Rename VAR16_32 to VAR16VISIBLE.
[seabios.git] / src / ata.c
index cbd61d95b23e54527885b0d990c7b7c6963014e4..98d114159fda800072da2b01e0f4ecb760157d51 100644 (file)
--- a/src/ata.c
+++ b/src/ata.c
 // Low level ATA disk access
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 // Copyright (C) 2002  MandrakeSoft S.A.
 //
-// This file may be distributed under the terms of the GNU GPLv3 license.
+// This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "ata.h" // ATA_*
 #include "types.h" // u8
 #include "ioport.h" // inb
-#include "util.h" // BX_INFO
+#include "util.h" // dprintf
 #include "cmos.h" // inb_cmos
+#include "pic.h" // enable_hwirq
+#include "biosvar.h" // GET_EBDA
+#include "pci.h" // pci_find_class
+#include "pci_ids.h" // PCI_CLASS_STORAGE_OTHER
+#include "pci_regs.h" // PCI_INTERRUPT_LINE
+#include "boot.h" // add_bcv_hd
+#include "disk.h" // struct ata_s
+#include "ata.h" // ATA_CB_STAT
 
-#define TIMEOUT 0
-#define BSY 1
-#define NOT_BSY 2
-#define NOT_BSY_DRQ 3
-#define NOT_BSY_NOT_DRQ 4
-#define NOT_BSY_RDY 5
+#define IDE_SECTOR_SIZE 512
+#define CDROM_SECTOR_SIZE 2048
 
-#define IDE_TIMEOUT 32000u //32 seconds max for IDE ops
+#define IDE_TIMEOUT 32000 //32 seconds max for IDE ops
 
-#define DEBUGF1(fmt, args...) bprintf(0, fmt , ##args)
-#define DEBUGF(fmt, args...)
+struct ata_channel_s ATA_channels[CONFIG_MAX_ATA_INTERFACES] VAR16VISIBLE;
 
-// XXX - lots of redundancy in this file.
 
