diff options
| author | Simon Glass <sjg@chromium.org> | 2023-04-25 10:54:32 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-27 13:51:06 -0400 |
| commit | bc65bff5dc5cf794df849ee18621442717edc926 (patch) | |
| tree | beebbc12d4ecfd590f1392f1223e16109bb2f3ac /drivers/block | |
| parent | 62d13fa6349e66f839fa855ac3f7ec71a1adfe87 (diff) | |
| download | u-boot-bc65bff5dc5cf794df849ee18621442717edc926.zip u-boot-bc65bff5dc5cf794df849ee18621442717edc926.tar.gz u-boot-bc65bff5dc5cf794df849ee18621442717edc926.tar.bz2 | |
ide: Move a few functions further up the file
Move these functions so they appear before they are used.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ide.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/drivers/block/ide.c b/drivers/block/ide.c index b5be022..58f1ef8 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -75,6 +75,40 @@ static void ide_reset(void) #define ide_reset() /* dummy */ #endif /* CONFIG_IDE_RESET */ +__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); + + outb(val, ATA_CURR_BASE(dev) + port); +} + +__weak unsigned char ide_inb(int dev, int port) +{ + uchar val; + + val = inb(ATA_CURR_BASE(dev) + port); + + debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", + dev, port, ATA_CURR_BASE(dev) + port, val); + return val; +} + +__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words) +{ + uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); + ushort *dbuf = (ushort *)sect_buf; + + debug("in input swap data base for read is %p\n", (void *)paddr); + + while (words--) { + EIEIO; + *dbuf++ = be16_to_cpu(inw(paddr)); + EIEIO; + *dbuf++ = be16_to_cpu(inw(paddr)); + } +} + /* * Wait until Busy bit is off, or timeout (in ms) * Return last status @@ -668,25 +702,6 @@ static void ide_ident(struct blk_desc *dev_desc) #endif } -__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); - - outb(val, ATA_CURR_BASE(dev) + port); -} - -__weak unsigned char ide_inb(int dev, int port) -{ - uchar val; - - val = inb(ATA_CURR_BASE(dev) + port); - - debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", - dev, port, ATA_CURR_BASE(dev) + port, val); - return val; -} - static void ide_init(void) { unsigned char c; @@ -763,21 +778,6 @@ static void ide_init(void) schedule(); } -__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words) -{ - uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); - ushort *dbuf = (ushort *)sect_buf; - - debug("in input swap data base for read is %p\n", (void *)paddr); - - while (words--) { - EIEIO; - *dbuf++ = be16_to_cpu(inw(paddr)); - EIEIO; - *dbuf++ = be16_to_cpu(inw(paddr)); - } -} - __weak void ide_output_data(int dev, const ulong *sect_buf, int words) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); |