From 129cc78f5e490c8e8c4095d5cdc3ff0e04d23f4b Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 5 Mar 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-03-05

---
 carrera/io.h   |  1 +
 carrera/main.c | 20 ++++++++++----------
 carrera/trap.c |  1 -
 port/devcons.c |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/carrera/io.h b/carrera/io.h
index 64af74efcd5524b1d997a6f521028d1df353c7be..fa6ce2fa1e750e7239986b2ceb044e8bb1686647 100644
--- a/carrera/io.h
+++ b/carrera/io.h
@@ -10,6 +10,7 @@ enum
 	Eisaphys	= 0x90000000,	/* IO port physical */
 	Devicevirt	= 0xE0000000,
 	Dmabase		= 0xE0000000,	
+	  R4030ier	= 0xE00000E8,	/* Interrupt enable register */
 	  R4030Isr	= 0xE0000204,	/* Interrupt status register */
 	  R4030Et	= 0xE000020C,	/* Eisa error type */
 	  R4030Rfa	= 0xE000003C,	/* Remote failed address */
diff --git a/carrera/main.c b/carrera/main.c
index a33b680474cb2429ae30ebda0a7ccff67aa453a2..6917915dff0a79fbea5297f98f3bf32699845527 100644
--- a/carrera/main.c
+++ b/carrera/main.c
@@ -228,11 +228,11 @@ ioinit(int mapeisa)
 	 *  Set the 8259 as master with edge triggered
 	 *  input with fully nested interrupts.
 	 */
-	EISAOUTB(Int0ctl, 0x11);		/* ICW1 - edge triggered, master,
-						   ICW4 will be sent */
-	EISAOUTB(Int0aux, Int0vec);		/* ICW2 - interrupt vector offset */
-	EISAOUTB(Int0aux, 0x04);		/* ICW3 - have slave on level 2 */
-	EISAOUTB(Int0aux, 0x01);		/* ICW4 - 8086 mode, not buffered */
+	EISAOUTB(Int0ctl, 0x11);	/* ICW1 - edge triggered, master,
+					   ICW4 will be sent */
+	EISAOUTB(Int0aux, Int0vec);	/* ICW2 - interrupt vector offset */
+	EISAOUTB(Int0aux, 0x04);	/* ICW3 - have slave on level 2 */
+	EISAOUTB(Int0aux, 0x01);	/* ICW4 - 8086 mode, not buffered */
 
 	/*
 	 *  Set up the second 8259 interrupt processor.
@@ -240,11 +240,11 @@ ioinit(int mapeisa)
 	 *  Set the 8259 as master with edge triggered
 	 *  input with fully nested interrupts.
 	 */
-	EISAOUTB(Int1ctl, 0x11);		/* ICW1 - edge triggered, master,
-						   ICW4 will be sent */
-	EISAOUTB(Int1aux, Int1vec);		/* ICW2 - interrupt vector offset */
-	EISAOUTB(Int1aux, 0x02);		/* ICW3 - I am a slave on level 2 */
-	EISAOUTB(Int1aux, 0x01);		/* ICW4 - 8086 mode, not buffered */
+	EISAOUTB(Int1ctl, 0x11);	/* ICW1 - edge triggered, master,
+					   ICW4 will be sent */
+	EISAOUTB(Int1aux, Int1vec);	/* ICW2 - interrupt vector offset */
+	EISAOUTB(Int1aux, 0x02);	/* ICW3 - I am a slave on level 2 */
+	EISAOUTB(Int1aux, 0x01);	/* ICW4 - 8086 mode, not buffered */
 
 	/*
 	 *  pass #2 8259 interrupts to #1
diff --git a/carrera/trap.c b/carrera/trap.c
index 6a349db49630905561a10412fae9178a3f582385..5b6ce03d65ebeb35a99aeef5eba6b2def6d9080d 100644
--- a/carrera/trap.c
+++ b/carrera/trap.c
@@ -319,7 +319,6 @@ intr(Ureg *ur)
 	}
 	if(cause & INTR2) {
 		isr = IO(ulong, R4030Isr);
-
 		if(isr & (1<<5)) {
 			audiodmaintr();
 			isr &= ~(1<<5);
diff --git a/port/devcons.c b/port/devcons.c
index bbcc23477cc2b346532c71e6452f694a398f563b..339fb64be3d14278d575990261da1fbdb6532528 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -146,6 +146,7 @@ panic(char *fmt, ...)
 
 	exit(1);
 }
+
 int
 pprint(char *fmt, ...)
 {