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

Timestamp:

2012-07-18T17:35:08Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7030bc9

Parents:

730dce77

Message:

import AHCI updates (comments, fixes) from Petr Jerman (lp:~petr-jerman/+junk/hos-ahci)

File:

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

uspace/drv/block/ahci/ahci.h

@@ -46 +46 @@
         
         /** Pointer to AHCI memory registers. */
-        ahci_memregs_t *memregs;
+        volatile ahci_memregs_t *memregs;
         
         /** AHCI device global timer. */
@@ -53 +53 @@
         /** Pointers to sata devices. */
         void *sata_devs[32];
+        
+        /** Device has harware interrupt. */
+        bool is_hw_interrupt; 
 } ahci_dev_t;
 
@@ -64 +67 @@
         
         /** Port interrupt states shadow registers. */
-        volatile ahci_port_is_t shadow_pxis;
+        ahci_port_is_t shadow_pxis;
         
         /** Device in invalid state (disconnected and so on). */
-        volatile bool invalid_device;
+        bool is_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;
@@ -78 +83 @@
         /** Mutex for single operation on device. */
         fibril_mutex_t lock;
+        
+        /** Mutex for port interrupt state register manipulation. */
+        fibril_mutex_t pxis_lock;
         
         /** Mutex for event signaling condition variable. */
@@ -96 +104 @@
         
         /** Device in invalid state (disconnected and so on). */
-        bool packet_device;
+        bool is_packet_device;
         
         /** Highest UDMA mode supported. */