diff options
Diffstat (limited to 'drivers/staging/vt6656/rxtx.h')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.h | 157 |
1 files changed, 101 insertions, 56 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 4bbee1c2fca..6db3337f1d1 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -53,119 +53,125 @@ struct vnt_mic_hdr { /* RsvTime buffer header */ struct vnt_rrv_time_rts { - u16 wRTSTxRrvTime_ba; - u16 wRTSTxRrvTime_aa; - u16 wRTSTxRrvTime_bb; + __le16 rts_rrv_time_ba; + __le16 rts_rrv_time_aa; + __le16 rts_rrv_time_bb; u16 wReserved; - u16 wTxRrvTime_b; - u16 wTxRrvTime_a; + __le16 rrv_time_b; + __le16 rrv_time_a; } __packed; struct vnt_rrv_time_cts { - u16 wCTSTxRrvTime_ba; + __le16 cts_rrv_time_ba; u16 wReserved; - u16 wTxRrvTime_b; - u16 wTxRrvTime_a; + __le16 rrv_time_b; + __le16 rrv_time_a; } __packed; struct vnt_rrv_time_ab { - u16 wRTSTxRrvTime; - u16 wTxRrvTime; + __le16 rts_rrv_time; + __le16 rrv_time; } __packed; /* TX data header */ struct vnt_tx_datahead_g { struct vnt_phy_field b; struct vnt_phy_field a; - u16 wDuration_b; - u16 wDuration_a; - u16 wTimeStampOff_b; - u16 wTimeStampOff_a; + __le16 duration_b; + __le16 duration_a; + __le16 time_stamp_off_b; + __le16 time_stamp_off_a; } __packed; struct vnt_tx_datahead_g_fb { struct vnt_phy_field b; struct vnt_phy_field a; - u16 wDuration_b; - u16 wDuration_a; - u16 wDuration_a_f0; - u16 wDuration_a_f1; - u16 wTimeStampOff_b; - u16 wTimeStampOff_a; + __le16 duration_b; + __le16 duration_a; + __le16 duration_a_f0; + __le16 duration_a_f1; + __le16 time_stamp_off_b; + __le16 time_stamp_off_a; } __packed; struct vnt_tx_datahead_ab { struct vnt_phy_field ab; - u16 wDuration; - u16 wTimeStampOff; + __le16 duration; + __le16 time_stamp_off; } __packed; struct vnt_tx_datahead_a_fb { struct vnt_phy_field a; - u16 wDuration; - u16 wTimeStampOff; - u16 wDuration_f0; - u16 wDuration_f1; + __le16 duration; + __le16 time_stamp_off; + __le16 duration_f0; + __le16 duration_f1; } __packed; /* RTS buffer header */ struct vnt_rts_g { struct vnt_phy_field b; struct vnt_phy_field a; - u16 wDuration_ba; - u16 wDuration_aa; - u16 wDuration_bb; + __le16 duration_ba; + __le16 duration_aa; + __le16 duration_bb; u16 wReserved; struct ieee80211_rts data; + struct vnt_tx_datahead_g data_head; } __packed; struct vnt_rts_g_fb { struct vnt_phy_field b; struct vnt_phy_field a; - u16 wDuration_ba; - u16 wDuration_aa; - u16 wDuration_bb; + __le16 duration_ba; + __le16 duration_aa; + __le16 duration_bb; u16 wReserved; - u16 wRTSDuration_ba_f0; - u16 wRTSDuration_aa_f0; - u16 wRTSDuration_ba_f1; - u16 wRTSDuration_aa_f1; + __le16 rts_duration_ba_f0; + __le16 rts_duration_aa_f0; + __le16 rts_duration_ba_f1; + __le16 rts_duration_aa_f1; struct ieee80211_rts data; + struct vnt_tx_datahead_g_fb data_head; } __packed; struct vnt_rts_ab { struct vnt_phy_field ab; - u16 wDuration; + __le16 duration; u16 wReserved; struct ieee80211_rts data; + struct vnt_tx_datahead_ab data_head; } __packed; struct vnt_rts_a_fb { struct vnt_phy_field a; - u16 wDuration; + __le16 duration; u16 wReserved; - u16 wRTSDuration_f0; - u16 wRTSDuration_f1; + __le16 rts_duration_f0; + __le16 rts_duration_f1; struct ieee80211_rts data; + struct vnt_tx_datahead_a_fb data_head; } __packed; /* CTS buffer header */ struct vnt_cts { struct vnt_phy_field b; - u16 wDuration_ba; + __le16 duration_ba; u16 wReserved; struct ieee80211_cts data; u16 reserved2; + struct vnt_tx_datahead_g data_head; } __packed; struct vnt_cts_fb { struct vnt_phy_field b; - u16 wDuration_ba; + __le16 duration_ba; u16 wReserved; - u16 wCTSDuration_ba_f0; - u16 wCTSDuration_ba_f1; + __le16 cts_duration_ba_f0; + __le16 cts_duration_ba_f1; struct ieee80211_cts data; u16 reserved2; + struct vnt_tx_datahead_g_fb data_head; } __packed; union vnt_tx_data_head { @@ -178,32 +184,71 @@ union vnt_tx_data_head { /* cts g */ struct vnt_cts cts_g; struct vnt_cts_fb cts_g_fb; + /* no rts/cts */ + struct vnt_tx_datahead_a_fb data_head_a_fb; + struct vnt_tx_datahead_ab data_head_ab; }; -struct vnt_tx_buffer { - u8 byType; - u8 byPKTNO; - u16 wTxByteCount; +struct vnt_tx_mic_hdr { + struct vnt_mic_hdr hdr; + union vnt_tx_data_head head; +} __packed; + +union vnt_tx { + struct vnt_tx_mic_hdr mic; + union vnt_tx_data_head head; +}; + +union vnt_tx_head { + struct { + struct vnt_rrv_time_rts rts; + union vnt_tx tx; + } __packed tx_rts; + struct { + struct vnt_rrv_time_cts cts; + union vnt_tx tx; + } __packed tx_cts; + struct { + struct vnt_rrv_time_ab ab; + union vnt_tx tx; + } __packed tx_ab; +}; + +struct vnt_tx_fifo_head { u32 adwTxKey[4]; u16 wFIFOCtl; - u16 wTimeStamp; + __le16 time_stamp; u16 wFragCtl; - u16 wReserved; + __le16 current_rate; +} __packed; + +struct vnt_tx_buffer { + u8 byType; + u8 byPKTNO; + __le16 tx_byte_count; + struct vnt_tx_fifo_head fifo_head; + union vnt_tx_head tx_head; +} __packed; + +struct vnt_tx_short_buf_head { + u16 fifo_ctl; + u16 time_stamp; + struct vnt_phy_field ab; + __le16 duration; + __le16 time_stamp_off; } __packed; struct vnt_beacon_buffer { u8 byType; u8 byPKTNO; - u16 wTxByteCount; - u16 wFIFOCtl; - u16 wTimeStamp; + __le16 tx_byte_count; + struct vnt_tx_short_buf_head short_head; + struct ieee80211_hdr hdr; } __packed; void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb); -int nsDMA_tx_packet(struct vnt_private *, u32 uDMAIdx, struct sk_buff *skb); +int nsDMA_tx_packet(struct vnt_private *, struct sk_buff *skb); CMD_STATUS csMgmt_xmit(struct vnt_private *, struct vnt_tx_mgmt *); CMD_STATUS csBeacon_xmit(struct vnt_private *, struct vnt_tx_mgmt *); -int bRelayPacketSend(struct vnt_private *, u8 *pbySkbData, u32 uDataLen, - u32 uNodeIndex); #endif /* __RXTX_H__ */ |