device: rs9113: update the code style of adapter interface

* update the code style

Signed-off-by: Wayne Ren <wei.ren@synopsys.com>

Author: Wayne Ren

device/peripheral/wifi/rs9113/rs9113_adapter.c

@@ -33,7 +33,8 @@
 #include "dev_wnic.h"
 #include "embARC_error.h"
 //TODO: move SPI related part to emdk\drivers\pmwifi
-#include "board.h" //include board.h for SPI wiring and frequency
+/* include board.h for SPI wiring and frequency */
+#include "board.h"
 #include "rswifi_netif.h"
 
 #include "rs9113_adapter.h"
@@ -47,16 +48,20 @@ typedef struct {
 	uint8_t *buf;
 	uint32_t len;
 	uint32_t cur_index;
-}rs9113_pbuf_t, *rs9113_pbuf_t_ptr;
+} rs9113_pbuf_t, *rs9113_pbuf_t_ptr;
 
-rs9113_pbuf_t rs9113_pbuf;
-void * driver_task_handle = NULL;
-#define RSI_WLAN_CTRL_BUFFER_SIZE  3680	//3680 is a suitable value for WLAN only, take reference to document and rsi_driver_init() for other cases
+static rs9113_pbuf_t rs9113_pbuf;
+static void *driver_task_handle = NULL;
+/*
+ * 3680 is a suitable value for WLAN only, take reference to document and
+ * rsi_driver_init() for other cases
+ */
+#define RSI_WLAN_CTRL_BUFFER_SIZE  3680
 
 #define RSI_BUFFER_USE_MALLOC 0
 #if RSI_BUFFER_USE_MALLOC
 #else
-uint8_t rs_buffer[RSI_WLAN_CTRL_BUFFER_SIZE];
+static uint8_t rs_buffer[RSI_WLAN_CTRL_BUFFER_SIZE];
 #endif /*RSI_BUFFER_USE_MALLOC*/
 
 static int32_t _rs9113_spi_open(uint32_t freq, uint32_t clk_mode)
@@ -67,15 +72,20 @@ static int32_t _rs9113_spi_open(uint32_t freq, uint32_t clk_mode)
 	rsi_spi_ptr = spi_get_dev(BOARD_RSI_SPI_ID);
 	RS9113_CHECK_EXP(rsi_spi_ptr != NULL, E_OBJ);
 
-	dbg_printf(DBG_MORE_INFO, "rsi_spi_open DEV_MASTER_MODE= 0x%x (%d),freq= 0x%x (%d) \r\n", DEV_MASTER_MODE, DEV_MASTER_MODE, freq, freq);
+	dbg_printf(DBG_MORE_INFO, "rsi_spi_open DEV_MASTER_MODE= 0x%x (%d),freq= 0x%x (%d) \r\n",
+	           DEV_MASTER_MODE, DEV_MASTER_MODE, freq, freq);
+
 	ercd = rsi_spi_ptr->spi_open(DEV_MASTER_MODE, freq);
+
 	if ((ercd == E_OPNED) || (ercd == E_OK)) {
 		ercd = rsi_spi_ptr->spi_control(SPI_CMD_SET_CLK_MODE, CONV2VOID(clk_mode));
 	}
+
 error_exit:
 	return ercd;
 }
