Skip to content

refactor: Use switch and improve code readability #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiroZDP wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: Use switch and improve code readability #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions src/kernel/drivers/ahci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,24 +248,34 @@ void ahciPortRebase(ahci *ahciPtr, HBA_PORT *port, int portno) {
}

void ahciPortProbe(ahci *ahciPtr, HBA_MEM *abar) {
uint32_t pi = abar->pi;
for (int i = 0; i < 32; i++) {
if (pi & 1) {
int dt = ahciPortType(&abar->ports[i]);
if (dt == AHCI_DEV_SATA) {
debugf("[pci::ahci] SATA drive found at port %d\n", i);
ahciPortRebase(ahciPtr, &abar->ports[i], i);
} else if (dt == AHCI_DEV_SATAPI) {
debugf("[pci::ahci] (unsupported) SATAPI drive found at port %d\n", i);
} else if (dt == AHCI_DEV_SEMB) {
debugf("[pci::ahci] (unsupported) SEMB drive found at port %d\n", i);
} else if (dt == AHCI_DEV_PM) {
debugf("[pci::ahci] (unsupported) PM drive found at port %d\n", i);
}
// otherwise, no drive is in this port
}
uint32_t portsBitmap = abar->pi;

for (int portIndex = 0; portIndex < 32; portIndex++, portsBitmap >>= 1) {
if (!(portsBitmap & 1))
continue; // No device in this port

const int deviceType = ahciPortType(&abar->ports[portIndex]);
switch (deviceType) {
case AHCI_DEV_SATA:
debugf("[pci::ahci] SATA drive found at port %d\n", portIndex);
ahciPortRebase(ahciPtr, &abar->ports[portIndex], portIndex);
break;

case AHCI_DEV_SATAPI:
debugf("[pci::ahci] (unsupported) SATAPI drive found at port %d\n", portIndex);
break;

case AHCI_DEV_SEMB:
debugf("[pci::ahci] (unsupported) SEMB drive found at port %d\n", portIndex);
break;

pi >>= 1;
case AHCI_DEV_PM:
debugf("[pci::ahci] (unsupported) PM drive found at port %d\n", portIndex);
break;

default: // No present drive or unknown type
break;
}
}
}

Expand Down
Loading