diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c index f2044153442..87b062af5ef 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c @@ -176,16 +176,19 @@ static int bcmf_driver_download_clm(FAR struct bcmf_dev_s *priv); /* FIXME only for debug purpose */ static void bcmf_wl_radio_event_handler(FAR struct bcmf_dev_s *priv, - struct bcmf_event_s *event, unsigned int len); + FAR struct bcmf_event_s *event, + unsigned int len); static void bcmf_wl_scan_event_handler(FAR struct bcmf_dev_s *priv, - struct bcmf_event_s *event, unsigned int len); + FAR struct bcmf_event_s *event, + unsigned int len); static void bcmf_wl_auth_event_handler(FAR struct bcmf_dev_s *priv, - struct bcmf_event_s *event, unsigned int len); + FAR struct bcmf_event_s *event, + unsigned int len); static int bcmf_wl_get_interface(FAR struct bcmf_dev_s *priv, - struct iwreq *iwr); + FAR struct iwreq *iwr); /**************************************************************************** * Private Functions @@ -232,7 +235,7 @@ int bcmf_wl_set_mac_address(FAR struct bcmf_dev_s *priv, struct ifreq *req) ret = bcmf_cdc_iovar_request(priv, CHIP_STA_INTERFACE, true, IOVAR_STR_CUR_ETHERADDR, - (uint8_t *)req->ifr_hwaddr.sa_data, + (FAR uint8_t *)req->ifr_hwaddr.sa_data, &out_len); if (ret != OK) { @@ -313,7 +316,7 @@ int bcmf_driver_download_clm(FAR struct bcmf_dev_s *priv) /* CLM header */ - dlhead = (struct wl_dload_data *)downloadbuff; + dlhead = (FAR struct wl_dload_data *)downloadbuff; dlhead->flag = (DLOAD_HANDLER_VER << DLOAD_FLAG_VER_SHIFT) | dl_flag; dlhead->dload_type = DL_TYPE_CLM; @@ -590,7 +593,7 @@ int bcmf_driver_initialize(FAR struct bcmf_dev_s *priv) ****************************************************************************/ void bcmf_wl_radio_event_handler(FAR struct bcmf_dev_s *priv, - struct bcmf_event_s *event, + FAR struct bcmf_event_s *event, unsigned int len) { wlinfo("Unhandled radio event from <%s>\n", event->src_name); @@ -601,7 +604,7 @@ void bcmf_wl_radio_event_handler(FAR struct bcmf_dev_s *priv, ****************************************************************************/ void bcmf_wl_auth_event_handler(FAR struct bcmf_dev_s *priv, - struct bcmf_event_s *event, + FAR struct bcmf_event_s *event, unsigned int len) { bool auth = false; @@ -1116,7 +1119,7 @@ void bcmf_wl_scan_timeout(wdparm_t arg) * Name: bcmf_wl_get_interface ****************************************************************************/ -int bcmf_wl_get_interface(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) +int bcmf_wl_get_interface(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr) { /* TODO resolve interface using iwr->ifr_name */ @@ -1222,13 +1225,13 @@ int bcmf_wl_enable(FAR struct bcmf_dev_s *priv, bool enable) * Start a WiFi scan. ****************************************************************************/ -int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) +int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr) { int ret; uint32_t out_len; uint32_t value; int interface; - struct iw_scan_req *req; + FAR struct iw_scan_req *req; struct wl_escan_params scan_params; interface = bcmf_wl_get_interface(priv, iwr); @@ -1256,7 +1259,7 @@ int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) if (iwr->u.data.pointer && iwr->u.data.length >= sizeof(*req)) { - req = (struct iw_scan_req *)iwr->u.data.pointer; + req = (FAR struct iw_scan_req *)iwr->u.data.pointer; memcpy(&scan_params.params.bssid, req->bssid.sa_data, sizeof(scan_params.params.bssid)); @@ -1325,8 +1328,9 @@ int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(scan_params); if (bcmf_cdc_iovar_request_unsafe(priv, CHIP_STA_INTERFACE, true, - IOVAR_STR_ESCAN, (uint8_t *)&scan_params, - &out_len)) + IOVAR_STR_ESCAN, + (FAR uint8_t *)&scan_params, + &out_len)) { ret = -EIO; goto exit_sem_post; @@ -1466,7 +1470,7 @@ int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) if (bcmf_cdc_iovar_request(priv, interface, true, "bsscfg:"IOVAR_STR_SUP_WPA, - (uint8_t *)wpa_version, + (FAR uint8_t *)wpa_version, &out_len)) { return -EIO; @@ -1474,7 +1478,7 @@ int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = 4; if (bcmf_cdc_ioctl(priv, interface, true, WLC_SET_WPA_AUTH, - (uint8_t *)&auth_mode, &out_len)) + (FAR uint8_t *)&auth_mode, &out_len)) { return -EIO; } @@ -1516,7 +1520,8 @@ int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = 4; if (bcmf_cdc_ioctl(priv, interface, true, - WLC_SET_WSEC, (uint8_t *)&cipher_mode, + WLC_SET_WSEC, + (FAR uint8_t *)&cipher_mode, &out_len)) { return -EIO; @@ -1526,7 +1531,8 @@ int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = 4; if (bcmf_cdc_ioctl(priv, interface, true, - WLC_SET_AUTH, (uint8_t *)&wep_auth, + WLC_SET_AUTH, + (FAR uint8_t *)&wep_auth, &out_len)) { return -EIO; @@ -1575,7 +1581,7 @@ int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) value = iwr->u.mode == IW_MODE_INFRA ? 1 : 0; return bcmf_cdc_ioctl(priv, interface, true, - WLC_SET_INFRA, (uint8_t *)&value, &out_len); + WLC_SET_INFRA, (FAR uint8_t *)&value, &out_len); } /**************************************************************************** @@ -1602,12 +1608,12 @@ int bcmf_wl_get_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(infra); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_INFRA, (uint8_t *)&infra, &out_len); + WLC_GET_INFRA, (FAR uint8_t *)&infra, &out_len); if (ret == OK) { out_len = sizeof(ap); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_AP, (uint8_t *)&ap, &out_len); + WLC_GET_AP, (FAR uint8_t *)&ap, &out_len); } if (ret == OK) @@ -1653,12 +1659,12 @@ int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(ap); ret = bcmf_cdc_ioctl(priv, interface, false, WLC_GET_AP, - (uint8_t *)&ap, &out_len); + (FAR uint8_t *)&ap, &out_len); if (ret == OK) { out_len = sizeof(infra); ret = bcmf_cdc_ioctl(priv, interface, false, WLC_GET_INFRA, - (uint8_t *)&infra, &out_len); + (FAR uint8_t *)&infra, &out_len); if (ret == OK) { @@ -1666,7 +1672,8 @@ int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) ret = bcmf_cdc_ioctl(priv, interface, true, ((ap || !infra) ? WLC_SET_BSSID : WLC_REASSOC), - (uint8_t *)iwr->u.ap_addr.sa_data, &out_len); + (FAR uint8_t *)iwr->u.ap_addr.sa_data, + &out_len); } } @@ -1696,7 +1703,7 @@ int bcmf_wl_get_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(struct ether_addr); return bcmf_cdc_ioctl(priv, interface, false, WLC_GET_BSSID, - (uint8_t *)iwr->u.ap_addr.sa_data, &out_len); + (FAR uint8_t *)iwr->u.ap_addr.sa_data, &out_len); } /**************************************************************************** @@ -1722,7 +1729,7 @@ int bcmf_wl_get_channel(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(ci); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_CHANNEL, (uint8_t *)&ci, &out_len); + WLC_GET_CHANNEL, (FAR uint8_t *)&ci, &out_len); if (ret == OK) { iwr->u.freq.m = bcmf_wl_channel_to_frequency(ci.target_channel); @@ -1754,7 +1761,7 @@ int bcmf_wl_get_rate(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(rate); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_RATE, (uint8_t *)&rate, &out_len); + WLC_GET_RATE, (FAR uint8_t *)&rate, &out_len); if (ret == OK) { iwr->u.bitrate.value = ((rate / 2) * 1000) + ((rate & 1) ? 500 : 0); @@ -1787,13 +1794,13 @@ int bcmf_wl_get_txpower(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(radio); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_RADIO, (uint8_t *)&radio, &out_len); + WLC_GET_RADIO, (FAR uint8_t *)&radio, &out_len); if (ret == OK) { out_len = sizeof(iwr->u.txpower.value); ret = bcmf_cdc_iovar_request(priv, interface, false, IOVAR_STR_QTXPOWER, - (uint8_t *)&(iwr->u.txpower.value), + (FAR uint8_t *)&(iwr->u.txpower.value), &out_len); if (ret == OK) { @@ -1842,7 +1849,7 @@ int bcmf_wl_get_iwrange(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(ci); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_CHANNEL, (uint8_t *)&ci, &out_len); + WLC_GET_CHANNEL, (FAR uint8_t *)&ci, &out_len); if (ret == OK) { range->num_frequency = 1; @@ -1878,7 +1885,7 @@ int bcmf_wl_get_rssi(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) out_len = sizeof(rssi); ret = bcmf_cdc_ioctl(priv, interface, false, - WLC_GET_RSSI, (uint8_t *)&rssi, &out_len); + WLC_GET_RSSI, (FAR uint8_t *)&rssi, &out_len); if (ret == OK) { iwr->u.sens.value = -rssi.rssi; @@ -1907,7 +1914,7 @@ int bcmf_wl_set_encode_ext(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) return -EINVAL; } - ext = (struct iw_encode_ext *)iwr->u.encoding.pointer; + ext = (FAR struct iw_encode_ext *)iwr->u.encoding.pointer; switch (ext->alg) { diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h index d67749d6289..580f9fe3dbc 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h @@ -69,8 +69,8 @@ struct bcmf_dev_s /* This holds the information visible to the NuttX network */ - struct net_driver_s bc_dev; /* Network interface structure */ - struct bcmf_frame_s *cur_tx_frame; /* Frame used to interface network layer */ + struct net_driver_s bc_dev; /* Network interface structure */ + FAR struct bcmf_frame_s *cur_tx_frame; /* Frame used to interface network layer */ /* Event registration array */ @@ -80,7 +80,7 @@ struct bcmf_dev_s sem_t control_timeout; /* Semaphore to wait for control frame rsp */ uint16_t control_reqid; /* Current control request id */ uint16_t control_rxdata_len; /* Received control frame out buffer length */ - uint8_t *control_rxdata; /* Received control frame out buffer */ + FAR uint8_t *control_rxdata; /* Received control frame out buffer */ uint32_t control_status; /* Last received frame status */ /* AP Scan state machine. @@ -92,10 +92,10 @@ struct bcmf_dev_s FAR wl_bss_info_t *scan_result; /* Temp buffer that holds results */ unsigned int scan_result_entries; /* Current entries of temp buffer */ - sem_t *auth_signal; /* Authentication notification signal */ - uint32_t auth_status; /* Authentication status */ - wsec_pmk_t auth_pmk; /* Authentication pmk */ - bool auth_pending; /* Authentication pending */ + FAR sem_t *auth_signal; /* Authentication notification signal */ + uint32_t auth_status; /* Authentication status */ + wsec_pmk_t auth_pmk; /* Authentication pmk */ + bool auth_pending; /* Authentication pending */ #ifdef CONFIG_IEEE80211_BROADCOM_LOWPOWER struct work_s lp_work_ifdown; /* Ifdown work to work queue */ @@ -110,7 +110,8 @@ struct bcmf_dev_s struct bcmf_bus_dev_s { void (*stop)(FAR struct bcmf_dev_s *priv); - int (*txframe)(FAR struct bcmf_dev_s *priv, struct bcmf_frame_s *frame, + int (*txframe)(FAR struct bcmf_dev_s *priv, + FAR struct bcmf_frame_s *frame, bool control); struct bcmf_frame_s *(*rxframe)(FAR struct bcmf_dev_s *priv); @@ -132,9 +133,9 @@ struct bcmf_bus_dev_s struct bcmf_frame_s { - uint8_t *base; /* Frame base buffer used by low level layer (SDIO) */ - uint8_t *data; /* Payload data (Control, data and event messages) */ - uint16_t len; /* Frame buffer size */ + FAR uint8_t *base; /* Frame base buffer used by low level layer (SDIO) */ + FAR uint8_t *data; /* Payload data (Control, data and event messages) */ + uint16_t len; /* Frame buffer size */ }; /**************************************************************************** @@ -148,7 +149,8 @@ int bcmf_driver_initialize(FAR struct bcmf_dev_s *priv); /* IOCTLs network interface implementation */ -int bcmf_wl_set_mac_address(FAR struct bcmf_dev_s *priv, struct ifreq *req); +int bcmf_wl_set_mac_address(FAR struct bcmf_dev_s *priv, + FAR struct ifreq *req); int bcmf_wl_enable(FAR struct bcmf_dev_s *priv, bool enable); @@ -163,36 +165,39 @@ int bcmf_wl_set_country_code(FAR struct bcmf_dev_s *priv, /* IOCTLs AP scan interface implementation */ -int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_scan_results(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_scan_results(FAR struct bcmf_dev_s *priv, + FAR struct iwreq *iwr); /* IOCTLs authentication interface implementation */ -int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_auth_param(FAR struct bcmf_dev_s *priv, + FAR struct iwreq *iwr); -int bcmf_wl_set_encode_ext(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_encode_ext(FAR struct bcmf_dev_s *priv, + FAR struct iwreq *iwr); -int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); -int bcmf_wl_get_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); +int bcmf_wl_get_mode(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_set_ssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); -int bcmf_wl_get_ssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_ssid(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); +int bcmf_wl_get_ssid(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); -int bcmf_wl_get_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); +int bcmf_wl_get_bssid(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_channel(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_channel(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_rate(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_rate(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_txpower(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_txpower(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_rssi(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_rssi(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_get_iwrange(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_get_iwrange(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); -int bcmf_wl_set_country(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); -int bcmf_wl_get_country(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); +int bcmf_wl_set_country(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); +int bcmf_wl_get_country(FAR struct bcmf_dev_s *priv, FAR struct iwreq *iwr); #endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_DRIVER_H */