Browse Source

Plan 9 from Bell Labs 2007-04-03

David du Colombier 14 years ago
parent
commit
5198cf059d

+ 4 - 4
dist/replica/_plan9.db

@@ -8045,7 +8045,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1161302470 1495
 sys/src/9/pc/pcf - 664 sys sys 1161302469 1553
 sys/src/9/pc/pcfl - 664 sys sys 1161302470 1587
 sys/src/9/pc/pcflop - 664 sys sys 1158061762 1513
-sys/src/9/pc/pci.c - 664 sys sys 1173287378 29216
+sys/src/9/pc/pci.c - 664 sys sys 1175564101 29261
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1099761153 1586
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1091129037 5230
@@ -8059,7 +8059,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1170456695 55276
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sdata.c - 664 sys sys 1167774860 52718
+sys/src/9/pc/sdata.c - 664 sys sys 1175564140 52809
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1167774867 25865
 sys/src/9/pc/sdmylex.c - 664 sys sys 1171321627 28237
 sys/src/9/pc/sdscsi.c - 664 sys sys 1158889425 7241
@@ -9102,13 +9102,13 @@ sys/src/boot/pc/pbsdisk.s - 664 sys sys 1017854325 6371
 sys/src/boot/pc/pbsdisklba - 775 sys sys 1015007954 509
 sys/src/boot/pc/pbsdisklba.s - 664 sys sys 1015007954 6022
 sys/src/boot/pc/pbslba.s - 664 sys sys 1143465392 8158
-sys/src/boot/pc/pci.c - 664 sys sys 1161067268 20500
+sys/src/boot/pc/pci.c - 664 sys sys 1175564218 20545
 sys/src/boot/pc/print.c - 664 sys sys 1094674483 219
 sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1144961191 52127
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1161230053 38799
+sys/src/boot/pc/sdata.c - 664 sys sys 1175564193 38846
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1171783051 28694
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1144961224 7006
 sys/src/boot/pc/trap.c - 664 sys sys 1144961191 7499

+ 4 - 4
dist/replica/plan9.db

@@ -8045,7 +8045,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1161302470 1495
 sys/src/9/pc/pcf - 664 sys sys 1161302469 1553
 sys/src/9/pc/pcfl - 664 sys sys 1161302470 1587
 sys/src/9/pc/pcflop - 664 sys sys 1158061762 1513
-sys/src/9/pc/pci.c - 664 sys sys 1173287378 29216
+sys/src/9/pc/pci.c - 664 sys sys 1175564101 29261
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1099761153 1586
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1091129037 5230
@@ -8059,7 +8059,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1170456695 55276
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sdata.c - 664 sys sys 1167774860 52718
+sys/src/9/pc/sdata.c - 664 sys sys 1175564140 52809
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1167774867 25865
 sys/src/9/pc/sdmylex.c - 664 sys sys 1171321627 28237
 sys/src/9/pc/sdscsi.c - 664 sys sys 1158889425 7241
@@ -9102,13 +9102,13 @@ sys/src/boot/pc/pbsdisk.s - 664 sys sys 1017854325 6371
 sys/src/boot/pc/pbsdisklba - 775 sys sys 1015007954 509
 sys/src/boot/pc/pbsdisklba.s - 664 sys sys 1015007954 6022
 sys/src/boot/pc/pbslba.s - 664 sys sys 1143465392 8158
-sys/src/boot/pc/pci.c - 664 sys sys 1161067268 20500
+sys/src/boot/pc/pci.c - 664 sys sys 1175564218 20545
 sys/src/boot/pc/print.c - 664 sys sys 1094674483 219
 sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1144961191 52127
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1161230053 38799
+sys/src/boot/pc/sdata.c - 664 sys sys 1175564193 38846
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1171783051 28694
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1144961224 7006
 sys/src/boot/pc/trap.c - 664 sys sys 1144961191 7499

+ 4 - 0
dist/replica/plan9.log

@@ -48109,3 +48109,7 @@
 1175324417 1 c sys/src/cmd/upas/fs/fs.c - 664 sys sys 1175322795 26929
 1175324417 2 c sys/src/cmd/upas/fs/plan9.c - 664 sys sys 1175322803 7498
 1175407297 0 c sys/man/1/prof - 664 sys sys 1175407194 3594
+1175565606 0 c sys/src/9/pc/pci.c - 664 sys sys 1175564101 29261
+1175565606 1 c sys/src/9/pc/sdata.c - 664 sys sys 1175564140 52809
+1175565606 2 c sys/src/boot/pc/pci.c - 664 sys sys 1175564218 20545
+1175565606 3 c sys/src/boot/pc/sdata.c - 664 sys sys 1175564193 38846

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

@@ -659,6 +659,7 @@ static Bridge southbridges[] = {
 	{ 0x10DE, 0x00D1, nil, nil },		// NVIDIA nForce 3
 	{ 0x1166, 0x0200, nil, nil },		// ServerWorks ServerSet III LE
 	{ 0x1002, 0x4377, nil, nil },		// ATI Radeon Xpress 200M
+	{ 0x1002, 0x4372, nil, nil },		// ATI SB400
 };
 
 typedef struct Slot Slot;

+ 2 - 0
sys/src/9/pc/sdata.c

@@ -1915,6 +1915,7 @@ atapnp(void)
 		case (0x4D69<<16)|0x105A:	/* Promise Ultra/133 TX2 */
 		case (0x3373<<16)|0x105A:	/* Promise 20378 RAID */
 		case (0x3149<<16)|0x1106:	/* VIA VT8237 SATA/RAID */
+		case (0x4379<<16)|0x1002:	/* ATI 4379 SATA*/
 		case (0x3112<<16)|0x1095:	/* SiI 3112 SATA/RAID */
 			maxio = 15;
 			span = 8*1024;
@@ -1975,6 +1976,7 @@ atapnp(void)
 			 * address for the registers (0x50?).
 			 */
 			/*FALLTHROUGH*/
+		case (0x1002<<16)|0x4372:	/* ATI SB400 */
 		case (0x4376<<16)|0x1002:	/* ATI Radeon Xpress 200M */
 			break;
 		case (0x0211<<16)|0x1166:	/* ServerWorks IB6566 */

+ 1 - 0
sys/src/boot/pc/pci.c

@@ -360,6 +360,7 @@ static bridge_t southbridges[] = {
 	{ 0x1078, 0x0100, cyrix_link, cyrix_init },	// Cyrix 5530 Legacy
 
 	{ 0x1002, 0x4377, nil, nil },		// ATI Radeon Xpress 200M
+	{ 0x1002, 0x4372, nil, nil },		// ATI SB400
 	{ 0x1022, 0x746B, nil, nil },		// AMD 8111
 	{ 0x10DE, 0x00D1, nil, nil },		// NVIDIA nForce 3
 	{ 0x1166, 0x0200, nil, nil },		// ServerWorks ServerSet III LE

+ 1 - 0
sys/src/boot/pc/sdata.c

@@ -1465,6 +1465,7 @@ atapnp(void)
 		case (0x4D69<<16)|0x105A:	/* Promise Ultra/133 TX2 */
 		case (0x3373<<16)|0x105A:	/* Promise 20378 RAID */
 		case (0x3149<<16)|0x1106:	/* VIA VT8237 SATA/RAID */
+		case (0x4379<<16)|0x1002:	/* ATI 4379 SATA*/
 		case (0x3112<<16)|0x1095:	/* SiL 3112 SATA (DMA busted?) */
 		case (0x3114<<16)|0x1095:	/* SiL 3114 SATA/RAID */
 			pi = 0x85;