Commit 279b6ccc authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: remove true/false boolean macros 



Use the kernel built-in true and false boolean values instead of duplicating
them in the driver code.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ce9ed5d

drivers/staging/winbond/linux/common.h

+0 −17
Original line number Diff line number Diff line
@@ -45,23 +45,6 @@ 
#define	FAILURE     0





#ifndef true

#define true        1

#endif



#ifndef false

#define false       0

#endif



// PD43 20021108

#ifndef TRUE

#define TRUE        1

#endif



#ifndef FALSE

#define FALSE       0

#endif



#define STATUS_MEDIA_CONNECT 1

#define STATUS_MEDIA_DISCONNECT 0

drivers/staging/winbond/linux/wb35reg.c

+35 −35
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency);



// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

// RegisterNo : start base

// pRegisterData : data point

// NumberOfData : number of register data
@@ -21,7 +21,7 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	// Trying to use burst write function if use new hardware

	UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest);
@@ -58,15 +58,15 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N 
		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);



		return TRUE;

		return true;

	} else {

		if (urb)

			usb_free_urb(urb);

		if (reg_queue)

			kfree(reg_queue);

		return FALSE;

		return false;

	}

   return FALSE;

   return false;

}



void
@@ -112,8 +112,8 @@ Wb35Reg_Update(phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue) 
	}

}



// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

unsigned char

Wb35Reg_WriteSync(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue )

{
@@ -122,7 +122,7 @@ Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	RegisterValue = cpu_to_le32(RegisterValue);
@@ -150,14 +150,14 @@ Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
		#endif



		pHwData->SurpriseRemove = 1; // 20060704.2

		return FALSE;

		return false;

	}



	return TRUE;

	return true;

}



// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

unsigned char

Wb35Reg_Write(  phw_data_t pHwData,  u16 RegisterNo,  u32 RegisterValue )

{
@@ -170,7 +170,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	// update the register by send urb request------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
@@ -180,7 +180,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
		reg_queue->DIRECT = 1;// burst write register

		reg_queue->INDEX = RegisterNo;

		reg_queue->VALUE = cpu_to_le32(RegisterValue);

		reg_queue->RESERVED_VALID = FALSE;

		reg_queue->RESERVED_VALID = false;

		dr = (struct usb_ctrlrequest *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue));

		dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;

		dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode
@@ -205,19 +205,19 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);



		return TRUE;

		return true;

	} else {

		if (urb)

			usb_free_urb(urb);

		kfree(reg_queue);

		return FALSE;

		return false;

	}

}



//This command will be executed with a user defined value. When it completes,

//this value is useful. For example, hal_set_current_channel will use it.

// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

unsigned char

Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue,

				s8 *pValue, s8 Len)
@@ -230,7 +230,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	// update the register by send urb request------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
@@ -242,7 +242,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 
		reg_queue->VALUE = cpu_to_le32(RegisterValue);

		//NOTE : Users must guarantee the size of value will not exceed the buffer size.

		memcpy(reg_queue->RESERVED, pValue, Len);

		reg_queue->RESERVED_VALID = TRUE;

		reg_queue->RESERVED_VALID = true;

		dr = (struct usb_ctrlrequest *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue));

		dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;

		dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode
@@ -265,17 +265,17 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 


		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);

		return TRUE;

		return true;

	} else {

		if (urb)

			usb_free_urb(urb);

		kfree(reg_queue);

		return FALSE;

		return false;

	}

}



// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

// pRegisterValue : It must be a resident buffer due to asynchronous read register.

unsigned char

Wb35Reg_ReadSync(  phw_data_t pHwData,  u16 RegisterNo,   u32 * pRegisterValue )
@@ -286,7 +286,7 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	// Read the register by send usb message------------------------------------
@@ -317,14 +317,14 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 
		#endif



		pHwData->SurpriseRemove = 1; // 20060704.2

		return FALSE;

		return false;

	}



	return TRUE;

	return true;

}



// TRUE  : read command process successfully

// FALSE : register not support

// true  : read command process successfully

// false : register not support

// pRegisterValue : It must be a resident buffer due to asynchronous read register.

unsigned char

Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo,  u32 * pRegisterValue )
@@ -337,7 +337,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 


	// Module shutdown

	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;



	// update the variable by send Urb to read register ------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
@@ -371,12 +371,12 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 
		// Start EP0VM

		Wb35Reg_EP0VM_start( pHwData );



		return TRUE;

		return true;

	} else {

		if (urb)

			usb_free_urb( urb );

		kfree(reg_queue);

		return FALSE;

		return false;

	}

}
@@ -629,9 +629,9 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData) 
	Dxx_initial(pHwData);



	if (pHwData->SurpriseRemove)

		return FALSE;

		return false;

	else

		return TRUE; // Initial fail

		return true; // Initial fail

}



//===================================================================================

drivers/staging/winbond/linux/wb35rx.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ u16 Wb35Rx_indicate(phw_data_t pHwData) 


		// Reclaim resource

		pWb35Rx->RxOwner[ RxBufferId ] = 1;

	} while(TRUE);

	} while (true);



	return stmp2;

}

drivers/staging/winbond/linux/wb35tx.c

+7 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer) 
	PWB35TX pWb35Tx = &pHwData->Wb35Tx;



	*pBuffer = pWb35Tx->TxBuffer[0];

	return TRUE;

	return true;

}



void Wb35Tx_start(phw_data_t pHwData)
@@ -136,16 +136,16 @@ unsigned char Wb35Tx_initial(phw_data_t pHwData) 


	pWb35Tx->Tx4Urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!pWb35Tx->Tx4Urb)

		return FALSE;

		return false;



	pWb35Tx->Tx2Urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!pWb35Tx->Tx2Urb)

	{

		usb_free_urb( pWb35Tx->Tx4Urb );

		return FALSE;

		return false;

	}



	return TRUE;

	return true;

}



