merge of 3e475547db06d6faf88fd643f2b80f61626f8fd5

     and b295125c518f1603b591188eac10cf3f0bb818c3

16 files changed, 313 insertions, 9 deletions

diff --git a/packages/cdstatus/.mtn2git_empty b/packages/cdstatus/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cdstatus/.mtn2git_empty
diff --git a/packages/cdstatus/cdstatus-0.96.05.bb b/packages/cdstatus/cdstatus-0.96.05.bb
new file mode 100644
index 0000000000..1ae728f836
--- /dev/null
+++ b/packages/cdstatus/cdstatus-0.96.05.bb
@@ -0,0 +1,25 @@
+# cdstatus OE build file
+
+PR="r0"
+LICENSE="GPL"
+HOMEPAGE = "http://cdstatus.sourceforge.net/"
+FILES_${PN} += ${datadir}/cdstatus.cfg
+
+SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.96.05.tar.gz \
+	 file://cdstatus.patch;patch=1"
+
+S="${WORKDIR}/cdstatus-0.96.05"
+
+inherit autotools
+
+TARGET_LDFLAGS=""
+
+do_install() {
+	install -d 0755 ${D}/${bindir}
+	install -d 0755 ${D}/${datadir}
+	install -d 0755 ${D}/${mandir}
+	install -m 0755 src/cdstatus          ${D}/${bindir}
+	install -m 0644 cdstatus.cfg          ${D}/${datadir}
+	install -m 0644 cdstatus.1            ${D}/${mandir}
+
+}
diff --git a/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty b/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty
diff --git a/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch b/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch
new file mode 100644
index 0000000000..913cd721e0
--- /dev/null
+++ b/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch
@@ -0,0 +1,131 @@
+*** cdstatus-0.96.05/src/cdstatus.c.orig	2005-11-26 16:23:27.000000000 +0100
+--- cdstatus-0.96.05/src/cdstatus.c	2005-11-26 19:06:57.000000000 +0100
+***************
+*** 436,441 ****
+--- 436,501 ----
+  	return 0;
+  }
+  
++ /* following code copied from
++   http://www.gamedev.net/reference/articles/article2091.asp
++   it has been slightly modified as we did not have a reason to output
++   big endian or float 
++ */
++ static short ShortSwap( short s )
++ {
++   unsigned char b1, b2;
++   
++   b1 = s & 255;
++   b2 = (s >> 8) & 255;
++ 
++   return (b1 << 8) + b2;
++ }
++ 
++ static short ShortNoSwap( short s )
++ {
++   return s;
++ }
++ 
++ static int LongSwap (int i)
++ {
++   unsigned char b1, b2, b3, b4;
++ 
++   b1 = i & 255;
++   b2 = ( i >> 8 ) & 255;
++   b3 = ( i>>16 ) & 255;
++   b4 = ( i>>24 ) & 255;
++ 
++   return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4;
++ }
++ 
++ static int LongNoSwap( int i )
++ {
++   return i;
++ }
++ 
++ static short (*LittleShort) ( short s );
++ static int (*LittleLong) ( int i );
++ 
++ static void InitEndian( void )
++ {
++   char SwapTest[2] = { 1, 0 };
++   
++   if( *(short *) SwapTest == 1 )
++   {
++     // little endian
++     //set func pointers to correct funcs
++     LittleShort = ShortNoSwap;
++     LittleLong = LongNoSwap;
++   }
++   else
++   {
++     // big endian
++     LittleShort = ShortSwap;
++     LittleLong = LongSwap;
++   }
++ }
++ /* end of copied code */
++ 
+  static void writeWavHeader(unsigned int readframes, FILE * audio_out)
+  {
+  	long int chunksize;
+***************
+*** 456,478 ****
+  
+  	wavHeader wHeader;
+  
+  	/* "RIFF" */
+! 	wHeader.RIFF_header = 0x46464952;
+  
+  	chunksize = readframes * CD_FRAMESIZE_RAW;
+! 	wHeader.total_size = (int32_t)(chunksize + sizeof(wavHeader));
+  
+  	/* "WAVEfmt " */
+! 	wHeader.WAVE = 0x45564157;
+! 	wHeader.fmt = 0x20746D66;
+  
+! 	wHeader.subchunk_size = 16;
+! 	wHeader.audio_format = 1;
+! 	wHeader.number_channels = 2;
+! 	wHeader.sampling_rate = 44100;
+! 	wHeader.byte_rate = 176400;
+! 	wHeader.block_align = 4;
+! 	wHeader.bits_per_sample = 16;
+  
+  	if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1)
+  	{
+--- 516,539 ----
+  
+  	wavHeader wHeader;
+  
++ 	InitEndian();
+  	/* "RIFF" */
+! 	wHeader.RIFF_header = LittleLong(0x46464952);
+  
+  	chunksize = readframes * CD_FRAMESIZE_RAW;
+! 	wHeader.total_size = LittleLong((int32_t)(chunksize + sizeof(wavHeader)));
+  
+  	/* "WAVEfmt " */
+! 	wHeader.WAVE = LittleLong(0x45564157);
+! 	wHeader.fmt = LittleLong(0x20746D66);
+  
+! 	wHeader.subchunk_size = LittleLong(16);
+! 	wHeader.audio_format = LittleShort(1);
+! 	wHeader.number_channels = LittleShort(2);
+! 	wHeader.sampling_rate = LittleLong(44100);
+! 	wHeader.byte_rate = LittleLong(176400);
+! 	wHeader.block_align = LittleShort(4);
+! 	wHeader.bits_per_sample = LittleShort(16);
+  
+  	if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1)
+  	{
+***************
+*** 492,497 ****
+--- 553,559 ----
+  		}
+  		exit(EXIT_FAILURE);
+  	}
++ 	chunksize = LittleLong(chunksize);
+  	if(fwrite((const void *) &chunksize, sizeof(long int), (size_t) 1, audio_out)!=1)
+  	{
+  		perror("Error writing wav file chunksize header");
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0
index 20b44b7197..0f42642e7f 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0
@@ -228,7 +228,7 @@ CONFIG_BINFMT_MISC=m
 # Power management options
 #
 CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_APM=y
 
@@ -840,6 +840,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_CORGI=y
+# CONFIG_KEYBOARD_TOSA is not set
 # CONFIG_KEYBOARD_SPITZ is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00
index b1748c9268..ad44de256e 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00
+++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00
@@ -216,7 +216,7 @@ CONFIG_BINFMT_MISC=m
 # Power management options
 #
 CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_APM=y
 
@@ -829,6 +829,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_CORGI is not set
 CONFIG_KEYBOARD_SPITZ=y
+# CONFIG_KEYBOARD_TOSA is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
index 9687967d92..3f90f81705 100644
--- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
+++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r2"
+PR = "r3"
 
 #DEFAULT_PREFERENCE = "-1"
 
@@ -22,13 +22,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \
            ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
-           ${RPSRC}/led_core-r0.patch;patch=1 \
-           ${RPSRC}/led_triggers-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
+           ${RPSRC}/led_core-r1.patch;patch=1 \
+           ${RPSRC}/led_triggers-r1.patch;patch=1 \
            ${RPSRC}/led_trig_timer-r0.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r0.patch;patch=1 \
-           ${RPSRC}/led_locomo-r0.patch;patch=1 \
-           ${RPSRC}/led_ide-r0.patch;patch=1 \
-           ${RPSRC}/led_nand-r0.patch;patch=1 \
+           ${RPSRC}/led_trig_sharpsl_pm-r0.patch;patch=1 \
+           ${RPSRC}/led_zaurus-r2.patch;patch=1 \
+           ${RPSRC}/led_locomo-r1.patch;patch=1 \
+           ${RPSRC}/led_ide-r1.patch;patch=1 \
+           ${RPSRC}/led_nand-r1.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r2.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch
new file mode 100644
index 0000000000..829c741b69
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch
@@ -0,0 +1,15 @@
+--- driver/Makefile-	2005-09-11 13:22:08.000000000 -1000
++++ driver/Makefile	2005-09-17 01:02:06.341217389 -1000
+@@ -37,10 +37,10 @@
+   all: modules
+ 
+   modules modules_install clean:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
+ 
+   install:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
+ 
+ else
+ 
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch
new file mode 100644
index 0000000000..b79c42e2c5
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch
@@ -0,0 +1,15 @@
+--- driver/Makefile-	2005-09-11 13:22:08.000000000 -1000
++++ driver/Makefile	2005-09-17 01:02:06.341217389 -1000
+@@ -37,10 +37,10 @@
+   all: modules
+ 
+   modules modules_install clean:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
+ 
+   install:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
+ 
+ else
+ 
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch
new file mode 100644
index 0000000000..b79c42e2c5
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch
@@ -0,0 +1,15 @@
+--- driver/Makefile-	2005-09-11 13:22:08.000000000 -1000
++++ driver/Makefile	2005-09-17 01:02:06.341217389 -1000
+@@ -37,10 +37,10 @@
+   all: modules
+ 
+   modules modules_install clean:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
+ 
+   install:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
+ 
+ else
+ 
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
new file mode 100644
index 0000000000..e8395ae52f
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
+LICENSE = "GPL"
+PR = "r0"
+RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400
+# It in fact also requires kernel-module-saa7115", but for now is using the local ones.
+ 
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \
+           file://Makefile.patch;patch=1" 
+
+S = "${WORKDIR}/pvrusb2-mci-20050921/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+          '-D__LINUX_ARM_ARCH__=5'"
+
+EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+                'CC=${KERNEL_CC}' \
+                'LD=${KERNEL_LD}' \
+                'KDIR=${STAGING_KERNEL_DIR}'" 
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
new file mode 100644
index 0000000000..bd3362c730
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
+LICENSE = "GPL"
+PR = "r1"
+# It in fact requires these modules, but for now is using the local ones.
+# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
+ 
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \
+           file://Makefile.patch;patch=1" 
+
+S = "${WORKDIR}/pvrusb2-mci-20051016/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+          '-D__LINUX_ARM_ARCH__=5'"
+
+EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+                'CC=${KERNEL_CC}' \
+                'LD=${KERNEL_LD}' \
+                'KDIR=${STAGING_KERNEL_DIR}'" 
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
new file mode 100644
index 0000000000..5ac677e329
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
+LICENSE = "GPL"
+PR = "r0"
+# It in fact requires these modules, but for now is using the local ones.
+# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
+ 
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2"
+
+#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \
+#           file://Makefile.patch;patch=1" 
+
+S = "${WORKDIR}/pvrusb2-mci-20051113"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+          '-D__LINUX_ARM_ARCH__=5'"
+
+EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+                'CC=${KERNEL_CC}' \
+                'LD=${KERNEL_LD}' \
+                'KDIR=${STAGING_KERNEL_DIR}'" 
+
+export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
+                         -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
+
+
+do_compile() {   
+	cd ivtv; oe_runmake
+	cd ../driver; oe_runmake 
+}
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+