X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fathdebug.c;h=64a1228a82029cc8cca3c38ef0030e677fa50f80;hb=c5246021b7b8580c2aeb0a145903acc07d246ac1;hp=35ef0d0d6b0b840f63b4fae69a1396ea76c48ee8;hpb=76ef1fd56b0c633831e0d1ceb379c3790094717c;p=madwifi%2F.git

diff --git a/tools/athdebug.c b/tools/athdebug.c
index 35ef0d0..64a1228 100644
--- a/tools/athdebug.c
+++ b/tools/athdebug.c
@@ -52,7 +52,8 @@
 #include <getopt.h>
 #include <err.h>
 
-#define	N(a)	(sizeof(a)/sizeof(a[0]))
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 static const char *progname;
 
@@ -63,7 +64,7 @@ enum {
 	ATH_DEBUG_RECV_DESC	= 0x00000008,	/* recv descriptors */
 	ATH_DEBUG_RATE		= 0x00000010,	/* rate control */
 	ATH_DEBUG_RESET		= 0x00000020,	/* reset processing */
-	ATH_DEBUG_MODE		= 0x00000040,	/* mode init/setup */
+	ATH_DEBUG_SKB_REF	= 0x00000040,   /* skb ref counting */
 	ATH_DEBUG_BEACON	= 0x00000080,	/* beacon handling */
 	ATH_DEBUG_WATCHDOG	= 0x00000100,	/* watchdog timeout */
 	ATH_DEBUG_INTR		= 0x00001000,	/* ISR */
@@ -73,7 +74,7 @@ enum {
 	ATH_DEBUG_CALIBRATE	= 0x00010000,	/* periodic calibration */
 	ATH_DEBUG_KEYCACHE	= 0x00020000,	/* key cache management */
 	ATH_DEBUG_STATE		= 0x00040000,	/* 802.11 state transitions */
-	ATH_DEBUG_NODE		= 0x00080000,	/* node management */
+	ATH_DEBUG_TSF		= 0x00080000,	/* timestamp processing */
 	ATH_DEBUG_LED		= 0x00100000,	/* led management */
 	ATH_DEBUG_FF		= 0x00200000,	/* fast frames */
 	ATH_DEBUG_TURBO		= 0x00400000,	/* turbo/dynamic turbo */
@@ -86,7 +87,8 @@ enum {
 	ATH_DEBUG_TXBUF         = 0x20000000,   /* TX buffer usage/leak debugging */
 	ATH_DEBUG_SKB           = 0x40000000,   /* SKB usage/leak debugging [applies to all vaps] */
 	ATH_DEBUG_FATAL		= 0x80000000,	/* fatal errors */
-	ATH_DEBUG_ANY		= 0xffffffff
+	ATH_DEBUG_ANY		= 0xffffffff,
+	ATH_DEBUG_GLOBAL	= (ATH_DEBUG_SKB|ATH_DEBUG_SKB_REF)
 };
 
 static struct {
@@ -100,7 +102,6 @@ static struct {
 	{ "recv_desc",	 ATH_DEBUG_RECV_DESC, 	"recv descriptors" },
 	{ "rate",	 ATH_DEBUG_RATE, 	"rate control modules" },
 	{ "reset",	 ATH_DEBUG_RESET, 	"reset processing and initialization" },
-	{ "mode",	 ATH_DEBUG_MODE, 	"mode initialization and changes" },
 	{ "beacon",	 ATH_DEBUG_BEACON, 	"beacon handling" },
 	{ "watchdog",	 ATH_DEBUG_WATCHDOG, 	"watchdog timer" },
 	{ "intr",	 ATH_DEBUG_INTR, 	"interrupt processing" },
@@ -110,9 +111,10 @@ static struct {
 	{ "calibrate",	 ATH_DEBUG_CALIBRATE, 	"periodic re-calibration" },
 	{ "keycache",	 ATH_DEBUG_KEYCACHE, 	"key cache management" },
 	{ "state",	 ATH_DEBUG_STATE, 	"802.11 state transitions" },
-	{ "node",	 ATH_DEBUG_NODE, 	"node management" },
+	{ "tsf",	 ATH_DEBUG_TSF, 	"TSF and timestamp processing"},
 	{ "txbuf", 	 ATH_DEBUG_TXBUF,   	"ath_buf management" },
 	{ "skb",         ATH_DEBUG_SKB,         "skb management (affects all devs)" },
+	{ "skb_ref",     ATH_DEBUG_SKB_REF,     "skb ref counting (affects all devs)" },
 	{ "led",         ATH_DEBUG_LED, 	"led management" },
 	{ "ff",		 ATH_DEBUG_FF, 		"fast frame handling" },
 	{ "turbo",	 ATH_DEBUG_TURBO, 	"dynamic turbo handling" },
@@ -130,7 +132,7 @@ getflag(const char *name, int len)
 {
 	int i;
 
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		if (strncasecmp(flags[i].name, name, len) == 0)
 			return flags[i].bit;
 	return 0;
@@ -143,7 +145,7 @@ usage(void)
 
 	fprintf(stderr, "usage: %s [-i device] [(+/-) flags]\n", progname);
 	fprintf(stderr, "\twhere flags are:\n\n");
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		printf("\t%12s\t0x%08x\t%s\n", flags[i].name, flags[i].bit, flags[i].desc);
 	exit(-1);
 }
@@ -175,7 +177,7 @@ sysctlbyname(const char *oid0, void *oldp, size_t *oldlenp, void *newp,
 		if (fd == NULL)
 			return -1;
 		/* XXX: only handle ints */
-		if (fscanf(fd, "%u", (int *) oldp) != 1) {
+		if (fscanf(fd, "%u", (int *)oldp) != 1) {
 			fclose(fd);
 			return -1;
 		}
@@ -272,14 +274,14 @@ main(int argc, char *argv[])
 	} else
 		printf("%s: 0x%08x", oid, debug);
 	sep = "<";
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		if (debug & flags[i].bit) {
 			printf("%s%s", sep, flags[i].name);
 			sep = ",";
 		}
 	printf("%s\n", *sep != '<' ? ">" : "");
 	printf("Details:\n");
-	for (i = 0; i < N(flags); i++)
+	for (i = 0; i < ARRAY_SIZE(flags); i++)
 		printf("%12s %s 0x%08x - %s\n", flags[i].name, debug & flags[i].bit ? "+" : " ", flags[i].bit, flags[i].desc);
 	return 0;
 }