ath6kl: Bringing in the upstream version

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

 //------------------------------------------------------------------------------
-// <copyright file="wmi.h" company="Atheros">
-//    Copyright (c) 2004-2008 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) 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.
+//
+//
+//
+// Author(s): ="Atheros"
 //------------------------------------------------------------------------------
-//==============================================================================
-// Author(s): ="Atheros"
-//==============================================================================
 
 /*
  * This file contains the definitions of the WMI protocol specified in the
  * Wireless Module Interface (WMI).  It includes definitions of all the
  * commands and events. Commands are messages from the host to the WM.
  * Events and Replies are messages from the WM to the host.
  *
  * Ownership of correctness in regards to commands
  * belongs to the host driver and the WMI is not required to validate
  * parameters for value, proper range, or any other checking.
@@ skipping 31 matching lines @@
 
 #define WMI_IMPLICIT_PSTREAM 0xFF
 #define WMI_MAX_THINSTREAM 15
 
 #ifdef AR6002_REV2
 #define IBSS_MAX_NUM_STA          4
 #else
 #define IBSS_MAX_NUM_STA          8
 #endif
 
-struct host_app_area_s {
+PREPACK struct host_app_area_s {
     A_UINT32 wmi_protocol_ver;
-};
+} POSTPACK;
 
 /*
  * Data Path
  */
 typedef PREPACK struct {
     A_UINT8     dstMac[ATH_MAC_LEN];
     A_UINT8     srcMac[ATH_MAC_LEN];
     A_UINT16    typeOrLen;
 } POSTPACK ATH_MAC_HDR;
 
@@ skipping 1599 matching lines @@
 
 typedef PREPACK struct {
     A_UINT32 aclWlanMediumDur;      /* Wlan usage time during Acl (non-a2dp)
                                                         coexistence (default 30 msecs)
                                     */
 
     A_UINT32 aclBtMediumDur;       /* Bt usage time during acl coexistence
                                                              (default 30 msecs)
                                    */
 
-        A_UINT32 aclDetectTimeout;         /* ACL coexistence enabled if we get
-                                                                   10 Pkts in X msec(default 100 msecs)
+        A_UINT32 aclDetectTimeout;         /* BT activity observation time limit.
+                                                                          In this time duration, number of bt pkts are counted.
+                                                                          If the Cnt reaches "aclPktCntLowerLimit" value
+                                                                          for "aclIterToEnableCoex" iteration continuously,
+                                                                          firmware gets into ACL coexistence mode.
+                                                                          Similarly, if bt traffic count during ACL coexistence
+                                                                          has not reached "aclPktCntLowerLimit" continuously
+                                                                          for "aclIterToEnableCoex", then ACL coexistence is
+                                                                          disabled.
+                                                                  -default 100 msecs
                                     */
 
-         A_UINT32 aclmaxPktCnt;            /* No of ACL pkts to receive before
-                                                                      enabling ACL coex
-                                      default = 9
+         A_UINT32 aclPktCntLowerLimit;   /* Acl Pkt Cnt to be received in duration of
+                                                                                "aclDetectTimeout" for
+                                                                                "aclIterForEnDis" times to enabling ACL coex.
+                                        Similar logic is used to disable acl coexistence.
+                                        (If "aclPktCntLowerLimit"  cnt of acl pkts
+                                         are not seen by the for "aclIterForEnDis"
+                                         then acl coexistence is disabled).
+                                        default = 10
                                    */
 
+         A_UINT32 aclIterForEnDis;      /* number of Iteration of "aclPktCntLowerLimit" for Enabling and
+                                       Disabling Acl Coexistence.
+                                       default = 3
+                                     */
+
+         A_UINT32 aclPktCntUpperLimit; /* This is upperBound limit, if there is more than
+                                                                          "aclPktCntUpperLimit" seen in "aclDetectTimeout",
+                                                                          ACL coexistence is enabled right away.
+                                                                          - default 15*/
+
         A_UINT32 aclCoexFlags;                  /* A2DP Option flags:
                                                   bits:    meaning:
                                           0       Allow Close Range Optimization
                                           1       disable Firmware detection
                                       (Currently supported configuration is aclCoexFlags =0)
                                                 */
         A_UINT32 linkId;                /* Applicable only for STE-BT - not used */
 
 }POSTPACK BTCOEX_ACLCOEX_CONFIG;
 
