A few minor corrections to the IORESOURCE changes

diff --git a/lib/header.h b/lib/header.h
index 3c3664fe0c764fee66e1df4b506f6cd54f27fcaf..0183d1fa8ebc73ea43f22c4d58a6e5c0e63997fc 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -1237,6 +1237,6 @@
 #define PCI_VENDOR_ID_INTEL            0x8086
 #define PCI_VENDOR_ID_COMPAQ           0x0e11
 
-/* taken from <include/linux/ioport.h> */
+/* I/O resource flags, compatible with <include/linux/ioport.h> */
 
-#define IORESOURCE_PCI_EA_BEI          (1<<5)
+#define PCI_IORESOURCE_PCI_EA_BEI      (1<<5)

diff --git a/lib/internal.h b/lib/internal.h
index 7e101aba8b36d8749d6fccadab6a5b691d102c3c..f888b5135568cdde7ff96cf346882b21376bf124 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -70,6 +70,7 @@ int pci_fill_info_v31(struct pci_dev *, int flags) VERSIONED_ABI;
 int pci_fill_info_v32(struct pci_dev *, int flags) VERSIONED_ABI;
 int pci_fill_info_v33(struct pci_dev *, int flags) VERSIONED_ABI;
 int pci_fill_info_v34(struct pci_dev *, int flags) VERSIONED_ABI;
+int pci_fill_info_v35(struct pci_dev *, int flags) VERSIONED_ABI;
 
 /* params.c */
 void pci_define_param(struct pci_access *acc, char *param, char *val, char *help);

diff --git a/lib/pci.h b/lib/pci.h
index a86bfd7ea9b8ba4fe29427269357b5bc56b2069c..6d904ddc39a9ea965feec687bc0956c680158315 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -136,8 +136,8 @@ struct pci_dev {
   char *module_alias;                  /* Linux kernel module alias */
   char *label;                         /* Device name as exported by BIOS */
   int numa_node;                       /* NUMA node */
-  pciaddr_t flags[6];                  /* Region IORESOURCE flags */
-  pciaddr_t rom_flags;                 /* Expansion ROM IORESOURCE flags */
+  pciaddr_t flags[6];                  /* PCI_IORESOURCE_* flags for regions */
+  pciaddr_t rom_flags;                 /* PCI_IORESOURCE_* flags for expansion ROM */
 
   /* Fields used internally: */
   struct pci_access *access;

diff --git a/lspci.c b/lspci.c
index 52d14f30cf864d6350d1fcb9f25968b7a348a65b..5b6716e7f862c855d402642a6882a7ee6ab4cb54 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -365,7 +365,7 @@ show_bases(struct device *d, int cnt)
        printf("\tRegion %d: ", i);
       else
        putchar('\t');
-      if (ioflg & IORESOURCE_PCI_EA_BEI)
+      if (ioflg & PCI_IORESOURCE_PCI_EA_BEI)
          printf("[enhanced] ");
       else if (pos && !flg)    /* Reported by the OS, but not by the device */
        {
@@ -441,7 +441,7 @@ show_rom(struct device *d, int reg)
   if (!rom && !flg && !len)
     return;
   putchar('\t');
-  if (ioflg & IORESOURCE_PCI_EA_BEI)
+  if (ioflg & PCI_IORESOURCE_PCI_EA_BEI)
       printf("[enhanced] ");
   else if ((rom & PCI_ROM_ADDRESS_MASK) && !(flg & PCI_ROM_ADDRESS_MASK))
     {