Index: ar5210.c
===================================================================
--- ar5210.c	(revision 1997)
+++ ar5210.c	(revision 2001)
@@ -1429,9 +1429,9 @@
 {
 #ifdef AR5K_DEBUG
 #define AR5K_PRINT_REGISTER(_x)						\
-	printf("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5210_##_x));
+	AR5K_PRINTF("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5210_##_x));
 
-	printf("DMA registers:\n");
+	AR5K_PRINT("DMA registers:\n");
 	AR5K_PRINT_REGISTER(TXDP0);
 	AR5K_PRINT_REGISTER(TXDP1);
 	AR5K_PRINT_REGISTER(CR);
@@ -1460,9 +1460,9 @@
 	AR5K_PRINT_REGISTER(GPIODO);
 	AR5K_PRINT_REGISTER(GPIODI);
 	AR5K_PRINT_REGISTER(SREV);
-	printf("\n");
+	AR5K_PRINT("\n");
 
-	printf("PCU registers:\n");
+	AR5K_PRINT("PCU registers:\n");
 	AR5K_PRINT_REGISTER(STA_ID0);
 	AR5K_PRINT_REGISTER(STA_ID1);
 	AR5K_PRINT_REGISTER(BSS_ID0);
@@ -1501,16 +1501,16 @@
 	AR5K_PRINT_REGISTER(FCS_FAIL);
 	AR5K_PRINT_REGISTER(BEACON_CNT);
 	AR5K_PRINT_REGISTER(KEYTABLE_0);
-	printf("\n");
+	AR5K_PRINT("\n");
 
-	printf("PHY registers:\n");
+	AR5K_PRINT("PHY registers:\n");
 	AR5K_PRINT_REGISTER(PHY(0));
 	AR5K_PRINT_REGISTER(PHY_FC);
 	AR5K_PRINT_REGISTER(PHY_AGC);
 	AR5K_PRINT_REGISTER(PHY_CHIP_ID);
 	AR5K_PRINT_REGISTER(PHY_ACTIVE);
 	AR5K_PRINT_REGISTER(PHY_AGCCTL);
-	printf("\n");
+	AR5K_PRINT("\n");
 #endif
 }
 
Index: ar5211.c
===================================================================
--- ar5211.c	(revision 1997)
+++ ar5211.c	(revision 2001)
@@ -1527,9 +1527,9 @@
 {
 #ifdef AR5K_DEBUG
 #define AR5K_PRINT_REGISTER(_x)						\
-	printf("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5211_##_x));
+	AR5K_PRINTF("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5211_##_x));
 
-	printf("MAC registers:\n");
+	AR5K_PRINT("MAC registers:\n");
 	AR5K_PRINT_REGISTER(CR);
 	AR5K_PRINT_REGISTER(CFG);
 	AR5K_PRINT_REGISTER(IER);
@@ -1592,9 +1592,9 @@
 	AR5K_PRINT_REGISTER(FCS_FAIL);
 	AR5K_PRINT_REGISTER(BEACON_CNT);
 	AR5K_PRINT_REGISTER(KEYTABLE_0);
-	printf("\n");
+	AR5K_PRINT("\n");
 
-	printf("PHY registers:\n");
+	AR5K_PRINT("PHY registers:\n");
 	AR5K_PRINT_REGISTER(PHY_TURBO);
 	AR5K_PRINT_REGISTER(PHY_AGC);
 	AR5K_PRINT_REGISTER(PHY_CHIP_ID);
@@ -1607,7 +1607,7 @@
 	AR5K_PRINT_REGISTER(PHY_RADAR);
 	AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_0);
 	AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_1);
-	printf("\n");
+	AR5K_PRINT("\n");
 #endif
 }
 
Index: ar5212.c
===================================================================
--- ar5212.c	(revision 1997)
+++ ar5212.c	(revision 2001)
@@ -1871,9 +1871,9 @@
 {
 #ifdef AR5K_DEBUG
 #define AR5K_PRINT_REGISTER(_x)						\
-	printf("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5212_##_x));
+	AR5K_PRINTF("(%s: %08x) ", #_x, AR5K_REG_READ(AR5K_AR5212_##_x));
 
-	printf("MAC registers:\n");
+	AR5K_PRINT("MAC registers:\n");
 	AR5K_PRINT_REGISTER(CR);
 	AR5K_PRINT_REGISTER(CFG);
 	AR5K_PRINT_REGISTER(IER);
@@ -1945,9 +1945,9 @@
 	AR5K_PRINT_REGISTER(TSF_PARM);
 	AR5K_PRINT_REGISTER(RATE_DUR_0);
 	AR5K_PRINT_REGISTER(KEYTABLE_0);
-	printf("\n");
+	AR5K_PRINT("\n");
 
-	printf("PHY registers:\n");
+	AR5K_PRINT("PHY registers:\n");
 	AR5K_PRINT_REGISTER(PHY_TURBO);
 	AR5K_PRINT_REGISTER(PHY_AGC);
 	AR5K_PRINT_REGISTER(PHY_TIMING_3);
@@ -1966,7 +1966,7 @@
 	AR5K_PRINT_REGISTER(PHY_RADAR);
 	AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_0);
 	AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_1);
-	printf("\n");
+	AR5K_PRINT("\n");
 #endif
 }
 
Index: opt_ah.h
===================================================================
--- opt_ah.h	(revision 1997)
+++ opt_ah.h	(revision 2001)
@@ -2,4 +2,4 @@
 #define SUPERCHANNEL    0
 
 /* Uncomment this for debuging (warning that results TOO much output) */
-//#define AR5K_DEBUG
+//#define AR5K_DEBUG	1
Index: ah_osdep.h
===================================================================
--- ah_osdep.h	(revision 1997)
+++ ah_osdep.h	(revision 2001)
@@ -44,8 +44,6 @@
 typedef u_int32_t AR5K_BUS_ADDR;
 #define bus_space_tag_t AR5K_BUS_TAG
 #define bus_space_handle_t AR5K_BUS_HANDLE
-//#define hz cpufreq_get(0) / 1000
-//#define tick 1000000 / hz
 
  /*
  * Linux uses __BIG_ENDIAN and __LITTLE_ENDIAN while BSD uses _foo