2 files changed, 73 insertions(+), 42 deletions(-)

M pc/devether.c
M pc/vga.c

@@ 475,7 475,7 @@ etherkproc(void *arg)
 			rb = &cp->rb[cp->rh];
 			etherup(cp, rb->pkt, rb->len);
 			rb->owner = Interface;
-			cp->rh = NEXT(cp->rh, Nrb);
+			cp->rh = NEXT(cp->rh, cp->nrb);
 		}
 
 		qunlock(&cp->rlock);


@@ 614,10 614,10 @@ wd8013reset(Ctlr *cp)
 	int i;
 	uchar msr;
 
-	cp->tb = ialloc(sizeof(Buffer)*Ntb, 1);
-	cp->ntb = Ntb;
 	cp->rb = ialloc(sizeof(Buffer)*Nrb, 1);
 	cp->nrb = Nrb;
+	cp->tb = ialloc(sizeof(Buffer)*Ntb, 1);
+	cp->ntb = Ntb;
 
 	msr = IN(hw, msr);
 	OUT(hw, msr, 0x40|msr);


@@ 684,8 684,6 @@ wd8013online(Ctlr *cp, int on)
 	OUT(cp->hw, w.tcr, 0);
 }
 
-static ulong wraps;
-
 static void
 wd8013receive(Ctlr *cp)
 {


@@ 708,26 706,22 @@ wd8013receive(Ctlr *cp)
 		cp->inpackets++;
 		p = &((Ring*)hw->ram)[next];
 		len = (p->len1<<8)|p->len0-4;
-if(len > sizeof(Etherpkt))
-    print("!");
 
 		rb = &cp->rb[cp->ri];
 		if(rb->owner == Interface){
 			rb->len = len;
-			/*copy in packet*/
-			if(p->data+len >= hw->ram+hw->size){
-wraps++;
+			if((p->data+len) >= (hw->ram+hw->size)){
 				len = hw->ram+hw->size - p->data;
 				memmove(rb->pkt+len,
 					&((Ring*)hw->ram)[hw->pstart],
-					p->data+rb->len - hw->ram+hw->size);
+					(p->data+rb->len) - (hw->ram+hw->size));
 			}
 			memmove(rb->pkt, p->data, len);
 			rb->owner = Host;
-			cp->ri = NEXT(cp->ri, Nrb);
+			cp->ri = NEXT(cp->ri, cp->nrb);
 		}
 
-p->status = 0;
+		p->status = 0;
 		next = p->next;
 		bnry = next-1;
 		if(bnry < hw->pstart)


@@ 747,7 741,6 @@ wd8013transmit(Ctlr *cp)
 	tb = &cp->tb[cp->ti];
 	if(tb->busy == 0 && tb->owner == Interface){
 		hw = cp->hw;
-tb->len = tb->len+1 & ~1;
 		memmove(hw->ram, tb->pkt, tb->len);
 		OUT(hw, w.tbcr0, tb->len & 0xFF);
 		OUT(hw, w.tbcr1, (tb->len>>8) & 0xFF);


@@ 785,7 778,7 @@ wd8013intr(Ureg *ur)
 			tb = &cp->tb[cp->ti];
 			tb->owner = Host;
 			tb->busy = 0;
-			cp->ti = NEXT(cp->ti, Ntb);
+			cp->ti = NEXT(cp->ti, cp->ntb);
 			(*cp->hw->transmit)(cp);
 			wakeup(&cp->tr);
 		}


@@ 820,22 813,4 @@ static Hw wd8013 = {
 void
 consdebug(void)
 {
-	Ctlr *cp = &ctlr[0];
-	Hw *hw = cp->hw;
-	Buffer *bp;
-	uchar bnry, curr;
-
-	print("th%d ti%d rh%d ri%d\n",
-		cp->th, cp->ti, cp->rh, cp->ri);
-	bp = &cp->tb[cp->ti];
-	print("t: owner %d busy %d len %d\n",
-		bp->owner, bp->busy, bp->len);
-	bnry = IN(hw, r.bnry);
-	OUT(hw, w.cr, 0x62);
-	curr = IN(hw, curr);
-	OUT(hw, w.cr, 0x22);
-	print("bnry %d, curr %d\n", bnry, curr);
-	print("in %d out %d crcs %d oerrs %d frames %d overflows %d buffs %d wraps %d\n",
-		cp->inpackets, cp->outpackets, cp->crcs, cp->oerrs, cp->frames,
-		cp->overflows, cp->buffs, wraps);
 }

@@ 22,8 22,13 @@ struct{
 /*
  *  screen dimensions
  */
+
+/*
 #define MAXX	800
 #define MAXY	600
+*/
+#define MAXX	640
+#define MAXY	480
 
 #define SCREENMEM	(0xA0000 | KZERO)
 


@@ 72,7 77,7 @@ struct VGAmode
 VGAmode mode12 = 
 {
 	/* general */
-	0xe7, 0x00,  /* 0x70, 0x04, these are read-only */
+	0xe7, 0x00,
 	/* sequence */
 	0x03, 0x01, 0x0f, 0x00, 0x06,
 	/* crt */


@@ 90,17 95,17 @@ VGAmode mode12 =
 };
 
 /*
- *  VESA standard (?) 800x600 display, 16 bit color 
+ *  VESA standard (?) 800x600 display, 16 bit color. 
  */
 VGAmode mode6a = 
 {
 	/* general */
-	0x2f, 0x00,  /* 0x70, 0x04, these are read-only */
+	0xe3, 0x00,  /* 0x70, 0x04, these are read-only */
 	/* sequence */
 	0x03, 0x01, 0x0f, 0x00, 0x06,
 	/* crt */
-	0x7f, 0x63, 0x64, 0x9d, 0x67, 0x92, 0x77, 0xf0,
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7f, 0x63, 0x64, 0x02, 0x6a, 0x1d, 0x77, 0xf0,
+	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
 	0x5d, 0x8f, 0x57, 0x32, 0x00, 0x5b, 0x74, 0xc3,
 	0xff,  
 	/* graphics */


@@ 205,8 210,60 @@ setmode(VGAmode *v)
 
 #ifdef VGATROUBLE
 void
-dumpmodes(VGAmode *v)
-{
+getmode(VGAmode *v) {
+	int i;
+	v->general[0] = inb(0x3cc);
+	v->general[1] = inb(0x3ca);
+	for(i = 0; i < sizeof(v->sequencer); i++) {
+		outb(SRX, i);
+		v->sequencer[i] = inb(SR);
+	}
+	for(i = 0; i < sizeof(v->crt); i++) {
+		outb(CRX, i);
+		v->crt[i] = inb(CR);
+	}
+	for(i = 0; i < sizeof(v->graphics); i++) {
+		outb(GRX, i);
+		v->graphics[i] = inb(GR);
+	}
+	for(i = 0; i < sizeof(v->attribute); i++) {
+		inb(0x3DA);
+		outb(ARW, i | 0x20);
+		v->attribute[i] = inb(ARR);
+	}
+}
+
+void
+printmode(VGAmode *v) {
+	int i;
+	print("general registers: %02x %02x\n",
+		v->general[0], v->general[1]);
+
+	print("sequence registers: ");
+	for(i = 0; i < sizeof(v->sequencer); i++) {
+		print(" %02x", v->sequencer[i]);
+	}
+
+	print("\nCRT registers: ");
+	for(i = 0; i < sizeof(v->crt); i++) {
+		print(" %02x", v->crt[i]);
+	}
+
+	print("\nGraphics registers: ");
+	for(i = 0; i < sizeof(v->graphics); i++) {
+		print(" %02x", v->graphics[i]);
+	}
+
+	print("\nAttribute registers: ");
+	for(i = 0; i < sizeof(v->attribute); i++) {
+		print(" %02x", v->attribute[i]);
+	}
+	print("\n");
+}
+
+void
+dumpmodes(void) {
+	VGAmode *v;
 	int i;
 
 	print("general registers: %02x %02x %02x %02x\n",


@@ 236,8 293,6 @@ dumpmodes(VGAmode *v)
 		outb(ARW, i | 0x20);
 		print(" %02x", inb(ARR));
 	}
-
-	print("\nPEL Mask Register = %02x\n\n", inb(0x3c6)&0xff);
 }
 #endif
 


@@ 247,6 302,7 @@ screeninit(void)
 	int i, j, k;
 	int c;
 	ulong *l;
+	VGAmode v;
 
 	setmode(&mode12);