Browse Source

Plan 9 from Bell Labs 2006-04-19

David du Colombier 15 years ago
parent
commit
ed6c4e35a6
5 changed files with 31 additions and 24 deletions
  1. 5 5
      dist/replica/_plan9.db
  2. 5 5
      dist/replica/plan9.db
  3. 5 0
      dist/replica/plan9.log
  4. 0 1
      sys/src/9/pc/ether2114x.c
  5. 16 13
      sys/src/9/pc/sd53c8xx.c

+ 5 - 5
dist/replica/_plan9.db

@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1141258211 755785
 386/9pcf - 775 sys sys 1145192013 2452775
 386/9pcf.gz - 664 sys sys 1141258217 910970
-386/9pxeload - 775 sys sys 1131317321 216948
+386/9pxeload - 775 sys sys 1145359841 217880
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1144696729 116699
@@ -122,7 +122,7 @@
 386/bin/aux/mswordstrings - 775 sys sys 1143777761 65636
 386/bin/aux/na - 775 sys sys 1143777762 154518
 386/bin/aux/nfsmount - 775 sys sys 1143777763 234786
-386/bin/aux/nfsserver - 775 sys sys 1144688919 186025
+386/bin/aux/nfsserver - 775 sys sys 1145379323 186025
 386/bin/aux/olefs - 775 sys sys 1143777764 149666
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1143741951 46940
@@ -631,7 +631,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1143742054 38994
 acme/bin/386/spout - 775 sys sys 1143777852 61936
-acme/bin/386/win - 775 sys sys 1143777852 185302
+acme/bin/386/win - 775 sys sys 1145379325 185327
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Mail - 775 sys sys 1114697798 201
@@ -7954,7 +7954,7 @@ sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
 sys/src/9/pc/devvga.c - 664 sys sys 1131290315 9332
 sys/src/9/pc/dma.c - 664 sys sys 1142966373 5332
 sys/src/9/pc/ether2000.c - 664 sys sys 1089299187 4819
-sys/src/9/pc/ether2114x.c - 664 sys sys 1144963814 41694
+sys/src/9/pc/ether2114x.c - 664 sys sys 1145359795 41693
 sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1131290338 13953
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
@@ -8020,7 +8020,7 @@ sys/src/9/pc/realmode.c - 664 sys sys 1139667044 2678
 sys/src/9/pc/rebootcode.s - 664 sys sys 1015014522 988
 sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1131290516 4156
-sys/src/9/pc/sd53c8xx.c - 664 sys sys 1139667209 55143
+sys/src/9/pc/sd53c8xx.c - 664 sys sys 1145359822 55087
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
 sys/src/9/pc/sdata.c - 664 sys sys 1141793347 52244
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780

+ 5 - 5
dist/replica/plan9.db

@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1141258211 755785
 386/9pcf - 775 sys sys 1145192013 2452775
 386/9pcf.gz - 664 sys sys 1141258217 910970
-386/9pxeload - 775 sys sys 1131317321 216948
+386/9pxeload - 775 sys sys 1145359841 217880
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1144696729 116699
@@ -122,7 +122,7 @@
 386/bin/aux/mswordstrings - 775 sys sys 1143777761 65636
 386/bin/aux/na - 775 sys sys 1143777762 154518
 386/bin/aux/nfsmount - 775 sys sys 1143777763 234786
-386/bin/aux/nfsserver - 775 sys sys 1144688919 186025
+386/bin/aux/nfsserver - 775 sys sys 1145379323 186025
 386/bin/aux/olefs - 775 sys sys 1143777764 149666
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1143741951 46940
@@ -631,7 +631,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1143742054 38994
 acme/bin/386/spout - 775 sys sys 1143777852 61936
