X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Finternal.h;h=cae18007578f9362b6a87ab4be6fe4db397b8fb4;hb=087e22e7bfdfc3eb0664ac9cca571c3858d838c9;hp=ff86b2d4774337ee6956a0ec19b9aa9d69008f20;hpb=14d6c0a377eff7ac4f488a640249a25703725cac;p=pciutils.git diff --git a/lib/internal.h b/lib/internal.h index ff86b2d..cae1800 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -1,61 +1,13 @@ /* - * $Id: internal.h,v 1.4 2000/04/21 11:58:00 mj Exp $ + * The PCI Library -- Internal Stuff * - * The PCI Library -- Internal Include File - * - * Copyright (c) 1997--1999 Martin Mares + * Copyright (c) 1997--2004 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ #include "pci.h" - -#ifdef HAVE_PM_LINUX_BYTEORDER_H - -#include -#define cpu_to_le16 __cpu_to_le16 -#define cpu_to_le32 __cpu_to_le32 -#define le16_to_cpu __le16_to_cpu -#define le32_to_cpu __le32_to_cpu - -#else - -#ifdef OS_LINUX -#include -#define BYTE_ORDER __BYTE_ORDER -#define BIG_ENDIAN __BIG_ENDIAN -#endif - -#ifdef OS_FREEBSD -#include -#endif - -#if BYTE_ORDER == BIG_ENDIAN -#define cpu_to_le16 swab16 -#define cpu_to_le32 swab32 -#define le16_to_cpu swab16 -#define le32_to_cpu swab32 - -static inline word swab16(word w) -{ - return (w << 8) | ((w >> 8) & 0xff); -} - -static inline u32 swab32(u32 w) -{ - return ((w & 0xff000000) >> 24) | - ((w & 0x00ff0000) >> 8) | - ((w & 0x0000ff00) << 8) | - ((w & 0x000000ff) << 24); -} -#else -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#endif - -#endif +#include "sysdep.h" struct pci_methods { char *name; @@ -84,11 +36,4 @@ struct pci_dev *pci_alloc_dev(struct pci_access *); int pci_link_dev(struct pci_access *, struct pci_dev *); extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_linux_proc, - pm_syscalls, pm_fbsd_device, pm_aix_device, pm_dump; - -#ifdef __GNUC__ -#define UNUSED __attribute__((unused)) -#else -#define UNUSED -#define inline -#endif + pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_dump, pm_linux_sysfs;