neod: make it work with magician and hx4700

diff --git a/packages/openmoko2/neod/.mtn2git_empty b/packages/openmoko2/neod/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/openmoko2/neod/htc.patch b/packages/openmoko2/neod/htc.patch
new file mode 100644 (file)
index 0000000..0ced894
--- /dev/null
+++ b/packages/openmoko2/neod/htc.patch
@@ -0,0 +1,32 @@
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac     2007-09-15 23:01:30.000000000 +0200
++++ neod/configure.ac  2007-09-15 23:02:01.000000000 +0200
+@@ -32,6 +32,10 @@
+         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
+ fi
+ 
++if test x"$neod_platform" = x"htc"; then
++      NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c      2007-09-15 23:02:15.000000000 +0200
++++ neod/src/buttonactions.c   2007-09-15 23:04:16.000000000 +0200
+@@ -63,6 +63,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_HTC
++    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
++    #define POWER_BUTTON_KEYCODE 0x74 /* power */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];

diff --git a/packages/openmoko2/neod/ipaq.patch b/packages/openmoko2/neod/ipaq.patch
new file mode 100644 (file)
index 0000000..19b61ab
--- /dev/null
+++ b/packages/openmoko2/neod/ipaq.patch
@@ -0,0 +1,32 @@
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c      2007-09-29 17:24:43.000000000 +0200
++++ neod/src/buttonactions.c   2007-09-29 17:24:49.000000000 +0200
+@@ -69,6 +69,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_IPAQ
++    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
++    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac     2007-09-29 17:25:12.000000000 +0200
++++ neod/configure.ac  2007-09-29 17:25:48.000000000 +0200
+@@ -36,6 +36,10 @@
+       NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
+ fi
+ 
++if test x"$neod_platform" = x"ipaq"; then
++      NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([

diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index b382fc2..6e6c3b6 100644 (file)
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -2,10 +2,13 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
 SECTION = "openmoko/daemons"
 DEPENDS = "gconf gtk+ pulseaudio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2 gconf
 
+SRC_URI += "file://htc.patch;patch=1 \
+            file://ipaq.patch;patch=1"
+
 EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973"
 EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973"
 EXTRA_OECONF_a780      = "--with-platform=ezx"
@@ -13,6 +16,8 @@ EXTRA_OECONF_a1200     = "--with-platform=ezx"
 EXTRA_OECONF_e680      = "--with-platform=ezx"
 EXTRA_OECONF_rokre2    = "--with-platform=ezx"
 EXTRA_OECONF_rokre6    = "--with-platform=ezx"
+EXTRA_OECONF_magician  = "--with-platform=htc"
+EXTRA_OECONF_hx4700    = "--with-platform=ipaq"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"