[oe-commits] org.oe.dev neod: make it work with magician and hx4700

[pH5 commit]

neod: make it work with magician and hx4700

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 8621de58003001e97296c882e71ab2ed9d466517
ViewMTN: http://monotone.openembedded.org/revision/info/8621de58003001e97296c882e71ab2ed9d466517
Files:
1
packages/openmoko2/neod
packages/openmoko2/neod/htc.patch
packages/openmoko2/neod/ipaq.patch
packages/openmoko2/neod_svn.bb
Diffs:

#
# mt diff -rcd21d75cfff033056e3acacea8568fdabac30742 -r8621de58003001e97296c882e71ab2ed9d466517
#
# 
# 
# add_dir "packages/openmoko2/neod"
# 
# add_file "packages/openmoko2/neod/htc.patch"
#  content [4718f3deec21ab373dfe51bf397890378437f016]
# 
# add_file "packages/openmoko2/neod/ipaq.patch"
#  content [c65a5ebec8071c701a07bd188b3b648d09931b43]
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [32bcbfdb1bfd2e330587154170f145bde2539594]
#    to [f1fe97ee6b1cc7b7c94b1a684ba17a7919070242]
# 
============================================================
--- packages/openmoko2/neod/htc.patch	4718f3deec21ab373dfe51bf397890378437f016
+++ packages/openmoko2/neod/htc.patch	4718f3deec21ab373dfe51bf397890378437f016
@@ -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];
============================================================
--- packages/openmoko2/neod/ipaq.patch	c65a5ebec8071c701a07bd188b3b648d09931b43
+++ packages/openmoko2/neod/ipaq.patch	c65a5ebec8071c701a07bd188b3b648d09931b43
@@ -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([
============================================================
--- packages/openmoko2/neod_svn.bb	32bcbfdb1bfd2e330587154170f145bde2539594
+++ packages/openmoko2/neod_svn.bb	f1fe97ee6b1cc7b7c94b1a684ba17a7919070242
@@ -1,11 +1,14 @@ PV = "0.1.0+svn${SVNREV}"
 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_rokre6    = "--with-platfor
 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}"