Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: w35und: remove timer wrappers 



This patch removes the OS_TIMER and related wrappers from driver code. The
patch also changes the code to use msecs_to_jiffies() for setting up
timer->expires.

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

drivers/staging/winbond/bssdscpt.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ typedef struct BSSDescriptionElement 
	u16		wIndex;			// THIS BSS element entry index



	void*	psadapter;		// pointer to THIS adapter

	OS_TIMER	nTimer;  // MLME timer

	struct timer_list timer;  // MLME timer



    // Authentication

    u16		wAuthAlgo;      // peer MAC MLME use Auth algorithm, default OPEN_AUTH

drivers/staging/winbond/linux/common.h

+0 −19
Original line number Diff line number Diff line
@@ -84,24 +84,5 @@ 
#define OS_MEMORY_CLEAR( _A, _S )	memset( (u8 *)_A,0,_S)

#define OS_MEMORY_COMPARE( _A, _B, _S )	(memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different



#define OS_TIMER	struct timer_list

#define OS_TIMER_INITIAL( _T, _F, _P )			\

{							\

	init_timer( _T );				\

	(_T)->function = (void *)_F##_1a;		\

	(_T)->data = (unsigned long)_P;			\

}



// _S : Millisecond

// 20060420 At least 1 large than jiffies

#define OS_TIMER_SET( _T, _S )					\

{								\

	(_T)->expires = jiffies + ((_S*HZ+999)/1000);\

	add_timer( _T );					\

}

#define OS_TIMER_CANCEL( _T, _B )		del_timer_sync( _T )

#define OS_TIMER_GET_SYS_TIME( _T )		(*_T=jiffies)





#endif // COMMON_DEF

drivers/staging/winbond/mds_f.h

+0 −6
Original line number Diff line number Diff line
@@ -12,13 +12,7 @@ extern void DataDmp(u8 *pdata, u32 len, u32 offset); 


void vRxTimerInit(struct wb35_adapter *adapter);

void vRxTimerStart(struct wb35_adapter *adapter, int timeout_value);

void RxTimerHandler_1a( struct wb35_adapter *adapter);

void vRxTimerStop(struct wb35_adapter *adapter);

void RxTimerHandler( void*			SystemSpecific1,

					   struct wb35_adapter * 	adapter,

					   void*			SystemSpecific2,

					   void*			SystemSpecific3);





// For Asynchronous indicating. The routine collocates with USB.

void Mds_MsduProcess(  struct wb35_adapter *adapter,  PRXLAYER1 pRxLayer1,  u8 SlotIndex);

drivers/staging/winbond/mds_s.h

+1 −2
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ typedef struct _MDS 
	u8		boCounterMeasureBlock;

	u8		reserved_4[2];



	//NDIS_MINIPORT_TIMER	nTimer;

	OS_TIMER	nTimer;

	struct timer_list timer;



	u32	TxTsc; // 20060214

	u32	TxTsc_2; // 20060214

drivers/staging/winbond/rxisr.c

+13 −16
Original line number Diff line number Diff line 
#include "os_common.h"



static void RxTimerHandler(unsigned long data)

{

	WARN_ON(1);

}



void vRxTimerInit(struct wb35_adapter *adapter)

{

	OS_TIMER_INITIAL(&(adapter->Mds.nTimer), (void*) RxTimerHandler, (void*) adapter);

	init_timer(&adapter->Mds.timer);

	adapter->Mds.timer.function = RxTimerHandler;

	adapter->Mds.timer.data = (unsigned long) adapter;

}



void vRxTimerStart(struct wb35_adapter *adapter, int timeout_value)
@@ -10,21 +17,11 @@ void vRxTimerStart(struct wb35_adapter * adapter, int timeout_value) 
	if (timeout_value < MIN_TIMEOUT_VAL)

		timeout_value = MIN_TIMEOUT_VAL;



	OS_TIMER_SET( &(adapter->Mds.nTimer), timeout_value );

	adapter->Mds.timer.expires = jiffies + msecs_to_jiffies(timeout_value);

	add_timer(&adapter->Mds.timer);

}



void vRxTimerStop(struct wb35_adapter *adapter)

{

	OS_TIMER_CANCEL( &(adapter->Mds.nTimer), 0 );

}



void RxTimerHandler_1a( struct wb35_adapter * adapter)

{

	RxTimerHandler(NULL, adapter, NULL, NULL);

}



void RxTimerHandler(void* SystemSpecific1, struct wb35_adapter * adapter,

		    void* SystemSpecific2, void* SystemSpecific3)

{

	WARN_ON(1);

	del_timer_sync(&adapter->Mds.timer);

}