[oe-commits] org.oe.dev frameworkd git s/CHARGER/USB/ in frameworkd.conf for all machines

[mickeyl commit]

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.

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b74bbaef312bef5b91193f9733ecea39b3427e18
ViewMTN: http://monotone.openembedded.org/revision/info/b74bbaef312bef5b91193f9733ecea39b3427e18
Files:
1
packages/freesmartphone/frameworkd/a780/frameworkd.conf
packages/freesmartphone/frameworkd/magician/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
Diffs:

#
# mt diff -r408b4adfcf574e5dde89cbf9737509e9494e4561 -rb74bbaef312bef5b91193f9733ecea39b3427e18
#
#
#
# patch "packages/freesmartphone/frameworkd/a780/frameworkd.conf"
#  from [2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee]
#    to [6e46480377b7fc9d31744bd843d0faad8f65a263]
# 
# patch "packages/freesmartphone/frameworkd/magician/frameworkd.conf"
#  from [6c951b8c68fd4a7515677bb251edcee52648e04c]
#    to [e46d0710524363feaa49d4dd8244cdf7d45ba5f8]
# 
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
#  from [b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6]
#    to [040c6fdc058edc68dbc8e89ed4c5522bafe23e72]
# 
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
#  from [a0b3e8d263d2f7a745291efc50eab5ddafea8d8c]
#    to [45fb306e7266afa152e0e9f376c64d1b36b6f86d]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [fb0260924225b0c8aa28c4ec9290819c11e7f543]
#    to [94282092330a8a0df7d9b488b224bda765e10cc9]
#
============================================================
--- packages/freesmartphone/frameworkd/a780/frameworkd.conf	2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee
+++ packages/freesmartphone/frameworkd/a780/frameworkd.conf	6e46480377b7fc9d31744bd843d0faad8f65a263
@@ -5,7 +5,7 @@ report2 = POWER,key,116,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]
============================================================
--- packages/freesmartphone/frameworkd/magician/frameworkd.conf	6c951b8c68fd4a7515677bb251edcee52648e04c
+++ packages/freesmartphone/frameworkd/magician/frameworkd.conf	e46d0710524363feaa49d4dd8244cdf7d45ba5f8
@@ -7,7 +7,7 @@ report2 = POWER,key,116,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]
============================================================
--- packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6
+++ packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	040c6fdc058edc68dbc8e89ed4c5522bafe23e72
@@ -11,7 +11,7 @@ report2 = POWER,key,116,1
 # 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]
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	a0b3e8d263d2f7a745291efc50eab5ddafea8d8c
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	45fb306e7266afa152e0e9f376c64d1b36b6f86d
@@ -17,7 +17,7 @@ report2 = POWER,key,116,1
 # 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
============================================================
--- packages/freesmartphone/frameworkd_git.bb	fb0260924225b0c8aa28c4ec9290819c11e7f543
+++ packages/freesmartphone/frameworkd_git.bb	94282092330a8a0df7d9b488b224bda765e10cc9
@@ -5,7 +5,7 @@ PV = "0.8.2+gitr${SRCREV}"
 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"