Second set of miscellaneous patches
Here is another set of miscellaneous patches from my queue. Please comment and/or merge. These patches can also be pulled from my git tree:
git://git.secretlab.ca/srv/git-trees/public/git/u-boot.git#merge
http://git.secretlab.ca/git/u-boot.git#merge
Patches 1, 2 and 4 are the same as in my previous set, so I haven't resent them (hence the missing patch numbers)
Patch #3 has been modified based on comments from the mailing list
Patches 5-9 are new.
board/esd/common/auto_update.c | 3 +- board/mcc200/auto_update.c | 3 +- board/mpl/mip405/mip405.c | 3 - board/trab/auto_update.c | 1 - board/xilinx/ml300/Makefile | 2 +- board/xilinx/ml300/ml300.c | 2 +- board/xilinx/ml300/serial.c | 3 +- board/xilinx/xilinx_enet/emac_adapter.c | 2 +- board/xilinx/xilinx_enet/xemac.h | 2 +- board/xilinx/xilinx_enet/xemac_g.c | 2 +- board/xilinx/xilinx_iic/iic_adapter.c | 2 +- common/Makefile | 3 +- common/cmd_ace.c | 267 ------------------------------- common/cmd_ext2.c | 40 +----- common/cmd_fat.c | 37 +---- common/cmd_ide.c | 16 ++- common/cmd_mem.c | 65 ++------ common/cmd_reiser.c | 40 +----- common/cmd_scsi.c | 6 +- common/cmd_usb.c | 1 + common/ft_build.c | 6 +- common/usb_storage.c | 7 +- cpu/pxa/mmc.c | 4 +- disk/part.c | 49 ++++++ drivers/Makefile | 2 +- drivers/systemace.c | 247 ++++++++++++++++++++++++++++ include/common.h | 2 + include/ide.h | 6 +- include/part.h | 15 ++- lib_generic/display_options.c | 70 ++++++++ 30 files changed, 439 insertions(+), 469 deletions(-)
PATCH 3/9 Move buffer print code from md command to common function
Printing a buffer is a darn useful thing. Move the buffer print code into print_buffer() in lib_generic/
--- common/cmd_mem.c | 65 ++++++++----------------------------- include/common.h | 2 + lib_generic/display_options.c | 70 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 51 deletions(-)
common/cmd_mem.c +14 -51
@@ -92,8 +92,9 @@ #define DISP_LINE_LEN 16int do_mem_md (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {ulong addr, length; -ulong i, nbytes, linebytes; -u_char *cp; +#if defined(CONFIG_HAS_DATAFLASH ) +ulong nbytes, linebytes; +#endif int size;int rc =0 ;
@@ -128,6 +129,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int fl length =simple_strtoul (argv[2 ],NULL ,16 ); } +#if defined(CONFIG_HAS_DATAFLASH )/* Print the lines. * * We buffer all read data, so we can make sure data is read only
@@ -136,64 +138,25 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int fl nbytes = length * size;do {char linebuf[DISP_LINE_LEN ]; -uint *uip = (uint *)linebuf; -ushort *usp = (ushort *)linebuf; -u_char *ucp = (u_char *)linebuf; -#ifdef CONFIG_HAS_DATAFLASH -int rc; -#endif -printf ("%08lx:" , addr); +void * p; linebytes = (nbytes>DISP_LINE_LEN )?DISP_LINE_LEN :nbytes; -#ifdef CONFIG_HAS_DATAFLASH -if ((rc =read_dataflash (addr, (linebytes/size)*size, linebuf)) ==DATAFLASH_OK ){ -/* if outside dataflash */ -/*if (rc != 1) { -dataflash_perror (rc); -return (1); -}*/ -for (i=0 ; i<linebytes; i+= size) { -if (size ==4 ) { -printf (" %08x" , *uip++); - }else if (size ==2 ) { -printf (" %04x" , *usp++); - }else { -printf (" %02x" , *ucp++); - } - addr += size; - } + rc =read_dataflash (addr, (linebytes/size)*size, linebuf); + p = (rc ==DATAFLASH_OK ) ? linebuf : (void *)addr; +print_buffer (addr, p, size, linebytes/size,DISP_LINE_LEN /size); - }else {/* addr does not correspond to DataFlash */ -#endif -for (i=0 ; i<linebytes; i+= size) { -if (size ==4 ) { -printf (" %08x" , (*uip++ = *((uint *)addr))); - }else if (size ==2 ) { -printf (" %04x" , (*usp++ = *((ushort *)addr))); - }else { -printf (" %02x" , (*ucp++ = *((u_char *)addr))); - } - addr += size; - } -#ifdef CONFIG_HAS_DATAFLASH - } -#endif -puts (" " ); - cp = (u_char *)linebuf; -for (i=0 ; i<linebytes; i++) { -if ((*cp <0x20 ) || (*cp >0x7e )) -putc ('.' ); -else -printf ("%c" , *cp); - cp++; - } -putc ('\n' ); nbytes -= linebytes; + addr += linebytes;if (ctrlc ()) { rc =1 ;break ; } }while (nbytes >0 ); +#else +/* Print the lines. */ +print_buffer (addr, (void *)addr, size, length,DISP_LINE_LEN /size); + addr += size*length; +#endif dp_last_addr = addr; dp_last_length = length;
include/common.h +2 -0
@@ -187,6 +187,8 @@ void hang (void) __attribute__ ((noretulong int initdram (int );int display_options (void );void print_size (ulong ,const char *); +int print_buffer (ulong addr,void * data,uint width,uint count, +uint linelen);/* common/main.c */ void main_loop (void );
lib_generic/display_options.c +70 -0
80 lines not on this page · raw message
Signature · 1 line
1.4.3.rc2.g0503
PATCH 5/9 Whitespace fixup on common/cmd_ace.c (using Lindent)
This patch is in preparation of additional changes to the sysace driver. May as well take this opportunity to fixup the inconsistent whitespace since this file is about to undergo major changes anyway.
There are zero functional changes in this patch. It only cleans up the the whitespace.
--- common/cmd_ace.c | 295 +++++++++++++++++++++++++++--------------------------- 1 files changed, 146 insertions(+), 149 deletions(-)
common/cmd_ace.c +146 -149
@@ -17,7 +17,6 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ident "$Id:$"/* * The Xilinx SystemACE chip support is activated by defining
@@ -34,16 +33,16 @@ #ident "$Id:$"* * According to Xilinx technical support, before accessing the * SystemACE CF you need to set the following control bits: -* FORCECFGMODE : 1 -* CFGMODE : 0 -* CFGSTART : 0 +* FORCECFGMODE : 1 +* CFGMODE : 0 +* CFGSTART : 0 */ -# include <common.h> -# include <command.h> -# include <systemace.h> -# include <part.h> -# include <asm/io.h> +#include <common.h> +#include <command.h> +#include <systemace.h> +#include <part.h> +#include <asm/io.h> #ifdef CONFIG_SYSTEMACE
@@ -57,18 +56,18 @@ #ifdef CONFIG_SYSTEMACEstatic unsigned ace_readw (unsigned offset) {#if (CFG_SYSTEMACE_WIDTH ==8 ) -u16 temp; +u16 temp;#if !defined(__BIG_ENDIAN) - temp =((u16 )readb (CFG_SYSTEMACE_BASE +offset) <<8 ); - temp |= (u16 )readb (CFG_SYSTEMACE_BASE +offset+1 ); + temp = ((u16 )readb (CFG_SYSTEMACE_BASE + offset) <<8 ); + temp |= (u16 )readb (CFG_SYSTEMACE_BASE + offset +1 );#else - temp = (u16 )readb (CFG_SYSTEMACE_BASE +offset); - temp |=((u16 )readb (CFG_SYSTEMACE_BASE +offset+1 ) <<8 ); + temp = (u16 )readb (CFG_SYSTEMACE_BASE + offset); + temp |= ((u16 )readb (CFG_SYSTEMACE_BASE + offset +1 ) <<8 );#endif -return temp; +return temp;#else -return readw (CFG_SYSTEMACE_BASE +offset); +return readw (CFG_SYSTEMACE_BASE + offset);#endif }
@@ -76,73 +75,72 @@ static void ace_writew(unsigned val, uns {#if (CFG_SYSTEMACE_WIDTH ==8 )#if !defined(__BIG_ENDIAN) -writeb ((u8)(val>>8 ),CFG_SYSTEMACE_BASE +offset); -writeb ((u8 )val,CFG_SYSTEMACE_BASE +offset+1 ); +writeb ((u8) (val >>8 ),CFG_SYSTEMACE_BASE + offset); +writeb ((u8 ) val,CFG_SYSTEMACE_BASE + offset +1 );#else -writeb ((u8 )val,CFG_SYSTEMACE_BASE +offset); -writeb ((u8)(val>>8 ),CFG_SYSTEMACE_BASE +offset+1 ); +writeb ((u8 ) val,CFG_SYSTEMACE_BASE + offset); +writeb ((u8) (val >>8 ),CFG_SYSTEMACE_BASE + offset +1 );#endif #else -writew (val,CFG_SYSTEMACE_BASE +offset); +writew (val,CFG_SYSTEMACE_BASE + offset);#endif }/* */ -static unsigned long systemace_read (int dev, -unsigned long start, -unsigned long blkcnt, -unsigned long *buffer); +static unsigned long systemace_read (int dev,unsigned long start, +unsigned long blkcnt, +unsigned long *buffer); -static block_dev_desc_t systemace_dev = {0 }; +static block_dev_desc_t systemace_dev = {0 };static int get_cf_lock (void ) { -int retry =10 ; +int retry =10 ;/* CONTROLREG = LOCKREG */ -unsigned val=ace_readw (0x18 ); - val|=0x0002 ; -ace_writew ((val&0xffff ),0x18 ); +unsigned val =ace_readw (0x18 ); + val |=0x0002 ; +ace_writew ((val &0xffff ),0x18 );/* Wait for MPULOCK in STATUSREG[15:0] */ -while (! (ace_readw (0x04 ) &0x0002 )) { +while (!(ace_readw (0x04 ) &0x0002 )) { -if (retry <0 ) -return -1 ; +if (retry <0 ) +return -1 ; -udelay (100000 ); - retry -=1 ; - } +udelay (100000 ); + retry -=1 ; + } -return 0 ; +return 0 ; }static void release_cf_lock (void ) { -unsigned val=ace_readw (0x18 ); - val&=~(0x0002 ); -ace_writew ((val&0xffff ),0x18 ); +unsigned val =ace_readw (0x18 ); + val &= ~(0x0002 ); +ace_writew ((val &0xffff ),0x18 ); } -block_dev_desc_t *systemace_get_dev (int dev) +block_dev_desc_t *systemace_get_dev (int dev) {/* The first time through this, the systemace_dev object is not yet initialized. In that case, fill it in. */ -if (systemace_dev.blksz ==0 ) { - systemace_dev.if_type =IF_TYPE_UNKNOWN ; - systemace_dev.dev =0 ; - systemace_dev.part_type =PART_TYPE_UNKNOWN ; - systemace_dev.type =DEV_TYPE_HARDDISK ; - systemace_dev.blksz =512 ; - systemace_dev.removable =1 ; - systemace_dev.block_read = systemace_read; +if (systemace_dev.blksz ==0 ) { + systemace_dev.if_type =IF_TYPE_UNKNOWN ; + systemace_dev.dev =0 ; + systemace_dev.part_type =PART_TYPE_UNKNOWN ; + systemace_dev.type =DEV_TYPE_HARDDISK ; + systemace_dev.blksz =512 ; + systemace_dev.removable =1 ; + systemace_dev.block_read = systemace_read; -init_part (&systemace_dev); +init_part (&systemace_dev); - } + } -return &systemace_dev; +return &systemace_dev; }/*
@@ -150,118 +148,117 @@ block_dev_desc_t * systemace_get_dev(in* the dev_desc) to read blocks of data. The return value is the * number of blocks read. A zero return indicates an error. */ -static unsigned long systemace_read (int dev, -unsigned long start, -unsigned long blkcnt, -unsigned long *buffer) +static unsigned long systemace_read (int dev,unsigned long start, +unsigned long blkcnt,unsigned long *buffer) { -int retry; -unsigned blk_countdown; -unsigned char *dp = (unsigned char *)buffer; -unsigned val; - -if (get_cf_lock () <0 ) { -unsigned status =ace_readw (0x04 ); - -/* If CFDETECT is false, card is missing. */ -if (! (status&0x0010 )) { -printf ("** CompactFlash card not present. **\n" ); -return 0 ; - } - -printf ("**** ACE locked away from me (STATUSREG=%04x)\n" , status); -return 0 ; - } - +int retry; +unsigned blk_countdown; +unsigned char *dp = (unsigned char *)buffer; +unsigned val; + +if (get_cf_lock () <0 ) { +unsigned status =ace_readw (0x04 ); + +/* If CFDETECT is false, card is missing. */ +if (!(status &0x0010 )) { +printf ("** CompactFlash card not present. **\n" ); +return 0 ; + } + +printf ("**** ACE locked away from me (STATUSREG=%04x)\n" , + status); +return 0 ; + }#ifdef DEBUG_SYSTEMACE -printf ("... systemace read %lu sectors at %lu\n" , blkcnt, start); +printf ("... systemace read %lu sectors at %lu\n" , blkcnt, start);#endif - retry =2000 ; -for (;;) { - val =ace_readw (0x04 ); + retry =2000 ; +for (;;) { + val =ace_readw (0x04 ); -/* If CFDETECT is false, card is missing. */ -if (! (val &0x0010 )) { -printf ("**** ACE CompactFlash not found.\n" ); -release_cf_lock (); -return 0 ; - } +/* If CFDETECT is false, card is missing. */ +if (!(val &0x0010 )) { +printf ("**** ACE CompactFlash not found.\n" ); +release_cf_lock (); +return 0 ; + } -/* If RDYFORCMD, then we are ready to go. */ -if (val &0x0100 ) -break ; +/* If RDYFORCMD, then we are ready to go. */ +if (val &0x0100 ) +break ; -if (retry <0 ) { -printf ("**** SystemACE not ready.\n" ); -release_cf_lock (); -return 0 ; - } +if (retry <0 ) { +printf ("**** SystemACE not ready.\n" ); +release_cf_lock (); +return 0 ; + } -udelay (1000 ); - retry -=1 ; - } +udelay (1000 ); + retry -=1 ; + }/* The SystemACE can only transfer 256 sectors@a time, so limit the current chunk of sectors. The blk_countdown variable is the number of sectors left to transfer. */ - blk_countdown = blkcnt; -while (blk_countdown >0 ) { -unsigned trans = blk_countdown; + blk_countdown = blkcnt; +while (blk_countdown >0 ) { +unsigned trans = blk_countdown; -if (trans >256 ) trans =256 ; +if (trans >256 ) + trans =256 ;#ifdef DEBUG_SYSTEMACE -printf ("... transfer %lu sector in a chunk\n" , trans); +printf ("... transfer %lu sector in a chunk\n" , trans);#endif -/* Write LBA block address */ -ace_writew ((start>>0 ) &0xffff ,0x10 ); -ace_writew ((start>>16 ) &0x00ff ,0x12 ); - -/* NOTE: in the Write Sector count below, a count of 0 -causes a transfer of 256, so &0xff gives the right -value for whatever transfer count we want. */ - -/* Write sector count | ReadMemCardData. */ -ace_writew ((trans&0xff ) |0x0300 ,0x14 ); - -/* Reset the configruation controller */ - val =ace_readw (0x18 ); - val|=0x0080 ; -ace_writew (val,0x18 ); - - retry = trans *16 ; -while (retry >0 ) { -int idx; - -/* Wait for buffer to become ready. */ -while (! (ace_readw (0x04 ) &0x0020 )) { -udelay (100 ); - } - -/* Read 16 words of 2bytes from the sector buffer. */ -for (idx =0 ; idx <16 ; idx +=1 ) { -unsigned short val =ace_readw (0x40 ); - *dp++ = val &0xff ; - *dp++ = (val>>8 ) &0xff ; - } - - retry -=1 ; - } - -/* Clear the configruation controller reset */ - val =ace_readw (0x18 ); - val&=~0x0080 ; -ace_writew (val,0x18 ); - -/* Count the blocks we transfer this time. */ - start += trans; - blk_countdown -= trans; - } - -release_cf_lock (); - -return blkcnt; +/* Write LBA block address */ +ace_writew ((start >>0 ) &0xffff ,0x10 ); +ace_writew ((start >>16 ) &0x00ff ,0x12 ); + +/* NOTE: in the Write Sector count below, a count of 0 +causes a transfer of 256, so &0xff gives the right +value for whatever transfer count we want. */ + +/* Write sector count | ReadMemCardData. */ +ace_writew ((trans &0xff ) |0x0300 ,0x14 ); + +/* Reset the configruation controller */ + val =ace_readw (0x18 ); + val |=0x0080 ; +ace_writew (val,0x18 ); + + retry = trans *16 ; +while (retry >0 ) { +int idx; + +/* Wait for buffer to become ready. */ +while (!(ace_readw (0x04 ) &0x0020 )) { +udelay (100 ); + } + +/* Read 16 words of 2bytes from the sector buffer. */ +for (idx =0 ; idx <16 ; idx +=1 ) { +unsigned short val =ace_readw (0x40 ); + *dp++ = val &0xff ; + *dp++ = (val >>8 ) &0xff ; + } + + retry -=1 ; + } + +/* Clear the configruation controller reset */ + val =ace_readw (0x18 ); + val &= ~0x0080 ; +ace_writew (val,0x18 ); + +/* Count the blocks we transfer this time. */ + start += trans; + blk_countdown -= trans; + } + +release_cf_lock (); + +return blkcnt; } -#endif /* CONFIG_SYSTEMACE */ +#endif /* CONFIG_SYSTEMACE */
Signature · 1 line
1.4.3.rc2.g0503
PATCH 6/9 Move common/cmd_ace.c to drivers/systemace.c
The code in this file is not a command; it is a device driver. Put it in the correct place. There are zero functional changes in this patch, it only moves the file.
--- common/Makefile | 3 +- common/cmd_ace.c | 264 --------------------------------------------------- drivers/Makefile | 2 +- drivers/systemace.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 266 insertions(+), 267 deletions(-)
common/Makefile +1 -2
@@ -27,8 +27,7 @@ LIB = $(obj)libcommon.a AOBJS = -COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \ - cmd_ace.o cmd_autoscript.o \ +COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \ cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \ cmd_cache.o cmd_console.o \ cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
common/cmd_ace.c deleted +0 -264
264 lines not on this page · raw message
drivers/Makefile +1 -1
@@ -44,7 +44,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o atme serial.o serial_max3100.o \ serial_pl010.o serial_pl011.o serial_xuartlite.o \ sl811_usb.o sm501.o smc91111.o smiLynxEM.o \ - status_led.o sym53c8xx.o ahci.o \ + status_led.o sym53c8xx.o systemace.o ahci.o \ ti_pci1410a.o tigon3.o tsec.o \ usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \ videomodes.o w83c553f.o \
drivers/systemace.c new file +264 -0
264 lines not on this page · raw message
Signature · 1 line
1.4.3.rc2.g0503
PATCH 7/9 Replace ace_readw/ace_writeb functions with macros
Register read/write does not need to be wrapped in a full function. The patch replaces them with macros.
--- drivers/systemace.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-)
drivers/systemace.c +10 -26
@@ -53,38 +53,22 @@ #ifdef CONFIG_SYSTEMACE* to be the base address for the chip, usually in the local * peripheral bus. */ -static unsigned ace_readw (unsigned offset) -{ -#if (CFG_SYSTEMACE_WIDTH ==8 ) -u16 temp; - -#if !defined(__BIG_ENDIAN) - temp = ((u16 )readb (CFG_SYSTEMACE_BASE + offset) <<8 ); - temp |= (u16 )readb (CFG_SYSTEMACE_BASE + offset +1 ); -#else - temp = (u16 )readb (CFG_SYSTEMACE_BASE + offset); - temp |= ((u16 )readb (CFG_SYSTEMACE_BASE + offset +1 ) <<8 ); -#endif -return temp; -#else -return readw (CFG_SYSTEMACE_BASE + offset); -#endif -} - -static void ace_writew (unsigned val,unsigned offset) -{#if (CFG_SYSTEMACE_WIDTH ==8 )#if !defined(__BIG_ENDIAN) -writeb ((u8) (val >>8 ),CFG_SYSTEMACE_BASE + offset); -writeb ((u8 ) val,CFG_SYSTEMACE_BASE + offset +1 ); +#define ace_readw (off) ((readb(CFG_SYSTEMACE_BASE+off)<<8) | \ + (readb(CFG_SYSTEMACE_BASE+off+1))) +#define ace_write (val, off) {writeb(val>>8, CFG_SYSTEMACE_BASE+off); \ + writeb(val, CFG_SYSTEMACE_BASE+off+1);}#else -writeb ((u8 ) val,CFG_SYSTEMACE_BASE + offset); -writeb ((u8) (val >>8 ),CFG_SYSTEMACE_BASE + offset +1 ); +#define ace_readw (off) ((readb(CFG_SYSTEMACE_BASE+off)) | \ + (readb(CFG_SYSTEMACE_BASE+off+1)<<8)) +#define ace_write (val, off) {writeb(val, CFG_SYSTEMACE_BASE+off); \ + writeb(val>>8, CFG_SYSTEMACE_BASE+off+1);}#endif #else -writew (val,CFG_SYSTEMACE_BASE + offset); +#define ace_readw (off) (readw(CFG_SYSTEMACE_BASE+off)) +#define ace_writew (val, off) (writew(val, CFG_SYSTEMACE_BASE+off))#endif -}/* */
Signature · 1 line
1.4.3.rc2.g0503
PATCH 8/9 Add block_write hook to block_dev_desc_t
Preparation for future patches which support block device writing
--- include/part.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
include/part.h +4 -0
@@ -45,6 +45,10 @@ #endifunsigned long start, lbaint_t blkcnt, unsigned long *buffer); +unsigned long (*block_write)(int dev, +unsigned long start, +lbaint_t blkcnt, +const void *buffer); }block_dev_desc_t;/* Interface types: */
Signature · 1 line
1.4.3.rc2.g0503
PATCH 9/9 Use "void *" not "unsigned long *" for block dev read/write buffer pointers
Block device read/write is anonymous data; there is no need to use a typed pointer. void * is fine. Also add a hook for block_read functions
--- common/cmd_ide.c | 8 ++++---- common/cmd_scsi.c | 4 ++-- common/usb_storage.c | 4 ++-- cpu/pxa/mmc.c | 2 +- drivers/systemace.c | 7 +++---- include/ide.h | 4 ++-- include/part.h | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-)
common/cmd_ide.c +4 -4
@@ -188,7 +188,7 @@ static void ident_cpy (unsigned char *de#ifdef CONFIG_ATAPI static void atapi_inquiry (block_dev_desc_t *dev_desc); -ulong atapi_read (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer); +ulong atapi_read (int device,lbaint_t blknr,ulong blkcnt,void *buffer);#endif
@@ -1233,7 +1233,7 @@ #endif/* ------------------------------------------------------------------------- */ -ulong ide_read (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer) +ulong ide_read (int device,lbaint_t blknr,ulong blkcnt,void *buffer) {ulong n =0 ;unsigned char c;
@@ -1353,7 +1353,7 @@ IDE_READ_E:/* ------------------------------------------------------------------------- */ -ulong ide_write (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer) +ulong ide_write (int device,lbaint_t blknr,ulong blkcnt,void *buffer) {ulong n =0 ;unsigned char c;
@@ -2015,7 +2015,7 @@ #define ATAPI_READ_MAX_BYTES 2048 /* we#define ATAPI_READ_BLOCK_SIZE 2048/* assuming CD part */ #define ATAPI_READ_MAX_BLOCK ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE/* max blocks */ -ulong atapi_read (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer) +ulong atapi_read (int device,lbaint_t blknr,ulong blkcnt,void *buffer) {ulong n =0 ;unsigned char ccb[12 ];/* Command descriptor block */
common/cmd_scsi.c +2 -2
@@ -74,7 +74,7 @@ void scsi_setup_inquiry(ccb * pccb);void scsi_ident_cpy (unsigned char *dest,unsigned char *src,unsigned int len); -ulong scsi_read (int device,ulong blknr,ulong blkcnt,ulong *buffer); +ulong scsi_read (int device,ulong blknr,ulong blkcnt,void *buffer);/*********************************************************************************
@@ -424,7 +424,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag,#define SCSI_MAX_READ_BLK 0xFFFF/* almost the maximum amount of the scsi_ext command.. */ -ulong scsi_read (int device,ulong blknr,ulong blkcnt,ulong *buffer) +ulong scsi_read (int device,ulong blknr,ulong blkcnt,void *buffer) {ulong start,blks, buf_addr;unsigned short smallblks;
common/usb_storage.c +2 -2
@@ -169,7 +169,7 @@ #define USB_STOR_TRANSPORT_ERROR -2int usb_stor_get_info (struct usb_device *dev,struct us_data *us,block_dev_desc_t *dev_desc);int usb_storage_probe (struct usb_device *dev,unsigned int ifnum,struct us_data *ss); -unsigned long usb_stor_read (int device,unsigned long blknr,unsigned long blkcnt,unsigned long *buffer); +unsigned long usb_stor_read (int device,unsigned long blknr,unsigned long blkcnt,void *buffer);struct usb_device *usb_get_dev_index (int index);void uhci_show_temp_int_td (void );
@@ -941,7 +941,7 @@ #endif /* CONFIG_USB_BIN_FIXUP */#define USB_MAX_READ_BLK 20 -unsigned long usb_stor_read (int device,unsigned long blknr,unsigned long blkcnt,unsigned long *buffer) +unsigned long usb_stor_read (int device,unsigned long blknr,unsigned long blkcnt,void *buffer) {unsigned long start,blks, buf_addr;unsigned short smallblks;
cpu/pxa/mmc.c +1 -1
@@ -363,7 +363,7 @@ mmc_write(uchar *src, ulong dst, int sizulong /****************************************************/ -mmc_bread (int dev_num,ulong blknr,ulong blkcnt,ulong *dst) +mmc_bread (int dev_num,ulong blknr,ulong blkcnt,void *dst)/****************************************************/ {int mmc_block_size =MMC_BLOCK_SIZE ;
drivers/systemace.c +3 -4
@@ -73,8 +73,7 @@ #endif/* */ static unsigned long systemace_read (int dev,unsigned long start, -unsigned long blkcnt, -unsigned long *buffer); +unsigned long blkcnt,void *buffer);static block_dev_desc_t systemace_dev = {0 };
@@ -133,11 +132,11 @@ block_dev_desc_t *systemace_get_dev(int* number of blocks read. A zero return indicates an error. */ static unsigned long systemace_read (int dev,unsigned long start, -unsigned long blkcnt,unsigned long *buffer) +unsigned long blkcnt,void *buffer) {int retry;unsigned blk_countdown; -unsigned char *dp = (unsigned char *)buffer; +unsigned char *dp = buffer;unsigned val;if (get_cf_lock () <0 ) {
include/ide.h +2 -2
@@ -49,7 +49,7 @@ #endif*/ void ide_init (void ); -ulong ide_read (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer); -ulong ide_write (int device,lbaint_t blknr,ulong blkcnt,ulong *buffer); +ulong ide_read (int device,lbaint_t blknr,ulong blkcnt,void *buffer); +ulong ide_write (int device,lbaint_t blknr,ulong blkcnt,void *buffer);#endif /* _IDE_H */
include/part.h +1 -1
@@ -44,7 +44,7 @@ #endifunsigned long (*block_read)(int dev,unsigned long start,lbaint_t blkcnt, -unsigned long *buffer); +void *buffer); unsigned long (*block_write)(int dev, unsigned long start, lbaint_t blkcnt,
Signature · 1 line
1.4.3.rc2.g0503
Stefan Roese
AppliedQuoted 6 lines · Grant Likely
Here is another set of miscellaneous patches from my queue. Please comment and/or merge. These patches can also be pulled from my git tree:
git://git.secretlab.ca/srv/git-trees/public/git/u-boot.git#merge
http://git.secretlab.ca/git/u-boot.git#merge
Quoted 6 lines
Patches 1, 2 and 4 are the same as in my previous set, so I haven't resent them (hence the missing patch numbers)
Patch #3 has been modified based on comments from the mailing list
Patches 5-9 are new.
Applied. Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
=====================================================================