diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-11-25 18:49:50 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-11-25 18:49:50 +0000 |
| commit | 486d3a4dd89dc87502297a8859f71bbf2e4e9a47 (patch) | |
| tree | b4b3374aa496f896b19aed29fbabd72c0c6d774e | |
| parent | 1de9c01bf7d0ad905eb29ebacbbdcda2d10597f8 (diff) | |
move some generic PCIe register flags used in wpi(4) and iwn(4)
into common pcireg.h
ok deraadt@, kettenis@, dlg@
| -rw-r--r-- | sys/dev/pci/if_iwnreg.h | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpireg.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcireg.h | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/sys/dev/pci/if_iwnreg.h b/sys/dev/pci/if_iwnreg.h index 9749cba0927..e8e9daf7901 100644 --- a/sys/dev/pci/if_iwnreg.h +++ b/sys/dev/pci/if_iwnreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnreg.h,v 1.17 2008/11/21 17:17:05 damien Exp $ */ +/* $OpenBSD: if_iwnreg.h,v 1.18 2008/11/25 18:49:49 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -36,13 +36,6 @@ /* Base Address Register. */ #define IWN_PCI_BAR0 PCI_MAPREG_START -/* Possible flags for PCIe Device Control Register (see PCIe 7.8.4) */ -#define PCI_PCIE_DCSR_ENA_NO_SNOOP (1 << 11) - -/* Possible flags for PCIe Link Control Register (see PCIe 7.8.7) */ -#define PCI_PCIE_LCSR_ASPM_L0S (1 << 0) -#define PCI_PCIE_LCSR_ASPM_L1 (1 << 1) - /* * Control and status registers. */ diff --git a/sys/dev/pci/if_wpireg.h b/sys/dev/pci/if_wpireg.h index b5f8ce53b8f..290714f7f4a 100644 --- a/sys/dev/pci/if_wpireg.h +++ b/sys/dev/pci/if_wpireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpireg.h,v 1.22 2008/11/09 10:00:17 damien Exp $ */ +/* $OpenBSD: if_wpireg.h,v 1.23 2008/11/25 18:49:49 damien Exp $ */ /*- * Copyright (c) 2006-2008 @@ -34,9 +34,6 @@ /* Base Address Register. */ #define WPI_PCI_BAR0 PCI_MAPREG_START -/* Possible flags for PCIe Link Control Register (see PCIe 7.8.7) */ -#define PCI_PCIE_LCSR_ASPM_L0S (1 << 0) - /* * Control and status registers. */ diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 142a7f259da..8c604fea5ed 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcireg.h,v 1.34 2007/11/26 13:20:28 jsg Exp $ */ +/* $OpenBSD: pcireg.h,v 1.35 2008/11/25 18:49:49 damien Exp $ */ /* $NetBSD: pcireg.h,v 1.26 2000/05/10 16:58:42 thorpej Exp $ */ /* @@ -512,8 +512,11 @@ typedef u_int8_t pci_revision_t; #define PCI_PCIE_XCAP_SI 0x01000000 #define PCI_PCIE_DCAP 0x04 #define PCI_PCIE_DCSR 0x08 +#define PCI_PCIE_DCSR_ENA_NO_SNOOP 0x00000800 #define PCI_PCIE_LCAP 0x0c #define PCI_PCIE_LCSR 0x10 +#define PCI_PCIE_LCSR_ASPM_L0S 0x00000001 +#define PCI_PCIE_LCSR_ASPM_L1 0x00000002 #define PCI_PCIE_SLCAP 0x14 #define PCI_PCIE_SLCAP_ABP 0x00000001 #define PCI_PCIE_SLCAP_PCP 0x00000002 |