Skip to content

L
linux
Commit 78a717d8 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files
Options

staging:vt6655:desc: Whitespace cleanups 

Neatening only.
git diff -w shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8314cfc
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 241 deletions
drivers/staging/vt6655/desc.h
View file @ 78a717d8
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
// max transmit or receive buffer size // max transmit or receive buffer size
#define CB_MAX_BUF_SIZE 2900U // max buffer size #define CB_MAX_BUF_SIZE 2900U // max buffer size
// NOTE: must be multiple of 4 // NOTE: must be multiple of 4
#define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE // max Tx buffer size #define CB_MAX_TX_BUF_SIZE CB_MAX_BUF_SIZE // max Tx buffer size
#define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE // max Rx buffer size when not use Multi-RD #define CB_MAX_RX_BUF_SIZE_NORMAL CB_MAX_BUF_SIZE // max Rx buffer size when not use Multi-RD
...@@ -101,10 +101,10 @@ ...@@ -101,10 +101,10 @@
#define CB_MIN_TX_DESC 16 // min # of tx descriptor #define CB_MIN_TX_DESC 16 // min # of tx descriptor
#define CB_MAX_RECEIVED_PACKETS 16 // max # of received packets at one time #define CB_MAX_RECEIVED_PACKETS 16 // max # of received packets at one time
// limit our receive routine to indicating // limit our receive routine to indicating
// this many at a time for 2 reasons: // this many at a time for 2 reasons:
// 1. driver flow control to protocol layer // 1. driver flow control to protocol layer
// 2. limit the time used in ISR routine // 2. limit the time used in ISR routine
#define CB_EXTRA_RD_NUM 32 // default # of Extra RD #define CB_EXTRA_RD_NUM 32 // default # of Extra RD
#define CB_RD_NUM 32 // default # of RD #define CB_RD_NUM 32 // default # of RD
...@@ -213,28 +213,28 @@ ...@@ -213,28 +213,28 @@
// may link to older skb that leads error. // may link to older skb that leads error.
typedef struct tagDEVICE_RD_INFO { typedef struct tagDEVICE_RD_INFO {
struct sk_buff* skb; struct sk_buff *skb;
dma_addr_t skb_dma; dma_addr_t skb_dma;
dma_addr_t curr_desc; dma_addr_t curr_desc;
} DEVICE_RD_INFO, *PDEVICE_RD_INFO; } DEVICE_RD_INFO, *PDEVICE_RD_INFO;
/* /*
static inline PDEVICE_RD_INFO alloc_rd_info(void) { static inline PDEVICE_RD_INFO alloc_rd_info(void) {
PDEVICE_RD_INFO ptr; PDEVICE_RD_INFO ptr;
ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC); ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC);
if (ptr == NULL) if (ptr == NULL)
return NULL; return NULL;
else { else {
memset(ptr,0,sizeof(DEVICE_RD_INFO)); memset(ptr,0,sizeof(DEVICE_RD_INFO));
return ptr; return ptr;
} }
} }
*/ */
/* /*
typedef struct tagRDES0 { typedef struct tagRDES0 {
unsigned short wResCount; unsigned short wResCount;
unsigned short wf1Owner ; unsigned short wf1Owner;
// unsigned short f15Reserved : 15; // unsigned short f15Reserved : 15;
// unsigned short f1Owner : 1; // unsigned short f1Owner : 1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
...@@ -244,11 +244,11 @@ SRDES0; ...@@ -244,11 +244,11 @@ SRDES0;
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
typedef struct tagRDES0 { typedef struct tagRDES0 {
volatile unsigned short wResCount; volatile unsigned short wResCount;
union { union {
volatile u16 f15Reserved; volatile u16 f15Reserved;
struct { struct {
volatile u8 f8Reserved1; volatile u8 f8Reserved1;
volatile u8 f1Owner:1; volatile u8 f1Owner:1;
volatile u8 f7Reserved:7; volatile u8 f7Reserved:7;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
...@@ -259,9 +259,9 @@ SRDES0, *PSRDES0; ...@@ -259,9 +259,9 @@ SRDES0, *PSRDES0;
#else #else
typedef struct tagRDES0 { typedef struct tagRDES0 {
unsigned short wResCount; unsigned short wResCount;
unsigned short f15Reserved : 15; unsigned short f15Reserved:15;
unsigned short f1Owner : 1; unsigned short f1Owner:1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRDES0; SRDES0;
...@@ -269,8 +269,8 @@ SRDES0; ...@@ -269,8 +269,8 @@ SRDES0;
#endif #endif
typedef struct tagRDES1 { typedef struct tagRDES1 {
unsigned short wReqCount; unsigned short wReqCount;
unsigned short wReserved; unsigned short wReserved;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRDES1; SRDES1;
...@@ -278,13 +278,13 @@ SRDES1; ...@@ -278,13 +278,13 @@ SRDES1;
// Rx descriptor // Rx descriptor
// //
typedef struct tagSRxDesc { typedef struct tagSRxDesc {
volatile SRDES0 m_rd0RD0; volatile SRDES0 m_rd0RD0;
volatile SRDES1 m_rd1RD1; volatile SRDES1 m_rd1RD1;
volatile u32 buff_addr; volatile u32 buff_addr;
volatile u32 next_desc; volatile u32 next_desc;
struct tagSRxDesc *next;//4 bytes struct tagSRxDesc *next;//4 bytes
volatile PDEVICE_RD_INFO pRDInfo;//4 bytes volatile PDEVICE_RD_INFO pRDInfo;//4 bytes
volatile u32 Reserved[2];//8 bytes volatile u32 Reserved[2];//8 bytes
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRxDesc, *PSRxDesc; SRxDesc, *PSRxDesc;
typedef const SRxDesc *PCSRxDesc; typedef const SRxDesc *PCSRxDesc;
...@@ -292,10 +292,10 @@ typedef const SRxDesc *PCSRxDesc; ...@@ -292,10 +292,10 @@ typedef const SRxDesc *PCSRxDesc;
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
/* /*
typedef struct tagTDES0 { typedef struct tagTDES0 {
volatile unsigned char byTSR0; volatile unsigned char byTSR0;
volatile unsigned char byTSR1; volatile unsigned char byTSR1;
volatile unsigned short wOwner_Txtime; volatile unsigned short wOwner_Txtime;
// volatile unsigned short f15Txtime : 15; // volatile unsigned short f15Txtime : 15;
// volatile unsigned short f1Owner:1; // volatile unsigned short f1Owner:1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
...@@ -303,12 +303,12 @@ STDES0; ...@@ -303,12 +303,12 @@ STDES0;
*/ */
typedef struct tagTDES0 { typedef struct tagTDES0 {
volatile unsigned char byTSR0; volatile unsigned char byTSR0;
volatile unsigned char byTSR1; volatile unsigned char byTSR1;
union { union {
volatile u16 f15Txtime; volatile u16 f15Txtime;
struct { struct {
volatile u8 f8Reserved1; volatile u8 f8Reserved1;
volatile u8 f1Owner:1; volatile u8 f1Owner:1;
volatile u8 f7Reserved:7; volatile u8 f7Reserved:7;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
...@@ -319,10 +319,10 @@ STDES0, PSTDES0; ...@@ -319,10 +319,10 @@ STDES0, PSTDES0;
#else #else
typedef struct tagTDES0 { typedef struct tagTDES0 {
volatile unsigned char byTSR0; volatile unsigned char byTSR0;
volatile unsigned char byTSR1; volatile unsigned char byTSR1;
volatile unsigned short f15Txtime : 15; volatile unsigned short f15Txtime:15;
volatile unsigned short f1Owner:1; volatile unsigned short f1Owner:1;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
STDES0; STDES0;
...@@ -330,63 +330,63 @@ STDES0; ...@@ -330,63 +330,63 @@ STDES0;
typedef struct tagTDES1 { typedef struct tagTDES1 {
volatile unsigned short wReqCount; volatile unsigned short wReqCount;
volatile unsigned char byTCR; volatile unsigned char byTCR;
volatile unsigned char byReserved; volatile unsigned char byReserved;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
STDES1; STDES1;
typedef struct tagDEVICE_TD_INFO{ typedef struct tagDEVICE_TD_INFO {
struct sk_buff* skb; struct sk_buff *skb;
unsigned char *buf; unsigned char *buf;
dma_addr_t skb_dma; dma_addr_t skb_dma;
dma_addr_t buf_dma; dma_addr_t buf_dma;
dma_addr_t curr_desc; dma_addr_t curr_desc;
unsigned long dwReqCount; unsigned long dwReqCount;
unsigned long dwHeaderLength; unsigned long dwHeaderLength;
unsigned char byFlags; unsigned char byFlags;
} DEVICE_TD_INFO, *PDEVICE_TD_INFO; } DEVICE_TD_INFO, *PDEVICE_TD_INFO;
/* /*
static inline PDEVICE_TD_INFO alloc_td_info(void) { static inline PDEVICE_TD_INFO alloc_td_info(void) {
PDEVICE_TD_INFO ptr; PDEVICE_TD_INFO ptr;
ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC); ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC);
if (ptr == NULL) if (ptr == NULL)
return NULL; return NULL;
else { else {
memset(ptr,0,sizeof(DEVICE_TD_INFO)); memset(ptr,0,sizeof(DEVICE_TD_INFO));
return ptr; return ptr;
} }
} }
*/ */
// //
// transmit descriptor // transmit descriptor
// //
typedef struct tagSTxDesc { typedef struct tagSTxDesc {
volatile STDES0 m_td0TD0; volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1; volatile STDES1 m_td1TD1;
volatile u32 buff_addr; volatile u32 buff_addr;
volatile u32 next_desc; volatile u32 next_desc;
struct tagSTxDesc* next; //4 bytes struct tagSTxDesc *next; //4 bytes
volatile PDEVICE_TD_INFO pTDInfo;//4 bytes volatile PDEVICE_TD_INFO pTDInfo;//4 bytes
volatile u32 Reserved[2];//8 bytes volatile u32 Reserved[2];//8 bytes
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDesc, *PSTxDesc; STxDesc, *PSTxDesc;
typedef const STxDesc *PCSTxDesc; typedef const STxDesc *PCSTxDesc;
typedef struct tagSTxSyncDesc { typedef struct tagSTxSyncDesc {
volatile STDES0 m_td0TD0; volatile STDES0 m_td0TD0;
volatile STDES1 m_td1TD1; volatile STDES1 m_td1TD1;
volatile u32 buff_addr; // pointer to logical buffer volatile u32 buff_addr; // pointer to logical buffer
volatile u32 next_desc; // pointer to next logical descriptor volatile u32 next_desc; // pointer to next logical descriptor
volatile unsigned short m_wFIFOCtl; volatile unsigned short m_wFIFOCtl;
volatile unsigned short m_wTimeStamp; volatile unsigned short m_wTimeStamp;
struct tagSTxSyncDesc* next; //4 bytes struct tagSTxSyncDesc *next; //4 bytes
volatile PDEVICE_TD_INFO pTDInfo;//4 bytes volatile PDEVICE_TD_INFO pTDInfo;//4 bytes
volatile u32 m_dwReserved2; volatile u32 m_dwReserved2;
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxSyncDesc, *PSTxSyncDesc; STxSyncDesc, *PSTxSyncDesc;
typedef const STxSyncDesc *PCSTxSyncDesc; typedef const STxSyncDesc *PCSTxSyncDesc;
...@@ -396,36 +396,36 @@ typedef const STxSyncDesc *PCSTxSyncDesc; ...@@ -396,36 +396,36 @@ typedef const STxSyncDesc *PCSTxSyncDesc;
// RsvTime buffer header // RsvTime buffer header
// //
typedef struct tagSRrvTime_gRTS { typedef struct tagSRrvTime_gRTS {
unsigned short wRTSTxRrvTime_ba; unsigned short wRTSTxRrvTime_ba;
unsigned short wRTSTxRrvTime_aa; unsigned short wRTSTxRrvTime_aa;
unsigned short wRTSTxRrvTime_bb; unsigned short wRTSTxRrvTime_bb;
unsigned short wReserved; unsigned short wReserved;
unsigned short wTxRrvTime_b; unsigned short wTxRrvTime_b;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_gRTS, *PSRrvTime_gRTS; SRrvTime_gRTS, *PSRrvTime_gRTS;
typedef const SRrvTime_gRTS *PCSRrvTime_gRTS; typedef const SRrvTime_gRTS *PCSRrvTime_gRTS;
typedef struct tagSRrvTime_gCTS { typedef struct tagSRrvTime_gCTS {
unsigned short wCTSTxRrvTime_ba; unsigned short wCTSTxRrvTime_ba;
unsigned short wReserved; unsigned short wReserved;
unsigned short wTxRrvTime_b; unsigned short wTxRrvTime_b;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_gCTS, *PSRrvTime_gCTS; SRrvTime_gCTS, *PSRrvTime_gCTS;
typedef const SRrvTime_gCTS *PCSRrvTime_gCTS; typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;
typedef struct tagSRrvTime_ab { typedef struct tagSRrvTime_ab {
unsigned short wRTSTxRrvTime; unsigned short wRTSTxRrvTime;
unsigned short wTxRrvTime; unsigned short wTxRrvTime;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_ab, *PSRrvTime_ab; SRrvTime_ab, *PSRrvTime_ab;
typedef const SRrvTime_ab *PCSRrvTime_ab; typedef const SRrvTime_ab *PCSRrvTime_ab;
typedef struct tagSRrvTime_atim { typedef struct tagSRrvTime_atim {
unsigned short wCTSTxRrvTime_ba; unsigned short wCTSTxRrvTime_ba;
unsigned short wTxRrvTime_a; unsigned short wTxRrvTime_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRrvTime_atim, *PSRrvTime_atim; SRrvTime_atim, *PSRrvTime_atim;
typedef const SRrvTime_atim *PCSRrvTime_atim; typedef const SRrvTime_atim *PCSRrvTime_atim;
...@@ -433,74 +433,74 @@ typedef const SRrvTime_atim *PCSRrvTime_atim; ...@@ -433,74 +433,74 @@ typedef const SRrvTime_atim *PCSRrvTime_atim;
// RTS buffer header // RTS buffer header
// //
typedef struct tagSRTSData { typedef struct tagSRTSData {
unsigned short wFrameControl; unsigned short wFrameControl;
unsigned short wDurationID; unsigned short wDurationID;
unsigned char abyRA[ETH_ALEN]; unsigned char abyRA[ETH_ALEN];
unsigned char abyTA[ETH_ALEN]; unsigned char abyTA[ETH_ALEN];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTSData, *PSRTSData; SRTSData, *PSRTSData;
typedef const SRTSData *PCSRTSData; typedef const SRTSData *PCSRTSData;
typedef struct tagSRTS_g { typedef struct tagSRTS_g {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned char bySignalField_a; unsigned char bySignalField_a;
unsigned char byServiceField_a; unsigned char byServiceField_a;
unsigned short wTransmitLength_a; unsigned short wTransmitLength_a;
unsigned short wDuration_ba; unsigned short wDuration_ba;
unsigned short wDuration_aa; unsigned short wDuration_aa;
unsigned short wDuration_bb; unsigned short wDuration_bb;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g, *PSRTS_g; SRTS_g, *PSRTS_g;
typedef const SRTS_g *PCSRTS_g; typedef const SRTS_g *PCSRTS_g;
typedef struct tagSRTS_g_FB { typedef struct tagSRTS_g_FB {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned char bySignalField_a; unsigned char bySignalField_a;
unsigned char byServiceField_a; unsigned char byServiceField_a;
unsigned short wTransmitLength_a; unsigned short wTransmitLength_a;
unsigned short wDuration_ba; unsigned short wDuration_ba;
unsigned short wDuration_aa; unsigned short wDuration_aa;
unsigned short wDuration_bb; unsigned short wDuration_bb;
unsigned short wReserved; unsigned short wReserved;
unsigned short wRTSDuration_ba_f0; unsigned short wRTSDuration_ba_f0;
unsigned short wRTSDuration_aa_f0; unsigned short wRTSDuration_aa_f0;
unsigned short wRTSDuration_ba_f1; unsigned short wRTSDuration_ba_f1;
unsigned short wRTSDuration_aa_f1; unsigned short wRTSDuration_aa_f1;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_g_FB, *PSRTS_g_FB; SRTS_g_FB, *PSRTS_g_FB;
typedef const SRTS_g_FB *PCSRTS_g_FB; typedef const SRTS_g_FB *PCSRTS_g_FB;
typedef struct tagSRTS_ab { typedef struct tagSRTS_ab {
unsigned char bySignalField; unsigned char bySignalField;
unsigned char byServiceField; unsigned char byServiceField;
unsigned short wTransmitLength; unsigned short wTransmitLength;
unsigned short wDuration; unsigned short wDuration;
unsigned short wReserved; unsigned short wReserved;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_ab, *PSRTS_ab; SRTS_ab, *PSRTS_ab;
typedef const SRTS_ab *PCSRTS_ab; typedef const SRTS_ab *PCSRTS_ab;
typedef struct tagSRTS_a_FB { typedef struct tagSRTS_a_FB {
unsigned char bySignalField; unsigned char bySignalField;
unsigned char byServiceField; unsigned char byServiceField;
unsigned short wTransmitLength; unsigned short wTransmitLength;
unsigned short wDuration; unsigned short wDuration;
unsigned short wReserved; unsigned short wReserved;
unsigned short wRTSDuration_f0; unsigned short wRTSDuration_f0;
unsigned short wRTSDuration_f1; unsigned short wRTSDuration_f1;
SRTSData Data; SRTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SRTS_a_FB, *PSRTS_a_FB; SRTS_a_FB, *PSRTS_a_FB;
typedef const SRTS_a_FB *PCSRTS_a_FB; typedef const SRTS_a_FB *PCSRTS_a_FB;
...@@ -509,34 +509,34 @@ typedef const SRTS_a_FB *PCSRTS_a_FB; ...@@ -509,34 +509,34 @@ typedef const SRTS_a_FB *PCSRTS_a_FB;
// CTS buffer header // CTS buffer header
// //
typedef struct tagSCTSData { typedef struct tagSCTSData {
unsigned short wFrameControl; unsigned short wFrameControl;
unsigned short wDurationID; unsigned short wDurationID;
unsigned char abyRA[ETH_ALEN]; unsigned char abyRA[ETH_ALEN];
unsigned short wReserved; unsigned short wReserved;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTSData, *PSCTSData; SCTSData, *PSCTSData;
typedef struct tagSCTS { typedef struct tagSCTS {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned short wDuration_ba; unsigned short wDuration_ba;
unsigned short wReserved; unsigned short wReserved;
SCTSData Data; SCTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTS, *PSCTS; SCTS, *PSCTS;
typedef const SCTS *PCSCTS; typedef const SCTS *PCSCTS;
typedef struct tagSCTS_FB { typedef struct tagSCTS_FB {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned short wDuration_ba; unsigned short wDuration_ba;
unsigned short wReserved; unsigned short wReserved;
unsigned short wCTSDuration_ba_f0; unsigned short wCTSDuration_ba_f0;
unsigned short wCTSDuration_ba_f1; unsigned short wCTSDuration_ba_f1;
SCTSData Data; SCTSData Data;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SCTS_FB, *PSCTS_FB; SCTS_FB, *PSCTS_FB;
typedef const SCTS_FB *PCSCTS_FB; typedef const SCTS_FB *PCSCTS_FB;
...@@ -545,20 +545,20 @@ typedef const SCTS_FB *PCSCTS_FB; ...@@ -545,20 +545,20 @@ typedef const SCTS_FB *PCSCTS_FB;
// Tx FIFO header // Tx FIFO header
// //
typedef struct tagSTxBufHead { typedef struct tagSTxBufHead {
u32 adwTxKey[4]; u32 adwTxKey[4];
unsigned short wFIFOCtl; unsigned short wFIFOCtl;
unsigned short wTimeStamp; unsigned short wTimeStamp;
unsigned short wFragCtl; unsigned short wFragCtl;
unsigned char byTxPower; unsigned char byTxPower;
unsigned char wReserved; unsigned char wReserved;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxBufHead, *PSTxBufHead; STxBufHead, *PSTxBufHead;
typedef const STxBufHead *PCSTxBufHead; typedef const STxBufHead *PCSTxBufHead;
typedef struct tagSTxShortBufHead { typedef struct tagSTxShortBufHead {
unsigned short wFIFOCtl; unsigned short wFIFOCtl;
unsigned short wTimeStamp; unsigned short wTimeStamp;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxShortBufHead, *PSTxShortBufHead; STxShortBufHead, *PSTxShortBufHead;
typedef const STxShortBufHead *PCSTxShortBufHead; typedef const STxShortBufHead *PCSTxShortBufHead;
...@@ -566,58 +566,58 @@ typedef const STxShortBufHead *PCSTxShortBufHead; ...@@ -566,58 +566,58 @@ typedef const STxShortBufHead *PCSTxShortBufHead;
// Tx data header // Tx data header
// //
typedef struct tagSTxDataHead_g { typedef struct tagSTxDataHead_g {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned char bySignalField_a; unsigned char bySignalField_a;
unsigned char byServiceField_a; unsigned char byServiceField_a;
unsigned short wTransmitLength_a; unsigned short wTransmitLength_a;
unsigned short wDuration_b; unsigned short wDuration_b;
unsigned short wDuration_a; unsigned short wDuration_a;
unsigned short wTimeStampOff_b; unsigned short wTimeStampOff_b;
unsigned short wTimeStampOff_a; unsigned short wTimeStampOff_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_g, *PSTxDataHead_g; STxDataHead_g, *PSTxDataHead_g;
typedef const STxDataHead_g *PCSTxDataHead_g; typedef const STxDataHead_g *PCSTxDataHead_g;
typedef struct tagSTxDataHead_g_FB { typedef struct tagSTxDataHead_g_FB {
unsigned char bySignalField_b; unsigned char bySignalField_b;
unsigned char byServiceField_b; unsigned char byServiceField_b;
unsigned short wTransmitLength_b; unsigned short wTransmitLength_b;
unsigned char bySignalField_a; unsigned char bySignalField_a;
unsigned char byServiceField_a; unsigned char byServiceField_a;
unsigned short wTransmitLength_a; unsigned short wTransmitLength_a;
unsigned short wDuration_b; unsigned short wDuration_b;
unsigned short wDuration_a; unsigned short wDuration_a;
unsigned short wDuration_a_f0; unsigned short wDuration_a_f0;
unsigned short wDuration_a_f1; unsigned short wDuration_a_f1;
unsigned short wTimeStampOff_b; unsigned short wTimeStampOff_b;
unsigned short wTimeStampOff_a; unsigned short wTimeStampOff_a;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_g_FB, *PSTxDataHead_g_FB; STxDataHead_g_FB, *PSTxDataHead_g_FB;
typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB; typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;
typedef struct tagSTxDataHead_ab { typedef struct tagSTxDataHead_ab {
unsigned char bySignalField; unsigned char bySignalField;
unsigned char byServiceField; unsigned char byServiceField;
unsigned short wTransmitLength; unsigned short wTransmitLength;
unsigned short wDuration; unsigned short wDuration;
unsigned short wTimeStampOff; unsigned short wTimeStampOff;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_ab, *PSTxDataHead_ab; STxDataHead_ab, *PSTxDataHead_ab;
typedef const STxDataHead_ab *PCSTxDataHead_ab; typedef const STxDataHead_ab *PCSTxDataHead_ab;
typedef struct tagSTxDataHead_a_FB { typedef struct tagSTxDataHead_a_FB {
unsigned char bySignalField; unsigned char bySignalField;
unsigned char byServiceField; unsigned char byServiceField;
unsigned short wTransmitLength; unsigned short wTransmitLength;
unsigned short wDuration; unsigned short wDuration;
unsigned short wTimeStampOff; unsigned short wTimeStampOff;
unsigned short wDuration_f0; unsigned short wDuration_f0;
unsigned short wDuration_f1; unsigned short wDuration_f1;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
STxDataHead_a_FB, *PSTxDataHead_a_FB; STxDataHead_a_FB, *PSTxDataHead_a_FB;
typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;
...@@ -625,38 +625,38 @@ typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB; ...@@ -625,38 +625,38 @@ typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;
// MICHDR data header // MICHDR data header
// //
typedef struct tagSMICHDRHead { typedef struct tagSMICHDRHead {
u32 adwHDR0[4]; u32 adwHDR0[4];
u32 adwHDR1[4]; u32 adwHDR1[4];
u32 adwHDR2[4]; u32 adwHDR2[4];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SMICHDRHead, *PSMICHDRHead; SMICHDRHead, *PSMICHDRHead;
typedef const SMICHDRHead *PCSMICHDRHead; typedef const SMICHDRHead *PCSMICHDRHead;
typedef struct tagSBEACONCtl { typedef struct tagSBEACONCtl {
u32 BufReady : 1; u32 BufReady:1;
u32 TSF : 15; u32 TSF:15;
u32 BufLen : 11; u32 BufLen:11;
u32 Reserved : 5; u32 Reserved:5;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SBEACONCtl; SBEACONCtl;
typedef struct tagSSecretKey { typedef struct tagSSecretKey {
u32 dwLowDword; u32 dwLowDword;
unsigned char byHighByte; unsigned char byHighByte;
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SSecretKey; SSecretKey;
typedef struct tagSKeyEntry { typedef struct tagSKeyEntry {
unsigned char abyAddrHi[2]; unsigned char abyAddrHi[2];
unsigned short wKCTL; unsigned short wKCTL;
unsigned char abyAddrLo[4]; unsigned char abyAddrLo[4];
u32 dwKey0[4]; u32 dwKey0[4];
u32 dwKey1[4]; u32 dwKey1[4];
u32 dwKey2[4]; u32 dwKey2[4];
u32 dwKey3[4]; u32 dwKey3[4];
u32 dwKey4[4]; u32 dwKey4[4];
}__attribute__ ((__packed__)) } __attribute__ ((__packed__))
SKeyEntry; SKeyEntry;
/*--------------------- Export Macros ------------------------------*/ /*--------------------- Export Macros ------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7