Changeset 1787e527 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

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

uspace/srv/bd/ata_bd/ata_bd.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <fibril_sync.h>
+#include <string.h>
 
 enum {
@@ -115 +116 @@
 
 enum drive_head_bits {
-        DHR_DRV         = 0x10
+        DHR_LBA         = 0x40, /**< Use LBA addressing mode */
+        DHR_DRV         = 0x10  /**< Select device 1 */
 };
 
@@ -130 +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
 };
 
@@ -142 +146 @@
 };
 
+/** Data returned from @c identify command. */
+typedef struct {
+        uint16_t gen_conf;
+        uint16_t cylinders;
+        uint16_t _res2;
+        uint16_t heads;
+        uint16_t _vs4;
+        uint16_t _vs5;
+        uint16_t sectors;
+        uint16_t _vs7;
+        uint16_t _vs8;
+        uint16_t _vs9;
+
+        uint16_t serial_number[10];
+        uint16_t _vs20;
+        uint16_t _vs21;
+        uint16_t vs_bytes;
+        uint16_t firmware_rev[4];
+        uint16_t model_name[20];
+
+        uint16_t max_rw_multiple;
+        uint16_t _res48;
+        uint16_t caps;
+        uint16_t _res50;
+        uint16_t pio_timing;
+        uint16_t dma_timing;
+
+        uint16_t validity;
+        uint16_t cur_cyl;
+        uint16_t cur_heads;
+        uint16_t cur_sectors;
+        uint16_t cur_capacity0;
+        uint16_t cur_capacity1;
+        uint16_t mss;
+        uint16_t total_lba28_0;
+        uint16_t total_lba28_1;
+        uint16_t sw_dma;
+        uint16_t mw_dma;
+        uint16_t pio_modes;
+        uint16_t min_mw_dma_cycle;
+        uint16_t rec_mw_dma_cycle;
+        uint16_t min_raw_pio_cycle;
+        uint16_t min_iordy_pio_cycle;
+
+        uint16_t _res69;
+        uint16_t _res70;
+        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];
+} identify_data_t;
+
+enum ata_caps {
+        cap_iordy       = 0x0800,
+        cap_iordy_cbd   = 0x0400,
+        cap_lba         = 0x0200,
+        cap_dma         = 0x0100
+};
+
+/** 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,         /**< 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 {
         bool present;
-        unsigned heads;
-        unsigned cylinders;
-        unsigned sectors;
+        enum addr_mode amode;
+
+        /*
+         * Geometry. Only valid if operating in CHS mode.
+         */
+        struct {
+                unsigned heads;
+                unsigned cylinders;
+                unsigned sectors;
+        } geom;
+
         uint64_t blocks;
+
+        char model[STR_BOUNDS(40) + 1];
 
         fibril_mutex_t lock;