X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffilter.c;h=573fb28103637f65d98411c9602bcb1899816471;hb=c4cf2d1c17594d333ccd819212756e3afb8b9924;hp=fab0025bd7322ad7f836a5ec459f911f736614d3;hpb=4d1c95253f900ccb62b2b960f9ae34d82ac26f29;p=pciutils.git diff --git a/lib/filter.c b/lib/filter.c index fab0025..573fb28 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -1,7 +1,7 @@ /* * The PCI Library -- Device Filtering * - * Copyright (c) 1998--2003 Martin Mares + * Copyright (c) 1998--2014 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -11,17 +11,22 @@ #include "internal.h" +void pci_filter_init_v33(struct pci_access *a UNUSED, struct pci_filter *f) VERSIONED_ABI; +char *pci_filter_parse_slot_v33(struct pci_filter *f, char *str) VERSIONED_ABI; +char *pci_filter_parse_id_v33(struct pci_filter *f, char *str) VERSIONED_ABI; +int pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d) VERSIONED_ABI; + void -pci_filter_init(struct pci_access *a UNUSED, struct pci_filter *f) +pci_filter_init_v33(struct pci_access *a UNUSED, struct pci_filter *f) { f->domain = f->bus = f->slot = f->func = -1; - f->vendor = f->device = f->class = -1; + f->vendor = f->device = f->device_class = -1; } /* Slot filter syntax: [[[domain]:][bus]:][slot][.[func]] */ char * -pci_filter_parse_slot(struct pci_filter *f, char *str) +pci_filter_parse_slot_v33(struct pci_filter *f, char *str) { char *colon = strrchr(str, ':'); char *dot = strchr((colon ? colon + 1 : str), '.'); @@ -40,7 +45,7 @@ pci_filter_parse_slot(struct pci_filter *f, char *str) if (str[0] && strcmp(str, "*")) { long int x = strtol(str, &e, 16); - if ((e && *e) || (x < 0 || x > 0xffff)) + if ((e && *e) || (x < 0 || x > 0x7fffffff)) return "Invalid domain number"; f->domain = x; } @@ -77,7 +82,7 @@ pci_filter_parse_slot(struct pci_filter *f, char *str) /* ID filter syntax: [vendor]:[device][:class] */ char * -pci_filter_parse_id(struct pci_filter *f, char *str) +pci_filter_parse_id_v33(struct pci_filter *f, char *str) { char *s, *c, *e; @@ -109,13 +114,13 @@ pci_filter_parse_id(struct pci_filter *f, char *str) long int x = strtol(c, &e, 16); if ((e && *e) || (x < 0 || x > 0xffff)) return "Invalid class code"; - f->class = x; + f->device_class = x; } return NULL; } int -pci_filter_match(struct pci_filter *f, struct pci_dev *d) +pci_filter_match_v33(struct pci_filter *f, struct pci_dev *d) { if ((f->domain >= 0 && f->domain != d->domain) || (f->bus >= 0 && f->bus != d->bus) || @@ -124,16 +129,112 @@ pci_filter_match(struct pci_filter *f, struct pci_dev *d) return 0; if (f->device >= 0 || f->vendor >= 0) { - pci_fill_info_v32(d, PCI_FILL_IDENT); + pci_fill_info_v35(d, PCI_FILL_IDENT); if ((f->device >= 0 && f->device != d->device_id) || (f->vendor >= 0 && f->vendor != d->vendor_id)) return 0; } - if (f->class >= 0) + if (f->device_class >= 0) { pci_fill_info(d, PCI_FILL_CLASS); - if (f->class != d->device_class) + if (f->device_class != d->device_class) return 0; } return 1; } + +/* + * Before pciutils v3.3, struct pci_filter had fewer fields, + * so we have to provide compatibility wrappers. + */ + +struct pci_filter_v30 { + int domain, bus, slot, func; /* -1 = ANY */ + int vendor, device; +}; + +void pci_filter_init_v30(struct pci_access *a, struct pci_filter_v30 *f) VERSIONED_ABI; +char *pci_filter_parse_slot_v30(struct pci_filter_v30 *f, char *str) VERSIONED_ABI; +char *pci_filter_parse_id_v30(struct pci_filter_v30 *f, char *str) VERSIONED_ABI; +int pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d) VERSIONED_ABI; + +static void +pci_filter_import_v30(struct pci_filter_v30 *old, struct pci_filter *new) +{ + new->domain = old->domain; + new->bus = old->bus; + new->slot = old->slot; + new->func = old->func; + new->vendor = old->vendor; + new->device = old->device; + new->device_class = -1; +} + +static void +pci_filter_export_v30(struct pci_filter *new, struct pci_filter_v30 *old) +{ + old->domain = new->domain; + old->bus = new->bus; + old->slot = new->slot; + old->func = new->func; + old->vendor = new->vendor; + old->device = new->device; +} + +void +pci_filter_init_v30(struct pci_access *a, struct pci_filter_v30 *f) +{ + struct pci_filter new; + pci_filter_init_v33(a, &new); + pci_filter_export_v30(&new, f); +} + +char * +pci_filter_parse_slot_v30(struct pci_filter_v30 *f, char *str) +{ + struct pci_filter new; + char *err; + pci_filter_import_v30(f, &new); + if (err = pci_filter_parse_slot_v33(&new, str)) + return err; + pci_filter_export_v30(&new, f); + return NULL; +} + +char * +pci_filter_parse_id_v30(struct pci_filter_v30 *f, char *str) +{ + struct pci_filter new; + char *err; + pci_filter_import_v30(f, &new); + if (err = pci_filter_parse_id_v33(&new, str)) + return err; + if (new.device_class >= 0) + return "Filtering by class not supported in this program"; + pci_filter_export_v30(&new, f); + return NULL; +} + +int +pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d) +{ + struct pci_filter new; + pci_filter_import_v30(f, &new); + return pci_filter_match_v33(&new, d); +} + +STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v33(a, f)); +SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); +SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@@LIBPCI_3.3); + +STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v33(f, str)); +SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); +SYMBOL_VERSION(pci_filter_parse_slot_v33, pci_filter_parse_slot@@LIBPCI_3.3); + +STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v33(f, str)); +SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); +SYMBOL_VERSION(pci_filter_parse_id_v33, pci_filter_parse_id@@LIBPCI_3.3); + +STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v33(f, d)); +SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); +SYMBOL_VERSION(pci_filter_match_v33, pci_filter_match@@LIBPCI_3.3);