-acme/bin/386/win - 775 sys sys 1143777852 185302
+acme/bin/386/win - 775 sys sys 1145379325 185327
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Mail - 775 sys sys 1114697798 201
@@ -7954,7 +7954,7 @@ sys/src/9/pc/devusb.c - 664 sys sys 1105193103 18364
 sys/src/9/pc/devvga.c - 664 sys sys 1131290315 9332
 sys/src/9/pc/dma.c - 664 sys sys 1142966373 5332
 sys/src/9/pc/ether2000.c - 664 sys sys 1089299187 4819
-sys/src/9/pc/ether2114x.c - 664 sys sys 1144963814 41694
+sys/src/9/pc/ether2114x.c - 664 sys sys 1145359795 41693
 sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1131290338 13953
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
@@ -8020,7 +8020,7 @@ sys/src/9/pc/realmode.c - 664 sys sys 1139667044 2678
 sys/src/9/pc/rebootcode.s - 664 sys sys 1015014522 988
 sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1131290516 4156
-sys/src/9/pc/sd53c8xx.c - 664 sys sys 1139667209 55143
+sys/src/9/pc/sd53c8xx.c - 664 sys sys 1145359822 55087
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
 sys/src/9/pc/sdata.c - 664 sys sys 1141793347 52244
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780

+ 5 - 0
dist/replica/plan9.log

@@ -29504,3 +29504,8 @@
 1145194268 1 c acme/bin/source/win/main.c - 664 sys sys 1145192657 12432
 1145278896 0 c sys/games/lib/fortunes - 664 sys sys 1145277998 258634
 1145313115 0 c sys/lib/dist/pc/inst/copydist - 775 sys sys 1145312927 715
+1145359807 0 c sys/src/9/pc/ether2114x.c - 664 sys sys 1145359795 41693
+1145359807 1 c sys/src/9/pc/sd53c8xx.c - 664 sys sys 1145359822 55087
+1145361608 0 c 386/9pxeload - 775 sys sys 1145359841 217880
+1145379613 0 c 386/bin/aux/nfsserver - 775 sys sys 1145379323 186025
+1145379613 1 c acme/bin/386/win - 775 sys sys 1145379325 185327

+ 0 - 1
sys/src/9/pc/ether2114x.c

@@ -1692,7 +1692,6 @@ dec2114xpci(void)
 		switch(ctlr->id){
 		default:
 			break;
-
 		case Pnic:			/* PNIC */
 			/*
 			 * Turn off the jabber timer.

+ 16 - 13
sys/src/9/pc/sd53c8xx.c

@@ -1998,25 +1998,28 @@ static Variant variant[] = {
 static int
 xfunc(Controller *c, enum na_external x, unsigned long *v)
 {
-	switch (x)
-	{
+	switch (x) {
+	default:
+		print("xfunc: can't find external %d\n", x);
+		return 0;
 	case X_scsi_id_buf:
-		*v = offsetof(Dsa, scsi_id_buf[0]); return 1;
+		*v = offsetof(Dsa, scsi_id_buf[0]);
+		break;
 	case X_msg_out_buf:
-		*v = offsetof(Dsa, msg_out_buf); return 1;
+		*v = offsetof(Dsa, msg_out_buf);
+		break;
 	case X_cmd_buf:
-		*v = offsetof(Dsa, cmd_buf); return 1;
+		*v = offsetof(Dsa, cmd_buf);
+		break;
 	case X_data_buf:
-		*v = offsetof(Dsa, data_buf); return 1;
+		*v = offsetof(Dsa, data_buf);
+		break;
 	case X_status_buf:
-		*v = offsetof(Dsa, status_buf); return 1;
+		*v = offsetof(Dsa, status_buf);
+		break;
 	case X_dsa_head:
-		*v = DMASEG(&c->dsalist.head[0]); return 1;
-	case X_ssid_mask:
-		*v = SSIDMASK(c); return 1;
-	default:
-		print("xfunc: can't find external %d\n", x);
-		return 0;
+		*v = DMASEG(&c->dsalist.head[0]);
+		break;
 	}
 	return 1;
 }