Fix stripping in cross-compiling mode

[pciutils.git] / lib / access.c

diff --git a/lib/access.c b/lib/access.c
index b80969e023c08fbd29d340ffcf3352de5bdd00d8..b8fdbe2319b5a717ddadd6eda22dc9e039205508 100644 (file)
--- a/lib/access.c
+++ b/lib/access.c
@@ -1,9 +1,7 @@
 /*
 /*

- *     $Id: access.c,v 1.7 2000/04/21 11:58:00 mj Exp $
- *

  *     The PCI Library -- User Access
  *
  *     The PCI Library -- User Access
  *

- *     Copyright (c) 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997--2022 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.
  */


@@ -15,168 +13,6 @@
 
 #include "internal.h"
 
 
 #include "internal.h"
 

-static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
-  NULL,
-#ifdef HAVE_PM_LINUX_PROC
-  &pm_linux_proc,
-#else
-  NULL,
-#endif
-#ifdef HAVE_PM_SYSCALLS
-  &pm_syscalls,
-#else
-  NULL,
-#endif
-#ifdef HAVE_PM_INTEL_CONF
-  &pm_intel_conf1,
-  &pm_intel_conf2,
-#else
-  NULL,
-  NULL,
-#endif
-#ifdef HAVE_PM_FBSD_DEVICE
-  &pm_fbsd_device,
-#else
-  NULL,
-#endif
-#ifdef HAVE_PM_AIX_DEVICE
-  &pm_aix_device,
-#else
-  NULL,
-#endif
-#ifdef 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 = PATH_PCI_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 * UNUSED msg, ...)
-{
-}
-
-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)
 {


@@ -188,9 +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->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;


@@ -202,24 +40,52 @@ 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;
 }
 
 struct pci_dev *
   return 1;
 }
 
 struct pci_dev *

-pci_get_dev(struct pci_access *a, int bus, int dev, int func)
+pci_get_dev(struct pci_access *a, int domain, int bus, int dev, int func)

 {
   struct pci_dev *d = pci_alloc_dev(a);
 
 {
   struct pci_dev *d = pci_alloc_dev(a);
 

+  d->domain = domain;

   d->bus = bus;
   d->dev = dev;
   d->func = func;
   return d;
 }
 
   d->bus = bus;
   d->dev = dev;
   d->func = func;
   return d;
 }
 

+static void
+pci_free_properties(struct pci_dev *d)
+{
+  struct pci_property *p;
+
+  while (p = d->properties)
+    {
+      d->properties = p->next;
+      pci_mfree(p);
+    }
+}
+

 void pci_free_dev(struct pci_dev *d)
 {
   if (d->methods->cleanup_dev)
     d->methods->cleanup_dev(d);
 void pci_free_dev(struct pci_dev *d)
 {
   if (d->methods->cleanup_dev)
     d->methods->cleanup_dev(d);

+
+  pci_free_caps(d);
+  pci_free_properties(d);

   pci_mfree(d);
 }
 
   pci_mfree(d);
 }
 


@@ -264,6 +130,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)
 {


@@ -305,22 +177,92 @@ pci_write_block(struct pci_dev *d, int pos, byte *buf, int len)
   return d->methods->write(d, pos, buf, len);
 }
 
   return d->methods->write(d, pos, buf, len);
 }
 

+static void
+pci_reset_properties(struct pci_dev *d)
+{
+  d->known_fields = 0;
+  d->phy_slot = NULL;
+  d->module_alias = NULL;
+  d->label = NULL;
+  pci_free_caps(d);
+  pci_free_properties(d);
+}
+

 int
 int

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

 {
 {

-  if (flags & PCI_FILL_RESCAN)
+  unsigned int uflags = flags;
+  if (uflags & PCI_FILL_RESCAN)

     {
     {

-      flags &= ~PCI_FILL_RESCAN;
-      d->known_fields = 0;
+      uflags &= ~PCI_FILL_RESCAN;
+      pci_reset_properties(d);

     }
     }

-  if (flags & ~d->known_fields)
-    d->known_fields |= d->methods->fill_info(d, flags & ~d->known_fields);
+  if (uflags & ~d->known_fields)
+    d->methods->fill_info(d, uflags);

   return 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, 3.5 and 3.8, the same has happened */
+STATIC_ALIAS(int pci_fill_info(struct pci_dev *d, int flags), pci_fill_info_v38(d, flags));
+DEFINE_ALIAS(int pci_fill_info_v30(struct pci_dev *d, int flags), pci_fill_info_v38);
+DEFINE_ALIAS(int pci_fill_info_v31(struct pci_dev *d, int flags), pci_fill_info_v38);
+DEFINE_ALIAS(int pci_fill_info_v32(struct pci_dev *d, int flags), pci_fill_info_v38);
+DEFINE_ALIAS(int pci_fill_info_v33(struct pci_dev *d, int flags), pci_fill_info_v38);
+DEFINE_ALIAS(int pci_fill_info_v34(struct pci_dev *d, int flags), pci_fill_info_v38);
+DEFINE_ALIAS(int pci_fill_info_v35(struct pci_dev *d, int flags), pci_fill_info_v38);
+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);
+SYMBOL_VERSION(pci_fill_info_v38, pci_fill_info@@LIBPCI_3.8);
+

 void
 pci_setup_cache(struct pci_dev *d, byte *cache, int len)
 {
   d->cache = cache;
   d->cache_len = len;
 }
 void
 pci_setup_cache(struct pci_dev *d, byte *cache, int len)
 {
   d->cache = cache;
   d->cache_len = len;
 }

+
+char *
+pci_set_property(struct pci_dev *d, u32 key, char *value)
+{
+  struct pci_property *p;
+  struct pci_property **pp = &d->properties;
+
+  while (p = *pp)
+    {
+      if (p->key == key)
+       {
+         *pp = p->next;
+         pci_mfree(p);
+       }
+      else
+       pp = &p->next;
+    }
+
+  if (!value)
+    return NULL;
+
+  p = pci_malloc(d->access, sizeof(*p) + strlen(value));
+  *pp = p;
+  p->next = NULL;
+  p->key = key;
+  strcpy(p->value, value);
+
+  return p->value;
+}
+
+char *
+pci_get_string_property(struct pci_dev *d, u32 prop)
+{
+  struct pci_property *p;
+
+  for (p = d->properties; p; p = p->next)
+    if (p->key == prop)
+      return p->value;
+
+  return NULL;
+}