Merge remote-tracking branch 'origin/master' into isa/arm64

[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 f40ae2428a135457793da09bf209e42d271ab73c..5213a53268becba11eb363428d722c79c281499f 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -14,8 +14,6 @@
 #include <hal/ahci/scsi.h>
 #include <hal/pci.h>
 
-#include <asm/x86_pmio.h>
-
 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <asm-generic/isrm.h>
@@ -29,7 +27,7 @@
 #define HBA_CLB_SIZE 1024
 
 #define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)
-#define AHCI_DEVCLASS DEVCLASS(DEVIF_PCI, DEVFN_STORAGE, DEV_SATA)
+#define AHCI_DEVCLASS DEVCLASS(LUNAIX, STORAGE, SATA)
 
 // #define DO_HBA_FULL_RESET
 
@@ -71,7 +69,7 @@ __hba_reset_port(hba_reg_t* port_reg)
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;
-    port_delay(100000); // 等待至少一毫秒，差不多就行了
+
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }