diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-04-18 16:06:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-04-18 16:06:05 +0200 |
| commit | 0f5642d7322740ad008a4c5eb0a131d64a6f7a0a (patch) | |
| tree | 129be3feb683cc3b54c259429c5b9fad75f5ffeb /common/cmd_ide.c | |
| parent | ad4eb555671d97f96dc56eab55103b1f86874b01 (diff) | |
| parent | afc7e4c2a4729427bec672561ea1b3dbb5e8c0d3 (diff) | |
| download | u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.zip u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.tar.gz u-boot-imx-0f5642d7322740ad008a4c5eb0a131d64a6f7a0a.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'common/cmd_ide.c')
| -rw-r--r-- | common/cmd_ide.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index b4119f3..ce99a41 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -423,7 +423,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } part = simple_strtoul(++ep, NULL, 16); } - if (get_partition_info (ide_dev_desc, part, &info)) { + if (get_partition_info (&ide_dev_desc[dev], part, &info)) { SHOW_BOOT_PROGRESS (-1); return 1; } @@ -1344,7 +1344,7 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer) ++n; ++blknr; - buffer += ATA_SECTORWORDS; + buffer += ATA_BLOCKSIZE; } IDE_READ_E: ide_led (DEVICE_LED(device), 0); /* LED off */ @@ -1428,7 +1428,7 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer) c = ide_inb (device, ATA_STATUS); /* clear IRQ */ ++n; ++blknr; - buffer += ATA_SECTORWORDS; + buffer += ATA_BLOCKSIZE; } WR_OUT: ide_led (DEVICE_LED(device), 0); /* LED off */ @@ -2052,7 +2052,7 @@ ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer) n+=cnt; blkcnt-=cnt; blknr+=cnt; - buffer+=cnt*(ATAPI_READ_BLOCK_SIZE/4); /* ulong blocksize in ulong */ + buffer+=(cnt*ATAPI_READ_BLOCK_SIZE); } while (blkcnt > 0); return (n); } |