merge of '49e39c42b944dda8eed607394e1849029b9f527f'

     and 'fbf7570478d5954f66dbaa425a8b6b1c8c1b862c'

15 files changed, 970 insertions, 49 deletions

diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index 23bdfaf64b..07040562dd 100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
@@ -3,10 +3,10 @@ SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \
-	    ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \
+	    ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \
 	   file://atftpd.init"
 S = "${WORKDIR}/atftp-${PV}"
 
diff --git a/packages/git/git.inc b/packages/git/git.inc
index 7115d44b35..3a80c5d950 100644
--- a/packages/git/git.inc
+++ b/packages/git/git.inc
@@ -3,7 +3,9 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1"
+           file://autotools.patch;patch=1 \
+           file://git-gui-install-mode-arg-spaces.patch;patch=1 \
+	   "
 S = "${WORKDIR}/git-${PV}"
 
 EXTRA_OEMAKE = "NO_TCLTL=1"
diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index 761100f702..f113d8bab0 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -2,30 +2,30 @@
 
 . /etc/init.d/functions
 
-case `cpuinfo_id` in
-	"GTA01"|"GTA02")
+case `machine_id` in
+	"gta01"|"gta02")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
 		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
 		GSM_DEV="/dev/ttySAC0"
 		;;
-	"HTC Apache"|"HTC Blueangel"|"HTC Universal")
+	"htc_apache"|"htc_blueangel"|"htc_universal")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS0"
 		;;
-	"HTC Himalaya")
+	"htc_himalaya")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS2"
 		;;
-	"HTC Magician")
+	"htc_magician")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS1"
 		;;
-	"Palm Treo 650")
+	"palm_treo_650")
 		GSMD_OPTS="-s 460800 -F -w 1"
 		GSM_DEV="/dev/ttyS0"
 		;;
-        "Motorola Ezx Platform")
+        "motorola_ezx_platform")
                 GSMD_OPTS="-s 115200 -F -v ti"
                 GSM_DEV="/dev/mux0"
                 ;;
diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc
index c8167d648e..f7d609e2c9 100644
--- a/packages/gsm/gsmd.inc
+++ b/packages/gsm/gsmd.inc
@@ -5,7 +5,7 @@ SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r39"
+PR = "r40"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
diff --git a/packages/initscripts/initscripts-1.0/functions b/packages/initscripts/initscripts-1.0/functions
index 358fc6edb3..fb9a914e4d 100644
--- a/packages/initscripts/initscripts-1.0/functions
+++ b/packages/initscripts/initscripts-1.0/functions
@@ -4,8 +4,8 @@
 #               shell scripts in the /etc/init.d directory.
 #
 
