Skip to content

Commit

Permalink
libertas: move to uniform lbs_/LBS_ namespace
Browse files Browse the repository at this point in the history 
This patch unifies the namespace of variables, functions defines
and structures. It does:

- rename libertas_XXX to lbs_XXX
- rename LIBERTAS_XXX to lbs_XXX
- rename wlan_XXX to lbs_XXX
- rename WLAN_XXX to LBS_XXX (but only those that were
  defined in libertas-local *.h files, e.g. not defines
  from net/ieee80211.h)

While passing, I fixed some checkpatch.pl errors too.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Jan 28, 2008
1 parent 9a62f73 commit 1007832
Show file tree
Hide file tree
Showing 29 changed files with 1,546 additions and 1,542 deletions.
72 changes: 36 additions & 36 deletions drivers/net/wireless/libertas/11d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static struct chan_freq_power channel_freq_power_UN_BG[] = {
{14, 2484, TX_PWR_DEFAULT}
};

static u8 wlan_region_2_code(u8 * region)
static u8 lbs_region_2_code(u8 *region)
{
u8 i;

Expand All @@ -60,7 +60,7 @@ static u8 wlan_region_2_code(u8 * region)
return (region_code_mapping[0].code);
}

static u8 *wlan_code_2_region(u8 code)
static u8 *lbs_code_2_region(u8 code)
{
u8 i;

Expand All @@ -79,7 +79,7 @@ static u8 *wlan_code_2_region(u8 code)
* @param nrchan number of channels
* @return the nrchan-th chan number
*/
static u8 wlan_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 * chan)
static u8 lbs_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 *chan)
/*find the nrchan-th chan after the firstchan*/
{
u8 i;
Expand Down Expand Up @@ -113,7 +113,7 @@ static u8 wlan_get_chan_11d(u8 band, u8 firstchan, u8 nrchan, u8 * chan)
* @param parsed_region_chan pointer to parsed_region_chan_11d
* @return TRUE; FALSE
*/
static u8 wlan_channel_known_11d(u8 chan,
static u8 lbs_channel_known_11d(u8 chan,
struct parsed_region_chan_11d * parsed_region_chan)
{
struct chan_power_11d *chanpwr = parsed_region_chan->chanpwr;
Expand All @@ -134,7 +134,7 @@ static u8 wlan_channel_known_11d(u8 chan,
return 0;
}

u32 libertas_chan_2_freq(u8 chan, u8 band)
u32 lbs_chan_2_freq(u8 chan, u8 band)
{
struct chan_freq_power *cf;
u16 i;
Expand All @@ -152,7 +152,7 @@ u32 libertas_chan_2_freq(u8 chan, u8 band)

static int generate_domain_info_11d(struct parsed_region_chan_11d
*parsed_region_chan,
struct wlan_802_11d_domain_reg * domaininfo)
struct lbs_802_11d_domain_reg *domaininfo)
{
u8 nr_subband = 0;

Expand Down Expand Up @@ -217,7 +217,7 @@ static int generate_domain_info_11d(struct parsed_region_chan_11d
* @param *parsed_region_chan pointer to parsed_region_chan_11d
* @return N/A
*/
static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_chan,
static void lbs_generate_parsed_region_chan_11d(struct region_channel *region_chan,
struct parsed_region_chan_11d *
parsed_region_chan)
{
Expand All @@ -238,7 +238,7 @@ static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_
parsed_region_chan->band = region_chan->band;
parsed_region_chan->region = region_chan->region;
memcpy(parsed_region_chan->countrycode,
wlan_code_2_region(region_chan->region), COUNTRY_CODE_LEN);
lbs_code_2_region(region_chan->region), COUNTRY_CODE_LEN);

lbs_deb_11d("region 0x%x, band %d\n", parsed_region_chan->region,
parsed_region_chan->band);
Expand All @@ -264,7 +264,7 @@ static void wlan_generate_parsed_region_chan_11d(struct region_channel * region_
* @param chan chan
* @return TRUE;FALSE
*/
static u8 wlan_region_chan_supported_11d(u8 region, u8 band, u8 chan)
static u8 lbs_region_chan_supported_11d(u8 region, u8 band, u8 chan)
{
struct chan_freq_power *cfp;
int cfp_no;
Expand All @@ -273,7 +273,7 @@ static u8 wlan_region_chan_supported_11d(u8 region, u8 band, u8 chan)

lbs_deb_enter(LBS_DEB_11D);

cfp = libertas_get_region_cfp_table(region, band, &cfp_no);
cfp = lbs_get_region_cfp_table(region, band, &cfp_no);
if (cfp == NULL)
return 0;

Expand Down Expand Up @@ -338,7 +338,7 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*

/*Step1: check region_code */
parsed_region_chan->region = region =
wlan_region_2_code(countryinfo->countrycode);
lbs_region_2_code(countryinfo->countrycode);

lbs_deb_11d("regioncode=%x\n", (u8) parsed_region_chan->region);
lbs_deb_hex(LBS_DEB_11D, "countrycode", (char *)countryinfo->countrycode,
Expand Down Expand Up @@ -367,15 +367,15 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
for (i = 0; idx < MAX_NO_OF_CHAN && i < nrchan; i++) {
/*step4: channel is supported? */

if (!wlan_get_chan_11d(band, firstchan, i, &curchan)) {
if (!lbs_get_chan_11d(band, firstchan, i, &curchan)) {
/* Chan is not found in UN table */
lbs_deb_11d("chan is not supported: %d \n", i);
break;
}

lastchan = curchan;

if (wlan_region_chan_supported_11d
if (lbs_region_chan_supported_11d
(region, band, curchan)) {
/*step5: Check if curchan is supported by mrvl in region */
parsed_region_chan->chanpwr[idx].chan = curchan;
Expand Down Expand Up @@ -411,14 +411,14 @@ static int parse_domain_info_11d(struct ieeetypes_countryinfofullset*
* @param parsed_region_chan pointer to parsed_region_chan_11d
* @return PASSIVE if chan is unknown; ACTIVE if chan is known
*/
u8 libertas_get_scan_type_11d(u8 chan,
u8 lbs_get_scan_type_11d(u8 chan,
struct parsed_region_chan_11d * parsed_region_chan)
{
u8 scan_type = CMD_SCAN_TYPE_PASSIVE;

lbs_deb_enter(LBS_DEB_11D);

if (wlan_channel_known_11d(chan, parsed_region_chan)) {
if (lbs_channel_known_11d(chan, parsed_region_chan)) {
lbs_deb_11d("found, do active scan\n");
scan_type = CMD_SCAN_TYPE_ACTIVE;
} else {
Expand All @@ -430,7 +430,7 @@ u8 libertas_get_scan_type_11d(u8 chan,

}

void libertas_init_11d(wlan_private * priv)
void lbs_init_11d(lbs_private * priv)
{
priv->adapter->enable11d = 0;
memset(&(priv->adapter->parsed_region_chan), 0,
Expand All @@ -440,10 +440,10 @@ void libertas_init_11d(wlan_private * priv)

/**
* @brief This function sets DOMAIN INFO to FW
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @return 0; -1
*/
static int set_domain_info_11d(wlan_private * priv)
static int set_domain_info_11d(lbs_private * priv)
{
int ret;

Expand All @@ -452,7 +452,7 @@ static int set_domain_info_11d(wlan_private * priv)
return 0;
}

ret = libertas_prepare_and_send_command(priv, CMD_802_11D_DOMAIN_INFO,
ret = lbs_prepare_and_send_command(priv, CMD_802_11D_DOMAIN_INFO,
CMD_ACT_SET,
CMD_OPTION_WAITFORRSP, 0, NULL);
if (ret)
Expand All @@ -463,13 +463,13 @@ static int set_domain_info_11d(wlan_private * priv)

/**
* @brief This function setups scan channels
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @param band band
* @return 0
*/
int libertas_set_universaltable(wlan_private * priv, u8 band)
int lbs_set_universaltable(lbs_private * priv, u8 band)
{
wlan_adapter *adapter = priv->adapter;
lbs_adapter *adapter = priv->adapter;
u16 size = sizeof(struct chan_freq_power);
u16 i = 0;

Expand All @@ -492,20 +492,20 @@ int libertas_set_universaltable(wlan_private * priv, u8 band)

/**
* @brief This function implements command CMD_802_11D_DOMAIN_INFO
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @param cmd pointer to cmd buffer
* @param cmdno cmd ID
* @param cmdOption cmd action
* @return 0
*/
int libertas_cmd_802_11d_domain_info(wlan_private * priv,
int lbs_cmd_802_11d_domain_info(lbs_private * priv,
struct cmd_ds_command *cmd, u16 cmdno,
u16 cmdoption)
{
struct cmd_ds_802_11d_domain_info *pdomaininfo =
&cmd->params.domaininfo;
struct mrvlietypes_domainparamset *domain = &pdomaininfo->domain;
wlan_adapter *adapter = priv->adapter;
lbs_adapter *adapter = priv->adapter;
u8 nr_subband = adapter->domainreg.nr_subband;

lbs_deb_enter(LBS_DEB_11D);
Expand Down Expand Up @@ -552,11 +552,11 @@ int libertas_cmd_802_11d_domain_info(wlan_private * priv,

/**
* @brief This function parses countryinfo from AP and download country info to FW
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @param resp pointer to command response buffer
* @return 0; -1
*/
int libertas_ret_802_11d_domain_info(wlan_private * priv,
int lbs_ret_802_11d_domain_info(lbs_private * priv,
struct cmd_ds_command *resp)
{
struct cmd_ds_802_11d_domain_info *domaininfo = &resp->params.domaininforesp;
Expand Down Expand Up @@ -598,14 +598,14 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv,

/**
* @brief This function parses countryinfo from AP and download country info to FW
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @return 0; -1
*/
int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
struct bss_descriptor * bss)
{
int ret;
wlan_adapter *adapter = priv->adapter;
lbs_adapter *adapter = priv->adapter;

lbs_deb_enter(LBS_DEB_11D);
if (priv->adapter->enable11d) {
Expand All @@ -620,7 +620,7 @@ int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
}

memset(&adapter->domainreg, 0,
sizeof(struct wlan_802_11d_domain_reg));
sizeof(struct lbs_802_11d_domain_reg));
generate_domain_info_11d(&adapter->parsed_region_chan,
&adapter->domainreg);

Expand All @@ -640,13 +640,13 @@ int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,

/**
* @brief This function generates 11D info from user specified regioncode and download to FW
* @param priv pointer to wlan_private
* @param priv pointer to lbs_private
* @return 0; -1
*/
int libertas_create_dnld_countryinfo_11d(wlan_private * priv)
int lbs_create_dnld_countryinfo_11d(lbs_private * priv)
{
int ret;
wlan_adapter *adapter = priv->adapter;
lbs_adapter *adapter = priv->adapter;
struct region_channel *region_chan;
u8 j;

Expand Down Expand Up @@ -679,12 +679,12 @@ int libertas_create_dnld_countryinfo_11d(wlan_private * priv)

memset(&adapter->parsed_region_chan, 0,
sizeof(struct parsed_region_chan_11d));
wlan_generate_parsed_region_chan_11d(region_chan,
lbs_generate_parsed_region_chan_11d(region_chan,
&adapter->
parsed_region_chan);

memset(&adapter->domainreg, 0,
sizeof(struct wlan_802_11d_domain_reg));
sizeof(struct lbs_802_11d_domain_reg));
generate_domain_info_11d(&adapter->parsed_region_chan,
&adapter->domainreg);

Expand Down
24 changes: 12 additions & 12 deletions drivers/net/wireless/libertas/11d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* This header file contains data structures and
* function declarations of 802.11d
*/
#ifndef _WLAN_11D_
#define _WLAN_11D_
#ifndef _LBS_11D_
#define _LBS_11D_

#include "types.h"
#include "defs.h"
Expand Down Expand Up @@ -52,7 +52,7 @@ struct cmd_ds_802_11d_domain_info {
} __attribute__ ((packed));

/** domain regulatory information */
struct wlan_802_11d_domain_reg {
struct lbs_802_11d_domain_reg {
/** country Code*/
u8 countrycode[COUNTRY_CODE_LEN];
/** No. of subband*/
Expand All @@ -78,26 +78,26 @@ struct region_code_mapping {
u8 code;
};

u8 libertas_get_scan_type_11d(u8 chan,
u8 lbs_get_scan_type_11d(u8 chan,
struct parsed_region_chan_11d *parsed_region_chan);

u32 libertas_chan_2_freq(u8 chan, u8 band);
u32 lbs_chan_2_freq(u8 chan, u8 band);

void libertas_init_11d(wlan_private * priv);
void lbs_init_11d(lbs_private * priv);

int libertas_set_universaltable(wlan_private * priv, u8 band);
int lbs_set_universaltable(lbs_private * priv, u8 band);

int libertas_cmd_802_11d_domain_info(wlan_private * priv,
int lbs_cmd_802_11d_domain_info(lbs_private * priv,
struct cmd_ds_command *cmd, u16 cmdno,
u16 cmdOption);

int libertas_ret_802_11d_domain_info(wlan_private * priv,
int lbs_ret_802_11d_domain_info(lbs_private * priv,
struct cmd_ds_command *resp);

struct bss_descriptor;
int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
int lbs_parse_dnld_countryinfo_11d(lbs_private * priv,
struct bss_descriptor * bss);

int libertas_create_dnld_countryinfo_11d(wlan_private * priv);
int lbs_create_dnld_countryinfo_11d(lbs_private * priv);

#endif /* _WLAN_11D_ */
#endif
Loading

0 comments on commit 1007832

Please sign in to comment.