@@ skipping 210 matching lines @@
     WMI_ADDBA_REQ_EVENTID,              /*0x1020 */
     WMI_ADDBA_RESP_EVENTID,
     WMI_DELBA_REQ_EVENTID,
     WMI_TX_COMPLETE_EVENTID,
     WMI_HCI_EVENT_EVENTID,
     WMI_ACL_DATA_EVENTID,
     WMI_REPORT_SLEEP_STATE_EVENTID,
 #ifdef WAPI_ENABLE
     WMI_WAPI_REKEY_EVENTID,
 #endif
-        WMI_REPORT_BTCOEX_STATS_EVENTID,
-        WMI_REPORT_BTCOEX_CONFIG_EVENTID,
-
-        WMI_THIN_RESERVED_START_EVENTID = 0x8000,
-        /* Events in this range are reserved for thinmode 
-         * See wmi_thin.h for actual definitions */
+    WMI_REPORT_BTCOEX_STATS_EVENTID,
+    WMI_REPORT_BTCOEX_CONFIG_EVENTID,
+    WMI_ACM_REJECT_EVENTID,
+    WMI_THIN_RESERVED_START_EVENTID = 0x8000,
+    /* Events in this range are reserved for thinmode 
+     * See wmi_thin.h for actual definitions */
     WMI_THIN_RESERVED_END_EVENTID = 0x8fff,
 
 } WMI_EVENT_ID;
 
 
 typedef enum {
     WMI_11A_CAPABILITY   = 1,
     WMI_11G_CAPABILITY   = 2,
     WMI_11AG_CAPABILITY  = 3,
     WMI_11NA_CAPABILITY  = 4,
@@ skipping 132 matching lines @@
     A_UINT32    regDomain;
 } POSTPACK WMI_REG_DOMAIN_EVENT;
 
 typedef PREPACK struct {
     A_UINT8     txQueueNumber;
     A_UINT8     rxQueueNumber;
     A_UINT8     trafficDirection;
     A_UINT8     trafficClass;
 } POSTPACK WMI_PSTREAM_TIMEOUT_EVENT;
 
+typedef PREPACK struct {
+    A_UINT8     reserve1;
+    A_UINT8     reserve2;
+    A_UINT8     reserve3;
+    A_UINT8     trafficClass;
+} POSTPACK WMI_ACM_REJECT_EVENT;
+
 /*
  * The WMI_NEIGHBOR_REPORT Event is generated by the target to inform
  * the host of BSS's it has found that matches the current profile.
  * It can be used by the host to cache PMKs and/to initiate pre-authentication
  * if the BSS supports it.  The first bssid is always the current associated
  * BSS.
  * The bssid and bssFlags information repeats according to the number
  * or APs reported.
  */
 typedef enum {
@@ skipping 909 matching lines @@
 
 typedef PREPACK struct {
     A_UINT32 rateMasks[8];
 } POSTPACK WMI_SET_TX_SELECT_RATES_CMD;
 
 typedef PREPACK struct {
     A_UINT32    sgiMask;
     A_UINT8     sgiPERThreshold;
 } POSTPACK WMI_SET_TX_SGI_PARAM_CMD;
 
+#define DEFAULT_SGI_MASK 0x08080000
+#define DEFAULT_SGI_PER 10
 
 typedef PREPACK struct {
     A_UINT32 rateField; /* 1 bit per rate corresponding to index */
     A_UINT8 id;
     A_UINT8 shortTrys;
     A_UINT8 longTrys;
     A_UINT8 reserved; /* padding */
 } POSTPACK WMI_SET_RATE_POLICY_CMD;
 
 typedef PREPACK struct {
     A_UINT8 metaVersion; /* version of meta data for rx packets <0 = default> (0-7 = valid) */
     A_UINT8 dot11Hdr; /* 1 == leave .11 header intact , 0 == replace .11 header with .3 <default> */
     A_UINT8 defragOnHost; /* 1 == defragmentation is performed by host, 0 == performed by target <default> */
     A_UINT8 reserved[1]; /* alignment */
 } POSTPACK WMI_RX_FRAME_FORMAT_CMD;
 
 
 typedef PREPACK struct {
-    A_UINT8 enable;     // 1 == device operates in thin mode , 0 == normal mode <default> */
+    A_UINT8 enable;     /* 1 == device operates in thin mode , 0 == normal mode <default> */
     A_UINT8 reserved[3];
 } POSTPACK WMI_SET_THIN_MODE_CMD;
 
 /* AP mode events */
 /* WMI_PS_POLL_EVENT */
 typedef PREPACK struct {
     A_UINT16 aid;
 } POSTPACK WMI_PSPOLL_EVENT;
 
 typedef PREPACK struct {
@@ skipping 29 matching lines @@
 
 #ifndef ATH_TARGET
 #include "athendpack.h"
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _WMI_H_ */