Browse Source

Plan 9 from Bell Labs 2005-06-02

David du Colombier 19 years ago
parent
commit
8a9adcf67d

+ 8 - 8
dist/replica/_plan9.db

@@ -1,15 +1,15 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1112757508 215872
-386/9loaddebug - 775 sys sys 1116215126 310385
+386/9loaddebug - 775 sys sys 1117596649 310399
 386/9loadlite - 775 sys sys 1112757508 135244
 386/9loadlitedebug - 775 sys sys 1116215126 198758
-386/9pc - 775 sys sys 1117429392 1834571
+386/9pc - 775 sys sys 1117596653 1834578
 386/9pc.gz - 664 sys sys 1112757510 643423
-386/9pccpu - 775 sys sys 1117429395 1489060
+386/9pccpu - 775 sys sys 1117596656 1489067
 386/9pccpu.gz - 664 sys sys 1112757511 529529
-386/9pcdisk - 775 sys sys 1117429400 2040377
+386/9pcdisk - 775 sys sys 1117596660 2040384
 386/9pcdisk.gz - 664 sys sys 1112757513 733576
-386/9pcf - 775 sys sys 1117429405 2383209
+386/9pcf - 775 sys sys 1117596666 2383216
 386/9pcf.gz - 664 sys sys 1112757515 886966
 386/9pxeload - 775 sys sys 1112757508 215872
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -7977,7 +7977,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1104430623 1485
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1112361040 1454
-sys/src/9/pc/pci.c - 664 sys sys 1107436009 25850
+sys/src/9/pc/pci.c - 664 sys sys 1117636046 26073
 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
@@ -9113,7 +9113,7 @@ 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 1017854326 8147
-sys/src/boot/pc/pci.c - 664 sys sys 1096379795 17688
+sys/src/boot/pc/pci.c - 664 sys sys 1117636062 17818
 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 1094674489 2271
@@ -13936,7 +13936,7 @@ sys/src/games/sudoku - 20000000775 sys sys 1117225572 0
 sys/src/games/sudoku/game.c - 664 sys sys 1117226433 7788
 sys/src/games/sudoku/levels.c - 664 sys sys 1117226433 3186
 sys/src/games/sudoku/mkfile - 664 sys sys 1117226432 218
-sys/src/games/sudoku/sudoku.c - 664 sys sys 1117226433 7805
+sys/src/games/sudoku/sudoku.c - 664 sys sys 1117636441 7809
 sys/src/games/sudoku/sudoku.h - 664 sys sys 1117226432 1159
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642

+ 8 - 8
dist/replica/plan9.db

@@ -1,15 +1,15 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1112757508 215872
-386/9loaddebug - 775 sys sys 1116215126 310385
+386/9loaddebug - 775 sys sys 1117596649 310399
 386/9loadlite - 775 sys sys 1112757508 135244
 386/9loadlitedebug - 775 sys sys 1116215126 198758
-386/9pc - 775 sys sys 1117429392 1834571
+386/9pc - 775 sys sys 1117596653 1834578
 386/9pc.gz - 664 sys sys 1112757510 643423
-386/9pccpu - 775 sys sys 1117429395 1489060
+386/9pccpu - 775 sys sys 1117596656 1489067
 386/9pccpu.gz - 664 sys sys 1112757511 529529
-386/9pcdisk - 775 sys sys 1117429400 2040377
+386/9pcdisk - 775 sys sys 1117596660 2040384
 386/9pcdisk.gz - 664 sys sys 1112757513 733576
-386/9pcf - 775 sys sys 1117429405 2383209
+386/9pcf - 775 sys sys 1117596666 2383216
 386/9pcf.gz - 664 sys sys 1112757515 886966
 386/9pxeload - 775 sys sys 1112757508 215872
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -7977,7 +7977,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1104430623 1485
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1112361040 1454
-sys/src/9/pc/pci.c - 664 sys sys 1107436009 25850
+sys/src/9/pc/pci.c - 664 sys sys 1117636046 26073
 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
@@ -9113,7 +9113,7 @@ 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 1017854326 8147
-sys/src/boot/pc/pci.c - 664 sys sys 1096379795 17688
+sys/src/boot/pc/pci.c - 664 sys sys 1117636062 17818
 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 1094674489 2271
@@ -13936,7 +13936,7 @@ sys/src/games/sudoku - 20000000775 sys sys 1117225572 0
 sys/src/games/sudoku/game.c - 664 sys sys 1117226433 7788
 sys/src/games/sudoku/levels.c - 664 sys sys 1117226433 3186
 sys/src/games/sudoku/mkfile - 664 sys sys 1117226432 218
