lspci: Indent PCIe Capability DevCap2 & DevCtl2 correctly

[pciutils.git] / lib / access.c

diff --git a/lib/access.c b/lib/access.c
index 5683eac8dd96a7b3e1b9c493024e155c227af2dc..d9911292f2e05efef8ede4144a494c73be316f86 100644 (file)
--- a/lib/access.c
+++ b/lib/access.c
@@ -1,7 +1,7 @@
 /*
  *     The PCI Library -- User Access
  *
 /*
  *     The PCI Library -- User Access
  *

- *     Copyright (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2014 Martin Mares <mj@ucw.cz>

  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */


@@ -13,173 +13,6 @@
 
 #include "internal.h"
 
 
 #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_DUMP
-  &pm_dump,
-#else
-  NULL,
-#endif
-};
-
-struct pci_access *
-pci_alloc(void)
-{
-  struct pci_access *a = malloc(sizeof(struct pci_access));
-  int i;
-
-  bzero(a, sizeof(*a));
-  a->id_file_name = PCI_PATH_IDS;
-  for(i=0; i<PCI_ACCESS_MAX; i++)
-    if (pci_methods[i] && pci_methods[i]->config)
-      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; i<PCI_ACCESS_MAX; i++)
-       if (pci_methods[i])
-         {
-           a->debug("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_mfree(a);
-}
-

 void
 pci_scan_bus(struct pci_access *a)
 {
 void
 pci_scan_bus(struct pci_access *a)
 {


@@ -191,10 +24,11 @@ pci_alloc_dev(struct pci_access *a)
 {
   struct pci_dev *d = pci_malloc(a, sizeof(struct pci_dev));
 
 {
   struct pci_dev *d = pci_malloc(a, sizeof(struct pci_dev));
 

-  bzero(d, sizeof(*d));
+  memset(d, 0, sizeof(*d));

   d->access = a;
   d->methods = a->methods;
   d->hdrtype = -1;
   d->access = a;
   d->methods = a->methods;
   d->hdrtype = -1;

+  d->numa_node = -1;

   if (d->methods->init_dev)
     d->methods->init_dev(d);
   return d;
   if (d->methods->init_dev)
     d->methods->init_dev(d);
   return d;


@@ -206,6 +40,18 @@ pci_link_dev(struct pci_access *a, struct pci_dev *d)
   d->next = a->devices;
   a->devices = d;
 
   d->next = a->devices;
   a->devices = d;
 

+  /*
+   * Applications compiled with older versions of libpci do not expect
+   * 32-bit domain numbers. To keep them working, we keep a 16-bit
+   * version of the domain number at the previous location in struct
+   * pci_dev. This will keep backward compatibility on systems which
+   * don't require large domain numbers.
+   */
+  if (d->domain > 0xffff)
+    d->domain_16 = 0xffff;
+  else
+    d->domain_16 = d->domain;
+

   return 1;
 }
 
   return 1;
 }
 


@@ -225,6 +71,10 @@ void pci_free_dev(struct pci_dev *d)
 {
   if (d->methods->cleanup_dev)
     d->methods->cleanup_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);
 }
 
   pci_mfree(d);
 }
 


@@ -269,6 +119,12 @@ pci_read_block(struct pci_dev *d, int pos, byte *buf, int len)
   return d->methods->read(d, pos, buf, 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)
 {
 static inline int
 pci_write_data(struct pci_dev *d, void *buf, int pos, int len)
 {


@@ -311,18 +167,34 @@ pci_write_block(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 int
 }
 
 int

-pci_fill_info(struct pci_dev *d, int flags)
+pci_fill_info_v35(struct pci_dev *d, int flags)

 {
   if (flags & PCI_FILL_RESCAN)
     {
       flags &= ~PCI_FILL_RESCAN;
       d->known_fields = 0;
 {
   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;
 }
 
     }
   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 versions 3.2, 3.3, 3.4 and 3.5, the same has happened */
+STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v35(d, flags));
+DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v35);
+DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v35);
+DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v35);
+DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v35);
+DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v35);
+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);
+SYMBOL_VERSION(pci_fill_info_v33, pci_fill_info@LIBPCI_3.3);
+SYMBOL_VERSION(pci_fill_info_v34, pci_fill_info@LIBPCI_3.4);
+SYMBOL_VERSION(pci_fill_info_v35, pci_fill_info@@LIBPCI_3.5);
+

 void
 pci_setup_cache(struct pci_dev *d, byte *cache, int len)
 {
 void
 pci_setup_cache(struct pci_dev *d, byte *cache, int len)
 {