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. r3712 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3713 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3714 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-12-20 19:08:30 +0100 (Thu, 20 Dec 2007)
New Revision: 3712
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
* src/sms-notes.c: (sms_notes_data_func):
Disable showing of recipient's name on the notes view page
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-20 17:24:47 UTC (rev 3711)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-12-20 18:08:30 UTC (rev 3712)
@@ -1,6 +1,11 @@
2007-12-20 Chris Lord <[EMAIL PROTECTED]>
* src/sms-notes.c: (sms_notes_data_func):
+ Disable showing of recipient's name on the notes view page
+
+2007-12-20 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-notes.c: (sms_notes_data_func):
Display contact names instead of phone numbers (fixes bug #1143)
2007-12-20 Chris Lord <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-20 17:24:47 UTC (rev 3711)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2007-12-20 18:08:30 UTC (rev 3712)
@@ -301,14 +301,14 @@
GtkTreeIter *iter,
SmsData *data)
{
- gchar *author, *recipient, *body, **categories;
+ gchar *author, /**recipient,*/ *body, **categories;
JanaTime *created, *modified;
gboolean outgoing;
gint i;
gtk_tree_model_get (model, iter,
JANA_GTK_NOTE_STORE_COL_AUTHOR, &author,
- JANA_GTK_NOTE_STORE_COL_RECIPIENT, &recipient,
+ /*JANA_GTK_NOTE_STORE_COL_RECIPIENT, &recipient,*/
JANA_GTK_NOTE_STORE_COL_BODY, &body,
JANA_GTK_NOTE_STORE_COL_CREATED, &created,
JANA_GTK_NOTE_STORE_COL_MODIFIED, &modified,
@@ -328,10 +328,10 @@
}
/* Replace numbers with contact names */
- for (i = 0; i < 2; i++) {
+ for (i = /*0*/ 1; i < 2; i++) {
const gchar *uid;
GtkTreeIter *iter;
- gchar *number = i ? author : recipient;
+ gchar *number = i ? author : /*recipient*/ NULL;
gchar *name;
if (!number) continue;
@@ -347,13 +347,13 @@
if (name) {
g_free (number);
if (i) author = name;
- else recipient = name;
+ /*else recipient = name;*/
}
}
g_object_set (cell,
"author", author,
- "recipient", recipient,
+ "recipient", /*recipient*/ NULL,
"body", body,
"created", created,
"modified", modified,
@@ -364,7 +364,7 @@
NULL);
g_free (author);
- g_free (recipient);
+ /*g_free (recipient);*/
g_free (body);
if (created) g_object_unref (created);
if (modified) g_object_unref (modified);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-20 19:12:04 +0100 (Thu, 20 Dec 2007)
New Revision: 3713
Modified:
branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
Log:
I'm working on this in my spare time, so no OpenMoko copyright involved
Modified: branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2007-12-20
18:08:30 UTC (rev 3712)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch 2007-12-20
18:12:04 UTC (rev 3713)
@@ -10,7 +10,7 @@
After a potential kernel inclusion, we would co-maintain the driver.
Acked-by: Thomas Kleffel <[EMAIL PROTECTED]>
-Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
+Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
Index: linux-2.6/include/asm-arm/arch-s3c2410/regs-sdi.h
===================================================================
@@ -94,7 +94,7 @@
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
+ *
+ * Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <[EMAIL PROTECTED]>
-+ * Copyright (C) 2007 OpenMoko, Inc., Harald Welte <[EMAIL PROTECTED]>
++ * Copyright (C) 2007 Harald Welte <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
@@ -638,7 +638,7 @@
+ cardint = 1;
+ mci_dclear |= S3C2410_SDIDSTA_SDIOIRQDETECT;
+ }
-+
++
+clear_status_bits:
+ writel(mci_cclear, host->base + S3C2410_SDICMDSTAT);
+ writel(mci_dclear, host->base + S3C2410_SDIDSTA);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-12-20 19:38:23 +0100 (Thu, 20 Dec 2007)
New Revision: 3714
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
Add support for NEO1973 NOR flash to MTD
From: warmcat <[EMAIL PROTECTED]>
You will need the default config from svn
http://svn.openmoko.org/trunk/src/target/kernel/config/
in the top level of your kernel dir to apply this patch -- and
you need to use the patched config to build the kernel
Whether the NOR flash is present at 0x18000000 or not (it
varies according to GTA revision... -02 A3 and A4 should work
fine and A2 if booted from NOR only) the whole 2MByte NOR
region appears as /dev/mtdblock0 and the NAND partitions start
from /dev/mtdblock1 up.
/dev/mtdblock0 2MB NOR
/dev/mtdblock1 U-Boot
/dev/mtdblock2 U-Boot env
/dev/mtdblock3 Kernel
/dev/mtdblock4 Splash
/dev/mtdblock5 rootfs
After applying this patch, you need to adjust the kernel cmdline
to identify root=/dev/mtdblock5 in order to boot into the rootfs
Once booted, you can do, eg
# mount -t jffs2 /dev/mtdblock0 /mnt
to mount the NOR 2MB partition on /mnt
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-20 18:12:04 UTC (rev 3713)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2007-12-20 18:38:23 UTC (rev 3714)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,679 @@
+@@ -0,0 +1,709 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -48,6 +48,7 @@
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
++#include <linux/mtd/physmap.h>
+
+#include <linux/pcf50633.h>
+
@@ -309,6 +310,34 @@
+ },
+};
+
++
++/* NOR Flash */
++
++#define GTA02_FLASH_BASE 0x18000000 /* GCS3 */
++#define GTA02_FLASH_SIZE 0x200000 /* 2MBytes */
++
++static struct physmap_flash_data gta02_nor_flash_data = {
++ .width = 2,
++};
++
++static struct resource gta02_nor_flash_resource = {
++ .start = GTA02_FLASH_BASE,
++ .end = GTA02_FLASH_BASE + GTA02_FLASH_SIZE - 1,
++ .flags = IORESOURCE_MEM,
++};
++
++static struct platform_device gta02_nor_flash = {
++ .name = "physmap-flash",
++ .id = 0,
++ .dev = {
++ .platform_data = >a02_nor_flash_data,
++ },
++ .resource = >a02_nor_flash_resource,
++ .num_resources = 1,
++};
++
++
++
+static struct platform_device *gta02_devices[] __initdata = {
+ &s3c_device_usb,
+ &s3c_device_wdt,
@@ -320,6 +349,7 @@
+ &s3c_device_ts,
+ &s3c_device_spi0,
+ &s3c_device_spi1,
++ >a02_nor_flash,
+};
+
+static struct s3c2410_nand_set gta02_nand_sets[] = {
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