-static int
-await_ide(u8 when_done, u16 base, u16 timeout)
+/****************************************************************
+ * Helper functions
+ ****************************************************************/
+
+// Wait for the specified ide state
+static inline int
+await_ide(u8 mask, u8 flags, u16 base, u16 timeout)
 {
-    u32 time=0, last=0;
-    // for the times you're supposed to throw one away
-    u16 status = inb(base + ATA_CB_STAT);
+    u64 end = calc_future_tsc(timeout);
     for (;;) {
-        status = inb(base+ATA_CB_STAT);
-        time++;
-        u8 result;
-        if (when_done == BSY)
-            result = status & ATA_CB_STAT_BSY;
-        else if (when_done == NOT_BSY)
-            result = !(status & ATA_CB_STAT_BSY);
-        else if (when_done == NOT_BSY_DRQ)
-            result = !(status & ATA_CB_STAT_BSY) && (status & ATA_CB_STAT_DRQ);
-        else if (when_done == NOT_BSY_NOT_DRQ)
-            result = !(status & ATA_CB_STAT_BSY) && !(status & ATA_CB_STAT_DRQ);
-        else if (when_done == NOT_BSY_RDY)
-            result = !(status & ATA_CB_STAT_BSY) && (status & ATA_CB_STAT_RDY);
-        else if (when_done == TIMEOUT)
-            result = 0;
-
-        if (result)
-            return 0;
-        // mod 2048 each 16 ms
-        if (time>>16 != last) {
-            last = time >>16;
-            DEBUGF("await_ide: (TIMEOUT,BSY,!BSY,!BSY_DRQ,!BSY_!DRQ,!BSY_RDY)"
-                   " %d time= %d timeout= %d\n"
-                   , when_done, time>>11, timeout);
-        }
-        if (status & ATA_CB_STAT_ERR) {
-            DEBUGF("await_ide: ERROR (TIMEOUT,BSY,!BSY,!BSY_DRQ"
-                   ",!BSY_!DRQ,!BSY_RDY) %d time= %d timeout= %d\n"
-                   , when_done, time>>11, timeout);
+        u8 status = inb(base+ATA_CB_STAT);
+        if ((status & mask) == flags)
+            return status;
+        if (rdtscll() > end) {
+            dprintf(1, "IDE time out\n");
             return -1;
         }
-        if ((timeout == 0) || ((time>>11) > timeout))
-            break;
     }
-    BX_INFO("IDE time out\n");
-    return -1;
 }
 
+// Wait for the device to be not-busy.
+static int
+await_not_bsy(u16 base)
+{
+    return await_ide(ATA_CB_STAT_BSY, 0, base, IDE_TIMEOUT);
+}
 
-// ---------------------------------------------------------------------------
-// ATA/ATAPI driver : software reset
-// ---------------------------------------------------------------------------
-// ATA-3
-// 8.2.1 Software reset - Device 0
-
-void
-ata_reset(u16 device)
+// Wait for the device to be ready.
+static int
+await_rdy(u16 base)
 {
-    u16 iobase1, iobase2;
-    u8  channel, slave, sn, sc;
-    u8  type;
+    return await_ide(ATA_CB_STAT_RDY, ATA_CB_STAT_RDY, base, IDE_TIMEOUT);
+}
 
-    channel = device / 2;
-    slave = device % 2;
+// Wait for ide state - pauses for one ata cycle first.
+static inline int
+pause_await_not_bsy(u16 iobase1, u16 iobase2)
+{
+    // Wait one PIO transfer cycle.
+    inb(iobase2 + ATA_CB_ASTAT);
 
-    iobase1 = GET_EBDA(ata.channels[channel].iobase1);
-    iobase2 = GET_EBDA(ata.channels[channel].iobase2);
+    return await_not_bsy(iobase1);
+}
 
-    // Reset
+// Wait for ide state - pause for 400ns first.
+static inline int
+ndelay_await_not_bsy(u16 iobase1)
+{
+    ndelay(400);
+    return await_not_bsy(iobase1);
+}
 
-    // 8.2.1 (a) -- set SRST in DC
+// Reset a drive
+static void
+ata_reset(int driveid)
+{
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u8 slave = ataid % 2;
+    u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+    u16 iobase2 = GET_GLOBAL(ATA_channels[channel].iobase2);
+
+    dprintf(6, "ata_reset driveid=%d\n", driveid);
+    // Pulse SRST
     outb(ATA_CB_DC_HD15 | ATA_CB_DC_NIEN | ATA_CB_DC_SRST, iobase2+ATA_CB_DC);
-
-    // 8.2.1 (b) -- wait for BSY
-    await_ide(BSY, iobase1, 20);
-
-    // 8.2.1 (f) -- clear SRST
+    udelay(5);
     outb(ATA_CB_DC_HD15 | ATA_CB_DC_NIEN, iobase2+ATA_CB_DC);
-
-    type=GET_EBDA(ata.devices[device].type);
-    if (type != ATA_TYPE_NONE) {
-
-        // 8.2.1 (g) -- check for sc==sn==0x01
-        // select device
-        outb(slave?ATA_CB_DH_DEV1:ATA_CB_DH_DEV0, iobase1+ATA_CB_DH);
-        sc = inb(iobase1+ATA_CB_SC);
-        sn = inb(iobase1+ATA_CB_SN);
-
-        if ( (sc==0x01) && (sn==0x01) ) {
-            if (type == ATA_TYPE_ATA) //ATA
-                await_ide(NOT_BSY_RDY, iobase1, IDE_TIMEOUT);
-            else //ATAPI
-                await_ide(NOT_BSY, iobase1, IDE_TIMEOUT);
+    mdelay(2);
+
+    // wait for device to become not busy.
+    int status = await_not_bsy(iobase1);
+    if (status < 0)
+        goto done;
+    if (slave) {
+        // Change device.
+        u64 end = calc_future_tsc(IDE_TIMEOUT);
+        for (;;) {
+            outb(ATA_CB_DH_DEV1, iobase1 + ATA_CB_DH);
+            status = ndelay_await_not_bsy(iobase1);
+            if (status < 0)
+                goto done;
+            if (inb(iobase1 + ATA_CB_DH) == ATA_CB_DH_DEV1)
+                break;
+            // Change drive request failed to take effect - retry.
+            if (rdtscll() > end) {
+                dprintf(1, "ata_reset slave time out\n");
+                goto done;
+            }
         }
-
-        // 8.2.1 (h) -- wait for not BSY
-        await_ide(NOT_BSY, iobase1, IDE_TIMEOUT);
+    } else {
+        // QEMU doesn't reset dh on reset, so set it explicitly.
+        outb(ATA_CB_DH_DEV0, iobase1 + ATA_CB_DH);
     }
 
+    // On a user-reset request, wait for RDY if it is an ATA device.
+    u8 type=GET_GLOBAL(Drives.drives[driveid].type);
+    if (type == DTYPE_ATA)
+        status = await_rdy(iobase1);
+
+done:
     // Enable interrupts
     outb(ATA_CB_DC_HD15, iobase2+ATA_CB_DC);
-}
 
+    dprintf(6, "ata_reset exit status=%x\n", status);
+}
 
-// ---------------------------------------------------------------------------
-// ATA/ATAPI driver : execute a data command
-// ---------------------------------------------------------------------------
-      // returns
-      // 0 : no error
-      // 1 : BUSY bit set
-      // 2 : read error
-      // 3 : expected DRQ=1
-      // 4 : no sectors left to read/verify
-      // 5 : more sectors to read/verify
-      // 6 : no sectors left to write
-      // 7 : more sectors to write
+static int
+isready(int driveid)
+{
+    // Read the status from controller
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+    u8 status = inb(iobase1 + ATA_CB_STAT);
+    if ((status & (ATA_CB_STAT_BSY|ATA_CB_STAT_RDY)) == ATA_CB_STAT_RDY)
+        return DISK_RET_SUCCESS;
+    return DISK_RET_ENOTREADY;
+}
 
 static int
-send_cmd(struct ata_pio_command *cmd)
+process_ata_misc_op(struct disk_op_s *op)
 {
-    u16 biosid = cmd->biosid;
-    u8 channel = biosid / 2;
-    u16 iobase1 = GET_EBDA(ata.channels[channel].iobase1);
-    u16 iobase2 = GET_EBDA(ata.channels[channel].iobase2);
+    if (!CONFIG_ATA)
+        return 0;
+
+    switch (op->command) {
+    case CMD_RESET:
+        ata_reset(op->driveid);
+        return DISK_RET_SUCCESS;
+    case CMD_ISREADY:
+        return isready(op->driveid);
+    case CMD_FORMAT:
+    case CMD_VERIFY:
+    case CMD_SEEK:
+        return DISK_RET_SUCCESS;
+    default:
+        op->count = 0;
+        return DISK_RET_EPARAM;
+    }
+}
 
-    u8 status = inb(iobase1 + ATA_CB_STAT);
-    if (status & ATA_CB_STAT_BSY)
-        return 1;
 
+/****************************************************************
+ * ATA send command
+ ****************************************************************/
+
+struct ata_pio_command {
+    u8 feature;
+    u8 sector_count;
+    u8 lba_low;
+    u8 lba_mid;
+    u8 lba_high;
+    u8 device;
+    u8 command;
+
+    u8 sector_count2;
+    u8 lba_low2;
+    u8 lba_mid2;
+    u8 lba_high2;
+};
+
+// Send an ata command to the drive.
+static int
+send_cmd(int driveid, struct ata_pio_command *cmd)
+{
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u8 slave = ataid % 2;
+    u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+    u16 iobase2 = GET_GLOBAL(ATA_channels[channel].iobase2);
+
+    // Disable interrupts
     outb(ATA_CB_DC_HD15 | ATA_CB_DC_NIEN, iobase2 + ATA_CB_DC);
+
+    // Select device
+    int status = await_not_bsy(iobase1);
+    if (status < 0)
+        return status;
+    u8 newdh = ((cmd->device & ~ATA_CB_DH_DEV1)
+                | (slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0));
+    u8 olddh = inb(iobase1 + ATA_CB_DH);
+    outb(newdh, iobase1 + ATA_CB_DH);
+    if ((olddh ^ newdh) & (1<<4)) {
+        // Was a device change - wait for device to become not busy.
+        status = ndelay_await_not_bsy(iobase1);
+        if (status < 0)
+            return status;
+    }
+
     if (cmd->command & 0x04) {
         outb(0x00, iobase1 + ATA_CB_FR);
         outb(cmd->sector_count2, iobase1 + ATA_CB_SC);
@@ -164,93 +227,89 @@ send_cmd(struct ata_pio_command *cmd)
     outb(cmd->lba_low, iobase1 + ATA_CB_SN);
     outb(cmd->lba_mid, iobase1 + ATA_CB_CL);
     outb(cmd->lba_high, iobase1 + ATA_CB_CH);
-    outb(cmd->device, iobase1 + ATA_CB_DH);
     outb(cmd->command, iobase1 + ATA_CB_CMD);
 
-    await_ide(NOT_BSY_DRQ, iobase1, IDE_TIMEOUT);
+    status = ndelay_await_not_bsy(iobase1);
+    if (status < 0)
+        return status;
 
-    status = inb(iobase1 + ATA_CB_STAT);
     if (status & ATA_CB_STAT_ERR) {
-        DEBUGF("send_cmd : read error\n");
-        return 2;
+        dprintf(6, "send_cmd : read error (status=%02x err=%02x)\n"
+                , status, inb(iobase1 + ATA_CB_ERR));
+        return -4;
     }
     if (!(status & ATA_CB_STAT_DRQ)) {
-        DEBUGF("send_cmd : DRQ not set (status %02x)\n"
-               , (unsigned) status);
-        return 3;
+        dprintf(6, "send_cmd : DRQ not set (status %02x)\n", status);
+        return -5;
     }
 
     return 0;
 }
 
-int
-ata_transfer(struct ata_pio_command *cmd)
-{
-    DEBUGF("ata_transfer id=%d cmd=%d lba=%d count=%d buf=%p\n"
-           , cmd->biosid, cmd->command
-           , (cmd->lba_high << 16) | (cmd->lba_mid << 8) | cmd->lba_low
-           , cmd->sector_count, cmd->far_buffer);
-
-    // Reset count of transferred data
-    SET_EBDA(ata.trsfsectors,0);
-    SET_EBDA(ata.trsfbytes,0L);
 
-    int ret = send_cmd(cmd);
-    if (ret)
-        return ret;
+/****************************************************************
+ * ATA transfers
+ ****************************************************************/
 
-    u16 biosid = cmd->biosid;
-    u8 channel  = biosid / 2;
-    u16 iobase1 = GET_EBDA(ata.channels[channel].iobase1);
-    u16 iobase2 = GET_EBDA(ata.channels[channel].iobase2);
-    u8 mode     = GET_EBDA(ata.devices[biosid].mode);
-    int iswrite = (cmd->command & ~0x40) == ATA_CMD_WRITE_SECTORS;
-    u8 current = 0;
-    u16 count = cmd->sector_count;
-    u8 status;
-    void *far_buffer = cmd->far_buffer;
+// Transfer 'op->count' blocks (of 'blocksize' bytes) to/from drive
+// 'op->driveid'.
+static int
+ata_transfer(struct disk_op_s *op, int iswrite, int blocksize)
+{
+    dprintf(16, "ata_transfer id=%d write=%d count=%d bs=%d buf=%p\n"
+            , op->driveid, iswrite, op->count, blocksize, op->buf_fl);
+
+    u8 ataid = GET_GLOBAL(Drives.drives[op->driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+    u16 iobase2 = GET_GLOBAL(ATA_channels[channel].iobase2);
+    int count = op->count;
+    void *buf_fl = op->buf_fl;
+    int status;
     for (;;) {
         if (iswrite) {
             // Write data to controller
-            DEBUGF("Write sector id=%d dest=%p\n", biosid, far_buffer);
-            if (mode == ATA_MODE_PIO32)
-                outsl_far(iobase1, far_buffer, 512 / 4);
+            dprintf(16, "Write sector id=%d dest=%p\n", op->driveid, buf_fl);
+            if (CONFIG_ATA_PIO32)
+                outsl_fl(iobase1, buf_fl, blocksize / 4);
             else
-                outsw_far(iobase1, far_buffer, 512 / 2);
+                outsw_fl(iobase1, buf_fl, blocksize / 2);
         } else {
             // Read data from controller
-            DEBUGF("Read sector id=%d dest=%p\n", biosid, far_buffer);
-            if (mode == ATA_MODE_PIO32)
-                insl_far(iobase1, far_buffer, 512 / 4);
+            dprintf(16, "Read sector id=%d dest=%p\n", op->driveid, buf_fl);
+            if (CONFIG_ATA_PIO32)
+                insl_fl(iobase1, buf_fl, blocksize / 4);
             else
-                insw_far(iobase1, far_buffer, 512 / 2);
-            await_ide(NOT_BSY, iobase1, IDE_TIMEOUT);
+                insw_fl(iobase1, buf_fl, blocksize / 2);
+        }
+        buf_fl += blocksize;
+
+        status = pause_await_not_bsy(iobase1, iobase2);
+        if (status < 0) {
+            // Error
+            op->count -= count;
+            return status;
         }
-        far_buffer += 512;
 
-        current++;
-        SET_EBDA(ata.trsfsectors,current);
         count--;
-        status = inb(iobase1 + ATA_CB_STAT);
-        if (count == 0)
+        if (!count)
             break;
-        status &= (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ
-                   | ATA_CB_STAT_ERR);
-        if (status != (ATA_CB_STAT_RDY | ATA_CB_STAT_DRQ)) {
-            DEBUGF("ata_transfer : more sectors left (status %02x)\n"
-                   , (unsigned) status);
-            return 5;
+        status &= (ATA_CB_STAT_BSY | ATA_CB_STAT_DRQ | ATA_CB_STAT_ERR);
+        if (status != ATA_CB_STAT_DRQ) {
+            dprintf(6, "ata_transfer : more sectors left (status %02x)\n"
+                    , status);
+            op->count -= count;
+            return -6;
         }
     }
 
-    status &= (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF
-               | ATA_CB_STAT_DRQ | ATA_CB_STAT_ERR);
+    status &= (ATA_CB_STAT_BSY | ATA_CB_STAT_DF | ATA_CB_STAT_DRQ
+               | ATA_CB_STAT_ERR);
     if (!iswrite)
         status &= ~ATA_CB_STAT_DF;
-    if (status != ATA_CB_STAT_RDY ) {
-        DEBUGF("ata_transfer : no sectors left (status %02x)\n"
-               , (unsigned) status);
-        return 4;
+    if (status != 0) {
+        dprintf(6, "ata_transfer : no sectors left (status %02x)\n", status);
+        return -7;
     }
 
     // Enable interrupts
@@ -258,487 +317,477 @@ ata_transfer(struct ata_pio_command *cmd)
     return 0;
 }
 
-// ---------------------------------------------------------------------------
-// ATA/ATAPI driver : execute a packet command
-// ---------------------------------------------------------------------------
-      // returns
-      // 0 : no error
-      // 1 : error in parameters
-      // 2 : BUSY bit set
-      // 3 : error
-      // 4 : not ready
-int
-ata_cmd_packet(u16 biosid, u8 *cmdbuf, u8 cmdlen
-               , u16 header, u32 length, void *far_buffer)
+
+/****************************************************************
+ * ATA hard drive functions
+ ****************************************************************/
+
+// Read/write count blocks from a harddrive.
+static int
+ata_cmd_data(struct disk_op_s *op, int iswrite, int command)
 {
-    DEBUGF("ata_cmd_packet d=%d cmdlen=%d h=%d l=%d buf=%p\n"
-           , biosid, cmdlen, header, length, far_buffer);
+    u64 lba = op->lba;
 
-    u8 channel = biosid / 2;
-    u8 slave = biosid % 2;
+    struct ata_pio_command cmd;
+    memset(&cmd, 0, sizeof(cmd));
+
+    cmd.command = command;
+    if (op->count >= (1<<8) || lba + op->count >= (1<<28)) {
+        cmd.sector_count2 = op->count >> 8;
+        cmd.lba_low2 = lba >> 24;
+        cmd.lba_mid2 = lba >> 32;
+        cmd.lba_high2 = lba >> 40;
 
-    // The header length must be even
-    if (header & 1) {
-        DEBUGF("ata_cmd_packet : header must be even (%04x)\n", header);
-        return 1;
+        cmd.command |= 0x04;
+        lba &= 0xffffff;
     }
 
-    u16 iobase1 = GET_EBDA(ata.channels[channel].iobase1);
-    u16 iobase2 = GET_EBDA(ata.channels[channel].iobase2);
-    u8 mode     = GET_EBDA(ata.devices[biosid].mode);
+    cmd.feature = 0;
+    cmd.sector_count = op->count;
+    cmd.lba_low = lba;
+    cmd.lba_mid = lba >> 8;
+    cmd.lba_high = lba >> 16;
+    cmd.device = ((lba >> 24) & 0xf) | ATA_CB_DH_LBA;
+
+    int ret = send_cmd(op->driveid, &cmd);
+    if (ret)
+        return ret;
+    return ata_transfer(op, iswrite, IDE_SECTOR_SIZE);
+}
+
+int
+process_ata_op(struct disk_op_s *op)
+{
+    if (!CONFIG_ATA)
+        return 0;
+
+    int ret;
+    switch (op->command) {
+    case CMD_READ:
+        ret = ata_cmd_data(op, 0, ATA_CMD_READ_SECTORS);
+        break;
+    case CMD_WRITE:
+        ret = ata_cmd_data(op, 1, ATA_CMD_WRITE_SECTORS);
+        break;
+    default:
+        return process_ata_misc_op(op);
+    }
+    if (ret)
+        return DISK_RET_EBADTRACK;
+    return DISK_RET_SUCCESS;
+}
+
+
+/****************************************************************
+ * ATAPI functions
+ ****************************************************************/
+
+// Low-level atapi command transmit function.
+static int
+send_atapi_cmd(int driveid, u8 *cmdbuf, u8 cmdlen, u16 blocksize)
+{
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+    u16 iobase2 = GET_GLOBAL(ATA_channels[channel].iobase2);
 
     struct ata_pio_command cmd;
     cmd.sector_count = 0;
     cmd.feature = 0;
     cmd.lba_low = 0;
-    cmd.lba_mid = 0xf0;
-    cmd.lba_high = 0xff;
-    cmd.device = slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0;
+    cmd.lba_mid = blocksize;
+    cmd.lba_high = blocksize >> 8;
+    cmd.device = 0;
     cmd.command = ATA_CMD_PACKET;
 
-    cmd.biosid = biosid;
-    int ret = send_cmd(&cmd);
+    int ret = send_cmd(driveid, &cmd);
     if (ret)
         return ret;
 
-    // Reset count of transferred data
-    SET_EBDA(ata.trsfsectors,0);
-    SET_EBDA(ata.trsfbytes,0L);
-
     // Send command to device
-    outsw_far(iobase1, MAKE_32_PTR(GET_SEG(SS), (u32)cmdbuf), cmdlen / 2);
+    outsw_fl(iobase1, MAKE_FLATPTR(GET_SEG(SS), cmdbuf), cmdlen / 2);
 
-    u8 status;
-    u16 loops = 0;
-    for (;;) {
-        if (loops == 0) {//first time through
-            status = inb(iobase2 + ATA_CB_ASTAT);
-            await_ide(NOT_BSY_DRQ, iobase1, IDE_TIMEOUT);
-        } else
-            await_ide(NOT_BSY, iobase1, IDE_TIMEOUT);
-        loops++;
-
-        status = inb(iobase1 + ATA_CB_STAT);
-        inb(iobase1 + ATA_CB_SC);
-
-        // Check if command completed
-        if(((inb(iobase1 + ATA_CB_SC)&0x7)==0x3) &&
-           ((status & (ATA_CB_STAT_RDY | ATA_CB_STAT_ERR)) == ATA_CB_STAT_RDY))
-            break;
+    int status = pause_await_not_bsy(iobase1, iobase2);
+    if (status < 0)
+        return status;
 
-        if (status & ATA_CB_STAT_ERR) {
-            DEBUGF("ata_cmd_packet : error (status %02x)\n", status);
-            return 3;
-        }
+    if (status & ATA_CB_STAT_ERR) {
+        u8 err = inb(iobase1 + ATA_CB_ERR);
+        // skip "Not Ready"
+        if (err != 0x20)
+            dprintf(6, "send_atapi_cmd : read error (status=%02x err=%02x)\n"
+                    , status, err);
+        return -2;
+    }
+    if (!(status & ATA_CB_STAT_DRQ)) {
+        dprintf(6, "send_atapi_cmd : DRQ not set (status %02x)\n", status);
+        return -3;
+    }
 
-        // Get the byte count
-        u16 lcount =  (((u16)(inb(iobase1 + ATA_CB_CH))<<8)
-                       + inb(iobase1 + ATA_CB_CL));
+    return 0;
+}
 
-        // adjust to read what we want
-        u16 lbefore, lafter;
-        if (header > lcount) {
-            lbefore=lcount;
-            header-=lcount;
-            lcount=0;
-        } else {
-            lbefore=header;
-            header=0;
-            lcount-=lbefore;
-        }
+// Read sectors from the cdrom.
+int
+cdrom_read(struct disk_op_s *op)
+{
+    u8 atacmd[12];
+    memset(atacmd, 0, sizeof(atacmd));
+    atacmd[0]=0x28;                         // READ command
+    atacmd[7]=(op->count & 0xff00) >> 8;    // Sectors
+    atacmd[8]=(op->count & 0x00ff);
+    atacmd[2]=(op->lba & 0xff000000) >> 24; // LBA
+    atacmd[3]=(op->lba & 0x00ff0000) >> 16;
+    atacmd[4]=(op->lba & 0x0000ff00) >> 8;
+    atacmd[5]=(op->lba & 0x000000ff);
+
+    int ret = send_atapi_cmd(op->driveid, atacmd, sizeof(atacmd)
+                             , CDROM_SECTOR_SIZE);
+    if (ret)
+        return ret;
 
-        if (lcount > length) {
-            lafter=lcount-length;
-            lcount=length;
-            length=0;
-        } else {
-            lafter=0;
-            length-=lcount;
-        }
+    return ata_transfer(op, 0, CDROM_SECTOR_SIZE);
+}
+
+int
+process_atapi_op(struct disk_op_s *op)
+{
+    int ret;
+    switch (op->command) {
+    case CMD_READ:
+        ret = cdrom_read(op);
+        break;
+    case CMD_FORMAT:
+    case CMD_WRITE:
+        return DISK_RET_EWRITEPROTECT;
+    default:
+        return process_ata_misc_op(op);
+    }
+    if (ret)
+        return DISK_RET_EBADTRACK;
+    return DISK_RET_SUCCESS;
+}
 
-        // Save byte count
-        u16 count = lcount;
+// Send a simple atapi command to a drive.
+int
+ata_cmd_packet(int driveid, u8 *cmdbuf, u8 cmdlen
+               , u32 length, void *buf_fl)
+{
+    int ret = send_atapi_cmd(driveid, cmdbuf, cmdlen, length);
+    if (ret)
+        return ret;
 
-        DEBUGF("Trying to read %04x bytes (%04x %04x %04x) to %p\n"
-               , lbefore+lcount+lafter, lbefore, lcount, lafter, far_buffer);
+    struct disk_op_s dop;
+    memset(&dop, 0, sizeof(dop));
+    dop.driveid = driveid;
+    dop.count = 1;
+    dop.buf_fl = buf_fl;
 
-        // If counts not dividable by 4, use 16bits mode
-        u8 lmode = mode;
-        if (lbefore & 0x03) lmode=ATA_MODE_PIO16;
-        if (lcount  & 0x03) lmode=ATA_MODE_PIO16;
-        if (lafter  & 0x03) lmode=ATA_MODE_PIO16;
+    return ata_transfer(&dop, 0, length);
+}
 
-        // adds an extra byte if count are odd. before is always even
-        if (lcount & 0x01) {
-            lcount+=1;
-            if ((lafter > 0) && (lafter & 0x01)) {
-                lafter-=1;
-            }
-        }
 
-        if (lmode == ATA_MODE_PIO32) {
-            lcount>>=2; lbefore>>=2; lafter>>=2;
-        } else {
-            lcount>>=1; lbefore>>=1; lafter>>=1;
-        }
+/****************************************************************
+ * ATA detect and init
+ ****************************************************************/
 
-        int i;
-        for (i=0; i<lbefore; i++)
-            if (lmode == ATA_MODE_PIO32)
-                inl(iobase1);
-            else
-                inw(iobase1);
+// Extract the ATA/ATAPI version info.
+static int
+extract_version(u16 *buffer)
+{
+    // Extract ATA/ATAPI version.
+    u16 ataversion = buffer[80];
+    u8 version;
+    for (version=15; version>0; version--)
+        if (ataversion & (1<<version))
+            break;
+    return version;
+}
 
-        if (lmode == ATA_MODE_PIO32)
-            insl_far(iobase1, far_buffer, lcount);
-        else
-            insw_far(iobase1, far_buffer, lcount);
+// Extract common information from IDENTIFY commands.
+static void
+extract_identify(int driveid, u16 *buffer)
+{
+    dprintf(3, "Identify w0=%x w2=%x\n", buffer[0], buffer[2]);
+
+    // Read model name
+    char *model = Drives.drives[driveid].model;
+    int maxsize = ARRAY_SIZE(Drives.drives[driveid].model);
+    int i;
+    for (i=0; i<maxsize/2; i++) {
+        u16 v = buffer[27+i];
+        model[i*2] = v >> 8;
+        model[i*2+1] = v & 0xff;
+    }
+    model[maxsize-1] = 0x00;
 
-        for (i=0; i<lafter; i++)
-            if (lmode == ATA_MODE_PIO32)
-                inl(iobase1);
-            else
-                inw(iobase1);
+    // Trim trailing spaces from model name.
+    for (i=maxsize-2; i>0 && model[i] == 0x20; i--)
+        model[i] = 0x00;
 
-        // Compute new buffer address
-        far_buffer += count;
+    // Common flags.
+    SET_GLOBAL(Drives.drives[driveid].removable, (buffer[0] & 0x80) ? 1 : 0);
+}
 
-        // Save transferred bytes count
-        SET_EBDA(ata.trsfsectors, loops);
-    }
+static int
+init_drive_atapi(int driveid, u16 *buffer)
+{
+    // Send an IDENTIFY_DEVICE_PACKET command to device
+    memset(buffer, 0, IDE_SECTOR_SIZE);
+    struct disk_op_s dop;
+    memset(&dop, 0, sizeof(dop));
+    dop.driveid = driveid;
+    dop.count = 1;
+    dop.lba = 1;
+    dop.buf_fl = MAKE_FLATPTR(GET_SEG(SS), buffer);
+    int ret = ata_cmd_data(&dop, 0, ATA_CMD_IDENTIFY_DEVICE_PACKET);
+    if (ret)
+        return ret;
 
-    // Final check, device must be ready
-    if ( (status & (ATA_CB_STAT_BSY | ATA_CB_STAT_RDY | ATA_CB_STAT_DF
-                    | ATA_CB_STAT_DRQ | ATA_CB_STAT_ERR) )
-         != ATA_CB_STAT_RDY ) {
-        DEBUGF("ata_cmd_packet : not ready (status %02x)\n"
-               , (unsigned) status);
-        return 4;
-    }
+    // Success - setup as ATAPI.
+    extract_identify(driveid, buffer);
+    SET_GLOBAL(Drives.drives[driveid].type, DTYPE_ATAPI);
+    SET_GLOBAL(Drives.drives[driveid].blksize, CDROM_SECTOR_SIZE);
+    SET_GLOBAL(Drives.drives[driveid].sectors, (u64)-1);
+    u8 iscd = ((buffer[0] >> 8) & 0x1f) == 0x05;
+
+    // Report drive info to user.
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u8 slave = ataid % 2;
+    printf("ata%d-%d: %s ATAPI-%d %s\n", channel, slave
+           , Drives.drives[driveid].model, extract_version(buffer)
+           , (iscd ? "CD-Rom/DVD-Rom" : "Device"));
+
+    // fill cdidmap
+    if (iscd)
+        map_cd_drive(driveid);
 
-    // Enable interrupts
-    outb(ATA_CB_DC_HD15, iobase2+ATA_CB_DC);
     return 0;
 }
 
-int
-cdrom_read(u16 biosid, u32 lba, u32 count, void *far_buffer, u16 skip)
+static int
+init_drive_ata(int driveid, u16 *buffer)
 {
-    u16 sectors = (count + 2048 - 1) / 2048;
+    // Send an IDENTIFY_DEVICE command to device
+    memset(buffer, 0, IDE_SECTOR_SIZE);
+    struct disk_op_s dop;
+    memset(&dop, 0, sizeof(dop));
+    dop.driveid = driveid;
+    dop.count = 1;
+    dop.lba = 1;
+    dop.buf_fl = MAKE_FLATPTR(GET_SEG(SS), buffer);
+    int ret = ata_cmd_data(&dop, 0, ATA_CMD_IDENTIFY_DEVICE);
+    if (ret)
+        return ret;
 
-    u8 atacmd[12];
-    memset(atacmd, 0, sizeof(atacmd));
-    atacmd[0]=0x28;                      // READ command
-    atacmd[7]=(sectors & 0xff00) >> 8;   // Sectors
-    atacmd[8]=(sectors & 0x00ff);        // Sectors
-    atacmd[2]=(lba & 0xff000000) >> 24;  // LBA
-    atacmd[3]=(lba & 0x00ff0000) >> 16;
-    atacmd[4]=(lba & 0x0000ff00) >> 8;
-    atacmd[5]=(lba & 0x000000ff);
-
-    return ata_cmd_packet(biosid, atacmd, sizeof(atacmd)
-                          , skip, count, far_buffer);
+    // Success - setup as ATA.
+    extract_identify(driveid, buffer);
+    SET_GLOBAL(Drives.drives[driveid].type, DTYPE_ATA);
+    SET_GLOBAL(Drives.drives[driveid].blksize, IDE_SECTOR_SIZE);
+
+    SET_GLOBAL(Drives.drives[driveid].pchs.cylinders, buffer[1]);
+    SET_GLOBAL(Drives.drives[driveid].pchs.heads, buffer[3]);
+    SET_GLOBAL(Drives.drives[driveid].pchs.spt, buffer[6]);
+
+    u64 sectors;
+    if (buffer[83] & (1 << 10)) // word 83 - lba48 support
+        sectors = *(u64*)&buffer[100]; // word 100-103
+    else
+        sectors = *(u32*)&buffer[60]; // word 60 and word 61
+    SET_GLOBAL(Drives.drives[driveid].sectors, sectors);
+
+    // Setup disk geometry translation.
+    setup_translation(driveid);
+
+    // Report drive info to user.
+    u8 ataid = GET_GLOBAL(Drives.drives[driveid].cntl_id);
+    u8 channel = ataid / 2;
+    u8 slave = ataid % 2;
+    char *model = Drives.drives[driveid].model;
+    printf("ata%d-%d: %s ATA-%d Hard-Disk ", channel, slave, model
+           , extract_version(buffer));
+    u64 sizeinmb = sectors >> 11;
+    if (sizeinmb < (1 << 16))
+        printf("(%u MiBytes)\n", (u32)sizeinmb);
+    else
+        printf("(%u GiBytes)\n", (u32)(sizeinmb >> 10));
+
+    // Register with bcv system.
+    add_bcv_hd(driveid, model);
+
+    return 0;
 }
 
-// ---------------------------------------------------------------------------
-// ATA/ATAPI driver : device detection
-// ---------------------------------------------------------------------------
+static int
+powerup_await_non_bsy(u16 base, u64 end)
+{
+    u8 orstatus = 0;
+    u8 status;
+    for (;;) {
+        status = inb(base+ATA_CB_STAT);
+        if (!(status & ATA_CB_STAT_BSY))
+            break;
+        orstatus |= status;
+        if (orstatus == 0xff) {
+            dprintf(1, "powerup IDE floating\n");
+            return orstatus;
+        }
+        if (rdtscll() > end) {
+            dprintf(1, "powerup IDE time out\n");
+            return -1;
+        }
+    }
+    dprintf(6, "powerup iobase=%x st=%x\n", base, status);
+    return status;
+}
 
-void
+static void
 ata_detect()
 {
-    u8  hdcount, cdcount, device, type;
-    u8  buffer[0x0200];
-    memset(buffer, 0, sizeof(buffer));
-
-#if CONFIG_MAX_ATA_INTERFACES > 0
-    SET_EBDA(ata.channels[0].iface,ATA_IFACE_ISA);
-    SET_EBDA(ata.channels[0].iobase1,0x1f0);
-    SET_EBDA(ata.channels[0].iobase2,0x3f0);
-    SET_EBDA(ata.channels[0].irq,14);
-#endif
-#if CONFIG_MAX_ATA_INTERFACES > 1
-    SET_EBDA(ata.channels[1].iface,ATA_IFACE_ISA);
-    SET_EBDA(ata.channels[1].iobase1,0x170);
-    SET_EBDA(ata.channels[1].iobase2,0x370);
-    SET_EBDA(ata.channels[1].irq,15);
-#endif
-#if CONFIG_MAX_ATA_INTERFACES > 2
-    SET_EBDA(ata.channels[2].iface,ATA_IFACE_ISA);
-    SET_EBDA(ata.channels[2].iobase1,0x1e8);
-    SET_EBDA(ata.channels[2].iobase2,0x3e0);
-    SET_EBDA(ata.channels[2].irq,12);
-#endif
-#if CONFIG_MAX_ATA_INTERFACES > 3
-    SET_EBDA(ata.channels[3].iface,ATA_IFACE_ISA);
-    SET_EBDA(ata.channels[3].iobase1,0x168);
-    SET_EBDA(ata.channels[3].iobase2,0x360);
-    SET_EBDA(ata.channels[3].irq,11);
-#endif
-#if CONFIG_MAX_ATA_INTERFACES > 4
-#error Please fill the ATA interface informations
-#endif
-
     // Device detection
-    hdcount=cdcount=0;
-
-    for(device=0; device<CONFIG_MAX_ATA_DEVICES; device++) {
-        u16 iobase1, iobase2;
-        u8  channel, slave, shift;
-        u8  sc, sn, cl, ch, st;
-
-        channel = device / 2;
-        slave = device % 2;
-
-        iobase1 =GET_EBDA(ata.channels[channel].iobase1);
-        iobase2 =GET_EBDA(ata.channels[channel].iobase2);
-
-        // Disable interrupts
-        outb(ATA_CB_DC_HD15 | ATA_CB_DC_NIEN, iobase2+ATA_CB_DC);
+    u64 end = calc_future_tsc(IDE_TIMEOUT);
+    int ataid, last_reset_ataid=-1;
+    for (ataid=0; ataid<CONFIG_MAX_ATA_INTERFACES*2; ataid++) {
+        u8 channel = ataid / 2;
+        u8 slave = ataid % 2;
+
+        u16 iobase1 = GET_GLOBAL(ATA_channels[channel].iobase1);
+        if (!iobase1)
+            break;
 
-        // Look for device
-        outb(slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0, iobase1+ATA_CB_DH);
-        outb(0x55, iobase1+ATA_CB_SC);
-        outb(0xaa, iobase1+ATA_CB_SN);
-        outb(0xaa, iobase1+ATA_CB_SC);
-        outb(0x55, iobase1+ATA_CB_SN);
+        // Wait for not-bsy.
+        int status = powerup_await_non_bsy(iobase1, end);
+        if (status < 0)
+            continue;
+        u8 newdh = slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0;
+        outb(newdh, iobase1+ATA_CB_DH);
+        ndelay(400);
+        status = powerup_await_non_bsy(iobase1, end);
+        if (status < 0)
+            continue;
+
+        // Check if ioport registers look valid.
+        outb(newdh, iobase1+ATA_CB_DH);
+        u8 dh = inb(iobase1+ATA_CB_DH);
         outb(0x55, iobase1+ATA_CB_SC);
         outb(0xaa, iobase1+ATA_CB_SN);
+        u8 sc = inb(iobase1+ATA_CB_SC);
+        u8 sn = inb(iobase1+ATA_CB_SN);
+        dprintf(6, "ata_detect ataid=%d sc=%x sn=%x dh=%x\n"
+                , ataid, sc, sn, dh);
+        if (sc != 0x55 || sn != 0xaa || dh != newdh)
+            continue;
+
+        // Prepare new driveid.
+        u8 driveid = GET_GLOBAL(Drives.drivecount);
+        if (driveid >= ARRAY_SIZE(Drives.drives))
+            break;
+        memset(&Drives.drives[driveid], 0, sizeof(Drives.drives[0]));
+        Drives.drives[driveid].cntl_id = ataid;
 
-        // If we found something
-        sc = inb(iobase1+ATA_CB_SC);
-        sn = inb(iobase1+ATA_CB_SN);
-
-        if ( (sc == 0x55) && (sn == 0xaa) ) {
-            SET_EBDA(ata.devices[device].type,ATA_TYPE_UNKNOWN);
-
-            // reset the channel
-            ata_reset(device);
-
-            // check for ATA or ATAPI
-            outb(slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0, iobase1+ATA_CB_DH);
-            sc = inb(iobase1+ATA_CB_SC);
-            sn = inb(iobase1+ATA_CB_SN);
-            if ((sc==0x01) && (sn==0x01)) {
-                cl = inb(iobase1+ATA_CB_CL);
-                ch = inb(iobase1+ATA_CB_CH);
-                st = inb(iobase1+ATA_CB_STAT);
-
-                if ((cl==0x14) && (ch==0xeb)) {
-                    SET_EBDA(ata.devices[device].type,ATA_TYPE_ATAPI);
-                } else if ((cl==0x00) && (ch==0x00) && (st!=0x00)) {
-                    SET_EBDA(ata.devices[device].type,ATA_TYPE_ATA);
-                } else if ((cl==0xff) && (ch==0xff)) {
-                    SET_EBDA(ata.devices[device].type,ATA_TYPE_NONE);
-                }
-            }
+        // reset the channel
+        if (slave && ataid == last_reset_ataid + 1) {
+            // The drive was just reset - no need to reset it again.
+        } else {
+            ata_reset(driveid);
+            last_reset_ataid = ataid;
         }
 
-        type=GET_EBDA(ata.devices[device].type);
-
-        // Now we send a IDENTIFY command to ATA device
-        if(type == ATA_TYPE_ATA) {
-            u32 sectors;
-            u16 cylinders, heads, spt, blksize;
-            u8  translation, removable, mode;
-
-            //Temporary values to do the transfer
-            SET_EBDA(ata.devices[device].device,ATA_DEVICE_HD);
-            SET_EBDA(ata.devices[device].mode, ATA_MODE_PIO16);
-
-            u16 ret = ata_cmd_data_chs(device, ATA_CMD_IDENTIFY_DEVICE
-                                       , 0, 0, 1, 1
-                                       , MAKE_32_PTR(GET_SEG(SS), (u32)buffer));
+        // check for ATAPI
+        u16 buffer[256];
+        int ret = init_drive_atapi(driveid, buffer);
+        if (!ret) {
+            // Found an ATAPI drive.
+        } else {
+            u8 st = inb(iobase1+ATA_CB_STAT);
+            if (!st)
+                // Status not set - can't be a valid drive.
+                continue;
+
+            // Wait for RDY.
+            ret = await_rdy(iobase1);
+            if (ret < 0)
+                continue;
+
+            // check for ATA.
+            ret = init_drive_ata(driveid, buffer);
             if (ret)
-                BX_PANIC("ata-detect: Failed to detect ATA device\n");
-
-            removable = (buffer[0] & 0x80) ? 1 : 0;
-            mode      = buffer[96] ? ATA_MODE_PIO32 : ATA_MODE_PIO16;
-            blksize   = *(u16*)&buffer[10];
-
-            cylinders = *(u16*)&buffer[1*2]; // word 1
-            heads     = *(u16*)&buffer[3*2]; // word 3
-            spt       = *(u16*)&buffer[6*2]; // word 6
-
-            sectors   = *(u32*)&buffer[60*2]; // word 60 and word 61
-
-            SET_EBDA(ata.devices[device].device,ATA_DEVICE_HD);
-            SET_EBDA(ata.devices[device].removable, removable);
-            SET_EBDA(ata.devices[device].mode, mode);
-            SET_EBDA(ata.devices[device].blksize, blksize);
-            SET_EBDA(ata.devices[device].pchs.heads, heads);
-            SET_EBDA(ata.devices[device].pchs.cylinders, cylinders);
-            SET_EBDA(ata.devices[device].pchs.spt, spt);
-            SET_EBDA(ata.devices[device].sectors, sectors);
-            BX_INFO("ata%d-%d: PCHS=%u/%d/%d translation="
-                    , channel, slave,cylinders, heads, spt);
-
-            translation = inb_cmos(CMOS_BIOS_DISKTRANSFLAG + channel/2);
-            for (shift=device%4; shift>0; shift--)
-                translation >>= 2;
-            translation &= 0x03;
-
-            SET_EBDA(ata.devices[device].translation, translation);
-
-            switch (translation) {
-            case ATA_TRANSLATION_NONE:
-                BX_INFO("none");
-                break;
-            case ATA_TRANSLATION_LBA:
-                BX_INFO("lba");
-                break;
-            case ATA_TRANSLATION_LARGE:
-                BX_INFO("large");
-                break;
-            case ATA_TRANSLATION_RECHS:
-                BX_INFO("r-echs");
-                break;
-            }
-            switch (translation) {
-            case ATA_TRANSLATION_NONE:
-                break;
-            case ATA_TRANSLATION_LBA:
-                spt = 63;
-                sectors /= 63;
-                heads = sectors / 1024;
-                if (heads>128) heads = 255;
-                else if (heads>64) heads = 128;
-                else if (heads>32) heads = 64;
-                else if (heads>16) heads = 32;
-                else heads=16;
-                cylinders = sectors / heads;
-                break;
-            case ATA_TRANSLATION_RECHS:
-                // Take care not to overflow
-                if (heads==16) {
-                    if(cylinders>61439) cylinders=61439;
-                    heads=15;
-                    cylinders = (u16)((u32)(cylinders)*16/15);
-                }
-                // then go through the large bitshift process
-            case ATA_TRANSLATION_LARGE:
-                while(cylinders > 1024) {
-                    cylinders >>= 1;
-                    heads <<= 1;
-
-                    // If we max out the head count
-                    if (heads > 127) break;
-                }
-                break;
-            }
-            // clip to 1024 cylinders in lchs
-            if (cylinders > 1024)
-                cylinders=1024;
-            BX_INFO(" LCHS=%d/%d/%d\n", cylinders, heads, spt);
-
-            SET_EBDA(ata.devices[device].lchs.heads, heads);
-            SET_EBDA(ata.devices[device].lchs.cylinders, cylinders);
-            SET_EBDA(ata.devices[device].lchs.spt, spt);
-
-            // fill hdidmap
-            SET_EBDA(ata.idmap[0][hdcount], device);
-            hdcount++;
+                // No ATA drive found
+                continue;
         }
+        SET_GLOBAL(Drives.drivecount, driveid+1);
+
+        u16 resetresult = buffer[93];
+        dprintf(6, "ata_detect resetresult=%04x\n", resetresult);
+        if (!slave && (resetresult & 0xdf61) == 0x4041)
+            // resetresult looks valid and device 0 is responding to
+            // device 1 requests - device 1 must not be present - skip
+            // detection.
+            ataid++;
+    }
 
-        // Now we send a IDENTIFY command to ATAPI device
-        if(type == ATA_TYPE_ATAPI) {
-
-            u8  type, removable, mode;
-            u16 blksize;
-
-            //Temporary values to do the transfer
-            SET_EBDA(ata.devices[device].device,ATA_DEVICE_CDROM);
-            SET_EBDA(ata.devices[device].mode, ATA_MODE_PIO16);
-
-            u16 ret = ata_cmd_data_chs(device, ATA_CMD_IDENTIFY_DEVICE_PACKET
-                                       , 0, 0, 1, 1
-                                       , MAKE_32_PTR(GET_SEG(SS), (u32)buffer));
-            if (ret != 0)
-                BX_PANIC("ata-detect: Failed to detect ATAPI device\n");
-
-            type      = buffer[1] & 0x1f;
-            removable = (buffer[0] & 0x80) ? 1 : 0;
-            mode      = buffer[96] ? ATA_MODE_PIO32 : ATA_MODE_PIO16;
-            blksize   = 2048;
-
-            SET_EBDA(ata.devices[device].device, type);
-            SET_EBDA(ata.devices[device].removable, removable);
-            SET_EBDA(ata.devices[device].mode, mode);
-            SET_EBDA(ata.devices[device].blksize, blksize);
+    printf("\n");
+}
 
-            // fill cdidmap
-            SET_EBDA(ata.idmap[1][cdcount], device);
-            cdcount++;
-        }
+static void
+ata_init()
+{
+    // Scan PCI bus for ATA adapters
+    int count=0;
+    int bdf, max;
+    foreachpci(bdf, max) {
+        if (pci_config_readw(bdf, PCI_CLASS_DEVICE) != PCI_CLASS_STORAGE_IDE)
+            continue;
+        if (count >= ARRAY_SIZE(ATA_channels))
+            break;
 
-        u32 sizeinmb = 0;
-        u16 ataversion;
-        u8  c, i, version=0, model[41];
-
-        switch (type) {
-        case ATA_TYPE_ATA:
-            sizeinmb = GET_EBDA(ata.devices[device].sectors);
-            sizeinmb >>= 11;
-        case ATA_TYPE_ATAPI:
-            // Read ATA/ATAPI version
-            ataversion=((u16)(buffer[161])<<8) | buffer[160];
-            for(version=15;version>0;version--) {
-                if ((ataversion&(1<<version))!=0)
-                    break;
-            }
+        u8 irq = pci_config_readb(bdf, PCI_INTERRUPT_LINE);
+        SET_GLOBAL(ATA_channels[count].irq, irq);
+        SET_GLOBAL(ATA_channels[count].pci_bdf, bdf);
 
-            // Read model name
-            for (i=0;i<20;i++) {
-                model[i*2] = buffer[(i*2)+54+1];
-                model[(i*2)+1] = buffer[(i*2)+54];
-            }
+        u8 prog_if = pci_config_readb(bdf, PCI_CLASS_PROG);
+        u32 port1, port2;
 
-            // Reformat
-            model[40] = 0x00;
-            for (i=39;i>0;i--) {
-                if (model[i]==0x20)
-                    model[i] = 0x00;
-                else
-                    break;
-            }
-            break;
+        if (prog_if & 1) {
+            port1 = pci_config_readl(bdf, PCI_BASE_ADDRESS_0) & ~3;
+            port2 = pci_config_readl(bdf, PCI_BASE_ADDRESS_1) & ~3;
+        } else {
+            port1 = 0x1f0;
+            port2 = 0x3f0;
         }
-
-        switch (type) {
-        case ATA_TYPE_ATA:
-            printf("ata%d %s: ",channel,slave?" slave":"master");
-            i=0;
-            while ((c=model[i++]))
-                printf("%c",c);
-            if (sizeinmb < (1UL<<16))
-                printf(" ATA-%d Hard-Disk (%u MBytes)\n", version, (u16)sizeinmb);
-            else
-                printf(" ATA-%d Hard-Disk (%u GBytes)\n", version, (u16)(sizeinmb>>10));
-            break;
-        case ATA_TYPE_ATAPI:
-            printf("ata%d %s: ",channel,slave?" slave":"master");
-            i=0;
-            while ((c=model[i++]))
-                printf("%c",c);
-            if (GET_EBDA(ata.devices[device].device)==ATA_DEVICE_CDROM)
-                printf(" ATAPI-%d CD-Rom/DVD-Rom\n",version);
-            else
-                printf(" ATAPI-%d Device\n",version);
-            break;
-        case ATA_TYPE_UNKNOWN:
-            printf("ata%d %s: Unknown device\n",channel,slave?" slave":"master");
-            break;
+        SET_GLOBAL(ATA_channels[count].iobase1, port1);
+        SET_GLOBAL(ATA_channels[count].iobase2, port2);
+        dprintf(1, "ATA controller %d at %x/%x (dev %x prog_if %x)\n"
+                , count, port1, port2, bdf, prog_if);
+        count++;
+
+        if (prog_if & 4) {
+            port1 = pci_config_readl(bdf, PCI_BASE_ADDRESS_2) & ~3;
+            port2 = pci_config_readl(bdf, PCI_BASE_ADDRESS_3) & ~3;
+        } else {
+            port1 = 0x170;
+            port2 = 0x370;
         }
+        dprintf(1, "ATA controller %d at %x/%x (dev %x prog_if %x)\n"
+                , count, port1, port2, bdf, prog_if);
+        SET_GLOBAL(ATA_channels[count].iobase1, port1);
+        SET_GLOBAL(ATA_channels[count].iobase2, port2);
+        count++;
     }
+}
+
+void
+ata_setup()
+{
+    if (!CONFIG_ATA)
+        return;
 
-    // Store the devices counts
-    SET_EBDA(ata.hdcount, hdcount);
-    SET_EBDA(ata.cdcount, cdcount);
-    SET_BDA(disk_count, hdcount);
+    dprintf(3, "init hard drives\n");
+    ata_init();
+    ata_detect();
 
-    printf("\n");
+    SET_BDA(disk_control_byte, 0xc0);
 
-    // FIXME : should use bios=cmos|auto|disable bits
-    // FIXME : should know about translation bits
-    // FIXME : move hard_drive_post here
+    enable_hwirq(14, entry_76);
 }