diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c b/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c index 4e583bf9c..3fb5b6ba4 100644 --- a/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c +++ b/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.10 2000/02/21 18:09:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.13 2000/03/05 23:47:48 dawes Exp $ */ /* * Copyright (c) 1997-1999 by The XFree86 Project, Inc. @@ -7,7 +7,6 @@ /* * This file contains the interfaces to the bus-specific code */ -#define DEBUG #include <ctype.h> #include <stdlib.h> #include <unistd.h> @@ -350,35 +349,35 @@ FindPCIVideoInfo(void) xf86Msg(X_PROBED, "PCI: (%d:%d:%d) ", info->bus, info->device, info->func); if (vendorname) - ErrorF("%s ", vendorname); + xf86ErrorF("%s ", vendorname); else - ErrorF("unknown vendor (0x%04x) ", info->vendor); + xf86ErrorF("unknown vendor (0x%04x) ", info->vendor); if (chipname) - ErrorF("%s ", chipname); + xf86ErrorF("%s ", chipname); else - ErrorF("unknown chipset (0x%04x) ", info->chipType); - ErrorF("rev %d", info->chipRev); + xf86ErrorF("unknown chipset (0x%04x) ", info->chipType); + xf86ErrorF("rev %d", info->chipRev); for (i = 0; i < 6; i++) { if (info->memBase[i]) { if (!memdone) { - ErrorF(", Mem @ "); + xf86ErrorF(", Mem @ "); memdone = TRUE; } else - ErrorF(", "); - ErrorF("0x%08x/%d", info->memBase[i], info->size[i]); + xf86ErrorF(", "); + xf86ErrorF("0x%08x/%d", info->memBase[i], info->size[i]); } } for (i = 0; i < 6; i++) { if (info->ioBase[i]) { if (!iodone) { - ErrorF(", I/O @ "); + xf86ErrorF(", I/O @ "); iodone = TRUE; } else - ErrorF(", "); - ErrorF("0x%04x/%d", info->ioBase[i], info->size[i]); + xf86ErrorF(", "); + xf86ErrorF("0x%04x/%d", info->ioBase[i], info->size[i]); } } - ErrorF("\n"); + xf86ErrorF("\n"); } } } @@ -1397,14 +1396,15 @@ getValidBIOSBase(PCITAG tag, int num) void xf86PciProbe(void) { - void (* DataSetupFunc)(SymTabPtr *, pciVendorDeviceInfo **, - pciVendorCardInfo **); + typedef void DataSetupFuncType(SymTabPtr *, pciVendorDeviceInfo **, + pciVendorCardInfo **); + DataSetupFuncType *DataSetupFunc; #ifdef XFree86LOADER /* * we need to get the pointer to the pci data structures initialized */ - DataSetupFunc = LoaderSymbol("xf86SetupPciData"); + DataSetupFunc = (DataSetupFuncType *)LoaderSymbol("xf86SetupPciData"); #else DataSetupFunc = xf86SetupScanPci; #endif |