Skip to content

Commit

Permalink
Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typ…
Browse files Browse the repository at this point in the history 
…edefs

Cleared all checkpatch warnings but 'do not add new typedefs' ones.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 18, 2010
1 parent 213d2e9 commit cc856e6
Show file tree
Hide file tree
Showing 48 changed files with 700 additions and 692 deletions.
48 changes: 24 additions & 24 deletions drivers/staging/vt6656/80211mgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ typedef struct _WLAN_IE_IBSS_DFS {
// prototype structure, all mgmt frame types will start with these members
typedef struct tagWLAN_FR_MGMT {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;

Expand All @@ -534,8 +534,8 @@ typedef struct tagWLAN_FR_MGMT {
// Beacon frame
typedef struct tagWLAN_FR_BEACON {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
// fixed fields
Expand Down Expand Up @@ -566,8 +566,8 @@ typedef struct tagWLAN_FR_BEACON {
// IBSS ATIM frame
typedef struct tagWLAN_FR_IBSSATIM {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;

Expand All @@ -580,8 +580,8 @@ typedef struct tagWLAN_FR_IBSSATIM {
// Disassociation
typedef struct tagWLAN_FR_DISASSOC {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -593,8 +593,8 @@ typedef struct tagWLAN_FR_DISASSOC {
// Association Request
typedef struct tagWLAN_FR_ASSOCREQ {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -617,8 +617,8 @@ typedef struct tagWLAN_FR_ASSOCREQ {
// Association Response
typedef struct tagWLAN_FR_ASSOCRESP {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -634,8 +634,8 @@ typedef struct tagWLAN_FR_ASSOCRESP {
// Reassociation Request
typedef struct tagWLAN_FR_REASSOCREQ {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;

Expand All @@ -659,8 +659,8 @@ typedef struct tagWLAN_FR_REASSOCREQ {
// Reassociation Response
typedef struct tagWLAN_FR_REASSOCRESP {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -676,8 +676,8 @@ typedef struct tagWLAN_FR_REASSOCRESP {
// Probe Request
typedef struct tagWLAN_FR_PROBEREQ {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -691,8 +691,8 @@ typedef struct tagWLAN_FR_PROBEREQ {
// Probe Response
typedef struct tagWLAN_FR_PROBERESP {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand Down Expand Up @@ -720,8 +720,8 @@ typedef struct tagWLAN_FR_PROBERESP {
// Authentication
typedef struct tagWLAN_FR_AUTHEN {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand All @@ -736,8 +736,8 @@ typedef struct tagWLAN_FR_AUTHEN {
// Deauthenication
typedef struct tagWLAN_FR_DEAUTHEN {

UINT uType;
UINT len;
unsigned int uType;
unsigned int len;
PBYTE pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
Expand Down
52 changes: 23 additions & 29 deletions drivers/staging/vt6656/baseband.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,11 +662,11 @@ const WORD awcFrameTime[MAX_RATE] =

/*
static
ULONG
unsigned long
s_ulGetLowSQ3(PSDevice pDevice);
static
ULONG
unsigned long
s_ulGetRatio(PSDevice pDevice);
static
Expand All @@ -689,27 +689,27 @@ s_vClearSQ3Value(PSDevice pDevice);
* Return Value: FrameTime
*
*/
UINT
unsigned int
BBuGetFrameTime (
BYTE byPreambleType,
BYTE byPktType,
UINT cbFrameLength,
unsigned int cbFrameLength,
WORD wRate
)
{
UINT uFrameTime;
UINT uPreamble;
UINT uTmp;
UINT uRateIdx = (UINT)wRate;
UINT uRate = 0;
unsigned int uFrameTime;
unsigned int uPreamble;
unsigned int uTmp;
unsigned int uRateIdx = (unsigned int)wRate;
unsigned int uRate = 0;


if (uRateIdx > RATE_54M) {
ASSERT(0);
return 0;
}

uRate = (UINT)awcFrameTime[uRateIdx];
uRate = (unsigned int)awcFrameTime[uRateIdx];

if (uRateIdx <= 3) { //CCK mode

Expand Down Expand Up @@ -759,17 +759,17 @@ BBuGetFrameTime (
void
BBvCaculateParameter (
PSDevice pDevice,
UINT cbFrameLength,
unsigned int cbFrameLength,
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
)
{
UINT cbBitCount;
UINT cbUsCount = 0;
UINT cbTmp;
unsigned int cbBitCount;
unsigned int cbUsCount = 0;
unsigned int cbTmp;
BOOL bExtBit;
BYTE byPreambleType = pDevice->byPreambleType;
BOOL bCCK = pDevice->bCCK;
Expand Down Expand Up @@ -1360,13 +1360,11 @@ BBvExitDeepSleep (PSDevice pDevice)
}


static
ULONG
s_ulGetLowSQ3(PSDevice pDevice)
static unsigned long s_ulGetLowSQ3(PSDevice pDevice)
{
int ii;
ULONG ulSQ3 = 0;
ULONG ulMaxPacket;
int ii;
unsigned long ulSQ3 = 0;
unsigned long ulMaxPacket;

ulMaxPacket = pDevice->aulPktNum[RATE_54M];
if ( pDevice->aulPktNum[RATE_54M] != 0 ) {
Expand All @@ -1382,16 +1380,12 @@ ULONG ulMaxPacket;
return ulSQ3;
}



static
ULONG
s_ulGetRatio (PSDevice pDevice)
static unsigned long s_ulGetRatio(PSDevice pDevice)
{
int ii,jj;
ULONG ulRatio = 0;
ULONG ulMaxPacket;
ULONG ulPacketNum;
int ii, jj;
unsigned long ulRatio = 0;
unsigned long ulMaxPacket;
unsigned long ulPacketNum;

//This is a thousand-ratio
ulMaxPacket = pDevice->aulPktNum[RATE_54M];
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/vt6656/baseband.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@

/*--------------------- Export Functions --------------------------*/

UINT
unsigned int
BBuGetFrameTime(
BYTE byPreambleType,
BYTE byFreqType,
UINT cbFrameLength,
unsigned int cbFrameLength,
WORD wRate
);

void
BBvCaculateParameter (
PSDevice pDevice,
UINT cbFrameLength,
unsigned int cbFrameLength,
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
Expand Down
Loading

0 comments on commit cc856e6

Please sign in to comment.