From ceb998c231efecbc7b91b92125d2b7eb5df65677 Mon Sep 17 00:00:00 2001 From: spuligil Date: Mon, 6 Aug 2018 10:13:05 -0700 Subject: [PATCH] fw-api: CL 5038197 - update fw common interface files WMI: provide prototypes for wmi_mac_addr <--> char array conversion funcs Provide prototypes for wmi_mac_addr_to_char_array and wmi_char_array_to_mac_addr functions, which implement the WMI_MAC_ADDR_TO_CHAR_ARRAY and WMI_CHAR_ARRAY_TO_MAC_ADDR operations, but as functions rather than macros (to save memory) Change-Id: Ic3f7618a2fa079ce6fbc0995f0b033a190420521 CRs-Fixed: 2262693 --- fw/wmi_unified.h | 12 +++++++++++- fw/wmi_version.h | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 1b7953b8d100..2ec6c1491f56 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -150,7 +150,7 @@ static INLINE void wmi_packed_arr_set_bits(A_UINT32 *arr, A_UINT32 entry_index, } /** 2 word representation of MAC addr */ -typedef struct { +typedef struct _wmi_mac_addr { /** upper 4 bytes of MAC address */ A_UINT32 mac_addr31to0; /** lower 2 bytes of MAC address */ @@ -177,6 +177,16 @@ typedef struct { (pwmi_mac_addr)->mac_addr47to32 = ((c_macaddr)[4] | ((c_macaddr)[5] << 8));\ } while (0) +/* + * The below function declarations are for implementations on some + * platforms of the above macros, but in function form, to save code + * memory by avoiding macro-inlining of a non-trivial amount of code. + * These function versions of the above macros may not be available + * on all host and target platforms. + */ +void wmi_mac_addr_to_char_array(wmi_mac_addr *pwmi_mac_addr, A_UINT8 *c_macaddr); +void wmi_char_array_to_mac_addr(A_UINT8 *c_macaddr, wmi_mac_addr *pwmi_mac_addr); + /* * wmi command groups. */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index d4bfe138a34c..9c27b36a3a7a 100644 --- a/fw/wmi_version.h +++ b/fw/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility. */ -#define __WMI_REVISION_ 559 +#define __WMI_REVISION_ 560 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work