diff options
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 2 | ||||
| -rw-r--r-- | sys/dev/pccbb/pccbbreg.h | 5 |
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 |
