[oe-commits] org.oe.dev merge of '994032a8e47f2490d414cd449885b6d0c16271f6'

rwhitby commit openembedded-commits at lists.openembedded.org
Mon Sep 24 09:17:56 UTC 2007


merge of '994032a8e47f2490d414cd449885b6d0c16271f6'
     and 'b2924f326d269c30e7221e36215ef1bf3a7f16ef'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e4d75b274d0d0e865c3387c7fffdc927c195383a
ViewMTN: http://monotone.openembedded.org/revision/info/e4d75b274d0d0e865c3387c7fffdc927c195383a
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
packages/gnome/libwnck_2.10.2.bb
packages/gnome/libwnck_2.12.1.bb
packages/gnome/libwnck_2.8.1.bb
packages/links/links-x11_2.0+2.1pre26.bb
packages/links/links-x11_2.0+2.1pre30.bb
packages/links/links_2.0+2.1pre26.bb
packages/links/links_2.0+2.1pre30.bb
packages/alsa/alsa-state/akita
packages/libglade/libglade-2.6.2
packages/navit
packages/navit/files
packages/alsa/alsa-fpu.inc
packages/alsa/alsa-state/akita/asound.state
packages/bluez/bluez-cups-backend_3.18.bb
packages/bluez/bluez-cups-backend_3.19.bb
packages/bluez/bluez-libs_3.18.bb
packages/bluez/bluez-libs_3.19.bb
packages/bluez/bluez-utils-alsa_3.18.bb
packages/bluez/bluez-utils-alsa_3.19.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.18.bb
packages/bluez/bluez-utils_3.19.bb
packages/libetpan/libetpan_0.52.bb
packages/libglade/libglade-2.6.2/glade-cruft.patch
packages/libglade/libglade-2.6.2/no-xml2.patch
packages/libglade/libglade_2.6.2.bb
packages/linux/linux-openmoko-devel/printascii.patch
packages/linux/linux-openmoko-devel/squashfs.patch
packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch
packages/navit/files/compile-fix.patch
packages/navit/navit_0.0.1.bb
packages/openmoko2/openmoko-browser2_svn.bb
packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch
packages/poppler/poppler_0.6.bb
packages/python/python-pybluez_0.13.bb
packages/sylpheed/claws-mail_3.0.1.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/include/gumstix.inc
conf/machine/omap5912osk.conf
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-state/c7x0/asound.state
packages/alsa/alsa-state.bb
packages/gnome/epiphany_2.19.6.bb
packages/gnome/libwnck_2.13.5.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/linux/linux-openmoko-devel/defconfig
packages/linux/linux-openmoko-devel_svn.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/pkgconfig/pkgconfig.inc
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
Diffs:

#
# mt diff -r994032a8e47f2490d414cd449885b6d0c16271f6 -re4d75b274d0d0e865c3387c7fffdc927c195383a
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [738a66a4cd05dd74381dce0949ddcd547be2497f]
#    to [3e624519aa3c29fb9c243930483b6363f1b191b9]
# 
# patch "packages/redboot-utils/fis_1.0.bb"
#  from [423fde1a30e871e390b48542349b88efb3a07ac9]
#    to [16fa3c9f589d8b24e84de8555dad50affd97b735]
# 
============================================================
--- packages/meta/slugos-packages.bb	738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb	3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils \
+	bluez-hcidump \
 	bogofilter \
 	boost \
 	bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb	423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb	16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
 
 export CFLAGS += "--std=c99"


