Skip to content

L
linux
Commit b1facee6 authored by Mike Sheldon's avatar Mike Sheldon Committed by Greg Kroah-Hartman
Browse files
Options

Staging: winbond: Replace C99 comments with C89. 

This patches mds.c to replace all the C99 style comments (//) with C89
style (/* ... */), as reported by checkpatch.pl.
Signed-off-by: default avatarMike Sheldon <mike@mikeasoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64ff4044
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 155 deletions
drivers/staging/winbond/mds.c
View file @ b1facee6
...@@ -43,53 +43,53 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -43,53 +43,53 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
pT01 = (PT01_DESCRIPTOR)(buffer+4); pT01 = (PT01_DESCRIPTOR)(buffer+4);
pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize); pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);
if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) // +8 for USB hdr if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) /* +8 for USB hdr */
boGroupAddr = true; boGroupAddr = true;
//======================================== /******************************************
// Set RTS/CTS mechanism * Set RTS/CTS mechanism
//======================================== ******************************************/
if (!boGroupAddr) if (!boGroupAddr)
{ {
//NOTE : If the protection mode is enabled and the MSDU will be fragmented, /* NOTE : If the protection mode is enabled and the MSDU will be fragmented,
// the tx rates of MPDUs will all be DSSS rates. So it will not use * the tx rates of MPDUs will all be DSSS rates. So it will not use
// CTS-to-self in this case. CTS-To-self will only be used when without * CTS-to-self in this case. CTS-To-self will only be used when without
// fragmentation. -- 20050112 * fragmentation. -- 20050112 */
BodyLen = (u16)pT00->T00_frame_length; //include 802.11 header BodyLen = (u16)pT00->T00_frame_length; /* include 802.11 header */
BodyLen += 4; //CRC BodyLen += 4; /* CRC */
if( BodyLen >= CURRENT_RTS_THRESHOLD ) if( BodyLen >= CURRENT_RTS_THRESHOLD )
RTS_on = true; // Using RTS RTS_on = true; /* Using RTS */
else else
{ {
if( pT01->T01_modulation_type ) // Is using OFDM if( pT01->T01_modulation_type ) /* Is using OFDM */
{ {
if( CURRENT_PROTECT_MECHANISM ) // Is using protect if( CURRENT_PROTECT_MECHANISM ) /* Is using protect */
CTS_on = true; // Using CTS CTS_on = true; /* Using CTS */
} }
} }
} }
if( RTS_on || CTS_on ) if( RTS_on || CTS_on )
{ {
if( pT01->T01_modulation_type) // Is using OFDM if( pT01->T01_modulation_type) /* Is using OFDM */
{ {
//CTS duration /* CTS duration
// 2 SIFS + DATA transmit time + 1 ACK * 2 SIFS + DATA transmit time + 1 ACK
// ACK Rate : 24 Mega bps * ACK Rate : 24 Mega bps
// ACK frame length = 14 bytes * ACK frame length = 14 bytes */
Duration = 2*DEFAULT_SIFSTIME + Duration = 2*DEFAULT_SIFSTIME +
2*PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + 2*PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION +
((BodyLen*8 + 22 + Rate*4 - 1)/(Rate*4))*Tsym + ((BodyLen*8 + 22 + Rate*4 - 1)/(Rate*4))*Tsym +
((112 + 22 + 95)/96)*Tsym; ((112 + 22 + 95)/96)*Tsym;
} }
else //DSSS else /* DSSS */
{ {
//CTS duration /* CTS duration
// 2 SIFS + DATA transmit time + 1 ACK * 2 SIFS + DATA transmit time + 1 ACK
// Rate : ?? Mega bps * Rate : ?? Mega bps
// ACK frame length = 14 bytes * ACK frame length = 14 bytes */
if( pT01->T01_plcp_header_length ) //long preamble if( pT01->T01_plcp_header_length ) /* long preamble */
Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*2; Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*2;
else else
Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*2; Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*2;
...@@ -100,21 +100,21 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -100,21 +100,21 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
if( RTS_on ) if( RTS_on )
{ {
if( pT01->T01_modulation_type ) // Is using OFDM if( pT01->T01_modulation_type ) /* Is using OFDM */
{ {
//CTS + 1 SIFS + CTS duration /* CTS + 1 SIFS + CTS duration
//CTS Rate : 24 Mega bps * CTS Rate : 24 Mega bps
//CTS frame length = 14 bytes * CTS frame length = 14 bytes */
Duration += (DEFAULT_SIFSTIME + Duration += (DEFAULT_SIFSTIME +
PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION +
((112 + 22 + 95)/96)*Tsym); ((112 + 22 + 95)/96)*Tsym);
} }
else else
{ {
//CTS + 1 SIFS + CTS duration /* CTS + 1 SIFS + CTS duration
//CTS Rate : ?? Mega bps * CTS Rate : ?? Mega bps
//CTS frame length = 14 bytes * CTS frame length = 14 bytes */
if( pT01->T01_plcp_header_length ) //long preamble if( pT01->T01_plcp_header_length ) /* long preamble */
Duration += LONG_PREAMBLE_PLUS_PLCPHEADER_TIME; Duration += LONG_PREAMBLE_PLUS_PLCPHEADER_TIME;
else else
Duration += SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME; Duration += SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME;
...@@ -123,15 +123,15 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -123,15 +123,15 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
} }
} }
// Set the value into USB descriptor /* Set the value into USB descriptor */
pT01->T01_add_rts = RTS_on ? 1 : 0; pT01->T01_add_rts = RTS_on ? 1 : 0;
pT01->T01_add_cts = CTS_on ? 1 : 0; pT01->T01_add_cts = CTS_on ? 1 : 0;
pT01->T01_rts_cts_duration = Duration; pT01->T01_rts_cts_duration = Duration;
} }
//===================================== /******************************************
// Fill the more fragment descriptor * Fill the more fragment descriptor
//===================================== ******************************************/
if( boGroupAddr ) if( boGroupAddr )
Duration = 0; Duration = 0;
else else
...@@ -139,14 +139,14 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -139,14 +139,14 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
for( i=pDes->FragmentCount-1; i>0; i-- ) for( i=pDes->FragmentCount-1; i>0; i-- )
{ {
NextBodyLen = (u16)pNextT00->T00_frame_length; NextBodyLen = (u16)pNextT00->T00_frame_length;
NextBodyLen += 4; //CRC NextBodyLen += 4; /* CRC */
if( pT01->T01_modulation_type ) if( pT01->T01_modulation_type )
{ {
//OFDM /* OFDM
// data transmit time + 3 SIFS + 2 ACK * data transmit time + 3 SIFS + 2 ACK
// Rate : ??Mega bps * Rate : ??Mega bps
// ACK frame length = 14 bytes, tx rate = 24M * ACK frame length = 14 bytes, tx rate = 24M */
Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION * 3; Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION * 3;
Duration += (((NextBodyLen*8 + 22 + Rate*4 - 1)/(Rate*4)) * Tsym + Duration += (((NextBodyLen*8 + 22 + Rate*4 - 1)/(Rate*4)) * Tsym +
(((2*14)*8 + 22 + 95)/96)*Tsym + (((2*14)*8 + 22 + 95)/96)*Tsym +
...@@ -154,12 +154,12 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -154,12 +154,12 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
} }
else else
{ {
//DSSS /* DSSS
// data transmit time + 2 ACK + 3 SIFS * data transmit time + 2 ACK + 3 SIFS
// Rate : ??Mega bps * Rate : ??Mega bps
// ACK frame length = 14 bytes * ACK frame length = 14 bytes
//TODO : * TODO : */
if( pT01->T01_plcp_header_length ) //long preamble if( pT01->T01_plcp_header_length ) /* long preamble */
Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*3; Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME*3;
else else
Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*3; Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME*3;
...@@ -168,39 +168,39 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -168,39 +168,39 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
DEFAULT_SIFSTIME*3 ); DEFAULT_SIFSTIME*3 );
} }
((u16 *)buffer)[5] = cpu_to_le16(Duration);// 4 USHOR for skip 8B USB, 2USHORT=FC + Duration ((u16 *)buffer)[5] = cpu_to_le16(Duration); /* 4 USHOR for skip 8B USB, 2USHORT=FC + Duration */
//----20061009 add by anson's endian /* ----20061009 add by anson's endian */
pNextT00->value = cpu_to_le32(pNextT00->value); pNextT00->value = cpu_to_le32(pNextT00->value);
pT01->value = cpu_to_le32( pT01->value ); pT01->value = cpu_to_le32( pT01->value );
//----end 20061009 add by anson's endian /* ----end 20061009 add by anson's endian */
buffer += OffsetSize; buffer += OffsetSize;
pT01 = (PT01_DESCRIPTOR)(buffer+4); pT01 = (PT01_DESCRIPTOR)(buffer+4);
if (i != 1) //The last fragment will not have the next fragment if (i != 1) /* The last fragment will not have the next fragment */
pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize); pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);
} }
//===================================== /*******************************************
// Fill the last fragment descriptor * Fill the last fragment descriptor
//===================================== *******************************************/
if( pT01->T01_modulation_type ) if( pT01->T01_modulation_type )
{ {
//OFDM /* OFDM
// 1 SIFS + 1 ACK * 1 SIFS + 1 ACK
// Rate : 24 Mega bps * Rate : 24 Mega bps
// ACK frame length = 14 bytes * ACK frame length = 14 bytes */
Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION; Duration = PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION;
//The Tx rate of ACK use 24M /* The Tx rate of ACK use 24M */
Duration += (((112 + 22 + 95)/96)*Tsym + DEFAULT_SIFSTIME ); Duration += (((112 + 22 + 95)/96)*Tsym + DEFAULT_SIFSTIME );
} }
else else
{ {
// DSSS /* DSSS
// 1 ACK + 1 SIFS * 1 ACK + 1 SIFS
// Rate : ?? Mega bps * Rate : ?? Mega bps
// ACK frame length = 14 bytes(112 bits) * ACK frame length = 14 bytes(112 bits) */
if( pT01->T01_plcp_header_length ) //long preamble if( pT01->T01_plcp_header_length ) /* long preamble */
Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME; Duration = LONG_PREAMBLE_PLUS_PLCPHEADER_TIME;
else else
Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME; Duration = SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME;
...@@ -209,14 +209,14 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor ...@@ -209,14 +209,14 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor
} }
} }
((u16 *)buffer)[5] = cpu_to_le16(Duration);// 4 USHOR for skip 8B USB, 2USHORT=FC + Duration ((u16 *)buffer)[5] = cpu_to_le16(Duration); /* 4 USHOR for skip 8B USB, 2USHORT=FC + Duration */
pT00->value = cpu_to_le32(pT00->value); pT00->value = cpu_to_le32(pT00->value);
pT01->value = cpu_to_le32(pT01->value); pT01->value = cpu_to_le32(pT01->value);
//--end 20061009 add /* --end 20061009 add */
} }
// The function return the 4n size of usb pk /* The function return the 4n size of usb pk */
static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer) static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer)
{ {
PT00_DESCRIPTOR pT00; PT00_DESCRIPTOR pT00;
...@@ -229,8 +229,8 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe ...@@ -229,8 +229,8 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe
u8 buf_index, FragmentCount = 0; u8 buf_index, FragmentCount = 0;
// Copy fragment body /* Copy fragment body */
buffer = TargetBuffer; // shift 8B usb + 24B 802.11 buffer = TargetBuffer; /* shift 8B usb + 24B 802.11 */
SizeLeft = pDes->buffer_total_size; SizeLeft = pDes->buffer_total_size;
buf_index = pDes->buffer_start_index; buf_index = pDes->buffer_start_index;
...@@ -240,35 +240,35 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe ...@@ -240,35 +240,35 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe
CopySize = SizeLeft; CopySize = SizeLeft;
if (SizeLeft > pDes->FragmentThreshold) { if (SizeLeft > pDes->FragmentThreshold) {
CopySize = pDes->FragmentThreshold; CopySize = pDes->FragmentThreshold;
pT00->T00_frame_length = 24 + CopySize;//Set USB length pT00->T00_frame_length = 24 + CopySize; /* Set USB length */
} else } else
pT00->T00_frame_length = 24 + SizeLeft;//Set USB length pT00->T00_frame_length = 24 + SizeLeft; /* Set USB length */
SizeLeft -= CopySize; SizeLeft -= CopySize;
// 1 Byte operation /* 1 Byte operation */
pctmp = (u8 *)( buffer + 8 + DOT_11_SEQUENCE_OFFSET ); pctmp = (u8 *)( buffer + 8 + DOT_11_SEQUENCE_OFFSET );
*pctmp &= 0xf0; *pctmp &= 0xf0;
*pctmp |= FragmentCount;//931130.5.m *pctmp |= FragmentCount; /* 931130.5.m */
if( !FragmentCount ) if( !FragmentCount )
pT00->T00_first_mpdu = 1; pT00->T00_first_mpdu = 1;
buffer += 32; // 8B usb + 24B 802.11 header buffer += 32; /* 8B usb + 24B 802.11 header */
Size += 32; Size += 32;
// Copy into buffer /* Copy into buffer */
stmp = CopySize + 3; stmp = CopySize + 3;
stmp &= ~0x03;//4n Alignment stmp &= ~0x03; /* 4n Alignment */
Size += stmp;// Current 4n offset of mpdu Size += stmp; /* Current 4n offset of mpdu */
while (CopySize) { while (CopySize) {
// Copy body /* Copy body */
src_buffer = pDes->buffer_address[buf_index]; src_buffer = pDes->buffer_address[buf_index];
CopyLeft = CopySize; CopyLeft = CopySize;
if (CopySize >= pDes->buffer_size[buf_index]) { if (CopySize >= pDes->buffer_size[buf_index]) {
CopyLeft = pDes->buffer_size[buf_index]; CopyLeft = pDes->buffer_size[buf_index];
// Get the next buffer of descriptor /* Get the next buffer of descriptor */
buf_index++; buf_index++;
buf_index %= MAX_DESCRIPTOR_BUFFER_INDEX; buf_index %= MAX_DESCRIPTOR_BUFFER_INDEX;
} else { } else {
...@@ -283,14 +283,14 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe ...@@ -283,14 +283,14 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe
CopySize -= CopyLeft; CopySize -= CopyLeft;
} }
// 931130.5.n /* 931130.5.n */
if (pMds->MicAdd) { if (pMds->MicAdd) {
if (!SizeLeft) { if (!SizeLeft) {
pMds->MicWriteAddress[ pMds->MicWriteIndex ] = buffer - pMds->MicAdd; pMds->MicWriteAddress[ pMds->MicWriteIndex ] = buffer - pMds->MicAdd;
pMds->MicWriteSize[ pMds->MicWriteIndex ] = pMds->MicAdd; pMds->MicWriteSize[ pMds->MicWriteIndex ] = pMds->MicAdd;
pMds->MicAdd = 0; pMds->MicAdd = 0;
} }
else if( SizeLeft < 8 ) //931130.5.p else if( SizeLeft < 8 ) /* 931130.5.p */
{ {
pMds->MicAdd = SizeLeft; pMds->MicAdd = SizeLeft;
pMds->MicWriteAddress[ pMds->MicWriteIndex ] = buffer - ( 8 - SizeLeft ); pMds->MicWriteAddress[ pMds->MicWriteIndex ] = buffer - ( 8 - SizeLeft );
...@@ -299,10 +299,10 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe ...@@ -299,10 +299,10 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe
} }
} }
// Does it need to generate the new header for next mpdu? /* Does it need to generate the new header for next mpdu? */
if (SizeLeft) { if (SizeLeft) {
buffer = TargetBuffer + Size; // Get the next 4n start address buffer = TargetBuffer + Size; /* Get the next 4n start address */
memcpy( buffer, TargetBuffer, 32 );//Copy 8B USB +24B 802.11 memcpy( buffer, TargetBuffer, 32 ); /* Copy 8B USB +24B 802.11 */
pT00 = (PT00_DESCRIPTOR)buffer; pT00 = (PT00_DESCRIPTOR)buffer;
pT00->T00_first_mpdu = 0; pT00->T00_first_mpdu = 0;
} }
...@@ -312,16 +312,16 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe ...@@ -312,16 +312,16 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe
pT00->T00_last_mpdu = 1; pT00->T00_last_mpdu = 1;
pT00->T00_IsLastMpdu = 1; pT00->T00_IsLastMpdu = 1;
buffer = (u8 *)pT00 + 8; // +8 for USB hdr buffer = (u8 *)pT00 + 8; /* +8 for USB hdr */
buffer[1] &= ~0x04; // Clear more frag bit of 802.11 frame control buffer[1] &= ~0x04; /* Clear more frag bit of 802.11 frame control */
pDes->FragmentCount = FragmentCount; // Update the correct fragment number pDes->FragmentCount = FragmentCount; /* Update the correct fragment number */
return Size; return Size;
} }
static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer) static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer)
{ {
struct wb35_mds *pMds = &adapter->Mds; struct wb35_mds *pMds = &adapter->Mds;
u8 *src_buffer = pDes->buffer_address[0];//931130.5.g u8 *src_buffer = pDes->buffer_address[0]; /* 931130.5.g */
PT00_DESCRIPTOR pT00; PT00_DESCRIPTOR pT00;
PT01_DESCRIPTOR pT01; PT01_DESCRIPTOR pT01;
u16 stmp; u16 stmp;
...@@ -330,44 +330,44 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor ...@@ -330,44 +330,44 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
stmp = pDes->buffer_total_size; stmp = pDes->buffer_total_size;
// /*
// Set USB header 8 byte * Set USB header 8 byte
// */
pT00 = (PT00_DESCRIPTOR)TargetBuffer; pT00 = (PT00_DESCRIPTOR)TargetBuffer;
TargetBuffer += 4; TargetBuffer += 4;
pT01 = (PT01_DESCRIPTOR)TargetBuffer; pT01 = (PT01_DESCRIPTOR)TargetBuffer;
TargetBuffer += 4; TargetBuffer += 4;
pT00->value = 0;// Clear pT00->value = 0; /* Clear */
pT01->value = 0;// Clear pT01->value = 0; /* Clear */
pT00->T00_tx_packet_id = pDes->Descriptor_ID;// Set packet ID pT00->T00_tx_packet_id = pDes->Descriptor_ID; /* Set packet ID */
pT00->T00_header_length = 24;// Set header length pT00->T00_header_length = 24; /* Set header length */
pT01->T01_retry_abort_ebable = 1;//921013 931130.5.h pT01->T01_retry_abort_ebable = 1; /* 921013 931130.5.h */
// Key ID setup /* Key ID setup */
pT01->T01_wep_id = 0; pT01->T01_wep_id = 0;
FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; //Do not fragment FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; /* Do not fragment */
// Copy full data, the 1'st buffer contain all the data 931130.5.j /* Copy full data, the 1'st buffer contain all the data 931130.5.j */
memcpy( TargetBuffer, src_buffer, DOT_11_MAC_HEADER_SIZE );// Copy header memcpy( TargetBuffer, src_buffer, DOT_11_MAC_HEADER_SIZE ); /* Copy header */
pDes->buffer_address[0] = src_buffer + DOT_11_MAC_HEADER_SIZE; pDes->buffer_address[0] = src_buffer + DOT_11_MAC_HEADER_SIZE;
pDes->buffer_total_size -= DOT_11_MAC_HEADER_SIZE; pDes->buffer_total_size -= DOT_11_MAC_HEADER_SIZE;
pDes->buffer_size[0] = pDes->buffer_total_size; pDes->buffer_size[0] = pDes->buffer_total_size;
// Set fragment threshold /* Set fragment threshold */
FragmentThreshold -= (DOT_11_MAC_HEADER_SIZE + 4); FragmentThreshold -= (DOT_11_MAC_HEADER_SIZE + 4);
pDes->FragmentThreshold = FragmentThreshold; pDes->FragmentThreshold = FragmentThreshold;
// Set more frag bit /* Set more frag bit */
TargetBuffer[1] |= 0x04;// Set more frag bit TargetBuffer[1] |= 0x04; /* Set more frag bit */
// /*
// Set tx rate * Set tx rate
// */
stmp = *(u16 *)(TargetBuffer+30); // 2n alignment address stmp = *(u16 *)(TargetBuffer+30); /* 2n alignment address */
//Use basic rate /* Use basic rate */
ctmp1 = ctmpf = CURRENT_TX_RATE_FOR_MNG; ctmp1 = ctmpf = CURRENT_TX_RATE_FOR_MNG;
pDes->TxRate = ctmp1; pDes->TxRate = ctmp1;
...@@ -381,10 +381,10 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor ...@@ -381,10 +381,10 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
if( i == 1 ) if( i == 1 )
ctmp1 = ctmpf; ctmp1 = ctmpf;
pMds->TxRate[pDes->Descriptor_ID][i] = ctmp1; // backup the ta rate and fall back rate pMds->TxRate[pDes->Descriptor_ID][i] = ctmp1; /* backup the ta rate and fall back rate */
if( ctmp1 == 108) ctmp2 = 7; if( ctmp1 == 108) ctmp2 = 7;
else if( ctmp1 == 96 ) ctmp2 = 6; // Rate convert for USB else if( ctmp1 == 96 ) ctmp2 = 6; /* Rate convert for USB */
else if( ctmp1 == 72 ) ctmp2 = 5; else if( ctmp1 == 72 ) ctmp2 = 5;
else if( ctmp1 == 48 ) ctmp2 = 4; else if( ctmp1 == 48 ) ctmp2 = 4;
else if( ctmp1 == 36 ) ctmp2 = 3; else if( ctmp1 == 36 ) ctmp2 = 3;
...@@ -394,7 +394,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor ...@@ -394,7 +394,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
else if( ctmp1 == 22 ) ctmp2 = 3; else if( ctmp1 == 22 ) ctmp2 = 3;
else if( ctmp1 == 11 ) ctmp2 = 2; else if( ctmp1 == 11 ) ctmp2 = 2;
else if( ctmp1 == 4 ) ctmp2 = 1; else if( ctmp1 == 4 ) ctmp2 = 1;
else ctmp2 = 0; // if( ctmp1 == 2 ) or default else ctmp2 = 0; /* if( ctmp1 == 2 ) or default */
if( i == 0 ) if( i == 0 )
pT01->T01_transmit_rate = ctmp2; pT01->T01_transmit_rate = ctmp2;
...@@ -402,14 +402,14 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor ...@@ -402,14 +402,14 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor
pT01->T01_fall_back_rate = ctmp2; pT01->T01_fall_back_rate = ctmp2;
} }
// /*
// Set preamble type * Set preamble type
// */
if ((pT01->T01_modulation_type == 0) && (pT01->T01_transmit_rate == 0)) // RATE_1M if ((pT01->T01_modulation_type == 0) && (pT01->T01_transmit_rate == 0)) /* RATE_1M */
pDes->PreambleMode = WLAN_PREAMBLE_TYPE_LONG; pDes->PreambleMode = WLAN_PREAMBLE_TYPE_LONG;
else else
pDes->PreambleMode = CURRENT_PREAMBLE_MODE; pDes->PreambleMode = CURRENT_PREAMBLE_MODE;
pT01->T01_plcp_header_length = pDes->PreambleMode; // Set preamble pT01->T01_plcp_header_length = pDes->PreambleMode; /* Set preamble */
} }
...@@ -431,21 +431,21 @@ Mds_Tx(struct wbsoft_priv * adapter) ...@@ -431,21 +431,21 @@ Mds_Tx(struct wbsoft_priv * adapter)
if (!hal_driver_init_OK(pHwData)) if (!hal_driver_init_OK(pHwData))
return; return;
//Only one thread can be run here /* Only one thread can be run here */
if (atomic_inc_return(&pMds->TxThreadCount) != 1) if (atomic_inc_return(&pMds->TxThreadCount) != 1)
goto cleanup; goto cleanup;
// Start to fill the data /* Start to fill the data */
do { do {
FillIndex = pMds->TxFillIndex; FillIndex = pMds->TxFillIndex;
if (pMds->TxOwner[FillIndex]) { // Is owned by software 0:Yes 1:No if (pMds->TxOwner[FillIndex]) { /* Is owned by software 0:Yes 1:No */
#ifdef _PE_TX_DUMP_ #ifdef _PE_TX_DUMP_
printk("[Mds_Tx] Tx Owner is H/W.\n"); printk("[Mds_Tx] Tx Owner is H/W.\n");
#endif #endif
break; break;
} }
XmitBufAddress = pMds->pTxBuffer + (MAX_USB_TX_BUFFER * FillIndex); //Get buffer XmitBufAddress = pMds->pTxBuffer + (MAX_USB_TX_BUFFER * FillIndex); /* Get buffer */
XmitBufSize = 0; XmitBufSize = 0;
FillCount = 0; FillCount = 0;
do { do {
...@@ -453,37 +453,37 @@ Mds_Tx(struct wbsoft_priv * adapter) ...@@ -453,37 +453,37 @@ Mds_Tx(struct wbsoft_priv * adapter)
if (!PacketSize) if (!PacketSize)
break; break;
//For Check the buffer resource /* For Check the buffer resource */
FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD; FragmentThreshold = CURRENT_FRAGMENT_THRESHOLD;
//931130.5.b /* 931130.5.b */
FragmentCount = PacketSize/FragmentThreshold + 1; FragmentCount = PacketSize/FragmentThreshold + 1;
stmp = PacketSize + FragmentCount*32 + 8;//931130.5.c 8:MIC stmp = PacketSize + FragmentCount*32 + 8; /* 931130.5.c 8:MIC */
if ((XmitBufSize + stmp) >= MAX_USB_TX_BUFFER) { if ((XmitBufSize + stmp) >= MAX_USB_TX_BUFFER) {
printk("[Mds_Tx] Excess max tx buffer.\n"); printk("[Mds_Tx] Excess max tx buffer.\n");
break; // buffer is not enough break; /* buffer is not enough */
} }
// /*
// Start transmitting * Start transmitting
// */
BufferFilled = true; BufferFilled = true;
/* Leaves first u8 intact */ /* Leaves first u8 intact */
memset((u8 *)pTxDes + 1, 0, sizeof(struct wb35_descriptor) - 1); memset((u8 *)pTxDes + 1, 0, sizeof(struct wb35_descriptor) - 1);
TxDesIndex = pMds->TxDesIndex;//Get the current ID TxDesIndex = pMds->TxDesIndex; /* Get the current ID */
pTxDes->Descriptor_ID = TxDesIndex; pTxDes->Descriptor_ID = TxDesIndex;
pMds->TxDesFrom[ TxDesIndex ] = 2;//Storing the information of source comming from pMds->TxDesFrom[ TxDesIndex ] = 2; /* Storing the information of source comming from */
pMds->TxDesIndex++; pMds->TxDesIndex++;
pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR; pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR;
MLME_GetNextPacket( adapter, pTxDes ); MLME_GetNextPacket( adapter, pTxDes );
// Copy header. 8byte USB + 24byte 802.11Hdr. Set TxRate, Preamble type /* Copy header. 8byte USB + 24byte 802.11Hdr. Set TxRate, Preamble type */
Mds_HeaderCopy( adapter, pTxDes, XmitBufAddress ); Mds_HeaderCopy( adapter, pTxDes, XmitBufAddress );
// For speed up Key setting /* For speed up Key setting */
if (pTxDes->EapFix) { if (pTxDes->EapFix) {
#ifdef _PE_TX_DUMP_ #ifdef _PE_TX_DUMP_
printk("35: EPA 4th frame detected. Size = %d\n", PacketSize); printk("35: EPA 4th frame detected. Size = %d\n", PacketSize);
...@@ -491,41 +491,41 @@ Mds_Tx(struct wbsoft_priv * adapter) ...@@ -491,41 +491,41 @@ Mds_Tx(struct wbsoft_priv * adapter)
pHwData->IsKeyPreSet = 1; pHwData->IsKeyPreSet = 1;
} }
// Copy (fragment) frame body, and set USB, 802.11 hdr flag /* Copy (fragment) frame body, and set USB, 802.11 hdr flag */
CurrentSize = Mds_BodyCopy(adapter, pTxDes, XmitBufAddress); CurrentSize = Mds_BodyCopy(adapter, pTxDes, XmitBufAddress);
// Set RTS/CTS and Normal duration field into buffer /* Set RTS/CTS and Normal duration field into buffer */
Mds_DurationSet(adapter, pTxDes, XmitBufAddress); Mds_DurationSet(adapter, pTxDes, XmitBufAddress);
//Shift to the next address /* Shift to the next address */
XmitBufSize += CurrentSize; XmitBufSize += CurrentSize;
XmitBufAddress += CurrentSize; XmitBufAddress += CurrentSize;
#ifdef _IBSS_BEACON_SEQ_STICK_ #ifdef _IBSS_BEACON_SEQ_STICK_
if ((XmitBufAddress[ DOT_11_DA_OFFSET+8 ] & 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) // +8 for USB hdr if ((XmitBufAddress[ DOT_11_DA_OFFSET+8 ] & 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) /* +8 for USB hdr */
#endif #endif
pMds->TxToggle = true; pMds->TxToggle = true;
// Get packet to transmit completed, 1:TESTSTA 2:MLME 3: Ndis data /* Get packet to transmit completed, 1:TESTSTA 2:MLME 3: Ndis data */
MLME_SendComplete(adapter, 0, true); MLME_SendComplete(adapter, 0, true);
// Software TSC count 20060214 /* Software TSC count 20060214 */
pMds->TxTsc++; pMds->TxTsc++;
if (pMds->TxTsc == 0) if (pMds->TxTsc == 0)
pMds->TxTsc_2++; pMds->TxTsc_2++;
FillCount++; // 20060928 FillCount++; /* 20060928 */
} while (HAL_USB_MODE_BURST(pHwData)); // End of multiple MSDU copy loop. false = single true = multiple sending } while (HAL_USB_MODE_BURST(pHwData)); /* End of multiple MSDU copy loop. false = single true = multiple sending */
// Move to the next one, if necessary /* Move to the next one, if necessary */
if (BufferFilled) { if (BufferFilled) {
// size setting /* size setting */
pMds->TxBufferSize[ FillIndex ] = XmitBufSize; pMds->TxBufferSize[ FillIndex ] = XmitBufSize;
// 20060928 set Tx count /* 20060928 set Tx count */
pMds->TxCountInBuffer[FillIndex] = FillCount; pMds->TxCountInBuffer[FillIndex] = FillCount;
// Set owner flag /* Set owner flag */
pMds->TxOwner[FillIndex] = 1; pMds->TxOwner[FillIndex] = 1;
pMds->TxFillIndex++; pMds->TxFillIndex++;
...@@ -534,14 +534,14 @@ Mds_Tx(struct wbsoft_priv * adapter) ...@@ -534,14 +534,14 @@ Mds_Tx(struct wbsoft_priv * adapter)
} else } else
break; break;
if (!PacketSize) // No more pk for transmitting if (!PacketSize) /* No more pk for transmitting */
break; break;
} while(true); } while(true);
// /*
// Start to send by lower module * Start to send by lower module
// */
if (!pHwData->IsKeyPreSet) if (!pHwData->IsKeyPreSet)
Wb35Tx_start(adapter); Wb35Tx_start(adapter);
...@@ -558,20 +558,20 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02) ...@@ -558,20 +558,20 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
unsigned char SendOK = true; unsigned char SendOK = true;
u8 RetryCount, TxRate; u8 RetryCount, TxRate;
if (pT02->T02_IgnoreResult) // Don't care the result if (pT02->T02_IgnoreResult) /* Don't care the result */
return; return;
if (pT02->T02_IsLastMpdu) { if (pT02->T02_IsLastMpdu) {
//TODO: DTO -- get the retry count and fragment count /* TODO: DTO -- get the retry count and fragment count */
// Tx rate /* Tx rate */
TxRate = pMds->TxRate[ PacketId ][ 0 ]; TxRate = pMds->TxRate[ PacketId ][ 0 ];
RetryCount = (u8)pT02->T02_MPDU_Cnt; RetryCount = (u8)pT02->T02_MPDU_Cnt;
if (pT02->value & FLAG_ERROR_TX_MASK) { if (pT02->value & FLAG_ERROR_TX_MASK) {
SendOK = false; SendOK = false;
if (pT02->T02_transmit_abort || pT02->T02_out_of_MaxTxMSDULiftTime) { if (pT02->T02_transmit_abort || pT02->T02_out_of_MaxTxMSDULiftTime) {
//retry error /* retry error */
pHwData->dto_tx_retry_count += (RetryCount+1); pHwData->dto_tx_retry_count += (RetryCount+1);
//[for tx debug] /* [for tx debug] */
if (RetryCount<7) if (RetryCount<7)
pHwData->tx_retry_count[RetryCount] += RetryCount; pHwData->tx_retry_count[RetryCount] += RetryCount;
else else
...@@ -583,7 +583,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02) ...@@ -583,7 +583,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
} }
pHwData->dto_tx_frag_count += (RetryCount+1); pHwData->dto_tx_frag_count += (RetryCount+1);
//[for tx debug] /* [for tx debug] */
if (pT02->T02_transmit_abort_due_to_TBTT) if (pT02->T02_transmit_abort_due_to_TBTT)
pHwData->tx_TBTT_start_count++; pHwData->tx_TBTT_start_count++;
if (pT02->T02_transmit_without_encryption_due_to_wep_on_false) if (pT02->T02_transmit_without_encryption_due_to_wep_on_false)
...@@ -596,7 +596,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02) ...@@ -596,7 +596,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
MTO_SetTxCount(adapter, TxRate, RetryCount); MTO_SetTxCount(adapter, TxRate, RetryCount);
} }
// Clear send result buffer /* Clear send result buffer */
pMds->TxResult[ PacketId ] = 0; pMds->TxResult[ PacketId ] = 0;
} else } else
pMds->TxResult[ PacketId ] |= ((u16)(pT02->value & 0x0ffff)); pMds->TxResult[ PacketId ] |= ((u16)(pT02->value & 0x0ffff));
......
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