//======================================================
@@ -193,12 +193,12 @@ void Wb35Tx_destroy(phw_data_t pHwData) 
void Wb35Tx_CurrentTime(phw_data_t pHwData, u32 TimeCount)

{

	PWB35TX pWb35Tx = &pHwData->Wb35Tx;

	unsigned char Trigger = FALSE;

	unsigned char Trigger = false;



	if (pWb35Tx->TxTimer > TimeCount)

		Trigger = TRUE;

		Trigger = true;

	else if (TimeCount > (pWb35Tx->TxTimer+500))

		Trigger = TRUE;

		Trigger = true;



	if (Trigger) {

		pWb35Tx->TxTimer = TimeCount;

drivers/staging/winbond/mds.c

+15 −16
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Mds_initial(struct wb35_adapter * adapter) 
{

	PMDS pMds = &adapter->Mds;



	pMds->TxPause = FALSE;

	pMds->TxPause = false;

	pMds->TxRTSThreshold = DEFAULT_RTSThreshold;

	pMds->TxFragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD;
@@ -43,7 +43,7 @@ Mds_Tx(struct wb35_adapter * adapter) 
	u8		*XmitBufAddress;

	u16		XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold;

	u8		FillIndex, TxDesIndex, FragmentCount, FillCount;

	unsigned char	BufferFilled = FALSE, MICAdd = 0;

	unsigned char	BufferFilled = false, MICAdd = 0;





	if (pMds->TxPause)
@@ -87,7 +87,7 @@ Mds_Tx(struct wb35_adapter * adapter) 
			//

			// Start transmitting

			//

			BufferFilled = TRUE;

			BufferFilled = true;



			/* Leaves first u8 intact */

			memset((u8 *)pTxDes + 1, 0, sizeof(DESCRIPTOR) - 1);
@@ -130,10 +130,10 @@ Mds_Tx(struct wb35_adapter * adapter) 
#ifdef _IBSS_BEACON_SEQ_STICK_

			if ((XmitBufAddress[ DOT_11_DA_OFFSET+8 ] & 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) // +8 for USB hdr

#endif

				pMds->TxToggle = TRUE;

				pMds->TxToggle = true;



			// 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

			pMds->TxTsc++;
@@ -141,7 +141,7 @@ Mds_Tx(struct wb35_adapter * adapter) 
				pMds->TxTsc_2++;



			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

		if (BufferFilled) {
@@ -156,14 +156,14 @@ Mds_Tx(struct wb35_adapter * adapter) 


			pMds->TxFillIndex++;

			pMds->TxFillIndex %= MAX_USB_TX_BUFFER_NUMBER;

			BufferFilled = FALSE;

			BufferFilled = false;

		} else

			break;



		if (!PacketSize) // No more pk for transmitting

			break;



	} while(TRUE);

	} while(true);



	//

	// Start to send by lower module
@@ -181,7 +181,7 @@ Mds_SendComplete(struct wb35_adapter * adapter, PT02_DESCRIPTOR pT02) 
	PMDS	pMds = &adapter->Mds;

	phw_data_t	pHwData = &adapter->sHwData;

	u8	PacketId = (u8)pT02->T02_Tx_PktID;

	unsigned char	SendOK = TRUE;

	unsigned char	SendOK = true;

	u8	RetryCount, TxRate;



	if (pT02->T02_IgnoreResult) // Don't care the result
@@ -192,7 +192,7 @@ Mds_SendComplete(struct wb35_adapter * adapter, PT02_DESCRIPTOR pT02) 
		TxRate = pMds->TxRate[ PacketId ][ 0 ];

		RetryCount = (u8)pT02->T02_MPDU_Cnt;

		if (pT02->value & FLAG_ERROR_TX_MASK) {

			SendOK = FALSE;

			SendOK = false;



			if (pT02->T02_transmit_abort || pT02->T02_out_of_MaxTxMSDULiftTime) {

				//retry error
@@ -435,11 +435,10 @@ Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer 
	PT01_DESCRIPTOR	pT01;

	u16	Duration, NextBodyLen, OffsetSize;

	u8	Rate, i;

	unsigned char	CTS_on = FALSE, RTS_on = FALSE;

	unsigned char	CTS_on = false, RTS_on = false;

	PT00_DESCRIPTOR pNextT00;

	u16 BodyLen = 0;

	unsigned char boGroupAddr = FALSE;



	unsigned char boGroupAddr = false;



	OffsetSize = pDes->FragmentThreshold + 32 + 3;

	OffsetSize &= ~0x03;
@@ -452,7 +451,7 @@ Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer 
	pNextT00 = (PT00_DESCRIPTOR)(buffer+OffsetSize);



	if( buffer[ DOT_11_DA_OFFSET+8 ] & 0x1 ) // +8 for USB hdr

		boGroupAddr = TRUE;

		boGroupAddr = true;



	//========================================

	// Set RTS/CTS mechanism
@@ -467,13 +466,13 @@ Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer 
		BodyLen += 4;	//CRC



		if( BodyLen >= CURRENT_RTS_THRESHOLD )

			RTS_on = TRUE; // Using RTS

			RTS_on = true; // Using RTS

		else

		{

			if( pT01->T01_modulation_type ) // Is using OFDM

			{

				if( CURRENT_PROTECT_MECHANISM ) // Is using protect

					CTS_on = TRUE; // Using CTS

					CTS_on = true; // Using CTS

			}

		}

	}