X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=pciutils.h;h=e433e6beea547b04e2a4ba2baf095a7e1235b9b7;hb=001b9ac6d7b706a223faa7d2dd1bd7d50393e2c9;hp=940810200f86b6b93ec57a4dc4aae15e889ce5ac;hpb=a0407443c25b4a1fcb3a37261a56ae48d65f447e;p=pciutils.git

diff --git a/pciutils.h b/pciutils.h
index 9408102..e433e6b 100644
--- a/pciutils.h
+++ b/pciutils.h
@@ -11,24 +11,20 @@
 
 #ifdef PCI_OS_WINDOWS
 #include "compat/getopt.h"
+#else
+#include <unistd.h>
 #endif
 
 #define PCIUTILS_VERSION PCILIB_VERSION
 
 extern const char program_name[];
 
-void die(char *msg, ...) NONRET;
+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);
 
-#ifdef PCI_HAVE_PM_LINUX_PROC
-#define GENOPT_PROC "P:"
-#define GENHELP_PROC "-P <dir>\tUse specified directory instead of " PCI_PATH_PROC_BUS_PCI "\n"
-#else
-#define GENOPT_PROC
-#define GENHELP_PROC
-#endif
 #ifdef PCI_HAVE_PM_INTEL_CONF
 #define GENOPT_INTEL "H:"
 #define GENHELP_INTEL "-H <mode>\tUse direct hardware access (<mode> = 1 or 2)\n"
@@ -36,16 +32,17 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENOPT_INTEL
 #define GENHELP_INTEL
 #endif
-#ifdef PCI_HAVE_PM_DUMP
+#if defined(PCI_HAVE_PM_DUMP) && !defined(PCIUTILS_SETPCI)
 #define GENOPT_DUMP "F:"
-#define GENHELP_DUMP "-F <file>\tRead configuration data from given file\n"
+#define GENHELP_DUMP "-F <file>\tRead PCI configuration dump from a given file\n"
 #else
 #define GENOPT_DUMP
 #define GENHELP_DUMP
 #endif
 
-#define GENERIC_OPTIONS "A:GO:" GENOPT_PROC GENOPT_INTEL GENOPT_DUMP
-#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_DUMP \
+#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" \
-	"-O <par>=<val>\tSet PCI access parameter (see `-O help' for a list)\n"
+	GENHELP_INTEL GENHELP_DUMP