~kris/9hist: Plan 9 from Bell Labs 1992-10-16

5 files changed, 137 insertions(+), 48 deletions(-)

M pc/devfloppy.c
M pc/devuart.c
M pc/ether509.c
M pc/kbd.c
M pc/main.c

M pc/devfloppy.c => pc/devfloppy.c +41 -29

@@ 13,7 13,8 @@ typedef	struct Drive		Drive;
 typedef	struct Controller	Controller;
 typedef struct Type		Type;
 
-#define DPRINT if(0)print
+#define DPRINT if(floppydebug)print
+int floppydebug;
 
 /* bits in the registers */
 enum


@@ 408,6 409,7 @@ changed(Chan *c, Drive *dp)
 			if(dp->t == start)
 				nexterror();
 			floppyon(dp);
+			DPRINT("changed: trying %s\n", dp->t->name);
 		}
 		floppyxfer(dp, Fread, dp->cache, 0, dp->t->tsize);
 		poperror();


@@ 540,6 542,8 @@ floppywrite(Chan *c, void *a, long n, ulong offset)
 			floppyon(dp);
 		} else if(SNCMP(ctlmsg, "format") == 0){
 			floppyformat(dp, ctlmsg);
+		} else if(SNCMP(ctlmsg, "debug") == 0){
+			floppydebug = 1;
 		}
 		poperror();
 		qunlock(&fl);


@@ 638,10 642,12 @@ floppycmd(void)
 	int i;
 	int tries;
 
