Commit 36d98c18 authored by Tahia Khan's avatar Tahia Khan Committed by Greg Kroah-Hartman

staging: wilc1000: Rename tstrRSSI members and change type of u8Full to bool

Remove Hungarian notation and camel casing from all tstrRSSI members'
names. Additionally, change type of u8Full to bool since it only takes
values 1 or 0.
Signed-off-by: default avatarTahia Khan <tahia.khan@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3ae44fc
...@@ -71,9 +71,9 @@ enum connect_status { ...@@ -71,9 +71,9 @@ enum connect_status {
}; };
struct rssi_history_buffer { struct rssi_history_buffer {
u8 u8Full; bool full;
u8 u8Index; u8 index;
s8 as8RSSI[NUM_RSSI]; s8 samples[NUM_RSSI];
}; };
struct network_info { struct network_info {
......
...@@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info) ...@@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info)
{ {
u8 i; u8 i;
int rssi_v = 0; int rssi_v = 0;
u8 num_rssi = (network_info->str_rssi.u8Full) ? u8 num_rssi = (network_info->str_rssi.full) ?
NUM_RSSI : (network_info->str_rssi.u8Index); NUM_RSSI : (network_info->str_rssi.index);
for (i = 0; i < num_rssi; i++) for (i = 0; i < num_rssi; i++)
rssi_v += network_info->str_rssi.as8RSSI[i]; rssi_v += network_info->str_rssi.samples[i];
rssi_v /= num_rssi; rssi_v /= num_rssi;
return rssi_v; return rssi_v;
...@@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, ...@@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
} else { } else {
ap_index = ap_found; ap_index = ap_found;
} }
rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index; rssi_index = last_scanned_shadow[ap_index].str_rssi.index;
last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi; last_scanned_shadow[ap_index].str_rssi.samples[rssi_index++] = pstrNetworkInfo->rssi;
if (rssi_index == NUM_RSSI) { if (rssi_index == NUM_RSSI) {
rssi_index = 0; rssi_index = 0;
last_scanned_shadow[ap_index].str_rssi.u8Full = 1; last_scanned_shadow[ap_index].str_rssi.full = true;
} }
last_scanned_shadow[ap_index].str_rssi.u8Index = rssi_index; last_scanned_shadow[ap_index].str_rssi.index = rssi_index;
last_scanned_shadow[ap_index].rssi = pstrNetworkInfo->rssi; last_scanned_shadow[ap_index].rssi = pstrNetworkInfo->rssi;
last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info; last_scanned_shadow[ap_index].cap_info = pstrNetworkInfo->cap_info;
last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len; last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment