You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/06/17 07:17:12 UTC
[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a diff in pull request #6464: wireless/bcm43xxx: add more ioctl command support
xiaoxiang781216 commented on code in PR #6464:
URL: https://github.com/apache/incubator-nuttx/pull/6464#discussion_r899829384
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c:
##########
@@ -1370,15 +1396,256 @@ int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
out_len = 4;
value = iwr->u.mode == IW_MODE_INFRA ? 1 : 0;
- if (bcmf_cdc_ioctl(priv, interface, true,
- WLC_SET_INFRA, (uint8_t *)&value, &out_len))
+
+ return bcmf_cdc_ioctl(priv, interface, true,
+ WLC_SET_INFRA, (uint8_t *)&value, &out_len);
+}
+
+int bcmf_wl_get_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ uint32_t infra;
+ int interface;
+ uint32_t ap;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
{
- return -EIO;
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_INFRA, (uint8_t *)&infra, &out_len);
+ if (ret == OK)
+ {
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_AP, (uint8_t *)&ap, &out_len);
+ }
+
+ if (ret == OK)
+ {
+ if (infra == 0)
+ {
+ iwr->u.mode = IW_MODE_ADHOC;
+ }
+ else if (ap)
+ {
+ iwr->u.mode = IW_MODE_MASTER;
+ }
+ else
+ {
+ iwr->u.mode = IW_MODE_INFRA;
+ }
+ }
+
+ return ret;
+}
+
+int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+ int ap = 0;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false, WLC_GET_AP,
+ (uint8_t *)&ap, &out_len);
+ if (ret == OK)
+ {
+ out_len = sizeof(struct ether_addr);
+ ret = bcmf_cdc_ioctl(priv, interface, true,
+ (ap ? WLC_SET_BSSID : WLC_REASSOC),
+ (uint8_t *)iwr->u.ap_addr.sa_data, &out_len);
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ iwr->u.ap_addr.sa_family = ARPHRD_ETHER;
+ 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);
+}
+
+int bcmf_wl_get_channel(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ channel_info_t ci;
+ uint32_t out_len;
+ int interface;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = sizeof(ci);
+
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_CHANNEL, (uint8_t *)&ci, &out_len);
+ if (ret == OK)
+ {
+ iwr->u.freq.m = bcmf_wl_channel_to_frequency(ci.target_channel);
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_rate(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ uint32_t rate;
+ int interface;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_RATE, (uint8_t *)&rate, &out_len);
+ if (ret == OK)
+ {
+ iwr->u.bitrate.value = ((rate / 2) * 1000) + ((rate & 1) ? 500 : 0);
+ iwr->u.bitrate.fixed = 1;
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_txpower(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+ int radio;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
Review Comment:
sizeof(radio)
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c:
##########
@@ -1370,15 +1396,256 @@ int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
out_len = 4;
value = iwr->u.mode == IW_MODE_INFRA ? 1 : 0;
- if (bcmf_cdc_ioctl(priv, interface, true,
- WLC_SET_INFRA, (uint8_t *)&value, &out_len))
+
+ return bcmf_cdc_ioctl(priv, interface, true,
+ WLC_SET_INFRA, (uint8_t *)&value, &out_len);
+}
+
+int bcmf_wl_get_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ uint32_t infra;
+ int interface;
+ uint32_t ap;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
{
- return -EIO;
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_INFRA, (uint8_t *)&infra, &out_len);
+ if (ret == OK)
+ {
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_AP, (uint8_t *)&ap, &out_len);
+ }
+
+ if (ret == OK)
+ {
+ if (infra == 0)
+ {
+ iwr->u.mode = IW_MODE_ADHOC;
+ }
+ else if (ap)
+ {
+ iwr->u.mode = IW_MODE_MASTER;
+ }
+ else
+ {
+ iwr->u.mode = IW_MODE_INFRA;
+ }
+ }
+
+ return ret;
+}
+
+int bcmf_wl_set_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+ int ap = 0;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false, WLC_GET_AP,
+ (uint8_t *)&ap, &out_len);
+ if (ret == OK)
+ {
+ out_len = sizeof(struct ether_addr);
+ ret = bcmf_cdc_ioctl(priv, interface, true,
+ (ap ? WLC_SET_BSSID : WLC_REASSOC),
+ (uint8_t *)iwr->u.ap_addr.sa_data, &out_len);
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_bssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ iwr->u.ap_addr.sa_family = ARPHRD_ETHER;
+ 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);
+}
+
+int bcmf_wl_get_channel(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ channel_info_t ci;
+ uint32_t out_len;
+ int interface;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = sizeof(ci);
+
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_CHANNEL, (uint8_t *)&ci, &out_len);
+ if (ret == OK)
+ {
+ iwr->u.freq.m = bcmf_wl_channel_to_frequency(ci.target_channel);
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_rate(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ uint32_t rate;
+ int interface;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_RATE, (uint8_t *)&rate, &out_len);
+ if (ret == OK)
+ {
+ iwr->u.bitrate.value = ((rate / 2) * 1000) + ((rate & 1) ? 500 : 0);
+ iwr->u.bitrate.fixed = 1;
+ }
+
+ return ret;
+}
+
+int bcmf_wl_get_txpower(FAR struct bcmf_dev_s *priv, struct iwreq *iwr)
+{
+ uint32_t out_len;
+ int interface;
+ int radio;
+ int ret;
+
+ interface = bcmf_wl_get_interface(priv, iwr);
+
+ if (interface < 0)
+ {
+ return -EINVAL;
+ }
+
+ out_len = 4;
+ ret = bcmf_cdc_ioctl(priv, interface, false,
+ WLC_GET_RADIO, (uint8_t *)&radio, &out_len);
+ if (ret == OK)
+ {
+ out_len = 4;
Review Comment:
sizeof(iwr->u.txpower.value)
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h:
##########
@@ -2712,6 +2712,13 @@ typedef struct wl_rssi_event
int8_t rssi_levels[MAX_RSSI_LEVELS];
} wl_rssi_event_t;
+typedef struct wl_sta_rssi
+{
+ uint32_t rssi;
+ struct ether_addr sta_addr;
+ uint16_t foo;
Review Comment:
why name foo?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org