Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: Correct function signatures for ide_read/write()

Browse source 
The prototypes in the header were changed by commit 4ac8f8e0 but the
functions no longer match. Correct this.

It seems odd that block devices take an lbaint_t for the block count, but
an unsigned long for the blknr. Surely we should promote blknr to lbaint_t
also?

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@ti.com>
This commit is contained in:
Simon Glass 2012-10-29 05:24:04 +00:00 • committed by Tom Rini
parent fe1f808ce7
commit b6458d38d6
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
common/cmd_ide.c
View file

@ -96,7 +96,8 @@ static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len
#ifdef CONFIG_ATAPI #ifdef CONFIG_ATAPI
static void atapi_inquiry(block_dev_desc_t *dev_desc); static void atapi_inquiry(block_dev_desc_t *dev_desc);
ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer); static ulong atapi_read(int device, ulong blknr, lbaint_t blkcnt,
void *buffer);
#endif #endif
@ -826,7 +827,7 @@ static void ide_ident(block_dev_desc_t *dev_desc)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer) ulong ide_read(int device, ulong blknr, lbaint_t blkcnt, void *buffer)
{ {
ulong n = 0; ulong n = 0;
unsigned char c; unsigned char c;
@ -840,7 +841,7 @@ ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer)
lba48 = 1; lba48 = 1;
} }
#endif #endif
debug("ide_read dev %d start %lX, blocks %lX buffer at %lX\n", debug("ide_read dev %d start %lX, blocks " LBAF " buffer at %lX\n",
device, blknr, blkcnt, (ulong) buffer); device, blknr, blkcnt, (ulong) buffer);
ide_led(DEVICE_LED(device), 1); /* LED on */ ide_led(DEVICE_LED(device), 1); /* LED on */
@ -930,13 +931,8 @@ ulong ide_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer)
if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) != if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
ATA_STAT_DRQ) { ATA_STAT_DRQ) {
#if defined(CONFIG_SYS_64BIT_LBA) printf("Error (no IRQ) dev %d blk %ld: status %#02x\n",
printf("Error (no IRQ) dev %d blk %lld: status 0x%02x\n",
device, blknr, c); device, blknr, c);
#else
printf("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
device, (ulong) blknr, c);
#endif
break; break;
} }
@ -955,7 +951,7 @@ IDE_READ_E:
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, const void *buffer) ulong ide_write(int device, ulong blknr, lbaint_t blkcnt, const void *buffer)
{ {
ulong n = 0; ulong n = 0;
unsigned char c; unsigned char c;
@ -1023,13 +1019,8 @@ ulong ide_write(int device, lbaint_t blknr, ulong blkcnt, const void *buffer)
if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) != if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
ATA_STAT_DRQ) { ATA_STAT_DRQ) {
#if defined(CONFIG_SYS_64BIT_LBA) printf("Error (no IRQ) dev %d blk %ld: status %#02x\n",
printf("Error (no IRQ) dev %d blk %lld: status 0x%02x\n",
device, blknr, c); device, blknr, c);
#else
printf("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
device, (ulong) blknr, c);
#endif
goto WR_OUT; goto WR_OUT;
} }
@ -1518,13 +1509,13 @@ static void atapi_inquiry(block_dev_desc_t *dev_desc)
#define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */ #define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */
#define ATAPI_READ_MAX_BLOCK (ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE) #define ATAPI_READ_MAX_BLOCK (ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE)
ulong atapi_read(int device, lbaint_t blknr, ulong blkcnt, void *buffer) ulong atapi_read(int device, ulong blknr, lbaint_t blkcnt, void *buffer)
{ {
ulong n = 0; ulong n = 0;
unsigned char ccb[12]; /* Command descriptor block */ unsigned char ccb[12]; /* Command descriptor block */
ulong cnt; ulong cnt;
debug("atapi_read dev %d start %lX, blocks %lX buffer at %lX\n", debug("atapi_read dev %d start %lX, blocks " LBAF " buffer at %lX\n",
device, blknr, blkcnt, (ulong) buffer); device, blknr, blkcnt, (ulong) buffer);
do { do {