libpci: Add separate file for bit manipulation functions

[pciutils.git] / lib / dump.c

diff --git a/lib/dump.c b/lib/dump.c
index 879c62449b27b62cb2adf965f17242b9c9e336c0..829071f4b2baf8471ddc7ff3b7393134e8513ef5 100644 (file)
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -3,7 +3,9 @@
  *
  *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
  *
  *
  *     Copyright (c) 1997--2008 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 v2+.
+ *
+ *     SPDX-License-Identifier: GPL-2.0-or-later

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -38,7 +40,7 @@ dump_alloc_data(struct pci_dev *dev, int len)
   dd->allocated = len;
   dd->len = 0;
   memset(dd->data, 0xff, len);
   dd->allocated = len;
   dd->len = 0;
   memset(dd->data, 0xff, len);

-  dev->aux = dd;
+  dev->backend_data = dd;

 }
 
 static int
 }
 
 static int


@@ -90,10 +92,12 @@ dump_init(struct pci_access *a)
       else if (!len)
        dev = NULL;
       else if (dev &&
       else if (!len)
        dev = NULL;
       else if (dev &&

-              (dump_validate(buf, "##: ") || dump_validate(buf, "###: ")) &&
+              (dump_validate(buf, "##: ") || dump_validate(buf, "###: ") || dump_validate(buf, "####: ") ||
+               dump_validate(buf, "#####: ") || dump_validate(buf, "######: ") ||
+               dump_validate(buf, "#######: ") || dump_validate(buf, "########: ")) &&

               sscanf(buf, "%x: ", &i) == 1)
        {
               sscanf(buf, "%x: ", &i) == 1)
        {

-         struct dump_data *dd = dev->aux;
+         struct dump_data *dd = dev->backend_data;

          z = strchr(buf, ' ') + 1;
          while (isxdigit(z[0]) && isxdigit(z[1]) && (!z[2] || z[2] == ' ') &&
                 sscanf(z, "%x", &j) == 1 && j < 256)
          z = strchr(buf, ' ') + 1;
          while (isxdigit(z[0]) && isxdigit(z[1]) && (!z[2] || z[2] == ' ') &&
                 sscanf(z, "%x", &j) == 1 && j < 256)


@@ -106,9 +110,9 @@ dump_init(struct pci_access *a)
              if (i >= dd->allocated)   /* Need to re-allocate the buffer */
                {
                  dump_alloc_data(dev, 4096);
              if (i >= dd->allocated)   /* Need to re-allocate the buffer */
                {
                  dump_alloc_data(dev, 4096);

-                 memcpy(((struct dump_data *) dev->aux)->data, dd->data, 256);
+                 memcpy(((struct dump_data *) dev->backend_data)->data, dd->data, 256);

                  pci_mfree(dd);
                  pci_mfree(dd);

-                 dd = dev->aux;
+                 dd = dev->backend_data;

                }
              dd->data[i++] = j;
              if (i > dd->len)
                }
              dd->data[i++] = j;
              if (i > dd->len)


@@ -141,14 +145,14 @@ static int
 dump_read(struct pci_dev *d, int pos, byte *buf, int len)
 {
   struct dump_data *dd;
 dump_read(struct pci_dev *d, int pos, byte *buf, int len)
 {
   struct dump_data *dd;

-  if (!(dd = d->aux))
+  if (!(dd = d->backend_data))

     {
       struct pci_dev *e = d->access->devices;
       while (e && (e->domain != d->domain || e->bus != d->bus || e->dev != d->dev || e->func != d->func))
        e = e->next;
       if (!e)
        return 0;
     {
       struct pci_dev *e = d->access->devices;
       while (e && (e->domain != d->domain || e->bus != d->bus || e->dev != d->dev || e->func != d->func))
        e = e->next;
       if (!e)
        return 0;

-      dd = e->aux;
+      dd = e->backend_data;

     }
   if (pos + len > dd->len)
     return 0;
     }
   if (pos + len > dd->len)
     return 0;


@@ -166,10 +170,10 @@ dump_write(struct pci_dev *d UNUSED, int pos UNUSED, byte *buf UNUSED, int len U
 static void
 dump_cleanup_dev(struct pci_dev *d)
 {
 static void
 dump_cleanup_dev(struct pci_dev *d)
 {

-  if (d->aux)
+  if (d->backend_data)

     {
     {

-      pci_mfree(d->aux);
-      d->aux = NULL;
+      pci_mfree(d->backend_data);
+      d->backend_data = NULL;

     }
 }
 
     }
 }