2 files changed, 13 insertions(+), 2 deletions(-)

M pc/devata.c
M pc/kbd.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);
 		}
 	}
 

@@ 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