#
# mt diff -rb2924f326d269c30e7221e36215ef1bf3a7f16ef -re4d75b274d0d0e865c3387c7fffdc927c195383a
#
# 
# 
# delete "packages/gnome/libwnck_2.10.2.bb"
# 
# delete "packages/gnome/libwnck_2.12.1.bb"
# 
# delete "packages/gnome/libwnck_2.8.1.bb"
# 
# rename "packages/links/links-x11_2.0+2.1pre26.bb"
#     to "packages/links/links-x11_2.0+2.1pre30.bb"
# 
# rename "packages/links/links_2.0+2.1pre26.bb"
#     to "packages/links/links_2.0+2.1pre30.bb"
# 
# add_dir "packages/alsa/alsa-state/akita"
# 
# add_dir "packages/libglade/libglade-2.6.2"
# 
# add_dir "packages/navit"
# 
# add_dir "packages/navit/files"
# 
# add_file "packages/alsa/alsa-fpu.inc"
#  content [45095284a3c8495d92d991a7651f06d033e745ea]
# 
# add_file "packages/alsa/alsa-state/akita/asound.state"
#  content [799c8bd0c2ed692f4558b6e6803920404254941a]
# 
# add_file "packages/bluez/bluez-cups-backend_3.18.bb"
#  content [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
# 
# add_file "packages/bluez/bluez-cups-backend_3.19.bb"
#  content [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
# 
# add_file "packages/bluez/bluez-libs_3.18.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/bluez/bluez-libs_3.19.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/bluez/bluez-utils-alsa_3.18.bb"
#  content [b7eb82c734b71cf61ac35a052d87da836df665d4]
# 
# add_file "packages/bluez/bluez-utils-alsa_3.19.bb"
#  content [b7eb82c734b71cf61ac35a052d87da836df665d4]
# 
# add_file "packages/bluez/bluez-utils3.inc"
#  content [4cf020b7c86ff55af20fb6a730f55fb32a810135]
# 
# add_file "packages/bluez/bluez-utils_3.18.bb"
#  content [6eab1b4ae54ca017408988788320c718efedc784]
# 
# add_file "packages/bluez/bluez-utils_3.19.bb"
#  content [6eab1b4ae54ca017408988788320c718efedc784]
# 
# add_file "packages/libetpan/libetpan_0.52.bb"
#  content [455fd8eb22cb52da26c972bbf23b2c0a5d54aea0]
# 
# add_file "packages/libglade/libglade-2.6.2/glade-cruft.patch"
#  content [02c3a7595f694f856ad78fc05b0341442160eba6]
# 
# add_file "packages/libglade/libglade-2.6.2/no-xml2.patch"
#  content [b326c74aa96570d70054c908adef2fea757cfb64]
# 
# add_file "packages/libglade/libglade_2.6.2.bb"
#  content [d94670ece5e8b9e8e3e0ba00b7744b565be182af]
# 
# add_file "packages/linux/linux-openmoko-devel/printascii.patch"
#  content [e7cfe3969d58b5690e047b0ce584a1b841f2b494]
# 
# add_file "packages/linux/linux-openmoko-devel/squashfs.patch"
#  content [f02adcc4dcc701eebc77fc31e6cb8a4ed17a7906]
# 
# add_file "packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch"
#  content [d136e98d1e89f12fec85b8f247c99a11530c5a16]
# 
# add_file "packages/navit/files/compile-fix.patch"
#  content [ee38dc11495544297652a79f769be7bed51b215d]
# 
# add_file "packages/navit/navit_0.0.1.bb"
#  content [96acdd2c7dd3d5a55f11159d0020d7d95d8392b7]
# 
# add_file "packages/openmoko2/openmoko-browser2_svn.bb"
#  content [c515dc949cdc66a24a754064948a0a2af35ddea4]
# 
# add_file "packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch"
#  content [d81ad979dfb003512eb32bfc73d71e68d07159fb]
# 
# add_file "packages/poppler/poppler_0.6.bb"
#  content [5051018c95108165af0a9b9d2a66681132cac581]
# 
# add_file "packages/python/python-pybluez_0.13.bb"
#  content [60012840998016cae9ffcf6abb2b1448fc898c8f]
# 
# add_file "packages/sylpheed/claws-mail_3.0.1.bb"
#  content [2b9c8d5e2a719ef32b55b66d6c5385b2108d35bb]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [7ab3e4a626dd86961455dfee876c957f998cfb14]
#    to [cb196173c3a1b600e59b8b160c7290b856d0faa5]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [a04da90ce000626924fee314bf3b57e19ad0d4c8]
#    to [bb0d6348c54d13071b292eabc79c21b87ad68708]
# 
# patch "conf/machine/include/gumstix.inc"
#  from [a9b8b761a9a47e6df416c842987c359d772d4580]
#    to [917537468325dc5643453f037aad76fbeb9bb147]
# 
# patch "conf/machine/omap5912osk.conf"
#  from [f0942949911d73f57760fb48a9469e67db0154ef]
#    to [e1b832be81c4577a78b18536406e78bab2ffa518]
# 
# patch "packages/alsa/alsa-lib_1.0.14.bb"
#  from [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
#    to [ec18e1786e732df88269f903aa646f5b8d1fc5e0]
# 
# patch "packages/alsa/alsa-state/c7x0/asound.state"
#  from [3a47c899cf3efa3d3a425936383fcf5da59476b0]
#    to [95f37176e753dfc75b69c3360f4f163af24062fc]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [69fceb77079fc74157e916309a95f6d27dc0998e]
#    to [87b0604266eaf34469b6a192b574a846d8b290d5]
# 
# patch "packages/gnome/epiphany_2.19.6.bb"
#  from [ef9504844f21d0471510539c90b701bc53554771]
#    to [77e6f8b09f3aef06dc17ffec1072c16e0554132b]
# 
# patch "packages/gnome/libwnck_2.13.5.bb"
#  from [e27ae70e709683b3a8e98a233980cfbd9dce7543]
#    to [5a389262f2f82c0a1df0911dc237ff1497323bca]
# 
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
#  from [6b749d9ef772b8e60588711e9d902b4292a7e84b]
#    to [3c5317edbfb2de05bfdcc53497f5a76d49e833db]
# 
# patch "packages/gtk+/gtk+.inc"
#  from [ffdca8e93dd38acb3bb2afdd28ab143a8438af91]
#    to [96ca94f87b25f43f0517b4454a035d2d1c5e107c]
# 
# patch "packages/gtk+/gtk+_2.12.0.bb"
#  from [4b06154f496fb45640853f54b964720268a461de]
#    to [08e63663afbf9b3a26edfaf43148e2e60683e7df]
# 
# patch "packages/linux/linux-openmoko-devel/defconfig"
#  from [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
#    to [5006da7a604a90f24c0dd8a2e8506dbbd8cbdcbe]
# 
# patch "packages/linux/linux-openmoko-devel_svn.bb"
#  from [0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f]
#    to [aa4cafaa0349ca6de84aa37d4653ee0925325284]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [c83b2518da5c8c31d03ed19d8aed54afa6d26d38]
#    to [9a0b682073222bc2809e001ffe275c358bde77ed]
# 
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
#  from [d2d7385073d2de3086a6fc7137fa76d25390a2c1]
#    to [2bbb752f84f5cd5d332df9a98b5ab1922ccc2320]
# 
# patch "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
#  from [bfa0e09f44be1950d51c8251ab99fdf9fce69bea]
#    to [8d7ac8b5a6221ab35c4c0a274a2edef6f114e8a9]
# 
# patch "packages/pkgconfig/pkgconfig.inc"
#  from [4721122cb57ad9aec15fca1982b594f2e74d5e95]
#    to [9605cd8789e993b3b4b021d69e0e9ee94821a5a5]
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [b42ad01a57090bd2d30d7aab77b4aa9e3607b31c]
#    to [d3999509e6f8e1b8cbcd12aafad259da103400de]
# 
# patch "packages/uboot/uboot-openmoko_svn.bb"
#  from [a9daac10326cc7c8c5b0dfea1c25a605b5855bc9]
#    to [32f83f5ac25253fffe2da4176c4bce6897bd83a1]
# 
============================================================
--- packages/alsa/alsa-fpu.inc	45095284a3c8495d92d991a7651f06d033e745ea
+++ packages/alsa/alsa-fpu.inc	45095284a3c8495d92d991a7651f06d033e745ea
@@ -0,0 +1,6 @@
+
+def get_alsa_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--with-softfloat"
+	return ""
+
============================================================
--- packages/alsa/alsa-state/akita/asound.state	799c8bd0c2ed692f4558b6e6803920404254941a
+++ packages/alsa/alsa-state/akita/asound.state	799c8bd0c2ed692f4558b6e6803920404254941a
@@ -0,0 +1,619 @@
+state.Spitz {
+	control.1 {
+		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.2 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture ZC Switch'
+		value.0 false
+		value.1 false
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture Switch'
+		value.0 false
+		value.1 false
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Headphone Playback ZC Switch'
+		value.0 false
+		value.1 false
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Speaker Playback ZC Switch'
+		value.0 false
+		value.1 false
+	}
+	control.6 {
+		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.7 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Normal
+		comment.item.1 'L Invert'
+		comment.item.2 'R Invert'
+		comment.item.3 'L + R Invert'
+		iface MIXER
+		name 'Capture Polarity'
+		value Normal
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Playback 6dB Attenuate'
+		value false
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Capture 6dB Attenuate'
+		value false
+	}
+	control.10 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'PCM Volume'
+		value.0 255
+		value.1 255
+	}
+	control.11 {
+		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.12 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 '130Hz @ 48kHz'
+		comment.item.1 '200Hz @ 48kHz'
+		iface MIXER
+		name 'Bass Filter'
+		value '130Hz @ 48kHz'
+	}
+	control.13 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'Bass Volume'
+		value 11
+	}
+	control.14 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'Treble Volume'
+		value 11
+	}
+	control.15 {
+		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.16 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name '3D Switch'
+		value false
+	}
+	control.17 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name '3D Volume'
+		value 9
+	}
+	control.18 {
+		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.19 {
+		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.20 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Capture
+		comment.item.1 Playback
+		iface MIXER
+		name '3D Mode'
+		value Playback
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 7'
+		iface MIXER
+		name 'ALC Capture Target Volume'
+		value 3
+	}
+	control.22 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 7'
+		iface MIXER
+		name 'ALC Capture Max Volume'
+		value 7
+	}
+	control.23 {
+		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.24 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'ALC Capture ZC Switch'
+		value false
+	}
+	control.25 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'ALC Capture Hold Time'
+		value 0
+	}
+	control.26 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'ALC Capture Decay Time'
+		value 3
+	}
+	control.27 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'ALC Capture Attack Time'
+		value 2
+	}
+	control.28 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		iface MIXER
+		name 'ALC Capture NG Threshold'
+		value 0
+	}
+	control.29 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 '2.2kHz'
+		comment.item.1 '1.5kHz'
+		iface MIXER
+		name 'ALC Capture NG Type'
+		value '2.2kHz'
+	}
+	control.30 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'ALC Capture NG Switch'
+		value false
+	}
+	control.31 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Left ADC Capture Volume'
+		value 195
+	}
+	control.32 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Right ADC Capture Volume'
+		value 0
+	}
+	control.33 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'ZC Timeout Switch'
+		value false
+	}
+	control.34 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Playback Invert Switch'
+		value false
+	}
+	control.35 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Right Speaker Playback Invert Switch'
+		value true
+	}
+	control.36 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 3'
+		iface MIXER
+		name 'Mic Boost'
+		value.0 0
+		value.1 0
+	}
+	control.37 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 7'
+		iface MIXER
+		name 'Bypass Left Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.38 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 7'
+		iface MIXER
+		name 'Bypass Right Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.39 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 7'
+		iface MIXER
+		name 'Bypass Mono Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.40 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mono Playback ZC Switch'
+		value false
+	}
+	control.41 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Headphone Playback Volume'
+		value.0 121
+		value.1 121
+	}
+	control.42 {
+		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.43 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Mono Playback Volume'
+		value 0
+	}
+	control.44 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Stereo
+		comment.item.1 'Mono (Left)'
+		comment.item.2 'Mono (Right)'
+		comment.item.3 'Digital Mono'
+		iface MIXER
+		name 'Right ADC Mux'
+		value 'Mono (Left)'
+	}
+	control.45 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Stereo
+		comment.item.1 'Mono (Left)'
+		comment.item.2 'Mono (Right)'
+		comment.item.3 'Digital Mono'
+		iface MIXER
+		name 'Left ADC Mux'
+		value 'Mono (Left)'
+	}
+	control.46 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 'Line 1'
+		comment.item.1 'Line 2'
+		iface MIXER
+		name 'Differential Mux'
+		value 'Line 1'
+	}
+	control.47 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 VREF
+		comment.item.1 'ROUT1 + Vol'
+		comment.item.2 MonoOut
+		comment.item.3 ROUT1
+		iface MIXER
+		name 'Out3 Mux'
+		value VREF
+	}
+	control.48 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 'Line 1'
+		comment.item.1 'Line 2'
+		comment.item.2 'Line 3'
+		comment.item.3 PGA
+		comment.item.4 Differential
+		iface MIXER
+		name 'Right Line Mux'
+		value 'Line 2'
+	}
+	control.49 {
+		comm%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list