ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/a_debug.h

Index: chromeos/drivers/ath6kl/include/a_debug.h
diff --git a/chromeos/drivers/ath6kl/include/a_debug.h b/chromeos/drivers/ath6kl/include/a_debug.h
index f8f7a2cdf5d3fc1471fe041974d4d71ec353d014..5a1b01fbb93cc795aebbb952cb0b662860f34921 100644
--- a/chromeos/drivers/ath6kl/include/a_debug.h
+++ b/chromeos/drivers/ath6kl/include/a_debug.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="a_debug.h" company="Atheros">
-//    Copyright (c) 2004-2008 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
 // 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 //
 //------------------------------------------------------------------------------
@@ -137,7 +141,7 @@ typedef struct  _ATH_DEBUG_MODULE_DBG_INFO{
 #define GET_ATH_MODULE_DEBUG_VAR_MASK(s) _XGET_ATH_MODULE_NAME_DEBUG_(s).CurrentMask
 #define _XGET_ATH_MODULE_NAME_DEBUG_(s) debug_ ## s
 
-#ifdef DEBUG
+#ifdef ATH_DEBUG_MODULE
 
     /* for source files that will instantiate the debug variables */
 #define ATH_DEBUG_INSTANTIATE_MODULE_VAR(s,name,moddesc,initmask,count,descriptions) \
@@ -164,8 +168,8 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo);
 #define A_DUMP_MODULE_DEBUG_INFO(s) a_dump_module_debug_info(&(GET_ATH_MODULE_DEBUG_VAR_NAME(s)))
 #define A_REGISTER_MODULE_DEBUG_INFO(s) a_register_module_debug_info(&(GET_ATH_MODULE_DEBUG_VAR_NAME(s)))
 
-#else /* !DEBUG */
-    /* NON DEBUG */
+#else /* !ATH_DEBUG_MODULE */
+    /* NON ATH_DEBUG_MODULE */
 #define ATH_DEBUG_INSTANTIATE_MODULE_VAR(s,name,moddesc,initmask,count,descriptions)
 #define AR_DEBUG_LVL_CHECK(lvl) 0
 #define AR_DEBUG_PRINTBUF(buffer, length, desc)
@@ -205,7 +209,12 @@ void a_module_debug_support_cleanup(void);
 
 #ifdef WIN_NWF
 #include <debug_win.h>
-#endif 
+#endif
+
+#ifdef THREADX
+#define ATH_DEBUG_MAKE_MODULE_MASK(index)  (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index)))
+#include "../os/threadx/include/common/debug_threadx.h"
+#endif  
 
 
 #ifdef __cplusplus