Change the timeouts on adb keyboard probing to be the same as NetBSD.

It now boots a bit faster, and works more reliable on PBG4 500MHz machines.

2 files changed, 5 insertions, 7 deletions

diff --git a/sys/arch/powerpc/mac/adb_direct.c b/sys/arch/powerpc/mac/adb_direct.c
index aa8e8a326db..bd504a14923 100644
--- a/sys/arch/powerpc/mac/adb_direct.c
+++ b/sys/arch/powerpc/mac/adb_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb_direct.c,v 1.7 2001/07/09 03:30:19 mickey Exp $	*/
+/*	$OpenBSD: adb_direct.c,v 1.8 2001/08/18 21:22:09 drahn Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
 /* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -1279,7 +1279,7 @@ adb_reinit(void)
 
 	/* send an ADB reset first */
 	adb_op_sync((Ptr)0, (Ptr)0, (Ptr)0, (short)0x00);
-	delay(1000);
+	delay(200000);
 
 	/*
 	 * Probe for ADB devices. Probe devices 1-15 quickly to determine
diff --git a/sys/arch/powerpc/mac/pm_direct.c b/sys/arch/powerpc/mac/pm_direct.c
index 14b2b92418d..61fba76c800 100644
--- a/sys/arch/powerpc/mac/pm_direct.c
+++ b/sys/arch/powerpc/mac/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.4 2001/07/04 08:38:52 niklas Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.5 2001/08/18 21:22:09 drahn Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -1044,13 +1044,11 @@ pm_adb_op(buffer, compRout, data, command)
 		return 1;
 	}
 
+	delay(10000);
+
 	adbWaiting = 1;
 	adbWaitingCmd = command;
 
-	{
-		delay (150000);
-	}
-
 	PM_VIA_INTR_ENABLE();
 
 	/* wait until the PM interrupt is occured */