git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
physical page list mapping
[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 5ff1cc218afc737ef871f4992b31e46817a8331d..fb196fac1ceb4b83d9fe402e52e87dc7784400ce 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 <hal/ahci/scsi.h>
#include <hal/pci.h>
-#include <asm/x86_pmio.h>
-
#include <klibc/string.h>
#include <lunaix/block.h>
#include <lunaix/mm/mmio.h>
#include <klibc/string.h>
#include <lunaix/block.h>
#include <lunaix/mm/mmio.h>
@@
-70,7
+68,7
@@
__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;
- port_delay(100000); // 等待至少一毫秒,差不多就行了
+
port_reg[HBA_RPxSCTL] &= ~0xf;
}
port_reg[HBA_RPxSCTL] &= ~0xf;
}