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. r3597 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r3598 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3599 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
4. r3600 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
5. r3601 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
6. r3602 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
7. r3603 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-12-06 12:05:01 +0100 (Thu, 06 Dec 2007)
New Revision: 3597
Added:
branches/src/target/kernel/2.6.24.x/patches/s3c2410_fb-line_length.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
merge commit 3234 from 2.6.22.x patchset: fix dynamic mode/resolution switching
with s3c2410_fb (line_length calculation) (Stefan Schmidt)
Added: branches/src/target/kernel/2.6.24.x/patches/s3c2410_fb-line_length.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410_fb-line_length.patch
2007-12-06 10:58:31 UTC (rev 3596)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410_fb-line_length.patch
2007-12-06 11:05:01 UTC (rev 3597)
@@ -0,0 +1,23 @@
+Fix line length calculation. var->width is the size of the display in mm. We
+like to use the pixel size.
+
+Without this fix, dynamic (fbset) based resolution changes with s3c2410_fb
+don't work at all.
+
+Spotted by john cass <[EMAIL PROTECTED]>
+
+Signed-off-by: Stefan Schmidt <[EMAIL PROTECTED]>
+Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
+Index: linux-2.6/drivers/video/s3c2410fb.c
+===================================================================
+--- linux-2.6.orig/drivers/video/s3c2410fb.c
++++ linux-2.6/drivers/video/s3c2410fb.c
+@@ -488,7 +488,7 @@
+ break;
+ }
+
+- info->fix.line_length = (var->width * var->bits_per_pixel) / 8;
++ info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
+
+ /* activate this new configuration */
+
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2007-12-06 10:58:31 UTC
(rev 3596)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2007-12-06 11:05:01 UTC
(rev 3597)
@@ -37,6 +37,7 @@
config-nr-tty-devices.patch
hxd8-core.patch
# s3c2410_fb-truecolor.patch evaluate
+s3c2410_fb-line_length.patch
s3c2440-nand-disable-hwecc.patch
hxd8-tsl256x.patch
pcf50633.patch
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 12:22:03 +0100 (Thu, 06 Dec 2007)
New Revision: 3598
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
merge commit 3236 from 2.6.22.x patchset: Add register init and extend state
machine to support QVGA on the LCM. (Stefan Schmidt)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:05:01 UTC (rev 3597)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:22:03 UTC (rev 3598)
@@ -29,11 +29,12 @@
===================================================================
--- /dev/null
+++ linux-2.6/drivers/spi/jbt6k74.c
-@@ -0,0 +1,548 @@
+@@ -0,0 +1,654 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <[EMAIL PROTECTED]>
++ * Author: Harald Welte <[EMAIL PROTECTED]>,
++ * Stefan Schmidt <[EMAIL PROTECTED]>
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
@@ -101,6 +102,7 @@
+ JBT_REG_GAMMA1_INCLINATION = 0xc9,
+ JBT_REG_GAMMA1_BLUE_OFFSET = 0xca,
+
++ /* VGA */
+ JBT_REG_BLANK_CONTROL = 0xcf,
+ JBT_REG_BLANK_TH_TV = 0xd0,
+ JBT_REG_CKV_ON_OFF = 0xd1,
@@ -109,6 +111,16 @@
+ JBT_REG_ASW_TIMING_1 = 0xd4,
+ JBT_REG_ASW_TIMING_2 = 0xd5,
+
++ /* QVGA */
++ JBT_REG_BLANK_CONTROL_QVGA = 0xd6,
++ JBT_REG_BLANK_TH_TV_QVGA = 0xd7,
++ JBT_REG_CKV_ON_OFF_QVGA = 0xd8,
++ JBT_REG_CKV_1_2_QVGA = 0xd9,
++ JBT_REG_OEV_TIMING_QVGA = 0xde,
++ JBT_REG_ASW_TIMING_1_QVGA = 0xdf,
++ JBT_REG_ASW_TIMING_2_QVGA = 0xe0,
++
++
+ JBT_REG_HCLOCK_VGA = 0xec,
+ JBT_REG_HCLOCK_QVGA = 0xed,
+
@@ -118,12 +130,14 @@
+ JBT_STATE_DEEP_STANDBY,
+ JBT_STATE_SLEEP,
+ JBT_STATE_NORMAL,
++ JBT_STATE_QVGA_NORMAL,
+};
+
+static const char *jbt_state_names[] = {
+ [JBT_STATE_DEEP_STANDBY] = "deep-standby",
+ [JBT_STATE_SLEEP] = "sleep",
+ [JBT_STATE_NORMAL] = "normal",
++ [JBT_STATE_QVGA_NORMAL] = "qvga-normal",
+};
+
+#if 1
@@ -187,12 +201,11 @@
+ return rc;
+}
+
-+static int jbt_init_regs(struct jbt_info *jbt)
++static int jbt_init_regs(struct jbt_info *jbt, int qvga)
+{
+ int rc;
+
+ DEBUGP("entering\n");
-+
+ rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE1, 0x01);
+ rc |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE2, 0x00);
+ rc |= jbt_reg_write(jbt, JBT_REG_RGB_FORMAT, 0x60);
@@ -223,21 +236,38 @@
+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
+
-+ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
-+ rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
++ if (!qvga) {
++ DEBUGP("entering VGA mode\n");
++ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
++ rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
++ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
++ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
+
-+ rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
++ rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
++ rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
+
-+ rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
-+ rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
++ rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
++ rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
++ rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
++ }
++ else {
++ DEBUGP("entering QVGA mode\n");
+
++ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
++ rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL_QVGA, 0x02);
++ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV_QVGA, 0x0804);
++
++ rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF_QVGA, 0x01);
++ rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2_QVGA, 0x0008);
++
++ rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING_QVGA, 0x050a);
++ rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1_QVGA, 0x0a19);
++ rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2_QVGA, 0x0a);
++ }
++
+#if 0
-+ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
++ rc |= jct_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ffe;
++ ic |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
+#endif
+
+ return rc;
@@ -284,10 +314,35 @@
+ rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
+
+ /* initialize register set */
-+ rc |= jbt_init_regs(jbt);
++ rc |= jbt_init_regs(jbt, 0);
+ return rc;
+}
+
++static int sleep_to_qvga_normal(struct jbt_info *jbt)
++{
++ int rc;
++ DEBUGP("entering\n");
++
++ /* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
++ rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
++
++ /* Quad mode on */
++ rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
++
++ /* AVDD on, XVDD on */
++ rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
++
++ /* Output control */
++ rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
++
++ /* Sleep mode off */
++ rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
++
++ /* initialize register set for qvga*/
++ rc |= jbt_init_regs(jbt, 1);
++ return rc;
++}
++
+static int normal_to_sleep(struct jbt_info *jbt)
+{
+ int rc;
@@ -328,6 +383,12 @@
+ /* then transition into normal */
+ rc |= sleep_to_normal(jbt);
+ break;
++ case JBT_STATE_QVGA_NORMAL:
++ /* first transition into sleep */
++ rc = standby_to_sleep(jbt);
++ /* then transition into normal */
++ rc |= sleep_to_qvga_normal(jbt);
++ break;
+ }
+ break;
+ case JBT_STATE_SLEEP:
@@ -341,6 +402,9 @@
+ case JBT_STATE_NORMAL:
+ rc = sleep_to_normal(jbt);
+ break;
++ case JBT_STATE_QVGA_NORMAL:
++ rc = sleep_to_qvga_normal(jbt);
++ break;
+ }
+ break;
+ case JBT_STATE_NORMAL:
@@ -357,8 +421,44 @@
+ case JBT_STATE_SLEEP:
+ rc = normal_to_sleep(jbt);
+ break;
++ case JBT_STATE_QVGA_NORMAL:
++ /* first transition into sleep */
++ rc = normal_to_sleep(jbt);
++ /* second transition into deep standby */
++ rc |= sleep_to_standby(jbt);
++ /* third transition into sleep */
++ rc |= standby_to_sleep(jbt);
++ /* fourth transition into normal */
++ rc |= sleep_to_qvga_normal(jbt);
++ break;
+ }
+ break;
++ case JBT_STATE_QVGA_NORMAL:
++ switch (new_state) {
++ case JBT_STATE_QVGA_NORMAL:
++ rc = 0;
++ break;
++ case JBT_STATE_DEEP_STANDBY:
++ /* first transition into sleep */
++ rc = normal_to_sleep(jbt);
++ /* then transition into deep standby */
++ rc |= sleep_to_standby(jbt);
++ break;
++ case JBT_STATE_SLEEP:
++ rc = normal_to_sleep(jbt);
++ break;
++ case JBT_STATE_NORMAL:
++ /* first transition into sleep */
++ rc = normal_to_sleep(jbt);
++ /* second transition into deep standby */
++ rc |= sleep_to_standby(jbt);
++ /* third transition into sleep */
++ rc |= standby_to_sleep(jbt);
++ /* fourth transition into normal */
++ rc |= sleep_to_normal(jbt);
++ break;
++ }
++ break;
+ }
+ if (rc == 0)
+ jbt->state = new_state;
@@ -399,9 +499,15 @@
+ strlen(jbt_state_names[i]))) {
+ DEBUGP("Switch to state: %u\n", i);
+ jbt6k74_enter_state(jbt, i);
-+ if (i == JBT_STATE_NORMAL)
++ switch (i) {
++ case JBT_STATE_NORMAL:
++ case JBT_STATE_QVGA_NORMAL:
+ /* Enable display again after deep-standby */
+ jbt6k74_display_onoff(jbt, 1);
++ break;
++ default:
++ break;
++ }
+ return count;
+ }
+ }
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-12-06 12:22:14 +0100 (Thu, 06 Dec 2007)
New Revision: 3599
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
Log:
* src/sms-compose.c: (send_clicked_cb):
* src/sms-main.c: (main):
Sync with phone-kit changes
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-06 11:22:03 UTC (rev 3598)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-06 11:22:14 UTC (rev 3599)
@@ -1,3 +1,9 @@
+2007-12-06 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-compose.c: (send_clicked_cb):
+ * src/sms-main.c: (main):
+ Sync with phone-kit changes
+
2007-11-26 Chris Lord <[EMAIL PROTECTED]>
* src/sms-compose.c: (page_shown):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-12-06 11:22:03 UTC (rev 3598)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-12-06 11:22:14 UTC (rev 3599)
@@ -149,9 +149,6 @@
if (hidden) return;
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
- data->new_button), FALSE);
-
number = gtk_entry_get_text (GTK_ENTRY (
GTK_BIN (data->number_combo)->child));
@@ -166,7 +163,7 @@
if (message && (message[0] != '\0')) {
g_debug ("Sending message '%s' to %s", message, number);
- if (!dbus_g_proxy_call (data->sms_proxy, "SendSms",
+ if (!dbus_g_proxy_call (data->sms_proxy, "Send",
&error, G_TYPE_STRING, number, G_TYPE_STRING,
message, G_TYPE_INVALID, G_TYPE_STRING, NULL,
G_TYPE_INVALID)) {
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2007-12-06 11:22:03 UTC (rev 3598)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
2007-12-06 11:22:14 UTC (rev 3599)
@@ -66,8 +66,8 @@
data.sms_proxy = NULL;
} else {
data.sms_proxy = dbus_g_proxy_new_for_name (connection,
- "org.openmoko.Dialer", "/org/openmoko/Dialer",
- "org.openmoko.Dialer");
+ "org.openmoko.PhoneKit", "/org/openmoko/PhoneKit/Sms",
+ "org.openmoko.PhoneKit.Sms");
}
data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 12:24:48 +0100 (Thu, 06 Dec 2007)
New Revision: 3600
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
merge commit 3237 from 2.6.22.x patchset: remove double register settings. Not
listed in the data-sheet and it works fine without them. Looks like a
copy-and-paste error. (Stefan Schmidt)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:22:14 UTC (rev 3599)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:24:48 UTC (rev 3600)
@@ -29,7 +29,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/drivers/spi/jbt6k74.c
-@@ -0,0 +1,654 @@
+@@ -0,0 +1,646 @@
+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
+ *
+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
@@ -213,7 +213,6 @@
+ rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_OP, 0x56);
+ rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_MODE, 0x33);
+ rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_FREQ, 0x11);
-+ rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_FREQ, 0x11);
+ rc |= jbt_reg_write(jbt, JBT_REG_OPAMP_SYSCLK, 0x02);
+ rc |= jbt_reg_write(jbt, JBT_REG_VSC_VOLTAGE, 0x2b);
+ rc |= jbt_reg_write(jbt, JBT_REG_VCOM_VOLTAGE, 0x40);
@@ -234,14 +233,12 @@
+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_FINE_2, 0x00);
+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_INCLINATION, 0x00);
+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
-+ rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
+
+ if (!qvga) {
+ DEBUGP("entering VGA mode\n");
+ rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
+ rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
+ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
-+ rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
+
+ rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
+ rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
@@ -265,11 +262,6 @@
+ rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2_QVGA, 0x0a);
+ }
+
-+#if 0
-+ rc |= jct_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ffe;
-+ ic |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
-+#endif
-+
+ return rc;
+}
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 12:27:10 +0100 (Thu, 06 Dec 2007)
New Revision: 3601
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
Log:
merging commit 3238 from 2.6.22.x patchset: Trivial whitespace before tab
cleanup. (Stefan Schmidt)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:24:48 UTC (rev 3600)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-jbt6k74.patch
2007-12-06 11:27:10 UTC (rev 3601)
@@ -653,7 +653,7 @@
+ .owner = THIS_MODULE,
+ },
+
-+ .probe = jbt_probe,
++ .probe = jbt_probe,
+ .remove = __devexit_p(jbt_remove),
+ .suspend = jbt_suspend,
+ .resume = jbt_resume,
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-12-06 13:27:08 +0100 (Thu, 06 Dec 2007)
New Revision: 3602
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
* configure.ac:
* src/Makefile.am:
* src/today-main.c: (set_window_title), (is_active_notify),
(provider_changed_cb), (main):
* src/today.h:
Use phone-kit to display network name (bug #367)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-12-06 11:27:10 UTC (rev 3601)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-12-06 12:27:08 UTC (rev 3602)
@@ -1,3 +1,12 @@
+2007-12-06 Chris Lord <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/Makefile.am:
+ * src/today-main.c: (set_window_title), (is_active_notify),
+ (provider_changed_cb), (main):
+ * src/today.h:
+ Use phone-kit to display network name (bug #367)
+
2007-11-30 Chris Lord <[EMAIL PROTECTED]>
* src/today-task-manager.c: (today_task_manager_populate_tasks),
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
2007-12-06 11:27:10 UTC (rev 3601)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
2007-12-06 12:27:08 UTC (rev 3602)
@@ -42,6 +42,7 @@
PKG_CHECK_MODULES(EBOOK, libebook-1.2 >= $LIBEBOOK_VERSION)
PKG_CHECK_MODULES(GCONF, gconf-2.0)
PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk)
+PKG_CHECK_MODULES(DBUS, dbus-glib-1)
AC_ARG_ENABLE(startup_notification,
AC_HELP_STRING([--enable-startup-notification], [enable startup
notification support]),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
2007-12-06 11:27:10 UTC (rev 3601)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
2007-12-06 12:27:08 UTC (rev 3602)
@@ -6,7 +6,7 @@
AM_CFLAGS = -Wall -pedantic -std=c99 @GTK_CFLAGS@ @ECAL_CFLAGS@ \
@EBOOK_CFLAGS@ @MOKOUI_CFLAGS@ @MOKOJOURNAL_CFLAGS@ \
- @GCONF_CFLAGS@ @JANA_CFLAGS@
+ @GCONF_CFLAGS@ @JANA_CFLAGS@ @DBUS_CFLAGS@
bin_PROGRAMS = openmoko-today
@@ -30,7 +30,7 @@
$(top_builddir)/libtaku/libtaku.a \
@GTK_LIBS@ @ECAL_LIBS@ @EBOOK_LIBS@ @SEXY_LIBS@ \
@SN_LIBS@ @MOKOUI_LIBS@ @MOKOJOURNAL_LIBS@ \
- @GCONF_LIBS@ @JANA_LIBS@
+ @GCONF_LIBS@ @JANA_LIBS@ @DBUS_LIBS@
# Optional inotify support
if HAVE_INOTIFY
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-12-06 11:27:10 UTC (rev 3601)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-12-06 12:27:08 UTC (rev 3602)
@@ -349,6 +349,35 @@
}
}
+static gboolean active = TRUE;
+
+static void
+set_window_title (TodayData *data)
+{
+ gtk_window_set_title (GTK_WINDOW (data->window),
+ data->network_name ? data->network_name :
+ "Registering...");
+}
+
+static void
+is_active_notify (GObject *window, GParamSpec *arg1, TodayData *data)
+{
+ g_object_get (window, "is-active", &active, NULL);
+ if (!active)
+ gtk_window_set_title (GTK_WINDOW (data->window), "Home");
+ else
+ set_window_title (data);
+}
+
+static void
+provider_changed_cb (DBusGProxy *proxy, const gchar *name, TodayData *data)
+{
+ g_free (data->network_name);
+ data->network_name = g_strdup (name);
+
+ if (active) set_window_title (data);
+}
+
static GtkWidget *window;
static void
@@ -362,17 +391,20 @@
main (int argc, char **argv)
{
TodayData data;
+ DBusGConnection *connection;
GOptionContext *context;
GtkWidget *widget;
#ifndef STANDALONE
gint x, y, w, h;
#endif
+ GError *error = NULL;
static GOptionEntry entries[] = {
{ NULL }
};
data.wallpaper = NULL;
+ data.network_name = NULL;
/* Initialise */
bindtextdomain (GETTEXT_PACKAGE, TODAY_LOCALE_DIR);;
@@ -387,6 +419,22 @@
/* init openmoko stock items */
moko_stock_register ();
+ /* Get phone-kit Network dbus proxy */
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if (!connection) {
+ g_warning ("Failed to get dbus connection: %s", error->message);
+ g_error_free (error);
+ data.network_proxy = NULL;
+ } else {
+ data.network_proxy = dbus_g_proxy_new_for_name (connection,
+ "org.openmoko.PhoneKit",
+ "/org/openmoko/PhoneKit/Network",
+ "org.openmoko.PhoneKit.Network");
+ dbus_g_proxy_connect_signal (data.network_proxy,
+ "ProviderChanged", G_CALLBACK (provider_changed_cb),
+ &data, NULL);
+ }
+
/* Create widgets */
data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (data.window), _("Home"));
@@ -442,6 +490,8 @@
#endif
/* Show and start */
+ g_signal_connect (data.window, "notify::is-active",
+ G_CALLBACK (is_active_notify), &data);
gtk_widget_show (data.window);
/* Listen to wallpaper setting */
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-12-06 11:27:10 UTC (rev 3601)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-12-06 12:27:08 UTC (rev 3602)
@@ -6,6 +6,8 @@
#include <libtaku/taku-launcher-tile.h>
#include <moko-journal.h>
#include <libjana/jana.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
#define GCONF_POKY_INTERFACE_PREFIX "/desktop/poky/interface"
#define GCONF_POKY_WALLPAPER "/wallpaper"
@@ -26,6 +28,8 @@
GtkWidget *bg_ebox;
GdkPixmap *wallpaper;
gchar *location;
+ DBusGProxy *network_proxy;
+ gchar *network_name;
GtkWidget *date_button;
GtkWidget *missed_calls_box;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-06 14:08:01 +0100 (Thu, 06 Dec 2007)
New Revision: 3603
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
Log:
GTA01:
* don't mark s3c2410_displays as __initdata since the driver needs it at fbset
time
* use correct millimeter values for physical height and width of display
* fix switched front/backporch understanding of myself ;)
* add 32bpp mode at full-vga
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-06 12:27:08 UTC (rev 3602)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-core.patch
2007-12-06 13:08:01 UTC (rev 3603)
@@ -31,7 +31,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,760 @@
+@@ -0,0 +1,783 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -308,12 +308,13 @@
+
+/* LCD driver info */
+
-+/* Configuration for 480x640 toppoly TD028TTEC1 */
-+static struct s3c2410fb_display gta01_displays[] __initdata = {
++/* Configuration for 480x640 toppoly TD028TTEC1.
++ * Do not mark this as __initdata or it will break! */
++static struct s3c2410fb_display gta01_displays[] = {
+ {
+ .type = S3C2410_LCDCON1_TFT,
-+ .width = 480,
-+ .height = 640,
++ .width = 43,
++ .height = 58,
+ .xres = 480,
+ .yres = 640,
+ .bpp = 16,
@@ -322,8 +323,8 @@
+ .left_margin = 104,
+ .right_margin = 8,
+ .hsync_len = 8,
-+ .upper_margin = 16,
-+ .lower_margin = 2,
++ .upper_margin = 2,
++ .lower_margin = 16,
+ .vsync_len = 2,
+ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
+ S3C2410_LCDCON5_INVVCLK |
@@ -334,8 +335,30 @@
+ },
+ {
+ .type = S3C2410_LCDCON1_TFT,
-+ .width = 240,
-+ .height = 320,
++ .width = 43,
++ .height = 58,
++ .xres = 480,
++ .yres = 640,
++ .bpp = 32,
++
++ .pixclock = 40000, /* HCLK/4 */
++ .left_margin = 104,
++ .right_margin = 8,
++ .hsync_len = 8,
++ .upper_margin = 2,
++ .lower_margin = 16,
++ .vsync_len = 2,
++ .lcdcon5 = S3C2410_LCDCON5_FRM565 |
++ S3C2410_LCDCON5_INVVCLK |
++ S3C2410_LCDCON5_INVVLINE |
++ S3C2410_LCDCON5_INVVFRAME |
++ S3C2410_LCDCON5_PWREN |
++ S3C2410_LCDCON5_HWSWP,
++ },
++ {
++ .type = S3C2410_LCDCON1_TFT,
++ .width = 43,
++ .height = 58,
+ .xres = 240,
+ .yres = 320,
+ .bpp = 16,
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
