Changes in / [b2a081ae:28a3e74] in mainline

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (5 diffs)
• ata_hw.h (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -372 +372 @@
         uint16_t w;
         uint8_t c;
-        uint16_t bc;
         size_t pos, len;
         int rc;
@@ -388 +387 @@
         } 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 +403 @@
         }
 
+        printf("device caps: 0x%04x\n", idata.caps);
         if (d->dev_type == ata_pkt_dev) {
                 /* Packet device */
@@ -579 +566 @@
 
         /*
-         * 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 +577 @@
                 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;
         }
 

uspace/srv/bd/ata_bd/ata_hw.h

@@ -293 +293 @@
 };
 
-enum ata_pdev_signature {
-        /**
-         * Signature put by a packet device in byte count register
-         * in response to Identify command.
-         */
-        PDEV_SIGNATURE_BC       = 0xEB14
-};
-
 #endif