Merge branch 'amiga'

[pciutils.git] / lib / pci.h

diff --git a/lib/pci.h b/lib/pci.h
index 2322bf73be8433875c8f4dde629f21d34aafbd47..447118cc37c7fed024b229f699ff2d4887400e64 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -51,6 +51,7 @@ enum pci_access_type {
   PCI_ACCESS_MMIO_TYPE1,               /* MMIO ports, type 1 */
   PCI_ACCESS_MMIO_TYPE1_EXT,           /* MMIO ports, type 1 extended */
   PCI_ACCESS_ECAM,                     /* PCIe ECAM via /dev/mem */
+  PCI_ACCESS_AOS_EXPANSION,            /* AmigaOS Expansion library */
   PCI_ACCESS_MAX
 };
 
@@ -81,16 +82,16 @@ struct pci_access {
   struct pci_param *params;
   struct id_entry **id_hash;           /* names.c */
   struct id_bucket *current_id_bucket;
-  int id_load_failed;
+  int id_load_attempted;
   int id_cache_status;                 /* 0=not read, 1=read, 2=dirty */
+  char *id_cache_name;
   struct udev *id_udev;                        /* names-hwdb.c */
   struct udev_hwdb *id_udev_hwdb;
   int fd;                              /* proc/sys: fd for config space */
   int fd_rw;                           /* proc/sys: fd opened read-write */
-  int fd_pos;                          /* proc/sys: current position */
   int fd_vpd;                          /* sys: fd for VPD */
   struct pci_dev *cached_dev;          /* proc/sys: device the fds are for */
-  void *aux;                           /* Auxiliary data for use by the back-end */
+  void *backend_data;                  /* Private data of the back end */
 };
 
 /* Initialize PCI access */
@@ -165,7 +166,7 @@ struct pci_dev {
   u8 *cache;                           /* Cached config registers */
   int cache_len;
   int hdrtype;                         /* Cached low 7 bits of header type, -1 if unknown */
-  void *aux;                           /* Auxiliary data for use by the back-end */
+  void *backend_data;                  /* Private data for of the back end */
   struct pci_property *properties;     /* A linked list of extra properties */
   struct pci_cap *last_cap;            /* Last capability in the list */
 };