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. r1668 -
trunk/src/target/OM-2007/applications/openmoko-calculator/data
([EMAIL PROTECTED])
2. r1669 -
trunk/src/target/OM-2007/applications/openmoko-rssreader/data
([EMAIL PROTECTED])
3. r1670 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data
([EMAIL PROTECTED])
4. r1671 - in trunk/src/target/OM-2007/examples:
openmoko-finger-demo/data openmoko-stylus-demo/data
openmoko-stylus-demo-simple/data ([EMAIL PROTECTED])
5. r1672 -
trunk/src/target/OM-2007/applications/openmoko-contacts/data
([EMAIL PROTECTED])
6. r1673 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
7. r1674 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-04-06 01:52:19 +0200 (Fri, 06 Apr 2007)
New Revision: 1668
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/data/openmoko-calculator.desktop
Log:
openmoko-calculator: fix icon path in .desktop file (don't add file extensions)
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/data/openmoko-calculator.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-calculator/data/openmoko-calculator.desktop
2007-04-05 23:50:59 UTC (rev 1667)
+++
trunk/src/target/OM-2007/applications/openmoko-calculator/data/openmoko-calculator.desktop
2007-04-05 23:52:19 UTC (rev 1668)
@@ -5,7 +5,7 @@
Version=1.0
Type=Application
Exec=openmoko-calculator
-Icon=openmoko-calculator.png
+Icon=openmoko-calculator
Terminal=false
Categories=GTK;Application;PIM;Office
SingleInstance=true
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-06 02:06:48 +0200 (Fri, 06 Apr 2007)
New Revision: 1669
Added:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.png
Removed:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/RSS.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.desktop
Log:
openmoko-rssreader: change icon name to work around bug in libmatchbox (chokes
on icon names less than 5 characters...)
Deleted: trunk/src/target/OM-2007/applications/openmoko-rssreader/data/RSS.png
===================================================================
(Binary files differ)
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.desktop
2007-04-05 23:52:19 UTC (rev 1668)
+++
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.desktop
2007-04-06 00:06:48 UTC (rev 1669)
@@ -3,7 +3,7 @@
Name=Feed Reader
Comment=Read your favourite RSS feeds
Exec=openmoko-rssreader
-Icon=RSS
+Icon=openmoko-rssreader
Terminal=false
Type=Application
Categories=GTK;Application;PIM;Office
Copied:
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/openmoko-rssreader.png
(from rev 1666,
trunk/src/target/OM-2007/applications/openmoko-rssreader/data/RSS.png)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-06 02:07:23 +0200 (Fri, 06 Apr 2007)
New Revision: 1670
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
Log:
openmoko-mainmenu: typo in Name
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
2007-04-06 00:06:48 UTC (rev 1669)
+++
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/openmoko-mainmenu.desktop
2007-04-06 00:07:23 UTC (rev 1670)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=MainMenu
+Name=Main Menu
Comment=Run Applications
Encoding=UTF-8
Version=1.0
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-06 02:11:28 +0200 (Fri, 06 Apr 2007)
New Revision: 1671
Modified:
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/openmoko-finger-demo.desktop
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/data/openmoko-stylus-demo-simple.desktop
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/data/openmoko-stylus-demo.desktop
Log:
examples: fix icon names in .desktop files
Modified:
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/openmoko-finger-demo.desktop
===================================================================
---
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/openmoko-finger-demo.desktop
2007-04-06 00:07:23 UTC (rev 1670)
+++
trunk/src/target/OM-2007/examples/openmoko-finger-demo/data/openmoko-finger-demo.desktop
2007-04-06 00:11:28 UTC (rev 1671)
@@ -1,11 +1,11 @@
[Desktop Entry]
-Name=OpenMoko Finger Demo
+Name=Finger Demo
Comment=Demonstrates a typical OpenMoko Finger Application
Encoding=UTF-8
Version=1.0
Type=Application
Exec=openmoko-finger-demo
-Icon=openmoko-finger-demo.png
+Icon=openmoko-finger-demo
Terminal=false
SingleInstance=true
StartupNotify=true
Modified:
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/data/openmoko-stylus-demo.desktop
===================================================================
---
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/data/openmoko-stylus-demo.desktop
2007-04-06 00:07:23 UTC (rev 1670)
+++
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/data/openmoko-stylus-demo.desktop
2007-04-06 00:11:28 UTC (rev 1671)
@@ -1,11 +1,11 @@
[Desktop Entry]
-Name=OpenMoko Stylus Demo
+Name=Stylus Demo
Comment=Demonstrates an OpenMoko Stylus Application
Encoding=UTF-8
Version=1.0
Type=Application
Exec=openmoko-stylus-demo
-Icon=openmoko-stylus-demo.png
+Icon=openmoko-stylus-demo
Terminal=false
SingleInstance=true
StartupNotify=true
Modified:
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/data/openmoko-stylus-demo-simple.desktop
===================================================================
---
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/data/openmoko-stylus-demo-simple.desktop
2007-04-06 00:07:23 UTC (rev 1670)
+++
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/data/openmoko-stylus-demo-simple.desktop
2007-04-06 00:11:28 UTC (rev 1671)
@@ -1,11 +1,11 @@
[Desktop Entry]
-Name=OpenMoko Simple Stylus Demo
+Name=Simple Stylus Demo
Comment=Demonstrates a simple OpenMoko Stylus Application
Encoding=UTF-8
Version=1.0
Type=Application
Exec=openmoko-stylus-demo-simple
-Icon=openmoko-stylus-demo-simple.png
+Icon=openmoko-stylus-demo-simple
Terminal=false
SingleInstance=true
StartupNotify=true
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-06 02:17:09 +0200 (Fri, 06 Apr 2007)
New Revision: 1672
Added:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/openmoko-contacts.png
Removed:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/oh-contacts.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-contacts/data/contacts.desktop.in
Log:
openmoko-contacts: change icon file and name
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/data/Makefile.am
2007-04-06 00:11:28 UTC (rev 1671)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/data/Makefile.am
2007-04-06 00:17:09 UTC (rev 1672)
@@ -6,7 +6,7 @@
@INTLTOOL_DESKTOP_RULE@
icondir = $(datadir)/pixmaps/
-icon_DATA = oh-contacts.png
+icon_DATA = openmoko-contacts.png
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = contacts.schemas
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/contacts.desktop.in
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/data/contacts.desktop.in
2007-04-06 00:11:28 UTC (rev 1671)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/data/contacts.desktop.in
2007-04-06 00:17:09 UTC (rev 1672)
@@ -3,7 +3,7 @@
_Name=Contacts
_Comment=Address book
Exec=contacts
-Icon=oh-contacts
+Icon=openmoko-contacts
Terminal=false
Type=Application
Categories=GTK;Application;PIM;Office;ContactManagement;
Deleted:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/oh-contacts.png
===================================================================
(Binary files differ)
Added:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/openmoko-contacts.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-contacts/data/openmoko-contacts.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-04-06 08:22:10 +0200 (Fri, 06 Apr 2007)
New Revision: 1673
Modified:
trunk/src/host/qemu-neo1973/hw/s3c2410.c
Log:
Send MODEM_HANDSHAKE ioctl when AFC is enabled for an uart.
Modified: trunk/src/host/qemu-neo1973/hw/s3c2410.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-04-06 00:17:09 UTC (rev
1672)
+++ trunk/src/host/qemu-neo1973/hw/s3c2410.c 2007-04-06 06:22:10 UTC (rev
1673)
@@ -1264,7 +1264,7 @@
if ((s->mcontrol ^ value) & (1 << 4)) {
afc = (value >> 4) & 1;
for (i = 0; i < s->chr_num; i ++)
- qemu_chr_ioctl(s->chr[i], CHR_IOCTL_MODEM_SET_AFC, &afc);
+ qemu_chr_ioctl(s->chr[i], CHR_IOCTL_MODEM_HANDSHAKE, &afc);
}
s->mcontrol = value & 0x11;
break;
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-04-06 08:45:03 +0200 (Fri, 06 Apr 2007)
New Revision: 1674
Modified:
trunk/src/host/qemu-neo1973/openmoko/flash.sh
Log:
Merge changes from MokoMakefile (Rod Whitby) - fix the flash.sh parameter.
Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-04-06 06:22:10 UTC
(rev 1673)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-04-06 06:45:03 UTC
(rev 1674)
@@ -24,7 +24,7 @@
. openmoko/env
if [[ "$1" != "" ]]; then
- img_dir="$1"
+ img_dir="`(cd \"$1\"; pwd)`"
else
img_dir="$script_dir"
fi
@@ -44,8 +44,9 @@
most_recent () {
cd $src_dir
export $2="`basename \`ls -d -1 $img_dir/$1 | sort | tail -n 1\``"
+ export $3="`python -c \"print hex(\`stat -c %s $img_dir/${!2}\`)\"`"
cd $script_dir
- export $3="`python -c \"print hex(\`stat -c %s ${!2}\`)\"`"
+ [ -e "${!2}" ] || ln -sf $img_dir/${!2} ${!2}
[ -n "${!3}" ]
}
@@ -111,11 +112,15 @@
uboot $rootfs_image 20 "
nand write.jffs2 $kernel_addr rootfs $rootfs_size"
+# Make the kernel image accessible under a fixed name
+rm -rf openmoko-kernel.bin
+ln -s $kernel_image openmoko-kernel.bin
+
echo
echo " "All done.
echo
echo " "Read the qemu manual and use a commandline like the following to
boot:
-echo \ \$ $qemu_relative -mtdblock $script_dir_relative/$flash_image -kernel
$script_dir_relative/$kernel_image -usb -show-cursor
+echo \ \$ $qemu_relative -mtdblock $script_dir_relative/$flash_image -kernel
$script_dir_relative/openmoko-kernel.bin -usb -show-cursor
echo
echo " "Append \'-snapshot\' to make the flash image read-only so that every
echo " "time emulation starts in the original unmodified state.
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
