summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2010-02-26 00:38:14 +0000
committerdyoung <dyoung@NetBSD.org>2010-02-26 00:38:14 +0000
commiteb0836d9aee393314f75ad010574a6fa5fcc7bd0 (patch)
tree637db116e5215730a7985157ecfcd894457e257b /sys/dev
parent007ba6f7e25a600da4178b7f5f1d1010de70bcc9 (diff)
Move the definitions for PCI_BAR0, PCI_BAR1, PCI_BAR2, PCI_BAR3,
PCI_BAR4, and PCI_BAR5 to pcireg.h for re-use.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_ex_pci.c10
-rw-r--r--sys/dev/pci/pcireg.h9
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c
index 2cb0984cf28..7f0150d465c 100644
--- a/sys/dev/pci/if_ex_pci.c
+++ b/sys/dev/pci/if_ex_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.50 2009/05/05 10:02:52 cegger Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.51 2010/02/26 00:38:14 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.50 2009/05/05 10:02:52 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.51 2010/02/26 00:38:14 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,12 +326,6 @@ ex_d3tod0(pci_chipset_tag_t pc, pcitag_t tag, device_t self, pcireg_t state)
{
#define PCI_CACHE_LAT_BIST 0x0c
-#define PCI_BAR0 0x10
-#define PCI_BAR1 0x14
-#define PCI_BAR2 0x18
-#define PCI_BAR3 0x1C
-#define PCI_BAR4 0x20
-#define PCI_BAR5 0x24
#define PCI_EXP_ROM_BAR 0x30
#define PCI_INT_GNT_LAT 0x3c
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index e9ac2bd4dde..ec1056b5273 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.65 2010/02/23 19:28:00 dyoung Exp $ */
+/* $NetBSD: pcireg.h,v 1.66 2010/02/26 00:38:14 dyoung Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -358,6 +358,13 @@ typedef u_int8_t pci_revision_t;
#define PCI_MAPREG_PPB_END 0x18
#define PCI_MAPREG_PCB_END 0x14
+#define PCI_BAR0 0x10
+#define PCI_BAR1 0x14
+#define PCI_BAR2 0x18
+#define PCI_BAR3 0x1C
+#define PCI_BAR4 0x20
+#define PCI_BAR5 0x24
+
#define PCI_MAPREG_TYPE(mr) \
((mr) & PCI_MAPREG_TYPE_MASK)
#define PCI_MAPREG_TYPE_MASK 0x00000001