Changeset e5792d1 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2009-08-22T15:20:01Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

22af3af

Parents:

a71c158 (diff), 4ef117f8 (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 driver improvements.

File:

• uspace/srv/bd/ata_bd/ata_bd.h (modified) (3 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 */
 };
 
@@ -142 +144 @@
 };
 
+/** 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_lba_sec0;
+        uint16_t total_lba_sec1;
+        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[1 + 127 - 71];
+        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
+};
+
+/** Block addressing mode. */
+enum addr_mode {
+        am_chs,
+        am_lba28
+};
+
 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;