diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-08-25 19:43:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-08-25 19:43:54 +0000 |
| commit | cf7c3e4b4071b5fd1b2a2db1d29552802419c9aa (patch) | |
| tree | ef418ec25662e24a6e44d1c757ecb9c6e6854342 | |
| parent | ac8b729e1af278982c713e9317dc2f13ee50d186 (diff) | |
frameworkd git s/CHARGER/USB/ in frameworkd.conf for all machines
Note: CHARGER is slightly incorrect on devices that can act as HOST
and GADGET. Since you don't know whether the USB plug actually leads
to the device being charged, beware of false assumptions. Better check
seperatly.
5 files changed, 6 insertions, 5 deletions
diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf index a619bf1c5a..425267d97b 100644 --- a/packages/freesmartphone/frameworkd/a780/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/a780/frameworkd.conf @@ -5,7 +5,7 @@ version = 1 # keys (copied from Openmoko, need to adjust) report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf index b7e40c0654..c4dadee386 100644 --- a/packages/freesmartphone/frameworkd/magician/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf @@ -7,7 +7,7 @@ version = 1 report1 = AUX,key,212,1 report2 = POWER,key,116,1 # magician doesn't use KEY_POWER2 for the charger, need to fix -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf index c25805b36f..27e624ab0a 100644 --- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf @@ -11,7 +11,7 @@ scenario_dir = /usr/share/openmoko/scenarios # Keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index 45bb12f6a8..6af15c96e3 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -17,7 +17,7 @@ ignoreinput=2,3 # keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 # disable accelerometer since it uses LOADS of CPU resources diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index fa669ced18..52bd54a4f1 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.2+gitr${SRCREV}" -PR = "r2" +PR = "r3" inherit distutils update-rc.d @@ -42,6 +42,7 @@ RRECOMMENDS_${PN} += "\ ppp \ " +# recommend MUXer on platforms that require one RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd" RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd" |