[PATCH 7/7] Clean up smd.c/h

[Eugene Krasnikov]

Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
---
 hal.h |  4 ++--
 smd.c | 30 +++++-------------------------
 smd.h | 50 --------------------------------------------------
 3 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/hal.h b/hal.h
index 5dd5af8..241caa9 100644
--- a/hal.h
+++ b/hal.h
@@ -658,8 +658,8 @@ struct wcn36xx_hal_set_sta_key_params {
 
 /* 4-byte control message header used by HAL*/
 struct wcn36xx_hal_msg_header {
-	enum wcn36xx_hal_host_msg_type msgType:16;
-	enum wcn36xx_hal_host_msg_version msgVersion:16;
+	enum wcn36xx_hal_host_msg_type msg_type:16;
+	enum wcn36xx_hal_host_msg_version msg_version:16;
 	u32 len;
 } __packed;
 
diff --git a/smd.c b/smd.c
index b733211..db9a898 100644
--- a/smd.c
+++ b/smd.c
@@ -45,8 +45,8 @@ int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
 
 #define INIT_HAL_MSG(msg_body, type) \
 	memset(&msg_body, 0, sizeof(msg_body)); \
-	msg_body.header.msgType = type; \
-	msg_body.header.msgVersion = WCN36XX_HAL_MSG_VERSION0; \
+	msg_body.header.msg_type = type; \
+	msg_body.header.msg_version = WCN36XX_HAL_MSG_VERSION0; \
 	msg_body.header.len = sizeof(msg_body);
 
 #define PREPARE_HAL_BUF(send_buf, msg_body) \
@@ -56,11 +56,11 @@ int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
 int wcn36xx_smd_rsp_status_check(void *buf, size_t len)
 {
 	struct wcn36xx_fw_msg_status_rsp * rsp;
-	if (len < sizeof(struct wcn36xx_fw_msg_header) +
+	if (len < sizeof(struct wcn36xx_hal_msg_header) +
 		sizeof(struct wcn36xx_fw_msg_status_rsp))
 		return -EIO;
 	rsp = (struct wcn36xx_fw_msg_status_rsp *)
-		(buf + sizeof(struct wcn36xx_fw_msg_header));
+		(buf + sizeof(struct wcn36xx_hal_msg_header));
 
 	if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status) {
 		return -EIO;
@@ -68,26 +68,6 @@ int wcn36xx_smd_rsp_status_check(void *buf, size_t len)
 	return 0;
 }
 
-#define INIT_MSG(msg_header, msg_body, type) \
-	msg_header.msg_type = type; \
-	msg_header.msg_ver = WCN36XX_FW_MSG_VER0; \
-	msg_header.msg_len = sizeof(msg_header)+sizeof(*msg_body); \
-	memset(msg_body, 0, sizeof(*msg_body));
-
-#define INIT_MSG_S(msg_header, type) \
-	msg_header.msg_type = type; \
-	msg_header.msg_ver = WCN36XX_FW_MSG_VER0; \
-	msg_header.msg_len = sizeof(msg_header);
-
-#define PREPARE_BUF(send_buf, msg_header, msg_body) \
-	memset(send_buf, 0, msg_header.msg_len); \
-	memcpy(send_buf, &msg_header, sizeof(msg_header)); \
-	memcpy((void*)(send_buf + sizeof(msg_header)), msg_body, sizeof(*msg_body));		\
-
-#define PREPARE_BUF_S(send_buf, msg_header) \
-	memset(send_buf, 0, msg_header.msg_len); \
-	memcpy(send_buf, &msg_header, sizeof(msg_header)); \
-
 int wcn36xx_smd_load_nv(struct wcn36xx *wcn)
 {
 	struct nv_data *nv_d;
@@ -453,7 +433,7 @@ static void wcn36xx_smd_notify(void *data, unsigned event)
 }
 static void wcn36xx_smd_rsp_process (void *buf, size_t len)
 {
-	struct wcn36xx_fw_msg_header * msg_header = buf;
+	struct wcn36xx_hal_msg_header * msg_header = buf;
 
 	wcn36xx_dbg_dump("SMD <<< ", buf, len);
 	switch (msg_header->msg_type) {
diff --git a/smd.h b/smd.h
index 14601e3..7635cfe 100644
--- a/smd.h
+++ b/smd.h
@@ -28,20 +28,6 @@
 #define WCN36XX_SMSM_WLAN_TX_ENABLE	 		0x00000400
 #define WCN36XX_SMSM_WLAN_TX_RINGS_EMPTY		0x00000200
 
-enum wcn36xx_fw_msg_type {
-	/* CFG */
-	WCN36XX_FW_MSG_TYPE_UPDATE_CFG_REQ		= 48,
-	WCN36XX_FW_MSG_TYPE_UPDATE_CFG_RSP		= 49,
-
-	WCN36XX_FW_MSG_TYPE_ADD_BCN_FILTER_REQ		= 84,
-	WCN36XX_FW_MSG_TYPE_ADD_BCN_FILTER_RSP		= 104,
-
-	WCN36XX_FW_MSG_TYPE_EX_CAPABILITIES_REQ		= 175,
-	WCN36XX_FW_MSG_TYPE_EX_CAPABILITIES_RSP		= 176
-
-};
-
-
 enum wcn36xx_fw_msg_result {
 	WCN36XX_FW_MSG_RESULT_SUCCESS			= 0,
 	WCN36XX_FW_MSG_RESULT_SUCCESS_SYNC		= 1,
@@ -49,10 +35,6 @@ enum wcn36xx_fw_msg_result {
 	WCN36XX_FW_MSG_RESULT_MEM_FAIL			= 5,
 };
 
-enum wcn36xx_fw_msg_ver {
-	WCN36XX_FW_MSG_VER0				= 0
-};
-
 /******************************/
 /* SMD requests and responses */
 /******************************/
@@ -60,38 +42,6 @@ struct wcn36xx_fw_msg_status_rsp {
 	u32 	status;
 } __packed;
 
-#define wcn36xx_fw_msg_ex_caps_rsp 		wcn36xx_fw_msg_ex_caps_req
-
-/* WCN36XX_FW_MSG_TYPE_UPDATE_CFG_REQ */
-struct wcn36xx_fw_msg_update_cfg_req {
-	u32 	conf_len;
-	 // config buffer must start in TLV format just here
-} __packed;
-
-/* WCN36XX_FW_MSG_TYPE_EX_CAPABILITIES_REQ */
-struct wcn36xx_fw_msg_ex_capabilities_req {
-	u32	caps[4];
-} __packed;
-#define wcn36xx_fw_msg_ex_capabilities_rsp wcn36xx_fw_msg_ex_capabilities_req
-
-/* WCN36XX_FW_MSG_TYPE_ADD_BCN_FILTER_REQ */
-struct wcn36xx_fw_msg_add_bcn_filter_req {
-	u8	enable_11d;
-	u8	resolved_11d;
-	u8	ch_count;
-	u8	ch[26];
-	u16	active_min_ch_time;
-	u16	active_max_ch_time;
-	u16	passive_min_ch_time;
-	u16	passive_max_ch_time;
-	u32	phy_ch_state;
-} __packed;
-
-struct wcn36xx_fw_msg_header {
-	enum wcn36xx_fw_msg_type	msg_type:16;
-	enum wcn36xx_fw_msg_ver		msg_ver:16;
-	u32				msg_len;
-};
 struct wcn36xx;
 
 int wcn36xx_smd_open(struct wcn36xx *wcn);
-- 
1.7.11.3