summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-11-23 23:09:45 +0000
committerimp <imp@FreeBSD.org>2002-11-23 23:09:45 +0000
commit6051661649a8eb28d7d818a06d24ca6585791f3c (patch)
treea1eaa7aa2af53edc30b69a4b6d406d54aebc9066 /sys
parentd3c6d000f7222049182f11e6007845d3f5d901a3 (diff)
downloadFreeBSD-src-6051661649a8eb28d7d818a06d24ca6585791f3c.zip
FreeBSD-src-6051661649a8eb28d7d818a06d24ca6585791f3c.tar.gz
Remove a comple of bogus debug printfs that snuck in during some
debugging I was doing 3 months ago :-(. Noticed by: scottl Aproved by: the re blanket (different than the security blanket).
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pccbb/pccbb.c2
-rw-r--r--sys/dev/pccbb/pccbbreg.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 3f4eea3..3ee2a7f 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -843,13 +843,11 @@ cbb_driver_added(device_t brdev, driver_t *driver)
if (devlist[tmp] == NULL)
/* NOTHING */;
else if (strcmp(driver->name, "cardbus") == 0) {
- printf("Adding cardbus\n");
sc->cbdev = devlist[tmp];
if (((sockstate & CBB_SOCKET_STAT_CD) == 0) &&
(sockstate & CBB_SOCKET_STAT_CB))
wake++;
} else if (strcmp(driver->name, "pccard") == 0) {
- printf("Adding pccard\n");
sc->pccarddev = devlist[tmp];
if (((sockstate & CBB_SOCKET_STAT_CD) == 0) &&
(sockstate & CBB_SOCKET_STAT_16BIT))
diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h
index 6dc29c9..d41cdeb 100644
--- a/sys/dev/pccbb/pccbbreg.h
+++ b/sys/dev/pccbb/pccbbreg.h
@@ -176,11 +176,12 @@
#define CBB_SOCKET_EVENT_CD1 0x02 /* Card Detect 1 */
#define CBB_SOCKET_EVENT_CD2 0x04 /* Card Detect 2 */
#define CBB_SOCKET_EVENT_CD 0x06 /* Card Detect all */
-#define CBB_SOCKET_EVENT_POWER 0x08 /* Power Cycle */
+#define CBB_SOCKET_EVENT_POWER 0x08 /* Power Cycle */
#define CBB_SOCKET_MASK_CSTS 0x01 /* Card Status Change */
#define CBB_SOCKET_MASK_CD 0x06 /* Card Detect */
#define CBB_SOCKET_MASK_POWER 0x08 /* Power Cycle */
+#define CBB_SOCKET_MASK_ALL 0x0F /* all of the above */
#define CBB_SOCKET_STAT_CARDSTS 0x00000001 /* Card Status Change */
#define CBB_SOCKET_STAT_CD1 0x00000002 /* Card Detect 1 */
@@ -202,8 +203,6 @@
#define CBB_SOCKET_STAT_XVSOCK 0x40000000 /* X.X V Socket */
#define CBB_SOCKET_STAT_YVSOCK 0x80000000 /* Y.Y V Socket */
-#define CBB_SOCKET_FORCE_BADVCC 0x0200 /* Bad Vcc Request */
-
#define CBB_SOCKET_CTRL_VPPMASK 0x07
#define CBB_SOCKET_CTRL_VPP_OFF 0x00
#define CBB_SOCKET_CTRL_VPP_12V 0x01
OpenPOWER on IntegriCloud