Changeset dd0c8a0 in mainline for uspace/drv/block/ata_bd/ata_bd.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/drv/block/ata_bd/ata_bd.h (moved) (moved from uspace/srv/bd/ata_bd/ata_bd.h ) (3 diffs)

uspace/drv/block/ata_bd/ata_bd.h

@@ -36 +36 @@
 #define __ATA_BD_H__
 
+#include <async.h>
 #include <bd_srv.h>
+#include <ddf/driver.h>
 #include <sys/types.h>
 #include <fibril_synch.h>
 #include <str.h>
+#include "ata_hw.h"
+
+#define NAME "ata_bd"
 
 /** Base addresses for ATA I/O blocks. */
@@ -95 +100 @@
 typedef struct {
         bool present;
+        struct ata_ctrl *ctrl;
+        struct ata_fun *afun;
 
         /** Device type */
@@ -116 +123 @@
         char model[STR_BOUNDS(40) + 1];
 
+        int disk_id;
+} disk_t;
+
+/** ATA controller */
+typedef struct ata_ctrl {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** 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];
+
         fibril_mutex_t lock;
-        service_id_t service_id;
-        int disk_id;
+} ata_ctrl_t;
+
+typedef struct ata_fun {
+        ddf_fun_t *fun;
+        disk_t *disk;
         bd_srvs_t bds;
-} disk_t;
+} ata_fun_t;
+
+extern int ata_ctrl_init(ata_ctrl_t *, ata_base_t *);
+extern int ata_ctrl_remove(ata_ctrl_t *);
+extern int ata_ctrl_gone(ata_ctrl_t *);
+
+extern bd_ops_t ata_bd_ops;
 
 #endif