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.

diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf
index a619bf1c5a2c0cf17eb5a4cfd1d8a03acd71ef20..425267d97b58646111dc506d150e3dbc00b80e1e 100644 (file)
--- 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 b7e40c0654502161a62cc751a999013df9eb8961..c4dadee386b387fd30949da30930000823011cb5 100644 (file)
--- 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 c25805b36f85cb72b02eff5070c56c600cf91191..27e624ab0a78aecb7d0ab8210206d17dae0b24bf 100644 (file)
--- 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 45bb12f6a8b047827affdf44ac84fef31f8018e0..6af15c96e3e0ffa5639ba178f4d0694a40649f39 100644 (file)
--- 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 fa669ced188d216f2d18e62dd25f494c0f0bbd1b..52bd54a4f1bb82a3dc661b44598f645974d7de1f 100644 (file)
--- 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"