/*
* The PCI Library -- User Access
*
- * Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ * Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL.
*/
#include "internal.h"
-static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
- NULL,
-#ifdef HAVE_PM_LINUX_PROC
- &pm_linux_proc,
-#else
- NULL,
-#endif
-#ifdef HAVE_PM_INTEL_CONF
- &pm_intel_conf1,
- &pm_intel_conf2,
-#else
- NULL,
- NULL,
-#endif
-#ifdef HAVE_PM_FBSD_DEVICE
- &pm_fbsd_device,
-#else
- NULL,
-#endif
-#ifdef HAVE_PM_AIX_DEVICE
- &pm_aix_device,
-#else
- NULL,
-#endif
-#ifdef HAVE_PM_NBSD_LIBPCI
- &pm_nbsd_libpci,
-#else
- NULL,
-#endif
-#ifdef HAVE_PM_DUMP
- &pm_dump,
-#else
- NULL,
-#endif
-};
-
-struct pci_access *
-pci_alloc(void)
-{
- struct pci_access *a = malloc(sizeof(struct pci_access));
- int i;
-
- bzero(a, sizeof(*a));
- a->id_file_name = PATH_PCI_IDS;
- for(i=0; i<PCI_ACCESS_MAX; i++)
- if (pci_methods[i] && pci_methods[i]->config)
- pci_methods[i]->config(a);
- return a;
-}
-
-void *
-pci_malloc(struct pci_access *a, int size)
-{
- void *x = malloc(size);
-
- if (!x)
- a->error("Out of memory (allocation of %d bytes failed)", size);
- return x;
-}
-
-void
-pci_mfree(void *x)
-{
- if (x)
- free(x);
-}
-
-static void
-pci_generic_error(char *msg, ...)
-{
- va_list args;
-
- va_start(args, msg);
- fputs("pcilib: ", stderr);
- vfprintf(stderr, msg, args);
- fputc('\n', stderr);
- exit(1);
-}
-
-static void
-pci_generic_warn(char *msg, ...)
-{
- va_list args;
-
- va_start(args, msg);
- fputs("pcilib: ", stderr);
- vfprintf(stderr, msg, args);
- fputc('\n', stderr);
-}
-
-static void
-pci_generic_debug(char *msg, ...)
-{
- va_list args;
-
- va_start(args, msg);
- vfprintf(stdout, msg, args);
- va_end(args);
-}
-
-static void
-pci_null_debug(char *msg UNUSED, ...)
-{
-}
-
-void
-pci_init(struct pci_access *a)
-{
- if (!a->error)
- a->error = pci_generic_error;
- if (!a->warning)
- a->warning = pci_generic_warn;
- if (!a->debug)
- a->debug = pci_generic_debug;
- if (!a->debugging)
- a->debug = pci_null_debug;
-
- if (a->method)
- {
- if (a->method >= PCI_ACCESS_MAX || !pci_methods[a->method])
- a->error("This access method is not supported.");
- a->methods = pci_methods[a->method];
- }
- else
- {
- unsigned int i;
- for(i=0; i<PCI_ACCESS_MAX; i++)
- if (pci_methods[i])
- {
- a->debug("Trying method %d...", i);
- if (pci_methods[i]->detect(a))
- {
- a->debug("...OK\n");
- a->methods = pci_methods[i];
- a->method = i;
- break;
- }
- a->debug("...No.\n");
- }
- if (!a->methods)
- a->error("Cannot find any working access method.");
- }
- a->debug("Decided to use %s\n", a->methods->name);
- a->methods->init(a);
-}
-
-void
-pci_cleanup(struct pci_access *a)
-{
- struct pci_dev *d, *e;
-
- for(d=a->devices; d; d=e)
- {
- e = d->next;
- pci_free_dev(d);
- }
- if (a->methods)
- a->methods->cleanup(a);
- pci_free_name_list(a);
- pci_mfree(a);
-}
-
void
pci_scan_bus(struct pci_access *a)
{
{
struct pci_dev *d = pci_malloc(a, sizeof(struct pci_dev));
- bzero(d, sizeof(*d));
+ memset(d, 0, sizeof(*d));
d->access = a;
d->methods = a->methods;
+ d->hdrtype = -1;
if (d->methods->init_dev)
d->methods->init_dev(d);
return d;
}
struct pci_dev *
-pci_get_dev(struct pci_access *a, int bus, int dev, int func)
+pci_get_dev(struct pci_access *a, int domain, int bus, int dev, int func)
{
struct pci_dev *d = pci_alloc_dev(a);
+ d->domain = domain;
d->bus = bus;
d->dev = dev;
d->func = func;