From owner-svn-src-head@FreeBSD.ORG  Wed Mar 11 08:14:44 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA7951065676;
	Wed, 11 Mar 2009 08:14: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 C5D408FC18;
	Wed, 11 Mar 2009 08:14:44 +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 n2B8EidY088734;
	Wed, 11 Mar 2009 08:14:44 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2B8EiGV088733;
	Wed, 11 Mar 2009 08:14:44 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200903110814.n2B8EiGV088733@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 11 Mar 2009 08:14: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: r189682 - head/sys/dev/pccard
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2009 08:14:47 -0000

Author: imp
Date: Wed Mar 11 08:14:44 2009
New Revision: 189682
URL: http://svn.freebsd.org/changeset/base/189682

Log:
  Allow zero length memroy space descriptor sections.  It is apparently
  legal in the spec.  Add newline to the verbose messages we print when
  debugging when this happens.  The Hitachi HT-4840-11 is the only card
  to hit these in years, and it works well enough if we're liberal about
  what we accept.

Modified:
  head/sys/dev/pccard/pccard_cis.c

Modified: head/sys/dev/pccard/pccard_cis.c
==============================================================================
--- head/sys/dev/pccard/pccard_cis.c	Wed Mar 11 08:12:28 2009	(r189681)
+++ head/sys/dev/pccard/pccard_cis.c	Wed Mar 11 08:14:44 2009	(r189682)
@@ -1198,8 +1198,7 @@ pccard_parse_cis_tuple(const struct pcca
 
 					if (lengthsize == 0) {
 						DPRINTF(("cfe memspace "
-						    "lengthsize == 0"));
-						state->card->error++;
+						    "lengthsize == 0\n"));
 					}
 					for (i = 0; i < cfe->num_memspace; i++) {
 						if (lengthsize) {
@@ -1211,9 +1210,8 @@ pccard_parse_cis_tuple(const struct pcca
 							cfe->memspace[i].length = 0;
 						}
 						if (cfe->memspace[i].length == 0) {
-							DPRINTF(("cfe->memspace[%d].length == 0",
+							DPRINTF(("cfe->memspace[%d].length == 0\n",
 								 i));
-							state->card->error++;
 						}
 						if (cardaddrsize) {
 							cfe->memspace[i].cardaddr =