From aac6b966928f6e00b7008823ff4efa163bb5ef95 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 14 Jun 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-06-14

---
 pc/sdmylex.c      |  3 ---
 pc/vgamach64xx.c  | 13 +++++++++++--
 port/devns16552.c |  5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pc/sdmylex.c b/pc/sdmylex.c
index e6a576c89dd06f782edbfc2aff91b68fdb8b21a8..19464d22b1ab75dc89c13ef946fe205f854484ea 100644
--- a/pc/sdmylex.c
+++ b/pc/sdmylex.c
@@ -1013,9 +1013,6 @@ buggery:
 static int mylexport[8] = {
 	0x330, 0x334, 0x230, 0x234, 0x130, 0x134, 0x000, 0x000,
 };
-static int mylexirq[8] = {
-	9, 10, 11, 12, 14, 15, 0, 0,
-};
 
 static SDev*
 mylexpnp(void)
diff --git a/pc/vgamach64xx.c b/pc/vgamach64xx.c
index 9b278accc9731ec4085511c6e45f8d175035274c..6adcc8f2feb6ee75bfb8f81496d61a65d5da2a75 100644
--- a/pc/vgamach64xx.c
+++ b/pc/vgamach64xx.c
@@ -13,7 +13,7 @@
 #include "screen.h"
 
 /*
- * ATI Mach64(CT|ET|G*|VT|VU|LP).
+ * ATI Mach64(CT|ET|G*|VT|VU|L*).
  */
 static ushort mach64xxdid[] = {
 	('C'<<8)|'T',
@@ -29,6 +29,7 @@ static ushort mach64xxdid[] = {
 	('G'<<8)|'Z',
 	('V'<<8)|'T',
 	('V'<<8)|'U',
+	('L'<<8)|'B',
 	('L'<<8)|'I',
 	('L'<<8)|'M',
 	('L'<<8)|'P',
@@ -765,8 +766,16 @@ mach64xxdrawinit(VGAscr *scr)
 		scr->scroll = mach64hwscroll;
 	}
 /*	scr->blank = mach64blank; */
-	if(scr->id == ('L'<<8)|'P')	/* Rage LT PRO */
+	switch(scr->id){
+	default:
+		break;
+	case ('L'<<8)|'B':		/* 4C42: Rage 3D LTPro */
+	case ('L'<<8)|'I':		/* 4C49: Rage 3D LTPro */
+	case ('L'<<8)|'M':		/* 4C4D: Rage Mobility */
+	case ('L'<<8)|'P':		/* 4C50: Rage 3D LTPro */
 		scr->blank = mach64lcdblank;
+		break;
+	}
 }
 
 VGAdev vgamach64xxdev = {
diff --git a/port/devns16552.c b/port/devns16552.c
index c337dc76ab569e3f1265465935c2fdd7d77b1fc3..f847fedbca20427e1dabc6a41861ca45920ea9dd 100644
--- a/port/devns16552.c
+++ b/port/devns16552.c
@@ -312,6 +312,8 @@ ns16552fifoon(Uart *p)
 	else
 		uartwrreg(p, Fifoctl, Fena|Ftrig4);
 
+	/* fix from Scott Schwartz <schwartz@bio.cse.psu.edu> */
+ 	p->istat = uartrdreg(p, Istat); 
 	if((p->istat & Fenabd) == 0){
 		/* didn't work, must be an earlier chip type */
 		p->type = Ns450;
@@ -890,7 +892,7 @@ uartstatus(Chan*, Uart *p, void *buf, long n, long offset)
 	fstat = p->sticky[Format];
 	snprint(str, sizeof str,
 		"b%d c%d d%d e%d l%d m%d p%c r%d s%d\n"
-		"%d %d %d%s%s%s%s%s\n",
+		"dev(%d) type(%d) framing(%d) overruns(%d)%s%s%s%s%s\n",
 
 		p->baud,
 		p->hup_dcd, 
@@ -903,6 +905,7 @@ uartstatus(Chan*, Uart *p, void *buf, long n, long offset)
 		(fstat & Stop2) ? 2 : 1,
 
 		p->dev,
+		p->type,
 		p->frame,
 		p->overrun, 
 		p->fifoon       ? " fifo" : "",