3 files changed, 15 insertions(+), 6 deletions(-)

M pc/sdmylex.c
M pc/vgamach64xx.c
M port/devns16552.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)

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

@@ 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" : "",