From ecf2a09a48ef029d09075af744c04e643661ec27 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Tue, 7 Jan 2025 07:39:26 +0100 Subject: ADD: Moved system call handler in HalCommonAPI.asm (AMD64) ADD: Replace make_container with make_app. ADD: Reference SwapDisk.h and TeamScheduler.h in unix_layer for future POSIX work too. Signed-off-by: Amlal El Mahrouss --- dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'dev/Kernel/HALKit/AMD64/Storage') diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc index 9fc261ef..1829a25a 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc @@ -37,18 +37,18 @@ Boolean drv_std_wait_io(UInt16 IO) rt_in8(IO + ATA_REG_STATUS); ATAWaitForIO_Retry: - auto statRdy = rt_in8(IO + ATA_REG_STATUS); + auto rdy = rt_in8(IO + ATA_REG_STATUS); - if ((statRdy & ATA_SR_BSY)) + if ((rdy & ATA_SR_BSY)) goto ATAWaitForIO_Retry; ATAWaitForIO_Retry2: - statRdy = rt_in8(IO + ATA_REG_STATUS); + rdy = rt_in8(IO + ATA_REG_STATUS); - if (statRdy & ATA_SR_ERR) + if (rdy & ATA_SR_ERR) return false; - if (!(statRdy & ATA_SR_DRDY)) + if (!(rdy & ATA_SR_DRDY)) goto ATAWaitForIO_Retry2; return true; @@ -74,16 +74,16 @@ ATAInit_Retry: // identify until it's good - auto statRdy = rt_in8(IO + ATA_REG_STATUS); + auto rdy = rt_in8(IO + ATA_REG_STATUS); - if (statRdy & ATA_SR_ERR) + if (rdy & ATA_SR_ERR) { kcout << "ATA Error, aborting...\r"; return false; } - if ((statRdy & ATA_SR_BSY)) + if ((rdy & ATA_SR_BSY)) { kcout << "Retrying as controller is busy...\r"; goto ATAInit_Retry; -- cgit v1.2.3