mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 03:45:24 -04:00
fw-api: CL 11290363 - update fw common interface files
HTT stats: make htt_stats.h depend just on htt_common.h, not htt.h Change-Id: Ieb0d366a277d995ffe4a097a9fbd6a6f679db97f CRs-Fixed: 2262693
This commit is contained in:
spuligil
parent
ffa7eb1984
commit
4993ca4e3e
4 changed files with 56 additions and 46 deletions
44
fw/htt.h
44
fw/htt.h
|
|
@ -251,42 +251,6 @@
|
|||
*/
|
||||
#define HTT_T2H_MSG_TYPE_RC_UPDATE_IND DEPRECATED_HTT_T2H_MSG_TYPE_RC_UPDATE_IND
|
||||
|
||||
/* HTT Access Category values */
|
||||
enum HTT_AC_WMM {
|
||||
/* WMM Access Categories */
|
||||
HTT_AC_WMM_BE = 0x0,
|
||||
HTT_AC_WMM_BK = 0x1,
|
||||
HTT_AC_WMM_VI = 0x2,
|
||||
HTT_AC_WMM_VO = 0x3,
|
||||
|
||||
HTT_NUM_AC_WMM = 0x4,
|
||||
|
||||
/* extension Access Categories */
|
||||
HTT_AC_EXT_NON_QOS = 0x4,
|
||||
HTT_AC_EXT_UCAST_MGMT = 0x5,
|
||||
HTT_AC_EXT_MCAST_DATA = 0x6,
|
||||
HTT_AC_EXT_MCAST_MGMT = 0x7,
|
||||
};
|
||||
enum HTT_AC_WMM_MASK {
|
||||
/* WMM Access Categories */
|
||||
HTT_AC_WMM_BE_MASK = (1 << HTT_AC_WMM_BE),
|
||||
HTT_AC_WMM_BK_MASK = (1 << HTT_AC_WMM_BK),
|
||||
HTT_AC_WMM_VI_MASK = (1 << HTT_AC_WMM_VI),
|
||||
HTT_AC_WMM_VO_MASK = (1 << HTT_AC_WMM_VO),
|
||||
/* extension Access Categories */
|
||||
HTT_AC_EXT_NON_QOS_MASK = (1 << HTT_AC_EXT_NON_QOS),
|
||||
HTT_AC_EXT_UCAST_MGMT_MASK = (1 << HTT_AC_EXT_UCAST_MGMT),
|
||||
HTT_AC_EXT_MCAST_DATA_MASK = (1 << HTT_AC_EXT_MCAST_DATA),
|
||||
HTT_AC_EXT_MCAST_MGMT_MASK = (1 << HTT_AC_EXT_MCAST_MGMT),
|
||||
};
|
||||
#define HTT_AC_MASK_WMM \
|
||||
(HTT_AC_WMM_BE_MASK | HTT_AC_WMM_BK_MASK | \
|
||||
HTT_AC_WMM_VI_MASK | HTT_AC_WMM_VO_MASK)
|
||||
#define HTT_AC_MASK_EXT \
|
||||
(HTT_AC_EXT_NON_QOS_MASK | HTT_AC_EXT_UCAST_MGMT_MASK | \
|
||||
HTT_AC_EXT_MCAST_DATA_MASK | HTT_AC_EXT_MCAST_MGMT_MASK)
|
||||
#define HTT_AC_MASK_ALL (HTT_AC_MASK_WMM | HTT_AC_MASK_EXT)
|
||||
|
||||
/*
|
||||
* htt_dbg_stats_type -
|
||||
* bit positions for each stats type within a stats type bitmask
|
||||
|
|
@ -12662,14 +12626,6 @@ typedef enum {
|
|||
HTT_PEER_TYPE_ROAMOFFLOAD_TEMP = 128, /* Temporarily created during offload roam */
|
||||
} HTT_PEER_TYPE;
|
||||
|
||||
/** 2 word representation of MAC addr */
|
||||
typedef struct {
|
||||
/** upper 4 bytes of MAC address */
|
||||
A_UINT32 mac_addr31to0;
|
||||
/** lower 2 bytes of MAC address */
|
||||
A_UINT32 mac_addr47to32;
|
||||
} htt_mac_addr;
|
||||
|
||||
/** macro to convert MAC address from char array to HTT word format */
|
||||
#define HTT_CHAR_ARRAY_TO_MAC_ADDR(c_macaddr, phtt_mac_addr) do { \
|
||||
(phtt_mac_addr)->mac_addr31to0 = \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2012-2016, 2020 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -34,6 +34,8 @@
|
|||
#ifndef _HTT_COMMON_H_
|
||||
#define _HTT_COMMON_H_
|
||||
|
||||
#include <htt_deps.h> /* A_UINT32 */
|
||||
|
||||
enum htt_sec_type {
|
||||
htt_sec_type_none,
|
||||
htt_sec_type_wep128,
|
||||
|
|
@ -128,4 +130,50 @@ enum htt_pkt_type {
|
|||
#define HTT_TX_IPA_NEW_MSDU_ID_SPACE_BEGIN 8192 /* = 0x2000 = b10,0000,0000,0000 */
|
||||
#define TGT_RX2TX_NEW_MSDU_ID_SPACE_BEGIN 12288 /* = 0x3000 = b11,0000,0000,0000 */
|
||||
|
||||
/* HTT Access Category values */
|
||||
enum HTT_AC_WMM {
|
||||
/* WMM Access Categories */
|
||||
HTT_AC_WMM_BE = 0x0,
|
||||
HTT_AC_WMM_BK = 0x1,
|
||||
HTT_AC_WMM_VI = 0x2,
|
||||
HTT_AC_WMM_VO = 0x3,
|
||||
|
||||
HTT_NUM_AC_WMM = 0x4,
|
||||
|
||||
/* extension Access Categories */
|
||||
HTT_AC_EXT_NON_QOS = 0x4,
|
||||
HTT_AC_EXT_UCAST_MGMT = 0x5,
|
||||
HTT_AC_EXT_MCAST_DATA = 0x6,
|
||||
HTT_AC_EXT_MCAST_MGMT = 0x7,
|
||||
};
|
||||
|
||||
enum HTT_AC_WMM_MASK {
|
||||
/* WMM Access Categories */
|
||||
HTT_AC_WMM_BE_MASK = (1 << HTT_AC_WMM_BE),
|
||||
HTT_AC_WMM_BK_MASK = (1 << HTT_AC_WMM_BK),
|
||||
HTT_AC_WMM_VI_MASK = (1 << HTT_AC_WMM_VI),
|
||||
HTT_AC_WMM_VO_MASK = (1 << HTT_AC_WMM_VO),
|
||||
/* extension Access Categories */
|
||||
HTT_AC_EXT_NON_QOS_MASK = (1 << HTT_AC_EXT_NON_QOS),
|
||||
HTT_AC_EXT_UCAST_MGMT_MASK = (1 << HTT_AC_EXT_UCAST_MGMT),
|
||||
HTT_AC_EXT_MCAST_DATA_MASK = (1 << HTT_AC_EXT_MCAST_DATA),
|
||||
HTT_AC_EXT_MCAST_MGMT_MASK = (1 << HTT_AC_EXT_MCAST_MGMT),
|
||||
};
|
||||
#define HTT_AC_MASK_WMM \
|
||||
(HTT_AC_WMM_BE_MASK | HTT_AC_WMM_BK_MASK | \
|
||||
HTT_AC_WMM_VI_MASK | HTT_AC_WMM_VO_MASK)
|
||||
#define HTT_AC_MASK_EXT \
|
||||
(HTT_AC_EXT_NON_QOS_MASK | HTT_AC_EXT_UCAST_MGMT_MASK | \
|
||||
HTT_AC_EXT_MCAST_DATA_MASK | HTT_AC_EXT_MCAST_MGMT_MASK)
|
||||
#define HTT_AC_MASK_ALL (HTT_AC_MASK_WMM | HTT_AC_MASK_EXT)
|
||||
|
||||
/** 2 word representation of MAC addr */
|
||||
typedef struct {
|
||||
/** upper 4 bytes of MAC address */
|
||||
A_UINT32 mac_addr31to0;
|
||||
/** lower 2 bytes of MAC address */
|
||||
A_UINT32 mac_addr47to32;
|
||||
} htt_mac_addr;
|
||||
|
||||
|
||||
#endif /* _HTT_COMMON_H_ */
|
||||
|
|
|
|||
|
|
@ -33,10 +33,15 @@
|
|||
#define _HTT_DEPS_H_
|
||||
|
||||
#include <a_types.h> /* A_UINT32 */
|
||||
|
||||
#ifndef QCA_WIFI_WIFISTATS_EXTBUILD
|
||||
#include <a_osapi.h> /* PREPACK, POSTPACK */
|
||||
#endif
|
||||
|
||||
#ifdef ATHR_WIN_NWF
|
||||
#pragma warning(disable:4214) /* bit field types other than int */
|
||||
#endif
|
||||
|
||||
#include "wlan_defs.h"
|
||||
|
||||
#endif /* _HTT_DEPS_H_ */
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
#ifndef __HTT_STATS_H__
|
||||
#define __HTT_STATS_H__
|
||||
|
||||
#include <htt.h>
|
||||
#include <htt_deps.h> /* A_UINT32 */
|
||||
#include <htt_common.h>
|
||||
|
||||
/*
|
||||
* htt_dbg_ext_stats_type -
|
||||
|
|
|
|||
Loading…
Reference in a new issue