[oe-commits] org.oe.oz354x zaurusd: Unb0rk last cset

[coredump commit]

zaurusd: Unb0rk last cset

Author: coredump at openembedded.org
Branch: org.openembedded.oz354x
Revision: 165d86fabc82365edb04456330bd3036fe44b9b7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=165d86fabc82365edb04456330bd3036fe44b9b7
Files:
1
packages/zaurusd/files/poodle-asound.state.patch
packages/zaurusd/zaurusd_svn.bb
Diffs:

#
# mt diff -r53a14a7aca3b02d54ff26c2cb5b31975697a8dd3 -r165d86fabc82365edb04456330bd3036fe44b9b7
#
# 
# 
# patch "packages/zaurusd/files/poodle-asound.state.patch"
#  from [389968f0ffc12d7f65460b88d07fce6271b33de8]
#    to [b208ec252118bb3d09b7bc88027d8d1612f7963f]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [cf489699d3bdfa958785918ff9530cbbf4924d96]
#    to [367ef4a321a2f055a8f95df5996952eef210aba1]
# 
============================================================
--- packages/zaurusd/files/poodle-asound.state.patch	389968f0ffc12d7f65460b88d07fce6271b33de8
+++ packages/zaurusd/files/poodle-asound.state.patch	b208ec252118bb3d09b7bc88027d8d1612f7963f
@@ -1,28 +1,153 @@
---- zaurusd/config/alsa/5600-default.state.orig	2006-11-27 21:20:53.992954093 +0100
+--- zaurusd/config/alsa/5600-default.state.orig	2006-10-15 01:37:02.000000000 +0200
 +++ zaurusd/config/alsa/5600-default.state	2006-11-27 21:17:21.000000000 +0100
-@@ -155,7 +155,7 @@
- 		comment.count 2
- 		comment.range '0 - 127'
- 		iface MIXER
--		name 'Playback Volume'
+@@ -148,3 +148,150 @@
+ 		value On
+ 	}
+ }
++state.Poodle {
++	control.1 {
++		comment.access 'read write'
++		comment.type INTEGER
++		comment.count 2
++		comment.range '0 - 127'
++		iface MIXER
 +		name 'Master Playback Volume'
- 		value.0 121
- 		value.1 121
- 	}
-@@ -164,7 +164,7 @@
- 		comment.type BOOLEAN
- 		comment.count 2
- 		iface MIXER
--		name 'Playback ZC Switch'
++		value.0 121
++		value.1 121
++	}
++	control.2 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 2
++		iface MIXER
 +		name 'Master Playback ZC Switch'
- 		value.0 false
- 		value.1 false
- 	}
-@@ -292,6 +292,6 @@
- 		comment.item.1 On
- 		iface MIXER
- 		name 'Speaker Function'
--		value Off
++		value.0 false
++		value.1 false
++	}
++	control.3 {
++		comment.access 'read write'
++		comment.type INTEGER
++		comment.count 2
++		comment.range '0 - 31'
++		iface MIXER
++		name 'Capture Volume'
++		value.0 23
++		value.1 23
++	}
++	control.4 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 2
++		iface MIXER
++		name 'Line Capture Switch'
++		value.0 false
++		value.1 false
++	}
++	control.5 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Mic Boost (+20dB)'
++		value false
++	}
++	control.6 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Capture Mic Switch'
++		value false
++	}
++	control.7 {
++		comment.access 'read write'
++		comment.type INTEGER
++		comment.count 1
++		comment.range '0 - 3'
++		iface MIXER
++		name 'Sidetone Playback Volume'
++		value 3
++	}
++	control.8 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'ADC High Pass Filter Switch'
++		value true
++	}
++	control.9 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Store DC Offset Switch'
++		value false
++	}
++	control.10 {
++		comment.access 'read write'
++		comment.type ENUMERATED
++		comment.count 1
++		comment.item.0 None
++		comment.item.1 '32Khz'
++		comment.item.2 '44.1Khz'
++		comment.item.3 '48Khz'
++		iface MIXER
++		name 'Playback De-emphasis'
++		value None
++	}
++	control.11 {
++		comment.access 'read write'
++		comment.type ENUMERATED
++		comment.count 1
++		comment.item.0 'Line In'
++		comment.item.1 Mic
++		iface MIXER
++		name 'Input Mux'
++		value 'Line In'
++	}
++	control.12 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Output Mixer Line Bypass Switch'
++		value true
++	}
++	control.13 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Output Mixer Mic Sidetone Switc'
++		value false
++	}
++	control.14 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Output Mixer HiFi Playback Swit'
++		value true
++	}
++	control.15 {
++		comment.access 'read write'
++		comment.type ENUMERATED
++		comment.count 1
++		comment.item.0 Off
++		comment.item.1 Headphone
++		iface MIXER
++		name 'Jack Function'
++		value Headphone
++	}
++	control.16 {
++		comment.access 'read write'
++		comment.type ENUMERATED
++		comment.count 1
++		comment.item.0 Off
++		comment.item.1 On
++		iface MIXER
++		name 'Speaker Function'
 +		value On
++	}
++}
- 	}
- }
============================================================
--- packages/zaurusd/zaurusd_svn.bb	cf489699d3bdfa958785918ff9530cbbf4924d96
+++ packages/zaurusd/zaurusd_svn.bb	367ef4a321a2f055a8f95df5996952eef210aba1
@@ -1,10 +1,10 @@ PV = "0.0+svn${CVSDATE}"
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 MAINTAINER = "Richard Purdie <rpurdie at openedhand.com>"
 LICENSE = "GPL"
 DEPENDS = "tslib"
 PV = "0.0+svn${CVSDATE}"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \