[oe-commits] org.oe.dev merge of '809d7d650e2852bbb5de2df34e3496d61b6c4523'

xora commit oe at amethyst.openembedded.net
Fri Apr 25 15:43:49 UTC 2008


merge of '809d7d650e2852bbb5de2df34e3496d61b6c4523'
     and '8bc85f8f69f20fd71d7fcd635175b375b7708bb8'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 5c982728e5a62f54dc68215741872afd778656a8
ViewMTN: http://monotone.openembedded.org/revision/info/5c982728e5a62f54dc68215741872afd778656a8
Files:
1
conf/distro/include/sane-srcrevs.inc
conf/distro/unslung.conf
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux-openmoko_2.6.24.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/ipkg/files/ipkg_bugfix.patch
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
packages/qtopia-phone
packages/qtopia-phone/files
packages/qtopia-phone/files/fic-gta01
packages/qtopia-phone/files/fic-gta02
packages/qtopia-phone/qtopia-phone-x11
packages/qtopia-phone/qtopia-phone-x11/fic-gta02
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d
packages/images/openmoko-qtopia-image.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/qtopia-phone/files/fic-gta01/device-conf
packages/qtopia-phone/files/fic-gta01/device-conf.old
packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
packages/qtopia-phone/files/fic-gta02/device-conf
packages/qtopia-phone/files/fic-gta02/device-conf.old
packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/qtopia-phone/qtopia-phone.inc
packages/qtopia-phone/qtopia-phone_4.3.0.bb
packages/qtopia-phone/qtopia-phone_4.3.1.bb
packages/qtopia-phone/qtopia-phone_arch.inc
packages/tasks/task-openmoko-qtopia-x11.bb
packages/tasks/task-openmoko-qtopia.bb
classes/sourcepkg.bbclass
packages/alsa/alsa-state.bb
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r809d7d650e2852bbb5de2df34e3496d61b6c4523 -r5c982728e5a62f54dc68215741872afd778656a8
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [eae76e457c389303e93597d7d4217f114ed95ff9]
#    to [5e1b754b03e79d67eb772bebe2af17a037267fa0]
# 
# patch "conf/distro/unslung.conf"
#  from [6e8466f25497e8fbd8b7999239627f13a4cebdc8]
#    to [0ef6d906a67568b77e1f68fc1ac5c65f65586c67]
# 
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
#  from [d45c132200ab0a148cc9c2d04e54ecf0bcf67549]
#    to [781f9c4e4e641f3aa5c5c9123a630e74511798fb]
# 
# patch "packages/linux/linux-openmoko_2.6.24.bb"
#  from [0f56c43fad11545eef657d0595fe6049fec5a575]
#    to [bb54941e8eb21a1af8484d556f6bb01027adbb80]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	eae76e457c389303e93597d7d4217f114ed95ff9
+++ conf/distro/include/sane-srcrevs.inc	5e1b754b03e79d67eb772bebe2af17a037267fa0
@@ -57,7 +57,7 @@ SRCREV_pn-linux-ixp4xx ?= "1039"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4194-r4165"
+SRCREV_pn-linux-openmoko ?= "4194"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
============================================================
--- conf/distro/unslung.conf	6e8466f25497e8fbd8b7999239627f13a4cebdc8
+++ conf/distro/unslung.conf	0ef6d906a67568b77e1f68fc1ac5c65f65586c67
@@ -80,3 +80,6 @@ PREFERRED_VERSION_linux-libc-headers ?= 
 # - mwester 16 Dec 2006
 #
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
+
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
============================================================
--- packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb	d45c132200ab0a148cc9c2d04e54ecf0bcf67549
+++ packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb	781f9c4e4e641f3aa5c5c9123a630e74511798fb
@@ -24,6 +24,7 @@ do_stage() {
 
 do_stage() {
 	cd gdk-pixbuf && oe_runmake install
+	find ${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
 }
 
 do_install() {
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb	0f56c43fad11545eef657d0595fe6049fec5a575
+++ packages/linux/linux-openmoko_2.6.24.bb	bb54941e8eb21a1af8484d556f6bb01027adbb80
@@ -8,20 +8,23 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 # need to synchronize with LOCALVERSION, if set
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-PV = "${VANILLA_VERSION}+svnr${SRCREV}"
-PR = "r3"
+# re-enabled this when feature is fully implemented in OE
+#SRCREV_FORMAT = "patches-rconfig"
+CONFIG_REV = "4165"
 
+PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}"
+PR = "r4"
+
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
 ##############################################################
 # source and patches
 #
-SRCREV_FORMAT = "patches-rconfig"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
-           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config "
+           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;rev=${CONFIG_REV};name=config "
 
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 


#
# mt diff -r8bc85f8f69f20fd71d7fcd635175b375b7708bb8 -r5c982728e5a62f54dc68215741872afd778656a8
#
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
# 
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# 
# delete "packages/gnash/gnash.inc"
# 
# delete "packages/gnash/gnash_0.8.1.bb"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# 
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# 
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# 
# delete "packages/ipkg/files/ipkg_bugfix.patch"
# 
# delete "packages/multitap-pad"
# 
# delete "packages/multitap-pad/files"
# 
# delete "packages/multitap-pad/files/80multitappad"
# 
# delete "packages/multitap-pad/multitap-pad_svn.bb"
# 
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
# 
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
# 
# delete "packages/perl/libwww-perl-native_5.808.bb"
# 
# delete "packages/perl/libwww-perl_5.808.bb"
# 
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# add_dir "packages/multitap-pad"
# 
# add_dir "packages/multitap-pad/files"
# 
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"
# 
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"
# 
# add_dir "packages/qtopia-phone"
# 
# add_dir "packages/qtopia-phone/files"
# 
# add_dir "packages/qtopia-phone/files/fic-gta01"
# 
# add_dir "packages/qtopia-phone/files/fic-gta02"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
# 
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
# 
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
#  content [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
# 
# add_file "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#  content [3db54371d119d26931ec5dc3eacd2f5658fb0982]
# 
# add_file "packages/gnash/gnash.inc"
#  content [66c805eb5cfd0e18a89770e022d4420ee9013566]
# 
# add_file "packages/gnash/gnash_0.8.1.bb"
#  content [50014de2c3904a6950c775be0eda4815399cb573]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#  content [f7d05fac53703548b59b528f752366847140744e]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#  content [47e014d89d9957ea970e01aced2dc553d3722236]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#  content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#  content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
# 
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
# 
# add_file "packages/images/openmoko-qtopia-image.bb"
#  content [85858c01bf04fa98f230120b45029c9ffc41a05c]
# 
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
#  content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
# 
# add_file "packages/multitap-pad/files/80multitappad"
#  content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
# 
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
#  content [8f2b626f58690dd52e509cacab5977c5f52270e2]
# 
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#  content [4e424e0c74d42282c80ac2738e417b8dc7014e80]
# 
# add_file "packages/openmoko-tools/pty-forward-native.bb"
#  content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
# 
# add_file "packages/openmoko-tools/serial-forward.bb"
#  content [32434a87a886be4c262ea2f13af0375bae297e48]
# 
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#  content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
# 
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#  content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
# 
# add_file "packages/perl/libwww-perl-native_5.808.bb"
#  content [66723b8808de2c5758435a88b9640bc8777d89be]
# 
# add_file "packages/perl/libwww-perl_5.808.bb"
#  content [c76a162b7e6844022d4b9826386bfeed71c6328e]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
# 
# add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
# 
# add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
#  content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
#  content [14600d791e31540ce23ce74084b05c424a136b7f]
# 
# add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  content [d410359003086e0e79d452ced03bb87f9747df45]
# 
# add_file "packages/qtopia-phone/qtopia-phone.inc"
#  content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]
# 
# add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
# 
# add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
# 
# add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
#  content [15641411049adbe933692115529c6bac3f43cfef]
# 
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
#  content [38da0e6335542addd488373f6e8cee974a877a58]
# 
# add_file "packages/tasks/task-openmoko-qtopia.bb"
#  content [4367872d7b461db04275d0f119b597e45eb0811b]
# 
# patch "classes/sourcepkg.bbclass"
#  from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
#    to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
#    to [5e1b754b03e79d67eb772bebe2af17a037267fa0]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
#    to [64e43b8b24e43885d00500fd5632f439c9579f8f]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [7212c808e7087d92aab3ce2cda5c8d3ba3ee695b]
#    to [55a8f8ba59b243e3e3dbc006935894e21d721aa6]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	45c4fabe80b7601dd86c45ad8f64a6773594d4e7
+++ conf/distro/include/preferred-om-2008-versions.inc	45c4fabe80b7601dd86c45ad8f64a6773594d4e7
@@ -0,0 +1,15 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.2"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
+PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.9"
+
============================================================
--- packages/alsa/alsa-state/fic-gta02/gsmhandset.state	3db54371d119d26931ec5dc3eacd2f5658fb0982
+++ packages/alsa/alsa-state/fic-gta02/gsmhandset.state	3db54371d119d26931ec5dc3eacd2f5658fb0982
@@ -0,0 +1,885 @@
+state.neo1973gta02 {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'PCM Volume'
+		value.0 235
+		value.1 235
+	}
+	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 0
+		value.1 0
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Speaker Playback Volume'
+		value.0 127
+		value.1 127
+	}
+	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 0
+	}
+	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 true
+		value.1 true
+	}
+	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 false
+	}
+	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 Left
+	}
+	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
+	}
+	control.44 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Playback 6dB Attenuate'
+		value false
+	}
+	control.45 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 None
+		commen%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list