Changeset 89ac5513 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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) (2 diffs)

uspace/srv/bd/ata_bd/ata_bd.h

@@ -95 +95 @@
 typedef struct {
         bool present;
+        struct ata_ctrl *ctrl;
 
         /** Device type */
@@ -122 +123 @@
 } disk_t;
 
+/** ATA controller */
+typedef struct ata_ctrl {
+        /** I/O base address of the command registers */
+        uintptr_t cmd_physical;
+        /** I/O base address of the control registers */
+        uintptr_t ctl_physical;
+
+        /** Command registers */
+        ata_cmd_t *cmd;
+        /** Control registers */
+        ata_ctl_t *ctl;
+
+        /** Per-disk state. */
+        disk_t disk[MAX_DISKS];
+} ata_ctrl_t;
+
 #endif