staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / wilc_wlan_cfg.c

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index f5bbbe86a0399513f89477ebc643260c420cd788..a34a81cdeb5e1042d39ea28a3f058c2f1cc8a4c5 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -7,6 +7,7 @@
 /*  */
 /* ///////////////////////////////////////////////////////////////////////// */
 
+#include <linux/string.h>
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
 #include "wilc_wlan_cfg.h"
@@ -160,7 +161,7 @@ static wilc_cfg_str_t g_cfg_str[] = {
  *
  ********************************************/
 
-static int wilc_wlan_cfg_set_byte(u8 *frame, uint32_t offset, u16 id, u8 val8)
+static int wilc_wlan_cfg_set_byte(u8 *frame, u32 offset, u16 id, u8 val8)
 {
        u8 *buf;
 
@@ -176,7 +177,7 @@ static int wilc_wlan_cfg_set_byte(u8 *frame, uint32_t offset, u16 id, u8 val8)
        return 4;
 }
 
-static int wilc_wlan_cfg_set_hword(u8 *frame, uint32_t offset, u16 id, u16 val16)
+static int wilc_wlan_cfg_set_hword(u8 *frame, u32 offset, u16 id, u16 val16)
 {
        u8 *buf;
 
@@ -194,7 +195,7 @@ static int wilc_wlan_cfg_set_hword(u8 *frame, uint32_t offset, u16 id, u16 val16
        return 5;
 }
 
-static int wilc_wlan_cfg_set_word(u8 *frame, uint32_t offset, u16 id, uint32_t val32)
+static int wilc_wlan_cfg_set_word(u8 *frame, u32 offset, u16 id, u32 val32)
 {
        u8 *buf;
 
@@ -214,7 +215,7 @@ static int wilc_wlan_cfg_set_word(u8 *frame, uint32_t offset, u16 id, uint32_t v
        return 7;
 }
 
-static int wilc_wlan_cfg_set_str(u8 *frame, uint32_t offset, u16 id, u8 *str, uint32_t size)
+static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str, u32 size)
 {
        u8 *buf;
 
@@ -233,10 +234,10 @@ static int wilc_wlan_cfg_set_str(u8 *frame, uint32_t offset, u16 id, u8 *str, ui
        return (size + 3);
 }
 
-static int wilc_wlan_cfg_set_bin(u8 *frame, uint32_t offset, u16 id, u8 *b, uint32_t size)
+static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size)
 {
        u8 *buf;
-       uint32_t i;
+       u32 i;
        u8 checksum = 0;
 
        if ((offset + size + 5) >= MAX_CFG_FRAME_SIZE)
@@ -268,7 +269,7 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, uint32_t offset, u16 id, u8 *b, uint
 
 static void wilc_wlan_parse_response_frame(u8 *info, int size)
 {
-       uint32_t wid, len = 0, i = 0;
+       u32 wid, len = 0, i = 0;
        static int seq;
 
        while (size > 0) {
@@ -363,8 +364,8 @@ static void wilc_wlan_parse_response_frame(u8 *info, int size)
 
 static int wilc_wlan_parse_info_frame(u8 *info, int size)
 {
-       wilc_mac_cfg_t *pd = (wilc_mac_cfg_t *)&g_mac;
-       uint32_t wid, len;
+       wilc_mac_cfg_t *pd = &g_mac;
+       u32 wid, len;
        int type = WILC_CFG_RSP_STATUS;
 
        wid = info[0] | (info[1] << 8);
@@ -385,7 +386,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size)
  *
  ********************************************/
 
-static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, u16 id, u8 *buf, int size)
+int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)
 {
        u8 type = (id >> 12) & 0xf;
        int ret = 0;
@@ -398,7 +399,7 @@ static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, u16 id, u8 *buf, in
                        ret = wilc_wlan_cfg_set_hword(frame, offset, id, *((u16 *)buf));
        } else if (type == 2) {                 /* word command */
                if (size >= 4)
-                       ret = wilc_wlan_cfg_set_word(frame, offset, id, *((uint32_t *)buf));
+                       ret = wilc_wlan_cfg_set_word(frame, offset, id, *((u32 *)buf));
        } else if (type == 3) {                 /* string command */
                ret = wilc_wlan_cfg_set_str(frame, offset, id, buf, size);
        } else if (type == 4) {                 /* binary command */
@@ -410,7 +411,7 @@ static int wilc_wlan_cfg_set_wid(u8 *frame, uint32_t offset, u16 id, u8 *buf, in
        return ret;
 }
 
-static int wilc_wlan_cfg_get_wid(u8 *frame, uint32_t offset, u16 id)
+int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
 {
        u8 *buf;
 
@@ -425,13 +426,13 @@ static int wilc_wlan_cfg_get_wid(u8 *frame, uint32_t offset, u16 id)
        return 2;
 }
 
-static int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, uint32_t buffer_size)
+int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size)
 {
-       uint32_t type = (wid >> 12) & 0xf;
+       u32 type = (wid >> 12) & 0xf;
        int i, ret = 0;
 
        if (wid == WID_STATUS) {
-               *((uint32_t *)buffer) = g_mac.mac_status;
+               *((u32 *)buffer) = g_mac.mac_status;
                return 4;
        }
 
@@ -478,7 +479,7 @@ static int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, uint32_t buffer_size
                                break;
 
                        if (g_cfg_str[i].id == wid) {
-                               uint32_t size =  g_cfg_str[i].str[0];
+                               u32 size =  g_cfg_str[i].str[0];
 
                                if (buffer_size >= size) {
                                        if (g_cfg_str[i].id == WID_SITE_SURVEY_RESULTS) {
@@ -504,7 +505,7 @@ static int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, uint32_t buffer_size
        return ret;
 }
 
-static int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
+int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
 {
        int ret = 1;
        u8 msg_type;
@@ -534,14 +535,11 @@ static int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
                GnrlAsyncInfoReceived(frame - 4, size + 4);
                break;
 
-#if 1
        case 'N':
                NetworkInfoReceived(frame - 4, size + 4);
                rsp->type = 0;
                break;
 
-#endif
-/*bug3819:*/
        case 'S':
                PRINT_INFO(RX_DBG, "Scan Notification Received\n");
                host_int_ScanCompleteReceived(frame - 4, size + 4);
@@ -560,17 +558,9 @@ static int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp)
        return ret;
 }
 
-static int wilc_wlan_cfg_init(wilc_debug_func func)
+int wilc_wlan_cfg_init(wilc_debug_func func)
 {
        memset((void *)&g_mac, 0, sizeof(wilc_mac_cfg_t));
        g_mac.dPrint = func;
        return 1;
 }
-
-wilc_cfg_func_t mac_cfg = {
-       wilc_wlan_cfg_set_wid,
-       wilc_wlan_cfg_get_wid,
-       wilc_wlan_cfg_get_wid_value,
-       wilc_wlan_cfg_indicate_rx,
-       wilc_wlan_cfg_init,
-};