ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/include/common/dbglog.h
diff --git a/chromeos/drivers/ath6kl/include/dbglog.h b/chromeos/drivers/ath6kl/include/common/dbglog.h
similarity index 79%
rename from chromeos/drivers/ath6kl/include/dbglog.h
rename to chromeos/drivers/ath6kl/include/common/dbglog.h
index b56d00f49a54f1f909f1198648a229ca47d12c3f..382d9a2dd4eb93dbf5477a4dcc9db906b8395fd8 100644
--- a/chromeos/drivers/ath6kl/include/dbglog.h
+++ b/chromeos/drivers/ath6kl/include/common/dbglog.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="dbglog.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.
 //
 //
 //------------------------------------------------------------------------------
@@ -20,6 +24,10 @@
 #ifndef _DBGLOG_H_
 #define _DBGLOG_H_
 
+#ifndef ATH_TARGET
+#include "athstartpack.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -58,7 +66,6 @@ extern "C" {
 #define DBGLOG_MODULEID_MGMT                  13
 #define DBGLOG_MODULEID_TMR                   14
 #define DBGLOG_MODULEID_BTCOEX                15
-#define DBGLOG_MODULEID_TLPM                  2
 #define DBGLOG_MODULEID_END
 
 #define DBGLOG_NUM_ARGS_OFFSET             30
@@ -80,21 +87,21 @@ extern "C" {
 #define DBGLOG_LOG_BUFFER_SIZE             1500
 #define DBGLOG_DBGID_DEFINITION_LEN_MAX    90
 
-struct dbglog_buf_s {
+PREPACK struct dbglog_buf_s {
     struct dbglog_buf_s *next;
     A_UINT8             *buffer;
     A_UINT32             bufsize;
     A_UINT32             length;
     A_UINT32             count;
     A_UINT32             free;
-};
+} POSTPACK;
 
-struct dbglog_hdr_s {
+PREPACK struct dbglog_hdr_s {
     struct dbglog_buf_s *dbuf;
     A_UINT32             dropped;
-};
+} POSTPACK;
 
-struct dbglog_config_s {
+PREPACK struct dbglog_config_s {
     A_UINT32                    cfgvalid; /* Mask with valid config bits */
     union {
         /* TODO: Take care of endianness */
@@ -108,7 +115,7 @@ struct dbglog_config_s {
 
         A_UINT32                value;
     } u;
-};
+} POSTPACK;
 
 #define cfgmmask                   u.dbglog_config.mmask
 #define cfgrep                     u.dbglog_config.rep
@@ -120,4 +127,8 @@ struct dbglog_config_s {
 }
 #endif
 
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
+
 #endif /* _DBGLOG_H_ */