-sys/src/games/sudoku/sudoku.c - 664 sys sys 1117226433 7805
+sys/src/games/sudoku/sudoku.c - 664 sys sys 1117636441 7809
 sys/src/games/sudoku/sudoku.h - 664 sys sys 1117226432 1159
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642

+ 8 - 0
dist/replica/plan9.log

@@ -19443,3 +19443,11 @@
 1117510225 0 c 386/bin/games/juggle - 775 sys sys 1117508921 125685
 1117551634 0 c sys/src/9/pc/ether82557.c - 664 sys sys 1117550886 30121
 1117551634 1 c sys/src/boot/pc/ether82557.c - 664 sys sys 1117550886 19045
+1117598444 0 c 386/9loaddebug - 775 sys sys 1117596649 310399
+1117598444 1 c 386/9pc - 775 sys sys 1117596653 1834578
+1117598444 2 c 386/9pccpu - 775 sys sys 1117596656 1489067
+1117598444 3 c 386/9pcdisk - 775 sys sys 1117596660 2040384
+1117598444 4 c 386/9pcf - 775 sys sys 1117596666 2383216
+1117636252 0 c sys/src/9/pc/pci.c - 664 sys sys 1117636046 26073
+1117636252 1 c sys/src/boot/pc/pci.c - 664 sys sys 1117636062 17818
+1117638053 0 c sys/src/games/sudoku/sudoku.c - 664 sys sys 1117636441 7809

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

@@ -636,6 +636,7 @@ static Bridge southbridges[] = {
 	{ 0x8086, 0x244c, pIIxget, pIIxset },	// Intel 82801BAM
 	{ 0x8086, 0x248c, pIIxget, pIIxset },	// Intel 82801CAM
 	{ 0x8086, 0x24d0, pIIxget, pIIxset },	// Intel 82801EB
+	{ 0x8086, 0x2640, pIIxget, pIIxset },	// Intel 82801FB
 	{ 0x1106, 0x0586, viaget, viaset },	// Viatech 82C586
 	{ 0x1106, 0x0596, viaget, viaset },	// Viatech 82C596
 	{ 0x1106, 0x0686, viaget, viaset },	// Viatech 82C686
@@ -1211,6 +1212,20 @@ pciclrbme(Pcidev* p)
 	pcicfgw16(p, PciPCR, p->pcr);
 }
 
+void
+pcisetmwi(Pcidev* p)
+{
+	p->pcr |= MemWrInv;
+	pcicfgw16(p, PciPCR, p->pcr);
+}
+
+void
+pciclrmwi(Pcidev* p)
+{
+	p->pcr &= ~MemWrInv;
+	pcicfgw16(p, PciPCR, p->pcr);
+}
+
 static int
 pcigetpmrb(Pcidev* p)
 {

+ 6 - 2
sys/src/boot/pc/pci.c

@@ -306,7 +306,9 @@ enum {
 		Intel_82801AB_0 = 0x2420,
 		Intel_82801BA_0 = 0x2440,
 		Intel_82801BAM_0 = 0x244c,
-		Intel_82801ICH5R_0 = 0x24d0,	/* part # is a guess */
+		Intel_82801CAM_0 = 0x248c,
+		Intel_82801EB_0 = 0x24d0,
+		Intel_82801FB_0 = 0x2640,
 	Viatech = 0x1106,
 		Via_82C586_0 = 0x0586,
 		Via_82C596 = 0x0596,
@@ -338,7 +340,9 @@ static bridge_t southbridges[] = {
 {	Intel, Intel_82801AB_0,		pIIx_link,	pIIx_init },
 {	Intel, Intel_82801BA_0,		pIIx_link,	pIIx_init },
 {	Intel, Intel_82801BAM_0,	pIIx_link,	pIIx_init },
-{	Intel, Intel_82801ICH5R_0,	pIIx_link,	pIIx_init },
+{	Intel, Intel_82801CAM_0,	pIIx_link,	pIIx_init },
+{	Intel, Intel_82801EB_0,		pIIx_link,	pIIx_init },
+{	Intel, Intel_82801FB_0,		pIIx_link,	pIIx_init },
 {	Viatech, Via_82C586_0,		via_link,	via_init },
 {	Viatech, Via_82C596,		via_link,	via_init },
 {	Viatech, Via_82C686,		via_link,	via_init },

+ 2 - 2
sys/src/games/sudoku/sudoku.c

@@ -286,9 +286,9 @@ eresized(int new)
 	}
 
 	p = Pt(Dx(screen->r), Dy(screen->r));
-	if(!new || !eqpt(p, Pt(Maxx, Maxy))) {
+	if(!new || !eqpt(p, Pt(Maxx - 8, Maxy - 8)))
 		resize();
-	}
+
 	drawscreen();
 }