merge of '4e808662b364403781cd4e899198db521c13afc9'

     and '88288139695df3e5cc87ecfe407fbad1d201c362'

85 files changed, 3016 insertions, 11915 deletions

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index d13b9d8270..ce7c97f0cc 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -7,30 +7,16 @@
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
-RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
 PV = "0.1.0"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = " \
   file://asoundrc \
   file://asound.state \
   file://alsa-state "
 
-SRC_URI_append_om-gta01 = " \
-  file://capturehandset.state \
-  file://captureheadset.state \
-  file://gsmbluetooth.state \
-  file://gsmhandset.state \
-  file://gsmheadset.state \
-  file://gsmspeakerout.state \
-  file://stereoout.state \
-  file://voip-handset.state \
-  file://voip-headset.state"
-
-SRC_URI_append_om-gta02 = "\
-  file://stereoout.state \
-  file://gsmhandset.state \
-  "
 
 inherit update-rc.d
 
diff --git a/packages/alsa/alsa-state/om-gta01/asound.state b/packages/alsa/alsa-state/om-gta01/asound.state
deleted file mode 100644
index 26db3cf311..0000000000
--- a/packages/alsa/alsa-state/om-gta01/asound.state
+++ /dev/null
@@ -1,910 +0,0 @@
-state.neo1973 {
-	control.1 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 255'
-		iface MIXER
-		name 'PCM Volume'
-		value.0 230
-		value.1 230
-	}
-	control.2 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 255'
-		iface MIXER
-		name 'ADC Capture Volume'
-		value.0 195
-		value.1 195
-	}
-	control.3 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Headphone Playback Volume'
-		value.0 127
-		value.1 127
-	}
-	control.4 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Speaker Playback Volume'
-		value.0 121
-		value.1 121
-	}
-	control.5 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 127'
-		iface MIXER
-		name 'Mono Playback Volume'
-		value 121
-	}
-	control.6 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Bypass Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.7 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Sidetone Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.8 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Voice Playback Volume'
-		value.0 2
-		value.1 2
-	}
-	control.9 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.10 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.11 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Bypass Playback Volume'
-		value 2
-	}
-	control.12 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Sidetone Playback Volume'
-		value 2
-	}
-	control.13 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Mono Voice Playback Volume'
-		value 2
-	}
-	control.14 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Mono Playback ZC Switch'
-		value false
-	}
-	control.15 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Linear Control'
-		comment.item.1 'Adaptive Boost'
-		iface MIXER
-		name 'Bass Boost'
-		value 'Linear Control'
-	}
-	control.16 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '130Hz @ 48kHz'
-		comment.item.1 '200Hz @ 48kHz'
-		comment.item.2 '100Hz @ 16kHz'
-		comment.item.3 '400Hz @ 48kHz'
-		comment.item.4 '100Hz @ 8kHz'
-		comment.item.5 '200Hz @ 8kHz'
-		iface MIXER
-		name 'Bass Filter'
-		value '130Hz @ 48kHz'
-	}
-	control.17 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'Bass Volume'
-		value 0
-	}
-	control.18 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'Treble Volume'
-		value 7
-	}
-	control.19 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '8kHz'
-		comment.item.1 '4kHz'
-		iface MIXER
-		name 'Treble Cut-off'
-		value '8kHz'
-	}
-	control.20 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Sidetone Capture Volume'
-		value.0 2
-		value.1 2
-	}
-	control.21 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'Voice Sidetone Capture Volume'
-		value 2
-	}
-	control.22 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 2
-		comment.range '0 - 63'
-		iface MIXER
-		name 'Capture Volume'
-		value.0 23
-		value.1 23
-	}
-	control.23 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
-	}
-	control.24 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 2
-		iface MIXER
-		name 'Capture Switch'
-		value.0 false
-		value.1 false
-	}
-	control.25 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '3.4Hz @ 48kHz'
-		comment.item.1 '82Hz @ 16k'
-		comment.item.2 '82Hz @ 8kHz'
-		comment.item.3 '170Hz @ 8kHz'
-		iface MIXER
-		name 'Capture Filter Select'
-		value '3.4Hz @ 48kHz'
-	}
-	control.26 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 HiFi
-		comment.item.1 Voice
-		iface MIXER
-		name 'Capture Filter Cut-off'
-		value HiFi
-	}
-	control.27 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Capture Filter Switch'
-		value true
-	}
-	control.28 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'ALC Capture Target Volume'
-		value 3
-	}
-	control.29 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 7'
-		iface MIXER
-		name 'ALC Capture Max Volume'
-		value 7
-	}
-	control.30 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Off
-		comment.item.1 Right
-		comment.item.2 Left
-		comment.item.3 Stereo
-		iface MIXER
-		name 'ALC Capture Function'
-		value Off
-	}
-	control.31 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Capture ZC Switch'
-		value false
-	}
-	control.32 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Hold Time'
-		value 15
-	}
-	control.33 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Decay Time'
-		value 12
-	}
-	control.34 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name 'ALC Capture Attack Time'
-		value 2
-	}
-	control.35 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 31'
-		iface MIXER
-		name 'ALC Capture NG Threshold'
-		value 0
-	}
-	control.36 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 'Constant PGA Gain'
-		comment.item.1 'Mute ADC Output'
-		iface MIXER
-		name 'ALC Capture NG Type'
-		value 'Constant PGA Gain'
-	}
-	control.37 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'ALC Capture NG Switch'
-		value false
-	}
-	control.38 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 Capture
-		comment.item.1 Playback
-		iface MIXER
-		name '3D Function'
-		value Capture
-	}
-	control.39 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '2.2kHz'
-		comment.item.1 '1.5kHz'
-		iface MIXER
-		name '3D Upper Cut-off'
-		value '2.2kHz'
-	}
-	control.40 {
-		comment.access 'read write'
-		comment.type ENUMERATED
-		comment.count 1
-		comment.item.0 '200Hz'
-		comment.item.1 '500Hz'
-		iface MIXER
-		name '3D Lower Cut-off'
-		value '200Hz'
-	}
-	control.41 {
-		comment.access 'read write'
-		comment.type INTEGER
-		comment.count 1
-		comment.range '0 - 15'
-		iface MIXER
-		name '3D Volume'
-		value 0
-	}
-	control.42 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name '3D Switch'
-		value false
-	}
-	control.43 {
-		comment.access 'read write'
-		comment.type BOOLEAN
-		comment.count 1
-		iface MIXER
-		name 'Capture 6dB Attenuate'
-		value false