ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/common/dbglog_id.h

Index: chromeos/drivers/ath6kl/include/common/dbglog_id.h
diff --git a/chromeos/drivers/ath6kl/include/dbglog_id.h b/chromeos/drivers/ath6kl/include/common/dbglog_id.h
similarity index 92%
rename from chromeos/drivers/ath6kl/include/dbglog_id.h
rename to chromeos/drivers/ath6kl/include/common/dbglog_id.h
index 72b048c24cfb98756d084f8285ec791a2dd85566..15ef829cab207187061a2e7f95a57326333124e9 100644
--- a/chromeos/drivers/ath6kl/include/dbglog_id.h
+++ b/chromeos/drivers/ath6kl/include/common/dbglog_id.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="dbglog_id.h" company="Atheros">
-//    Copyright (c) 2004-2007 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.
 //
 //
 //------------------------------------------------------------------------------
@@ -92,6 +96,22 @@ extern "C" {
 /* MISC debug identifier definitions */
 #define MISC_DBGID_DEFINITION_START
 #define MISC_WLAN_SCHEDULER_EVENT_REGISTER_ERROR     1
+#define TLPM_INIT                                    2
+#define TLPM_FILTER_POWER_STATE                      3
+#define TLPM_NOTIFY_NOT_IDLE                         4
+#define TLPM_TIMEOUT_IDLE_HANDLER                    5
+#define TLPM_TIMEOUT_WAKEUP_HANDLER                  6
+#define TLPM_WAKEUP_SIGNAL_HANDLER                   7
+#define TLPM_UNEXPECTED_GPIO_INTR_ERROR              8
+#define TLPM_BREAK_ON_NOT_RECEIVED_ERROR             9
+#define TLPM_BREAK_OFF_NOT_RECIVED_ERROR             10
+#define TLPM_ACK_GPIO_INTR                           11
+#define TLPM_ON                                      12
+#define TLPM_OFF                                     13
+#define TLPM_WAKEUP_FROM_HOST                        14
+#define TLPM_WAKEUP_FROM_BT                          15 
+#define TLPM_TX_BREAK_RECIVED                        16
+#define TLPM_IDLE_TIMER_NOT_RUNNING                  17
 #define MISC_DBGID_DEFINITION_END
     
 /* TXRX debug identifier definitions */
@@ -143,10 +163,11 @@ extern "C" {
 #define TXRX_MGMTBUF_DEQUEUE_FROM_HW_SFQ             19
 #define TXRX_MGMTBUF_PAUSE_HW_TXQ                    20
 #define TXRX_MGMTBUF_RESUME_HW_TXQ                   21
-#define TXRX_MGMTBUF_TEAR_DOWN_BA					 22
-#define TXRX_MGMTBUF_PROCESS_ADDBA_REQ				 23
-#define TXRX_MGMTBUF_PROCESS_DELBA					 24
+#define TXRX_MGMTBUF_TEAR_DOWN_BA                    22
+#define TXRX_MGMTBUF_PROCESS_ADDBA_REQ               23
+#define TXRX_MGMTBUF_PROCESS_DELBA                   24
 #define TXRX_MGMTBUF_PERFORM_BA                      25
+#define TXRX_MGMTBUF_WLAN_RESET_ON_ERROR             26 
 #define TXRX_MGMTBUF_DBGID_DEFINITION_END
 
 /* PM (Power Module) debug identifier definitions */
@@ -527,26 +548,9 @@ extern "C" {
 #define BTCOEX_DBG_SCO_STOMP_LOW_PRI               185
 #define BTCOEX_DBG_A2DP_FORCE_SCAN                 186
 #define BTCOEX_DBG_DTIM_STOMP_COMP                 187
+#define BTCOEX_ACL_PRESENCE_TIMER                  188
 #define BTCOEX_DBGID_DEFINITION_END
 
-#define TLPM_DBGID_DEFINITION_START
-#define TLPM_INIT                                  1
-#define TLPM_FILTER_POWER_STATE                    2
-#define TLPM_NOTIFY_NOT_IDLE                       3
-#define TLPM_TIMEOUT_IDLE_HANDLER                  4
-#define TLPM_TIMEOUT_WAKEUP_HANDLER                5
-#define TLPM_WAKEUP_SIGNAL_HANDLER                 6
-#define TLPM_UNEXPECTED_GPIO_INTR_ERROR            7
-#define TLPM_BREAK_ON_NOT_RECEIVED_ERROR           8
-#define TLPM_BREAK_OFF_NOT_RECIVED_ERROR           9
-#define TLPM_ACK_GPIO_INTR                         10
-#define TLPM_ON                                    11
-#define TLPM_OFF                                   12
-#define TLPM_WAKEUP_FROM_HOST                      13
-#define TLPM_WAKEUP_FROM_BT                        14 
-#define TLPM_TX_BREAK_RECIVED                      15
-#define TLPM_DBGID_DEFINITION_END
-
 #ifdef __cplusplus
 }
 #endif