Browse Source

Plan 9 from Bell Labs 2004-06-20

David du Colombier 18 years ago
parent
commit
16ceffbbdd

+ 9 - 9
dist/replica/_plan9.db

@@ -9,13 +9,13 @@
 386/9loaddebug - 775 sys sys 1085583486 270508
 386/9loadlite - 775 sys sys 1077033685 125344
 386/9loadlitedebug - 775 sys sys 1085583486 183619
-386/9pc - 775 sys sys 1085583489 1810627
+386/9pc - 775 sys sys 1087618546 1811884
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1085583493 1464801
+386/9pccpu - 775 sys sys 1087618551 1466062
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1085583499 2013077
+386/9pcdisk - 775 sys sys 1087618555 2014334
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1085583502 2333080
+386/9pcf - 775 sys sys 1087618560 2346321
 386/9pcf.gz - 664 sys sys 1077049490 872650
 386/9pxeload - 775 sys sys 1071320501 188380
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -5153,7 +5153,7 @@ sys/src/9/alphapc/fns.h - 664 sys sys 1084331942 3901
 sys/src/9/alphapc/fptrap.c - 664 sys sys 1015012785 707
 sys/src/9/alphapc/i8259.c - 664 sys sys 1015012785 3409
 sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
-sys/src/9/alphapc/io.h - 664 sys sys 1015012785 4612
+sys/src/9/alphapc/io.h - 664 sys sys 1087657423 4540
 sys/src/9/alphapc/kbd.c - 664 sys sys 1015012785 8676
 sys/src/9/alphapc/l.s - 664 sys sys 1067722580 9124
 sys/src/9/alphapc/main.c - 664 sys sys 1039753420 13626
@@ -5295,7 +5295,7 @@ sys/src/9/mtx/fns.h - 664 sys sys 1084475126 3171
 sys/src/9/mtx/i8259.c - 664 sys sys 1018721286 4695
 sys/src/9/mtx/inb.s - 664 sys sys 1018721286 1476
 sys/src/9/mtx/initcode - 664 sys sys 1039753442 444
-sys/src/9/mtx/io.h - 664 sys sys 1018721286 4889
+sys/src/9/mtx/io.h - 664 sys sys 1087657404 4817
 sys/src/9/mtx/kbd.c - 664 sys sys 1018721286 8358
 sys/src/9/mtx/l.s - 664 sys sys 1067722599 10730
 sys/src/9/mtx/main.c - 664 sys sys 1018721287 8344
@@ -5304,7 +5304,7 @@ sys/src/9/mtx/mkfile - 664 sys sys 1072972534 1520
 sys/src/9/mtx/mmu.c - 664 sys sys 1018721287 4388
 sys/src/9/mtx/mtx - 664 sys sys 1056336297 416
 sys/src/9/mtx/mtxcpu - 664 sys sys 1039753442 421
-sys/src/9/mtx/pci.c - 664 sys sys 1018721287 16662
+sys/src/9/mtx/pci.c - 664 sys sys 1087657434 16662
 sys/src/9/mtx/random.c - 664 sys sys 1036813598 1983
 sys/src/9/mtx/raven.c - 664 sys sys 1018721288 2587
 sys/src/9/mtx/trap.c - 664 sys sys 1084475126 15856
@@ -5365,7 +5365,7 @@ sys/src/9/pc/i8253.c - 664 sys sys 1084475127 6272
 sys/src/9/pc/i8259.c - 664 sys sys 1015014519 4423
 sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
-sys/src/9/pc/io.h - 664 sys sys 1086987325 8101
+sys/src/9/pc/io.h - 664 sys sys 1087657448 8029
 sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
 sys/src/9/pc/l.s - 664 sys sys 1086960172 22732
 sys/src/9/pc/main.c - 664 sys sys 1084475127 14675
@@ -5386,7 +5386,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1079575654 1462
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1067722894 1383
-sys/src/9/pc/pci.c - 664 sys sys 1086987325 25736
+sys/src/9/pc/pci.c - 664 sys sys 1087657460 25736
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1048635123 1545
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1067722684 5273
 sys/src/9/pc/plan9l.s - 664 sys sys 1015014521 910

+ 9 - 9
dist/replica/plan9.db

@@ -9,13 +9,13 @@
 386/9loaddebug - 775 sys sys 1085583486 270508
 386/9loadlite - 775 sys sys 1077033685 125344
 386/9loadlitedebug - 775 sys sys 1085583486 183619
