Commit 7cc386e9 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: add enum cfg_type_cmd

This patch adds a new enum cfg_type_cmd to change hard-coded command
type.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76e6121c
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
* Global Data * Global Data
* *
********************************************/ ********************************************/
enum cfg_cmd_type {
CFG_BYTE_CMD = 0,
CFG_HWORD_CMD = 1,
CFG_WORD_CMD = 2,
CFG_STR_CMD = 3,
CFG_BIN_CMD = 4
};
struct wilc_mac_cfg { struct wilc_mac_cfg {
int mac_status; int mac_status;
...@@ -371,18 +378,18 @@ int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size) ...@@ -371,18 +378,18 @@ int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)
u8 type = (id >> 12) & 0xf; u8 type = (id >> 12) & 0xf;
int ret = 0; int ret = 0;
if (type == 0) { /* byte command */ if (type == CFG_BYTE_CMD) { /* byte command */
if (size >= 1) if (size >= 1)
ret = wilc_wlan_cfg_set_byte(frame, offset, id, *buf); ret = wilc_wlan_cfg_set_byte(frame, offset, id, *buf);
} else if (type == 1) { /* half word command */ } else if (type == CFG_HWORD_CMD) { /* half word command */
if (size >= 2) if (size >= 2)
ret = wilc_wlan_cfg_set_hword(frame, offset, id, *((u16 *)buf)); ret = wilc_wlan_cfg_set_hword(frame, offset, id, *((u16 *)buf));
} else if (type == 2) { /* word command */ } else if (type == CFG_WORD_CMD) { /* word command */
if (size >= 4) if (size >= 4)
ret = wilc_wlan_cfg_set_word(frame, offset, id, *((u32 *)buf)); ret = wilc_wlan_cfg_set_word(frame, offset, id, *((u32 *)buf));
} else if (type == 3) { /* string command */ } else if (type == CFG_STR_CMD) { /* string command */
ret = wilc_wlan_cfg_set_str(frame, offset, id, buf, size); ret = wilc_wlan_cfg_set_str(frame, offset, id, buf, size);
} else if (type == 4) { /* binary command */ } else if (type == CFG_BIN_CMD) { /* binary command */
ret = wilc_wlan_cfg_set_bin(frame, offset, id, buf, size); ret = wilc_wlan_cfg_set_bin(frame, offset, id, buf, size);
} }
...@@ -415,7 +422,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) ...@@ -415,7 +422,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
} }
i = 0; i = 0;
if (type == 0) { /* byte command */ if (type == CFG_BYTE_CMD) { /* byte command */
do { do {
if (g_cfg_byte[i].id == WID_NIL) if (g_cfg_byte[i].id == WID_NIL)
break; break;
...@@ -427,7 +434,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) ...@@ -427,7 +434,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
} }
i++; i++;
} while (1); } while (1);
} else if (type == 1) { /* half word command */ } else if (type == CFG_HWORD_CMD) { /* half word command */
do { do {
if (g_cfg_hword[i].id == WID_NIL) if (g_cfg_hword[i].id == WID_NIL)
break; break;
...@@ -439,7 +446,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) ...@@ -439,7 +446,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
} }
i++; i++;
} while (1); } while (1);
} else if (type == 2) { /* word command */ } else if (type == CFG_WORD_CMD) { /* word command */
do { do {
if (g_cfg_word[i].id == WID_NIL) if (g_cfg_word[i].id == WID_NIL)
break; break;
...@@ -451,7 +458,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size) ...@@ -451,7 +458,7 @@ int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
} }
i++; i++;
} while (1); } while (1);
} else if (type == 3) { /* string command */ } else if (type == CFG_STR_CMD) { /* string command */
do { do {
if (g_cfg_str[i].id == WID_NIL) if (g_cfg_str[i].id == WID_NIL)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment