X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fpci.h;h=8becd76d9b7ceb843658364854fb8ff7d7e33eec;hb=09156b3b13e4940d14d390f7cbb1fd6bdea6a9d8;hp=4fca73eee34d3ce09c0a1b90e7c8c840771a4e68;hpb=bc6346df8d89ece4814be7dff951ec1a7d259938;p=pciutils.git diff --git a/lib/pci.h b/lib/pci.h index 4fca73e..8becd76 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -1,9 +1,7 @@ /* - * $Id: pci.h,v 1.5 1999/07/20 12:13:40 mj Exp $ - * * The PCI Library * - * Copyright (c) 1997--1999 Martin Mares + * Copyright (c) 1997--2006 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -12,45 +10,31 @@ #define _PCI_LIB_H #include "config.h" - -#ifdef HAVE_OWN_HEADER_H #include "header.h" -#else -#include -#endif - -/* - * Types - */ - -#include +#include "types.h" -typedef __u8 byte; -typedef __u8 u8; -typedef __u16 word; -typedef __u16 u16; -typedef __u32 u32; - -#ifdef HAVE_LONG_ADDRESS -typedef unsigned long long pciaddr_t; -#else -typedef unsigned long pciaddr_t; -#endif +#define PCI_LIB_VERSION 0x020204 /* * PCI Access Structure */ struct pci_methods; -struct nl_entry; -#define PCI_ACCESS_AUTO 0 /* Autodetection (params: none) */ -#define PCI_ACCESS_PROC_BUS_PCI 1 /* Linux /proc/bus/pci (params: path) */ -#define PCI_ACCESS_SYSCALLS 2 /* pciconfig_read() syscalls (params: none) */ -#define PCI_ACCESS_I386_TYPE1 3 /* i386 ports, type 1 (params: none) */ -#define PCI_ACCESS_I386_TYPE2 4 /* i386 ports, type 2 (params: none) */ -#define PCI_ACCESS_DUMP 5 /* Dump file (params: filename) */ -#define PCI_ACCESS_MAX 6 +enum pci_access_type { + /* Known access methods, remember to update access.c as well */ + PCI_ACCESS_AUTO, /* Autodetection (params: none) */ + PCI_ACCESS_SYS_BUS_PCI, /* Linux /sys/bus/pci (params: path) */ + PCI_ACCESS_PROC_BUS_PCI, /* Linux /proc/bus/pci (params: path) */ + PCI_ACCESS_I386_TYPE1, /* i386 ports, type 1 (params: none) */ + PCI_ACCESS_I386_TYPE2, /* i386 ports, type 2 (params: none) */ + PCI_ACCESS_FBSD_DEVICE, /* FreeBSD /dev/pci (params: path) */ + PCI_ACCESS_AIX_DEVICE, /* /dev/pci0, /dev/bus0, etc. */ + PCI_ACCESS_NBSD_LIBPCI, /* NetBSD libpci */ + PCI_ACCESS_OBSD_DEVICE, /* OpenBSD /dev/pci */ + PCI_ACCESS_DUMP, /* Dump file (params: filename) */ + PCI_ACCESS_MAX +}; struct pci_access { /* Options you can change: */ @@ -59,7 +43,8 @@ struct pci_access { int writeable; /* Open in read/write mode */ int buscentric; /* Bus-centric view of the world */ char *id_file_name; /* Name of ID list file */ - int numeric_ids; /* Don't resolve device IDs to names */ + int free_id_name; /* Set if id_file_name is malloced */ + int numeric_ids; /* Enforce PCI_LOOKUP_NUMERIC (>1 => PCI_LOOKUP_MIXED) */ int debugging; /* Turn on debugging messages */ /* Functions you can override: */ @@ -71,8 +56,9 @@ struct pci_access { /* Fields used internally: */ struct pci_methods *methods; - char *nl_list; /* Name list cache */ - struct nl_entry **nl_hash; + struct id_entry **id_hash; /* names.c */ + struct id_bucket *current_id_bucket; + int hash_load_failed; int fd; /* proc: fd */ int fd_rw; /* proc: fd opened read-write */ struct pci_dev *cached_dev; /* proc: device the fd is for */ @@ -86,7 +72,7 @@ void pci_cleanup(struct pci_access *); /* Scanning of devices */ void pci_scan_bus(struct pci_access *acc); -struct pci_dev *pci_get_dev(struct pci_access *acc, int bus, int dev, int func); /* Raw access to specified device */ +struct pci_dev *pci_get_dev(struct pci_access *acc, int domain, int bus, int dev, int func); /* Raw access to specified device */ void pci_free_dev(struct pci_dev *); /* @@ -95,12 +81,13 @@ void pci_free_dev(struct pci_dev *); struct pci_dev { struct pci_dev *next; /* Next device in the chain */ - word bus; /* Higher byte can select host bridges */ - byte dev, func; /* Device and function */ + u16 domain; /* PCI domain (host bridge) */ + u8 bus, dev, func; /* Bus inside domain, device and function */ /* These fields are set by pci_fill_info() */ int known_fields; /* Set of info fields already known */ - word vendor_id, device_id; /* Identity of the device */ + u16 vendor_id, device_id; /* Identity of the device */ + u16 device_class; /* PCI device class */ int irq; /* IRQ number */ pciaddr_t base_addr[6]; /* Base addresses */ pciaddr_t size[6]; /* Region sizes */ @@ -110,23 +97,23 @@ struct pci_dev { /* Fields used internally: */ struct pci_access *access; struct pci_methods *methods; - byte *cache; /* Cached information */ + u8 *cache; /* Cached config registers */ int cache_len; - int hdrtype; /* Direct methods: header type */ + int hdrtype; /* Cached low 7 bits of header type, -1 if unknown */ void *aux; /* Auxillary data */ }; #define PCI_ADDR_IO_MASK (~(pciaddr_t) 0x3) #define PCI_ADDR_MEM_MASK (~(pciaddr_t) 0xf) -byte pci_read_byte(struct pci_dev *, int pos); /* Access to configuration space */ -word pci_read_word(struct pci_dev *, int pos); +u8 pci_read_byte(struct pci_dev *, int pos); /* Access to configuration space */ +u16 pci_read_word(struct pci_dev *, int pos); u32 pci_read_long(struct pci_dev *, int pos); -int pci_read_block(struct pci_dev *, int pos, byte *buf, int len); -int pci_write_byte(struct pci_dev *, int pos, byte data); -int pci_write_word(struct pci_dev *, int pos, word data); +int pci_read_block(struct pci_dev *, int pos, u8 *buf, int len); +int pci_write_byte(struct pci_dev *, int pos, u8 data); +int pci_write_word(struct pci_dev *, int pos, u16 data); int pci_write_long(struct pci_dev *, int pos, u32 data); -int pci_write_block(struct pci_dev *, int pos, byte *buf, int len); +int pci_write_block(struct pci_dev *, int pos, u8 *buf, int len); int pci_fill_info(struct pci_dev *, int flags); /* Fill in device information */ @@ -135,16 +122,17 @@ int pci_fill_info(struct pci_dev *, int flags); /* Fill in device information */ #define PCI_FILL_BASES 4 #define PCI_FILL_ROM_BASE 8 #define PCI_FILL_SIZES 16 +#define PCI_FILL_CLASS 32 #define PCI_FILL_RESCAN 0x10000 -void pci_setup_cache(struct pci_dev *, byte *cache, int len); +void pci_setup_cache(struct pci_dev *, u8 *cache, int len); /* * Filters */ struct pci_filter { - int bus, slot, func; /* -1 = ANY */ + int domain, bus, slot, func; /* -1 = ANY */ int vendor, device; }; @@ -154,16 +142,36 @@ char *pci_filter_parse_id(struct pci_filter *, char *); int pci_filter_match(struct pci_filter *, struct pci_dev *); /* - * Device names + * Conversion of PCI ID's to names (according to the pci.ids file) + * + * Call pci_lookup_name() to identify different types of ID's: + * + * VENDOR (vendorID) -> vendor + * DEVICE (vendorID, deviceID) -> device + * VENDOR | DEVICE (vendorID, deviceID) -> combined vendor and device + * SUBSYSTEM | VENDOR (subvendorID) -> subsystem vendor + * SUBSYSTEM | DEVICE (vendorID, deviceID, subvendorID, subdevID) -> subsystem device + * SUBSYSTEM | VENDOR | DEVICE (vendorID, deviceID, subvendorID, subdevID) -> combined subsystem v+d + * SUBSYSTEM | ... (-1, -1, subvendorID, subdevID) -> generic subsystem + * CLASS (classID) -> class + * PROGIF (classID, progif) -> programming interface */ -char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, u32 arg1, u32 arg2); -void pci_free_name_list(struct pci_access *a); - -#define PCI_LOOKUP_VENDOR 1 -#define PCI_LOOKUP_DEVICE 2 -#define PCI_LOOKUP_CLASS 4 -#define PCI_LOOKUP_SUBSYSTEM 8 -#define PCI_LOOKUP_NUMERIC 0x10000 +char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, ...); + +int pci_load_name_list(struct pci_access *a); /* Called automatically by pci_lookup_*() when needed; returns success */ +void pci_free_name_list(struct pci_access *a); /* Called automatically by pci_cleanup() */ +void pci_set_name_list_path(struct pci_access *a, char *name, int to_be_freed); + +enum pci_lookup_mode { + PCI_LOOKUP_VENDOR = 1, /* Vendor name (args: vendorID) */ + PCI_LOOKUP_DEVICE = 2, /* Device name (args: vendorID, deviceID) */ + PCI_LOOKUP_CLASS = 4, /* Device class (args: classID) */ + PCI_LOOKUP_SUBSYSTEM = 8, + PCI_LOOKUP_PROGIF = 16, /* Programming interface (args: classID, prog_if) */ + PCI_LOOKUP_NUMERIC = 0x10000, /* Want only formatted numbers; default if access->numeric_ids is set */ + PCI_LOOKUP_NO_NUMBERS = 0x20000, /* Return NULL if not found in the database; default is to print numerically */ + PCI_LOOKUP_MIXED = 0x40000, /* Include both numbers and names */ +}; #endif