summaryrefslogtreecommitdiff
path: root/xserver/hw/xfree86/common/xf86pciBus.h
diff options
context:
space:
mode:
Diffstat (limited to 'xserver/hw/xfree86/common/xf86pciBus.h')
-rw-r--r--xserver/hw/xfree86/common/xf86pciBus.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/xserver/hw/xfree86/common/xf86pciBus.h b/xserver/hw/xfree86/common/xf86pciBus.h
index 45b5a0fee..14ae9760e 100644
--- a/xserver/hw/xfree86/common/xf86pciBus.h
+++ b/xserver/hw/xfree86/common/xf86pciBus.h
@@ -33,11 +33,13 @@
#ifndef _XF86_PCI_BUS_H
#define _XF86_PCI_BUS_H
+#include "xf86MatchDrivers.h"
+
void xf86PciProbe(void);
Bool xf86PciAddMatchingDev(DriverPtr drvp);
Bool xf86PciProbeDev(DriverPtr drvp);
void xf86PciIsolateDevice(const char *argument);
-int xf86PciMatchDriver(char *matches[], int nmatches);
+void xf86PciMatchDriver(XF86MatchedDrivers *md);
Bool xf86PciConfigure(void *busData, struct pci_device *pDev);
void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
GDevRec * GDev, int *chipset);
@@ -47,10 +49,9 @@ void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
((x)->func == (y)->func) && \
((x)->dev == (y)->dev))
-int
+void
xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
- char *matches[], int nmatches);
-int
-xf86VideoPtrToDriverList(struct pci_device *dev,
- char *returnList[], int returnListMax);
+ XF86MatchedDrivers *md);
+void
+xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md);
#endif /* _XF86_PCI_BUS_H */