Skip to content

Commit

Permalink
Staging: rt28x0: run common/*.c files through Lindent
Browse files Browse the repository at this point in the history 
commit 96b3c83 upstream.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@bzolnier
bzolnier authored and debian-kernel-patches-to-git committed Mar 12, 2011
1 parent 93ebe80 commit 7d58759
Show file tree
Hide file tree
Showing 30 changed files with 16,252 additions and 16,688 deletions.
610 changes: 302 additions & 308 deletions drivers/staging/rt2860/common/action.c
View file

Large diffs are not rendered by default.

1,454 changes: 682 additions & 772 deletions drivers/staging/rt2860/common/ba_action.c
View file

Large diffs are not rendered by default.

1,103 changes: 506 additions & 597 deletions drivers/staging/rt2860/common/cmm_aes.c
View file

Large diffs are not rendered by default.

2,443 changes: 1,224 additions & 1,219 deletions drivers/staging/rt2860/common/cmm_asic.c
View file

Large diffs are not rendered by default.

216 changes: 92 additions & 124 deletions drivers/staging/rt2860/common/cmm_cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,50 +35,41 @@
--------- ---------- ----------------------------------------------
*/



#include "../rt_config.h"


char* GetPhyMode(
int Mode)
char *GetPhyMode(int Mode)
{
switch(Mode)
{
case MODE_CCK:
return "CCK";

case MODE_OFDM:
return "OFDM";
case MODE_HTMIX:
return "HTMIX";

case MODE_HTGREENFIELD:
return "GREEN";
default:
return "N/A";
switch (Mode) {
case MODE_CCK:
return "CCK";

case MODE_OFDM:
return "OFDM";
case MODE_HTMIX:
return "HTMIX";

case MODE_HTGREENFIELD:
return "GREEN";
default:
return "N/A";
}
}


char* GetBW(
int BW)
char *GetBW(int BW)
{
switch(BW)
{
case BW_10:
return "10M";

case BW_20:
return "20M";
case BW_40:
return "40M";
default:
return "N/A";
switch (BW) {
case BW_10:
return "10M";

case BW_20:
return "20M";
case BW_40:
return "40M";
default:
return "N/A";
}
}


/*
==========================================================================
Description:
Expand All @@ -89,54 +80,44 @@ char* GetBW(
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
INT RT_CfgSetCountryRegion(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg,
IN INT band)
INT RT_CfgSetCountryRegion(IN PRTMP_ADAPTER pAd, IN PSTRING arg, IN INT band)
{
LONG region, regionMax;
UCHAR *pCountryRegion;

region = simple_strtol(arg, 0, 10);

if (band == BAND_24G)
{
if (band == BAND_24G) {
pCountryRegion = &pAd->CommonCfg.CountryRegion;
regionMax = REGION_MAXIMUM_BG_BAND;
}
else
{
} else {
pCountryRegion = &pAd->CommonCfg.CountryRegionForABand;
regionMax = REGION_MAXIMUM_A_BAND;
}

// TODO: Is it neccesay for following check???
// Country can be set only when EEPROM not programmed
if (*pCountryRegion & 0x80)
{
DBGPRINT(RT_DEBUG_ERROR, ("CfgSetCountryRegion():CountryRegion in eeprom was programmed\n"));
if (*pCountryRegion & 0x80) {
DBGPRINT(RT_DEBUG_ERROR,
("CfgSetCountryRegion():CountryRegion in eeprom was programmed\n"));
return FALSE;
}

if((region >= 0) && (region <= REGION_MAXIMUM_BG_BAND))
{
*pCountryRegion= (UCHAR) region;
}
else if ((region == REGION_31_BG_BAND) && (band == BAND_24G))
{
if ((region >= 0) && (region <= REGION_MAXIMUM_BG_BAND)) {
*pCountryRegion = (UCHAR) region;
}
else
{
DBGPRINT(RT_DEBUG_ERROR, ("CfgSetCountryRegion():region(%ld) out of range!\n", region));
} else if ((region == REGION_31_BG_BAND) && (band == BAND_24G)) {
*pCountryRegion = (UCHAR) region;
} else {
DBGPRINT(RT_DEBUG_ERROR,
("CfgSetCountryRegion():region(%ld) out of range!\n",
region));
return FALSE;
}

return TRUE;

}


/*
==========================================================================
Description:
Expand All @@ -145,18 +126,15 @@ INT RT_CfgSetCountryRegion(
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
INT RT_CfgSetWirelessMode(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg)
INT RT_CfgSetWirelessMode(IN PRTMP_ADAPTER pAd, IN PSTRING arg)
{
INT MaxPhyMode = PHY_11G;
LONG WirelessMode;
INT MaxPhyMode = PHY_11G;
LONG WirelessMode;

MaxPhyMode = PHY_11N_5G;

WirelessMode = simple_strtol(arg, 0, 10);
if (WirelessMode <= MaxPhyMode)
{
if (WirelessMode <= MaxPhyMode) {
pAd->CommonCfg.PhyMode = WirelessMode;
return TRUE;
}
Expand All @@ -165,10 +143,7 @@ INT RT_CfgSetWirelessMode(

}


INT RT_CfgSetShortSlot(
IN PRTMP_ADAPTER pAd,
IN PSTRING arg)
INT RT_CfgSetShortSlot(IN PRTMP_ADAPTER pAd, IN PSTRING arg)
{
LONG ShortSlot;

Expand All @@ -179,12 +154,11 @@ INT RT_CfgSetShortSlot(
else if (ShortSlot == 0)
pAd->CommonCfg.bUseShortSlotTime = FALSE;
else
return FALSE; //Invalid argument
return FALSE; //Invalid argument

return TRUE;
}


/*
==========================================================================
Description:
Expand All @@ -193,54 +167,53 @@ INT RT_CfgSetShortSlot(
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
INT RT_CfgSetWepKey(
IN PRTMP_ADAPTER pAd,
IN PSTRING keyString,
IN CIPHER_KEY *pSharedKey,
IN INT keyIdx)
INT RT_CfgSetWepKey(IN PRTMP_ADAPTER pAd,
IN PSTRING keyString,
IN CIPHER_KEY * pSharedKey, IN INT keyIdx)
{
INT KeyLen;
INT i;
UCHAR CipherAlg = CIPHER_NONE;
BOOLEAN bKeyIsHex = FALSE;
INT KeyLen;
INT i;
UCHAR CipherAlg = CIPHER_NONE;
BOOLEAN bKeyIsHex = FALSE;

// TODO: Shall we do memset for the original key info??
memset(pSharedKey, 0, sizeof(CIPHER_KEY));
KeyLen = strlen(keyString);
switch (KeyLen)
{
case 5: //wep 40 Ascii type
case 13: //wep 104 Ascii type
bKeyIsHex = FALSE;
pSharedKey->KeyLen = KeyLen;
NdisMoveMemory(pSharedKey->Key, keyString, KeyLen);
break;

case 10: //wep 40 Hex type
case 26: //wep 104 Hex type
for(i=0; i < KeyLen; i++)
{
if( !isxdigit(*(keyString+i)) )
return FALSE; //Not Hex value;
}
bKeyIsHex = TRUE;
pSharedKey->KeyLen = KeyLen/2 ;
AtoH(keyString, pSharedKey->Key, pSharedKey->KeyLen);
break;

default: //Invalid argument
DBGPRINT(RT_DEBUG_TRACE, ("RT_CfgSetWepKey(keyIdx=%d):Invalid argument (arg=%s)\n", keyIdx, keyString));
return FALSE;
switch (KeyLen) {
case 5: //wep 40 Ascii type
case 13: //wep 104 Ascii type
bKeyIsHex = FALSE;
pSharedKey->KeyLen = KeyLen;
NdisMoveMemory(pSharedKey->Key, keyString, KeyLen);
break;

case 10: //wep 40 Hex type
case 26: //wep 104 Hex type
for (i = 0; i < KeyLen; i++) {
if (!isxdigit(*(keyString + i)))
return FALSE; //Not Hex value;
}
bKeyIsHex = TRUE;
pSharedKey->KeyLen = KeyLen / 2;
AtoH(keyString, pSharedKey->Key, pSharedKey->KeyLen);
break;

default: //Invalid argument
DBGPRINT(RT_DEBUG_TRACE,
("RT_CfgSetWepKey(keyIdx=%d):Invalid argument (arg=%s)\n",
keyIdx, keyString));
return FALSE;
}

pSharedKey->CipherAlg = ((KeyLen % 5) ? CIPHER_WEP128 : CIPHER_WEP64);
DBGPRINT(RT_DEBUG_TRACE, ("RT_CfgSetWepKey:(KeyIdx=%d,type=%s, Alg=%s)\n",
keyIdx, (bKeyIsHex == FALSE ? "Ascii" : "Hex"), CipherName[CipherAlg]));
DBGPRINT(RT_DEBUG_TRACE,
("RT_CfgSetWepKey:(KeyIdx=%d,type=%s, Alg=%s)\n", keyIdx,
(bKeyIsHex == FALSE ? "Ascii" : "Hex"),
CipherName[CipherAlg]));

return TRUE;
}


/*
==========================================================================
Description:
Expand All @@ -257,33 +230,28 @@ INT RT_CfgSetWepKey(
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
INT RT_CfgSetWPAPSKKey(
IN RTMP_ADAPTER *pAd,
IN PSTRING keyString,
IN UCHAR *pHashStr,
IN INT hashStrLen,
OUT PUCHAR pPMKBuf)
INT RT_CfgSetWPAPSKKey(IN RTMP_ADAPTER * pAd,
IN PSTRING keyString,
IN UCHAR * pHashStr,
IN INT hashStrLen, OUT PUCHAR pPMKBuf)
{
int keyLen;
UCHAR keyMaterial[40];

keyLen = strlen(keyString);
if ((keyLen < 8) || (keyLen > 64))
{
DBGPRINT(RT_DEBUG_TRACE, ("WPAPSK Key length(%d) error, required 8 ~ 64 characters!(keyStr=%s)\n",
keyLen, keyString));
if ((keyLen < 8) || (keyLen > 64)) {
DBGPRINT(RT_DEBUG_TRACE,
("WPAPSK Key length(%d) error, required 8 ~ 64 characters!(keyStr=%s)\n",
keyLen, keyString));
return FALSE;
}

memset(pPMKBuf, 0, 32);
if (keyLen == 64)
{
AtoH(keyString, pPMKBuf, 32);
}
else
{
PasswordHash(keyString, pHashStr, hashStrLen, keyMaterial);
NdisMoveMemory(pPMKBuf, keyMaterial, 32);
if (keyLen == 64) {
AtoH(keyString, pPMKBuf, 32);
} else {
PasswordHash(keyString, pHashStr, hashStrLen, keyMaterial);
NdisMoveMemory(pPMKBuf, keyMaterial, 32);
}

return TRUE;
Expand Down
Loading

0 comments on commit 7d58759

Please sign in to comment.