From: John Hodge <tpg@mutabah.net>
Date: Tue, 6 Aug 2013 01:34:32 +0000 (+0800)
Subject: Modules/ATA - Added timeout to GetDiskSize
X-Git-Tag: rel0.15~295
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=072e6e60fd6d5dd5c5b905552bddb907240139c0;p=tpg%2Facess2.git

Modules/ATA - Added timeout to GetDiskSize
---

diff --git a/KernelLand/Modules/Storage/ATA/io.c b/KernelLand/Modules/Storage/ATA/io.c
index 9f471b7d..b15918e1 100644
--- a/KernelLand/Modules/Storage/ATA/io.c
+++ b/KernelLand/Modules/Storage/ATA/io.c
@@ -249,15 +249,22 @@ Uint64 ATA_GetDiskSize(int Disk)
 	}
 
 	// Poll until BSY clears or ERR is set
+	tTime	endtime = now() + 2*1000;	// 2 second timeout
 	// TODO: Timeout?
-	while( (val & 0x80) && !(val & 1) )
+	while( (val & 0x80) && !(val & 1) && now() < endtime )
 		val = inb(base+7);
 	LOG("BSY unset (0x%x)", val);
 	// and, wait for DRQ to set
-	while( !(val & 0x08) && !(val & 1))
+	while( !(val & 0x08) && !(val & 1) && now() < endtime )
 		val = inb(base+7);
 	LOG("DRQ set (0x%x)", val);
 
+	if(now() >= endtime) {
+		Log_Warning("ATA", "Timeout on ATA IDENTIFY (Disk %i)", Disk);
+		LEAVE('i', 0);
+		return 0;
+	}
+
 	// Check for an error
 	if(val & 1) {
 		LEAVE('i', 0);