ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/include/common/dsetid.h
diff --git a/chromeos/drivers/ath6kl/include/dsetid.h b/chromeos/drivers/ath6kl/include/common/dsetid.h
similarity index 81%
rename from chromeos/drivers/ath6kl/include/dsetid.h
rename to chromeos/drivers/ath6kl/include/common/dsetid.h
index fc42fd20ba83f54d9c7530666b7a0df0c8245017..d08fdeb39ec31d46c66d6aa4fd84277536d579d6 100644
--- a/chromeos/drivers/ath6kl/include/dsetid.h
+++ b/chromeos/drivers/ath6kl/include/common/dsetid.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="dsetid.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.
 //
 //
 //------------------------------------------------------------------------------
@@ -21,6 +25,10 @@
 #ifndef __DSETID_H__
 #define __DSETID_H__
 
+#ifndef ATH_TARGET
+#include "athstartpack.h"
+#endif
+
 /* Well-known DataSet IDs */
 #define DSETID_UNUSED                     0x00000000
 #define DSETID_BOARD_DATA                 0x00000001 /* Cal and board data */
@@ -72,10 +80,10 @@
  *
  * This allows for patches to be stored in flash.
  */
-struct patch_s {
+PREPACK struct patch_s {
     A_UINT32 *address;
     A_UINT32  data;
-};
+} POSTPACK ;
 
 /*
  * Skip some patches.  Can be used to erase a single patch in a
@@ -119,4 +127,8 @@ struct patch_s {
  */
 #define DSETID_BPATCH_FLAG                0x80000000
 
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
+
 #endif /* __DSETID_H__ */