Re: Problems with -current on 425e

Thilo Manske wrote:

> Console output is working fine now, but it seems to ignore characters sent
> to it. Even if I press RESET on the HIL keyboard and the kernel enters the
> debugger.

Try the following patch:

--- dev/apci.c.orig	Thu Apr 18 08:56:40 2002
+++ dev/apci.c	Thu Apr 18 09:04:30 2002
@@ -737,7 +737,8 @@
 	tp->t_cflag = cflag;
 
 	apci->ap_ier = IER_ERXRDY | IER_ETXRDY | IER_ERLS | IER_EMSC;
-	apci->ap_mcr |= MCR_IEN;
+	if (mmuid != MMUID_425_E)
+		apci->ap_mcr |= MCR_IEN;
 
 	splx(s);
 	return (0);
@@ -803,13 +804,15 @@
 	struct apciregs *apci = sc->sc_apci;
 	int s;
 
-	/*
-	 * Always make sure MCR_IEN is set (unless setting to 0)
-	 */
-	if (how == DMBIS || (how == DMSET && bits))
-		bits |= MCR_IEN;
-	else if (how == DMBIC)
-		bits &= ~MCR_IEN;
+	if (mmuid != MMUID_425_E) {
+		/*
+		 * Always make sure MCR_IEN is set (unless setting to 0)
+		 */
+		if (how == DMBIS || (how == DMSET && bits))
+			bits |= MCR_IEN;
+		else if (how == DMBIC)
+			bits &= ~MCR_IEN;
+	}
 
 	s = spltty();
 
	-- Gregory McGarry <[email protected]>