X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Faccess.c;h=c23a2fd159723f62f9febcdb2f6bea26db600672;hb=66e0afd0ea5b913255038f7db5399d369854c71b;hp=01bdc24dd331ee5c04ee7236a03715a146e2745d;hpb=c6b83ae3aece7a098858701c4ae3b36adc1c1378;p=pciutils.git diff --git a/lib/access.c b/lib/access.c index 01bdc24..c23a2fd 100644 --- a/lib/access.c +++ b/lib/access.c @@ -1,7 +1,7 @@ /* * The PCI Library -- User Access * - * Copyright (c) 1997--2008 Martin Mares + * Copyright (c) 1997--2013 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -13,183 +13,6 @@ #include "internal.h" -static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = { - NULL, -#ifdef PCI_HAVE_PM_LINUX_SYSFS - &pm_linux_sysfs, -#else - NULL, -#endif -#ifdef PCI_HAVE_PM_LINUX_PROC - &pm_linux_proc, -#else - NULL, -#endif -#ifdef PCI_HAVE_PM_INTEL_CONF - &pm_intel_conf1, - &pm_intel_conf2, -#else - NULL, - NULL, -#endif -#ifdef PCI_HAVE_PM_FBSD_DEVICE - &pm_fbsd_device, -#else - NULL, -#endif -#ifdef PCI_HAVE_PM_AIX_DEVICE - &pm_aix_device, -#else - NULL, -#endif -#ifdef PCI_HAVE_PM_NBSD_LIBPCI - &pm_nbsd_libpci, -#else - NULL, -#endif -#ifdef PCI_HAVE_PM_OBSD_DEVICE - &pm_obsd_device, -#else - NULL, -#endif -#ifdef PCI_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; - - memset(a, 0, sizeof(*a)); - pci_set_name_list_path(a, PCI_PATH_IDS_DIR "/" PCI_IDS, 0); - pci_set_net_domain(a, PCI_ID_DOMAIN, 0); - a->id_lookup_mode = PCI_LOOKUP_CACHE; - for(i=0; iconfig) - 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; idebug("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_set_name_list_path(a, NULL, 0); - pci_set_net_domain(a, NULL, 0); - pci_set_id_cache(a, NULL, 0); - pci_mfree(a); -} - void pci_scan_bus(struct pci_access *a) { @@ -235,6 +58,10 @@ void pci_free_dev(struct pci_dev *d) { if (d->methods->cleanup_dev) d->methods->cleanup_dev(d); + pci_free_caps(d); + pci_mfree(d->module_alias); + pci_mfree(d->label); + pci_mfree(d->phy_slot); pci_mfree(d); } @@ -279,6 +106,12 @@ pci_read_block(struct pci_dev *d, int pos, byte *buf, int len) return d->methods->read(d, pos, buf, len); } +int +pci_read_vpd(struct pci_dev *d, int pos, byte *buf, int len) +{ + return d->methods->read_vpd ? d->methods->read_vpd(d, pos, buf, len) : 0; +} + static inline int pci_write_data(struct pci_dev *d, void *buf, int pos, int len) { @@ -321,18 +154,28 @@ pci_write_block(struct pci_dev *d, int pos, byte *buf, int len) } int -pci_fill_info(struct pci_dev *d, int flags) +pci_fill_info_v32(struct pci_dev *d, int flags) { if (flags & PCI_FILL_RESCAN) { flags &= ~PCI_FILL_RESCAN; d->known_fields = 0; + pci_free_caps(d); } if (flags & ~d->known_fields) d->known_fields |= d->methods->fill_info(d, flags & ~d->known_fields); return d->known_fields; } +/* In version 3.1, pci_fill_info got new flags => versioned alias */ +/* In version 3.2, the same has happened */ +STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v32(d, flags)); +DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v32); +DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v32); +SYMBOL_VERSION(pci_fill_info_v30, pci_fill_info@LIBPCI_3.0); +SYMBOL_VERSION(pci_fill_info_v31, pci_fill_info@LIBPCI_3.1); +SYMBOL_VERSION(pci_fill_info_v32, pci_fill_info@@LIBPCI_3.2); + void pci_setup_cache(struct pci_dev *d, byte *cache, int len) {