Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1510 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
2. r1511 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r1512 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
4. r1513 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
5. r1514 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r1515 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-03-26 16:39:12 +0200 (Mon, 26 Mar 2007)
New Revision: 1510
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-omoko.c: (create_main_window): Use correct icons on
action buttons
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-03-26 14:33:32 UTC (rev 1509)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-03-26 14:39:12 UTC (rev 1510)
@@ -1,5 +1,10 @@
2007-03-26 Thomas Wood <[EMAIL PROTECTED]>
+ * src/contacts-omoko.c: (create_main_window): Use correct icons on
+ action buttons
+
+2007-03-26 Thomas Wood <[EMAIL PROTECTED]>
+
* src/contacts-ui.c: (contacts_setup_ui): Make sure we always create an
initial Groups menu. Fixes OpenMoko bug 314.
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-03-26 14:33:32 UTC (rev 1509)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-03-26 14:39:12 UTC (rev 1510)
@@ -165,35 +165,26 @@
/* groups button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX
(moko_tool_box)));
- moko_pixmap_button_set_action_btn_upper_stock (MOKO_PIXMAP_BUTTON
(widget),
+ moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (widget),
"openmoko-action-button-group-icon");
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(widget),
- "Group");
g_signal_connect (G_OBJECT (widget), "clicked",
G_CALLBACK (contacts_groups_pane_show),
contacts_data);
/* history button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX
(moko_tool_box)));
- moko_pixmap_button_set_action_btn_upper_stock (MOKO_PIXMAP_BUTTON
(widget),
-
"openmoko-filter-menu-icon");
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(widget),
- "History");
+ moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (widget),
+
"openmoko-action-button-history-icon");
/* edit button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX
(moko_tool_box)));
- moko_pixmap_button_set_action_btn_upper_stock (MOKO_PIXMAP_BUTTON
(widget),
-
"openmoko-filter-menu-icon");
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(widget),
- "Edit");
+ moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (widget),
GTK_STOCK_EDIT);
g_signal_connect (G_OBJECT (widget), "clicked",
G_CALLBACK (contacts_edit_cb), contacts_data);
/* view button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX
(moko_tool_box)));
- moko_pixmap_button_set_action_btn_upper_stock (MOKO_PIXMAP_BUTTON
(widget),
-
"openmoko-filter-menu-icon");
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(widget),
- "View");
+ moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (widget),
+
"openmoko-action-button-view-icon");
g_signal_connect (G_OBJECT (widget), "clicked",
G_CALLBACK (contacts_view_cb), contacts_data);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-26 16:40:34 +0200 (Mon, 26 Mar 2007)
New Revision: 1511
Modified:
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
* de-assert NAND write protection signal
FIXME: we might do this only during nand write, rather than globally
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-03-26 14:39:12 UTC (rev 1510)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
2007-03-26 14:40:34 UTC (rev 1511)
@@ -26,7 +26,7 @@
Index: u-boot/board/neo1973/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/Makefile 2007-03-26 16:30:17.000000000 +0200
++++ u-boot/board/neo1973/Makefile 2007-03-26 16:37:54.000000000 +0200
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000, 2001, 2002
@@ -117,8 +117,8 @@
Index: u-boot/board/neo1973/neo1973.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.c 2007-03-26 16:30:20.000000000 +0200
-@@ -0,0 +1,361 @@
++++ u-boot/board/neo1973/neo1973.c 2007-03-26 16:38:49.000000000 +0200
+@@ -0,0 +1,362 @@
+/*
+ * (C) 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -304,6 +304,7 @@
+ gpio->GPHUP = 0x000007FF;
+#elif defined(CONFIG_ARCH_GTA01B_v4)
+ gpio->GPACON = 0x0005E0FFF;
++ gpio->GPADAT |= (1 << 16); /* Set GPA16 to high (nNAND_WP) */
+
+ gpio->GPBCON = 0x00045496;
+ gpio->GPBUP = 0x000007FF;
@@ -740,7 +741,7 @@
Index: u-boot/include/configs/neo1973.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/neo1973.h 2007-03-26 16:30:20.000000000 +0200
++++ u-boot/include/configs/neo1973.h 2007-03-26 16:37:57.000000000 +0200
@@ -0,0 +1,263 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
@@ -1067,7 +1068,7 @@
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-26 16:30:19.000000000 +0200
++++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-26 16:37:56.000000000 +0200
@@ -0,0 +1,120 @@
+/*
+ * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1192,7 +1193,7 @@
Index: u-boot/board/neo1973/neo1973.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.h 2007-03-26 16:30:17.000000000 +0200
++++ u-boot/board/neo1973/neo1973.h 2007-03-26 16:37:54.000000000 +0200
@@ -0,0 +1,18 @@
+#ifndef _NEO1973_H
+#define _NEO1973_H
@@ -1686,7 +1687,7 @@
Index: u-boot/common/main.c
===================================================================
--- u-boot.orig/common/main.c 2007-03-26 14:42:55.000000000 +0200
-+++ u-boot/common/main.c 2007-03-26 16:30:17.000000000 +0200
++++ u-boot/common/main.c 2007-03-26 16:37:55.000000000 +0200
@@ -61,6 +61,7 @@
#undef DEBUG_PARSER
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-26 19:00:59 +0200 (Mon, 26 Mar 2007)
New Revision: 1512
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
Log:
core support for GTA01Bv4
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-03-26 14:40:34 UTC
(rev 1511)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-03-26 17:00:59 UTC
(rev 1512)
@@ -1,10 +1,10 @@
This patch adds support for the FIC GTA01 machine type to the ARM port of
the linux kernel.
-Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.20.2/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Kconfig 2007-03-08
13:36:44.000000000 +0100
-+++ linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig 2007-03-08
13:37:56.000000000 +0100
+--- linux-2.6.20.2.orig/arch/arm/mach-s3c2410/Kconfig 2007-03-26
11:31:44.000000000 +0200
++++ linux-2.6.20.2/arch/arm/mach-s3c2410/Kconfig 2007-03-26
14:24:48.000000000 +0200
@@ -86,6 +86,14 @@
help
Say Y here if you are using the Armzone QT2410
@@ -20,10 +20,10 @@
config ARCH_S3C2440
bool "SMDK2440"
select CPU_S3C2440
-Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.20.2/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Makefile 2007-03-08
13:36:44.000000000 +0100
-+++ linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile 2007-03-08
13:36:44.000000000 +0100
+--- linux-2.6.20.2.orig/arch/arm/mach-s3c2410/Makefile 2007-03-26
11:31:44.000000000 +0200
++++ linux-2.6.20.2/arch/arm/mach-s3c2410/Makefile 2007-03-26
11:31:44.000000000 +0200
@@ -89,5 +89,6 @@
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o
@@ -31,11 +31,11 @@
+obj-$(CONFIG_MACH_GTA01) += mach-gta01.o
obj-$(CONFIG_MACH_SMDK) += common-smdk.o
-Index: linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.20.2/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-08
13:38:24.000000000 +0100
-@@ -0,0 +1,506 @@
++++ linux-2.6.20.2/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-26
11:35:14.000000000 +0200
+@@ -0,0 +1,507 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -499,7 +499,8 @@
+{
+ if (system_rev == GTA01v4_SYSTEM_REV ||
+ system_rev == GTA01Bv2_SYSTEM_REV ||
-+ system_rev == GTA01Bv3_SYSTEM_REV)
++ system_rev == GTA01Bv3_SYSTEM_REV ||
++ system_rev == GTA01Bv4_SYSTEM_REV)
+ gta01_udc_cfg.udc_command = gta01_udc_command;
+
+ s3c_device_usb.dev.platform_data = >a01_usb_info;
@@ -542,11 +543,11 @@
+MACHINE_END
+
+
-Index: linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.20.2/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h 2007-03-08
13:38:38.000000000 +0100
-@@ -0,0 +1,60 @@
++++ linux-2.6.20.2/include/asm-arm/arch-s3c2410/gta01.h 2007-03-26
14:28:16.000000000 +0200
+@@ -0,0 +1,69 @@
+#ifndef _GTA01_H
+#define _GTA01_H
+
@@ -573,6 +574,7 @@
+#define GTA01_GPIO_MODEM_RST S3C2410_GPB6
+#define GTA01_GPIO_MODEM_ON S3C2410_GPB7
+#define GTA01_GPIO_LCD_RESET S3C2410_GPC6
++#define GTA01_GPIO_PMU_IRQ S3C2410_GPG8
+#define GTA01_GPIO_JACK_INSERT S3C2410_GPF4
+#define GTA01_GPIO_nSD_DETECT S3C2410_GPF5
+#define GTA01_GPIO_AUX_KEY S3C2410_GPF6
@@ -592,6 +594,7 @@
+
+/* GTA01Bv2 */
+#define GTA01Bv2_GPIO_nGSM_EN S3C2410_GPF2
++#define GTA01Bv2_GPIO_VIBRATOR_ON S3C2410_GPB10
+
+/* GTA01Bv3 */
+#define GTA01_GPIO_GPS_EN_3V3 S3C2410_GPG9
@@ -606,4 +609,11 @@
+#define GTA01_GPIO_GPS_EN_3V S3C2410_GPG10
+#define GTA01_GPIO_GPS_RESET S3C2410_GPC0
+
++/* GTA01Bv4 */
++#define GTA01Bv4_GPIO_nNAND_WP S3C2410_GPA16
++#define GTA01Bv4_GPIO_VIBRATOR_ON S3C2410_GPB3
++#define GTA01Bv4_GPIO_PMU_IRQ S3C2410_GPG1
++
++#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9
++
+#endif /* _GTA01_H */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-26 19:33:36 +0200 (Mon, 26 Mar 2007)
New Revision: 1513
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
use sysfs_{create,remove}_group() instead of consecutive sysfs_create_file()
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-26
17:00:59 UTC (rev 1512)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-26
17:33:36 UTC (rev 1513)
@@ -1,17 +1,17 @@
-Index: linux-2.6.20.1/arch/arm/common/Makefile
+Index: linux-2.6.20.4/arch/arm/common/Makefile
===================================================================
---- linux-2.6.20.1.orig/arch/arm/common/Makefile 2007-03-08
14:03:22.000000000 +0100
-+++ linux-2.6.20.1/arch/arm/common/Makefile 2007-03-08 23:12:20.000000000
+0100
+--- linux-2.6.20.4.orig/arch/arm/common/Makefile 2007-03-23
20:52:51.000000000 +0100
++++ linux-2.6.20.4/arch/arm/common/Makefile 2007-03-26 19:01:18.000000000
+0200
@@ -17,3 +17,4 @@
obj-$(CONFIG_SHARP_SCOOP) += scoop.o
obj-$(CONFIG_ARCH_IXP2000) += uengine.o
obj-$(CONFIG_ARCH_IXP23XX) += uengine.o
+obj-$(CONFIG_MACH_GTA01) += gta01_pm_gsm.o gta01_pm_gps.o gta01_pm_bt.o
-Index: linux-2.6.20.1/arch/arm/common/gta01_pm_gps.c
+Index: linux-2.6.20.4/arch/arm/common/gta01_pm_gps.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/arch/arm/common/gta01_pm_gps.c 2007-03-08
14:03:27.000000000 +0100
-@@ -0,0 +1,542 @@
++++ linux-2.6.20.4/arch/arm/common/gta01_pm_gps.c 2007-03-26
19:15:54.000000000 +0200
+@@ -0,0 +1,534 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
+ *
@@ -454,9 +454,24 @@
+#define gta01_pm_gps_resume NULL
+#endif
+
++static struct attribute *gta01_gps_sysfs_entries[] = {
++ &dev_attr_power_avdd_3v.attr,
++ &dev_attr_pwron.attr,
++ &dev_attr_reset.attr,
++ &dev_attr_power_lp_io_3v3.attr,
++ &dev_attr_power_pll_core_2v5.attr,
++ &dev_attr_power_sequence.attr,
++ NULL,
++ NULL
++};
++
++static struct attribute_group gta01_gps_attr_group = {
++ .name = NULL,
++ .attrs = gta01_gps_sysfs_entries,
++};
++
+static int __init gta01_pm_gps_probe(struct platform_device *pdev)
+{
-+
+ s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
+
+ switch (system_rev) {
@@ -487,44 +502,21 @@
+ case GTA01v3_SYSTEM_REV:
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
-+ device_create_file(&pdev->dev, &dev_attr_power_tcxo_2v8);
++ gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
++
&dev_attr_power_tcxo_2v8.attr;
+ break;
+ case GTA01Bv3_SYSTEM_REV:
-+ device_create_file(&pdev->dev, &dev_attr_power_core_1v5);
++ gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
++
&dev_attr_power_core_1v5.attr;
+ break;
+ }
+
-+ device_create_file(&pdev->dev, &dev_attr_power_avdd_3v);
-+ device_create_file(&pdev->dev, &dev_attr_pwron);
-+ device_create_file(&pdev->dev, &dev_attr_reset);
-+ device_create_file(&pdev->dev, &dev_attr_power_lp_io_3v3);
-+ device_create_file(&pdev->dev, &dev_attr_power_pll_core_2v5);
-+ device_create_file(&pdev->dev, &dev_attr_power_sequence);
-+
-+ return 0;
++ return sysfs_create_group(&pdev->dev.kobj, >a01_gps_attr_group);
+}
+
+static int gta01_pm_gps_remove(struct platform_device *pdev)
+{
-+ switch (system_rev) {
-+ case GTA01v3_SYSTEM_REV:
-+ case GTA01v4_SYSTEM_REV:
-+ case GTA01Bv2_SYSTEM_REV:
-+ device_remove_file(&pdev->dev, &dev_attr_power_tcxo_2v8);
-+ break;
-+ case GTA01Bv3_SYSTEM_REV:
-+ device_remove_file(&pdev->dev, &dev_attr_power_core_1v5);
-+ break;
-+ }
-+
-+ device_remove_file(&pdev->dev, &dev_attr_power_sequence);
-+ device_remove_file(&pdev->dev, &dev_attr_power_pll_core_2v5);
-+ device_remove_file(&pdev->dev, &dev_attr_power_lp_io_3v3);
-+ device_remove_file(&pdev->dev, &dev_attr_reset);
-+ device_remove_file(&pdev->dev, &dev_attr_pwron);
-+ device_remove_file(&pdev->dev, &dev_attr_power_avdd_3v);
-+ device_remove_file(&pdev->dev, &dev_attr_power_tcxo_2v8);
-+
++ sysfs_remove_group(&pdev->dev.kobj, >a01_gps_attr_group);
+ return 0;
+}
+
@@ -554,11 +546,11 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GPS Power Management");
-Index: linux-2.6.20.1/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6.20.4/arch/arm/common/gta01_pm_gsm.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/arch/arm/common/gta01_pm_gsm.c 2007-03-08
23:48:57.000000000 +0100
-@@ -0,0 +1,208 @@
++++ linux-2.6.20.4/arch/arm/common/gta01_pm_gsm.c 2007-03-26
19:20:52.000000000 +0200
+@@ -0,0 +1,216 @@
+/*
+ * GSM Management code for the FIC Neo1973 GSM Phone
+ *
@@ -692,6 +684,18 @@
+#define gta01_gsm_resume NULL
+#endif
+
++static struct attribute *gta01_gsm_sysfs_entries[] = {
++ &dev_attr_power_on.attr,
++ &dev_attr_reset.attr,
++ NULL,
++ NULL
++};
++
++static struct attribute_group gta01_gsm_attr_group = {
++ .name = NULL,
++ .attrs = gta01_gsm_sysfs_entries,
++};
++
+static int __init gta01_gsm_probe(struct platform_device *pdev)
+{
+ switch (system_rev) {
@@ -713,13 +717,11 @@
+ break;
+ }
+
-+ device_create_file(&pdev->dev, &dev_attr_power_on);
-+ device_create_file(&pdev->dev, &dev_attr_reset);
-+
+ switch (system_rev) {
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
-+ device_create_file(&pdev->dev, &dev_attr_download);
++ gta01_gsm_sysfs_entries[ARRAY_SIZE(gta01_gsm_sysfs_entries)-2] =
++ &dev_attr_download.attr;
+ break;
+ default:
+ break;
@@ -729,14 +731,12 @@
+ if (!gta01_gsm.con)
+ dev_warn(&pdev->dev, "cannot find S3C24xx console driver\n");
+
-+ return 0;
++ return sysfs_create_group(&pdev->dev.kobj, >a01_gsm_attr_group);
+}
+
+static int gta01_gsm_remove(struct platform_device *pdev)
+{
-+ device_remove_file(&pdev->dev, &dev_attr_download);
-+ device_remove_file(&pdev->dev, &dev_attr_power_on);
-+ device_remove_file(&pdev->dev, &dev_attr_reset);
++ sysfs_remove_group(&pdev->dev.kobj, >a01_gsm_attr_group);
+
+ return 0;
+}
@@ -767,11 +767,11 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
-Index: linux-2.6.20.1/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6.20.4/arch/arm/common/gta01_pm_bt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/arch/arm/common/gta01_pm_bt.c 2007-03-08
14:03:27.000000000 +0100
-@@ -0,0 +1,133 @@
++++ linux-2.6.20.4/arch/arm/common/gta01_pm_bt.c 2007-03-26
19:14:32.000000000 +0200
+@@ -0,0 +1,140 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
+ *
@@ -859,22 +859,29 @@
+#define gta01_bt_resume NULL
+#endif
+
++static struct attribute *gta01_bt_sysfs_entries[] = {
++ &dev_attr_power_on.attr,
++ &dev_attr_reset.attr,
++ NULL
++};
++
++static struct attribute_group gta01_bt_attr_group = {
++ .name = NULL,
++ .attrs = gta01_bt_sysfs_entries,
++};
++
+static int __init gta01_bt_probe(struct platform_device *pdev)
+{
+ dev_info(&pdev->dev, DRVMSG ": starting\n");
+
-+ device_create_file(&pdev->dev, &dev_attr_power_on);
-+ device_create_file(&pdev->dev, &dev_attr_reset);
-+
-+ return 0;
++ return sysfs_create_group(&pdev->dev.kobj, >a01_bt_attr_group);
+}
+
+static int gta01_bt_remove(struct platform_device *pdev)
+{
+ dev_info(&pdev->dev, DRVMSG ": ending\n");
+
-+ device_remove_file(&pdev->dev, &dev_attr_power_on);
-+ device_remove_file(&pdev->dev, &dev_attr_reset);
++ sysfs_remove_group(&pdev->dev.kobj, >a01_bt_attr_group);
+
+ return 0;
+}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-26 19:38:14 +0200 (Mon, 26 Mar 2007)
New Revision: 1514
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
add GTA01Bv4 support
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-26
17:33:36 UTC (rev 1513)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-26
17:38:14 UTC (rev 1514)
@@ -10,8 +10,8 @@
Index: linux-2.6.20.4/arch/arm/common/gta01_pm_gps.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.4/arch/arm/common/gta01_pm_gps.c 2007-03-26
19:15:54.000000000 +0200
-@@ -0,0 +1,534 @@
++++ linux-2.6.20.4/arch/arm/common/gta01_pm_gps.c 2007-03-26
19:35:38.000000000 +0200
+@@ -0,0 +1,552 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
+ *
@@ -53,6 +53,7 @@
+ s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_2V8, on);
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ break;
+ }
+}
@@ -75,6 +76,7 @@
+ ret = 1;
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ break;
+ }
+
@@ -95,6 +97,7 @@
+ break;
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V, on);
+ break;
+ }
@@ -115,6 +118,7 @@
+ break;
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V))
+ ret = 1;
+ break;
@@ -137,6 +141,7 @@
+ PCF50606_REGULATOR_DCD, on);
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V3, on);
+ break;
+ }
@@ -157,6 +162,7 @@
+ ret = 1;
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V3))
+ ret = 1;
+ break;
@@ -175,6 +181,7 @@
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (on)
+ pcf50606_voltage_set(pcf50606_global,
+ PCF50606_REGULATOR_D2REG, 2500);
@@ -196,6 +203,7 @@
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (pcf50606_onoff_get(pcf50606_global,
+ PCF50606_REGULATOR_D2REG) &&
+ pcf50606_voltage_get(pcf50606_global,
@@ -217,6 +225,7 @@
+ /* This is switched via 2v5 */
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (on)
+ pcf50606_voltage_set(pcf50606_global,
+ PCF50606_REGULATOR_D2REG, 1500);
@@ -238,6 +247,7 @@
+ ret = 1;
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (pcf50606_onoff_get(pcf50606_global,
+ PCF50606_REGULATOR_D2REG) &&
+ pcf50606_voltage_get(pcf50606_global,
@@ -272,6 +282,8 @@
+ break;
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
++ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ s3c2410_gpio_setpin(GTA01_GPIO_GPS_RESET, on);
+ break;
+ }
@@ -286,6 +298,8 @@
+ break;
+ case GTA01v4_SYSTEM_REV:
+ case GTA01Bv2_SYSTEM_REV:
++ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_RESET))
+ return 1;
+ break;
@@ -481,6 +495,7 @@
+ s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
+ /* fallthrough */
+ case GTA01Bv2_SYSTEM_REV:
@@ -506,6 +521,7 @@
+
&dev_attr_power_tcxo_2v8.attr;
+ break;
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
+
&dev_attr_power_core_1v5.attr;
+ break;
@@ -516,7 +532,9 @@
+
+static int gta01_pm_gps_remove(struct platform_device *pdev)
+{
++ gps_power_sequence_down();
+ sysfs_remove_group(&pdev->dev.kobj, >a01_gps_attr_group);
++
+ return 0;
+}
+
@@ -549,8 +567,8 @@
Index: linux-2.6.20.4/arch/arm/common/gta01_pm_gsm.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.4/arch/arm/common/gta01_pm_gsm.c 2007-03-26
19:20:52.000000000 +0200
-@@ -0,0 +1,216 @@
++++ linux-2.6.20.4/arch/arm/common/gta01_pm_gsm.c 2007-03-26
19:36:11.000000000 +0200
+@@ -0,0 +1,217 @@
+/*
+ * GSM Management code for the FIC Neo1973 GSM Phone
+ *
@@ -707,6 +725,7 @@
+ break;
+ case GTA01Bv2_SYSTEM_REV:
+ case GTA01Bv3_SYSTEM_REV:
++ case GTA01Bv4_SYSTEM_REV:
+ gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
+ s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
+ break;
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-03-27 03:57:29 +0200 (Tue, 27 Mar 2007)
New Revision: 1515
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.h
Log:
fix popup menu position calculate function
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-03-26 17:38:14 UTC (rev 1514)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-03-27 01:57:29 UTC (rev 1515)
@@ -38,12 +38,13 @@
if (sm)
gtk_menu_popup (sm, NULL, NULL,
(GtkMenuPositionFunc)moko_menu_position_cb,
- NULL, 0, gtk_get_current_event_time());
+ GTK_WIDGET(applet), 0, gtk_get_current_event_time());
else g_debug ("no stylus menu objcet");
}
static void tap_hold( MokoPanelApplet* applet )
{
+ g_debug ("tap hold event callback");
GtkWidget* widget = GTK_WIDGET(applet);
Screen* screen = GDK_SCREEN_XSCREEN(gtk_widget_get_screen (widget));
XEvent xev;
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-03-26 17:38:14 UTC (rev 1514)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-03-27 01:57:29 UTC (rev 1515)
@@ -20,64 +20,6 @@
#include "stylusmenu.h"
//#include "callbacks.h"
-struct _MokoStylusMenuPrivate{
-
-};
-enum {
- MENU_SIGNAL = 0,
- LAST_SIGNAL
-};
-
-static void moko_stylus_menu_class_init(MokoStylusMenuClass *klass);
-
-static void moko_stylus_menu_init(MokoStylusMenu *self);
-
-static guint stylus_menu_signals[LAST_SIGNAL] = { 0 };
-
-GType
-moko_stylus_menu_get_type (void) /* Typechecking */
-{
- static GType menu_type = 0;
-g_debug("get >");
- if (!menu_type)
- {
- static const GTypeInfo menu_info =
- {
- sizeof (MokoStylusMenuClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) moko_stylus_menu_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (MokoStylusMenu),
- 0,
- (GInstanceInitFunc) moko_stylus_menu_init,
- NULL
- };
- menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL,
"MokoStylusMenu", &menu_info, 0);
- }
-
-g_debug("get <");
- return menu_type;
-}
-
-void
-moko_stylus_menu_class_init (MokoStylusMenuClass * klass)
-{
-
-}
-
-void
-moko_stylus_menu_init (MokoStylusMenu * self)
-{
-}
-
-MokoStylusMenu *
-moko_stylus_menu_new ()
-{
- return STYLUSMENU(g_object_new(moko_stylus_menu_get_type, NULL));
-}
-
static GtkImageMenuItem *moko_build_new_menu_item (const char *icon_name,
const char *icon_path);
void
@@ -169,19 +111,12 @@
}
void
-moko_menu_position_cb (GtkMenu *menu, int *x, int *y, gboolean *push_in,
gpointer *p)
+moko_menu_position_cb (GtkMenu *menu, int *x, int *y, gboolean *push_in,
GtkWidget *data)
{
- // GtkAllocation* allocation = >K_WIDGET(button)->allocation;
- //GtkRequisition req;
- //GtkRequisition menu_req;
- //GtkOrientation orientation;
- //GtkTextDirection direction;
-
- // gdk_window_get_origin(GTK_BUTTON(button)->event_window, x, y);
+ GtkAllocation* allocation = >K_WIDGET(data)->allocation;
- //FIXME:
- *x = 0;
- *y = 44;
+ *x = allocation->x;
+ *y = allocation->y + allocation->height;
*push_in = TRUE;
}
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.h
2007-03-26 17:38:14 UTC (rev 1514)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.h
2007-03-27 01:57:29 UTC (rev 1515)
@@ -32,7 +32,7 @@
//void moko_stylus_menu_build (GtkMenu *menu, MokoDesktopItem *item);
-void moko_menu_position_cb (GtkMenu *menu, int *x, int *y, gboolean *push_in,
gpointer *p);
+void moko_menu_position_cb (GtkMenu *menu, int *x, int *y, gboolean *push_in,
GtkWidget *data);
G_END_DECLS
#endif /*_MOKO_STYLUS_MAIN_MENU_H*/
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
