Modules/AHCI - Cleaned up AHCI LVM names

[tpg/acess2.git] / KernelLand / Modules / Storage / AHCI / ahci.h

diff --git a/KernelLand/Modules/Storage/AHCI/ahci.h b/KernelLand/Modules/Storage/AHCI/ahci.h
index 3965295..81b6059 100644 (file)
--- a/KernelLand/Modules/Storage/AHCI/ahci.h
+++ b/KernelLand/Modules/Storage/AHCI/ahci.h
@@ -9,16 +9,53 @@
 #define _AHCI__AHCI_H_
 
 #include "ahci_hw.h"
+#include <Storage/LVM/include/lvm.h>
+#include <stdbool.h>
+#include <mutex.h>
+#include <semaphore.h>
+#include <events.h>
 
 typedef struct sAHCI_Ctrlr     tAHCI_Ctrlr;
+typedef struct sAHCI_Port      tAHCI_Port;
 
 struct sAHCI_Ctrlr
 {
-        int    PortCount;      
-
+        int    ID;     // Controller ID
+       
         int    IRQ;
        tPAddr  PMemBase;
-       struct sAHCI_MemSpace   *MMIO;
+       tAHCI_MemSpace  *MMIO;
+       
+       bool    Supports64Bit;
+
+        int    NCS;
+       
+        int    PortCount;
+       tAHCI_Port      *Ports;
+};
+
+struct sAHCI_Port
+{
+        int    Idx;    // Hardware index
+       tAHCI_Ctrlr     *Ctrlr;
+       volatile struct s_port  *MMIO;
+
+       tMutex  lCommandSlots;
+       Uint32  IssuedCommands;
+       volatile struct sAHCI_CmdHdr    *CmdList;
+       struct sAHCI_CmdTable   *CommandTables[32];
+       tThread *CommandThreads[32];
+       volatile struct sAHCI_RcvdFIS   *RcvdFIS;
+
+       tSemaphore      InterruptSem;
+       Uint32  LastIS;
+
+       bool    bHotplug;
+       bool    bPresent;
+       bool    bATAPI;
+
+       void    *LVMHandle;
+       Uint64  SectorCount;
 };
 
 #endif