refactor: one more step towards arch-agnostic design

[lunaix-os.git] / lunaix-os / hal / ahci / ahci.c

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 249b6992cfbd119dd57b6e88ceacf7a8991d8e8e..805976013d18e742adda46aa08e62bb311a2be1a 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -12,8 +12,11 @@
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>

-

 #include <hal/pci.h>
 #include <hal/pci.h>

+
+#include <sys/pci_hba.h>
+#include <sys/port_io.h>
+

 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>
 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>


@@ -33,7 +36,7 @@
 
 LOG_MODULE("AHCI")
 
 
 LOG_MODULE("AHCI")
 

-struct llist_header ahcis;
+DEFINE_LLIST(ahcis);

 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",
 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",


@@ -73,17 +76,10 @@ __hba_reset_port(hba_reg_t* port_reg)
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;

-    io_delay(100000); // 等待至少一毫秒，差不多就行了
+    port_delay(100000); // 等待至少一毫秒，差不多就行了

     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 

-void
-ahci_init()
-{
-    llist_init_head(&ahcis);
-    pci_add_driver("Serial ATA AHCI", AHCI_HBA_CLASS, 0, 0, ahci_driver_init);
-}
-

 void*
 ahci_driver_init(struct pci_device* ahci_dev)
 {
 void*
 ahci_driver_init(struct pci_device* ahci_dev)
 {


@@ -203,6 +199,7 @@ ahci_driver_init(struct pci_device* ahci_dev)
 
     return ahci_drv;
 }
 
     return ahci_drv;
 }

+EXPORT_PCI_DEVICE(pci_ahci, AHCI_HBA_CLASS, 0, 0, ahci_driver_init);

 
 void
 ahci_register_device(struct hba_device* hbadev)
 
 void
 ahci_register_device(struct hba_device* hbadev)