+	fl.nstat = 0;
 	for(i = 0; i < fl.ncmd; i++){
 		for(tries = 0; ; tries++){
 			if(tries > 1000){
-			DPRINT("cmd %ux can't be sent (%d %ux)\n", fl.cmd[0], i, inb(Pmsr));
+				DPRINT("cmd %ux can't be sent (%d %ux)\n",
+					fl.cmd[0], i, inb(Pmsr));
 				fl.confused = 1;
 				return -1;
 			}


@@ 754,6 760,7 @@ static int
 floppyrecal(Drive *dp)
 {
 	dp->ccyl = -1;
+	dp->cyl = -1;
 
 	fl.ncmd = 0;
 	fl.cmd[fl.ncmd++] = Frecal;


@@ 762,16 769,18 @@ floppyrecal(Drive *dp)
 		return -1;
 	floppywait();
 	if(fl.nstat < 2){
+		DPRINT("recalibrate: confused\n");
 		fl.confused = 1;
 		return -1;
 	}
 	if((fl.stat[0] & (Codemask|Seekend)) != Seekend){
+		DPRINT("recalibrate: failed\n");
 		dp->confused = 1;
 		return -1;
 	}
 	dp->cyl = fl.stat[1];
 	if(dp->cyl != 0){
-		DPRINT("recalibrate went to wrong cylinder %d\n", dp->cyl);
+		DPRINT("recalibrate: wrong cylinder %d\n", dp->cyl);
 		dp->cyl = -1;
 		dp->confused = 1;
 		return -1;


@@ 822,24 831,23 @@ floppyseek(Drive *dp, long off)
 	floppypos(dp, off);
 	if(dp->cyl == dp->tcyl)
 		return dp->tcyl;
+	dp->cyl = -1;
 
-	DPRINT("seeking tcyl %d, thead %d\n", dp->tcyl, dp->thead);
+	DPRINT("seek: tcyl %d, thead %d\n", dp->tcyl, dp->thead);
 	fl.ncmd = 0;
 	fl.cmd[fl.ncmd++] = Fseek;
 	fl.cmd[fl.ncmd++] = (dp->thead<<2) | dp->dev;
 	fl.cmd[fl.ncmd++] = dp->tcyl * dp->t->steps;
-	if(floppycmd() < 0){
-		DPRINT("seek cmd failed\n");
+	if(floppycmd() < 0)
 		return -1;
-	}
 	floppywait();
 	if(fl.nstat < 2){
-		DPRINT("seek cmd confused\n");
+		DPRINT("seek: confused\n");
 		fl.confused = 1;
 		return -1;
 	}
 	if((fl.stat[0] & (Codemask|Seekend)) != Seekend){
-		DPRINT("seek failed\n");
+		DPRINT("seek: failed\n");
 		dp->confused = 1;
 		return -1;
 	}


@@ 855,7 863,7 @@ static long
 floppyxfer(Drive *dp, int cmd, void *a, long off, long n)
 {
 	long offset;
-	int tries = 0;
+	int tries;
 
 	if(off >= dp->t->cap)
 		return 0;


@@ 863,15 871,21 @@ floppyxfer(Drive *dp, int cmd, void *a, long off, long n)
 		n = dp->t->cap - off;
 
 	/* retry on error 3 times */
-	while(waserror())
+	tries = 0;
+	while(waserror()){
+		DPRINT("floppyxfer: retrying\n");
 		if(tries++ >= 3)
 			nexterror();
+	}
 
 	dp->len = n;
-	if(floppyseek(dp, off) < 0)
+	if(floppyseek(dp, off) < 0){
+		DPRINT("xfer: seek failed\n");
+		dp->confused = 1;
 		error(Eio);
+	}
 
-	DPRINT("tcyl %d, thead %d, tsec %d, addr %lux, n %d\n",
+	DPRINT("floppyxfer: tcyl %d, thead %d, tsec %d, addr %lux, n %d\n",
 	dp->tcyl, dp->thead, dp->tsec, a, dp->len);
 
 	/*


@@ 897,11 911,8 @@ floppyxfer(Drive *dp, int cmd, void *a, long off, long n)
 	fl.cmd[fl.ncmd++] = dp->t->sectors;
 	fl.cmd[fl.ncmd++] = dp->t->gpl;
 	fl.cmd[fl.ncmd++] = 0xFF;
-	if(floppycmd() < 0){
-		spllo();
-		DPRINT("xfer cmd failed\n");
+	if(floppycmd() < 0)
 		error(Eio);
-	}
 
 	/*
 	 *  give bus to DMA, floppyintr() will read result


@@ 914,12 925,12 @@ floppyxfer(Drive *dp, int cmd, void *a, long off, long n)
 	 *  check for errors
 	 */
 	if(fl.nstat < 7){
-		DPRINT("xfer result failed %lux\n", inb(Pmsr));
+		DPRINT("xfer: confused\n");
 		fl.confused = 1;
 		error(Eio);
 	}
 	if((fl.stat[0] & Codemask)!=0 || fl.stat[1] || fl.stat[2]){
-		DPRINT("xfer failed %lux %lux %lux\n", fl.stat[0],
+		DPRINT("xfer: failed %lux %lux %lux\n", fl.stat[0],
 			fl.stat[1], fl.stat[2]);
 		DPRINT("offset %lud len %d\n", off, dp->len);
 		dp->confused = 1;


@@ 933,7 944,7 @@ floppyxfer(Drive *dp, int cmd, void *a, long off, long n)
 	offset = offset*dp->t->sectors + fl.stat[5] - 1;
 	offset = offset * c2b[fl.stat[6]];
 	if(offset != off+dp->len){
-		DPRINT("xfer ends on wrong cyl\n");
+		DPRINT("xfer: ends on wrong cyl\n");
 		dp->confused = 1;
 		error(Eio);
 	}


@@ 979,6 990,13 @@ floppyformat(Drive *dp, char *params)
 		nexterror();
 	}
 
+	/* force a recalibrate to cylinder 0 */
+	dp->confused = 1;
+	if(!waserror()){
+		floppyon(dp);
+		poperror();
+	}
+
 	/*
 	 *  format a track at time
 	 */


@@ 989,10 1007,6 @@ floppyformat(Drive *dp, char *params)
 		/*
 		 *  seek to track, ignore errors
 		 */
-		if(!waserror()){
-			floppyon(dp);
-			poperror();
-		}
 		floppyseek(dp, track*t->tsize);
 		dp->cyl = cyl;
 		dp->confused = 0;


@@ 1023,10 1037,8 @@ floppyformat(Drive *dp, char *params)
 		fl.cmd[fl.ncmd++] = t->sectors;
 		fl.cmd[fl.ncmd++] = t->fgpl;
 		fl.cmd[fl.ncmd++] = 0x5a;
-		if(floppycmd() < 0){
-			DPRINT("xfer cmd failed\n");
+		if(floppycmd() < 0)
 			error(Eio);
-		}
 
 		/*
 		 *  give bus to DMA, floppyintr() will read result


@@ 1039,12 1051,12 @@ floppyformat(Drive *dp, char *params)
 		 *  check for errors
 		 */
 		if(fl.nstat < 7){
-			DPRINT("format result failed %lux\n",inb(Pmsr));
+			DPRINT("format: confused\n");
 			fl.confused = 1;
 			error(Eio);
 		}
 		if((fl.stat[0]&Codemask)!=0 || fl.stat[1]|| fl.stat[2]){
-			DPRINT("format failed %lux %lux %lux\n",
+			DPRINT("format: failed %lux %lux %lux\n",
 				fl.stat[0], fl.stat[1], fl.stat[2]);
 			dp->confused = 1;
 			error(Eio);

M pc/devuart.c => pc/devuart.c +69 -2

@@ 37,7 37,7 @@ enum
 	 Rts=	(1<<1),		/*  request to send */
 	 Ri=	(1<<2),		/*  ring */
 	 Inton=	(1<<3),		/*  turn on interrupts */
-	 Loop=	(1<<4),		/*  loop bask */
+	 Loop=	(1<<4),		/*  loop back */
 	Lstat=	5,		/* line status */
 	 Inready=(1<<0),	/*  receive buffer full */
 	 Oerror=(1<<1),		/*  receiver overrun */


@@ 147,6 147,58 @@ uartbreak(Uart *up, int ms)
 }
 
 /*
+ *  set bits/char
+ */
+void
+uartbits(Uart *up, int bits)
+{
+	if(bits < 5 || bits > 8)
+		error(Ebadarg);
+	up->sticky[Format] &= ~3;
+	up->sticky[Format] |= bits-5;
+	uartwrreg(up, Format, 0);
+}
+
+/*
+ *  set parity
+ */
+void
+uartparity(Uart *up, int c)
+{
+	switch(c&0xff){
+	case 'e':
+		up->sticky[Format] |= Pena|Peven;
+		break;
+	case 'o':
+		up->sticky[Format] &= ~Peven;
+		up->sticky[Format] |= Pena;
+		break;
+	default:
+		up->sticky[Format] &= ~(Pena|Peven);
+		break;
+	}
+	uartwrreg(up, Format, 0);
+}
+
+/*
+ *  set stop bits
+ */
+void
+uartstop(Uart *up, int n)
+{
+	switch(n){
+	case 1:
+		up->sticky[Format] &= ~Stop2;
+		break;
+	case 2:
+	default:
+		up->sticky[Format] |= Stop2;
+		break;
+	}
+	uartwrreg(up, Format, 0);
+}
+
+/*
  *  default is 9600 baud, 1 stop bit, 8 bit chars, no interrupts,
  *  transmit and receive enabled, interrupts disabled.
  */


@@ 182,6 234,9 @@ uartsetup(void)
 		uartwrreg(up, Format, 0);
 		up->sticky[Mctl] |= Inton;
 		uartwrreg(up, Mctl, 0x0);
+
+		uartdtr(up, 1);
+		uartrts(up, 1);
 	}
 }
 


@@ 355,9 410,9 @@ uartdisable(Uart *up)
 
 	/*
 	 *  turn off DTR and RTS
-	 */
 	uartdtr(up, 0);
 	uartrts(up, 0);
+	 */
 	up->enabled = 0;
 
 	/*


@@ 487,10 542,22 @@ uartoput(Queue *q, Block *bp)
 		case 'k':
 			uartbreak(up, n);
 			break;
+		case 'L':
+		case 'l':
+			uartbits(up, n);
+			break;
+		case 'P':
+		case 'p':
+			uartparity(up, *(bp->rptr+1));
+			break;
 		case 'R':
 		case 'r':
 			uartrts(up, n);
 			break;
+		case 'S':
+		case 's':
+			uartstop(up, n);
+			break;
 		}
 	}else while((m = BLEN(bp)) > 0){
 		while ((n = canputc(cq)) == 0){

M pc/ether509.c => pc/ether509.c +8 -4

@@ 409,12 409,11 @@ interrupt(EtherCtlr *cp)
 		 * the transmitter.
 		 */
 		txstatus = 0;
-		while(ins(hw->addr+Status) & TxComplete){
-			x = inb(hw->addr+TxStatus);
-			if(x)
+		do{
+			if(x = inb(hw->addr+TxStatus))
 				outb(hw->addr+TxStatus, 0);
 			txstatus |= x;
-		}
+		}while(ins(hw->addr+Status) & TxComplete);
 		if(txstatus & (TxJabber|TxUnderrun))
 			COMMAND(hw, TxReset, 0);
 		COMMAND(hw, TxEnable, 0);


@@ 422,6 421,11 @@ interrupt(EtherCtlr *cp)
 	}
 
 	if(status & (TxAvailable|TxComplete)){
+		/*
+		 * Reset the Tx FIFO threshold.
+		 */
+		if(status & TxAvailable)
+			COMMAND(hw, AckIntr, TxAvailable);
 		(*cp->hw->transmit)(cp);
 		wakeup(&cp->tr);
 		status &= ~(TxAvailable|TxComplete);

M pc/kbd.c => pc/kbd.c +13 -7

@@ 179,17 179,17 @@ mousecmd(int cmd)
 		if(tries++ > 5)
 			break;
 		if(outready() < 0)
-			continue;
+			break;
 		outb(Cmd, 0xD4);
 		if(outready() < 0)
-			continue;
+			break;
 		outb(Data, cmd);
 		if(outready() < 0)
-			continue;
+			break;
 		if(inready() < 0)
-			continue;
+			break;
 		c = inb(Data);
-	} while(c == 0xFE);
+	} while(c == 0xFE || c == 0);
 	if(c != 0xFA){
 		print("mouse returns %2.2ux to the %2.2ux command\n", c, cmd);
 		return -1;


@@ 270,7 270,7 @@ kbdinit(void)
 void
 mouseserial(int port)
 {
-	if(mousetype == Mouseserial)
+	if(mousetype)
 		return;
 
 	/* set up /dev/eia0 as the mouse */


@@ 306,7 306,7 @@ mouseps2(void)
 		print("mouse init failed\n");
 
 	/* make mouse streaming, enabled */
-	mousecmd(0xEA);
+	mousecmd(0xF6);
 	mousecmd(0xF4);
 	splx(x);
 


@@ 319,13 319,16 @@ mouseps2(void)
 void
 mouseaccelerate(int on)
 {
+	int x;
 
 	switch(mousetype){
 	case MousePS2:
+		x = splhi();
 		if(on)
 			mousecmd(0xE7);
 		else
 			mousecmd(0xE6);
+		splx(x);
 		break;
 	}
 }


@@ 336,11 339,14 @@ mouseaccelerate(int on)
 void
 mouseres(int res)
 {
+	int x;
 
 	switch(mousetype){
 	case MousePS2:
+		x = splhi();
 		mousecmd(0xE8);
 		mousecmd(res);
+		splx(x);
 		break;
 	}
 }

M pc/main.c => pc/main.c +6 -6

@@ 264,20 264,20 @@ confinit(void)
 		x += 0x3141526;
 	}
 	conf.base1 = 1*MB;
-	conf.npage1 = ((i-1)*MB - conf.base1)/BY2PG;
+	conf.npage1 = (i*MB - conf.base1)/BY2PG;
 	conf.npage = conf.npage0 + conf.npage1;
 
-	ktop = PGROUND((ulong)end);
-	ktop = PADDR(ktop);
-	conf.npage0 -= ktop/BY2PG;
-	conf.base0 += ktop;
-
 	pcnt = screenbits()-1;		/* Calculate % of memory for page pool */
 	pcnt = 70 - (pcnt*10);
 	conf.upages = (conf.npage*pcnt)/100;
 	if(conf.npage - conf.upages < 1572864/BY2PG)
 		conf.upages = conf.npage - 1572864/BY2PG;
 
+	ktop = PGROUND((ulong)end);
+	ktop = PADDR(ktop);
+	conf.npage0 -= ktop/BY2PG;
+	conf.base0 += ktop;
+
 	conf.topofmem = i*MB;
 
 	conf.monitor = 1;

~kris/9p

9hist