ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/include/common/bmi_msg.h
diff --git a/chromeos/drivers/ath6kl/include/bmi_msg.h b/chromeos/drivers/ath6kl/include/common/bmi_msg.h
similarity index 88%
rename from chromeos/drivers/ath6kl/include/bmi_msg.h
rename to chromeos/drivers/ath6kl/include/common/bmi_msg.h
index 1f48389f96645f9dd2191b8f08bcd81338702511..f9687d325b2f0f9754037673e3aee91286c3467d 100644
--- a/chromeos/drivers/ath6kl/include/bmi_msg.h
+++ b/chromeos/drivers/ath6kl/include/common/bmi_msg.h
@@ -1,25 +1,31 @@
 //------------------------------------------------------------------------------
-// <copyright file="bmi_msg.h" company="Atheros">
-//    Copyright (c) 2004-2009 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;
+// Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
+//
+//
+// 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.
 //
-// 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.
 //
 //
-//------------------------------------------------------------------------------
-//==============================================================================
 // Author(s): ="Atheros"
-//==============================================================================
+//------------------------------------------------------------------------------
 
 #ifndef __BMI_MSG_H__
 #define __BMI_MSG_H__
 
+#ifndef ATH_TARGET
+#include "athstartpack.h"
+#endif
+
 /*
  * Bootloader Messaging Interface (BMI)
  *
@@ -139,11 +145,11 @@
          *    struct bmi_target_info;
          */
 
-struct bmi_target_info {
+PREPACK struct bmi_target_info {
     A_UINT32 target_info_byte_count; /* size of this structure */
     A_UINT32 target_ver;             /* Target Version ID */
     A_UINT32 target_type;            /* Target type */
-};
+} POSTPACK;
 #define TARGET_VERSION_SENTINAL 0xffffffff
 #define TARGET_TYPE_AR6001 1
 #define TARGET_TYPE_AR6002 2
@@ -228,4 +234,8 @@ struct bmi_target_info {
          * Note: Not supported on all versions of ROM firmware.
          */
 
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
+
 #endif /* __BMI_MSG_H__ */