From cf1df83b6ebb5f019e443fc1856aeeafaebb64bb Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 6 Oct 1998 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1998-10-06

---
 pc/devata.c |  3 +--
 pc/kbd.c    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pc/devata.c b/pc/devata.c
index 57d0a413201b4c149fb0c0e0c5c1b2e1c9dd4d27..c32bd748e3ac097fa09458b026463e559d3525b4 100644
--- a/pc/devata.c
+++ b/pc/devata.c
@@ -394,7 +394,6 @@ atactlrprobe(int ctlrno, int irq, int resetok)
 	ctlr->tbdf = BUSUNKNOWN;
 	ctlr->lastcmd = 0xFF;
 
-
 	/*
 	 * Attempt to check the existence of drives on the controller
 	 * by issuing a 'check device diagnostics' command.
@@ -1612,7 +1611,7 @@ ataintr(Ureg*, void* arg)
 		if(++loop > Maxloop){
 			print("ata%d: cmd=%ux, lastcmd=%ux status=%ux\n",
 				cp->ctlrno, cp->cmd, cp->lastcmd, inb(cp->pbase+Pstatus));
-			panic("%s: wait busy\n", dp->vol);
+			panic("ata%d: wait busy\n", cp->ctlrno);
 		}
 	}
 
diff --git a/pc/kbd.c b/pc/kbd.c
index a063ce5e6e3347fcff1527132a32535faffe32b2..93fd60bbba463fa4fb2bbad0c0107ed9f3edbef3 100644
--- a/pc/kbd.c
+++ b/pc/kbd.c
@@ -62,6 +62,10 @@ uchar kbtab[] =
 [0x48]	'8',	'9',	'-',	'4',	'5',	'6',	'+',	'1',
 [0x50]	'2',	'3',	'0',	'.',	No,	No,	No,	KF|11,
 [0x58]	KF|12,	No,	No,	No,	No,	No,	No,	No,
+[0x60]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x68]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x70]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x78]	No,	View,	No,	KF|14,	No,	No,	No,	No,
 };
 
 uchar kbtabshift[] =
@@ -78,6 +82,10 @@ uchar kbtabshift[] =
 [0x48]	'8',	'9',	'-',	'4',	'5',	'6',	'+',	'1',
 [0x50]	'2',	'3',	'0',	'.',	No,	No,	No,	KF|11,
 [0x58]	KF|12,	No,	No,	No,	No,	No,	No,	No,
+[0x60]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x68]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x70]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x78]	No,	KF|14,	No,	KF|14,	No,	No,	No,	No,
 };
 
 uchar kbtabesc1[] =
@@ -94,6 +102,10 @@ uchar kbtabesc1[] =
 [0x48]	Up,	Pgup,	No,	Left,	No,	Right,	No,	End,
 [0x50]	Down,	Pgdown,	Ins,	Del,	No,	No,	No,	No,
 [0x58]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x60]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x68]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x70]	No,	No,	No,	No,	No,	No,	No,	No,
+[0x78]	No,	KF|14,	No,	No,	No,	No,	No,	No,
 };
 
 enum