>Number:         5280
>Category:       port-amiga
>Synopsis:       changes to machdep.c break several drivers
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 10 12:50:00 1998
>Last-Modified:
>Originator:     Matthias Scheler
>Organization:
Matthias Scheler                                http://home.owl.de/~tron/
>Release:        980408
>Environment:
[kernel message not available]

>Description:
Recently the variable "amiga_ttyspl" has been renamed to "amiga_serialspl".
Unfortunately these changes were not applied in all source files which
use this variable. As a result the kernel can't be linked.

>How-To-Repeat:
Try to compile a GENERIC kernel.

>Fix:
--- src/sys/arch/amiga/dev/com_supio.c.orig	Tue Jan 13 14:20:17 1998
+++ src/sys/arch/amiga/dev/com_supio.c	Fri Apr 10 03:41:22 1998
@@ -141,10 +141,10 @@
 	/* XXX this should be really in the interupt stuff */
 	needpsl = PSL_S | (supa->supio_ipl << 8);
 
-	if (amiga_ttyspl < needpsl) {
-		printf("%s: raising amiga_ttyspl from 0x%x to 0x%x\n",
-		    csc->sc_dev.dv_xname, amiga_ttyspl, needpsl);
-		amiga_ttyspl = needpsl;
+	if (amiga_serialspl < needpsl) {
+		printf("%s: raising amiga_serialspl from 0x%x to 0x%x\n",
+		    csc->sc_dev.dv_xname, amiga_serialspl, needpsl);
+		amiga_serialspl = needpsl;
 	}
 	sc->sc_isr.isr_intr = comintr;
 	sc->sc_isr.isr_arg = csc;
--- src/sys/arch/amiga/dev/lpt_supio.c.orig	Sun Sep 28 13:35:11 1997
+++ src/sys/arch/amiga/dev/lpt_supio.c	Fri Apr 10 03:42:33 1998
@@ -124,10 +124,10 @@
 	/* XXX this should be really in the interupt stuff */
 	needpsl = PSL_S | (supa->supio_ipl << 8);
 
-	if (amiga_ttyspl < needpsl) {
-		printf("%s: raising amiga_ttyspl from 0x%x to 0x%x\n",
-		    lsc->sc_dev.dv_xname, amiga_ttyspl, needpsl);
-		amiga_ttyspl = needpsl;
+	if (amiga_serialspl < needpsl) {
+		printf("%s: raising amiga_serialspl from 0x%x to 0x%x\n",
+		    lsc->sc_dev.dv_xname, amiga_serialspl, needpsl);
+		amiga_serialspl = needpsl;
 	}
 	sc->sc_isr.isr_intr = lpt_supio_intr;
 	sc->sc_isr.isr_arg = sc;
--- src/sys/arch/amiga/include/psl.h.orig	Sat Nov 30 13:16:46 1996
+++ src/sys/arch/amiga/include/psl.h	Fri Apr 10 02:29:08 1998
@@ -78,8 +78,8 @@
  *	-is
  */
 
-extern u_int16_t	amiga_ttyspl;
-#define spltty()	_spl(amiga_ttyspl)
+extern u_int16_t	amiga_serialspl;
+#define spltty()	_spl(amiga_serialspl)
 #define splimp()	spltty()	/* XXX for the full story, see i386 */
 
 #ifndef LEV6_DEFER

>Audit-Trail:
>Unformatted: