diff options
Diffstat (limited to 'pciutils.h')
| -rw-r--r-- | pciutils.h | 24 |
1 files changed, 10 insertions, 14 deletions
@@ -1,7 +1,7 @@ /* * The PCI Utilities -- Declarations * - * Copyright (c) 1997--2004 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. */ @@ -17,18 +17,11 @@ 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); 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,14 +29,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 "G" GENOPT_PROC GENOPT_INTEL GENOPT_DUMP -#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_DUMP \ - "-G\t\tEnable PCI access debugging\n" +#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 |