staging: vt6655: rxtx create new structure vnt_tx_short_buf_head for csBeacon_xmit

[karo-tx-linux.git] / drivers / staging / vt6655 / desc.h

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 05efa4e1b68225a454888a3cb8a1b93b7bca0e7f..b5730df9c121fd84659fbd33e4b0ba73ef8ccc61 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -377,13 +377,22 @@ typedef struct tagSRTSData {
 SRTSData, *PSRTSData;
 typedef const SRTSData *PCSRTSData;
 
+/* Length, Service, and Signal fields of Phy for Tx */
+struct vnt_phy_field {
+       u8 signal;
+       u8 service;
+       __le16 len;
+} __packed;
+
+union vnt_phy_field_swap {
+       struct vnt_phy_field field_read;
+       u16 swap[2];
+       u32 field_write;
+};
+
 typedef struct tagSRTS_g {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
-       unsigned char bySignalField_a;
-       unsigned char byServiceField_a;
-       unsigned short wTransmitLength_a;
+       struct vnt_phy_field b;
+       struct vnt_phy_field a;
        unsigned short wDuration_ba;
        unsigned short wDuration_aa;
        unsigned short wDuration_bb;
@@ -394,12 +403,8 @@ SRTS_g, *PSRTS_g;
 typedef const SRTS_g *PCSRTS_g;
 
 typedef struct tagSRTS_g_FB {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
-       unsigned char bySignalField_a;
-       unsigned char byServiceField_a;
-       unsigned short wTransmitLength_a;
+       struct vnt_phy_field b;
+       struct vnt_phy_field a;
        unsigned short wDuration_ba;
        unsigned short wDuration_aa;
        unsigned short wDuration_bb;
@@ -414,9 +419,7 @@ SRTS_g_FB, *PSRTS_g_FB;
 typedef const SRTS_g_FB *PCSRTS_g_FB;
 
 typedef struct tagSRTS_ab {
-       unsigned char bySignalField;
-       unsigned char byServiceField;
-       unsigned short wTransmitLength;
+       struct vnt_phy_field ab;
        unsigned short wDuration;
        unsigned short wReserved;
        SRTSData    Data;
@@ -425,9 +428,7 @@ SRTS_ab, *PSRTS_ab;
 typedef const SRTS_ab *PCSRTS_ab;
 
 typedef struct tagSRTS_a_FB {
-       unsigned char bySignalField;
-       unsigned char byServiceField;
-       unsigned short wTransmitLength;
+       struct vnt_phy_field a;
        unsigned short wDuration;
        unsigned short wReserved;
        unsigned short wRTSDuration_f0;
@@ -449,9 +450,7 @@ typedef struct tagSCTSData {
 SCTSData, *PSCTSData;
 
 typedef struct tagSCTS {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
+       struct vnt_phy_field b;
        unsigned short wDuration_ba;
        unsigned short wReserved;
        SCTSData    Data;
@@ -460,9 +459,7 @@ SCTS, *PSCTS;
 typedef const SCTS *PCSCTS;
 
 typedef struct tagSCTS_FB {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
+       struct vnt_phy_field b;
        unsigned short wDuration_ba;
        unsigned short wReserved;
        unsigned short wCTSDuration_ba_f0;
@@ -486,23 +483,12 @@ typedef struct tagSTxBufHead {
 STxBufHead, *PSTxBufHead;
 typedef const STxBufHead *PCSTxBufHead;
 
-typedef struct tagSTxShortBufHead {
-       unsigned short wFIFOCtl;
-       unsigned short wTimeStamp;
-} __attribute__ ((__packed__))
-STxShortBufHead, *PSTxShortBufHead;
-typedef const STxShortBufHead *PCSTxShortBufHead;
-
 //
 // Tx data header
 //
 typedef struct tagSTxDataHead_g {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
-       unsigned char bySignalField_a;
-       unsigned char byServiceField_a;
-       unsigned short wTransmitLength_a;
+       struct vnt_phy_field b;
+       struct vnt_phy_field a;
        unsigned short wDuration_b;
        unsigned short wDuration_a;
        unsigned short wTimeStampOff_b;
@@ -512,12 +498,8 @@ STxDataHead_g, *PSTxDataHead_g;
 typedef const STxDataHead_g *PCSTxDataHead_g;
 
 typedef struct tagSTxDataHead_g_FB {
-       unsigned char bySignalField_b;
-       unsigned char byServiceField_b;
-       unsigned short wTransmitLength_b;
-       unsigned char bySignalField_a;
-       unsigned char byServiceField_a;
-       unsigned short wTransmitLength_a;
+       struct vnt_phy_field b;
+       struct vnt_phy_field a;
        unsigned short wDuration_b;
        unsigned short wDuration_a;
        unsigned short wDuration_a_f0;
@@ -529,9 +511,7 @@ STxDataHead_g_FB, *PSTxDataHead_g_FB;
 typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;
 
 typedef struct tagSTxDataHead_ab {
-       unsigned char bySignalField;
-       unsigned char byServiceField;
-       unsigned short wTransmitLength;
+       struct vnt_phy_field ab;
        unsigned short wDuration;
        unsigned short wTimeStampOff;
 } __attribute__ ((__packed__))
@@ -539,9 +519,7 @@ STxDataHead_ab, *PSTxDataHead_ab;
 typedef const STxDataHead_ab *PCSTxDataHead_ab;
 
 typedef struct tagSTxDataHead_a_FB {
-       unsigned char bySignalField;
-       unsigned char byServiceField;
-       unsigned short wTransmitLength;
+       struct vnt_phy_field a;
        unsigned short wDuration;
        unsigned short wTimeStampOff;
        unsigned short wDuration_f0;
@@ -550,17 +528,6 @@ typedef struct tagSTxDataHead_a_FB {
 STxDataHead_a_FB, *PSTxDataHead_a_FB;
 typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;
 
-//
-// MICHDR data header
-//
-typedef struct tagSMICHDRHead {
-       u32 adwHDR0[4];
-       u32 adwHDR1[4];
-       u32 adwHDR2[4];
-} __attribute__ ((__packed__))
-SMICHDRHead, *PSMICHDRHead;
-typedef const SMICHDRHead *PCSMICHDRHead;
-
 typedef struct tagSBEACONCtl {
        u32 BufReady:1;
        u32 TSF:15;