diff options
| author | Stefan Roese <sr@denx.de> | 2007-02-20 10:58:04 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-02-20 10:58:04 +0100 |
| commit | 90b0cf47eb23e5f3461d3d957f6898386907fd99 (patch) | |
| tree | 4acaab40f79d89c08cad928fdf52cad3a93dbdec /common/cmd_scsi.c | |
| parent | 4745acaa1a603b67f6b9b7970365ebadd7d6586f (diff) | |
| parent | eb867a76238fb38e952c37871b16d0d7fd61c95f (diff) | |
| download | olio-uboot-2014.01-90b0cf47eb23e5f3461d3d957f6898386907fd99.tar.xz olio-uboot-2014.01-90b0cf47eb23e5f3461d3d957f6898386907fd99.zip | |
Merge with /home/stefan/git/u-boot/denx-merge-sr
Diffstat (limited to 'common/cmd_scsi.c')
| -rw-r--r-- | common/cmd_scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index cc08743d5..da36ed9e1 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -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); /********************************************************************************* @@ -194,7 +194,7 @@ void scsi_init(void) block_dev_desc_t * scsi_get_dev(int dev) { - return((block_dev_desc_t *)&scsi_dev_desc[dev]); + return (dev < CFG_SCSI_MAX_DEVICE) ? &scsi_dev_desc[dev] : NULL; } @@ -424,7 +424,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #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; |