Browse Source

Plan 9 from Bell Labs 2008-02-09

David du Colombier 12 years ago
parent
commit
938110b941
6 changed files with 15 additions and 12 deletions
  1. 3 2
      dist/replica/_plan9.db
  2. 3 2
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 1 1
      sys/man/8/prep
  5. 0 0
      sys/src/9/pc/ether82598.c
  6. 5 7
      sys/src/9/pc/etherm10g.c

+ 3 - 2
dist/replica/_plan9.db

@@ -7867,7 +7867,7 @@ sys/man/8/ping - 664 sys sys 1196638947 3650
 sys/man/8/plan9.ini - 664 sys sys 1202255136 23868
 sys/man/8/pop3 - 664 sys sys 1197574309 3122
 sys/man/8/ppp - 664 sys sys 1196638948 4430
-sys/man/8/prep - 664 sys sys 1196638948 14201
+sys/man/8/prep - 664 sys sys 1202496787 14211
 sys/man/8/qer - 664 sys sys 1196638948 4909
 sys/man/8/reboot - 664 sys sys 1196638948 443
 sys/man/8/replica - 664 sys sys 1196638948 6383
@@ -8105,6 +8105,7 @@ sys/src/9/pc/ether8169.c - 664 sys sys 1185812348 26931
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1191886292 30411
 sys/src/9/pc/ether82563.c - 664 sys sys 1200342471 37076
+sys/src/9/pc/ether82598.c - 664 sys sys 1202489363 0
 sys/src/9/pc/ether83815.c - 664 sys sys 1172259521 26346
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
@@ -8115,7 +8116,7 @@ sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1201822310 45935
-sys/src/9/pc/etherm10g.c - 664 sys sys 1199912528 28463
+sys/src/9/pc/etherm10g.c - 664 sys sys 1202453395 28413
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1202131465 1094881
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1202131484 1065187
 sys/src/9/pc/ethermii.c - 664 sys sys 1181160689 4668

+ 3 - 2
dist/replica/plan9.db

@@ -7867,7 +7867,7 @@ sys/man/8/ping - 664 sys sys 1196638947 3650
 sys/man/8/plan9.ini - 664 sys sys 1202255136 23868
 sys/man/8/pop3 - 664 sys sys 1197574309 3122
 sys/man/8/ppp - 664 sys sys 1196638948 4430
-sys/man/8/prep - 664 sys sys 1196638948 14201
+sys/man/8/prep - 664 sys sys 1202496787 14211
 sys/man/8/qer - 664 sys sys 1196638948 4909
 sys/man/8/reboot - 664 sys sys 1196638948 443
 sys/man/8/replica - 664 sys sys 1196638948 6383
@@ -8105,6 +8105,7 @@ sys/src/9/pc/ether8169.c - 664 sys sys 1185812348 26931
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1191886292 30411
 sys/src/9/pc/ether82563.c - 664 sys sys 1200342471 37076
+sys/src/9/pc/ether82598.c - 664 sys sys 1202489363 0
 sys/src/9/pc/ether83815.c - 664 sys sys 1172259521 26346
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
@@ -8115,7 +8116,7 @@ sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1201822310 45935
-sys/src/9/pc/etherm10g.c - 664 sys sys 1199912528 28463
+sys/src/9/pc/etherm10g.c - 664 sys sys 1202453395 28413
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1202131465 1094881
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1202131484 1065187
 sys/src/9/pc/ethermii.c - 664 sys sys 1181160689 4668

+ 3 - 0
dist/replica/plan9.log

@@ -18455,3 +18455,6 @@
 1202328006 1 c sys/src/ape/lib/v/plan9/tty.c - 664 sys sys 1202327292 559
 1202358609 0 c 386/lib/ape/libv.a - 664 sys sys 1202357672 19334
 1202405405 0 c sys/man/6/ms - 664 sys sys 1202404624 6966
+1202454006 0 c sys/src/9/pc/etherm10g.c - 664 sys sys 1202453395 28413
+1202490003 0 a sys/src/9/pc/ether82598.c - 664 sys sys 1202489363 0
+1202497204 0 c sys/man/8/prep - 664 sys sys 1202496787 14211

+ 1 - 1
sys/man/8/prep

@@ -685,7 +685,7 @@ Initialize the blank hard disk
 .EX
 disk/mbr -m /386/mbr /dev/sdC0/data
 disk/fdisk -baw /dev/sdC0/data
-disk/prep -bw -a^(9fat fs cache swap) /dev/sdC0/plan9
+disk/prep -bw -a^(9fat nvram fossil cache swap) /dev/sdC0/plan9
 disk/format -b /386/pbslba -d -r 2 /dev/sdC0/9fat \e
 	/386/9load /386/9pcf /tmp/plan9.ini
 .EE

+ 0 - 0
sys/src/9/pc/ether82598.c


+ 5 - 7
sys/src/9/pc/etherm10g.c

@@ -729,14 +729,13 @@ fwtype(ulong type)
 static int
 chkfw(Ctlr *c)
 {
-	uintptr off;
+	ulong off, type;
 	Fwhdr *h;
-	ulong type;
 
 	off = gbit32(c->ram+0x3c);
-	dprint("firmware %llux\n", (uvlong)off);
+	dprint("firmware %lux\n", off);
 	if((off&3) || off + sizeof *h > c->ramsz){
-		print("!m10g: bad firmware %llux\n", (uvlong)off);
+		print("!m10g: bad firmware %lux\n", off);
 		return -1;
 	}
 	h = (Fwhdr*)(c->ram + off);
@@ -1223,7 +1222,7 @@ m10gtransmit(Ether *e)
 		rdma = nseg = nsegments(b, segsz);
 		bus = PCIWADDR(b->rp);
 		for(; len; len -= slen){
-			end = bus + segsz & ~(segsz-1);
+			end = (bus + segsz) & ~(segsz-1);
 			slen = end - bus;
 			if(slen > len)
 				slen = len;
@@ -1239,7 +1238,7 @@ m10gtransmit(Ether *e)
 			flags &= ~SFfirst;
 			rdma = 1;
 		}
-		tx->bring[i + nseg - 1 & tx->m] = b;
+		tx->bring[(i + nseg - 1) & tx->m] = b;
 		if(1 || count > 0){
 			submittx(tx, count);
 			count = 0;
@@ -1565,7 +1564,6 @@ m10gpci(void)
 		c = malloc(sizeof *c);
 		if(c == nil)
 			continue;
-		memset(c, 0, sizeof *c);
 		c->pcidev = p;
 		c->id = p->did<<16 | p->vid;
 		c->boot = pcicap(p, PciCapVND);