Signed-off-by: Marek Vasut marek.vasut@gmail.com --- common/cmd_ide.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 093ca9f..9c4b250 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -161,8 +161,8 @@ static uchar ide_wait (int dev, ulong t);

#define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */

-static void input_data(int dev, ulong *sect_buf, int words); -static void output_data(int dev, ulong *sect_buf, int words); +static void input_data(int dev, uint16_t *sect_buf, int words); +static void output_data(int dev, uint16_t *sect_buf, int words); static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);

#ifndef CONFIG_SYS_ATA_PORT_ADDR @@ -526,7 +526,7 @@ __ide_outb(int dev, int port, unsigned char val) { debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", dev, port, val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); - outb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); + writeb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); } void ide_outb (int dev, int port, unsigned char val) __attribute__((weak, alias("__ide_outb"))); @@ -535,7 +535,7 @@ unsigned char inline __ide_inb(int dev, int port) { uchar val; - val = inb((ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); + val = readb((ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", dev, port, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)), val); return val; @@ -937,9 +937,11 @@ output_data(int dev, ulong *sect_buf, int words) } #else /* ! __PPC__ */ static void -output_data(int dev, ulong *sect_buf, int words) +output_data(int dev, uint16_t *sect_buf, int words) { - outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words<<1); + int i; + for (i = 0; i < (words << 1); i++) + writew(sect_buf[i], ATA_CURR_BASE(dev)+ATA_DATA_REG); } #endif /* __PPC__ */

@@ -995,9 +997,11 @@ input_data(int dev, ulong *sect_buf, int words) } #else /* ! __PPC__ */ static void -input_data(int dev, ulong *sect_buf, int words) +input_data(int dev, uint16_t *sect_buf, int words) { - insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1); + int i; + for (i = 0; i < (words << 1); i++) + sect_buf[i] = readw(ATA_CURR_BASE(dev)+ATA_DATA_REG); }

#endif /* __PPC__ */ @@ -1115,7 +1119,7 @@ static void ide_ident (block_dev_desc_t *dev_desc) return; #endif

- input_swap_data (device, iobuf, ATA_SECTORWORDS); + input_swap_data (device, (uint16_t *)iobuf, ATA_SECTORWORDS);

ident_cpy ((unsigned char*)dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision)); ident_cpy ((unsigned char*)dev_desc->vendor, iop->model, sizeof(dev_desc->vendor));