PERFORCE change 71688 for review

[Sam Leffler]

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

Change 71688 by sam at 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);
 		}