From owner-svn-src-all@FreeBSD.ORG  Mon Jan 18 17:53:44 2010
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 BA0CC106568B;
	Mon, 18 Jan 2010 17:53:44 +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 A99218FC0C;
	Mon, 18 Jan 2010 17:53:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0IHriIW035104;
	Mon, 18 Jan 2010 17:53:44 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0IHrioQ035102;
	Mon, 18 Jan 2010 17:53:44 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001181753.o0IHrioQ035102@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 18 Jan 2010 17:53:44 +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: r202581 - head/sys/dev/cs
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, 18 Jan 2010 17:53:44 -0000

Author: imp
Date: Mon Jan 18 17:53:44 2010
New Revision: 202581
URL: http://svn.freebsd.org/changeset/base/202581

Log:
  Add a warning if we're inw'ing from an odd address.  This could happen
  due to a bug and might be the real basis for the cardbus workaround
  hack.

Modified:
  head/sys/dev/cs/if_csreg.h

Modified: head/sys/dev/cs/if_csreg.h
==============================================================================
--- head/sys/dev/cs/if_csreg.h	Mon Jan 18 17:52:57 2010	(r202580)
+++ head/sys/dev/cs/if_csreg.h	Mon Jan 18 17:53:44 2010	(r202581)
@@ -539,6 +539,8 @@
 static __inline uint16_t
 cs_inw(struct cs_softc *sc, int off)
 {
+	if (off & 1)
+		device_printf(sc->dev, "BUG: inw to an odd address.\n");
 	return ((inb(sc->nic_addr + off) & 0xff) |
 	    (inb(sc->nic_addr + off + 1) << 8));
 }