Changeset 17aca1c in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2011-02-04T20:56:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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 mainline changes

File:

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

uspace/srv/bd/ata_bd/ata_bd.h

@@ -53 +53 @@
 };
 
-/** Block addressing mode. */
-enum addr_mode {
+enum ata_dev_type {
+        ata_reg_dev,    /* Register device (no packet feature set support) */
+        ata_pkt_dev     /* Packet device (supports packet feature set). */
+};
+
+/** Register device block addressing mode. */
+enum rd_addr_mode {
         am_chs,         /**< CHS block addressing */
         am_lba28,       /**< LBA-28 block addressing */
@@ -62 +67 @@
 /** Block coordinates */
 typedef struct {
-        /** Addressing mode used */
-        enum addr_mode amode;
+        enum rd_addr_mode amode;
 
         union {
@@ -90 +94 @@
 typedef struct {
         bool present;
-        enum addr_mode amode;
+
+        /** Device type */
+        enum ata_dev_type dev_type;
+
+        /** Addressing mode to use (if register device) */
+        enum rd_addr_mode amode;
 
         /*
@@ -102 +111 @@
 
         uint64_t blocks;
+        size_t block_size;
 
         char model[STR_BOUNDS(40) + 1];