Changeset 029b13c in mainline

Timestamp:

2011-04-02T12:48:51Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b2a081ae

Parents:

250dbef

Message:

Move signature definition to ata_hw.h.

Location:

uspace/srv/bd/ata_bd

Files:

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

uspace/srv/bd/ata_bd/ata_bd.c

@@ -371 +371 @@
         ata_inquiry_data_t inq_data;
         uint16_t w;
-        uint8_t c, bc_high, bc_low;
+        uint8_t c;
+        uint16_t bc;
         size_t pos, len;
         int rc;
@@ -396 +397 @@
                  * the byte count registers. So, only check these.
                  */
-                bc_high = pio_read_8(&cmd->cylinder_high);
-                bc_low = pio_read_8(&cmd->cylinder_low);
-
-                if (bc_high == 0xEB && bc_low == 0x14) {
+                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) {
@@ -416 +417 @@
         }
 
-        printf("device caps: 0x%04x\n", idata.caps);
         if (d->dev_type == ata_pkt_dev) {
                 /* Packet device */

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