-static int32_t _rs9113_spi_close()
+
+static int32_t _rs9113_spi_close(void)
 {
 	int32_t ercd = E_OK;
 	DEV_SPI_PTR rsi_spi_ptr;
@@ -94,14 +104,19 @@ static int32_t _rs9113_wnic_deinit(DEV_WNIC_PTR rs9113_wnic)
 	int32_t ercd = E_OK;
 	DEV_WNIC_INFO *rs9113_info;
 	WIFI_IF_PTR rswifi_if_ptr;
+
 	RS9113_CHECK_EXP(rs9113_wnic!=NULL, E_OBJ);
+
 	rs9113_info = &(rs9113_wnic->wnic_info);
 	rswifi_if_ptr = (WIFI_IF_PTR)(rs9113_info->extra);
 	ercd = rsi_wireless_deinit();
+
 #if RSI_BUFFER_USE_MALLOC
-	if(rswifi_if_ptr->rsi_buffer != NULL){
+
+	if (rswifi_if_ptr->rsi_buffer != NULL) {
 		free(rswifi_if_ptr->rsi_buffer);
 	}
+
 #else
 #endif
 	_rs9113_spi_close();
@@ -140,10 +155,10 @@ int32_t rs9113_wnic_init(DEV_WNIC_PTR rs9113_wnic, uint32_t network_type)
 	RS9113_CHECK_EXP(rs9113_wnic!=NULL, E_OBJ);
 	rs9113_info = &(rs9113_wnic->wnic_info);
 	RS9113_CHECK_EXP((rs9113_info->init_status==WNIC_NOT_INITIALIZED) \
-				|| (rs9113_info->init_status==WNIC_INIT_FAILED), E_OPNED);
+	                 || (rs9113_info->init_status==WNIC_INIT_FAILED), E_OPNED);
 
 	RS9113_CHECK_EXP((network_type==WNIC_NETWORK_TYPE_INFRASTRUCTURE) \
-				|| (network_type==WNIC_NETWORK_TYPE_ADHOC), E_PAR);
+	                 || (network_type==WNIC_NETWORK_TYPE_ADHOC), E_PAR);
 
 	rs9113_info->init_status = WNIC_DURING_INITIALIZATION;  /* start initialization process */
 	rs9113_info->network_type = network_type; /* set network type used next */
@@ -169,8 +184,9 @@ int32_t rs9113_wnic_init(DEV_WNIC_PTR rs9113_wnic, uint32_t network_type)
 	RS9113_CHECK_EXP(ercd == E_OK, E_SYS);
 
 	//! Task created for Driver task
-	if(driver_task_handle == NULL){
-		rsi_task_create(rsi_wireless_driver_task, "driver_task", RSI_DRIVER_TASK_STACK_SIZE, NULL, RSI_DRIVER_TASK_PRIORITY, &driver_task_handle);
+	if (driver_task_handle == NULL) {
+		rsi_task_create(rsi_wireless_driver_task, "driver_task", RSI_DRIVER_TASK_STACK_SIZE, NULL, RSI_DRIVER_TASK_PRIORITY,
+		                &driver_task_handle);
 	}
 
 	//a short delay to wait the device get ready
@@ -185,6 +201,7 @@ int32_t rs9113_wnic_init(DEV_WNIC_PTR rs9113_wnic, uint32_t network_type)
 	rs9113_info->power_status = WNIC_POWER_NORMAL;
 	rs9113_info->init_status = WNIC_INIT_SUCCESSFUL;  /* stop initialization process */
 	rs9113_on_ops = &(rs9113_wnic->wnic_on_ops);
+
 	if (rs9113_on_ops->on_init_success != NULL) {
 		rs9113_on_ops->on_init_success(rs9113_wnic);
 	}
@@ -231,7 +248,7 @@ int32_t rs9113_set_network_type(DEV_WNIC_PTR rs9113_wnic, uint32_t type)
 	rs9113_info = &(rs9113_wnic->wnic_info);
 	RS9113_CHECK_EXP((rs9113_info->init_status==WNIC_INIT_SUCCESSFUL), E_CLSED);
 	RS9113_CHECK_EXP((type==WNIC_NETWORK_TYPE_INFRASTRUCTURE) \
-				|| (type==WNIC_NETWORK_TYPE_ADHOC), E_PAR);
+	                 || (type==WNIC_NETWORK_TYPE_ADHOC), E_PAR);
 
 	rs9113_info->network_type = type;
 
@@ -255,6 +272,7 @@ int32_t rs9113_set_macaddr(DEV_WNIC_PTR rs9113_wnic, uint8_t *mac)
 	rs9113_info->mac_status = WNIC_MAC_UPDATED;
 
 	rs9113_on_ops = &(rs9113_wnic->wnic_on_ops);
