5a4e15c3f6
Most of the driver enumeration functions take an array and a maximum number of entries that they are allowed to fill in. Upon success, they return the number of entries filled in. This allows them to be easily used to consecutively. One exception is the xf86MatchDriverFromFiles() function, which doesn't return a value, so callers have to manually search the array for the first empty entry. This commit modifies the xf86MatchDriverFromFiles() to behave the same way as others, which makes it easier to deal with. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Tested-By: Aaron Plattner <aplattner@nvidia.com> Tested-by: Rob Clark <robdclark@gmail.com> (on arm / platform device) Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
57 lines
2.5 KiB
C
57 lines
2.5 KiB
C
|
|
/*
|
|
* Copyright (c) 1999-2003 by The XFree86 Project, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Except as contained in this notice, the name of the copyright holder(s)
|
|
* and author(s) shall not be used in advertising or otherwise to promote
|
|
* the sale, use or other dealings in this Software without prior written
|
|
* authorization from the copyright holder(s) and author(s).
|
|
*/
|
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#ifndef _XF86_PCI_BUS_H
|
|
#define _XF86_PCI_BUS_H
|
|
|
|
void xf86PciProbe(void);
|
|
Bool xf86PciAddMatchingDev(DriverPtr drvp);
|
|
Bool xf86PciProbeDev(DriverPtr drvp);
|
|
void xf86PciIsolateDevice(const char *argument);
|
|
int xf86PciMatchDriver(char *matches[], int nmatches);
|
|
Bool xf86PciConfigure(void *busData, struct pci_device *pDev);
|
|
void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
|
|
GDevRec * GDev, int *chipset);
|
|
|
|
#define MATCH_PCI_DEVICES(x, y) (((x)->domain == (y)->domain) && \
|
|
((x)->bus == (y)->bus) && \
|
|
((x)->func == (y)->func) && \
|
|
((x)->dev == (y)->dev))
|
|
|
|
int
|
|
xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
|
|
char *matches[], int nmatches);
|
|
int
|
|
xf86VideoPtrToDriverList(struct pci_device *dev,
|
|
char *returnList[], int returnListMax);
|
|
#endif /* _XF86_PCI_BUS_H */
|