-386/9pc - 775 sys sys 1085583489 1810627
+386/9pc - 775 sys sys 1087618546 1811884
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1085583493 1464801
+386/9pccpu - 775 sys sys 1087618551 1466062
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1085583499 2013077
+386/9pcdisk - 775 sys sys 1087618555 2014334
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1085583502 2333080
+386/9pcf - 775 sys sys 1087618560 2346321
 386/9pcf.gz - 664 sys sys 1077049490 872650
 386/9pxeload - 775 sys sys 1071320501 188380
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -5153,7 +5153,7 @@ sys/src/9/alphapc/fns.h - 664 sys sys 1084331942 3901
 sys/src/9/alphapc/fptrap.c - 664 sys sys 1015012785 707
 sys/src/9/alphapc/i8259.c - 664 sys sys 1015012785 3409
 sys/src/9/alphapc/initcode - 664 sys sys 1039753419 779
-sys/src/9/alphapc/io.h - 664 sys sys 1015012785 4612
+sys/src/9/alphapc/io.h - 664 sys sys 1087657423 4540
 sys/src/9/alphapc/kbd.c - 664 sys sys 1015012785 8676
 sys/src/9/alphapc/l.s - 664 sys sys 1067722580 9124
 sys/src/9/alphapc/main.c - 664 sys sys 1039753420 13626
@@ -5295,7 +5295,7 @@ sys/src/9/mtx/fns.h - 664 sys sys 1084475126 3171
 sys/src/9/mtx/i8259.c - 664 sys sys 1018721286 4695
 sys/src/9/mtx/inb.s - 664 sys sys 1018721286 1476
 sys/src/9/mtx/initcode - 664 sys sys 1039753442 444
-sys/src/9/mtx/io.h - 664 sys sys 1018721286 4889
+sys/src/9/mtx/io.h - 664 sys sys 1087657404 4817
 sys/src/9/mtx/kbd.c - 664 sys sys 1018721286 8358
 sys/src/9/mtx/l.s - 664 sys sys 1067722599 10730
 sys/src/9/mtx/main.c - 664 sys sys 1018721287 8344
@@ -5304,7 +5304,7 @@ sys/src/9/mtx/mkfile - 664 sys sys 1072972534 1520
 sys/src/9/mtx/mmu.c - 664 sys sys 1018721287 4388
 sys/src/9/mtx/mtx - 664 sys sys 1056336297 416
 sys/src/9/mtx/mtxcpu - 664 sys sys 1039753442 421
-sys/src/9/mtx/pci.c - 664 sys sys 1018721287 16662
+sys/src/9/mtx/pci.c - 664 sys sys 1087657434 16662
 sys/src/9/mtx/random.c - 664 sys sys 1036813598 1983
 sys/src/9/mtx/raven.c - 664 sys sys 1018721288 2587
 sys/src/9/mtx/trap.c - 664 sys sys 1084475126 15856
@@ -5365,7 +5365,7 @@ sys/src/9/pc/i8253.c - 664 sys sys 1084475127 6272
 sys/src/9/pc/i8259.c - 664 sys sys 1015014519 4423
 sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
-sys/src/9/pc/io.h - 664 sys sys 1086987325 8101
+sys/src/9/pc/io.h - 664 sys sys 1087657448 8029
 sys/src/9/pc/kbd.c - 664 sys sys 1079617269 11655
 sys/src/9/pc/l.s - 664 sys sys 1086960172 22732
 sys/src/9/pc/main.c - 664 sys sys 1084475127 14675
@@ -5386,7 +5386,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1079575654 1462
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1067722894 1383
-sys/src/9/pc/pci.c - 664 sys sys 1086987325 25736
+sys/src/9/pc/pci.c - 664 sys sys 1087657460 25736
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1048635123 1545
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1067722684 5273
 sys/src/9/pc/plan9l.s - 664 sys sys 1015014521 910

+ 9 - 0
dist/replica/plan9.log

@@ -15698,3 +15698,12 @@
 1087529405 0 c 386/bin/8c - 775 sys sys 1087527915 341009
 1087529405 1 c 386/bin/8l - 775 sys sys 1087527915 106966
 1087606820 0 c sys/src/9/ip/tcp.c - 664 sys sys 1087606219 65623
+1087619422 0 c 386/9pc - 775 sys sys 1087618546 1811884
+1087619422 1 c 386/9pccpu - 775 sys sys 1087618551 1466062
+1087619422 2 c 386/9pcdisk - 775 sys sys 1087618555 2014334
+1087619422 3 c 386/9pcf - 775 sys sys 1087618560 2346321
+1087659029 0 c sys/src/9/alphapc/io.h - 664 sys sys 1087657423 4540
+1087659029 1 c sys/src/9/mtx/io.h - 664 sys sys 1087657404 4817
+1087659029 2 c sys/src/9/mtx/pci.c - 664 sys sys 1087657434 16662
+1087659029 3 c sys/src/9/pc/io.h - 664 sys sys 1087657448 8029
+1087659029 4 c sys/src/9/pc/pci.c - 664 sys sys 1087657460 25736

+ 0 - 4
sys/src/9/alphapc/io.h