+
 	if (rs9113_on_ops->on_mac_updated != NULL) {
 		rs9113_on_ops->on_mac_updated(rs9113_wnic);
 	}
@@ -284,7 +302,8 @@ int32_t rs9113_get_macaddr(DEV_WNIC_PTR rs9113_wnic, uint8_t *mac)
 	return ercd;
 }
 
-rsi_rsp_scan_t scan_result;
+static rsi_rsp_scan_t scan_result;
+
 int32_t rs9113_start_scan(DEV_WNIC_PTR rs9113_wnic)
 {
 	int32_t ercd = E_OK;
@@ -349,16 +368,17 @@ int32_t rs9113_get_scan_result_cnt(DEV_WNIC_PTR rs9113_wnic)
 	} else {
 		ercd = 0;
 	}
+
 error_exit:
 	return ercd;
 }
 
-static rsi_scan_info_t * p_scan_result =  &(scan_result.scan_info);
+static rsi_scan_info_t *p_scan_result =  &(scan_result.scan_info);
 int32_t rs9113_get_scan_result(DEV_WNIC_PTR rs9113_wnic, uint32_t index, WNIC_SCAN_RESULT *result)
 {
 	int32_t ercd = E_OK;
 	DEV_WNIC_INFO *rs9113_info;
-	rsi_scan_info_t * p_scan_result_temp;
+	rsi_scan_info_t *p_scan_result_temp;
 	WNIC_AP_CONFIG apConfig_result;
 
 	RS9113_CHECK_EXP(rs9113_wnic!=NULL, E_OBJ);
@@ -374,26 +394,32 @@ int32_t rs9113_get_scan_result(DEV_WNIC_PTR rs9113_wnic, uint32_t index, WNIC_SC
 	memcpy(result->ssid, p_scan_result_temp->ssid, WNIC_SSID_MAX_LEN);
 	result->ssid[WNIC_SSID_MAX_LEN-1] = '\0'; /* make end of ssid */
 	result->ssidlen = strlen((char *)result->ssid);
-	switch(p_scan_result_temp->security_mode){
+
+	switch (p_scan_result_temp->security_mode) {
 		case 0://open
 			apConfig_result.ap_cfg.privacy = 0;
+
 		case 1://WPA
 			apConfig_result.ap_cfg.wpa = 1;
 			apConfig_result.ap_cfg.privacy = 1;
 			break;
+
 		case 2://WPA2
 			apConfig_result.ap_cfg.wpa2 = 1;
 			apConfig_result.ap_cfg.wpa = 1;
 			apConfig_result.ap_cfg.privacy = 1;
 			break;
+
 		case 3://WEP
 			apConfig_result.ap_cfg.privacy = 1;
 			break;
+
 		case 4://WAP Enterprise
 		case 5://WPA2 Enterprise
 		default:
 			break;
 	}
+
 	result->ap_config.apConfig = apConfig_result.apConfig;
 	result->rssi = p_scan_result_temp->rssi_val;
 	result->bsstype = p_scan_result_temp->network_type;
@@ -421,7 +447,7 @@ int32_t rs9113_wnic_connect(DEV_WNIC_PTR rs9113_wnic, uint32_t security, const u
 	RS9113_CHECK_EXP((rs9113_info->init_status==WNIC_INIT_SUCCESSFUL), E_CLSED);
 	RS9113_CHECK_EXP((rs9113_info->busy_status==WNIC_IS_FREE), E_CLS);
 	RS9113_CHECK_EXP((rs9113_info->conn_status==WNIC_NOT_CONNECTED) \
-				|| (rs9113_info->conn_status==WNIC_CONNECTED), E_CLS);
+	                 || (rs9113_info->conn_status==WNIC_CONNECTED), E_CLS);
 
 	if (rs9113_info->conn_status == WNIC_CONNECTED) {
 		/* if connected to a different ssid, just disconnect it */
@@ -436,14 +462,15 @@ int32_t rs9113_wnic_connect(DEV_WNIC_PTR rs9113_wnic, uint32_t security, const u
 	} else {
 		rs9113_wnic_disconnect(rs9113_wnic);
 	}
+
 	rs9113_info->busy_status = WNIC_IS_BUSY;
 
 	rs9113_info->conn_status = WNIC_DURING_CONNECTION;
 	memcpy(rs9113_info->ssid.ssid, ssid, ssid_len);
 	rs9113_info->ssid.ssid_len = ssid_len;
 
-rsi_security_mode_t rsi_security_type;
-void * rsi_secret_key;
+	rsi_security_mode_t rsi_security_type;
+	void *rsi_secret_key;
 
 	switch (security) {
 		case AUTH_SECURITY_OPEN:
@@ -460,17 +487,20 @@ void * rsi_secret_key;
 
 		case AUTH_SECURITY_WPA_WITH_PASS_PHRASE:
 			rsi_security_type = RSI_WPA;
-			rsi_secret_key = (void *)key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
+			rsi_secret_key = (void *)
+			                 key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
 			break;
 
 		case AUTH_SECURITY_WPA2_WITH_PASS_PHRASE:
 			rsi_security_type = RSI_WPA2;
-			rsi_secret_key = (void *)key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
+			rsi_secret_key = (void *)
+			                 key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
 			break;
 
 		case AUTH_SECURITY_WPA_AUTO_WITH_PASS_PHRASE:
 			rsi_security_type = RSI_WPA_WPA2_MIXED;
-			rsi_secret_key = (void *)key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
+			rsi_secret_key = (void *)
+			                 key->key;//PSK string terminated with NULL. Length of PSK should be greater than equal to 8 and less than 64 bytes.
 			break;
 
 		case AUTH_SECURITY_WPA_WITH_KEY:
@@ -493,35 +523,43 @@ void * rsi_secret_key;
 			rsi_secret_key = (void *)key->key;//8 bytes WPS PIN
 			break;
 
-		 case AUTH_SECURITY_WPA_AUTO_WITH_KEY:
-			//unsupported, need specify WPA/WPA2 PMK
+		case AUTH_SECURITY_WPA_AUTO_WITH_KEY:
+
+		//unsupported, need specify WPA/WPA2 PMK
 		default:
-		 	dbg_printf(DBG_LESS_INFO, "RS9113 does not support security type %d \r\n", security);
+			dbg_printf(DBG_LESS_INFO, "RS9113 does not support security type %d \r\n", security);
 			rs9113_info->conn_status = WNIC_NOT_CONNECTED;
 			rs9113_info->busy_status = WNIC_IS_FREE;
 			ercd = E_PAR;
 			goto error_exit;
 			break;
 	}
+
 	ercd = rsi_wlan_connect((int8_t *)ssid, rsi_security_type, rsi_secret_key);
-	dbg_printf(DBG_MORE_INFO, "rsi_wlan_connect return 0x%x when connect ssid %s with security type %d\r\n", ercd, ssid, rsi_security_type);
+	dbg_printf(DBG_MORE_INFO, "rsi_wlan_connect return 0x%x when connect ssid %s with security type %d\r\n", ercd, ssid,
+	           rsi_security_type);
 	rs9113_info->busy_status = WNIC_IS_FREE;
-	if(ercd != E_OK){
+
+	if (ercd != E_OK) {
 		rs9113_info->conn_status = WNIC_NOT_CONNECTED;
 		dbg_printf(DBG_LESS_INFO, "RS9113 wlan connect failed (return 0x%x )\r\n", ercd);
 		return ercd;
 	}
+
 	//register rs9113 on receive callback function
 	rsi_wlan_register_callbacks(RSI_WLAN_DATA_RECEIVE_NOTIFY_CB, rswifi_on_input);
 	rs9113_info->mac_status = WNIC_MAC_NOT_UPDATED;
 	rs9113_info->conn_status = WNIC_CONNECTED;
 	rs9113_on_ops = &(rs9113_wnic->wnic_on_ops);
+
 	if (rs9113_on_ops->on_init_success != NULL) {//update MAC address again
 		rs9113_on_ops->on_init_success(rs9113_wnic);
 	}
+
 	if (rs9113_on_ops->on_connected != NULL) {
 		rs9113_on_ops->on_connected(rs9113_wnic);
 	}
+
 error_exit:
 	return ercd;
 }
@@ -538,10 +576,12 @@ int32_t rs9113_poll_conn_status(DEV_WNIC_PTR rs9113_wnic)
 		ercd = rs9113_info->conn_status;
 		goto error_exit;
 	}
+
 	if (rs9113_info->conn_status == WNIC_CONNECTED) {
 		ercd = WNIC_CONNECTED;
 		goto error_exit;
 	}
+
 	ercd = rsi_wlan_get_status();
 	dbg_printf(DBG_MORE_INFO, "rsi_wlan_get_status ret %d\r\n", ercd);
 	rs9113_info->conn_status = ercd;
@@ -567,6 +607,7 @@ int32_t rs9113_wnic_disconnect(DEV_WNIC_PTR rs9113_wnic)
 		dbg_printf(DBG_MORE_INFO, "rsi_wlan_disconnect ret %d\r\n", ercd);
 		rs9113_info->conn_status = WNIC_NOT_CONNECTED;
 		rs9113_on_ops = &(rs9113_wnic->wnic_on_ops);
+
 		if (rs9113_on_ops->on_disconnected != NULL) {
 			rs9113_on_ops->on_disconnected(rs9113_wnic);
 		}
@@ -580,13 +621,14 @@ int32_t rs9113_prepare_tx(DEV_WNIC_PTR rs9113_wnic, uint32_t tx_len)
 {
 	int32_t ercd = E_OK;
 	rs9113_pbuf.buf = malloc(tx_len);
-	if(rs9113_pbuf.buf != NULL){
+
+	if (rs9113_pbuf.buf != NULL) {
 		rs9113_pbuf.len = tx_len;
-	}
-	else{
+	} else {
 		rs9113_pbuf.len = 0;
 		ercd = E_NOMEM;
 	}
+
 	rs9113_pbuf.cur_index = 0;
 
 error_exit:
@@ -604,9 +646,10 @@ int32_t rs9113_add_tx_data(DEV_WNIC_PTR rs9113_wnic, uint8_t *p_buf, uint32_t le
 	rs9113_info = &(rs9113_wnic->wnic_info);
 	RS9113_CHECK_EXP((rs9113_info->init_status==WNIC_INIT_SUCCESSFUL), E_CLSED);
 
-	if(rs9113_pbuf.cur_index + len > rs9113_pbuf.len){
+	if (rs9113_pbuf.cur_index + len > rs9113_pbuf.len) {
 		len = rs9113_pbuf.len - rs9113_pbuf.cur_index;
 	}
+
 	uint8_t *dest = rs9113_pbuf.buf + rs9113_pbuf.cur_index;
 	memcpy(dest, p_buf, len);
 	rs9113_pbuf.cur_index += len;
@@ -634,9 +677,11 @@ int32_t rs9113_commit_tx(DEV_WNIC_PTR rs9113_wnic, uint32_t len)
 
 error_exit:
 	free(rs9113_pbuf.buf);
-	if(rs9113_pbuf.buf != NULL){
+
+	if (rs9113_pbuf.buf != NULL) {
 		rs9113_pbuf.buf = NULL;
 	}
+
 	return ercd;
 }
 

device/peripheral/wifi/rs9113/rs9113_adapter.h

@@ -27,8 +27,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
 --------------------------------------------- */
-#ifndef RS9113_ADAPTER_H_
-#define	RS9113_ADAPTER_H_
+#ifndef _RS9113_ADAPTER_H_
+#define	_RS9113_ADAPTER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,4 +123,4 @@ extern void rs9113_period_process(DEV_WNIC *rs9113_wnic, void *ptr);
 }
 #endif
 
-#endif	/* RS9113_ADAPTER_H_ */
+#endif	/* _RS9113_ADAPTER_H_ */