Sat Aug 20 08:29:36 2016 UTC ()
align format string with argument type


(jakllsch)
diff -r1.3 -r1.4 xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c

cvs diff -r1.3 -r1.4 xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c (expand / switch to unified diff)

--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c 2016/08/19 23:53:25 1.3
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_ums.c 2016/08/20 08:29:36 1.4
@@ -177,27 +177,27 @@ viaMapMMIO(ScrnInfoPtr pScrn) @@ -177,27 +177,27 @@ viaMapMMIO(ScrnInfoPtr pScrn)
177 } else { 177 } else {
178 pVia->FrameBufferBase = pVia->PciInfo->regions[0].base_addr; 178 pVia->FrameBufferBase = pVia->PciInfo->regions[0].base_addr;
179 } 179 }
180#else 180#else
181 if (pVia->Chipset == VIA_VX900) { 181 if (pVia->Chipset == VIA_VX900) {
182 pVia->FrameBufferBase = pVia->PciInfo->memBase[2]; 182 pVia->FrameBufferBase = pVia->PciInfo->memBase[2];
183 } else { 183 } else {
184 pVia->FrameBufferBase = pVia->PciInfo->memBase[0]; 184 pVia->FrameBufferBase = pVia->PciInfo->memBase[0];
185 } 185 }
186#endif 186#endif
187 187
188 xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 188 xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
189 "Mapping the frame buffer at address 0x%lX with " 189 "Mapping the frame buffer at address 0x%lX with "
190 "size %u KB.\n", 190 "size %lu KB.\n",
191 pVia->FrameBufferBase, pVia->videoRambytes / 1024); 191 pVia->FrameBufferBase, pVia->videoRambytes / 1024);
192 192
193#ifdef HAVE_PCIACCESS 193#ifdef HAVE_PCIACCESS
194 err = pci_device_map_range(pVia->PciInfo, pVia->FrameBufferBase, 194 err = pci_device_map_range(pVia->PciInfo, pVia->FrameBufferBase,
195 pVia->videoRambytes, 195 pVia->videoRambytes,
196 (PCI_DEV_MAP_FLAG_WRITABLE | 196 (PCI_DEV_MAP_FLAG_WRITABLE |
197 PCI_DEV_MAP_FLAG_WRITE_COMBINE), 197 PCI_DEV_MAP_FLAG_WRITE_COMBINE),
198 (void **)&pVia->FBBase); 198 (void **)&pVia->FBBase);
199 if (err) { 199 if (err) {
200 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 200 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
201 "Unable to map the frame buffer.\n" 201 "Unable to map the frame buffer.\n"
202 "Error: %s (%u)\n", 202 "Error: %s (%u)\n",
203 strerror(err), err); 203 strerror(err), err);