mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/ninaw10: Fix BSSID byte order, and add null byte to ESSID.

Browse Source 
- Fix the BSSID byte order from scan and netinfo.
- Make sure ESSID from netinfo is null terminated.
This commit is contained in:
iabdalkader 2021-11-17 17:32:09 +02:00 committed by Damien George
parent 841eeb158e
commit b65d17fced
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ninaw10/nina_wifi_drv.c
View File

@ -344,6 +344,14 @@ static int nina_send_command_read_vals(uint32_t cmd, uint32_t nargs,
return 0; return 0;
} }
static void nina_fix_mac_addr(uint8_t *mac) {
for (int i = 0; i < 3; i++) {
uint8_t b = mac[i];
mac[i] = mac[5 - i];
mac[5 - i] = b;
}
}
int nina_init(void) { int nina_init(void) {
// Initialize the BSP. // Initialize the BSP.
nina_bsp_init(); nina_bsp_init();
@ -541,12 +549,18 @@ int nina_netinfo(nina_netinfo_t *netinfo) {
return -1; return -1;
} }
// Null terminate SSID.
netinfo->ssid[MIN((NINA_MAX_SSID_LEN - 1), ssid_len)] = 0;
if (nina_send_command_read_vals(NINA_CMD_GET_BSSID, if (nina_send_command_read_vals(NINA_CMD_GET_BSSID,
1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)), 1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
1, ARG_8BITS, NINA_VALS({&bssid_len, &netinfo->bssid})) != 0) { 1, ARG_8BITS, NINA_VALS({&bssid_len, &netinfo->bssid})) != 0) {
return -1; return -1;
} }
// The MAC address is read in reverse from the firmware.
nina_fix_mac_addr(netinfo->bssid);
return 0; return 0;
} }
@ -630,6 +644,9 @@ int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout) {
return -1; return -1;
} }
// The MAC address is read in reverse from the firmware.
nina_fix_mac_addr(scan_result.bssid);
scan_callback(&scan_result, arg); scan_callback(&scan_result, arg);
} }