diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
| commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
| tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /common/cmd_scsi.c | |
| parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
| parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) | |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
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 cc08743d5dc..da36ed9e1d1 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; |