Date: Thu, 17 Sep 2009 12:44:59 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r197271 - in stable/7/sys: . contrib/pf dev/pci Message-ID: <200909171244.n8HCix5Y056991@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Sep 17 12:44:58 2009 New Revision: 197271 URL: http://svn.freebsd.org/changeset/base/197271 Log: MFC r197077: pci: remove definitions of duplicate constants Suggested by: jhb Reviewed by: jhb Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/pci/pcireg.h stable/7/sys/dev/pci/pcivar.h Modified: stable/7/sys/dev/pci/pcireg.h ============================================================================== --- stable/7/sys/dev/pci/pcireg.h Thu Sep 17 12:41:27 2009 (r197270) +++ stable/7/sys/dev/pci/pcireg.h Thu Sep 17 12:44:58 2009 (r197271) @@ -39,11 +39,11 @@ */ /* some PCI bus constants */ - -#define PCI_BUSMAX 255 -#define PCI_SLOTMAX 31 -#define PCI_FUNCMAX 7 -#define PCI_REGMAX 255 +#define PCI_DOMAINMAX 65535 /* highest supported domain number */ +#define PCI_BUSMAX 255 /* highest supported bus number */ +#define PCI_SLOTMAX 31 /* highest supported slot number */ +#define PCI_FUNCMAX 7 /* highest supported function number */ +#define PCI_REGMAX 255 /* highest supported config register addr. */ #define PCI_MAXHDRTYPE 2 /* PCI config header registers for all devices */ Modified: stable/7/sys/dev/pci/pcivar.h ============================================================================== --- stable/7/sys/dev/pci/pcivar.h Thu Sep 17 12:41:27 2009 (r197270) +++ stable/7/sys/dev/pci/pcivar.h Thu Sep 17 12:44:58 2009 (r197271) @@ -33,13 +33,6 @@ #include <sys/queue.h> /* some PCI bus constants */ - -#define PCI_DOMAINMAX 65535 /* highest supported domain number */ -#define PCI_BUSMAX 255 /* highest supported bus number */ -#define PCI_SLOTMAX 31 /* highest supported slot number */ -#define PCI_FUNCMAX 7 /* highest supported function number */ -#define PCI_REGMAX 255 /* highest supported config register addr. */ - #define PCI_MAXMAPS_0 6 /* max. no. of memory/port maps */ #define PCI_MAXMAPS_1 2 /* max. no. of maps for PCI to PCI bridge */ #define PCI_MAXMAPS_2 1 /* max. no. of maps for CardBus bridge */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909171244.n8HCix5Y056991>