From owner-svn-src-all@FreeBSD.ORG  Mon Nov  3 05:52:43 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98E1E1065689;
	Mon,  3 Nov 2008 05:52:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86F068FC1F;
	Mon,  3 Nov 2008 05:52:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA35qhPk057963;
	Mon, 3 Nov 2008 05:52:43 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA35qhCb057962;
	Mon, 3 Nov 2008 05:52:43 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200811030552.mA35qhCb057962@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 3 Nov 2008 05:52:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184579 - head/sys/dev/cardbus
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Nov 2008 05:52:43 -0000

Author: imp
Date: Mon Nov  3 05:52:43 2008
New Revision: 184579
URL: http://svn.freebsd.org/changeset/base/184579

Log:
  We can't mask out the higher order bits and have the size come out
  right...  Good thing the size was ignored...
  
  Where this macro is used, there's no reason to do it anyway.  There
  seems to have been some old-time confusion between the CIS pointer
  definition, and the BAR definitions at the base of this bug.

Modified:
  head/sys/dev/cardbus/cardbusreg.h

Modified: head/sys/dev/cardbus/cardbusreg.h
==============================================================================
--- head/sys/dev/cardbus/cardbusreg.h	Mon Nov  3 05:19:45 2008	(r184578)
+++ head/sys/dev/cardbus/cardbusreg.h	Mon Nov  3 05:52:43 2008	(r184579)
@@ -45,7 +45,7 @@
 #define	CARDBUS_EXROM_DATA_CODE_TYPE	0x14 /* Code Type */
 #define	CARDBUS_EXROM_DATA_INDICATOR	0x15 /* Indicator */
 
-#define	CARDBUS_MAPREG_MEM_ADDR_MASK	0x0ffffff0
+#define	CARDBUS_MAPREG_MEM_ADDR_MASK	0xfffffff0
 #define	CARDBUS_MAPREG_MEM_ADDR(mr)					\
 	((mr) & CARDBUS_MAPREG_MEM_ADDR_MASK)
 #define	CARDBUS_MAPREG_MEM_SIZE(mr)					\