From 2ea3d68c165982b6b8dc808114a1c34a6d4bcb30 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 27 Mar 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-03-27

---
 port/devcons.c | 4 ++++
 power/bboot.c  | 2 +-
 power/boot.c   | 2 +-
 power/boot.h   | 4 ++--
 power/duart.c  | 4 ----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/port/devcons.c b/port/devcons.c
index f45ddbe609c5b1fd7e7ce090710b1a458f5fbe96..3c697e46df6110b31b4574494ded1787f35acb54 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -249,6 +249,8 @@ echo(int c)
 	/*
 	 * ^t hack BUG
 	 */
+	if(c == 0x10)
+		panic("^p");
 	if(c == 0x14)
 		DEBUG();
 	if(c == 0x15)
@@ -272,6 +274,8 @@ echo(int c)
 void
 kbdchar(int c)
 {
+	if(c == 0)	/* NULs cause trouble */
+		return;
 	if(c == '\r')
 		c = '\n';
 	echo(c);
diff --git a/power/bboot.c b/power/bboot.c
index 16e416db5b163b3107aab933caf2c0b7f96948a2..cfc8a8ff27f110bb1350d03fdbcb11813f7c4576 100644
--- a/power/bboot.c
+++ b/power/bboot.c
@@ -26,7 +26,7 @@ struct address {
 
 Address addr[] = {
 	{ "ross", "connect 020701005eff" },
-	{ "bootes", "connect 080069020205" },
+	{ "bootes", "connect 0800690203f3" },
 	{ "helix", "connect 080069020427" },
 	{ "spindle", "connect 0800690202df" },
 	{ "r70", "connect 08002b04265d" },
diff --git a/power/boot.c b/power/boot.c
index da7e4782f4b68c1e502c922a43e903d557ff9e1f..bdc4faa55698736a68a952652bae88b2e57dde2d 100644
--- a/power/boot.c
+++ b/power/boot.c
@@ -27,7 +27,7 @@ struct address {
 
 Address addr[] = {
 	{ "ross", "connect 020701005eff" },
-	{ "bootes", "connect 080069020205" },
+	{ "bootes", "connect 0800690203f3" },
 	{ "helix", "connect 080069020427" },
 	{ "spindle", "connect 0800690202df" },
 	{ "r70", "connect 08002b04265d" },
diff --git a/power/boot.h b/power/boot.h
index 852b33d65a6d500ec26c630400df56446775b807..3b42fc65cd2bb987a0c90514b9a91329161dc58d 100644
--- a/power/boot.h
+++ b/power/boot.h
@@ -5384,8 +5384,8 @@ ulong bootcode[]={
 	0x06e656374,
 	0x020303830,
 	0x030363930,
-	0x032303230,
-	0x035006865,
+	0x032303366,
+	0x033006865,
 	0x06c697800,
 	0x0636f6e6e,
 	0x065637420,
diff --git a/power/duart.c b/power/duart.c
index 7b171456113a30cbd7b3ab508bd2beceae270039..ae385da90d2049a86434be1681f9b797da7ca40b 100644
--- a/power/duart.c
+++ b/power/duart.c
@@ -132,10 +132,6 @@ duartintr(void)
 		c = duart->data;
 		if(status & (FRM_ERR|OVR_ERR|PAR_ERR))
 			duart->cmnd = RESET_ERR;
-		switch(c &= 0x7F){
-		case 0x10:
-			panic("^p");
-		}
 		kbdchar(c);
 	}
 	/*