ath6kl: Bringing in the upstream version

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

 //------------------------------------------------------------------------------
-// <copyright file="targaddrs.h" company="Atheros">
-//    Copyright (c) 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.
+// Copyright (c) 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.
+//
+//
+//
+// Author(s): ="Atheros"
 //------------------------------------------------------------------------------
-//==============================================================================
-// Author(s): ="Atheros"
-//==============================================================================
 
 #ifndef __TARGADDRS_H__
 #define __TARGADDRS_H__
-#if defined(AR6001)
-#include "AR6001/addrs.h"
+
+#ifndef ATH_TARGET
+#include "athstartpack.h"
 #endif
+
 #if defined(AR6002)
 #include "AR6002/addrs.h"
 #endif
 
 /*
  * AR6K option bits, to enable/disable various features.
  * By default, all option bits are 0.
  * These bits can be set in LOCAL_SCRATCH register 0.
  */
 #define AR6K_OPTION_BMI_DISABLE      0x01 /* Disable BMI comm with Host */
@@ skipping 11 matching lines @@
  * symbol (see linker script).
  *
  * Host Interest is shared between Host and Target in order to coordinate
  * between the two, and is intended to remain constant (with additions only
  * at the end) across software releases.
  *
  * All addresses are available here so that it's possible to
  * write a single binary that works with all Target Types.
  * May be used in assembler code as well as C.
  */
-#define AR6001_HOST_INTEREST_ADDRESS    0x80000600
 #define AR6002_HOST_INTEREST_ADDRESS    0x00500400
 #define AR6003_HOST_INTEREST_ADDRESS    0x00540600
 
 
 #define HOST_INTEREST_MAX_SIZE          0x100
 
 #if !defined(__ASSEMBLER__)
 struct register_dump_s;
 struct dbglog_hdr_s;
 
 /*
  * These are items that the Host may need to access
  * via BMI or via the Diagnostic Window. The position
  * of items in this structure must remain constant
  * across firmware revisions!
  *
  * Types for each item must be fixed size across
  * target and host platforms.
  *
  * More items may be added at the end.
  */
-struct host_interest_s {
+PREPACK struct host_interest_s {
     /*
      * Pointer to application-defined area, if any.
      * Set by Target application during startup.
      */
     A_UINT32               hi_app_host_interest;                      /* 0x00 */
 
     /* Pointer to register dump area, valid after Target crash. */
     A_UINT32               hi_failure_state;                          /* 0x04 */
 
     /* Pointer to debug logging header */
@@ skipping 77 matching lines @@
     A_UINT32               hi_allocram_sz;                            /* 0x9c */
     A_UINT32               hi_hci_bridge_flags;                       /* 0xa0 */
     A_UINT32               hi_hci_uart_support_pins;                  /* 0xa4 */
         /* NOTE: byte [0] = RESET pin (bit 7 is polarity), bytes[1]..bytes[3] are for future use */
     A_UINT32               hi_hci_uart_pwr_mgmt_params;               /* 0xa8 */
         /* 0xa8 - [0]: 1 = enable, 0 = disable
          *        [1]: 0 = UART FC active low, 1 = UART FC active high
          * 0xa9 - [7:0]: wakeup timeout in ms
          * 0xaa, 0xab - [15:0]: idle timeout in ms
          */       
-};
+    /* Pointer to extended board Data  */
+    A_UINT32               hi_board_ext_data;                         /* 0xac */
+    A_UINT32               hi_board_ext_data_initialized;             /* 0xb0 */
+} POSTPACK;
 
 /* Bits defined in hi_option_flag */
 #define HI_OPTION_TIMER_WAR       0x01 /* Enable timer workaround */
 #define HI_OPTION_BMI_CRED_LIMIT  0x02 /* Limit BMI command credits */
 #define HI_OPTION_RELAY_DOT11_HDR 0x04 /* Relay Dot11 hdr to/from host */
 #define HI_OPTION_FW_MODE_LSB     0x08 /* low bit of MODE (see below) */
 #define HI_OPTION_FW_MODE_MSB     0x10 /* high bit of MODE (see below) */
 #define HI_OPTION_ENABLE_PROFILE  0x20 /* Enable CPU profiling */
 #define HI_OPTION_DISABLE_DBGLOG  0x40 /* Disable debug logging */
 #define HI_OPTION_SKIP_ERA_TRACKING  0x80 /* Skip Era Tracking */
 #define HI_OPTION_PAPRD_DISABLE      0x100 /* Disable PAPRD (debug) */
 
 /* 2 bits of hi_option_flag are used to represent 3 modes */
 #define HI_OPTION_FW_MODE_IBSS    0x0 /* IBSS Mode */
 #define HI_OPTION_FW_MODE_BSS_STA 0x1 /* STA Mode */
 #define HI_OPTION_FW_MODE_AP      0x2 /* AP Mode */
 
 /* Fw Mode Mask */
 #define HI_OPTION_FW_MODE_MASK    0x3
 #define HI_OPTION_FW_MODE_SHIFT   0x3
 
 /*
  * Intended for use by Host software, this macro returns the Target RAM
  * address of any item in the host_interest structure.
- * Example: target_addr = AR6001_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
+ * Example: target_addr = AR6002_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
  */
