From owner-p4-projects@FreeBSD.ORG  Wed Feb 23 21:38:46 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA8B216A4D0; Wed, 23 Feb 2005 21:38:45 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A741F16A4CE
	for <perforce@freebsd.org>; Wed, 23 Feb 2005 21:38:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D73443D49
	for <perforce@freebsd.org>; Wed, 23 Feb 2005 21:38:45 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1NLcjxp093063
	for <perforce@freebsd.org>; Wed, 23 Feb 2005 21:38:45 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1NLcjLd093060
	for perforce@freebsd.org; Wed, 23 Feb 2005 21:38:45 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 23 Feb 2005 21:38:45 GMT
Message-Id: <200502232138.j1NLcjLd093060@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 71688 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Feb 2005 21:38:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=71688

Change 71688 by sam@sam_ebb on 2005/02/23 21:37:54

	IFC

Affected files ...

.. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#5 integrate

Differences ...

==== //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.49 2005/02/06 21:03:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.50 2005/02/20 20:36:16 imp Exp $");
 
 /*
  * CIS Handling for the Cardbus Bus
@@ -402,9 +402,8 @@
     int len, uint8_t *tupledata, uint32_t start, uint32_t *off,
     struct tuple_callbacks *info)
 {
-	if (cardbus_cis_debug) {
+	if (cardbus_cis_debug)
 		printf("CIS reading done\n");
-	}
 	return (0);
 }
 
@@ -659,12 +658,16 @@
 
 	bzero(tupledata, MAXTUPLESIZE);
 	expect_linktarget = TRUE;
-	if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0)
+	if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0) {
+		device_printf(cbdev, "CIS pointer is 0!\n");
 		return (ENXIO);
+	}
 	off = 0;
 	res = cardbus_read_tuple_init(cbdev, child, &start, &rid);
-	if (res == NULL)
+	if (res == NULL) {
+		device_printf(cbdev, "Unable to allocate resources for CIS\n");
 		return (ENXIO);
+	}
 
 	do {
 		if (0 != cardbus_read_tuple(cbdev, child, res, start, &off,
@@ -683,6 +686,8 @@
 		expect_linktarget = decode_tuple(cbdev, child, tupleid, len,
 		    tupledata, start, &off, callbacks);
 		if (expect_linktarget != 0) {
+			device_printf(cbdev, "Parsing failed with %d\n",
+			    expect_linktarget);
 			cardbus_read_tuple_finish(cbdev, child, rid, res);
 			return (expect_linktarget);
 		}