Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

49 files changed, 12825 insertions, 255 deletions

diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb
index 50dc5a69c6..05010f97bb 100644
--- a/packages/blackbox/blackbox_0.70.1.bb
+++ b/packages/blackbox/blackbox_0.70.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Blackbox Window Manager"
 SECTION = "x11/wm"
 LICENSE = "GPL"
 DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \
   file://remove-host-includes.patch;patch=1"
@@ -12,3 +12,10 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus"
 
+#fix path of pc file
+do_install_append() {
+	sed -i s#${STAGING_LIBDIR}#${libdir}#g ${D}/${libdir}/pkgconfig/libbt.pc
+}
+do_stage_append () {
+	sed -i s#${STAGING_LIBDIR}#${libdir}#g ${STAGING_LIBDIR}/pkgconfig/libbt.pc
+}
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index f8d85089fe..faf22b29cf 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-PR = "r7"
+PR = "r8"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://fixincludes.patch;patch=1 \
@@ -12,6 +12,13 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
 
+
+inherit update-rc.d
+
+INITSCRIPT_PACKAGES = "dhcp-server"
+INITSCRIPT_NAME_dhcp-server = dhcp-server
+INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ."
+
 do_configure() {
 	./configure
 }
diff --git a/packages/euphony/euphony_0.1.2.bb b/packages/euphony/euphony_0.1.3.bb
index 134a39dc5e..134a39dc5e 100644
--- a/packages/euphony/euphony_0.1.2.bb
+++ b/packages/euphony/euphony_0.1.3.bb
diff --git a/packages/ezx/ezx-gen-blob_svn.bb b/packages/ezx/ezx-gen-blob_svn.bb
new file mode 100644
index 0000000000..fb0def2c20
--- /dev/null
+++ b/packages/ezx/ezx-gen-blob_svn.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform"
+SECTION = "bootloaders"
+AUTHOR = "Daniel Riberio"
+HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+PV = "0.1.0+${SRCREV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=http"
+S = "${WORKDIR}/gen-blob"
+
+do_deploy() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 gen-blob ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+do_install() {
+	dd if=${WORKDIR}/gen-blob bs=1k seek=2 conv=sync of=${WORKDIR}/gen-blob-a1200
+
+	install -d ${D}/${datadir}/openezx
+	install -m 0644 gen-blob ${D}${datadir}/openezx/gen-blob-for-1stgen.${SRCDATE}
+	install -m 0644 gen-blob-a1200 ${D}${datadir}/openezx/gen-blob-for-2ndgen.${SRCDATE}
+}
+
+addtask deploy before do_build after do_compile
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} = "${datadir}"
diff --git a/packages/linux/linux-2.6.28/collie/0001-collie-start-scoop-converton-to-new-api.patch b/packages/linux/linux-2.6.28/collie/0001-collie-start-scoop-converton-to-new-api.patch
new file mode 100644
index 0000000000..51c161f99d
--- /dev/null
+++ b/packages/linux/linux-2.6.28/collie/0001-collie-start-scoop-converton-to-new-api.patch
@@ -0,0 +1,106 @@
+From 4765c85914d55590c6d17b6cf9e6f7964d1af108 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Date: Tue, 28 Oct 2008 21:41:39 +0300
+Subject: [PATCH 01/23] collie: start scoop converton to new api
+
+Start converting scoop gpio access to new API instead of old
+deprecated one.
+
+Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+---
+ arch/arm/mach-sa1100/collie.c              |   28 +++++++++++++++++++++++-----
+ arch/arm/mach-sa1100/include/mach/collie.h |    7 ++++---
+ 2 files changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
+index fe28999..8cf267f 100644
+--- a/arch/arm/mach-sa1100/collie.c
++++ b/arch/arm/mach-sa1100/collie.c
+@@ -25,6 +25,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/timer.h>
++#include <linux/gpio.h>
+ 
+ #include <mach/hardware.h>
+ #include <asm/mach-types.h>
+@@ -55,6 +56,7 @@ static struct resource collie_scoop_resources[] = {
+ static struct scoop_config collie_scoop_setup = {
+ 	.io_dir 	= COLLIE_SCOOP_IO_DIR,
+ 	.io_out		= COLLIE_SCOOP_IO_OUT,
++	.gpio_base	= COLLIE_SCOOP_GPIO_BASE,
+ };
+ 
+ struct platform_device colliescoop_device = {
+@@ -196,18 +198,34 @@ static struct mtd_partition collie_partitions[] = {
+ 	}
+ };
+ 
++static int collie_flash_init(void)
++{
++	int rc;
++	rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
++	if (rc)
++		return rc;
++
++	rc = gpio_direction_output(COLLIE_GPIO_VPEN, 1);
++	if (rc)
++		gpio_free(COLLIE_GPIO_VPEN);
++
++	return rc;
++}
++
+ static void collie_set_vpp(int vpp)
+ {
+-	write_scoop_reg(&colliescoop_device.dev, SCOOP_GPCR, read_scoop_reg(&colliescoop_device.dev, SCOOP_GPCR) | COLLIE_SCP_VPEN);
+-	if (vpp)
+-		write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR) | COLLIE_SCP_VPEN);
+-	else
+-		write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR) & ~COLLIE_SCP_VPEN);
++	gpio_set_value(COLLIE_GPIO_VPEN, vpp);
+ }
+ 
++static void collie_flash_exit(void)
++{
++	gpio_free(COLLIE_GPIO_VPEN);
++}
+ static struct flash_platform_data collie_flash_data = {
+ 	.map_name	= "cfi_probe",
++	.init		= collie_flash_init,
+ 	.set_vpp	= collie_set_vpp,
++	.exit		= collie_flash_exit,
+ 	.parts		= collie_partitions,
+ 	.nr_parts	= ARRAY_SIZE(collie_partitions),
+ };
+diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
+index 69e9624..9bc5349 100644
+--- a/arch/arm/mach-sa1100/include/mach/collie.h
++++ b/arch/arm/mach-sa1100/include/mach/collie.h
+@@ -14,6 +14,7 @@
+ #define __ASM_ARCH_COLLIE_H
+ 
+ 
++#define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)
+ #define COLLIE_SCP_CHARGE_ON	SCOOP_GPCR_PA11
+ #define COLLIE_SCP_DIAG_BOOT1	SCOOP_GPCR_PA12
+ #define COLLIE_SCP_DIAG_BOOT2	SCOOP_GPCR_PA13
+@@ -21,13 +22,13 @@
+ #define COLLIE_SCP_MUTE_R	SCOOP_GPCR_PA15
+ #define COLLIE_SCP_5VON		SCOOP_GPCR_PA16
+ #define COLLIE_SCP_AMP_ON	SCOOP_GPCR_PA17
+-#define COLLIE_SCP_VPEN		SCOOP_GPCR_PA18
++#define COLLIE_GPIO_VPEN	(COLLIE_SCOOP_GPIO_BASE + 7)
+ #define COLLIE_SCP_LB_VOL_CHG	SCOOP_GPCR_PA19
+ 
+ #define COLLIE_SCOOP_IO_DIR	( COLLIE_SCP_CHARGE_ON | COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
+-				COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | COLLIE_SCP_VPEN | \
++				COLLIE_SCP_5VON | COLLIE_SCP_AMP_ON | \
+ 				COLLIE_SCP_LB_VOL_CHG )
+-#define COLLIE_SCOOP_IO_OUT	( COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | COLLIE_SCP_VPEN | \
++#define COLLIE_SCOOP_IO_OUT	( COLLIE_SCP_MUTE_L | COLLIE_SCP_MUTE_R | \
+ 				COLLIE_SCP_CHARGE_ON )
+ 
+ /* GPIOs for which the generic definition doesn't say much */
+-- 
+1.5.6.5
+
diff --git a/packages/linux/linux-2.6.28/collie/0002-add-locomo_spi-driver.patch b/packages/linux/linux-2.6.28/collie/0002-add-locomo_spi-driver.patch
new file mode 100644
index 0000000000..7530beee2c
--- /dev/null
+++ b/packages/linux/linux-2.6.28/collie/0002-add-locomo_spi-driver.patch
@@ -0,0 +1,1228 @@
+From dae5d7c71ba47bdd0603d5cc3e8a3dfe28d209a0 Mon Sep 17 00:00:00 2001
+From: Thomas Kunze <thommycheck@gmx.de>
+Date: Mon, 20 Oct 2008 17:30:32 +0200
+Subject: [PATCH 02/23] add locomo_spi driver
+
+---
+ drivers/spi/Kconfig      |    4 +
+ drivers/spi/Makefile     |    1 +
+ drivers/spi/locomo_spi.c | 1097 ++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/spi/locomo_spi.h |   75 ++++
+ 4 files changed, 1177 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/spi/locomo_spi.c
+ create mode 100644 drivers/spi/locomo_spi.h
+
+diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
+index b9d0efb..aa3c60a 100644
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -123,6 +123,10 @@ config SPI_MPC52xx_PSC
+ 	  This enables using the Freescale MPC52xx Programmable Serial
+ 	  Controller in master SPI mode.
+ 
++config SPI_LOCOMO
++	tristate "Locomo SPI master"
++	depends on SPI_MASTER && SHARP_LOCOMO && EXPERIMENTAL
++
+ config SPI_MPC83xx
+ 	tristate "Freescale MPC83xx/QUICC Engine SPI controller"
+ 	depends on (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
+diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
+index ccf18de..794dd45 100644
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
+ obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
+ obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
+ obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.o
++obj-$(CONFIG_SPI_LOCOMO)                += locomo_spi.o
+ # 	... add above this line ...
+ 
+ # SPI protocol drivers (device/link on bus)
+diff --git a/drivers/spi/locomo_spi.c b/drivers/spi/locomo_spi.c
+new file mode 100644
+index 0000000..d3a4bd9
+--- /dev/null
++++ b/drivers/spi/locomo_spi.c
+@@ -0,0 +1,1097 @@
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/device.h>
++#include <linux/stat.h>
++#include <linux/delay.h>
++#include <linux/wait.h>
++#include <linux/interrupt.h>
++#include <asm/hardware/locomo.h>
++#include <asm/errno.h>
++#include <linux/mmc/host.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/mmc_spi.h>
++#include <linux/workqueue.h>
++#include <linux/spinlock.h>
++#include <linux/list.h>
++#include "locomo_spi.h"
++static struct locomospi_dev * spidev;
++static struct work_struct transfer_wq;
++int  delay;
++
++char* transtxbuf=(char*)NULL;
++char* transrxbuf=(char*)NULL;
++int transfercount=0, transfersize=0;
++static DECLARE_WAIT_QUEUE_HEAD(transferqueue);
++/* MMC_SPI functions *********************************************************/
++
++static int locomommcspi_init(struct device *dev, irqreturn_t (*isr)(int, void*), void *mmc)
++{
++	int result;
++	result=request_irq(IRQ_LOCOMO_CARDDETECT, isr, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "locomo-spi",  mmc);
++	return result;
++}
++
++static void locomommcspi_exit(struct device *dev, void* mmc)
++{
++	free_irq(IRQ_LOCOMO_CARDDETECT, mmc);
++}
++
++static int locomommcspi_getro(struct device *dev)
++{
++	return locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROT) > 0 ? 1 : 0;
++}
++
++static void locomommcspi_setpower(struct device *dev, unsigned int mask)
++{
++	if(!mask && spidev->card_power)
++		locomospi_power(0);
++	else if( !spidev->card_power )
++		locomospi_power(1);
++
++}
++
++
++static struct mmc_spi_platform_data colliemmc ={
++	.init 		= locomommcspi_init,
++	.exit 		= locomommcspi_exit,
++	.detect_delay 	= 200,
++	.get_ro 	= locomommcspi_getro,
++	.ocr_mask 	= MMC_VDD_32_33 | MMC_VDD_33_34,
++	.setpower	= locomommcspi_setpower,
++	.powerup_msecs  = 200,
++};
++
++/* Utility function **********************************************************/
++
++static void locomospi_power(int on)
++{
++	locomo_gpio_write(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_POWER, on);
++	spidev->card_power=on;
++	printk(KERN_DEBUG "locomospi: power %d\n",on);
++}
++
++static void locomospi_setclock(unsigned int div, unsigned int clock)
++{
++	u16 r = ioread16(spidev->base+LOCOMO_SPIMD);
++	div &= 0x7;
++	clock &= 0x3;
++	if(clock != spidev->clock_base || div != spidev->clock_div){
++		r &= ~(LOCOMO_SPI_XSEL  | LOCOMO_SPI_CLKSEL | LOCOMO_SPI_XEN);
++		iowrite16(r,spidev->base+LOCOMO_SPIMD);
++		r |=  (div | (clock <<3) | LOCOMO_SPI_XEN);
++		iowrite16(r,spidev->base+LOCOMO_SPIMD);
++		spidev->clock_div = div;
++		spidev->clock_base = clock;
++		udelay(300);
++	}
++
++}
++// returns 1 if card ist present, 0 otherwise
++static int locomospi_carddetect()
++{
++	return (locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1;
++}
++
++static void locomospi_setcs(int high)
++{
++	u16 r;
++	printk(KERN_DEBUG "locomospi: cs %d\n",high);
++	r = ioread16(spidev->base + LOCOMO_SPICT);
++	if(high)
++		r |= LOCOMO_SPI_CS;
++	else
++		r &= ~LOCOMO_SPI_CS;
++	iowrite16(r, spidev->base + LOCOMO_SPICT);
++}
++
++static void locomospi_reg_open()
++{
++	u16 r;
++	spidev->clock_div = DIV_64;
++	spidev->clock_base = CLOCK_18MHZ;
++	locomospi_power(1);
++	msleep(100);
++//	iowrite16( 0xec00 | (CLOCK_18MHZ <<3)|DIV_64, spidev->base+LOCOMO_SPIMD);
++	iowrite16( LOCOMO_SPI_MSB1ST | LOCOMO_SPI_DOSTAT | LOCOMO_SPI_RCPOL | LOCOMO_SPI_TCPOL 
++			|(CLOCK_18MHZ <<3) | DIV_64, spidev->base+LOCOMO_SPIMD);
++//	if(locomospi_carddetect()){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16( r, spidev->base+LOCOMO_SPIMD);
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XEN;
++		iowrite16( r, spidev->base+LOCOMO_SPIMD);
++//	}
++	iowrite16( LOCOMO_SPI_CS, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= (LOCOMO_SPI_CEN | LOCOMO_SPI_RXUEN | LOCOMO_SPI_ALIGNEN);
++	iowrite16( r, spidev->base+LOCOMO_SPICT);
++	udelay(200);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_CS;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++}
++
++static void locomospi_reg_release()
++{
++	u16 r;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_CEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPIMD);
++	r &= ~LOCOMO_SPI_XEN;
++	iowrite16(r, spidev->base+LOCOMO_SPIMD);
++	r = ioread16(spidev->base+LOCOMO_SPIMD);
++	r &= ~LOCOMO_SPI_XON;
++	iowrite16(r, spidev->base+LOCOMO_SPIMD);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_XEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	locomospi_power(0);
++}
++#if 0
++static int txrx(const char* txbuffer, char* rxbuffer, int size)
++{
++	u16 r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	printk(KERN_DEBUG "locomospi: %d bytes to prozess\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transtxbuf=txbuffer; transrxbuf=rxbuffer;
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_TEND);
++	iowrite8(txbuffer[0], spidev->base+LOCOMO_SPITD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_TEND);
++	transrxbuf=NULL; transtxbuf=NULL;
++	
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: sent: %x  received: %x \n",txbuffer[i], rxbuffer[i]);
++	
++	
++	return size;
++}
++
++
++static int tx(const char* txbuffer, int size)
++{
++	printk(KERN_DEBUG "locomospi: %d bytes to send\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transtxbuf=txbuffer; 
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_RFW);
++	iowrite8(txbuffer[0], spidev->base+LOCOMO_SPITD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_RFW);
++	transtxbuf=NULL;
++	
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: sent: %x\n",txbuffer[i]);
++	
++	
++	return size;
++}
++
++static int rx(char* rxbuffer, int size)
++{
++	printk(KERN_DEBUG "locomospi: %d bytes to read\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transrxbuf=rxbuffer;
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_RFR);
++	rxbuffer[0]=ioread8(spidev->base+LOCOMO_SPIRD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_RFR);
++	transrxbuf=NULL;
++	
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: received: %x \n", rxbuffer[i]);
++	
++	
++	return size;
++}
++
++#else
++static int txrx(const char* txbuffer, char* rxbuffer, int size)
++{
++	int i=0,j=0;
++	int wait;
++	u16 r;
++/*	char * txback = kmalloc(size * sizeof(char), GFP_KERNEL);
++	memcpy(txback, txbuffer, size);	
++*/	
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	
++//	printk(KERN_DEBUG "locomospi: txrx %d bytes to prozess\n",size);
++	
++//	r = ioread16(spidev->base+LOCOMO_SPICT);
++//	r |= LOCOMO_SPI_ALIGNEN;
++//	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	//discard first bogus byte
++
++	ioread8(spidev->base+LOCOMO_SPIRD);
++	for(i=0; i<size; i++){
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)
++				break;
++		}
++		iowrite8(txbuffer[i], spidev->base+LOCOMO_SPITD);
++		ndelay(delay);
++		
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)
++				break;
++		}
++		rxbuffer[i] = ioread8(spidev->base+LOCOMO_SPIRD);
++		ndelay(delay);
++	}
++//	r = ioread16(spidev->base+LOCOMO_SPICT);
++//	r &= ~LOCOMO_SPI_ALIGNEN;
++//	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	
++/*	for(j=0; j< size; j++)
++		printk(KERN_DEBUG "locomospi: sent: %x  received: %x \n",txback[j], rxbuffer[j]);
++	
++	kfree(txback);	
++*/	return i;
++}
++
++static int tx(const char* buffer, int size)
++{
++	int i=0,j=0;
++	int wait;
++	u16 r;
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++
++//	printk(KERN_DEBUG "locomospi: tx %d bytes to transmit\n",size);
++	for(i=0; i<size; i++){
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)
++				break;
++		}
++		iowrite8(buffer[i], spidev->base+LOCOMO_SPITD);
++		ndelay(delay);
++	}
++
++	for(j=0; j <= wait; j++){
++		if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_TEND)
++			break;
++	}
++	
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	
++//	for(j=0; j< size; j++)
++//		printk(KERN_DEBUG "locomospi: sent: %x \n", buffer[j]);
++//	printk(KERN_DEBUG "locomospi: tx %d bytes transmitted\n",i);
++	return i;
++}
++
++static int rx(char* buffer, int size)
++{
++	int i,j;
++	int wait;
++	u16 r; 	
++	printk(KERN_DEBUG "locomospi: rx %d bytes to receive\n",size);
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++
++	for(i=0; i<size; i++){
++
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)
++				break;
++		}
++		buffer[i]= ioread8(spidev->base+LOCOMO_SPIRD);
++		ndelay(delay);
++	}
++