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. r2360 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r2361 - trunk/oe/conf/distro/include ([EMAIL PROTECTED])
3. r2362 - trunk/oe/packages/openmoko-base/openmoko-session
([EMAIL PROTECTED])
4. r2363 - in trunk: oe/conf/distro/include oe/packages/tasks
src/target/OM-2007/applications
src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-07-05 17:02:38 +0200 (Thu, 05 Jul 2007)
New Revision: 2360
Modified:
trunk/src/target/kernel/patches/s3c_mci.patch
Log:
* fix 'unfinished read' problems due to missing max_blk_count/max_blk_size
(Roman Moravcik)
Modified: trunk/src/target/kernel/patches/s3c_mci.patch
===================================================================
--- trunk/src/target/kernel/patches/s3c_mci.patch 2007-07-04 20:55:44 UTC
(rev 2359)
+++ trunk/src/target/kernel/patches/s3c_mci.patch 2007-07-05 15:02:38 UTC
(rev 2360)
@@ -1,9 +1,9 @@
This is the latest S3C MMC/SD driver by Thomas Kleffel
-Index: linux-2.6.21-moko/drivers/mmc/Kconfig
+Index: linux-2.6.21.3-moko/drivers/mmc/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/mmc/Kconfig
-+++ linux-2.6.21-moko/drivers/mmc/Kconfig
+--- linux-2.6.21.3-moko.orig/drivers/mmc/Kconfig
++++ linux-2.6.21.3-moko/drivers/mmc/Kconfig
@@ -125,4 +125,16 @@
To compile this driver as a module, choose M here: the
module will be called tifm_sd.
@@ -21,10 +21,10 @@
+
+
endmenu
-Index: linux-2.6.21-moko/drivers/mmc/mmc_debug.c
+Index: linux-2.6.21.3-moko/drivers/mmc/mmc_debug.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/mmc_debug.c
++++ linux-2.6.21.3-moko/drivers/mmc/mmc_debug.c
@@ -0,0 +1,59 @@
+/*
+ * linux/drivers/mmc/mmc_debug.c
@@ -85,10 +85,10 @@
+ }
+}
+EXPORT_SYMBOL(mmc_err2str);
-Index: linux-2.6.21-moko/drivers/mmc/mmc_debug.h
+Index: linux-2.6.21.3-moko/drivers/mmc/mmc_debug.h
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/mmc_debug.h
++++ linux-2.6.21.3-moko/drivers/mmc/mmc_debug.h
@@ -0,0 +1,7 @@
+#ifndef MMC_DEBUG_H
+#define MMC_DEBUG_H
@@ -97,11 +97,11 @@
+char *mmc_err2str(int err);
+
+#endif /* MMC_DEBUG_H */
-Index: linux-2.6.21-moko/drivers/mmc/s3cmci.c
+Index: linux-2.6.21.3-moko/drivers/mmc/s3cmci.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/s3cmci.c
-@@ -0,0 +1,1339 @@
++++ linux-2.6.21.3-moko/drivers/mmc/s3cmci.c
+@@ -0,0 +1,1341 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
+ *
@@ -1293,6 +1293,8 @@
+ mmc->f_min = host->clk_rate / (host->clk_div * 256);
+ mmc->f_max = host->clk_rate / host->clk_div;
+
++ mmc->max_blk_count = 4095;
++ mmc->max_blk_size = 4095;
+ mmc->max_req_size = 4095 * 512;
+ mmc->max_seg_size = mmc->max_req_size;
+
@@ -1441,10 +1443,10 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>");
+
-Index: linux-2.6.21-moko/drivers/mmc/s3cmci.h
+Index: linux-2.6.21.3-moko/drivers/mmc/s3cmci.h
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/mmc/s3cmci.h
++++ linux-2.6.21.3-moko/drivers/mmc/s3cmci.h
@@ -0,0 +1,71 @@
+/*
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1517,10 +1519,10 @@
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
+};
-Index: linux-2.6.21-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
+Index: linux-2.6.21.3-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
===================================================================
---- linux-2.6.21-moko.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
-+++ linux-2.6.21-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
+--- linux-2.6.21.3-moko.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
++++ linux-2.6.21.3-moko/include/asm-arm/arch-s3c2410/regs-sdi.h
@@ -28,9 +28,15 @@
#define S3C2410_SDIDCNT (0x30)
#define S3C2410_SDIDSTA (0x34)
@@ -1588,10 +1590,10 @@
#define S3C2410_SDIFSTA_RFLAST (1<<9)
#define S3C2410_SDIFSTA_RFFULL (1<<8)
#define S3C2410_SDIFSTA_RFHALF (1<<7)
-Index: linux-2.6.21-moko/include/linux/mmc/mmc.h
+Index: linux-2.6.21.3-moko/include/linux/mmc/mmc.h
===================================================================
---- linux-2.6.21-moko.orig/include/linux/mmc/mmc.h
-+++ linux-2.6.21-moko/include/linux/mmc/mmc.h
+--- linux-2.6.21.3-moko.orig/include/linux/mmc/mmc.h
++++ linux-2.6.21.3-moko/include/linux/mmc/mmc.h
@@ -55,12 +55,15 @@
unsigned int retries; /* max number of retries */
unsigned int error; /* command error */
@@ -1614,10 +1616,10 @@
struct mmc_data *data; /* data segment associated with
cmd */
struct mmc_request *mrq; /* associated request */
-Index: linux-2.6.21-moko/drivers/mmc/Makefile
+Index: linux-2.6.21.3-moko/drivers/mmc/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/mmc/Makefile
-+++ linux-2.6.21-moko/drivers/mmc/Makefile
+--- linux-2.6.21.3-moko.orig/drivers/mmc/Makefile
++++ linux-2.6.21.3-moko/drivers/mmc/Makefile
@@ -24,10 +24,12 @@
obj-$(CONFIG_MMC_OMAP) += omap.o
obj-$(CONFIG_MMC_AT91) += at91_mci.o
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-06 10:11:05 +0200 (Fri, 06 Jul 2007)
New Revision: 2361
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
Log:
* Pin down openmoko-applet-mainmenu to have it buildable during bigger changes.
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-05 15:02:38 UTC (rev 2360)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-06 08:11:05 UTC (rev 2361)
@@ -78,7 +78,7 @@
#
SRCDATE_openmoko-panel-clock = "now"
SRCDATE_openmoko-panel-battery = "now"
-SRCDATE_openmoko-panel-mainmenu = "now"
+SRCDATE_openmoko-panel-mainmenu = "20070705"
SRCDATE_openmoko-panel-gsm = "now"
SRCDATE_openmoko-panel-gps = "now"
SRCDATE_openmoko-panel-bt = "now"
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-06 10:38:29 +0200 (Fri, 06 Jul 2007)
New Revision: 2362
Modified:
trunk/oe/packages/openmoko-base/openmoko-session/session
Log:
* Make sure libgtkstylus.so gtk module is loaded to have tap'n'hold
functionality.
Modified: trunk/oe/packages/openmoko-base/openmoko-session/session
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session/session 2007-07-06
08:11:05 UTC (rev 2361)
+++ trunk/oe/packages/openmoko-base/openmoko-session/session 2007-07-06
08:38:29 UTC (rev 2362)
@@ -2,6 +2,8 @@
SHOWCURSOR="no"
+export GTK_MODULES=libgtkstylus.so
+
matchbox-panel-2 \
--start-applets=openmoko-panel-mainmenu,systray,startup \
--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock
&
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-07-06 11:14:14 +0200 (Fri, 06 Jul 2007)
New Revision: 2363
Removed:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/
Modified:
trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
trunk/oe/packages/tasks/task-openmoko.bb
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Log:
* Completely remove openmoko-mainmenu. The finger menu is now merged in
openmoko-applet-mainmenu and started by tap'and'hold on the applet.
Modified: trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
===================================================================
--- trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-06 08:38:29 UTC (rev 2362)
+++ trunk/oe/conf/distro/include/preferred-openmoko-versions.inc
2007-07-06 09:14:14 UTC (rev 2363)
@@ -59,7 +59,6 @@
SRCDATE_openmoko-dialer = "now"
SRCDATE_openmoko-footer = "20070628"
SRCDATE_openmoko-phone = "now"
-SRCDATE_openmoko-mainmenu = "now"
SRCDATE_openmoko-taskmanager = "now"
SRCDATE_openmoko-terminal = "now"
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-07-06 08:38:29 UTC (rev
2362)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-07-06 09:14:14 UTC (rev
2363)
@@ -91,7 +91,6 @@
DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and
Footer"
RDEPENDS_task-openmoko-base = "\
openmoko-terminal \
- openmoko-mainmenu \
matchbox-panel-2 \
matchbox-panel-2-applets \
matchbox-applet-inputmanager \
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-07-06 08:38:29 UTC (rev 2362)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-07-06 09:14:14 UTC (rev 2363)
@@ -62,7 +62,7 @@
static void tap_hold(MokoPanelApplet * applet)
{
g_debug("tap hold event callback");
- GtkWidget *widget = GTK_WIDGET(applet);
+/* GtkWidget *widget = GTK_WIDGET(applet);
Screen *screen = GDK_SCREEN_XSCREEN(gtk_widget_get_screen(widget));
XEvent xev;
@@ -83,7 +83,7 @@
XSendEvent(DisplayOfScreen(screen), RootWindowOfScreen(screen), False,
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
-
+*/
mma = g_malloc0 (sizeof (MokoMainmenuApp));
if (!mma)
{
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
