Skip to content

Commit

Permalink
Staging: w35und: remove ->adapter from struct _HW_DATA_T
Browse files Browse the repository at this point in the history 
Eventually we want to pass a pointer to struct ieee80211_hw around in the
driver, so remove the bidirectional link between struct wb35_adapter and struct
_HW_DATA_T to simplify the code.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent cc18071 commit 42c84bb
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 48 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/winbond/mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Mds_Tx(struct wb35_adapter * adapter)
// Start to send by lower module
//
if (!pHwData->IsKeyPreSet)
Wb35Tx_start(pHwData);
Wb35Tx_start(adapter);

cleanup:
atomic_dec(&pMds->TxThreadCount);
Expand Down
38 changes: 21 additions & 17 deletions drivers/staging/winbond/wb35tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,24 @@ Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer)
return true;
}

void Wb35Tx_start(phw_data_t pHwData)
void Wb35Tx_start(struct wb35_adapter *adapter)
{
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;

// Allow only one thread to run into function
if (atomic_inc_return(&pWb35Tx->TxFireCounter) == 1) {
pWb35Tx->EP4vm_state = VM_RUNNING;
Wb35Tx(pHwData);
Wb35Tx(adapter);
} else
atomic_dec(&pWb35Tx->TxFireCounter);
}


void Wb35Tx(phw_data_t pHwData)
void Wb35Tx(struct wb35_adapter *adapter)
{
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
struct wb35_adapter *adapter = pHwData->adapter;
u8 *pTxBufferAddress;
PMDS pMds = &adapter->Mds;
struct urb * pUrb = (struct urb *)pWb35Tx->Tx4Urb;
Expand All @@ -65,7 +66,7 @@ void Wb35Tx(phw_data_t pHwData)
usb_fill_bulk_urb(pUrb, pHwData->WbUsb.udev,
usb_sndbulkpipe(pHwData->WbUsb.udev, 4),
pTxBufferAddress, pMds->TxBufferSize[ SendIndex ],
Wb35Tx_complete, pHwData);
Wb35Tx_complete, adapter);

pWb35Tx->EP4vm_state = VM_RUNNING;
retv = usb_submit_urb(pUrb, GFP_ATOMIC);
Expand All @@ -77,7 +78,7 @@ void Wb35Tx(phw_data_t pHwData)
// Check if driver needs issue Irp for EP2
pWb35Tx->TxFillCount += pMds->TxCountInBuffer[SendIndex];
if (pWb35Tx->TxFillCount > 12)
Wb35Tx_EP2VM_start( pHwData );
Wb35Tx_EP2VM_start(adapter);

pWb35Tx->ByteTransfer += pMds->TxBufferSize[SendIndex];
return;
Expand All @@ -90,8 +91,8 @@ void Wb35Tx(phw_data_t pHwData)

void Wb35Tx_complete(struct urb * pUrb)
{
phw_data_t pHwData = pUrb->context;
struct wb35_adapter *adapter = pHwData->adapter;
struct wb35_adapter *adapter = pUrb->context;
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
PMDS pMds = &adapter->Mds;

Expand All @@ -117,7 +118,7 @@ void Wb35Tx_complete(struct urb * pUrb)
}

Mds_Tx(adapter);
Wb35Tx(pHwData);
Wb35Tx(adapter);
return;

error:
Expand Down Expand Up @@ -193,8 +194,9 @@ void Wb35Tx_destroy(phw_data_t pHwData)
#endif
}

void Wb35Tx_CurrentTime(phw_data_t pHwData, u32 TimeCount)
void Wb35Tx_CurrentTime(struct wb35_adapter *adapter, u32 TimeCount)
{
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
unsigned char Trigger = false;

Expand All @@ -205,26 +207,28 @@ void Wb35Tx_CurrentTime(phw_data_t pHwData, u32 TimeCount)

if (Trigger) {
pWb35Tx->TxTimer = TimeCount;
Wb35Tx_EP2VM_start( pHwData );
Wb35Tx_EP2VM_start(adapter);
}
}

void Wb35Tx_EP2VM_start(phw_data_t pHwData)
void Wb35Tx_EP2VM_start(struct wb35_adapter *adapter)
{
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;

// Allow only one thread to run into function
if (atomic_inc_return(&pWb35Tx->TxResultCount) == 1) {
pWb35Tx->EP2vm_state = VM_RUNNING;
Wb35Tx_EP2VM( pHwData );
Wb35Tx_EP2VM(adapter);
}
else
atomic_dec(&pWb35Tx->TxResultCount);
}


