Staging: vt665x: Typedef and macro cleanup Part 1 (193a823c) · Commits · jan.koester / Linux

drivers/staging/vt6656/bssdb.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -94,13 +94,13 @@
	typedef struct tagSERPObject {		typedef struct tagSERPObject {
	BOOL bERPExist;		BOOL bERPExist;
	BYTE byERP;		BYTE byERP;
	}ERPObject, DEF* PERPObject;		}ERPObject, *PERPObject;


	typedef struct tagSRSNCapObject {		typedef struct tagSRSNCapObject {
	BOOL bRSNCapExist;		BOOL bRSNCapExist;
	WORD wRSNCap;		WORD wRSNCap;
	}SRSNCapObject, DEF* PSRSNCapObject;		}SRSNCapObject, *PSRSNCapObject;

	// BSS info(AP)		// BSS info(AP)
	#pragma pack(1)		#pragma pack(1)
	@@ -165,7 +165,7 @@ typedef struct tagKnownBSS {
	BYTE abyIEs[1024]; // don't move this field !!		BYTE abyIEs[1024]; // don't move this field !!

	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	KnownBSS , DEF* PKnownBSS;		KnownBSS , *PKnownBSS;



	@@ -235,7 +235,7 @@ typedef struct tagKnownNodeDB {
	UINT uTxFail[MAX_RATE+1];		UINT uTxFail[MAX_RATE+1];
	UINT uTimeCount;		UINT uTimeCount;

	} KnownNodeDB, DEF* PKnownNodeDB;		} KnownNodeDB, *PKnownNodeDB;


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

