svn commit: r186642 - head/sys/dev/cardbus

Warner Losh imp at FreeBSD.org
Wed Dec 31 07:41:44 UTC 2008


Author: imp
Date: Wed Dec 31 07:41:42 2008
New Revision: 186642
URL: http://svn.freebsd.org/changeset/base/186642

Log:
  When no driver attaches to a card, don't power down the card.  We can
  now read config registers of cardbus cards that are inserted, but
  aren't attached to a driver.
  Also, add a power related comment...

Modified:
  head/sys/dev/cardbus/cardbus.c

Modified: head/sys/dev/cardbus/cardbus.c
==============================================================================
--- head/sys/dev/cardbus/cardbus.c	Wed Dec 31 07:39:23 2008	(r186641)
+++ head/sys/dev/cardbus/cardbus.c	Wed Dec 31 07:41:42 2008	(r186642)
@@ -207,7 +207,7 @@ cardbus_attach_card(device_t cbdev)
 	}
 	if (cardattached > 0)
 		return (0);
-	POWER_DISABLE_SOCKET(brdev, cbdev);
+/*	POWER_DISABLE_SOCKET(brdev, cbdev); */
 	return (ENOENT);
 }
 
@@ -269,6 +269,7 @@ cardbus_driver_added(device_t cbdev, dri
 	}
 	if (i > 0 && i == numdevs)
 		POWER_ENABLE_SOCKET(device_get_parent(cbdev), cbdev);
+	/* XXX Should I wait for power to become good? */
 	for (i = 0; i < numdevs; i++) {
 		dev = devlist[i];
 		if (device_get_state(dev) != DS_NOTPRESENT)


More information about the svn-src-head mailing list