-cpuinfo_id() {		# return the Hardware module ID
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+machine_id() {		# return the machine ID
+    awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
 }
 
 killproc() {		# kill the named process(es)
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 7fab41858b..4433d12318 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r103"
+PR = "r104"
 
 SRC_URI = "file://functions \
            file://halt \
diff --git a/packages/ipaq-sleep/files/unbreak.patch b/packages/ipaq-sleep/files/unbreak.patch
new file mode 100644
index 0000000000..5884bf69e1
--- /dev/null
+++ b/packages/ipaq-sleep/files/unbreak.patch
@@ -0,0 +1,184 @@
+--- a/ipaq-sleep.c.org	2006-01-20 19:43:14.000000000 +0200
++++ a/ipaq-sleep.c	2007-12-26 06:26:32.000000000 +0200
+@@ -27,14 +27,14 @@
+ #include <X11/Xlib.h>
+ #include <X11/extensions/scrnsaver.h>
+ 
+-#undef DEBUG
++#define DEBUG
+ 
+ int irqs[MAX_IRQS]; /* irqs to examine have a value of 1 */
+ long v, irq_count[MAX_IRQS]; /* holds previous counters of the irq's */
+ int sleep_idle=3 * 60; /* in seconds */
+ int dim_idle=1 * 60; /* in seconds */
+ int daemonize=1;
+-int sleep_time = DEFAULT_SLEEP_TIME;
++int sleep_time = 1; //DEFAULT_SLEEP_TIME;
+ int cpu=1;
+ int apm=1;
+ int dimming=1;
+@@ -57,6 +57,7 @@
+ Window root;		    /* The root window (which holds MIT_SCREEN_SAVER
+ 			       info). */
+ XScreenSaverInfo *info;	    /* The MIT_SCREEN_SAVER info object. */
++int xfd = -1;
+ 
+ int init() { 
+ 	int first_event, first_error;
+@@ -69,6 +70,8 @@
+ 	else {
+   		XScreenSaverQueryExtension(dpy, &first_event, &first_error);
+   		root = DefaultRootWindow(dpy);
++		XSelectInput(dpy, root, KeyPressMask | KeyReleaseMask | PointerMotionMask);
++		xfd = ConnectionNumber(dpy);
+   		info = XScreenSaverAllocInfo();
+ #ifdef DEBUG
+   		if (debug) 
+@@ -108,7 +111,7 @@
+       if (fgets (buf, 32, input))
+ 	{
+ 	  if (!strncmp (buf, "on ", 3))
+-	    r = atoi (buf + 4);
++	    r = atoi (buf + 3);
+ 	  else
+ 	    r = -1;
+ 	}
+@@ -189,7 +192,7 @@
+ 				if (strcmp(func, Lflag)==0) {
+ 					dim_level=atoi(value);
+ #ifdef DEBUG
+-					if (debug) fprintf(dgfp, "dim_idle=%d\n", dim_idle);
++					if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle);
+ #endif
+ 				}
+ 				if (strcmp(func, aflag)==0) {
+@@ -282,6 +285,12 @@
+ 						dimming=0;
+ 					}
+ 				}
++				if (strcmp(func, Lflag)==0) {
++					dim_level=atoi(value);
++#ifdef DEBUG
++					if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle);
++#endif
++				}
+ 				if (strcmp(func, aflag)==0) {
+ 					apm=atoi(value);
+ #ifdef DEBUG
+@@ -487,8 +496,11 @@
+ 		return(1);
+ 	}
+ 
++	if (info.ac_line_status == AC_LINE_STATUS_UNKNOWN || info.battery_status == BATTERY_STATUS_UNKNOWN)
++		return(0);
++
+ #ifdef DEBUG
+-	if (debug) fprintf(dgfp,"You are NOT on external power. Its all good.....\n");
++	if (debug) fprintf(dgfp,"You are NOT on external power. Line status: %d, battery status: %d.\n", info.ac_line_status, info.battery_status);
+ #endif
+ 	runtime = info.battery_time;
+ 	if (apm && runtime >= 0 && runtime < battery_level)
+@@ -587,12 +599,17 @@
+ 	
+ }		
+ 
++/* X idle status checked every sleep_time,
++  other boring and expensive stuff - sleep_time * CYCLE_INTERLEAVE */
++#define CYCLE_INTERLEAVE 10
++
+ /* Keep checking the interrupts. As long as there is activity, do nothing. */
+ void main_loop (void) {
+-	int activity, i, total_unused=0, apm_active=0, old_apm=0;
++	int activity, i, apm_active=0, old_apm=0, last_active = time(NULL);
+ 	int dimmed=0, current_bl=32;
+ 	int newIdle, oldIdle, lastIdle, oldTime, newTime;
+ 	char iline[64];
++	int cycle = 0;
+   	
+ 	Time idleTime; /* milliseconds */
+         FILE *f;
+@@ -656,6 +673,9 @@
+ 			if (dimming  && !dimmed && !apm_active) {
+ 				if ((newIdle-oldIdle)>=dim_idle) {
+ 					current_bl = read_backlight ();
++#ifdef DEBUG
++					if (debug) fprintf(dgfp, "Dim timeout. Current bl value=%d, setting to=%d\n", current_bl, dim_level);
++#endif
+ 					set_backlight (dim_level);
+ 					dimmed=1;
+ 				}
+@@ -664,6 +684,11 @@
+ 			lastIdle=newIdle;
+ 	
+ 		}
++		
++		cycle++;
++		cycle %= CYCLE_INTERLEAVE;
++		if (cycle)
++			goto sleep;
+ 
+ 		apm_active=check_apm();
+ 		if (apm_active) {
+@@ -698,17 +723,15 @@
+ 		}
+ 
+ 		if (activity) {
+-			total_unused = 0;
++			last_active = time(NULL);
+ 		}
+ 		else {
+-			total_unused += sleep_time;
+-			if (total_unused >= sleep_idle && sleeping) {
++			if (time(NULL) - last_active >= sleep_idle && sleeping) {
+ 				
+ 				if (check_cpu() || check_PID() || probe_IRQs()) {
+ #ifdef DEBUG
+ 					if (debug) fprintf(dgfp,"You cannot sleep at this time! Not going to sleep....\n");
+ #endif
+-					total_unused=0;
+ 					oldIdle=newIdle;
+ 				}
+ 				else {
+@@ -718,24 +741,37 @@
+ 					do_sleep ();
+ 					set_backlight (current_bl);
+ 					dimmed=0;					
+-					total_unused=0;
++					last_active = time(NULL);
+ 				}
+ 			}
+ 			
+ 		}
+ 
++sleep:
+ #ifdef DEBUG		
+ 		if (debug) fflush(dgfp);
+ #endif
+-		sleep(sleep_time);
++		{
++		struct timeval tv;
++		fd_set readset;
++		FD_ZERO(&readset);
++		if (xfd != -1)
++		    FD_SET(xfd, &readset);
++		tv.tv_sec = 1;
++		tv.tv_usec = 0;
++#ifdef DEBUG		
++		if (debug) fprintf(dgfp, "select=%d, tv_sec=%d, tv_usec=%d\n", select(xfd+1, &readset, NULL, NULL, &tv), tv.tv_sec, tv.tv_usec);
++#endif
++		}
++		
+ 		
+ 		newTime=time(NULL);
+-		if (oldTime && newTime-sleep_time > oldTime +1) {
++		if (oldTime && newTime-sleep_time > oldTime +2) {
+ #ifdef DEBUG
+ 			if (debug)
+-			  fprintf(stderr, "%i sec sleep; resetting timer and resetting dimmer...", (int)(newTime - oldTime));
++			  fprintf(dgfp, "%i sec sleep, apparently, was suspended; resetting timer and resetting dimmer...", (int)(newTime - oldTime));
+ #endif
+-			total_unused=0;
++			last_active = time(NULL);
+ 			
+ 			query_idle(&idleTime);
+ 			lastIdle=oldIdle=(int)idleTime;
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index d41cacdf58..005c606c29 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -8,8 +8,10 @@ RDEPENDS = "apm"
 
 SRC_URI_append = " file://init-script-busybox.patch;patch=1"
 SRC_URI_append = " file://install-fix.patch;patch=1"
+SRC_URI_append = " file://unbreak.patch;patch=1"
 
-PR = "r1"
+PR = "r5"
 
 DESCRIPTION = "Automatic sleep/suspend control daemon"
 
+CONFFILES_${PN} += "${sysconfdir}/ipaq-sleep.conf"
diff --git a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty
diff --git a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig
index b6b752f623..b6b752f623 100644
--- a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig
+++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig
diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index ca94ee809f..8c1d2b85e1 100644
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -1,36 +1,25 @@
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
-SECTION = "kernel"
+require linux.inc
+
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
-LICENSE = "GPL"
-PR = "r3"
+
+PR = "r4"
 DEPENDS = "u-boot"
 
 COMPATIBLE_MACHINE = "dht-walnut"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           file://dht-walnut_defconfig"
-
+           file://defconfig"
 
 S = "${WORKDIR}/linux-${PV}"
 
-inherit kernel
-
-
 FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
 ARCH = "ppc"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
-
-
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config
-}
-
-
 do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
 
@@ -42,24 +31,11 @@ do_stage_append () {
        cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
-
-
-
-
 do_install_append () {
         install -d  ${DEPLOY_DIR_IMAGE}
         install -m 0755 arch/ppc/boot/images/zImage.elf \ 
                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
         install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/
-        powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S \ 
-               ${DEPLOY_DIR_IMAGE}/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
-        gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
-        mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "ppc405"+${PV} -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz \ 
-                ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin        
-        rm ${DEPLOY_DIR_IMAGE}/vmlinux
-        rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
-
-
 }
 
 
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init
index 5587346cb1..7f7eb36fbe 100644
--- a/packages/psplash/files/psplash-init
+++ b/packages/psplash/files/psplash-init
@@ -9,10 +9,14 @@ for x in $(cat /proc/cmdline); do
         esac
 done
 
+. /etc/init.d/functions
+
 psplash_args=''
-case "`grep ^Hardware /proc/cpuinfo|cut -d: -f2 |tr A-Z a-z`" in
- "hp ipaq h3100"|"hp ipaq h3800") pspash_args='-a 90' ;;
- "hp ipaq 3600"|"hp ipaq 3700"|"hp ipaq h3900"|"htc universal"|*collie|*poodle|*akita|*spitz|*borzoi) psplash_args='-a 270' ;;
+case `machine_id` in
+    "hp_ipaq_h3100"|"hp_ipaq_h3800") 
+	pspash_args='-a 90' ;;
+    "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi)
+	psplash_args='-a 270' ;;
 esac
 
 export TMPDIR=/mnt/.psplash
@@ -20,4 +24,5 @@ mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 /usr/bin/psplash $psplash_args &
 
+# Timetrap against hanging with splash hiding console messages.
 (sleep 120; psplash-write "QUIT") &
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index cf6e228d92..17b459a15f 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://projects.o-hand.com/psplash"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r11"
+PR = "r12"
+RDEPENDS = "initscripts"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND
diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch
new file mode 100644
index 0000000000..e019f3a117
--- /dev/null
+++ b/packages/zaurusd/files/alsa-6000x-default.state.patch
@@ -0,0 +1,750 @@
+--- zaurusd/config/alsa/6000x-default.state.old	2007-12-22 04:31:38.000000000 -0600
++++ zaurusd/config/alsa/6000x-default.state	2007-12-26 00:06:02.000000000 -0600
+@@ -37,13 +37,23 @@ state.Tosa {
+ 	}
+ 	control.5 {
+ 		comment.access 'read write'
++		comment.type INTEGER
++		comment.count 2
++		comment.range '0 - 31'
++		iface MIXER
++		name 'PCM Playback Volume'
++		value.0 23
++		value.1 23
++	}
++	control.6 {
++		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'Speaker Playback ZC Switch'
+ 		value true
+ 	}
+-	control.6 {
++	control.7 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -51,7 +61,7 @@ state.Tosa {
+ 		name 'Speaker Playback Invert Switch'
+ 		value true
+ 	}
+-	control.7 {
++	control.8 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -59,7 +69,7 @@ state.Tosa {
+ 		name 'Headphone Playback ZC Switch'
+ 		value true
+ 	}
+-	control.8 {
++	control.9 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -67,7 +77,7 @@ state.Tosa {
+ 		name 'Mono Playback ZC Switch'
+ 		value false
+ 	}
+-	control.9 {
++	control.10 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -76,7 +86,7 @@ state.Tosa {
+ 		name 'Mono Playback Volume'
+ 		value 0
+ 	}
+-	control.10 {
++	control.11 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -85,16 +95,16 @@ state.Tosa {
+ 		name 'ALC Target Volume'
+ 		value 11
+ 	}
+-	control.11 {
++	control.12 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Hold Time'
+-		value 0
++		value 2
+ 	}
+-	control.12 {
++	control.13 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -103,7 +113,7 @@ state.Tosa {
+ 		name 'ALC Decay Time'
+ 		value 3
+ 	}
+-	control.13 {
++	control.14 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -112,7 +122,7 @@ state.Tosa {
+ 		name 'ALC Attack Time'
+ 		value 2
+ 	}
+-	control.14 {
++	control.15 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -124,7 +134,7 @@ state.Tosa {
+ 		name 'ALC Function'
+ 		value None
+ 	}
+-	control.15 {
++	control.16 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -133,7 +143,7 @@ state.Tosa {
+ 		name 'ALC Max Volume'
+ 		value 7
+ 	}
+-	control.16 {
++	control.17 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -142,7 +152,7 @@ state.Tosa {
+ 		name 'ALC ZC Timeout'
+ 		value 0
+ 	}
+-	control.17 {
++	control.18 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -150,7 +160,7 @@ state.Tosa {
+ 		name 'ALC ZC Switch'
+ 		value false
+ 	}
+-	control.18 {
++	control.19 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -158,7 +168,7 @@ state.Tosa {
+ 		name 'ALC NG Switch'
+ 		value false
+ 	}
+-	control.19 {
++	control.20 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -168,7 +178,7 @@ state.Tosa {
+ 		name 'ALC NG Type'
+ 		value 'Constant Gain'
+ 	}
+-	control.20 {
++	control.21 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -177,16 +187,16 @@ state.Tosa {
+ 		name 'ALC NG Threshold'
+ 		value 31
+ 	}
+-	control.21 {
++	control.22 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Mic Headphone  Volume'
+-		value 3
++		value 7
+ 	}
+-	control.22 {
++	control.23 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -195,7 +205,7 @@ state.Tosa {
+ 		name 'ALC Headphone Volume'
+ 		value 5
+ 	}
+-	control.23 {
++	control.24 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -203,7 +213,7 @@ state.Tosa {
+ 		name 'Out3 Switch'
+ 		value false
+ 	}
+-	control.24 {
++	control.25 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -211,7 +221,7 @@ state.Tosa {
+ 		name 'Out3 ZC Switch'
+ 		value true
+ 	}
+-	control.25 {
++	control.26 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -220,7 +230,7 @@ state.Tosa {
+ 		name 'Out3 Volume'
+ 		value 0
+ 	}
+-	control.26 {
++	control.27 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -229,7 +239,7 @@ state.Tosa {
+ 		name 'PCBeep Bypass Headphone Volume'
+ 		value 0
+ 	}
+-	control.27 {
++	control.28 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -238,7 +248,7 @@ state.Tosa {
+ 		name 'PCBeep Bypass Speaker Volume'
+ 		value 0
+ 	}
+-	control.28 {
++	control.29 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -247,16 +257,16 @@ state.Tosa {
+ 		name 'PCBeep Bypass Phone Volume'
+ 		value 0
+ 	}
+-	control.29 {
++	control.30 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Aux Playback Headphone Volume'
+-		value 6
++		value 5
+ 	}
+-	control.30 {
++	control.31 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -265,7 +275,7 @@ state.Tosa {
+ 		name 'Aux Playback Speaker Volume'
+ 		value 0
+ 	}
+-	control.31 {
++	control.32 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -274,7 +284,7 @@ state.Tosa {
+ 		name 'Aux Playback Phone Volume'
+ 		value 0
+ 	}
+-	control.32 {
++	control.33 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -283,7 +293,7 @@ state.Tosa {
+ 		name 'Phone Volume'
+ 		value 0
+ 	}
+-	control.33 {
++	control.34 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 2
+@@ -293,7 +303,7 @@ state.Tosa {
+ 		value.0 23
+ 		value.1 23
+ 	}
+-	control.34 {
++	control.35 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -301,7 +311,7 @@ state.Tosa {
+ 		name 'Capture 20dB Boost Switch'
+ 		value true
+ 	}
+-	control.35 {
++	control.36 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -309,7 +319,7 @@ state.Tosa {
+ 		name 'Capture to Phone 20dB Boost Switch'
+ 		value true
+ 	}
+-	control.36 {
++	control.37 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -317,7 +327,7 @@ state.Tosa {
+ 		name '3D Upper Cut-off Switch'
+ 		value false
+ 	}
+-	control.37 {
++	control.38 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -325,7 +335,7 @@ state.Tosa {
+ 		name '3D Lower Cut-off Switch'
+ 		value false
+ 	}
+-	control.38 {
++	control.39 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -334,7 +344,7 @@ state.Tosa {
+ 		name '3D Playback Volume'
+ 		value 0
+ 	}
+-	control.39 {
++	control.40 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -344,7 +354,7 @@ state.Tosa {
+ 		name 'Bass Control'
+ 		value 'Adaptive Boost'
+ 	}
+-	control.40 {
++	control.41 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -352,7 +362,7 @@ state.Tosa {
+ 		name 'Bass Cut-off Switch'
+ 		value true
+ 	}
+-	control.41 {
++	control.42 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -360,7 +370,7 @@ state.Tosa {
+ 		name 'Tone Cut-off Switch'
+ 		value false
+ 	}
+-	control.42 {
++	control.43 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -368,7 +378,7 @@ state.Tosa {
+ 		name 'Playback Attenuate (-6dB) Switch'
+ 		value false
+ 	}
+-	control.43 {
++	control.44 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -377,7 +387,7 @@ state.Tosa {
+ 		name 'Bass Volume'
+ 		value 8
+ 	}
+-	control.44 {
++	control.45 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -386,7 +396,7 @@ state.Tosa {
+ 		name 'Treble Volume'
+ 		value 5
+ 	}
+-	control.45 {
++	control.46 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -394,7 +404,7 @@ state.Tosa {
+ 		name 'Capture ADC Switch'
+ 		value false
+ 	}
+-	control.46 {
++	control.47 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 2
+@@ -405,17 +415,17 @@ state.Tosa {
+ 		value.0 '+0.75dB Steps'
+ 		value.1 '+0.75dB Steps'
+ 	}
+-	control.47 {
++	control.48 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 2
+ 		comment.range '0 - 63'
+ 		iface MIXER
+ 		name 'Capture Volume'
+-		value.0 63
+-		value.1 63
++		value.0 0
++		value.1 0
+ 	}
+-	control.48 {
++	control.49 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -423,7 +433,7 @@ state.Tosa {
+ 		name 'Capture ZC Switch'
+ 		value false
+ 	}
+-	control.49 {
++	control.50 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -432,7 +442,7 @@ state.Tosa {
+ 		name 'Mic 1 Volume'
+ 		value 23
+ 	}
+-	control.50 {
++	control.51 {
+ 		comment.access 'read write'
+ 		comment.type INTEGER
+ 		comment.count 1
+@@ -441,7 +451,7 @@ state.Tosa {
+ 		name 'Mic 2 Volume'
+ 		value 23
+ 	}
+-	control.51 {
++	control.52 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -449,7 +459,7 @@ state.Tosa {
+ 		name 'Mic 20dB Boost Switch'
+ 		value false
+ 	}
+-	control.52 {
++	control.53 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -457,7 +467,7 @@ state.Tosa {
+ 		name 'Speaker Mixer PCBeep Bypass Swi'
+ 		value false
+ 	}
+-	control.53 {
++	control.54 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -465,7 +475,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Aux Playback Swit'
+ 		value false
+ 	}
+-	control.54 {
++	control.55 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -473,7 +483,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Phone Bypass Swit'
+ 		value false
+ 	}
+-	control.55 {
++	control.56 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -481,7 +491,7 @@ state.Tosa {
+ 		name 'Speaker Mixer Line Bypass Switc'
+ 		value false
+ 	}
+-	control.56 {
++	control.57 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -489,7 +499,7 @@ state.Tosa {
+ 		name 'Speaker Mixer PCM Playback Swit'
+ 		value true
+ 	}
+-	control.57 {
++	control.58 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -497,7 +507,7 @@ state.Tosa {
+ 		name 'Phone Mixer PCBeep Bypass Switc'
+ 		value false
+ 	}
+-	control.58 {
++	control.59 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -505,7 +515,7 @@ state.Tosa {
+ 		name 'Phone Mixer Aux Playback Switch'
+ 		value false
+ 	}
+-	control.59 {
++	control.60 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -513,7 +523,7 @@ state.Tosa {
+ 		name 'Phone Mixer Line Bypass Switch'
+ 		value false
+ 	}
+-	control.60 {
++	control.61 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -521,7 +531,7 @@ state.Tosa {
+ 		name 'Phone Mixer PCM Playback Switch'
+ 		value false
+ 	}
+-	control.61 {
++	control.62 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -529,7 +539,7 @@ state.Tosa {
+ 		name 'Phone Mixer Mic 1 Sidetone Swit'
+ 		value false
+ 	}
+-	control.62 {
++	control.63 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+@@ -537,55 +547,103 @@ state.Tosa {
+ 		name 'Phone Mixer Mic 2 Sidetone Swit'
+ 		value false
+ 	}
+-	control.63 {
++	control.64 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer PCBeep Bypass Switch'
++		name 'Right HP Mixer PCBeep Bypass Sw'
+ 		value false
+ 	}
+-	control.64 {
++	control.65 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Aux Playback Switch'
++		name 'Right HP Mixer Aux Playback Swi'
+ 		value false
+ 	}
+-	control.65 {
++	control.66 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Phone Bypass Switch'
++		name 'Right HP Mixer Phone Bypass Swi'
+ 		value false
+ 	}
+-	control.66 {
++	control.67 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Line Bypass Switch'
++		name 'Right HP Mixer Line Bypass Swit'
+ 		value false
+ 	}
+-	control.67 {
++	control.68 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer PCM Playback Switch'
++		name 'Right HP Mixer PCM Playback Swi'
+ 		value true
+ 	}
+-	control.68 {
++	control.69 {
+ 		comment.access 'read write'
+ 		comment.type BOOLEAN
+ 		comment.count 1
+ 		iface MIXER
+-		name 'HP Mixer Mic Sidetone Switch'
++		name 'Right HP Mixer Mic Sidetone Swi'
+ 		value false
+ 	}
+-	control.69 {
++	control.70 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer PCBeep Bypass Swi'
++		value false
++	}
++	control.71 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Aux Playback Swit'
++		value false
++	}
++	control.72 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Phone Bypass Swit'
++		value false
++	}
++	control.73 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Line Bypass Switc'
++		value false
++	}
++	control.74 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer PCM Playback Swit'
++		value true
++	}
++	control.75 {
++		comment.access 'read write'
++		comment.type BOOLEAN
++		comment.count 1
++		iface MIXER
++		name 'Left HP Mixer Mic Sidetone Swit'
++		value false
++	}
++	control.76 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -595,7 +653,7 @@ state.Tosa {
+ 		name 'Differential Source'
+ 		value Mic
+ 	}
+-	control.70 {
++	control.77 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -607,7 +665,7 @@ state.Tosa {
+ 		name 'Mic Select Source'
+ 		value Differential
+ 	}
+-	control.71 {
++	control.78 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -623,7 +681,7 @@ state.Tosa {
+ 		name 'Right Capture Select'
+ 		value Mic
+ 	}
+-	control.72 {
++	control.79 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -639,7 +697,7 @@ state.Tosa {
+ 		name 'Left Capture Select'
+ 		value Mic
+ 	}
+-	control.73 {
++	control.80 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -651,7 +709,7 @@ state.Tosa {
+ 		name 'Capture Phone Mux'
+ 		value Mute
+ 	}
+-	control.74 {
++	control.81 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -661,7 +719,7 @@ state.Tosa {
+ 		name 'Speaker Mux'
+ 		value 'Headphone Mix'
+ 	}
+-	control.75 {
++	control.82 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -673,7 +731,7 @@ state.Tosa {
+ 		name 'Out3 Mux'
+ 		value Left
+ 	}
+-	control.76 {
++	control.83 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -685,7 +743,7 @@ state.Tosa {
+ 		name 'ALC Sidetone Mux'
+ 		value Stereo
+ 	}
+-	control.77 {
++	control.84 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+@@ -698,15 +756,14 @@ state.Tosa {
+ 		name 'Jack Function'
+ 		value Headphone
+ 	}
+-	control.78 {
++	control.85 {
+ 		comment.access 'read write'
+ 		comment.type ENUMERATED
+ 		comment.count 1
+-		comment.item.0 Auto
+-		comment.item.1 On
+-		comment.item.2 Off
++		comment.item.0 On
++		comment.item.1 Off
+ 		iface MIXER
+ 		name 'Speaker Function'
+-		value Auto
++		value On
+ 	}
+ }
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 8801974fc9..3ea0d2b22f 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,12 +4,13 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
 	   file://add-poodle.patch;patch=1 \
 	   file://alsa-cxx00-default.state.patch;patch=1 \
+	   file://alsa-6000x-default.state.patch;patch=1 \
 	   file://disable-alsa-handling.patch;patch=1 \
 	   file://zaurus-hinge.matchbox-portrait \	   
 	   file://zaurus-hinge.matchbox-landscape \