aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2013-08-15 16:23:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-15 20:24:22 -0400
commitc521cb58880c153683c983a51e54517b21d04daf (patch)
tree76eebf5d3f9dc20089bc450f77533a76ec6785f4
parent24b7ed475e2b71eba68ee9714b29c712f8dc41f6 (diff)
staging: vt6656: desc.h Remove typedef struct tagSRTS_* to new strutures in rxtx.h
The new structures being typedef struct tagSRTS_g -> struct vnt_rts_g typedef struct tagSRTS_g_FB -> struct vnt_rts_g_fb typedef struct tagSRTS_ab -> struct vnt_rts_ab typedef struct tagSRTS_a_FB -> struct vnt_rts_a_fb These are only needed by rxtc.c so moved to rxtx.h and will eventually form part of the structure of struct vnt_tx_buffer. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/staging/vt6656/desc.h66
-rw-r--r--drivers/staging/vt6656/rxtx.c51
-rw-r--r--drivers/staging/vt6656/rxtx.h53
3 files changed, 87 insertions, 83 deletions
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h
index 1a1cf34e4113..4e2eb1886936 100644
--- a/drivers/staging/vt6656/desc.h
+++ b/drivers/staging/vt6656/desc.h
@@ -186,72 +186,6 @@ SRrvTime_atim, *PSRrvTime_atim;
186typedef const SRrvTime_atim *PCSRrvTime_atim; 186typedef const SRrvTime_atim *PCSRrvTime_atim;
187 187
188/* 188/*
189 * RTS buffer header
190 */
191typedef struct tagSRTS_g {
192 u8 bySignalField_b;
193 u8 byServiceField_b;
194 u16 wTransmitLength_b;
195 u8 bySignalField_a;
196 u8 byServiceField_a;
197 u16 wTransmitLength_a;
198 u16 wDuration_ba;
199 u16 wDuration_aa;
200 u16 wDuration_bb;
201 u16 wReserved;
202 struct ieee80211_rts data;
203} __attribute__ ((__packed__))
204SRTS_g, *PSRTS_g;
205typedef const SRTS_g *PCSRTS_g;
206
207typedef struct tagSRTS_g_FB {
208 u8 bySignalField_b;
209 u8 byServiceField_b;
210 u16 wTransmitLength_b;
211 u8 bySignalField_a;
212 u8 byServiceField_a;
213 u16 wTransmitLength_a;
214 u16 wDuration_ba;
215 u16 wDuration_aa;
216 u16 wDuration_bb;
217 u16 wReserved;
218 u16 wRTSDuration_ba_f0;
219 u16 wRTSDuration_aa_f0;
220 u16 wRTSDuration_ba_f1;
221 u16 wRTSDuration_aa_f1;
222 struct ieee80211_rts data;
223} __attribute__ ((__packed__))
224SRTS_g_FB, *PSRTS_g_FB;
225
226typedef const SRTS_g_FB *PCSRTS_g_FB;
227
228typedef struct tagSRTS_ab {
229 u8 bySignalField;
230 u8 byServiceField;
231 u16 wTransmitLength;
232 u16 wDuration;
233 u16 wReserved;
234 struct ieee80211_rts data;
235} __attribute__ ((__packed__))
236SRTS_ab, *PSRTS_ab;
237
238typedef const SRTS_ab *PCSRTS_ab;
239
240typedef struct tagSRTS_a_FB {
241 u8 bySignalField;
242 u8 byServiceField;
243 u16 wTransmitLength;
244 u16 wDuration;
245 u16 wReserved;
246 u16 wRTSDuration_f0;
247 u16 wRTSDuration_f1;
248 struct ieee80211_rts data;
249} __attribute__ ((__packed__))
250SRTS_a_FB, *PSRTS_a_FB;
251
252typedef const SRTS_a_FB *PCSRTS_a_FB;
253
254/*
255 * CTS buffer header 189 * CTS buffer header
256 */ 190 */
257typedef struct tagSCTS { 191typedef struct tagSCTS {
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 7a4ebbc40d2f..e7ff84520fe2 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -629,7 +629,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
629 // Otherwise, we need to modified codes for them. 629 // Otherwise, we need to modified codes for them.
630 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { 630 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
631 if (byFBOption == AUTO_FB_NONE) { 631 if (byFBOption == AUTO_FB_NONE) {
632 PSRTS_g pBuf = (PSRTS_g)pvRTS; 632 struct vnt_rts_g *pBuf = (struct vnt_rts_g *)pvRTS;
633 //Get SignalField,ServiceField,Length 633 //Get SignalField,ServiceField,Length
634 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 634 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
635 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 635 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
@@ -665,7 +665,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
665 memcpy(pBuf->data.ta, psEthHeader->h_source, ETH_ALEN); 665 memcpy(pBuf->data.ta, psEthHeader->h_source, ETH_ALEN);
666 } 666 }
667 else { 667 else {
668 PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS; 668 struct vnt_rts_g_fb *pBuf = (struct vnt_rts_g_fb *)pvRTS;
669 //Get SignalField,ServiceField,Length 669 //Get SignalField,ServiceField,Length
670 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 670 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
671 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 671 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b)
@@ -715,7 +715,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
715 } 715 }
716 else if (byPktType == PK_TYPE_11A) { 716 else if (byPktType == PK_TYPE_11A) {
717 if (byFBOption == AUTO_FB_NONE) { 717 if (byFBOption == AUTO_FB_NONE) {
718 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 718 struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS;
719 //Get SignalField,ServiceField,Length 719 //Get SignalField,ServiceField,Length
720 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 720 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
721 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 721 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
@@ -741,7 +741,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
741 memcpy(pBuf->data.ta, psEthHeader->h_source, ETH_ALEN); 741 memcpy(pBuf->data.ta, psEthHeader->h_source, ETH_ALEN);
742 } 742 }
743 else { 743 else {
744 PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS; 744 struct vnt_rts_a_fb *pBuf = (struct vnt_rts_a_fb *)pvRTS;
745 //Get SignalField,ServiceField,Length 745 //Get SignalField,ServiceField,Length
746 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 746 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
747 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 747 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
@@ -774,7 +774,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType,
774 } 774 }
775 } 775 }
776 else if (byPktType == PK_TYPE_11B) { 776 else if (byPktType == PK_TYPE_11B) {
777 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 777 struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS;
778 //Get SignalField,ServiceField,Length 778 //Get SignalField,ServiceField,Length
779 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 779 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
780 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 780 (u16 *)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
@@ -1151,10 +1151,15 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
1151 if (bRTS == true) {//RTS_need 1151 if (bRTS == true) {//RTS_need
1152 pvRrvTime = (PSRrvTime_gRTS) (pbyTxBufferAddr + wTxBufSize); 1152 pvRrvTime = (PSRrvTime_gRTS) (pbyTxBufferAddr + wTxBufSize);
1153 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS)); 1153 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS));
1154 pvRTS = (PSRTS_g) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR); 1154 pvRTS = (struct vnt_rts_g *) (pbyTxBufferAddr + wTxBufSize +
1155 sizeof(SRrvTime_gRTS) + cbMICHDR);
1155 pvCTS = NULL; 1156 pvCTS = NULL;
1156 pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR + sizeof(SRTS_g)); 1157 pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +
1157 cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR + sizeof(SRTS_g) + sizeof(STxDataHead_g); 1158 sizeof(SRrvTime_gRTS) + cbMICHDR +
1159 sizeof(struct vnt_rts_g));
1160 cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gRTS) +
1161 cbMICHDR + sizeof(struct vnt_rts_g) +
1162 sizeof(STxDataHead_g);
1158 } 1163 }
1159 else { //RTS_needless 1164 else { //RTS_needless
1160 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize); 1165 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
@@ -1169,10 +1174,14 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
1169 if (bRTS == true) {//RTS_need 1174 if (bRTS == true) {//RTS_need
1170 pvRrvTime = (PSRrvTime_gRTS) (pbyTxBufferAddr + wTxBufSize); 1175 pvRrvTime = (PSRrvTime_gRTS) (pbyTxBufferAddr + wTxBufSize);
1171 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS)); 1176 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS));
1172 pvRTS = (PSRTS_g_FB) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR); 1177 pvRTS = (struct vnt_rts_g_fb *) (pbyTxBufferAddr + wTxBufSize +
1178 sizeof(SRrvTime_gRTS) + cbMICHDR);
1173 pvCTS = NULL; 1179 pvCTS = NULL;
1174 pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR + sizeof(SRTS_g_FB)); 1180 pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr + wTxBufSize +
1175 cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR + sizeof(SRTS_g_FB) + sizeof(STxDataHead_g_FB); 1181 sizeof(SRrvTime_gRTS) + cbMICHDR +
1182 sizeof(struct vnt_rts_g_fb));
1183 cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gRTS) + cbMICHDR +
1184 sizeof(struct vnt_rts_g_fb) + sizeof(STxDataHead_g_FB);
1176 } 1185 }
1177 else if (bRTS == false) { //RTS_needless 1186 else if (bRTS == false) { //RTS_needless
1178 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize); 1187 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
@@ -1189,10 +1198,14 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
1189 if (bRTS == true) {//RTS_need 1198 if (bRTS == true) {//RTS_need
1190 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize); 1199 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize);
1191 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab)); 1200 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab));
1192 pvRTS = (PSRTS_ab) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR); 1201 pvRTS = (struct vnt_rts_ab *) (pbyTxBufferAddr + wTxBufSize +
1202 sizeof(SRrvTime_ab) + cbMICHDR);
1193 pvCTS = NULL; 1203 pvCTS = NULL;
1194 pvTxDataHd = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR + sizeof(SRTS_ab)); 1204 pvTxDataHd = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize +
1195 cbHeaderLength = wTxBufSize + sizeof(PSRrvTime_ab) + cbMICHDR + sizeof(SRTS_ab) + sizeof(STxDataHead_ab); 1205 sizeof(SRrvTime_ab) + cbMICHDR +
1206 sizeof(struct vnt_rts_ab));
1207 cbHeaderLength = wTxBufSize + sizeof(PSRrvTime_ab) + cbMICHDR +
1208 sizeof(struct vnt_rts_ab) + sizeof(STxDataHead_ab);
1196 } 1209 }
1197 else if (bRTS == false) { //RTS_needless, no MICHDR 1210 else if (bRTS == false) { //RTS_needless, no MICHDR
1198 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize); 1211 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize);
@@ -1207,10 +1220,14 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
1207 if (bRTS == true) {//RTS_need 1220 if (bRTS == true) {//RTS_need
1208 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize); 1221 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize);
1209 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab)); 1222 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab));
1210 pvRTS = (PSRTS_a_FB) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR); 1223 pvRTS = (struct vnt_rts_a_fb *) (pbyTxBufferAddr + wTxBufSize +
1224 sizeof(SRrvTime_ab) + cbMICHDR);
1211 pvCTS = NULL; 1225 pvCTS = NULL;
1212 pvTxDataHd = (PSTxDataHead_a_FB) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_ab) + cbMICHDR + sizeof(SRTS_a_FB)); 1226 pvTxDataHd = (PSTxDataHead_a_FB) (pbyTxBufferAddr + wTxBufSize +
1213 cbHeaderLength = wTxBufSize + sizeof(PSRrvTime_ab) + cbMICHDR + sizeof(SRTS_a_FB) + sizeof(STxDataHead_a_FB); 1227 sizeof(SRrvTime_ab) + cbMICHDR +
1228 sizeof(struct vnt_rts_a_fb));
1229 cbHeaderLength = wTxBufSize + sizeof(PSRrvTime_ab) + cbMICHDR +
1230 sizeof(struct vnt_rts_a_fb) + sizeof(STxDataHead_a_FB);
1214 } 1231 }
1215 else if (bRTS == false) { //RTS_needless 1232 else if (bRTS == false) { //RTS_needless
1216 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize); 1233 pvRrvTime = (PSRrvTime_ab) (pbyTxBufferAddr + wTxBufSize);
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 3e347a932ede..8ce5bfcd737a 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -32,6 +32,59 @@
32#include "device.h" 32#include "device.h"
33#include "wcmd.h" 33#include "wcmd.h"
34 34
35/* RTS buffer header */
36struct vnt_rts_g {
37 u8 bySignalField_b;
38 u8 byServiceField_b;
39 u16 wTransmitLength_b;
40 u8 bySignalField_a;
41 u8 byServiceField_a;
42 u16 wTransmitLength_a;
43 u16 wDuration_ba;
44 u16 wDuration_aa;
45 u16 wDuration_bb;
46 u16 wReserved;
47 struct ieee80211_rts data;
48} __packed;
49
50struct vnt_rts_g_fb {
51 u8 bySignalField_b;
52 u8 byServiceField_b;
53 u16 wTransmitLength_b;
54 u8 bySignalField_a;
55 u8 byServiceField_a;
56 u16 wTransmitLength_a;
57 u16 wDuration_ba;
58 u16 wDuration_aa;
59 u16 wDuration_bb;
60 u16 wReserved;
61 u16 wRTSDuration_ba_f0;
62 u16 wRTSDuration_aa_f0;
63 u16 wRTSDuration_ba_f1;
64 u16 wRTSDuration_aa_f1;
65 struct ieee80211_rts data;
66} __packed;
67
68struct vnt_rts_ab {
69 u8 bySignalField;
70 u8 byServiceField;
71 u16 wTransmitLength;
72 u16 wDuration;
73 u16 wReserved;
74 struct ieee80211_rts data;
75} __packed;
76
77struct vnt_rts_a_fb {
78 u8 bySignalField;
79 u8 byServiceField;
80 u16 wTransmitLength;
81 u16 wDuration;
82 u16 wReserved;
83 u16 wRTSDuration_f0;
84 u16 wRTSDuration_f1;
85 struct ieee80211_rts data;
86} __packed;
87
35struct vnt_tx_buffer { 88struct vnt_tx_buffer {
36 u8 byType; 89 u8 byType;
37 u8 byPKTNO; 90 u8 byPKTNO;
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-13 00:52:22 -0400