drivers/staging/vt6656/card.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,7 @@ typedef enum _CARD_PHY_TYPE {
	PHY_TYPE_11B,		PHY_TYPE_11B,
	PHY_TYPE_11G,		PHY_TYPE_11G,
	PHY_TYPE_11A		PHY_TYPE_11A
	} CARD_PHY_TYPE, DEF* PCARD_PHY_TYPE;		} CARD_PHY_TYPE, *PCARD_PHY_TYPE;

	typedef enum _CARD_OP_MODE {		typedef enum _CARD_OP_MODE {

drivers/staging/vt6656/channel.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,7 @@ typedef struct tagSChannelTblElement {
	BYTE byChannelNumber;		BYTE byChannelNumber;
	UINT uFrequency;		UINT uFrequency;
	BOOL bValid;		BOOL bValid;
	}SChannelTblElement, DEF* PSChannelTblElement;		}SChannelTblElement, *PSChannelTblElement;

	/--------------------- Export Variables --------------------------/		/--------------------- Export Variables --------------------------/

drivers/staging/vt6656/desc.h

+37 −37

Original line number	Original line	Diff line number	Diff line
	@@ -184,8 +184,8 @@ typedef struct tagSRrvTime_gRTS {
	WORD wTxRrvTime_b;		WORD wTxRrvTime_b;
	WORD wTxRrvTime_a;		WORD wTxRrvTime_a;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRrvTime_gRTS, DEF* PSRrvTime_gRTS;		SRrvTime_gRTS, *PSRrvTime_gRTS;
	typedef const SRrvTime_gRTS DEF* PCSRrvTime_gRTS;		typedef const SRrvTime_gRTS *PCSRrvTime_gRTS;

	typedef struct tagSRrvTime_gCTS {		typedef struct tagSRrvTime_gCTS {
	WORD wCTSTxRrvTime_ba;		WORD wCTSTxRrvTime_ba;
	@@ -193,22 +193,22 @@ typedef struct tagSRrvTime_gCTS {
	WORD wTxRrvTime_b;		WORD wTxRrvTime_b;
	WORD wTxRrvTime_a;		WORD wTxRrvTime_a;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRrvTime_gCTS, DEF* PSRrvTime_gCTS;		SRrvTime_gCTS, *PSRrvTime_gCTS;
	typedef const SRrvTime_gCTS DEF* PCSRrvTime_gCTS;		typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;

	typedef struct tagSRrvTime_ab {		typedef struct tagSRrvTime_ab {
	WORD wRTSTxRrvTime;		WORD wRTSTxRrvTime;
	WORD wTxRrvTime;		WORD wTxRrvTime;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRrvTime_ab, DEF* PSRrvTime_ab;		SRrvTime_ab, *PSRrvTime_ab;
	typedef const SRrvTime_ab DEF* PCSRrvTime_ab;		typedef const SRrvTime_ab *PCSRrvTime_ab;

	typedef struct tagSRrvTime_atim {		typedef struct tagSRrvTime_atim {
	WORD wCTSTxRrvTime_ba;		WORD wCTSTxRrvTime_ba;
	WORD wTxRrvTime_a;		WORD wTxRrvTime_a;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRrvTime_atim, DEF* PSRrvTime_atim;		SRrvTime_atim, *PSRrvTime_atim;
	typedef const SRrvTime_atim DEF* PCSRrvTime_atim;		typedef const SRrvTime_atim *PCSRrvTime_atim;

	//		//
	// RTS buffer header		// RTS buffer header
	@@ -219,8 +219,8 @@ typedef struct tagSRTSData {
	BYTE abyRA[U_ETHER_ADDR_LEN];		BYTE abyRA[U_ETHER_ADDR_LEN];
	BYTE abyTA[U_ETHER_ADDR_LEN];		BYTE abyTA[U_ETHER_ADDR_LEN];
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRTSData, DEF* PSRTSData;		SRTSData, *PSRTSData;
	typedef const SRTSData DEF* PCSRTSData;		typedef const SRTSData *PCSRTSData;

	typedef struct tagSRTS_g {		typedef struct tagSRTS_g {
	BYTE bySignalField_b;		BYTE bySignalField_b;
	@@ -235,8 +235,8 @@ typedef struct tagSRTS_g {
	WORD wReserved;		WORD wReserved;
	SRTSData Data;		SRTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRTS_g, DEF* PSRTS_g;		SRTS_g, *PSRTS_g;
	typedef const SRTS_g DEF* PCSRTS_g;		typedef const SRTS_g *PCSRTS_g;


	typedef struct tagSRTS_g_FB {		typedef struct tagSRTS_g_FB {
	@@ -256,8 +256,8 @@ typedef struct tagSRTS_g_FB {
	WORD wRTSDuration_aa_f1;		WORD wRTSDuration_aa_f1;
	SRTSData Data;		SRTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRTS_g_FB, DEF* PSRTS_g_FB;		SRTS_g_FB, *PSRTS_g_FB;
	typedef const SRTS_g_FB DEF* PCSRTS_g_FB;		typedef const SRTS_g_FB *PCSRTS_g_FB;


	typedef struct tagSRTS_ab {		typedef struct tagSRTS_ab {
	@@ -268,8 +268,8 @@ typedef struct tagSRTS_ab {
	WORD wReserved;		WORD wReserved;
	SRTSData Data;		SRTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRTS_ab, DEF* PSRTS_ab;		SRTS_ab, *PSRTS_ab;
	typedef const SRTS_ab DEF* PCSRTS_ab;		typedef const SRTS_ab *PCSRTS_ab;


	typedef struct tagSRTS_a_FB {		typedef struct tagSRTS_a_FB {
	@@ -282,8 +282,8 @@ typedef struct tagSRTS_a_FB {
	WORD wRTSDuration_f1;		WORD wRTSDuration_f1;
	SRTSData Data;		SRTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SRTS_a_FB, DEF* PSRTS_a_FB;		SRTS_a_FB, *PSRTS_a_FB;
	typedef const SRTS_a_FB DEF* PCSRTS_a_FB;		typedef const SRTS_a_FB *PCSRTS_a_FB;


	//		//
	@@ -295,7 +295,7 @@ typedef struct tagSCTSData {
	BYTE abyRA[U_ETHER_ADDR_LEN];		BYTE abyRA[U_ETHER_ADDR_LEN];
	WORD wReserved;		WORD wReserved;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SCTSData, DEF* PSCTSData;		SCTSData, *PSCTSData;

	typedef struct tagSCTS {		typedef struct tagSCTS {
	BYTE bySignalField_b;		BYTE bySignalField_b;
	@@ -305,8 +305,8 @@ typedef struct tagSCTS {
	WORD wReserved;		WORD wReserved;
	SCTSData Data;		SCTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SCTS, DEF* PSCTS;		SCTS, *PSCTS;
	typedef const SCTS DEF* PCSCTS;		typedef const SCTS *PCSCTS;

	typedef struct tagSCTS_FB {		typedef struct tagSCTS_FB {
	BYTE bySignalField_b;		BYTE bySignalField_b;
	@@ -318,8 +318,8 @@ typedef struct tagSCTS_FB {
	WORD wCTSDuration_ba_f1;		WORD wCTSDuration_ba_f1;
	SCTSData Data;		SCTSData Data;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SCTS_FB, DEF* PSCTS_FB;		SCTS_FB, *PSCTS_FB;
	typedef const SCTS_FB DEF* PCSCTS_FB;		typedef const SCTS_FB *PCSCTS_FB;


	//		//
	@@ -332,15 +332,15 @@ typedef struct tagSTxBufHead {
	WORD wFragCtl;		WORD wFragCtl;
	WORD wReserved;		WORD wReserved;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxBufHead, DEF* PSTxBufHead;		STxBufHead, *PSTxBufHead;
	typedef const STxBufHead DEF* PCSTxBufHead;		typedef const STxBufHead *PCSTxBufHead;

	typedef struct tagSTxShortBufHead {		typedef struct tagSTxShortBufHead {
	WORD wFIFOCtl;		WORD wFIFOCtl;
	WORD wTimeStamp;		WORD wTimeStamp;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxShortBufHead, DEF* PSTxShortBufHead;		STxShortBufHead, *PSTxShortBufHead;
	typedef const STxShortBufHead DEF* PCSTxShortBufHead;		typedef const STxShortBufHead *PCSTxShortBufHead;

	//		//
	// Tx data header		// Tx data header
	@@ -357,8 +357,8 @@ typedef struct tagSTxDataHead_g {
	WORD wTimeStampOff_b;		WORD wTimeStampOff_b;
	WORD wTimeStampOff_a;		WORD wTimeStampOff_a;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxDataHead_g, DEF* PSTxDataHead_g;		STxDataHead_g, *PSTxDataHead_g;
	typedef const STxDataHead_g DEF* PCSTxDataHead_g;		typedef const STxDataHead_g *PCSTxDataHead_g;

	typedef struct tagSTxDataHead_g_FB {		typedef struct tagSTxDataHead_g_FB {
	BYTE bySignalField_b;		BYTE bySignalField_b;
	@@ -374,8 +374,8 @@ typedef struct tagSTxDataHead_g_FB {
	WORD wTimeStampOff_b;		WORD wTimeStampOff_b;
	WORD wTimeStampOff_a;		WORD wTimeStampOff_a;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxDataHead_g_FB, DEF* PSTxDataHead_g_FB;		STxDataHead_g_FB, *PSTxDataHead_g_FB;
	typedef const STxDataHead_g_FB DEF* PCSTxDataHead_g_FB;		typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;


	typedef struct tagSTxDataHead_ab {		typedef struct tagSTxDataHead_ab {
	@@ -385,8 +385,8 @@ typedef struct tagSTxDataHead_ab {
	WORD wDuration;		WORD wDuration;
	WORD wTimeStampOff;		WORD wTimeStampOff;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxDataHead_ab, DEF* PSTxDataHead_ab;		STxDataHead_ab, *PSTxDataHead_ab;
	typedef const STxDataHead_ab DEF* PCSTxDataHead_ab;		typedef const STxDataHead_ab *PCSTxDataHead_ab;


	typedef struct tagSTxDataHead_a_FB {		typedef struct tagSTxDataHead_a_FB {
	@@ -398,8 +398,8 @@ typedef struct tagSTxDataHead_a_FB {
	WORD wDuration_f0;		WORD wDuration_f0;
	WORD wDuration_f1;		WORD wDuration_f1;
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	STxDataHead_a_FB, DEF* PSTxDataHead_a_FB;		STxDataHead_a_FB, *PSTxDataHead_a_FB;
	typedef const STxDataHead_a_FB DEF* PCSTxDataHead_a_FB;		typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;

	//		//
	// MICHDR data header		// MICHDR data header
	@@ -409,8 +409,8 @@ typedef struct tagSMICHDRHead {
	DWORD adwHDR1[4];		DWORD adwHDR1[4];
	DWORD adwHDR2[4];		DWORD adwHDR2[4];
	}__attribute__ ((__packed__))		}__attribute__ ((__packed__))
	SMICHDRHead, DEF* PSMICHDRHead;		SMICHDRHead, *PSMICHDRHead;
	typedef const SMICHDRHead DEF* PCSMICHDRHead;		typedef const SMICHDRHead *PCSMICHDRHead;

	typedef struct tagSBEACONCtl {		typedef struct tagSBEACONCtl {
	DWORD BufReady : 1;		DWORD BufReady : 1;

drivers/staging/vt6656/device.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -388,7 +388,7 @@ typedef struct tagSPMKIDCandidateEvent {
	ULONG Version; // Version of the structure		ULONG Version; // Version of the structure
	ULONG NumCandidates; // No. of pmkid candidates		ULONG NumCandidates; // No. of pmkid candidates
	PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST];		PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST];
	} SPMKIDCandidateEvent, DEF* PSPMKIDCandidateEvent;		} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent;

	//--		//--

	@@ -400,7 +400,7 @@ typedef struct tagSQuietControl {
	DWORD dwStartTime;		DWORD dwStartTime;
	BYTE byPeriod;		BYTE byPeriod;
	WORD wDuration;		WORD wDuration;
	} SQuietControl, DEF* PSQuietControl;		} SQuietControl, *PSQuietControl;

	//--		//--

	@@ -432,7 +432,7 @@ typedef struct tagSDeFragControlBlock
	PBYTE pbyRxBuffer;		PBYTE pbyRxBuffer;
	UINT cbFrameLength;		UINT cbFrameLength;
	BOOL bInUse;		BOOL bInUse;
	} SDeFragControlBlock, DEF* PSDeFragControlBlock;		} SDeFragControlBlock, *PSDeFragControlBlock;