From 1cbf449b993aee7a2794aaa07c651a31aba2875e Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 20 Apr 1997 06:57:43 +0000 Subject: [PATCH] The bit of the cardbus bridge support code se and I have been able to agree on so far... :-) Reviewed by: se --- sys/dev/pci/pcireg.h | 8 +++++++- sys/pci/pcireg.h | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 2f1fcb5a3b48..815703c906c3 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id$ +** $Id: pcireg.h,v 1.12 1997/02/22 09:44:12 peter Exp $ ** ** Names for PCI configuration space registers. ** @@ -126,6 +126,7 @@ #define PCI_SUBCLASS_BRIDGE_MC 0x00030000 #define PCI_SUBCLASS_BRIDGE_PCI 0x00040000 #define PCI_SUBCLASS_BRIDGE_PCMCIA 0x00050000 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x00070000 #define PCI_SUBCLASS_BRIDGE_MISC 0x00800000 /* @@ -181,6 +182,11 @@ #define PCI_PPB_MEMBASE_EXTRACT(x) (((x) << 16) & 0xFFF00000) #define PCI_PPB_MEMLIMIT_EXTRACT(x) (((x) << 0) & 0xFFF00000 | 0x000FFFFF) +/* +** PCI-Cardbus bridge mapping registers +*/ +#define PCI_CARDBUS_SOCKET_REG 0x10 + /* ** Interrupt configuration register */ diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h index 2f1fcb5a3b48..815703c906c3 100644 --- a/sys/pci/pcireg.h +++ b/sys/pci/pcireg.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id$ +** $Id: pcireg.h,v 1.12 1997/02/22 09:44:12 peter Exp $ ** ** Names for PCI configuration space registers. ** @@ -126,6 +126,7 @@ #define PCI_SUBCLASS_BRIDGE_MC 0x00030000 #define PCI_SUBCLASS_BRIDGE_PCI 0x00040000 #define PCI_SUBCLASS_BRIDGE_PCMCIA 0x00050000 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x00070000 #define PCI_SUBCLASS_BRIDGE_MISC 0x00800000 /* @@ -181,6 +182,11 @@ #define PCI_PPB_MEMBASE_EXTRACT(x) (((x) << 16) & 0xFFF00000) #define PCI_PPB_MEMLIMIT_EXTRACT(x) (((x) << 0) & 0xFFF00000 | 0x000FFFFF) +/* +** PCI-Cardbus bridge mapping registers +*/ +#define PCI_CARDBUS_SOCKET_REG 0x10 + /* ** Interrupt configuration register */