add system time, clean up pci into pci.sys, clean up syscall names, fix USERAPC1 typo

code/drivers/storage/ahci/ahci.h

@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <ntlite/ddi/io_driver.h>
+#include <ntlite/ddi/pci.h>
 #include <kernel/mm_phys.h>
 #include <kernel/mm_virt.h>
 #include <kernel/ke_debug.h>
@@ -223,13 +224,12 @@ typedef volatile struct {
 // Constants
 // ---------------------------------------------------------------------------
 
-// PCI
-#define PCI_AHCI_CLASS        0x01
-#define PCI_AHCI_SUBCLASS     0x06
-#define PCI_CMD_REG           0x04
-#define PCI_BAR5_REG          0x24
-#define PCI_CMD_BUSMASTER     (1 << 2)
-#define PCI_CMD_MEMSPACE      (1 << 1)
+// PCI/AHCI binding.  PCI enumeration, BAR decoding, interrupt line
+// discovery, and command-register policy are owned by pci.sys.
+#define AHCI_PCI_BAR_ABAR     5u
+#define AHCI_CONTROLLER_MAGIC  0x41484349u // 'AHCI'
+#define AHCI_DRIVE_MAGIC       0x41484452u // 'AHDR'
+#define MAX_AHCI_CONTROLLERS   8
 
 // GHC register bits
 #define GHC_AE                (1u << 31)  // AHCI Enable
@@ -314,8 +314,12 @@ typedef volatile struct {
 // We map 8 pages (32KB) without probing the BAR size.
 #define AHCI_MMIO_PAGES 8
 
+typedef struct AHCI_CONTROLLER AHCI_CONTROLLER;
+
 // Per-drive context
 typedef struct {
+    uint32_t        magic;          // AHCI_DRIVE_MAGIC
+    AHCI_CONTROLLER* controller;    // owning AHCI controller FDO extension
     HBA_PORT       *port;           // MMIO port registers (virtual)
     uint64_t        sectorCount;    // Total LBA sectors on device
     uint8_t         portNo;         // Physical port index (for ISR dispatch)
@@ -358,15 +362,30 @@ typedef struct {
     //   volatile uint32_t prevSact;             // previous port->sact snapshot
 } AHCI_DRIVE;
 
+struct AHCI_CONTROLLER {
+    uint32_t       magic;           // AHCI_CONTROLLER_MAGIC
+    DEVICE_OBJECT* fdo;
+    DEVICE_OBJECT* pdo;
+    DEVICE_OBJECT* lowerDevice;
+
+    PCI_DEVICE_INFO pciInfo;
+    PCI_BAR         abar;
+    HBA_MEM*        hba;
+    uint64_t        abarLength;
+    uint8_t         irq;
+
+    AHCI_DRIVE      drives[MAX_AHCI_DRIVES];
+    int             driveCount;
+
+    bool            started;
+    bool            surpriseRemoved;
+    bool            removed;
+};
 
 extern const HAL_API *g_hal;
-extern HBA_MEM *g_hba;
-extern uint8_t g_irq;
 extern DRIVER_OBJECT g_driver;
-extern AHCI_DRIVE g_drives[MAX_AHCI_DRIVES];
-extern int g_driveCount;
 
-KSTATUS ahci_map_mmio(uint64_t physBase);
+KSTATUS ahci_map_mmio(uint64_t physBase, uint64_t length);
 void port_stop(HBA_PORT *port);
 void port_start(HBA_PORT *port);
 KSTATUS hba_reset(HBA_MEM *hba);