update-pciids: Re-compress pci.ids if needed

[pciutils.git] / pciutils.h

diff --git a/pciutils.h b/pciutils.h
index fe0388d90c2e69d47d897489ca90e018163d668d..95c26e64f3d00e19c8b5424e65f3fd4112c3a290 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,38 +1,63 @@
 /*
- *     $Id: pciutils.h,v 1.1 1997/12/23 10:29:18 mj Exp $
+ *     The PCI Utilities -- Declarations
  *
- *     Linux PCI Utilities -- Declarations
+ *     Copyright (c) 1997--2018 Martin Mares <mj@ucw.cz>
  *
- *     Copyright (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Can be freely distributed and used under the terms of the GNU GPL v2+
  *
- *     Can be freely distributed and used under the terms of the GNU GPL.
+ *     SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include <linux/types.h>
+#include "lib/pci.h"
+#include "lib/sysdep.h"
 
-#if 1
-#define PROC_BUS_PCI "/proc/bus/pci"
-#define ETC_PCI_IDS "/etc/pci.ids"
-#else
-#define PROC_BUS_PCI "/tmp/bus/pci"
-#define ETC_PCI_IDS "pci.ids"
+/*
+ * gcc predefines macro __MINGW32__ for all MinGW targets.
+ * Including some MinGW header (e.g. windef.h) defines additional
+ * macro __MINGW32_MAJOR_VERSION (available for all MinGW targets).
+ */
+#if defined(PCI_OS_WINDOWS) && defined(__MINGW32__)
+#include <windef.h>
 #endif
 
-/* Types */
-
-typedef __u8 byte;
-typedef __u16 word;
-typedef __u32 u32;
+/*
+ * On Windows only MinGW 3.0 and higher versions provides <getopt.h>
+ * header file. Older MinGW versions and MSVC do not have it.
+ */
+#if defined(PCI_OS_WINDOWS) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 3)
+#include "compat/getopt.h"
+#else
+#include <unistd.h>
+#endif
 
-/* lspci.c */
+#define PCIUTILS_VERSION PCILIB_VERSION
 
-void *xmalloc(unsigned int);
+extern const char program_name[];
 
-/* names.c */
+void die(char *msg, ...) NONRET PCI_PRINTF(1,2);
+void *xmalloc(size_t howmuch);
+void *xrealloc(void *ptr, size_t howmuch);
+char *xstrdup(const char *str);
+int parse_generic_option(int i, struct pci_access *pacc, char *arg);
 
-extern int show_numeric_ids;
+#ifdef PCI_HAVE_PM_INTEL_CONF
+#define GENOPT_INTEL "H:"
+#define GENHELP_INTEL "-H <mode>\tUse direct hardware access (<mode> = 1 or 2)\n"
+#else
+#define GENOPT_INTEL
+#define GENHELP_INTEL
+#endif
+#if defined(PCI_HAVE_PM_DUMP) && !defined(PCIUTILS_SETPCI)
+#define GENOPT_DUMP "F:"
+#define GENHELP_DUMP "-F <file>\tRead PCI configuration dump from a given file\n"
+#else
+#define GENOPT_DUMP
+#define GENHELP_DUMP
+#endif
 
-char *lookup_vendor(word);
-char *lookup_device(word, word);
-char *lookup_device_full(word, word);
-char *lookup_class(word);
+#define GENERIC_OPTIONS "A:GO:" GENOPT_INTEL GENOPT_DUMP
+#define GENERIC_HELP \
+       "-A <method>\tUse the specified PCI access method (see `-A help' for a list)\n" \
+       "-O <par>=<val>\tSet PCI access parameter (see `-O help' for a list)\n" \
+       "-G\t\tEnable PCI access debugging\n" \
+       GENHELP_INTEL GENHELP_DUMP