svn commit: r237864 - in head/sys/dev/ath: . ath_hal

[Adrian Chadd]

Author: adrian
Date: Sun Jul  1 02:34:32 2012
New Revision: 237864
URL: http://svn.freebsd.org/changeset/base/237864

Log:
  Fix the HAL debugging to only use one bit to mark a message as unmaskable.
  
  Whilst I'm here, remove the duplication of the #define.

Modified:
  head/sys/dev/ath/ah_osdep.c
  head/sys/dev/ath/ath_hal/ah_debug.h

Modified: head/sys/dev/ath/ah_osdep.c
==============================================================================
--- head/sys/dev/ath/ah_osdep.c	Sun Jul  1 00:40:56 2012	(r237863)
+++ head/sys/dev/ath/ah_osdep.c	Sun Jul  1 02:34:32 2012	(r237864)
@@ -47,6 +47,7 @@
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
 #include <dev/ath/ath_hal/ah.h>
+#include <dev/ath/ath_hal/ah_debug.h>
 
 /*
  * WiSoC boards overload the bus tag with information about the
@@ -137,8 +138,6 @@ ath_hal_ether_sprintf(const u_int8_t *ma
 
 #ifdef AH_DEBUG
 
-/* This must match the definition in ath_hal/ah_debug.h */
-#define	HAL_DEBUG_UNMASKABLE	0xf0000000
 void
 DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
 {

Modified: head/sys/dev/ath/ath_hal/ah_debug.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_debug.h	Sun Jul  1 00:40:56 2012	(r237863)
+++ head/sys/dev/ath/ath_hal/ah_debug.h	Sun Jul  1 02:34:32 2012	(r237864)
@@ -48,7 +48,7 @@ enum {
 	HAL_DEBUG_DFS		= 0x00200000,	/* DFS debugging */
 	HAL_DEBUG_HANG		= 0x00400000,	/* BB/MAC hang debugging */
 
-	HAL_DEBUG_UNMASKABLE	= 0xf0000000,	/* always printed */
+	HAL_DEBUG_UNMASKABLE	= 0x80000000,	/* always printed */
 	HAL_DEBUG_ANY		= 0xffffffff
 };
 #endif /* _ATH_AH_DEBUG_H_ */