Changes in uspace/drv/block/ahci/ahci.h [56fd7cf:9904eb90] in mainline

File:

• uspace/drv/block/ahci/ahci.h (modified) (5 diffs)

uspace/drv/block/ahci/ahci.h

@@ -34 +34 @@
 #define __AHCI_H__
 
-#include <async.h>
 #include <sys/types.h>
 #include <devman.h>
@@ -47 +46 @@
         
         /** Pointer to AHCI memory registers. */
-        volatile ahci_memregs_t *memregs;
+        ahci_memregs_t *memregs;
+        
+        /** AHCI device global timer. */
+        fibril_timer_t *timer;
         
         /** Pointers to sata devices. */
-        void *sata_devs[AHCI_MAX_PORTS];
-
-        /** Parent session */
-        async_sess_t *parent_sess;
+        void *sata_devs[32];
 } ahci_dev_t;
 
@@ -61 +60 @@
         ahci_dev_t *ahci;
         
-        /** Pointer to ddf function. */
-        ddf_fun_t *fun;
-        
-        /** SATA port number (0-31). */
+        /** SATA port number(0-31). */
         uint8_t port_num;
         
+        /** Port interrupt states shadow registers. */
+        volatile ahci_port_is_t shadow_pxis;
+        
         /** Device in invalid state (disconnected and so on). */
-        bool is_invalid_device;
+        volatile bool invalid_device;
         
         /** Pointer to SATA port. */
         volatile ahci_port_t *port;
-        
         /** Pointer to command header. */
         volatile ahci_cmdhdr_t *cmd_header;
-        
         /** Pointer to command table. */
         volatile uint32_t *cmd_table;
@@ -84 +81 @@
         /** Mutex for event signaling condition variable. */
         fibril_mutex_t event_lock;
-        
         /** Event signaling condition variable. */
         fibril_condvar_t event_condvar;
         
-        /** Event interrupt state. */
-        ahci_port_is_t event_pxis;
-        
         /** Block device service id. */
-        service_id_t service_id;
+        service_id_t service_id; 
         
         /** Number of device data blocks. */
         uint64_t blocks;
-        
         /** Size of device data blocks. */
         size_t block_size;
@@ -104 +96 @@
         
         /** Device in invalid state (disconnected and so on). */
-        bool is_packet_device;
+        bool packet_device;
         
         /** Highest UDMA mode supported. */