X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pciutils.h;h=1f347a588d4398be3b7e11b264d29d65e0027363;hb=04885ef71099072b54bba3a6f47e3fd6590e3a23;hp=4e2610884752ea6222c6ef5691863de006bcfefc;hpb=6ece6bc6bf4741318d53b298f848b549d063b9f6;p=pciutils.git

diff --git a/pciutils.h b/pciutils.h
index 4e26108..1f347a5 100644
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,57 +1,46 @@
 /*
- *	$Id: pciutils.h,v 1.11 1999/01/19 21:24:42 mj Exp $
+ *	The PCI Utilities -- Declarations
  *
- *	Linux PCI Utilities -- Declarations
- *
- *	Copyright (c) 1997, 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *	Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#include <linux/types.h>
+#include "lib/pci.h"
+#include "lib/sysdep.h"
 
-#ifdef KERNEL_PCI_H
-#include <linux/pci.h>
-#else
-#include "pci.h"
+#ifdef PCI_OS_WINDOWS
+#include "compat/getopt.h"
 #endif
 
-#define PCIUTILS_VERSION "1.10"
-
-#define PROC_BUS_PCI "/proc/bus/pci"
-#define ETC_PCI_IDS "/usr/share/pci.ids"
-
-/* Types */
-
-typedef __u8 byte;
-typedef __u16 word;
-typedef __u32 u32;
-
-/* lspci.c */
-
-void *xmalloc(unsigned int);
+#define PCIUTILS_VERSION PCILIB_VERSION
 
-/* names.c */
+extern const char program_name[];
 
-extern int show_numeric_ids;
-extern char *pci_ids;
+void die(char *msg, ...) NONRET PCI_PRINTF(1,2);
+void *xmalloc(unsigned int howmuch);
+void *xrealloc(void *ptr, unsigned int howmuch);
+char *xstrdup(char *str);
+int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 
-char *lookup_vendor(word);
-char *lookup_device(word, word);
-char *lookup_device_full(word, word);
-char *lookup_class(word);
-char *lookup_subsys_vendor(word);
-char *lookup_subsys_device(word, word);
-char *lookup_subsys_device_full(word, word);
-
-/* filter.c */
-
-struct pci_filter {
-  int bus, slot, func;			/* -1 = ANY */
-  int vendor, device;
-};
+#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
 
-void filter_init(struct pci_filter *);
-char *filter_parse_slot(struct pci_filter *, char *);
-char *filter_parse_id(struct pci_filter *, char *);
-int filter_match(struct pci_filter *, byte bus, byte devfn, word vendid, word devid);
+#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