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. r1131 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
([EMAIL PROTECTED])
2. r1132 -
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep
([EMAIL PROTECTED])
3. r1133 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-02-26 07:29:37 +0100 (Mon, 26 Feb 2007)
New Revision: 1131
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
Log:
matchbox vfolder patch change: /usr/share/matchbox
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
2007-02-26 03:41:21 UTC (rev 1130)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
2007-02-26 06:29:37 UTC (rev 1131)
@@ -143,7 +143,7 @@
/* finger wheel object*/
mma->wheel = moko_finger_window_get_wheel (mma->window);
- gtk_window_set_title (GTK_WIDGET (mma->wheel), "wheel");
+ gtk_window_set_title (GTK_WIDGET (mma->wheel), "wheel");
/* finger toolbox object*/
mma->toolbox = moko_finger_window_get_toolbox(mma->window);
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
2007-02-26 03:41:21 UTC (rev 1130)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
2007-02-26 06:29:37 UTC (rev 1131)
@@ -28,11 +28,9 @@
LAST_SIGNAL
};
-static void
-moko_main_menu_class_init(MokoMainMenuClass *klass);
+static void moko_main_menu_class_init(MokoMainMenuClass *klass);
-static void
-moko_main_menu_init(MokoMainMenu *mm);
+static void moko_main_menu_init(MokoMainMenu *mm);
static guint menu_signals[LAST_SIGNAL] = { 0 };
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
2007-02-26 03:41:21 UTC (rev 1130)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
2007-02-26 06:29:37 UTC (rev 1131)
@@ -15,7 +15,7 @@
#include <libmb/mb.h>
-#define VFOLDERDIR "/usr/local/share/matchbox"
+#define VFOLDERDIR "/usr/share/matchbox"
#define DD_DIR "/usr/share/applications/"
/* #define DD_DIR "/tmp/" */
--- End Message ---
--- Begin Message ---
Author: jiang_li
Date: 2007-02-26 07:45:06 +0100 (Mon, 26 Feb 2007)
New Revision: 1132
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
Log:
This commit change the app name from "openmoko-media-player" to
"openmoko-simple-media-player" and adjust the desktop file to this change.
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-02-26 06:29:37 UTC (rev 1131)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-02-26 06:45:06 UTC (rev 1132)
@@ -3,7 +3,7 @@
beepincludedir = $(includedir)/bmp
bin_PROGRAMS = beep
-transform = s/beep/openmoko-media-player/
+transform = s/beep/openmoko-simple-media-player/
beep_LDFLAGS = -export-dynamic
beep_LDADD = -lid3 \
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
2007-02-26 06:29:37 UTC (rev 1131)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
2007-02-26 06:45:06 UTC (rev 1132)
@@ -1,7 +1,7 @@
[Desktop Entry]
-Name=Beep Media Player
+Name=Openmoko Simple Media Player
Comment=Play music
-Exec=beep-media-player
+Exec=openmoko-simple-media-player
Icon=bmp.png
MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
Categories=Application;GTK;AudioVideo;Player;
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-02-26 08:24:58 +0100 (Mon, 26 Feb 2007)
New Revision: 1133
Modified:
trunk/src/target/u-boot/patches/boot-menu.patch
Log:
u-boot/board/neo1973/bootmenu.c (bootmenu): return and power-off if "Boot"
command fails
u-boot/board/neo1973/neo1973.c: removed setting of "nobootdelay"
u-boot/board/neo1973/neo1973.c (board_late_init): enter the boot menu when
"AUX" was pressed at least half the time
u-boot/board/neo1973/neo1973.c (board_late_init): minor code cleanup
Modified: trunk/src/target/u-boot/patches/boot-menu.patch
===================================================================
--- trunk/src/target/u-boot/patches/boot-menu.patch 2007-02-26 06:45:06 UTC
(rev 1132)
+++ trunk/src/target/u-boot/patches/boot-menu.patch 2007-02-26 07:24:58 UTC
(rev 1133)
@@ -4,9 +4,12 @@
board/neo1973/neo1973.c (neo1973_on_key_pressed): return 1 if the $POWER key is
pressed
board/neo1973/neo1973.c (board_late_init): make use of neo1973_new_second and
- neo1973_on_key_pressed, call "bootmenu" if AUX is pressed with POWER
-board/neo1973/Makefile: added bootmenu.c
+ neo1973_on_key_pressed
board/neo1973/neo1973.h: added function prototypes
+u-boot/board/neo1973/neo1973.c: removed setting of "nobootdelay"
+u-boot/board/neo1973/neo1973.c (board_late_init): enter the boot menu when
+ "AUX" was pressed at least half the time
+u-boot/board/neo1973/neo1973.c (board_late_init): minor code cleanup
- Werner Almesberger <[EMAIL PROTECTED]>
@@ -14,7 +17,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/bootmenu.c
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,187 @@
+/*
+ * bootmenu.c - Boot menu
+ *
@@ -191,6 +194,8 @@
+ run_command("dynpart", 0);
+ }
+ run_command("bootd", 0);
++ if (!n)
++ return;
+ }
+ else
+ run_command(option_command(n), 0);
@@ -204,28 +209,60 @@
===================================================================
--- u-boot.orig/board/neo1973/neo1973.c
+++ u-boot/board/neo1973/neo1973.c
-@@ -228,14 +228,10 @@ int board_late_init(void)
- nobootdelay = 1;
+@@ -69,7 +69,6 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define U_M_SDIV 0x3
- while (1) {
+ unsigned int neo1973_wakeup_cause;
+-extern int nobootdelay;
+
+ static inline void delay (unsigned long loops)
+ {
+@@ -196,6 +195,7 @@ int board_late_init(void)
+ extern unsigned char booted_from_nand;
+ unsigned char tmp;
+ char buf[32];
++ int menu_vote = 0; /* <= 0: no, > 0: yes */
+
+ /* Initialize the Power Management Unit with a safe register set */
+ pcf50606_init();
+@@ -219,25 +219,18 @@ int board_late_init(void)
+
+ if (tmp & PCF50606_INT1_ONKEYF) {
+ int seconds = 0;
++
+ neo1973_wakeup_cause = NEO1973_WAKEUP_POWER_KEY;
+ /* we've been woken up by a falling edge of the onkey */
+
+- /* we can't just setenv(bootdelay,-1) because that would
+- * accidentially become permanent if the user does saveenv */
+- if (neo1973_911_key_pressed())
+- nobootdelay = 1;
+-
+- while (1) {
- u_int8_t int1, oocs;
-
- oocs = pcf50606_reg_read(PCF50606_REG_OOCS);
- if (oocs & PFC50606_OOCS_ONKEY)
-+ if (!neo1973_on_key_pressed())
- break;
+- break;
++ while (neo1973_on_key_pressed()) {
++ if (neo1973_911_key_pressed())
++ menu_vote++;
++ else
++ menu_vote--;
- int1 = pcf50606_reg_read(PCF50606_REG_INT1);
- if (int1 & PCF50606_INT1_SECOND)
+ if (neo1973_new_second())
seconds++;
-
+-
if (seconds >= POWER_KEY_SECONDS)
-@@ -262,6 +258,11 @@ continue_boot:
+ goto continue_boot;
+ }
+@@ -262,6 +255,11 @@ continue_boot:
/* switch on the backlight */
neo1973_backlight(1);
-+ if (nobootdelay) {
++ if (menu_vote > 0) {
+ bootmenu();
+ neo1973_poweroff();
+ }
@@ -233,7 +270,7 @@
return 0;
}
-@@ -313,6 +314,16 @@ void neo1973_vibrator(int on)
+@@ -313,6 +311,16 @@ void neo1973_vibrator(int on)
gpio->GPBDAT &= ~(1 << 10);
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
