Staging: winbond: Fixed some coding style issues
cover Staging: winbond: Fixed some coding style issues
Fixes some coding style issues from drivers/staging/winbond
Iker Pedrosa (6):
Staging: winbond: wb35reg: changed sleep function from msleep to
usleep
Staging: winbond: wb35reg: white space deleted
Staging: winbond: wb35reg: avoided use of extern function
Staging: winbond: mds: fixed some lines over 80 characters
Staging: winbond: mds_f: fixed lines over 80 characters
Staging: winbond: mds_f: deleted extern function
drivers/staging/winbond/mds.c | 56 ++++++++++++++++++------------- drivers/staging/winbond/mds_f.h | 13 ++++--- drivers/staging/winbond/phy_calibration.h | 1 + drivers/staging/winbond/wb35reg.c | 13 ++++--- 4 files changed, 48 insertions(+), 35 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/6 Staging: winbond: wb35reg: changed sleep function from msleep to usleep
Changed sleep function from msleep to usleep according to the documentation.
--- drivers/staging/winbond/wb35reg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/winbond/wb35reg.c +4 -4
@@ -134,7 +134,7 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg/* Wait until EP0VM stop */ while (reg->EP0vm_state !=VM_STOP ) -msleep (10 ); +usleep (10000 );/* Sync IoCallDriver */ reg->EP0vm_state =VM_RUNNING ;
@@ -301,7 +301,7 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe/* Wait until EP0VM stop */ while (reg->EP0vm_state !=VM_STOP ) -msleep (10 ); +usleep (10000 ); reg->EP0vm_state =VM_RUNNING ; ret = usb_control_msg(pHwData->udev,
@@ -501,9 +501,9 @@ void Wb35Reg_destroy(struct hw_data *pHwData)/* Wait for Reg operation completed */ do { -msleep (10 );/* Delay for waiting function enter */ +usleep (10000 );/* Delay for waiting function enter */ }while (reg->EP0vm_state !=VM_STOP ); -msleep (10 );/* Delay for waiting function enter */ +usleep (10000 );/* Delay for waiting function enter */ /* Release all the data in RegQueue */ spin_lock_irq (®->EP0VM_spin_lock);
Signature · 1 line
1.8.1.2
Re: [PATCH 1/6] Staging: winbond: wb35reg: changed sleep function from msleep to usleep
Quoted 3 lines · Iker Pedrosa
Changed sleep function from msleep to usleep according to the documentation.
Signed-off-by Iker Pedrosa <[email protected]>
Can you explain why this is good idea?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 1/6] Staging: winbond: wb35reg: changed sleep function from msleep to usleep
According to Documentation/timers/timers-howto.txt it is not recommended to use msleep for 1ms - 20ms because it may sleep longer than 20ms. So, it is recommended to use usleep instead.
Quoted 10 lines · On Mon, 12 Aug 2013 12:05:10 +0200 Pavel Machek <[email protected]> wrote:
Quoted 3 lines · Iker Pedrosa
Changed sleep function from msleep to usleep according to the documentation.
Signed-off-by Iker Pedrosa <[email protected]>Can you explain why this is good idea?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Signature · 3 lines
Regards, Iker Pedrosa <[email protected]>
PATCH 2/6 Staging: winbond: wb35reg: white space deleted
In reply to Iker PedrosaWhite space deleted before a semicolon.
--- drivers/staging/winbond/wb35reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/winbond/wb35reg.c +1 -1
@@ -44,7 +44,7 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p reg_queue->pBuffer = (u32 *)((u8 *)reg_queue +sizeof (struct wb35_reg_queue ));memcpy (reg_queue->pBuffer, pRegisterData, DataSize);/* the function for reversing register data from little endian to big endian */ -for (i =0 ; i < NumberOfData ; i++) +for (i =0 ; i < NumberOfData; i++) reg_queue->pBuffer[i] =cpu_to_le32 (reg_queue->pBuffer[i]); dr = (struct usb_ctrlrequest *)((u8 *)reg_queue +sizeof (struct wb35_reg_queue ) + DataSize);
Signature · 1 line
1.8.1.2
Re: [PATCH 2/6] Staging: winbond: wb35reg: white space deleted
Quoted 3 lines · Iker Pedrosa
White space deleted before a semicolon.
Signed-off-by Iker Pedrosa <[email protected]>
ACK.
Quoted 17 lines
--- drivers/staging/winbond/wb35reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/winbond/wb35reg.c +1
-1@@ -44,7 +44,7 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p reg_queue->pBuffer = (u32 *)((u8 *)reg_queue +sizeof (struct wb35_reg_queue ));memcpy (reg_queue->pBuffer, pRegisterData, DataSize);/* the function for reversing register data from little endian to big endian */ -for (i =0 ; i < NumberOfData ; i++) +for (i =0 ; i < NumberOfData; i++) reg_queue->pBuffer[i] =cpu_to_le32 (reg_queue->pBuffer[i]); dr = (struct usb_ctrlrequest *)((u8 *)reg_queue +sizeof (struct wb35_reg_queue ) + DataSize);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 3/6 Staging: winbond: wb35reg: avoided use of extern function
In reply to Iker PedrosaPrototype of a function added to the header to avoid the use of extern.
--- drivers/staging/winbond/phy_calibration.h | 1 + drivers/staging/winbond/wb35reg.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/winbond/phy_calibration.h +1 -0
@@ -79,6 +79,7 @@#define SHIFT_IQCAL_TONE_Q (x) ((x) >> 13)void phy_set_rf_data (struct hw_data *pHwData,u32 index,u32 value); +void phy_calibration_winbond (struct hw_data *phw_data,u32 frequency);#define phy_init_rf (_A)/* RFSynthesizer_initial(_A) */ #endif
drivers/staging/winbond/wb35reg.c +1 -2
@@ -1,10 +1,9 @@#include "wb35reg_f.h" +#include "phy_calibration.h" #include <linux/usb.h> #include <linux/slab.h> -extern void phy_calibration_winbond (struct hw_data *phw_data,u32 frequency); -/* * true : read command process successfully * false : register not support
Signature · 1 line
1.8.1.2
Re: [PATCH 3/6] Staging: winbond: wb35reg: avoided use of extern function
Quoted 3 lines · Iker Pedrosa
Prototype of a function added to the header to avoid the use of extern.
Signed-off-by Iker Pedrosa <[email protected]>
ACK.
Quoted 33 lines
--- drivers/staging/winbond/phy_calibration.h | 1 + drivers/staging/winbond/wb35reg.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/staging/winbond/phy_calibration.h +1
-0@@ -79,6 +79,7 @@#define SHIFT_IQCAL_TONE_Q (x) ((x) >> 13)void phy_set_rf_data (struct hw_data *pHwData,u32 index,u32 value); +void phy_calibration_winbond (struct hw_data *phw_data,u32 frequency);#define phy_init_rf (_A)/* RFSynthesizer_initial(_A) */ #endif drivers/staging/winbond/wb35reg.c +1
-2@@ -1,10 +1,9 @@#include "wb35reg_f.h" +#include "phy_calibration.h" #include <linux/usb.h> #include <linux/slab.h> -extern void phy_calibration_winbond (struct hw_data *phw_data,u32 frequency); -/* * true : read command process successfully * false : register not support
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 4/6 Staging: winbond: mds: fixed some lines over 80 characters
In reply to Iker PedrosaFixed some coding style issues
--- drivers/staging/winbond/mds.c | 56 +++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 23 deletions(-)
drivers/staging/winbond/mds.c +33 -23
@@ -15,7 +15,8 @@ Mds_initial(struct wbsoft_priv *adapter)return hal_get_tx_buffer (&adapter->sHwData, &pMds->pTxBuffer); } -static void Mds_DurationSet (struct wbsoft_priv *adapter,struct wb35_descriptor *pDes,u8 *buffer) +static void Mds_DurationSet (struct wbsoft_priv *adapter, +struct wb35_descriptor *pDes,u8 *buffer) {struct T00_descriptor *pT00;struct T01_descriptor *pT01;
@@ -43,10 +44,11 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* Set RTS/CTS mechanism ******************************************/ if (!boGroupAddr) { -/* 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 -* CTS-to-self in this case. CTS-To-self will only be used when without -* fragmentation. -- 20050112 */ +/* 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 CTS-to-self in this case. +* CTS-To-self will only be used when without +* fragmentation. -- 20050112 */ BodyLen = (u16 )pT00->T00_frame_length;/* include 802.11 header */ BodyLen +=4 ;/* CRC */
@@ -90,8 +92,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* CTS Rate : 24 Mega bps * CTS frame length = 14 bytes */ Duration += (DEFAULT_SIFSTIME + -PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + - ((112 +22 +95 )/96 )*Tsym); +PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + + ((112 +22 +95 )/96 )*Tsym); }else {/* CTS + 1 SIFS + CTS duration * CTS Rate : ?? Mega bps
@@ -101,7 +103,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptorelse Duration +=SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME ; - Duration += (((112 + Rate-1 ) / Rate) +DEFAULT_SIFSTIME ); + Duration += (((112 + Rate-1 ) / Rate) + +DEFAULT_SIFSTIME ); } }
@@ -127,9 +130,10 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* Rate : ??Mega bps * ACK frame length = 14 bytes, tx rate = 24M */ Duration =PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION *3 ; - Duration += (((NextBodyLen*8 +22 + Rate*4 -1 )/(Rate*4 )) * Tsym + - (((2 *14 )*8 +22 +95 )/96 )*Tsym + -DEFAULT_SIFSTIME *3 ); + Duration += (((NextBodyLen*8 +22 + Rate*4 -1 ) + /(Rate*4 )) * Tsym + + (((2 *14 )*8 +22 +95 )/96 )*Tsym + +DEFAULT_SIFSTIME *3 ); }else {/* DSSS * data transmit time + 2 ACK + 3 SIFS
@@ -141,8 +145,9 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptorelse Duration =SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME *3 ; - Duration += (((NextBodyLen + (2 *14 ))*8 + Rate-1 ) / Rate + -DEFAULT_SIFSTIME *3 ); + Duration += (((NextBodyLen + (2 *14 ))*8 + + Rate-1 ) / Rate + +DEFAULT_SIFSTIME *3 ); } ((u16 *)buffer)[5 ] =cpu_to_le16 (Duration);/* 4 USHOR for skip 8B USB, 2USHORT=FC + Duration */
@@ -168,7 +173,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* ACK frame length = 14 bytes */ Duration =PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION ;/* The Tx rate of ACK use 24M */ - Duration += (((112 +22 +95 )/96 )*Tsym +DEFAULT_SIFSTIME ); + Duration += (((112 +22 +95 )/96 )*Tsym + +DEFAULT_SIFSTIME ); }else {/* DSSS * 1 ACK + 1 SIFS
@@ -191,7 +197,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor }/* 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) {struct T00_descriptor *pT00;struct wb35_mds *pMds = &adapter->Mds;
@@ -246,7 +253,7 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe buf_index++; buf_index %=MAX_DESCRIPTOR_BUFFER_INDEX ; }else { -u8 *pctmp = pDes->buffer_address[buf_index]; +u8 *pctmp = pDes->buffer_address[buf_index]; pctmp += CopySize; pDes->buffer_address[buf_index] = pctmp; pDes->buffer_size[buf_index] -= CopySize;
@@ -290,7 +297,8 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDereturn 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;u8 *src_buffer = pDes->buffer_address[0 ];/* 931130.5.g */
@@ -391,11 +399,12 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * pDes->PreambleMode =WLAN_PREAMBLE_TYPE_LONG ; else pDes->PreambleMode = CURRENT_PREAMBLE_MODE; - pT01->T01_plcp_header_length = pDes->PreambleMode;/* Set preamble */ + pT01->T01_plcp_header_length = pDes->PreambleMode;/* Set preamble */ } -static void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *desc) +static void MLME_GetNextPacket (struct wbsoft_priv *adapter, +struct wb35_descriptor *desc) { desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; desc->InternalUsed %=MAX_DESCRIPTOR_BUFFER_INDEX ;
@@ -423,7 +432,8 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData) } } -static void MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID,unsigned char SendOK) +static void MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID, +unsigned char SendOK) {/* Reclaim the data buffer */ adapter->sMlmeFrame.len =0 ;
@@ -440,9 +450,9 @@ Mds_Tx(struct wbsoft_priv *adapter)struct wb35_mds *pMds = &adapter->Mds;struct wb35_descriptor TxDes;struct wb35_descriptor *pTxDes = &TxDes; -u8 *XmitBufAddress; -u16 XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold; -u8 FillIndex, TxDesIndex, FragmentCount, FillCount; +u8 *XmitBufAddress; +u16 XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold; +u8 FillIndex, TxDesIndex, FragmentCount, FillCount;unsigned char BufferFilled = false;
Signature · 1 line
1.8.1.2
Re: [PATCH 4/6] Staging: winbond: mds: fixed some lines over 80 characters
Quoted 3 lines · Iker Pedrosa
Fixed some coding style issues
Signed-off-by Iker Pedrosa <[email protected]>
ACK.
Quoted 158 lines
--- drivers/staging/winbond/mds.c | 56 +++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 23 deletions(-)drivers/staging/winbond/mds.c +33
-23@@ -15,7 +15,8 @@ Mds_initial(struct wbsoft_priv *adapter)return hal_get_tx_buffer (&adapter->sHwData, &pMds->pTxBuffer); } -static void Mds_DurationSet (struct wbsoft_priv *adapter,struct wb35_descriptor *pDes,u8 *buffer) +static void Mds_DurationSet (struct wbsoft_priv *adapter, +struct wb35_descriptor *pDes,u8 *buffer) {struct T00_descriptor *pT00;struct T01_descriptor *pT01;@@ -43,10 +44,11 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* Set RTS/CTS mechanism ******************************************/ if (!boGroupAddr) { -/* 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 -* CTS-to-self in this case. CTS-To-self will only be used when without -* fragmentation. -- 20050112 */ +/* 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 CTS-to-self in this case. +* CTS-To-self will only be used when without +* fragmentation. -- 20050112 */ BodyLen = (u16 )pT00->T00_frame_length;/* include 802.11 header */ BodyLen +=4 ;/* CRC */ @@ -90,8 +92,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* CTS Rate : 24 Mega bps * CTS frame length = 14 bytes */ Duration += (DEFAULT_SIFSTIME + -PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + - ((112 +22 +95 )/96 )*Tsym); +PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION + + ((112 +22 +95 )/96 )*Tsym); }else {/* CTS + 1 SIFS + CTS duration * CTS Rate : ?? Mega bps @@ -101,7 +103,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptorelse Duration +=SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME ; - Duration += (((112 + Rate-1 ) / Rate) +DEFAULT_SIFSTIME ); + Duration += (((112 + Rate-1 ) / Rate) + +DEFAULT_SIFSTIME ); } }@@ -127,9 +130,10 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* Rate : ??Mega bps * ACK frame length = 14 bytes, tx rate = 24M */ Duration =PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION *3 ; - Duration += (((NextBodyLen*8 +22 + Rate*4 -1 )/(Rate*4 )) * Tsym + - (((2 *14 )*8 +22 +95 )/96 )*Tsym + -DEFAULT_SIFSTIME *3 ); + Duration += (((NextBodyLen*8 +22 + Rate*4 -1 ) + /(Rate*4 )) * Tsym + + (((2 *14 )*8 +22 +95 )/96 )*Tsym + +DEFAULT_SIFSTIME *3 ); }else {/* DSSS * data transmit time + 2 ACK + 3 SIFS @@ -141,8 +145,9 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptorelse Duration =SHORT_PREAMBLE_PLUS_PLCPHEADER_TIME *3 ; - Duration += (((NextBodyLen + (2 *14 ))*8 + Rate-1 ) / Rate + -DEFAULT_SIFSTIME *3 ); + Duration += (((NextBodyLen + (2 *14 ))*8 + + Rate-1 ) / Rate + +DEFAULT_SIFSTIME *3 ); } ((u16 *)buffer)[5 ] =cpu_to_le16 (Duration);/* 4 USHOR for skip 8B USB, 2USHORT=FC + Duration */ @@ -168,7 +173,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor* ACK frame length = 14 bytes */ Duration =PREAMBLE_PLUS_SIGNAL_PLUS_SIGNALEXTENSION ;/* The Tx rate of ACK use 24M */ - Duration += (((112 +22 +95 )/96 )*Tsym +DEFAULT_SIFSTIME ); + Duration += (((112 +22 +95 )/96 )*Tsym + +DEFAULT_SIFSTIME ); }else {/* DSSS * 1 ACK + 1 SIFS @@ -191,7 +197,8 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor }/* 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) {struct T00_descriptor *pT00;struct wb35_mds *pMds = &adapter->Mds;@@ -246,7 +253,7 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDe buf_index++; buf_index %=MAX_DESCRIPTOR_BUFFER_INDEX ; }else { -u8 *pctmp = pDes->buffer_address[buf_index]; +u8 *pctmp = pDes->buffer_address[buf_index]; pctmp += CopySize; pDes->buffer_address[buf_index] = pctmp; pDes->buffer_size[buf_index] -= CopySize;@@ -290,7 +297,8 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDereturn 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;u8 *src_buffer = pDes->buffer_address[0 ];/* 931130.5.g */ @@ -391,11 +399,12 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * pDes->PreambleMode =WLAN_PREAMBLE_TYPE_LONG ; else pDes->PreambleMode = CURRENT_PREAMBLE_MODE; - pT01->T01_plcp_header_length = pDes->PreambleMode;/* Set preamble */ + pT01->T01_plcp_header_length = pDes->PreambleMode;/* Set preamble */ } -static void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *desc) +static void MLME_GetNextPacket (struct wbsoft_priv *adapter, +struct wb35_descriptor *desc) { desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; desc->InternalUsed %=MAX_DESCRIPTOR_BUFFER_INDEX ;@@ -423,7 +432,8 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData) } } -static void MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID,unsigned char SendOK) +static void MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID, +unsigned char SendOK) {/* Reclaim the data buffer */ adapter->sMlmeFrame.len =0 ;@@ -440,9 +450,9 @@ Mds_Tx(struct wbsoft_priv *adapter)struct wb35_mds *pMds = &adapter->Mds;struct wb35_descriptor TxDes;struct wb35_descriptor *pTxDes = &TxDes; -u8 *XmitBufAddress; -u16 XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold; -u8 FillIndex, TxDesIndex, FragmentCount, FillCount; +u8 *XmitBufAddress; +u16 XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold; +u8 FillIndex, TxDesIndex, FragmentCount, FillCount;unsigned char BufferFilled = false;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 5/6 Staging: winbond: mds_f: fixed lines over 80 characters
In reply to Iker PedrosaFixed some coding style issues.
--- drivers/staging/winbond/mds_f.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/staging/winbond/mds_f.h +8 -4
@@ -7,13 +7,17 @@unsigned char Mds_initial (struct wbsoft_priv *adapter);void Mds_Tx (struct wbsoft_priv *adapter);void Mds_SendComplete (struct wbsoft_priv *adapter,struct T02_descriptor *pt02); -void Mds_MpduProcess (struct wbsoft_priv *adapter,struct wb35_descriptor *prxdes); +void Mds_MpduProcess (struct wbsoft_priv *adapter, +struct wb35_descriptor *prxdes);extern void DataDmp (u8 *pdata,u32 len,u32 offset);/* For data frame sending */ u16 MDS_GetPacketSize (struct wbsoft_priv *adapter); -void MDS_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *pdes); -void MDS_GetNextPacketComplete (struct wbsoft_priv *adapter,struct wb35_descriptor *pdes); -void MDS_SendResult (struct wbsoft_priv *adapter,u8 packetid,unsigned char sendok); +void MDS_GetNextPacket (struct wbsoft_priv *adapter, +struct wb35_descriptor *pdes); +void MDS_GetNextPacketComplete (struct wbsoft_priv *adapter, +struct wb35_descriptor *pdes); +void MDS_SendResult (struct wbsoft_priv *adapter,u8 packetid, +unsigned char sendok);#endif
Signature · 1 line
1.8.1.2
Re: [PATCH 5/6] Staging: winbond: mds_f: fixed lines over 80 characters
Quoted 3 lines · Iker Pedrosa
Fixed some coding style issues.
Signed-off-by Iker Pedrosa <[email protected]>
ACK.
Quoted 30 lines
--- drivers/staging/winbond/mds_f.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)drivers/staging/winbond/mds_f.h +8
-4@@ -7,13 +7,17 @@unsigned char Mds_initial (struct wbsoft_priv *adapter);void Mds_Tx (struct wbsoft_priv *adapter);void Mds_SendComplete (struct wbsoft_priv *adapter,struct T02_descriptor *pt02); -void Mds_MpduProcess (struct wbsoft_priv *adapter,struct wb35_descriptor *prxdes); +void Mds_MpduProcess (struct wbsoft_priv *adapter, +struct wb35_descriptor *prxdes);extern void DataDmp (u8 *pdata,u32 len,u32 offset);/* For data frame sending */ u16 MDS_GetPacketSize (struct wbsoft_priv *adapter); -void MDS_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *pdes); -void MDS_GetNextPacketComplete (struct wbsoft_priv *adapter,struct wb35_descriptor *pdes); -void MDS_SendResult (struct wbsoft_priv *adapter,u8 packetid,unsigned char sendok); +void MDS_GetNextPacket (struct wbsoft_priv *adapter, +struct wb35_descriptor *pdes); +void MDS_GetNextPacketComplete (struct wbsoft_priv *adapter, +struct wb35_descriptor *pdes); +void MDS_SendResult (struct wbsoft_priv *adapter,u8 packetid, +unsigned char sendok);#endif
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 6/6 Staging: winbond: mds_f: deleted extern function
In reply to Iker PedrosaDeleted an extern function that wasn't used in this driver.
--- drivers/staging/winbond/mds_f.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/winbond/mds_f.h +0 -1
@@ -9,7 +9,6 @@ void Mds_Tx(struct wbsoft_priv *adapter);void Mds_SendComplete (struct wbsoft_priv *adapter,struct T02_descriptor *pt02);void Mds_MpduProcess (struct wbsoft_priv *adapter,struct wb35_descriptor *prxdes); -extern void DataDmp (u8 *pdata,u32 len,u32 offset);/* For data frame sending */ u16 MDS_GetPacketSize (struct wbsoft_priv *adapter);
Signature · 1 line
1.8.1.2
Re: [PATCH 6/6] Staging: winbond: mds_f: deleted extern function
Quoted 3 lines · Iker Pedrosa
Deleted an extern function that wasn't used in this driver.
Signed-off-by Iker Pedrosa <[email protected]>
ACK.
Quoted 16 lines
--- drivers/staging/winbond/mds_f.h | 1 - 1 file changed, 1 deletion(-)drivers/staging/winbond/mds_f.h +0
-1@@ -9,7 +9,6 @@ void Mds_Tx(struct wbsoft_priv *adapter);void Mds_SendComplete (struct wbsoft_priv *adapter,struct T02_descriptor *pt02);void Mds_MpduProcess (struct wbsoft_priv *adapter,struct wb35_descriptor *prxdes); -extern void DataDmp (u8 *pdata,u32 len,u32 offset);/* For data frame sending */ u16 MDS_GetPacketSize (struct wbsoft_priv *adapter);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html