Changeset 21d8020 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2009-08-23T20:54:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e0565005

Parents:

22af3af (diff), 5048be7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ATA LBA-48 feature.

File:

• uspace/srv/bd/ata_bd/ata_bd.h (modified) (7 diffs)

uspace/srv/bd/ata_bd/ata_bd.h

@@ -132 +132 @@
 
 enum ata_command {
-        CMD_IDENTIFY_DRIVE      = 0xEC,
         CMD_READ_SECTORS        = 0x20,
-        CMD_WRITE_SECTORS       = 0x30
+        CMD_READ_SECTORS_EXT    = 0x24,
+        CMD_WRITE_SECTORS       = 0x30,
+        CMD_WRITE_SECTORS_EXT   = 0x34,
+        CMD_IDENTIFY_DRIVE      = 0xEC
 };
 
@@ -156 +158 @@
         uint16_t _vs8;
         uint16_t _vs9;
+
         uint16_t serial_number[10];
         uint16_t _vs20;
@@ -162 +165 @@
         uint16_t firmware_rev[4];
         uint16_t model_name[20];
+
         uint16_t max_rw_multiple;
         uint16_t _res48;
@@ -168 +172 @@
         uint16_t pio_timing;
         uint16_t dma_timing;
+
         uint16_t validity;
         uint16_t cur_cyl;
@@ -175 +180 @@
         uint16_t cur_capacity1;
         uint16_t mss;
-        uint16_t total_lba_sec0;
-        uint16_t total_lba_sec1;
+        uint16_t total_lba28_0;
+        uint16_t total_lba28_1;
         uint16_t sw_dma;
         uint16_t mw_dma;
@@ -184 +189 @@
         uint16_t min_raw_pio_cycle;
         uint16_t min_iordy_pio_cycle;
+
         uint16_t _res69;
         uint16_t _res70;
-        uint16_t _res71[1 + 127 - 71];
+        uint16_t _res71;
+        uint16_t _res72;
+        uint16_t _res73;
+        uint16_t _res74;
+
+        uint16_t queue_depth;
+        uint16_t _res76[1 + 79 - 76];
+        uint16_t version_maj;
+        uint16_t version_min;
+        uint16_t cmd_set0;
+        uint16_t cmd_set1;
+        uint16_t csf_sup_ext;
+        uint16_t csf_enabled0;
+        uint16_t csf_enabled1;
+        uint16_t csf_default;
+        uint16_t udma;
+
+        uint16_t _res89[1 + 99 - 89];
+
+        /* Total number of blocks in LBA-48 addressing */
+        uint16_t total_lba48_0;
+        uint16_t total_lba48_1;
+        uint16_t total_lba48_2;
+        uint16_t total_lba48_3;
+
+        /* Note: more fields are defined in ATA/ATAPI-7 */
+        uint16_t _res104[1 + 127 - 104];
         uint16_t _vs128[1 + 159 - 128];
         uint16_t _res160[1 + 255 - 160];
@@ -198 +230 @@
 };
 
+/** Bits of @c identify_data_t.cmd_set1 */
+enum ata_cs1 {
+        cs1_addr48      = 0x0400        /**< 48-bit address feature set */
+};
+
 /** Block addressing mode. */
 enum addr_mode {
-        am_chs,
-        am_lba28
-};
+        am_chs,         /**< CHS block addressing */
+        am_lba28,       /**< LBA-28 block addressing */
+        am_lba48        /**< LBA-48 block addressing */
+};
+
+/** Block coordinates */
+typedef struct {
+        /** Addressing mode used */
+        enum addr_mode amode;
+
+        union {
+                /** CHS coordinates */
+                struct {
+                        uint8_t sector;
+                        uint8_t cyl_lo;
+                        uint8_t cyl_hi;
+                };
+                /** LBA coordinates */
+                struct {
+                        uint8_t c0;
+                        uint8_t c1;
+                        uint8_t c2;
+                        uint8_t c3;
+                        uint8_t c4;
+                        uint8_t c5;
+                };
+        };
+
+        /** Lower 4 bits for device/head register */
+        uint8_t h;
+} block_coord_t;
 
 typedef struct {