Update Sata.cs

incognel · Dec 30, 2017 · 75320a7 · 75320a7
1 parent 5bbab33
commit 75320a7
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/source/Cosmos.HAL2/BlockDevice/Ports/Sata.cs b/source/Cosmos.HAL2/BlockDevice/Ports/Sata.cs
@@ -89,7 +89,9 @@ public void SendSATACommand(ATACommands aCommand)
                 Device = 0
             };
 
-            while ((mPortReg.TFD & 0x88) != 0 && xSpin < 1000000);
+            int xSpin = 0;
+
+            while ((mPortReg.TFD & 0x88) != 0) && xSpin < 1000000) xSpin++;
 
             if (xSpin == 1000000)
             {
@@ -181,7 +183,15 @@ public void SendSATA28Command(ATACommands aCommand, uint aStart, uint aCount)
                 };
             }
 
-            while ((mPortReg.TFD & 0x88) != 0);
+            int xSpin = 0;
+
+            while ((mPortReg.TFD & 0x88) != 0) && xSpin < 1000000) xSpin++;
+
+            if (xSpin == 1000000)
+            {
+                mSATAPIDebugger.Send($"Port {mPortNumber} timed out!");
+                return;
+            };
 
             mPortReg.CI = 1U;
 
@@ -247,8 +257,16 @@ public void SendSATA48Command(ATACommands aCommand, ulong aStart, uint aCount)
                 CountH = (byte)((aCount >> 8) & 0xFF)
             };
 
-            while ((mPortReg.TFD & 0x88) != 0) ;
+            int xSpin = 0;
+
+            while ((mPortReg.TFD & 0x88) != 0) && xSpin < 1000000) xSpin++;
 
+            if (xSpin == 1000000)
+            {
+                mSATAPIDebugger.Send($"Port {mPortNumber} timed out!");
+                return;
+            };
+
             mPortReg.CI = 1U;
 
             while (true)