| Message ID | e4e0e4da09635d0cb7ef43223022490b6de739a8.1487912400.git.tahia.khan@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Fri, 24 Feb 2017, Tahia Khan wrote: > 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. Acked-by: Julia Lawall <julia.lawall@lip6.fr> Maybe the second line of the commit message is a little too long. It is under 80 characters, but they come out a bit indented in the git log, so a little shorter is better. julia > > Signed-off-by: Tahia Khan <tahia.khan@gmail.com> > --- > drivers/staging/wilc1000/coreconfigurator.h | 6 +++--- > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++------- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h > index 1c77529..9712d89 100644 > --- a/drivers/staging/wilc1000/coreconfigurator.h > +++ b/drivers/staging/wilc1000/coreconfigurator.h > @@ -71,9 +71,9 @@ enum connect_status { > }; > > struct rssi_history_buffer { > - u8 u8Full; > - u8 u8Index; > - s8 as8RSSI[NUM_RSSI]; > + bool full; > + u8 index; > + s8 samples[NUM_RSSI]; > }; > > struct network_info { > diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > index f7ce47c..9601ab8 100644 > --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > @@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info) > { > u8 i; > int rssi_v = 0; > - u8 num_rssi = (network_info->str_rssi.u8Full) ? > - NUM_RSSI : (network_info->str_rssi.u8Index); > + u8 num_rssi = (network_info->str_rssi.full) ? > + NUM_RSSI : (network_info->str_rssi.index); > > 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; > return rssi_v; > @@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, > } else { > ap_index = ap_found; > } > - rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index; > - last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi; > + rssi_index = last_scanned_shadow[ap_index].str_rssi.index; > + last_scanned_shadow[ap_index].str_rssi.samples[rssi_index++] = pstrNetworkInfo->rssi; > if (rssi_index == NUM_RSSI) { > 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].cap_info = pstrNetworkInfo->cap_info; > last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len; > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/e4e0e4da09635d0cb7ef43223022490b6de739a8.1487912400.git.tahia.khan%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 1c77529..9712d89 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -71,9 +71,9 @@ enum connect_status { }; struct rssi_history_buffer { - u8 u8Full; - u8 u8Index; - s8 as8RSSI[NUM_RSSI]; + bool full; + u8 index; + s8 samples[NUM_RSSI]; }; struct network_info { diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index f7ce47c..9601ab8 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -205,11 +205,11 @@ static u32 get_rssi_avg(struct network_info *network_info) { u8 i; int rssi_v = 0; - u8 num_rssi = (network_info->str_rssi.u8Full) ? - NUM_RSSI : (network_info->str_rssi.u8Index); + u8 num_rssi = (network_info->str_rssi.full) ? + NUM_RSSI : (network_info->str_rssi.index); 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; return rssi_v; @@ -346,13 +346,13 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, } else { ap_index = ap_found; } - rssi_index = last_scanned_shadow[ap_index].str_rssi.u8Index; - last_scanned_shadow[ap_index].str_rssi.as8RSSI[rssi_index++] = pstrNetworkInfo->rssi; + rssi_index = last_scanned_shadow[ap_index].str_rssi.index; + last_scanned_shadow[ap_index].str_rssi.samples[rssi_index++] = pstrNetworkInfo->rssi; if (rssi_index == NUM_RSSI) { 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].cap_info = pstrNetworkInfo->cap_info; last_scanned_shadow[ap_index].ssid_len = pstrNetworkInfo->ssid_len;
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: Tahia Khan <tahia.khan@gmail.com> --- drivers/staging/wilc1000/coreconfigurator.h | 6 +++--- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-)