tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix AHCI bit test accesses in various files to use PCIBt/PCIBts/PCIBtr.

Browse source
This commit is contained in:
TomAwezome 2022-10-23 02:03:47 -04:00
parent b07c1385f7
commit ff06fa23a3
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Kernel/BlkDev/DiskATAId.ZC
View file

@ -29,7 +29,7 @@ I64 MountAHCIAuto()
// if boot-drive blkdev exists, do a SATA port iteration to mount it first
"( ':' BlkDev at 0x%0X )\n", bd;
for (i = 0; i < AHCI_MAX_PORTS; i++)
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
@ -55,7 +55,7 @@ I64 MountAHCIAuto()
// do a 2nd iteration to mount remaining drives
// (we will end up trying to boot off whichever drive/partition ends up at chosen letter)
for (i = 0; i < AHCI_MAX_PORTS; i++)
if (i != ata_port && i != atapi_port && Bt(&blkdev.ahci_hba->ports_implemented, i))
if (i != ata_port && i != atapi_port && PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];

2
src/Misc/Auto/AutoFullDistro0.ZC
View file

@ -7,7 +7,7 @@ U0 Auto()
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATA)

2
src/Misc/Auto/AutoFullDistro00.ZC
View file

@ -7,7 +7,7 @@ U0 Auto()
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATA)

4
src/Misc/Auto/AutoInstall.ZC
View file

@ -66,7 +66,7 @@ U0 VMInstallWiz()
SATARep;
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATA)
@ -78,7 +78,7 @@ U0 VMInstallWiz()
}
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATAPI)

4
src/Misc/OSInstall.ZC
View file

@ -268,7 +268,7 @@ U0 VMInstallWiz()
SATARep;
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATA)
@ -280,7 +280,7 @@ U0 VMInstallWiz()
}
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];
if (port->signature == AHCI_PxSIG_ATAPI)

2
src/System/BlkDev/Mount.ZC
View file

@ -60,7 +60,7 @@ public I64 SATARep(I64 bd_type=BDT_NULL)
for (i = 0; i < AHCI_MAX_PORTS; i++)
{
if (Bt(&blkdev.ahci_hba->ports_implemented, i))
if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
{
port = &blkdev.ahci_hba->ports[i];