Changeset eb3683a in mainline for uspace/drv/block/ahci/ahci.h

Timestamp:

2012-07-21T14:11:55Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

76c07e4

Parents:

8486c07

Message:

AHCI improvements

• avoid interrupt lockups by properly detecting and clearing SATA ports interrupt events
• remove timer-based polling (interrupt handling should be reliable now)
• simplify several declarations and get rid of some infamous bit fields
• cstyle improvements

File:

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

uspace/drv/block/ahci/ahci.h

@@ -48 +48 @@
         volatile ahci_memregs_t *memregs;
         
-        /** AHCI device global timer. */
-        fibril_timer_t *timer;
-        
         /** Pointers to sata devices. */
-        void *sata_devs[32];
-        
-        /** Device has harware interrupt. */
-        bool is_hw_interrupt; 
+        void *sata_devs[AHCI_MAX_PORTS];
 } ahci_dev_t;
 
@@ -63 +57 @@
         ahci_dev_t *ahci;
         
-        /** SATA port number(0-31). */
+        /** SATA port number (0-31). */
         uint8_t port_num;
-        
-        /** Port interrupt states shadow registers. */
-        ahci_port_is_t shadow_pxis;
         
         /** Device in invalid state (disconnected and so on). */
@@ -84 +75 @@
         fibril_mutex_t lock;
         
-        /** Mutex for port interrupt state register manipulation. */
-        fibril_mutex_t pxis_lock;
-        
         /** 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;