Commit 78a717d8 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging:vt6655:desc: Whitespace cleanups

Neatening only.
git diff -w shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8314cfc
...@@ -213,13 +213,13 @@ ...@@ -213,13 +213,13 @@
// may link to older skb that leads error. // may link to older skb that leads error.
typedef struct tagDEVICE_RD_INFO { typedef struct tagDEVICE_RD_INFO {
struct sk_buff* skb; struct sk_buff *skb;
dma_addr_t skb_dma; dma_addr_t skb_dma;
dma_addr_t curr_desc; dma_addr_t curr_desc;
} DEVICE_RD_INFO, *PDEVICE_RD_INFO; } DEVICE_RD_INFO, *PDEVICE_RD_INFO;
/* /*
static inline PDEVICE_RD_INFO alloc_rd_info(void) { static inline PDEVICE_RD_INFO alloc_rd_info(void) {
PDEVICE_RD_INFO ptr; PDEVICE_RD_INFO ptr;
ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC); ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC);
if (ptr == NULL) if (ptr == NULL)
...@@ -228,13 +228,13 @@ static inline PDEVICE_RD_INFO alloc_rd_info(void) { ...@@ -228,13 +228,13 @@ static inline PDEVICE_RD_INFO alloc_rd_info(void) {
memset(ptr,0,sizeof(DEVICE_RD_INFO)); memset(ptr,0,sizeof(DEVICE_RD_INFO));
return ptr; return ptr;
} }
} }
*/ */
/* /*
typedef struct tagRDES0 { typedef struct tagRDES0 {
unsigned short wResCount; unsigned short wResCount;
unsigned short wf1Owner ; unsigned short wf1Owner;
// unsigned short f15Reserved : 15; // unsigned short f15Reserved : 15;
// unsigned short f1Owner : 1; // unsigned short f1Owner : 1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
...@@ -260,8 +260,8 @@ SRDES0, *PSRDES0; ...@@ -260,8 +260,8 @@ SRDES0, *PSRDES0;
typedef struct tagRDES0 { typedef struct tagRDES0 {
unsigned short wResCount; unsigned short wResCount;
unsigned short f15Reserved : 15; unsigned short f15Reserved:15;
unsigned short f1Owner : 1; unsigned short f1Owner:1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRDES0; SRDES0;
...@@ -292,7 +292,7 @@ typedef const SRxDesc *PCSRxDesc; ...@@ -292,7 +292,7 @@ typedef const SRxDesc *PCSRxDesc;
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
/* /*
typedef struct tagTDES0 { typedef struct tagTDES0 {
volatile unsigned char byTSR0; volatile unsigned char byTSR0;
volatile unsigned char byTSR1; volatile unsigned char byTSR1;
volatile unsigned short wOwner_Txtime; volatile unsigned short wOwner_Txtime;
...@@ -321,7 +321,7 @@ STDES0, PSTDES0; ...@@ -321,7 +321,7 @@ STDES0, PSTDES0;
typedef struct tagTDES0 { typedef struct tagTDES0 {
volatile unsigned char byTSR0; volatile unsigned char byTSR0;
volatile unsigned char byTSR1; volatile unsigned char byTSR1;
volatile unsigned short f15Txtime : 15; volatile unsigned short f15Txtime:15;
volatile unsigned short f1Owner:1; volatile unsigned short f1Owner:1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
STDES0; STDES0;
...@@ -337,8 +337,8 @@ typedef struct tagTDES1 { ...@@ -337,8 +337,8 @@ typedef struct tagTDES1 {
STDES1; STDES1;
typedef struct tagDEVICE_TD_INFO{ typedef struct tagDEVICE_TD_INFO {
struct sk_buff* skb; struct sk_buff *skb;
unsigned char *buf; unsigned char *buf;
dma_addr_t skb_dma; dma_addr_t skb_dma;
dma_addr_t buf_dma; dma_addr_t buf_dma;
...@@ -349,7 +349,7 @@ typedef struct tagDEVICE_TD_INFO{ ...@@ -349,7 +349,7 @@ typedef struct tagDEVICE_TD_INFO{
} DEVICE_TD_INFO, *PDEVICE_TD_INFO; } DEVICE_TD_INFO, *PDEVICE_TD_INFO;
/* /*
static inline PDEVICE_TD_INFO alloc_td_info(void) { static inline PDEVICE_TD_INFO alloc_td_info(void) {
PDEVICE_TD_INFO ptr; PDEVICE_TD_INFO ptr;
ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC); ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC);
if (ptr == NULL) if (ptr == NULL)
...@@ -358,7 +358,7 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) { ...@@ -358,7 +358,7 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) {
memset(ptr,0,sizeof(DEVICE_TD_INFO)); memset(ptr,0,sizeof(DEVICE_TD_INFO));
return ptr; return ptr;
} }
} }
*/ */
// //
...@@ -369,7 +369,7 @@ typedef struct tagSTxDesc { ...@@ -369,7 +369,7 @@ typedef struct tagSTxDesc {
volatile STDES1 m_td1TD1; volatile STDES1 m_td1TD1;
volatile u32 buff_addr; volatile u32 buff_addr;
volatile u32 next_desc; volatile u32 next_desc;
struct tagSTxDesc* next; //4 bytes struct tagSTxDesc *next; //4 bytes
volatile PDEVICE_TD_INFO pTDInfo;//4 bytes volatile PDEVICE_TD_INFO pTDInfo;//4 bytes
volatile u32 Reserved[2];//8 bytes volatile u32 Reserved[2];//8 bytes
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
...@@ -384,7 +384,7 @@ typedef struct tagSTxSyncDesc { ...@@ -384,7 +384,7 @@ typedef struct tagSTxSyncDesc {
volatile u32 next_desc; // pointer to next logical descriptor volatile u32 next_desc; // pointer to next logical descriptor
volatile unsigned short m_wFIFOCtl; volatile unsigned short m_wFIFOCtl;
volatile unsigned short m_wTimeStamp; volatile unsigned short m_wTimeStamp;
struct tagSTxSyncDesc* next; //4 bytes struct tagSTxSyncDesc *next; //4 bytes
volatile PDEVICE_TD_INFO pTDInfo;//4 bytes volatile PDEVICE_TD_INFO pTDInfo;//4 bytes
volatile u32 m_dwReserved2; volatile u32 m_dwReserved2;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
...@@ -402,7 +402,7 @@ typedef struct tagSRrvTime_gRTS { ...@@ -402,7 +402,7 @@ typedef struct tagSRrvTime_gRTS {
unsigned short wReserved; unsigned short wReserved;
unsigned short wTxRrvTime_b; unsigned short wTxRrvTime_b;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_gRTS, *PSRrvTime_gRTS; SRrvTime_gRTS, *PSRrvTime_gRTS;
typedef const SRrvTime_gRTS *PCSRrvTime_gRTS; typedef const SRrvTime_gRTS *PCSRrvTime_gRTS;
...@@ -411,21 +411,21 @@ typedef struct tagSRrvTime_gCTS { ...@@ -411,21 +411,21 @@ typedef struct tagSRrvTime_gCTS {
unsigned short wReserved; unsigned short wReserved;
unsigned short wTxRrvTime_b; unsigned short wTxRrvTime_b;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_gCTS, *PSRrvTime_gCTS; SRrvTime_gCTS, *PSRrvTime_gCTS;
typedef const SRrvTime_gCTS *PCSRrvTime_gCTS; typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;
typedef struct tagSRrvTime_ab { typedef struct tagSRrvTime_ab {
unsigned short wRTSTxRrvTime; unsigned short wRTSTxRrvTime;
unsigned short wTxRrvTime; unsigned short wTxRrvTime;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_ab, *PSRrvTime_ab; SRrvTime_ab, *PSRrvTime_ab;
typedef const SRrvTime_ab *PCSRrvTime_ab; typedef const SRrvTime_ab *PCSRrvTime_ab;
typedef struct tagSRrvTime_atim { typedef struct tagSRrvTime_atim {
unsigned short wCTSTxRrvTime_ba; unsigned short wCTSTxRrvTime_ba;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_atim, *PSRrvTime_atim; SRrvTime_atim, *PSRrvTime_atim;
typedef const SRrvTime_atim *PCSRrvTime_atim; typedef const SRrvTime_atim *PCSRrvTime_atim;
...@@ -437,7 +437,7 @@ typedef struct tagSRTSData { ...@@ -437,7 +437,7 @@ typedef struct tagSRTSData {
unsigned short wDurationID; unsigned short wDurationID;
unsigned char abyRA[ETH_ALEN]; unsigned char abyRA[ETH_ALEN];
unsigned char abyTA[ETH_ALEN]; unsigned char abyTA[ETH_ALEN];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTSData, *PSRTSData; SRTSData, *PSRTSData;
typedef const SRTSData *PCSRTSData; typedef const SRTSData *PCSRTSData;
...@@ -453,7 +453,7 @@ typedef struct tagSRTS_g { ...@@ -453,7 +453,7 @@ typedef struct tagSRTS_g {
unsigned short wDuration_bb; unsigned short wDuration_bb;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g, *PSRTS_g; SRTS_g, *PSRTS_g;
typedef const SRTS_g *PCSRTS_g; typedef const SRTS_g *PCSRTS_g;
...@@ -474,7 +474,7 @@ typedef struct tagSRTS_g_FB { ...@@ -474,7 +474,7 @@ typedef struct tagSRTS_g_FB {
unsigned short wRTSDuration_ba_f1; unsigned short wRTSDuration_ba_f1;
unsigned short wRTSDuration_aa_f1; unsigned short wRTSDuration_aa_f1;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g_FB, *PSRTS_g_FB; SRTS_g_FB, *PSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB; typedef const SRTS_g_FB *PCSRTS_g_FB;
...@@ -486,7 +486,7 @@ typedef struct tagSRTS_ab { ...@@ -486,7 +486,7 @@ typedef struct tagSRTS_ab {
unsigned short wDuration; unsigned short wDuration;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_ab, *PSRTS_ab; SRTS_ab, *PSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab; typedef const SRTS_ab *PCSRTS_ab;
...@@ -500,7 +500,7 @@ typedef struct tagSRTS_a_FB { ...@@ -500,7 +500,7 @@ typedef struct tagSRTS_a_FB {
unsigned short wRTSDuration_f0; unsigned short wRTSDuration_f0;
unsigned short wRTSDuration_f1; unsigned short wRTSDuration_f1;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_a_FB, *PSRTS_a_FB; SRTS_a_FB, *PSRTS_a_FB;
typedef const SRTS_a_FB *PCSRTS_a_FB; typedef const SRTS_a_FB *PCSRTS_a_FB;
...@@ -513,7 +513,7 @@ typedef struct tagSCTSData { ...@@ -513,7 +513,7 @@ typedef struct tagSCTSData {
unsigned short wDurationID; unsigned short wDurationID;
unsigned char abyRA[ETH_ALEN]; unsigned char abyRA[ETH_ALEN];
unsigned short wReserved; unsigned short wReserved;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTSData, *PSCTSData; SCTSData, *PSCTSData;
typedef struct tagSCTS { typedef struct tagSCTS {
...@@ -523,7 +523,7 @@ typedef struct tagSCTS { ...@@ -523,7 +523,7 @@ typedef struct tagSCTS {
unsigned short wDuration_ba; unsigned short wDuration_ba;
unsigned short wReserved; unsigned short wReserved;
SCTSData Data; SCTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTS, *PSCTS; SCTS, *PSCTS;
typedef const SCTS *PCSCTS; typedef const SCTS *PCSCTS;
...@@ -536,7 +536,7 @@ typedef struct tagSCTS_FB { ...@@ -536,7 +536,7 @@ typedef struct tagSCTS_FB {
unsigned short wCTSDuration_ba_f0; unsigned short wCTSDuration_ba_f0;
unsigned short wCTSDuration_ba_f1; unsigned short wCTSDuration_ba_f1;
SCTSData Data; SCTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTS_FB, *PSCTS_FB; SCTS_FB, *PSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB; typedef const SCTS_FB *PCSCTS_FB;
...@@ -551,14 +551,14 @@ typedef struct tagSTxBufHead { ...@@ -551,14 +551,14 @@ typedef struct tagSTxBufHead {
unsigned short wFragCtl; unsigned short wFragCtl;
unsigned char byTxPower; unsigned char byTxPower;
unsigned char wReserved; unsigned char wReserved;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxBufHead, *PSTxBufHead; STxBufHead, *PSTxBufHead;
typedef const STxBufHead *PCSTxBufHead; typedef const STxBufHead *PCSTxBufHead;
typedef struct tagSTxShortBufHead { typedef struct tagSTxShortBufHead {
unsigned short wFIFOCtl; unsigned short wFIFOCtl;
unsigned short wTimeStamp; unsigned short wTimeStamp;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxShortBufHead, *PSTxShortBufHead; STxShortBufHead, *PSTxShortBufHead;
typedef const STxShortBufHead *PCSTxShortBufHead; typedef const STxShortBufHead *PCSTxShortBufHead;
...@@ -576,7 +576,7 @@ typedef struct tagSTxDataHead_g { ...@@ -576,7 +576,7 @@ typedef struct tagSTxDataHead_g {
unsigned short wDuration_a; unsigned short wDuration_a;
unsigned short wTimeStampOff_b; unsigned short wTimeStampOff_b;
unsigned short wTimeStampOff_a; unsigned short wTimeStampOff_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_g, *PSTxDataHead_g; STxDataHead_g, *PSTxDataHead_g;
typedef const STxDataHead_g *PCSTxDataHead_g; typedef const STxDataHead_g *PCSTxDataHead_g;
...@@ -593,7 +593,7 @@ typedef struct tagSTxDataHead_g_FB { ...@@ -593,7 +593,7 @@ typedef struct tagSTxDataHead_g_FB {
unsigned short wDuration_a_f1; unsigned short wDuration_a_f1;
unsigned short wTimeStampOff_b; unsigned short wTimeStampOff_b;
unsigned short wTimeStampOff_a; unsigned short wTimeStampOff_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_g_FB, *PSTxDataHead_g_FB; STxDataHead_g_FB, *PSTxDataHead_g_FB;
typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB; typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;
...@@ -604,7 +604,7 @@ typedef struct tagSTxDataHead_ab { ...@@ -604,7 +604,7 @@ typedef struct tagSTxDataHead_ab {
unsigned short wTransmitLength; unsigned short wTransmitLength;
unsigned short wDuration; unsigned short wDuration;
unsigned short wTimeStampOff; unsigned short wTimeStampOff;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_ab, *PSTxDataHead_ab; STxDataHead_ab, *PSTxDataHead_ab;
typedef const STxDataHead_ab *PCSTxDataHead_ab; typedef const STxDataHead_ab *PCSTxDataHead_ab;
...@@ -617,7 +617,7 @@ typedef struct tagSTxDataHead_a_FB { ...@@ -617,7 +617,7 @@ typedef struct tagSTxDataHead_a_FB {
unsigned short wTimeStampOff; unsigned short wTimeStampOff;
unsigned short wDuration_f0; unsigned short wDuration_f0;
unsigned short wDuration_f1; unsigned short wDuration_f1;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_a_FB, *PSTxDataHead_a_FB; STxDataHead_a_FB, *PSTxDataHead_a_FB;
typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;
...@@ -628,23 +628,23 @@ typedef struct tagSMICHDRHead { ...@@ -628,23 +628,23 @@ typedef struct tagSMICHDRHead {
u32 adwHDR0[4]; u32 adwHDR0[4];
u32 adwHDR1[4]; u32 adwHDR1[4];
u32 adwHDR2[4]; u32 adwHDR2[4];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SMICHDRHead, *PSMICHDRHead; SMICHDRHead, *PSMICHDRHead;
typedef const SMICHDRHead *PCSMICHDRHead; typedef const SMICHDRHead *PCSMICHDRHead;
typedef struct tagSBEACONCtl { typedef struct tagSBEACONCtl {
u32 BufReady : 1; u32 BufReady:1;
u32 TSF : 15; u32 TSF:15;
u32 BufLen : 11; u32 BufLen:11;
u32 Reserved : 5; u32 Reserved:5;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SBEACONCtl; SBEACONCtl;
typedef struct tagSSecretKey { typedef struct tagSSecretKey {
u32 dwLowDword; u32 dwLowDword;
unsigned char byHighByte; unsigned char byHighByte;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SSecretKey; SSecretKey;
typedef struct tagSKeyEntry { typedef struct tagSKeyEntry {
...@@ -656,7 +656,7 @@ typedef struct tagSKeyEntry { ...@@ -656,7 +656,7 @@ typedef struct tagSKeyEntry {
u32 dwKey2[4]; u32 dwKey2[4];
u32 dwKey3[4]; u32 dwKey3[4];
u32 dwKey4[4]; u32 dwKey4[4];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SKeyEntry; SKeyEntry;
/*--------------------- Export Macros ------------------------------*/ /*--------------------- Export Macros ------------------------------*/
......
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