void Wb35Tx_EP2VM(phw_data_t pHwData)
void Wb35Tx_EP2VM(struct wb35_adapter *adapter)
{
phw_data_t pHwData = &adapter->sHwData;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
struct urb * pUrb = (struct urb *)pWb35Tx->Tx2Urb;
u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;
Expand All @@ -240,7 +244,7 @@ void Wb35Tx_EP2VM(phw_data_t pHwData)
// Issuing URB
//
usb_fill_int_urb( pUrb, pHwData->WbUsb.udev, usb_rcvintpipe(pHwData->WbUsb.udev,2),
pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, pHwData, 32);
pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, adapter, 32);

pWb35Tx->EP2vm_state = VM_RUNNING;
retv = usb_submit_urb(pUrb, GFP_ATOMIC);
Expand All @@ -261,9 +265,9 @@ void Wb35Tx_EP2VM(phw_data_t pHwData)

void Wb35Tx_EP2VM_complete(struct urb * pUrb)
{
phw_data_t pHwData = pUrb->context;
struct wb35_adapter *adapter = pUrb->context;
phw_data_t pHwData = &adapter->sHwData;
T02_DESCRIPTOR T02, TSTATUS;
struct wb35_adapter *adapter = pHwData->adapter;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;
u32 i;
Expand Down
11 changes: 6 additions & 5 deletions drivers/staging/winbond/wb35tx_f.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef __WINBOND_WB35TX_F_H
#define __WINBOND_WB35TX_F_H

#include "adapter.h"
#include "wbhal_f.h"

//====================================
Expand All @@ -10,16 +11,16 @@ unsigned char Wb35Tx_initial( phw_data_t pHwData );
void Wb35Tx_destroy( phw_data_t pHwData );
unsigned char Wb35Tx_get_tx_buffer( phw_data_t pHwData, u8 **pBuffer );

void Wb35Tx_EP2VM( phw_data_t pHwData );
void Wb35Tx_EP2VM_start( phw_data_t pHwData );
void Wb35Tx_EP2VM(struct wb35_adapter *adapter);
void Wb35Tx_EP2VM_start(struct wb35_adapter *adapter);
void Wb35Tx_EP2VM_complete(struct urb *urb);

void Wb35Tx_start( phw_data_t pHwData );
void Wb35Tx_start(struct wb35_adapter *adapter);
void Wb35Tx_stop( phw_data_t pHwData );
void Wb35Tx( phw_data_t pHwData );
void Wb35Tx(struct wb35_adapter *adapter);
void Wb35Tx_complete(struct urb *urb);
void Wb35Tx_reset_descriptor( phw_data_t pHwData );

void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount );
void Wb35Tx_CurrentTime(struct wb35_adapter *adapter, u32 TimeCount);

#endif
24 changes: 12 additions & 12 deletions drivers/staging/winbond/wbhal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void hal_get_permanent_address( phw_data_t pHwData, u8 *pethernet_address )

static void hal_led_control(unsigned long data)
{
phw_data_t pHwData = (phw_data_t) data;
struct wb35_adapter * adapter = pHwData->adapter;
struct wb35_adapter *adapter = (struct wb35_adapter *) data;
phw_data_t pHwData = &adapter->sHwData;
struct wb35_reg *reg = &pHwData->reg;
u32 LEDSet = (pHwData->SoftwareSet & HAL_LED_SET_MASK) >> HAL_LED_SET_SHIFT;
u8 LEDgray[20] = { 0,3,4,6,8,10,11,12,13,14,15,14,13,12,11,10,8,6,4,2 };
Expand Down Expand Up @@ -310,7 +310,7 @@ static void hal_led_control(unsigned long data)
}

pHwData->time_count += TimeInterval;
Wb35Tx_CurrentTime( pHwData, pHwData->time_count ); // 20060928 add
Wb35Tx_CurrentTime(adapter, pHwData->time_count); // 20060928 add
pHwData->LEDTimer.expires = jiffies + msecs_to_jiffies(TimeInterval);
add_timer(&pHwData->LEDTimer);
}
Expand All @@ -319,7 +319,6 @@ static void hal_led_control(unsigned long data)
u8 hal_init_hardware(phw_data_t pHwData, struct wb35_adapter * adapter)
{
u16 SoftwareSet;
pHwData->adapter = adapter;

// Initial the variable
pHwData->MaxReceiveLifeTime = DEFAULT_MSDU_LIFE_TIME; // Setting Rx maximum MSDU life time
Expand All @@ -334,7 +333,7 @@ u8 hal_init_hardware(phw_data_t pHwData, struct wb35_adapter * adapter)
pHwData->InitialResource = 4;
init_timer(&pHwData->LEDTimer);
pHwData->LEDTimer.function = hal_led_control;
pHwData->LEDTimer.data = (unsigned long) pHwData;
pHwData->LEDTimer.data = (unsigned long) adapter;
pHwData->LEDTimer.expires = jiffies + msecs_to_jiffies(1000);
add_timer(&pHwData->LEDTimer);

Expand All @@ -351,7 +350,7 @@ u8 hal_init_hardware(phw_data_t pHwData, struct wb35_adapter * adapter)
#endif

Wb35Rx_start( pHwData );
Wb35Tx_EP2VM_start( pHwData );
Wb35Tx_EP2VM_start(adapter);

return true;
}
Expand Down Expand Up @@ -672,13 +671,13 @@ s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count )
return ltmp;
}
//----------------------------------------------------------------------------------------------------
s32 hal_get_rssi_bss( phw_data_t pHwData, u16 idx, u8 Count )
s32 hal_get_rssi_bss(struct wb35_adapter *adapter, u16 idx, u8 Count)
{
phw_data_t pHwData = &adapter->sHwData;
struct wb35_reg *reg = &pHwData->reg;
R01_DESCRIPTOR r01;
s32 ltmp = 0, tmp;
u8 i, j;
struct wb35_adapter * adapter = pHwData->adapter;
// u32 *HalRssiArry = psBSS(idx)->HalRssi;

if( pHwData->SurpriseRemove ) return -200;
Expand Down Expand Up @@ -842,9 +841,10 @@ void hal_system_power_change(phw_data_t pHwData, u32 PowerState)
}
}