@@ -93,10 +93,6 @@ enum {					/* type 0 and type 1 pre-defined header */
 };
 
 enum {					/* type 0 pre-defined header */
-	PciBAR2		= 0x18,
-	PciBAR3		= 0x1C,
-	PciBAR4		= 0x20,
-	PciBAR5		= 0x24,
 	PciCIS		= 0x28,		/* cardbus CIS pointer */
 	PciSVID		= 0x2C,		/* subsystem vendor ID */
 	PciSID		= 0x2E,		/* cardbus CIS pointer */

+ 0 - 4
sys/src/9/mtx/io.h

@@ -91,10 +91,6 @@ enum {					/* type 0 and type 1 pre-defined header */
 };
 
 enum {					/* type 0 pre-defined header */
-	PciBAR2		= 0x18,
-	PciBAR3		= 0x1C,
-	PciBAR4		= 0x20,
-	PciBAR5		= 0x24,
 	PciCIS		= 0x28,		/* cardbus CIS pointer */
 	PciSVID		= 0x2C,		/* subsystem vendor ID */
 	PciSID		= 0x2E,		/* cardbus CIS pointer */

+ 5 - 5
sys/src/9/mtx/pci.c

@@ -320,21 +320,21 @@ pcibusmap(Pcidev *root, ulong *pmema, ulong *pioa, int wrreg)
 
 		base = p->ioa.bar;
 		limit = base+p->ioa.size-1;
-		v = pcicfgrw32(p->tbdf, PciBAR3, 0, 1);
+		v = pcicfgrw32(p->tbdf, PciIBR, 0, 1);
 		v = (v&0xFFFF0000)|(limit & 0xF000)|((base & 0xF000)>>8);
-		pcicfgrw32(p->tbdf, PciBAR3, v, 0);
+		pcicfgrw32(p->tbdf, PciIBR, v, 0);
 		v = (limit & 0xFFFF0000)|(base>>16);
-		pcicfgrw32(p->tbdf, 0x30, v, 0);
+		pcicfgrw32(p->tbdf, PciIUBR, v, 0);
 
 		base = p->mema.bar;
 		limit = base+p->mema.size-1;
 		v = (limit & 0xFFF00000)|((base & 0xFFF00000)>>16);
-		pcicfgrw32(p->tbdf, PciBAR4, v, 0);
+		pcicfgrw32(p->tbdf, PciMBR, v, 0);
 
 		/*
 		 * Disable memory prefetch
 		 */
-		pcicfgrw32(p->tbdf, PciBAR5, 0x0000FFFF, 0);
+		pcicfgrw32(p->tbdf, PciPMBR, 0x0000FFFF, 0);
 		pcicfgrw8(p->tbdf, PciLTR, 64, 0);
 
 		/*

+ 0 - 4
sys/src/9/pc/io.h

@@ -116,10 +116,6 @@ enum {					/* type 0 and type 1 pre-defined header */
 };
 
 enum {					/* type 0 pre-defined header */
-	PciBAR2		= 0x18,
-	PciBAR3		= 0x1C,
-	PciBAR4		= 0x20,
-	PciBAR5		= 0x24,
 	PciCIS		= 0x28,		/* cardbus CIS pointer */
 	PciSVID		= 0x2C,		/* subsystem vendor ID */
 	PciSID		= 0x2E,		/* cardbus CIS pointer */

+ 5 - 5
sys/src/9/pc/pci.c

@@ -328,21 +328,21 @@ pcibusmap(Pcidev *root, ulong *pmema, ulong *pioa, int wrreg)
 
 		base = p->ioa.bar;
 		limit = base+p->ioa.size-1;
-		v = pcicfgrw32(p->tbdf, PciBAR3, 0, 1);
+		v = pcicfgrw32(p->tbdf, PciIBR, 0, 1);
 		v = (v&0xFFFF0000)|(limit & 0xF000)|((base & 0xF000)>>8);
-		pcicfgrw32(p->tbdf, PciBAR3, v, 0);
+		pcicfgrw32(p->tbdf, PciIBR, v, 0);
 		v = (limit & 0xFFFF0000)|(base>>16);
-		pcicfgrw32(p->tbdf, 0x30, v, 0);
+		pcicfgrw32(p->tbdf, PciIUBR, v, 0);
 
 		base = p->mema.bar;
 		limit = base+p->mema.size-1;
 		v = (limit & 0xFFF00000)|((base & 0xFFF00000)>>16);
-		pcicfgrw32(p->tbdf, PciBAR4, v, 0);
+		pcicfgrw32(p->tbdf, PciMBR, v, 0);
 
 		/*
 		 * Disable memory prefetch
 		 */
-		pcicfgrw32(p->tbdf, PciBAR5, 0x0000FFFF, 0);
+		pcicfgrw32(p->tbdf, PciPMBR, 0x0000FFFF, 0);
 		pcicfgrw8(p->tbdf, PciLTR, 64, 0);
 
 		/*