-#define AR6001_HOST_INTEREST_ITEM_ADDRESS(item) \
-    ((A_UINT32)&((((struct host_interest_s *)(AR6001_HOST_INTEREST_ADDRESS))->item)))
-
 #define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \
-    ((A_UINT32)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
+    (A_UINT32)((unsigned long)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
 
 #define AR6003_HOST_INTEREST_ITEM_ADDRESS(item) \
-    ((A_UINT32)&((((struct host_interest_s *)(AR6003_HOST_INTEREST_ADDRESS))->item)))
+    (A_UINT32)((unsigned long)&((((struct host_interest_s *)(AR6003_HOST_INTEREST_ADDRESS))->item)))
 
 #define HOST_INTEREST_DBGLOG_IS_ENABLED() \
         (!(HOST_INTEREST->hi_option_flag & HI_OPTION_DISABLE_DBGLOG))
 
 #define HOST_INTEREST_PROFILE_IS_ENABLED() \
         (HOST_INTEREST->hi_option_flag & HI_OPTION_ENABLE_PROFILE)
 
 /* Convert a Target virtual address into a Target physical address */
-#define AR6001_VTOP(vaddr) ((vaddr) & 0x0fffffff)
 #define AR6002_VTOP(vaddr) ((vaddr) & 0x001fffff)
 #define AR6003_VTOP(vaddr) ((vaddr) & 0x001fffff)
 #define TARG_VTOP(TargetType, vaddr) \
-        (((TargetType) == TARGET_TYPE_AR6001) ? AR6001_VTOP(vaddr) : \
-        (((TargetType) == TARGET_TYPE_AR6002) ? AR6002_VTOP(vaddr) : AR6003_VTOP(vaddr)))
+        (((TargetType) == TARGET_TYPE_AR6002) ? AR6002_VTOP(vaddr) : AR6003_VTOP(vaddr))
 
 /* override REV2 ROM's app start address */
 #define AR6002_REV2_APP_START_OVERRIDE    0x911A00
 #define AR6003_REV1_APP_START_OVERRIDE    0x944c00
 #define AR6003_REV1_OTP_DATA_ADDRESS      0x542800
 #define AR6003_REV2_APP_START_OVERRIDE    0x945000
 #define AR6003_REV2_OTP_DATA_ADDRESS      0x543800
+#define AR6003_BOARD_EXT_DATA_ADDRESS     0x57E600
 
 
 /* # of A_UINT32 entries in targregs, used by DIAG_FETCH_TARG_REGS */
 #define AR6003_FETCH_TARG_REGS_COUNT 64
 
 #endif /* !__ASSEMBLER__ */
 
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
+
 #endif /* __TARGADDRS_H__ */