Changes in uspace/srv/bd/ata_bd/ata_bd.c [029b13c:aa893e0] in mainline

File:

• uspace/srv/bd/ata_bd/ata_bd.c (modified) (12 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -51 +51 @@
 #include <libarch/ddi.h>
 #include <ddi.h>
+#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -281 +282 @@
         sysarg_t method;
         devmap_handle_t dh;
-        unsigned int flags;
+        int flags;
         int retval;
         uint64_t ba;
@@ -297 +298 @@
 
         if (disk_id < 0 || disk[disk_id].present == false) {
-                async_answer_0(iid, EINVAL);
+                ipc_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
 
         if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                async_answer_0(callid, EHANGUP);
+                ipc_answer_0(callid, EHANGUP);
                 return;
         }
@@ -311 +312 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                async_answer_0(callid, EHANGUP);
+                ipc_answer_0(callid, EHANGUP);
                 return;
         }
@@ -323 +324 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        async_answer_0(callid, EOK);
+                        ipc_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -346 +347 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        async_answer_1(callid, EOK, disk[disk_id].block_size);
+                        ipc_answer_1(callid, EOK, disk[disk_id].block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
-                        async_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
+                        ipc_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
                             UPPER32(disk[disk_id].blocks));
                         continue;
@@ -356 +357 @@
                         break;
                 }
-                async_answer_0(callid, retval);
+                ipc_answer_0(callid, retval);
         }
 }
@@ -372 +373 @@
         uint16_t w;
         uint8_t c;
-        uint16_t bc;
         size_t pos, len;
         int rc;
@@ -388 +388 @@
         } else if (rc == EIO) {
                 /*
-                 * There is something, but not a register device. Check to see
-                 * whether the IDENTIFY command left the packet signature in
-                 * the registers in case this is a packet device.
-                 *
-                 * According to the ATA specification, the LBA low and
-                 * interrupt reason registers should be set to 0x01. However,
-                 * there are many devices that do not follow this and only set
-                 * the byte count registers. So, only check these.
+                 * There is something, but not a register device.
+                 * It could be a packet device.
                  */
-                bc = ((uint16_t)pio_read_8(&cmd->cylinder_high) << 8) |
-                    pio_read_8(&cmd->cylinder_low);
-
-                if (bc == PDEV_SIGNATURE_BC) {
-                        rc = identify_pkt_dev(disk_id, &idata);
-                        if (rc == EOK) {
-                                /* We have a packet device. */
-                                d->dev_type = ata_pkt_dev;
-                        } else {
-                                return EIO;
-                        }
+                rc = identify_pkt_dev(disk_id, &idata);
+                if (rc == EOK) {
+                        /* We have a packet device. */
+                        d->dev_type = ata_pkt_dev;
                 } else {
                         /* Nope. Something's there, but not recognized. */
@@ -417 +404 @@
         }
 
+        printf("device caps: 0x%04x\n", idata.caps);
         if (d->dev_type == ata_pkt_dev) {
                 /* Packet device */
@@ -579 +567 @@
 
         /*
-         * Do not wait for DRDY to be set in case this is a packet device.
-         * We determine whether the device is present by waiting for DRQ to be
-         * set after issuing the command.
+         * This is where we would most likely expect a non-existing device to
+         * show up by not setting SR_DRDY.
          */
-        if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
+        if (wait_status(SR_DRDY, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
                 return ETIMEOUT;
 
@@ -591 +578 @@
                 return ETIMEOUT;
 
-        /*
-         * If ERR is set, this may be a packet device, so return EIO to cause
-         * the caller to check for one.
-         */
+        /* Read data from the disk buffer. */
+
+        if ((status & SR_DRQ) != 0) {
+                for (i = 0; i < identify_data_size / 2; i++) {
+                        data = pio_read_16(&cmd->data_port);
+                        ((uint16_t *) buf)[i] = data;
+                }
+        }
+
         if ((status & SR_ERR) != 0) {
                 return EIO;
-        }
-
-        if (wait_status(SR_DRQ, ~SR_BSY, &status, TIMEOUT_PROBE) != EOK)
-                return ETIMEOUT;
-
-        /* Read data from the disk buffer. */
-
-        for (i = 0; i < identify_data_size / 2; i++) {
-                data = pio_read_16(&cmd->data_port);
-                ((uint16_t *) buf)[i] = data;
         }