diff options
| author | Martin Mares <mj@ucw.cz> | 2017-02-24 21:23:53 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2017-02-24 21:23:53 +0100 |
| commit | 3f30d0d1fdd23bbf7fafa201eea0fe734ca841c6 (patch) | |
| tree | 96327ab2eb371a8f7b6dca748dbbc27e9e9ae251 | |
| parent | 2ee7d45ad76d7c455e9c8c008512f1ce3101b3f4 (diff) | |
| download | pciutils-3f30d0d1fdd23bbf7fafa201eea0fe734ca841c6.tar.gz | |
types.h: Provide u64 on all systems
Recent changes in lspci.c require u64 to be present regardless
of PCI_HAVE_64BIT_ADDRESS.
| -rw-r--r-- | lib/types.h | 24 | ||||
| -rw-r--r-- | lspci.c | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/types.h b/lib/types.h index 4d23e69..7011252 100644 --- a/lib/types.h +++ b/lib/types.h @@ -1,7 +1,7 @@ /* * The PCI Library -- Types and Format Strings * - * Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz> + * Copyright (c) 1997--2017 Martin Mares <mj@ucw.cz> * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -11,38 +11,48 @@ #ifndef PCI_HAVE_Uxx_TYPES #ifdef PCI_OS_WINDOWS +/* On Windows compilers, use <windef.h> */ #include <windef.h> typedef BYTE u8; typedef WORD u16; typedef DWORD u32; +typedef unsigned __int64 u64; +#define PCI_U64_FMT_X "I64x" + #elif defined(PCI_HAVE_STDINT_H) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) +/* Use standard types in C99 and newer */ #include <stdint.h> +#include <inttypes.h> typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; +typedef uint64_t u64; +#define PCI_U64_FMT_X PRIx64 + #else +/* Hope for POSIX types from <sys/types.h> */ typedef u_int8_t u8; typedef u_int16_t u16; typedef u_int32_t u32; -#endif -#ifdef PCI_HAVE_64BIT_ADDRESS +/* u64 will be unsigned (long) long */ #include <limits.h> #if ULONG_MAX > 0xffffffff typedef unsigned long u64; -#define PCI_U64_FMT "l" +#define PCI_U64_FMT_X "lx" #else typedef unsigned long long u64; -#define PCI_U64_FMT "ll" +#define PCI_U64_FMT_X "llx" #endif + #endif #endif /* PCI_HAVE_Uxx_TYPES */ #ifdef PCI_HAVE_64BIT_ADDRESS typedef u64 pciaddr_t; -#define PCIADDR_T_FMT "%08" PCI_U64_FMT "x" -#define PCIADDR_PORT_FMT "%04" PCI_U64_FMT "x" +#define PCIADDR_T_FMT "%08" PCI_U64_FMT_X +#define PCIADDR_PORT_FMT "%04" PCI_U64_FMT_X #else typedef u32 pciaddr_t; #define PCIADDR_T_FMT "%08x" @@ -359,7 +359,7 @@ show_range(char *prefix, u64 base, u64 limit, int is_64bit) printf("%s: ", prefix); if (is_64bit) - printf("%016" PCI_U64_FMT "x-%016" PCI_U64_FMT "x", base, limit); + printf("%016" PCI_U64_FMT_X "-%016" PCI_U64_FMT_X, base, limit); else printf("%08x-%08x", (unsigned) base, (unsigned) limit); if (base <= limit) |