sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Photon: Small update from Simon Piriou.

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-14 08:39:53 -06:00
parent 06db5614e7
commit fa649df52e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/wireless/ieee80211/bcmf_driver.c
View File

@ -370,7 +370,6 @@ void bcmf_wl_scan_event_handler(FAR struct bcmf_dev_s *priv,
struct bcmf_event_s *event, unsigned int len) struct bcmf_event_s *event, unsigned int len)
{ {
uint32_t status; uint32_t status;
uint32_t reason;
uint32_t event_len; uint32_t event_len;
struct wl_escan_result *result; struct wl_escan_result *result;
struct wl_bss_info *bss; struct wl_bss_info *bss;
@ -387,7 +386,6 @@ void bcmf_wl_scan_event_handler(FAR struct bcmf_dev_s *priv,
} }
status = bcmf_getle32(&event->status); status = bcmf_getle32(&event->status);
reason = bcmf_getle32(&event->reason);
escan_result_len = bcmf_getle32(&event->len); escan_result_len = bcmf_getle32(&event->len);
len -= sizeof(struct bcmf_event_s); len -= sizeof(struct bcmf_event_s);
@ -464,7 +462,7 @@ wl_escan_result_processed:
/* Scan done */ /* Scan done */
wlinfo("escan done event %d %d\n", status, reason); wlinfo("escan done event %d %d\n", status, bcmf_getle32(&event->reason));
wd_cancel(priv->scan_timeout); wd_cancel(priv->scan_timeout);

10
drivers/wireless/ieee80211/bcmf_netdev.c
View File

@ -177,7 +177,7 @@ int bcmf_netdev_alloc_tx_frame(FAR struct bcmf_dev_s *priv)
priv->cur_tx_frame = bcmf_bdc_allocate_frame(priv, MAX_NET_DEV_MTU, true); priv->cur_tx_frame = bcmf_bdc_allocate_frame(priv, MAX_NET_DEV_MTU, true);
if (!priv->cur_tx_frame) if (!priv->cur_tx_frame)
{ {
wlerr("Cannot allocate TX frame\n"); wlerr("ERROR: Cannot allocate TX frame\n");
return -ENOMEM; return -ENOMEM;
} }
@ -215,7 +215,7 @@ static int bcmf_transmit(FAR struct bcmf_dev_s *priv,
if (ret) if (ret)
{ {
wlerr("Failed to transmit frame\n"); wlerr("ERROR: Failed to transmit frame\n");
return -EIO; return -EIO;
} }
@ -392,7 +392,7 @@ static void bcmf_receive(FAR struct bcmf_dev_s *priv)
else else
#endif #endif
{ {
wlinfo("RX dropped\n"); wlerr("ERROR: RX dropped\n");
NETDEV_RXDROPPED(&priv->bc_dev); NETDEV_RXDROPPED(&priv->bc_dev);
priv->bus->free_frame(priv, frame); priv->bus->free_frame(priv, frame);
} }
@ -992,11 +992,11 @@ static int bcmf_ioctl(FAR struct net_driver_s *dev, int cmd,
switch (cmd) switch (cmd)
{ {
case SIOCSIWSCAN: case SIOCSIWSCAN:
ret = bcmf_wl_start_scan(priv, (struct ifreq *)arg); ret = bcmf_wl_start_scan(priv, (struct iwreq *)arg);
break; break;
case SIOCGIWSCAN: case SIOCGIWSCAN:
ret = bcmf_wl_get_scan_results(priv, (struct ifreq *)arg); ret = bcmf_wl_get_scan_results(priv, (struct iwreq *)arg);
break; break;
case SIOCSIFHWADDR: /* Set device MAC address */ case SIOCSIFHWADDR: /* Set device MAC address */