Module Name: xsrc Committed By: wiz Date: Mon Feb 23 11:18:02 UTC 2015
Modified Files: xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_driver.c Log Message: Reduce diff to upstream (whitespace only). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.3 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.4 --- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.3 Mon Jun 3 10:02:22 2013 +++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Mon Feb 23 11:18:02 2015 @@ -669,15 +669,15 @@ TDFXInitChips(ScrnInfoPtr pScrn) } else { for (i = 0; i < pTDFX->numChips; i++) { PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i); - - #if 0 - v=pciReadWord(pTDFX->PciTag[i], CFG_PCI_COMMAND); - if (!i) - pciWriteWord(pTDFX->PciTag[i], CFG_PCI_COMMAND, v | 0x3); - else - pciWriteWord(pTDFX->PciTag[i], CFG_PCI_COMMAND, v | 0x2); - #endif - + +#if 0 + v=pciReadWord(pTDFX->PciTag[i], CFG_PCI_COMMAND); + if (!i) + pciWriteWord(pTDFX->PciTag[i], CFG_PCI_COMMAND, v | 0x3); + else + pciWriteWord(pTDFX->PciTag[i], CFG_PCI_COMMAND, v | 0x2); +#endif + pTDFX->MMIOAddr[i] = mem0base + (i * mem0size); PCI_WRITE_LONG(pTDFX->MMIOAddr[i], CFG_MEM0BASE, i);