From 909d60ae804b1479247e555f4e3560113a36377d Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 28 May 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-05-28

---
 carrera/l.s    | 8 ++++----
 carrera/main.c | 6 +++---
 pc/devvga.c    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/carrera/l.s b/carrera/l.s
index 617a8125f369ad281ec68d3869bb04c86419c0d7..7d56a4b510141c2d61355aedeb86a163892f9696 100644
--- a/carrera/l.s
+++ b/carrera/l.s
@@ -2,7 +2,6 @@
 
 #define	SP		R29
 
-#define	PROM		(KSEG1+0x1C000000)
 #define	NOOP		WORD	$0x27
 #define	FCRNOOP		NOOP; NOOP; NOOP
 #define	WAIT		NOOP; NOOP
@@ -102,9 +101,10 @@ TEXT	touser(SB), $-4
 	ERET
 
 TEXT	firmware(SB), $0
-	SLL	$3, R1
-	MOVW	$(PROM+0x774), R1
-	JMP	(R1)
+	MOVW	$0xE000D004, R1
+	MOVW	R0, 0(R1)
+firm:
+	JMP	firm
 
 TEXT	splhi(SB), $0
 	MOVW	R31, 12(R(MACH))	/* save PC in m->splpc */
diff --git a/carrera/main.c b/carrera/main.c
index 8cd55c76cdc5eba4ca67a4fff49129e1c98e1300..658df70264c3bc3d4358f7e6ad55457a3e39c7f7 100644
--- a/carrera/main.c
+++ b/carrera/main.c
@@ -409,7 +409,7 @@ exit(long type)
 	USED(type);
 
 	spllo();
-	print("cpu %d exiting\n", m->machno);
+	print("cpu%d exiting\n", m->machno);
 	while(consactive())
 		delay(10);
 
@@ -417,8 +417,8 @@ exit(long type)
 	/* Turn off the NMI hander for the debugger */
 	vec = (uchar*)0xA0000420;
 	vec[0] = 0;
-	/* Call the prom */
-	((void(*)(void))0xBFC00000)();
+
+	firmware(type);
 }
 
 void
diff --git a/pc/devvga.c b/pc/devvga.c
index 6a5fa5f876510c82a1afc7e27c86dd82313beb93..81c78d083ec6833daa487cd2fd5b69dd084fbf18 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -587,7 +587,7 @@ setscreen(int maxx, int maxy, int ldepth)
 	switch(ldepth){
 	case 3:
 		for(i = 0; i < 256; i++)
-			setcolor(i, xnto32(i>>5, 3), xnto32(i>>2, 3), xnto32(i<<1, 2));
+			setcolor(i, xnto32(i>>5, 3), xnto32(i>>2, 3), xnto32(i, 2));
 		setcolor(0x55, xnto32(0x15, 6), xnto32(0x15, 6), xnto32(0x15, 6));
 		setcolor(0xaa, xnto32(0x2a, 6), xnto32(0x2a, 6), xnto32(0x2a, 6));
 		setcolor(0xff, xnto32(0x3f, 6), xnto32(0x3f, 6), xnto32(0x3f, 6));