diff options
| author | peter <peter@FreeBSD.org> | 2000-05-28 16:35:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-05-28 16:35:57 +0000 |
| commit | eda3ab65365eda15e04a893a46c7244b53638c94 (patch) | |
| tree | a75cd25e9649785a73bedb6d5cbf9fc20d6a036a /sys/dev/pci/pcireg.h | |
| parent | deeb13a8dbcfd2933374a20e990791e83cd77096 (diff) | |
| download | FreeBSD-src-eda3ab65365eda15e04a893a46c7244b53638c94.zip FreeBSD-src-eda3ab65365eda15e04a893a46c7244b53638c94.tar.gz | |
Encapsulate the old PCI compatability support and APIs completely under
"options COMPAT_OLDPCI". This option already existed, but now also tidies
up the declarations in #include <pci/pci*.h>. It is amazing how much stuff
was using the old pre-FreeBSD 3.x names and going silently undetected.
Diffstat (limited to 'sys/dev/pci/pcireg.h')
| -rw-r--r-- | sys/dev/pci/pcireg.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 0f6fb28..2a32f50 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,6 +1,3 @@ -#ifndef PCI_COMPAT -#define PCI_COMPAT -#endif /* * Copyright (c) 1997, Stefan Esser <se@freebsd.org> * All rights reserved. @@ -234,9 +231,13 @@ #define PCID_INTEL_SATURN 0x0483 #define PCID_INTEL_ORION 0x84c4 -/* for compatibility to FreeBSD-2.2 version of PCI code */ +/* for compatibility to FreeBSD-2.2 and 3.x versions of PCI code */ + +#if defined(_KERNEL) && !defined(KLD_MODULE) +#include "opt_compat_oldpci.h" +#endif -#ifdef PCI_COMPAT +#ifdef COMPAT_OLDPCI #define PCI_ID_REG 0x00 #define PCI_COMMAND_STATUS_REG 0x04 @@ -257,4 +258,4 @@ #define PCI_MAP_IO 0x00000001 #define PCI_INTERRUPT_REG 0x3c -#endif /* PCI_COMPAT */ +#endif /* COMPAT_OLDPCI */ |
