diff options
| author | imp <imp@FreeBSD.org> | 2002-03-07 08:10:42 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2002-03-07 08:10:42 +0000 |
| commit | de68624be2e6b9be491de054971a586780cb16a4 (patch) | |
| tree | 25ba5b74af24a994769d1c5250052d5cd187df8b /sys/dev/cardbus | |
| parent | 03b0ddafe21bf030535b665c826844d350ebf0a4 (diff) | |
| download | FreeBSD-src-de68624be2e6b9be491de054971a586780cb16a4.zip FreeBSD-src-de68624be2e6b9be491de054971a586780cb16a4.tar.gz | |
Implement hw.cardbus.debug and hw.cardbus.cis_debug to help debug some
of the cardbus problems that people may start seeing.
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 34 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbus_cis.c | 15 |
2 files changed, 25 insertions, 24 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index c6f1f8f..60baeb7 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -36,12 +36,11 @@ * Written by Jonathan Chen <jon@freebsd.org> */ -#define CARDBUS_DEBUG - #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> +#include <sys/sysctl.h> #include <sys/bus.h> #include <machine/bus.h> @@ -61,18 +60,25 @@ #include "card_if.h" #include "pcib_if.h" -#if defined CARDBUS_DEBUG -#define DPRINTF(a) printf a -#define DEVPRINTF(x) device_printf x -#else -#define DPRINTF(a) -#define DEVPRINTF(x) -#endif - -#if !defined(lint) -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); + +/* sysctl vars */ +SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters"); + +int cardbus_debug = 0; +TUNABLE_INT("hw.cardbus.debug", &cardbus_debug); +SYSCTL_INT(_hw_cardbus, OID_AUTO, debug, CTLFLAG_RW, + &cardbus_debug, 0, + "CardBus debug"); + +int cardbus_cis_debug = 0; +TUNABLE_INT("hw.cardbus.cis_debug", &cardbus_cis_debug); +SYSCTL_INT(_hw_cardbus, OID_AUTO, cis_debug, CTLFLAG_RW, + &cardbus_cis_debug, 0, + "CardBus CIS debug"); + +#define DPRINTF(a) if (cardbus_debug) printf a +#define DEVPRINTF(x) if (cardbus_debug) device_printf x static int cardbus_probe(device_t cbdev); static int cardbus_attach(device_t cbdev); diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c index 41d0a32..466a667 100644 --- a/sys/dev/cardbus/cardbus_cis.c +++ b/sys/dev/cardbus/cardbus_cis.c @@ -32,8 +32,6 @@ * CIS Handling for the Cardbus Bus */ -#define CARDBUS_DEBUG - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -54,16 +52,13 @@ #include "card_if.h" -#if defined CARDBUS_DEBUG -#define DPRINTF(a) printf a -#define DEVPRINTF(x) device_printf x -#else -#define DPRINTF(a) -#define DEVPRINTF(x) -#endif - __FBSDID("$FreeBSD$"); +extern int cardbus_cis_debug; + +#define DPRINTF(a) if (cardbus_cis_debug) printf a +#define DEVPRINTF(x) if (cardbus_cis_debug) device_printf x + #define DECODE_PARAMS \ (device_t cbdev, device_t child, int id, int len, \ u_int8_t *tupledata, u_int32_t start, u_int32_t *off, \ |
