staging: wilc1000: move wilc_send_config_pkt to wilc_wlan.c

This patch moves the function wilc_send_config_pkt to wilc_wlan.c which
handles transport since the purpose of the function is sending/getting of
config information. coreconfiguator.[ch] will be rename with frame.[ch] later.
The print codes of the function is removed also and they will be implemented
with netdev_xx print format later.
struct wid need to be moved to wilc_wlan_if.h which defines configure
informations.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 49ae9b1526542035f6cb29e5cf3bac06d9a9b9e1..6f17e2b666733419bde8b66f5daed15a1eead12e 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -433,62 +433,3 @@ s32 wilc_dealloc_assoc_resp_info(tstrConnectRespInfo *pstrConnectRespInfo)
 
        return s32Error;
 }
-
-/**
- *  @brief              sends certain Configuration Packet based on the input WIDs pstrWIDs
- *  using driver config layer
- *
- *  @details
- *  @param[in]  pstrWIDs WIDs to be sent in the configuration packet
- *  @param[in]  u32WIDsCount number of WIDs to be sent in the configuration packet
- *  @param[out]         pu8RxResp The received Packet Response
- *  @param[out]         ps32RxRespLen Length of the received Packet Response
- *  @return     Error code indicating success/failure
- *  @note
- *  @author    mabubakr
- *  @date              1 Mar 2012
- *  @version   1.0
- */
-s32 wilc_send_config_pkt(struct wilc *wilc, u8 mode, struct wid *wids,
-                        u32 count, u32 drv)
-{
-       s32 counter = 0, ret = 0;
-
-       if (mode == GET_CFG) {
-               for (counter = 0; counter < count; counter++) {
-                       PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,
-                                  (counter == count - 1));
-                       if (!wilc_wlan_cfg_get(wilc, !counter,
-                                              wids[counter].id,
-                                              (counter == count - 1),
-                                              drv)) {
-                               ret = -ETIMEDOUT;
-                               printk("[Sendconfigpkt]Get Timed out\n");
-                               break;
-                       }
-               }
-               counter = 0;
-               for (counter = 0; counter < count; counter++) {
-                       wids[counter].size = wilc_wlan_cfg_get_val(
-                                       wids[counter].id,
-                                       wids[counter].val,
-                                       wids[counter].size);
-               }
-       } else if (mode == SET_CFG) {
-               for (counter = 0; counter < count; counter++) {
-                       PRINT_D(CORECONFIG_DBG, "Sending config SET PACKET WID:%x\n", wids[counter].id);
-                       if (!wilc_wlan_cfg_set(wilc, !counter,
-                                              wids[counter].id,
-                                              wids[counter].val,
-                                              wids[counter].size,
-                                              (counter == count - 1),
-                                              drv)) {
-                               ret = -ETIMEDOUT;
-                               printk("[Sendconfigpkt]Set Timed out\n");
-                               break;
-                       }
-               }
-       }
-
-       return ret;
-}

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index fc43d04ca1dab651ab70e53116378e138ec78229..ee107ac915e003f2d92d4420e46e29cda4941612 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -70,13 +70,6 @@ typedef enum {
        CONNECT_STS_FORCE_16_BIT = 0xFFFF
 } tenuConnectSts;
 
-struct wid {
-       u16 id;
-       enum wid_type type;
-       s32 size;
-       s8 *val;
-};
-
 typedef struct {
        u8 u8Full;
        u8 u8Index;
@@ -127,8 +120,6 @@ typedef struct {
        size_t ie_len;
 } tstrDisconnectNotifInfo;
 
-s32 wilc_send_config_pkt(struct wilc *wilc, u8 mode, struct wid *wids,
-                        u32 count, u32 drv);
 s32 wilc_parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
 s32 wilc_dealloc_network_info(tstrNetworkInfo *pstrNetworkInfo);
 

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 04d4c92e3948b867331f24835290ffd27fd7d428..265ddfe3a924de0633c0005942415c4171bc28c6 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1439,6 +1439,45 @@ int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size)
        return ret;
 }
 
+s32 wilc_send_config_pkt(struct wilc *wilc, u8 mode, struct wid *wids,
+                        u32 count, u32 drv)
+{
+       s32 counter = 0, ret = 0;
+
+       if (mode == GET_CFG) {
+               for (counter = 0; counter < count; counter++) {
+                       if (!wilc_wlan_cfg_get(wilc, !counter,
+                                              wids[counter].id,
+                                              (counter == count - 1),
+                                              drv)) {
+                               ret = -ETIMEDOUT;
+                               break;
+                       }
+               }
+               counter = 0;
+               for (counter = 0; counter < count; counter++) {
+                       wids[counter].size = wilc_wlan_cfg_get_val(
+                                       wids[counter].id,
+                                       wids[counter].val,
+                                       wids[counter].size);
+               }
+       } else if (mode == SET_CFG) {
+               for (counter = 0; counter < count; counter++) {
+                       if (!wilc_wlan_cfg_set(wilc, !counter,
+                                              wids[counter].id,
+                                              wids[counter].val,
+                                              wids[counter].size,
+                                              (counter == count - 1),
+                                              drv)) {
+                               ret = -ETIMEDOUT;
+                               break;
+                       }
+               }
+       }
+
+       return ret;
+}
+
 static u32 init_chip(struct net_device *dev)
 {
        u32 chipid;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 7f046531be0141ce15929c42d9a2883c428f31d6..3ebaf0e3e6bd1aa2df35e4b55c4128a3cb543c9b 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -299,4 +299,6 @@ void host_sleep_notify(struct wilc *wilc);
 extern bool wilc_enable_ps;
 void chip_allow_sleep(struct wilc *wilc);
 void chip_wakeup(struct wilc *wilc);
+s32 wilc_send_config_pkt(struct wilc *wilc, u8 mode, struct wid *wids,
+                        u32 count, u32 drv);
 #endif

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index c446af60dfe86ce1388cfc79a8a90e79e0da4c31..455a98fb9b20fca46aa9bf6fa977553fc7c31635 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -300,6 +300,13 @@ enum wid_type {
        WID_TYPE_FORCE_32BIT    = 0xFFFFFFFF
 };
 
+struct wid {
+       u16 id;
+       enum wid_type type;
+       s32 size;
+       s8 *val;
+};
+
 typedef enum {
        WID_NIL                         = 0xffff,