From 7d30006e4a540d7b929c358e353bb4304d82526c Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 15 Feb 1996 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1996-02-15

---
 pc/devata.c       | 6 +++---
 pc/vgaark2000pv.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pc/devata.c b/pc/devata.c
index f875d92fef41c618a5008f0ca9cd9ccf4880de08..1dc7340fec37ce6ae5f59e8b316ef4129a023738 100644
--- a/pc/devata.c
+++ b/pc/devata.c
@@ -399,9 +399,9 @@ atactlrprobe(int ctlrno, int irq)
 	 */
 	if(ctlr->resetok){
 		outb(port+Pctrl, Srst|nIEN);
-		microdelay(1);
+		delay(10);
 		outb(port+Pctrl, 0);
-		if(atactlrwait(ctlr, DHmagic, 0, 100)){
+		if(atactlrwait(ctlr, DHmagic, 0, MS2TK(20)){
 			DPRINT("ata%d: Srst status %ux/%ux/%ux\n", ctlrno,
 				inb(port+Pstatus), inb(port+Pcylmsb), inb(port+Pcyllsb));
 			xfree(ctlr);
@@ -1116,7 +1116,7 @@ retryatapi:
 	if(cmd == Cident)
 		atasleep(cp, 3000);
 	else
-		atasleep(cp, 30000);
+		atasleep(cp, 10000);
 
 	if(cp->status & Serr){
 		DPRINT("%s: bad disk ident status\n", dp->vol);
diff --git a/pc/vgaark2000pv.c b/pc/vgaark2000pv.c
index be4e139799098dea717bedfc439e64f22450e81c..fcd5b7e8d48988e3645cb90df059bf90d0d47fd6 100644
--- a/pc/vgaark2000pv.c
+++ b/pc/vgaark2000pv.c
@@ -179,7 +179,7 @@ move(Point p)
 	return 0;
 }
 
-Hwgc ark2000pvhwgc = {
+static Hwgc ark2000pvhwgc = {
 	"ark2000pvhwgc",
 	enable,
 	load,