there you go ki-ear-ron

src/driver/bus/PCI.pas

@@ -91,6 +91,7 @@ function getDeviceInfo(class_code : uint8; subclass_code : uint8; prog_if : uint
 procedure requestConfig(bus : uint8; slot : uint8; func : uint8; row : uint8);
 procedure writeConfig(bus: uint8; slot : uint8; func : uint8; row : uint8; val : uint32);
 procedure setBusMaster(bus : uint8; slot : uint8; func : uint8; master : boolean);
+procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
 
 implementation 
 
@@ -442,4 +443,32 @@ begin
     pop_trace;
 end;
 
+//Enable device inturrupts and set bus master
+procedure enableDevice(bus : uint8; slot : uint8; func : uint8);
+var
+    addr : uint32;
+    cmd : uint32;
+begin
+    push_trace('PCI.enableDevice');
+
+    addr := ($1 shl 31);
+    addr := addr or (bus shl 16);
+    addr := addr or ((slot) shl 11);
+    addr := addr or ((func) shl 8);
+    addr := addr or ($04 and $FC);
+
+    outl(PCI_CONFIG_ADDRESS_PORT, addr);
+    cmd := inl(PCI_CONFIG_DATA_PORT);
+    cmd := cmd or PCI_COMMAND_MEM_SPACE;
+    cmd := cmd or PCI_COMMAND_BUS_MASTER;
+
+    //enable interrupts, remove disable interrupt bit
+    cmd := cmd and not PCI_COMMAND_INT_DISABLE;
+
+    outl(PCI_CONFIG_ADDRESS_PORT, addr);
+    outl(PCI_CONFIG_DATA_PORT, cmd);
+
+    pop_trace;
+end;
+
 end.

src/driver/include/drivertypes.pas

@@ -21,6 +21,23 @@ unit drivertypes;
 
 interface
 
+const
+    PCI_CONFIG_ADDRESS_PORT = $0CF8;
+    PCI_CONFIG_DATA_PORT    = $0CFC;
+
+    PCI_COMMAND_IO_SPACE    = $0001;
+    PCI_COMMAND_MEM_SPACE   = $0002;
+    PCI_COMMAND_BUS_MASTER  = $0004;
+    PCI_COMMAND_SPECIAL_CYC = $0008;
+    PCI_COMMAND_MEM_WRITE   = $0010;
+    PCI_COMMAND_VGA_PALETTE = $0020;
+    PCI_COMMAND_PARITY      = $0040;
+    PCI_COMMAND_WAIT        = $0080;
+    PCI_COMMAND_SERR        = $0100;
+    PCI_COMMAND_FAST_BACK   = $0200;
+    PCI_COMMAND_INT_DISABLE = $0400;
+    PCI_COMMAND_SERR_ENABLE = $8000;
+
 type
 
     PPCI_Device = ^TPCI_Device;
@@ -44,6 +61,7 @@ type
         address1       : uint32;
         address2       : uint32;
         address3       : uint32;
+
         address4       : uint32;
         address5       : uint32;
         CIS_pointer    : uint32;

src/driver/storage/AHCI/AHCITypes.pas

@@ -72,7 +72,7 @@ type
         rsv0: uint32;           // Reserved
         tfd: uint32;            // Task File Data
         signature: uint32;      // Signature
-        sata_stat: uint32;      // SATA Status (SCR0:SStatus)
+        sata_status: uint32;    // SATA Status (SCR0:SStatus)
         sata_ctrl: uint32;      // SATA Control (SCR2:SControl)
         sata_error: uint32;     // SATA Error (SCR1:SError)
         sata_active: uint32;    // SATA Active
@@ -111,7 +111,7 @@ type
     { 
         AHCI Host Bus Adapter (HBA) FIS (Frame Information Structure) Interface
         This structure is used to access the AHCI HBA's FIS (Frame Information Structure)
-        memory-mapped registers. 
+        memory-mapped registers. RX
     }
     THBA_FIS = bitpacked record 
         dsfis: array[0..$1F] of uint32; // DMA Setup FIS
@@ -127,15 +127,53 @@ type
 
     PHBA_FIS = ^THBA_FIS;
 
+    //enum fis type
+    TFISType = (
+        FIS_TYPE_REG_H2D = $27, // Register FIS - Host to Device
+        FIS_TYPE_REG_D2H = $34, // Register FIS - Device to Host
+        FIS_TYPE_DMA_ACT = $39, // DMA Activate FIS - Device to Host
+        FIS_TYPE_DMA_SETUP = $41, // DMA Setup FIS - Bidirectional
+        FIS_TYPE_DATA = $46, // Data FIS - Bidirectional
+        FIS_TYPE_BIST = $58, // BIST Activate FIS - Bidirectional
+        FIS_TYPE_PIO_SETUP = $5F, // PIO Setup FIS - Device to Host
+        FIS_TYPE_DEV_BITS = $A1 // Set Device Bits FIS - Device to Host
+    );
+
+    { 
+        AHCI Host Bus Adapter (HBA) FIS (Frame Information Structure) Interface
+        This structure is used to access the AHCI HBA's FIS (Frame Information Structure)
+    }
+    THBA_FIS_REG_H2D = bitpacked record 
+        fis_type: uint8;         // FIS Type
+        pmport: uint8;           // Port Multiplier Port
+        command: uint8;          // Command
+        featurel: uint8;         // Feature Lower 8-bits
+        lba0: uint8;             // LBA0
+        lba1: uint8;             // LBA1
+        lba2: uint8;             // LBA2
+        device: uint8;           // Device
+        lba3: uint8;             // LBA3
+        lba4: uint8;             // LBA4
+        lba5: uint8;             // LBA5
+        featureh: uint8;         // Feature Upper 8-bits
+        countl: uint8;           // Count Lower 8-bits
+        counth: uint8;           // Count Upper 8-bits
+        icc: uint8;              // Isochronous Command Completion
+        control: uint8;          // Control
+        rsv0: array[0..2] of uint8;
+    end;
+
+    PHBA_FIS_REG_H2D = ^THBA_FIS_REG_H2D;
+
+
+
     { 
         AHCI Host Bus Adapter (HBA) Command Header Interface
-        This structure is used to access the AHCI HBA's Command Header memory-mapped
-        registers.
     }
     THBA_CMD_HEADER = bitpacked record 
         cmd_fis_length: uint8;   // Command FIS Length
         atapi: uint8;            // ATAPI
-        write: uint8;            // Write
+        wrt: uint8;            // Write
         prefetchable: uint8;     // Prefetchable
         reset: uint8;            // Reset
         bist: uint8;             // BIST
@@ -152,14 +190,28 @@ type
 
     { 
         AHCI Host Bus Adapter (HBA) Command Table Interface
-        This structure is used to access the AHCI HBA's Command Table memory-mapped
+    }
-        registers. The AHCI HBA's Command Table memory-mapped registers are used to
+    THBA_PRD = bitpacked record 
-        configure the HBA and to issue commands to the SATA devices connected to the HBA.
+        dba: uint32;             // Data Base Address
+        dbau: uint32;            // Data Base Address Upper 32-bits
+        rsv0: uint32;            // Reserved
+        reserved: ubit9;         // Reserved
+        dbc: ubit22;             // Data Byte Count
+        int: ubit1;        // Interrupt
+        // dbc: uint32;             // Data Byte Count, bit 1 is Interrupt, then 22 bits of Byte Count, then 9 bits of Reserved
+    end;
+
+    TPRDT = array[0..31] of THBA_PRD;
+    PPRDT = ^TPRDT;
+
+    { 
+        AHCI Host Bus Adapter (HBA) Command Table Interface
     }
     THBA_CMD_TABLE = bitpacked record 
-        cmd_fis: THBA_FIS;       // Command FIS
+        cmd_fis: array[0..63] of uint8; // Command FIS
-        acmd: array[0..$1F] of uint8; // ATAPI Command
+        acmd: array[0..15] of uint8;    // ATAPI Command
-        rsv0: array[0..$30] of uint8;
+        rsv0: array[0..47] of uint8;
+        prdt: TPRDT;                    // Physical Region Descriptor Table
     end;
 
     PHBA_CMD_TABLE = ^THBA_CMD_TABLE;
@@ -167,42 +219,6 @@ type
     TCMD_LIST = array[0..255] of THBA_CMD_HEADER;
     PCMD_LIST = ^TCMD_LIST;
 
-    { 
-        AHCI Host Bus Adapter (HBA) Command Table Interface
-        This structure is used to access the AHCI HBA's Command Table memory-mapped
-        registers. 
-    }
-    THBA_PRD = bitpacked record 
-        dba: uint32;             // Data Base Address
-        dbau: uint32;            // Data Base Address Upper 32-bits
-        rsv0: uint32;            // Reserved
-        dbc: uint32;             // Data Byte Count
-        rsv1: uint32;            // Reserved
-    end;
-
-    { 
-        AHCI Host Bus Adapter (HBA) Command Table Interface
-        This structure is used to access the AHCI HBA's Command Table memory-mapped
-        registers. 
-    }
-    THBA_CMD = bitpacked record 
-        header: THBA_CMD_HEADER; // Command Header
-        table: THBA_CMD_TABLE;   // Command Table
-        prd: array[0..31] of THBA_PRD; // Physical Region Descriptor Table
-    end;
-
-    { 
-        AHCI Host Bus Adapter (HBA) Command Table Interface
-        This structure is used to access the AHCI HBA's Command Table memory-mapped
-        registers. 
-    }
-    THBA = bitpacked record 
-        memory: THBA_Memory; // HBA Memory
-        cmd: array[0..$7FF] of THBA_CMD; // Command List
-    end;
-
-    PHBA = ^THBA;
-
     //////////////////////////////////////////
     //////////// Asuro AHCI types ////////////
     //////////////////////////////////////////