Module Name: src
Committed By: dyoung
Date: Fri Feb 26 00:38:14 UTC 2010
Modified Files:
src/sys/dev/pci: if_ex_pci.c pcireg.h
Log Message:
Move the definitions for PCI_BAR0, PCI_BAR1, PCI_BAR2, PCI_BAR3,
PCI_BAR4, and PCI_BAR5 to pcireg.h for re-use.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_ex_pci.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ex_pci.c
diff -u src/sys/dev/pci/if_ex_pci.c:1.50 src/sys/dev/pci/if_ex_pci.c:1.51
--- src/sys/dev/pci/if_ex_pci.c:1.50 Tue May 5 10:02:52 2009
+++ src/sys/dev/pci/if_ex_pci.c Fri Feb 26 00:38:14 2010
@@ -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 @@
{
#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
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.65 src/sys/dev/pci/pcireg.h:1.66
--- src/sys/dev/pci/pcireg.h:1.65 Tue Feb 23 19:28:00 2010
+++ src/sys/dev/pci/pcireg.h Fri Feb 26 00:38:14 2010
@@ -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 @@
#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
