diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-08-20 22:52:30 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-21 10:13:27 -0700 |
commit | aed387c78d4ad3cb7b65670785ab396ce06d0b5d (patch) | |
tree | dd36952cd4c320df2ef2f8eee3b85a89d2c9b252 /drivers/staging/vt6656/rxtx.h | |
parent | 4ac306e0d41e8da01a59ac9e3a347877d56874a7 (diff) |
staging: vt6656: baseband.c BBvCalculateParameter create structure for pwPhyLen, pbyPhySrv and pbyPhySgn
Create single packed structure vnt_phy_field for rxtx.h structures.
In card.c CARDvSetRSPINF a vnt_phy_field replaces abyServ,
abySignal, awLen variables.
In rxtx.c point BBvCalculateParameter to relevant field.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/rxtx.h')
-rw-r--r-- | drivers/staging/vt6656/rxtx.h | 57 |
1 files changed, 15 insertions, 42 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index b1ef90eac4e..3484f2b1664 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -31,6 +31,7 @@ #include "device.h" #include "wcmd.h" +#include "baseband.h" /* RsvTime buffer header */ struct vnt_rrv_time_rts { @@ -56,12 +57,8 @@ struct vnt_rrv_time_ab { /* TX data header */ struct vnt_tx_datahead_g { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; - u8 bySignalField_a; - u8 byServiceField_a; - u16 wTransmitLength_a; + struct vnt_phy_field b; + struct vnt_phy_field a; u16 wDuration_b; u16 wDuration_a; u16 wTimeStampOff_b; @@ -69,12 +66,8 @@ struct vnt_tx_datahead_g { } __packed; struct vnt_tx_datahead_g_fb { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; - u8 bySignalField_a; - u8 byServiceField_a; - u16 wTransmitLength_a; + struct vnt_phy_field b; + struct vnt_phy_field a; u16 wDuration_b; u16 wDuration_a; u16 wDuration_a_f0; @@ -84,17 +77,13 @@ struct vnt_tx_datahead_g_fb { } __packed; struct vnt_tx_datahead_ab { - u8 bySignalField; - u8 byServiceField; - u16 wTransmitLength; + struct vnt_phy_field ab; u16 wDuration; u16 wTimeStampOff; } __packed; struct vnt_tx_datahead_a_fb { - u8 bySignalField; - u8 byServiceField; - u16 wTransmitLength; + struct vnt_phy_field a; u16 wDuration; u16 wTimeStampOff; u16 wDuration_f0; @@ -103,12 +92,8 @@ struct vnt_tx_datahead_a_fb { /* RTS buffer header */ struct vnt_rts_g { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; - u8 bySignalField_a; - u8 byServiceField_a; - u16 wTransmitLength_a; + struct vnt_phy_field b; + struct vnt_phy_field a; u16 wDuration_ba; u16 wDuration_aa; u16 wDuration_bb; @@ -117,12 +102,8 @@ struct vnt_rts_g { } __packed; struct vnt_rts_g_fb { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; - u8 bySignalField_a; - u8 byServiceField_a; - u16 wTransmitLength_a; + struct vnt_phy_field b; + struct vnt_phy_field a; u16 wDuration_ba; u16 wDuration_aa; u16 wDuration_bb; @@ -135,18 +116,14 @@ struct vnt_rts_g_fb { } __packed; struct vnt_rts_ab { - u8 bySignalField; - u8 byServiceField; - u16 wTransmitLength; + struct vnt_phy_field ab; u16 wDuration; u16 wReserved; struct ieee80211_rts data; } __packed; struct vnt_rts_a_fb { - u8 bySignalField; - u8 byServiceField; - u16 wTransmitLength; + struct vnt_phy_field a; u16 wDuration; u16 wReserved; u16 wRTSDuration_f0; @@ -156,9 +133,7 @@ struct vnt_rts_a_fb { /* CTS buffer header */ struct vnt_cts { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; + struct vnt_phy_field b; u16 wDuration_ba; u16 wReserved; struct ieee80211_cts data; @@ -166,9 +141,7 @@ struct vnt_cts { } __packed; struct vnt_cts_fb { - u8 bySignalField_b; - u8 byServiceField_b; - u16 wTransmitLength_b; + struct vnt_phy_field b; u16 wDuration_ba; u16 wReserved; u16 wCTSDuration_ba_f0; |