From ff06fa23a35d95661dc276b19fd4832da943be63 Mon Sep 17 00:00:00 2001
From: TomAwezome <sonidd1@yahoo.com>
Date: Sun, 23 Oct 2022 02:03:47 -0400
Subject: [PATCH] Fix AHCI bit test accesses in various files to use
 PCIBt/PCIBts/PCIBtr.

---
 src/Kernel/BlkDev/DiskATAId.ZC    | 4 ++--
 src/Misc/Auto/AutoFullDistro0.ZC  | 2 +-
 src/Misc/Auto/AutoFullDistro00.ZC | 2 +-
 src/Misc/Auto/AutoInstall.ZC      | 4 ++--
 src/Misc/OSInstall.ZC             | 4 ++--
 src/System/BlkDev/Mount.ZC        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Kernel/BlkDev/DiskATAId.ZC b/src/Kernel/BlkDev/DiskATAId.ZC
index 27b86762..84044438 100755
--- a/src/Kernel/BlkDev/DiskATAId.ZC
+++ b/src/Kernel/BlkDev/DiskATAId.ZC
@@ -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];
 
diff --git a/src/Misc/Auto/AutoFullDistro0.ZC b/src/Misc/Auto/AutoFullDistro0.ZC
index 423786c0..791b8b47 100755
--- a/src/Misc/Auto/AutoFullDistro0.ZC
+++ b/src/Misc/Auto/AutoFullDistro0.ZC
@@ -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)
diff --git a/src/Misc/Auto/AutoFullDistro00.ZC b/src/Misc/Auto/AutoFullDistro00.ZC
index 1dddeb74..c9c58e39 100755
--- a/src/Misc/Auto/AutoFullDistro00.ZC
+++ b/src/Misc/Auto/AutoFullDistro00.ZC
@@ -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)
diff --git a/src/Misc/Auto/AutoInstall.ZC b/src/Misc/Auto/AutoInstall.ZC
index 7008970b..d3f5f4ec 100755
--- a/src/Misc/Auto/AutoInstall.ZC
+++ b/src/Misc/Auto/AutoInstall.ZC
@@ -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)
diff --git a/src/Misc/OSInstall.ZC b/src/Misc/OSInstall.ZC
index 94ab304d..4605d6a8 100755
--- a/src/Misc/OSInstall.ZC
+++ b/src/Misc/OSInstall.ZC
@@ -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)
diff --git a/src/System/BlkDev/Mount.ZC b/src/System/BlkDev/Mount.ZC
index 9f1c5e02..e66d18cb 100755
--- a/src/System/BlkDev/Mount.ZC
+++ b/src/System/BlkDev/Mount.ZC
@@ -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];