drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[Denali] Rename devices to ports.

This commit is contained in:
Drew Galbraith 2023-12-08 15:14:52 -08:00
parent 69ce3028fa
commit e308d8e120
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/denali/ahci/ahci_controller.cpp
View File

@ -28,7 +28,7 @@ glcr::ErrorOr<glcr::UniquePtr<AhciController>> AhciController::Init(
driver->DumpCapabilities(); driver->DumpCapabilities();
RET_ERR(driver->ResetHba()); RET_ERR(driver->ResetHba());
RET_ERR(driver->RegisterIrq()); RET_ERR(driver->RegisterIrq());
RET_ERR(driver->LoadDevices()); RET_ERR(driver->LoadPorts());
// driver->DumpPorts(); // driver->DumpPorts();
return driver; return driver;
} }
@ -38,11 +38,11 @@ glcr::ErrorOr<AhciPort*> AhciController::GetDevice(uint64_t id) {
return glcr::INVALID_ARGUMENT; return glcr::INVALID_ARGUMENT;
} }
if (devices_[id].empty()) { if (ports_[id].empty()) {
return glcr::NOT_FOUND; return glcr::NOT_FOUND;
} }
return devices_[id].get(); return ports_[id].get();
} }
void AhciController::DumpCapabilities() { void AhciController::DumpCapabilities() {
@ -125,13 +125,13 @@ void AhciController::DumpCapabilities() {
void AhciController::DumpPorts() { void AhciController::DumpPorts() {
for (uint64_t i = 0; i < 6; i++) { for (uint64_t i = 0; i < 6; i++) {
if (devices_[i].empty()) { if (ports_[i].empty()) {
continue; continue;
} }
dbgln(""); dbgln("");
dbgln("Port {}:", i); dbgln("Port {}:", i);
devices_[i]->DumpInfo(); ports_[i]->DumpInfo();
} }
} }
@ -141,8 +141,8 @@ void AhciController::InterruptLoop() {
uint64_t bytes, caps; uint64_t bytes, caps;
check(ZPortRecv(irq_port_cap_, &bytes, nullptr, &caps, nullptr)); check(ZPortRecv(irq_port_cap_, &bytes, nullptr, &caps, nullptr));
for (uint64_t i = 0; i < num_ports_; i++) { for (uint64_t i = 0; i < num_ports_; i++) {
if (!devices_[i].empty() && (ahci_hba_->interrupt_status & (1 << i))) { if (!ports_[i].empty() && (ahci_hba_->interrupt_status & (1 << i))) {
devices_[i]->HandleIrq(); ports_[i]->HandleIrq();
ahci_hba_->interrupt_status &= ~(1 << i); ahci_hba_->interrupt_status &= ~(1 << i);
} }
} }
@ -229,7 +229,7 @@ glcr::ErrorCode AhciController::ResetHba() {
return static_cast<glcr::ErrorCode>(ZThreadSleep(50)); return static_cast<glcr::ErrorCode>(ZThreadSleep(50));
} }
glcr::ErrorCode AhciController::LoadDevices() { glcr::ErrorCode AhciController::LoadPorts() {
for (uint8_t i = 0; i <= num_ports_; i++) { for (uint8_t i = 0; i <= num_ports_; i++) {
if (!(ahci_hba_->port_implemented & (1 << i))) { if (!(ahci_hba_->port_implemented & (1 << i))) {
continue; continue;
@ -242,9 +242,9 @@ glcr::ErrorCode AhciController::LoadDevices() {
continue; continue;
} }
devices_[i] = new AhciPort(reinterpret_cast<AhciPortHba*>(port_addr)); ports_[i] = new AhciPort(reinterpret_cast<AhciPortHba*>(port_addr));
// TODO: Maybe continue to the next device if this fails. // TODO: Maybe continue to the next device if this fails.
RET_ERR(devices_[i]->Identify()); RET_ERR(ports_[i]->Identify());
} }
return glcr::OK; return glcr::OK;
} }

4
sys/denali/ahci/ahci_controller.h
View File

@ -27,7 +27,7 @@ class AhciController {
mmth::OwnedMemoryRegion ahci_region_; mmth::OwnedMemoryRegion ahci_region_;
volatile AhciHba* ahci_hba_ = nullptr; volatile AhciHba* ahci_hba_ = nullptr;
glcr::UniquePtr<AhciPort> devices_[32]; glcr::UniquePtr<AhciPort> ports_[32];
Thread irq_thread_; Thread irq_thread_;
uint64_t irq_port_cap_ = 0; uint64_t irq_port_cap_ = 0;
@ -38,7 +38,7 @@ class AhciController {
glcr::ErrorCode LoadCapabilities(); glcr::ErrorCode LoadCapabilities();
glcr::ErrorCode LoadHbaRegisters(); glcr::ErrorCode LoadHbaRegisters();
glcr::ErrorCode ResetHba(); glcr::ErrorCode ResetHba();
glcr::ErrorCode LoadDevices(); glcr::ErrorCode LoadPorts();
AhciController(mmth::OwnedMemoryRegion&& pci_region) AhciController(mmth::OwnedMemoryRegion&& pci_region)
: pci_region_(glcr::Move(pci_region)), : pci_region_(glcr::Move(pci_region)),