|
@@ -676,28 +676,14 @@ __weak void 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) + port);
|
|
|
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- if (port) {
|
|
|
- /* write command */
|
|
|
- ide_write_register(dev, port, val);
|
|
|
- } else {
|
|
|
- /* write data */
|
|
|
- outb(val, (ATA_CURR_BASE(dev)));
|
|
|
- }
|
|
|
-#else
|
|
|
outb(val, ATA_CURR_BASE(dev) + port);
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
__weak unsigned char ide_inb(int dev, int port)
|
|
|
{
|
|
|
uchar val;
|
|
|
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- val = ide_read_register(dev, port);
|
|
|
-#else
|
|
|
val = inb(ATA_CURR_BASE(dev) + port);
|
|
|
-#endif
|
|
|
|
|
|
debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n",
|
|
|
dev, port, ATA_CURR_BASE(dev) + port, val);
|
|
@@ -824,9 +810,6 @@ __weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
|
|
|
|
|
|
__weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
{
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- ide_write_data(dev, sect_buf, words);
|
|
|
-#else
|
|
|
uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
ushort *dbuf;
|
|
|
|
|
@@ -837,14 +820,10 @@ __weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
EIEIO;
|
|
|
outw(cpu_to_le16(*dbuf++), paddr);
|
|
|
}
|
|
|
-#endif /* CONFIG_IDE_AHB */
|
|
|
}
|
|
|
|
|
|
__weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
{
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- ide_read_data(dev, sect_buf, words);
|
|
|
-#else
|
|
|
uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
ushort *dbuf;
|
|
|
|
|
@@ -858,7 +837,6 @@ __weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
EIEIO;
|
|
|
*dbuf++ = le16_to_cpu(inw(paddr));
|
|
|
}
|
|
|
-#endif /* CONFIG_IDE_AHB */
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_BLK
|