void hal_surprise_remove( phw_data_t pHwData )
void hal_surprise_remove(struct wb35_adapter *adapter)
{
struct wb35_adapter * adapter = pHwData->adapter;
phw_data_t pHwData = &adapter->sHwData;

if (atomic_inc_return( &pHwData->SurpriseRemoveCount ) == 1) {
#ifdef _PE_STATE_DUMP_
WBDEBUG(("Calling hal_surprise_remove\n"));
Expand All @@ -853,9 +853,9 @@ void hal_surprise_remove( phw_data_t pHwData )
}
}

void hal_rate_change( phw_data_t pHwData ) // Notify the HAL rate is changing 20060613.1
void hal_rate_change(struct wb35_adapter *adapter) // Notify the HAL rate is changing 20060613.1
{
struct wb35_adapter * adapter = pHwData->adapter;
phw_data_t pHwData = &adapter->sHwData;
u8 rate = CURRENT_TX_RATE;

BBProcessor_RateChanging( pHwData, rate );
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/winbond/wbhal_f.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void hal_set_cwmax( phw_data_t pHwData, u16 cwin_max );
void hal_set_rsn_wpa( phw_data_t pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode);
//s32 hal_get_rssi( phw_data_t pHwData, u32 HalRssi );
s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count );
s32 hal_get_rssi_bss( phw_data_t pHwData, u16 idx, u8 Count );
s32 hal_get_rssi_bss(struct wb35_adapter *adapter, u16 idx, u8 Count);
void hal_set_connect_info( phw_data_t pHwData, unsigned char boConnect );
u8 hal_get_est_sq3( phw_data_t pHwData, u8 Count );
void hal_set_rf_power( phw_data_t pHwData, u8 PowerIndex ); // 20060621 Modify
Expand All @@ -82,13 +82,13 @@ u8 hal_get_hw_radio_off ( phw_data_t pHwData );
#define hal_scan_interval( _A ) (_A->Scan_Interval)
void hal_scan_status_indicate( phw_data_t pHwData, u8 status); // 0: complete, 1: in progress
void hal_system_power_change( phw_data_t pHwData, u32 PowerState ); // 20051230 -=D0 1=D1 ..
void hal_surprise_remove( phw_data_t pHwData );
void hal_surprise_remove(struct wb35_adapter *adapter);

#define PHY_DEBUG( msg, args... )



void hal_rate_change( phw_data_t pHwData ); // Notify the HAL rate is changing 20060613.1
void hal_rate_change(struct wb35_adapter *adapter); // Notify the HAL rate is changing 20060613.1
unsigned char hal_get_dxx_reg( phw_data_t pHwData, u16 number, u32 * pValue );
unsigned char hal_set_dxx_reg( phw_data_t pHwData, u16 number, u32 value );
#define hal_get_time_count( _P ) (_P->time_count/10) // return 100ms count
Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/winbond/wbhal_s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,16 +449,6 @@ typedef struct _HW_DATA_T
u32 FragCount;
u32 DMAFix; //V1_DMA_FIX The variable can be removed if driver want to save mem space for V2.

//=======================================================================================
// For USB driver, hal need more variables. Due to
// 1. NDIS-WDM operation
// 2. The SME, MLME and OLD MDS need adapter structure, but the driver under HAL doesn't
// have that parameter when receiving and indicating packet.
// The MDS must input the adapter pointer as the second parameter of hal_init_hardware.
// The function usage is different than PCI driver.
//=======================================================================================
void* adapter;

//===============================================
// Definition for MAC address
//===============================================
Expand Down

0 comments on commit 42c84bb

Please sign in to comment.