Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 126551
b: refs/heads/master
c: 88ebc4b
h: refs/heads/master
i:
  126549: b17d2e6
  126547: fa537a9
  126543: 8d49a09
v: v3
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent cf1635a commit e163072
Show file tree
Hide file tree
Showing 29 changed files with 316 additions and 316 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65144de7989badce1782cc3319d9b8b2b5805acc
refs/heads/master: 88ebc4b950e344a8024ab46cccfb506a81f70634
10 changes: 5 additions & 5 deletions trunk/drivers/staging/winbond/adapter.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//
// ADAPTER.H -
// Windows NDIS global variable 'Adapter' typedef
// Windows NDIS global variable 'adapter' typedef
//
#define MAX_ANSI_STRING 40
typedef struct WB32_ADAPTER
{
u32 AdapterIndex; // 20060703.4 Add for using pAdapterContext global Adapter point

struct wb35_adapter {
u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point

WB_LOCALDESCRIPT sLocalPara; // Myself connected parameters
PWB_BSSDESCRIPTION asBSSDescriptElement;
Expand All @@ -20,4 +20,4 @@ typedef struct WB32_ADAPTER
struct iw_statistics iw_stats;

u8 LinkName[MAX_ANSI_STRING];
} WB32_ADAPTER, ADAPTER, *PWB32_ADAPTER, *PADAPTER;
};
68 changes: 34 additions & 34 deletions trunk/drivers/staging/winbond/bss_f.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,54 @@
// BSS descriptor DataBase management global function
//

void vBSSdescriptionInit(PWB32_ADAPTER Adapter);
void vBSSfoundList(PWB32_ADAPTER Adapter);
u8 boChanFilter(PWB32_ADAPTER Adapter, u8 ChanNo);
u16 wBSSallocateEntry(PWB32_ADAPTER Adapter);
u16 wBSSGetEntry(PWB32_ADAPTER Adapter);
void vSimpleHouseKeeping(PWB32_ADAPTER Adapter);
u16 wBSShouseKeeping(PWB32_ADAPTER Adapter);
void ClearBSSdescpt(PWB32_ADAPTER Adapter, u16 i);
u16 wBSSfindBssID(PWB32_ADAPTER Adapter, u8 *pbBssid);
u16 wBSSfindDedicateCandidate(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid, u8 *pbBssid);
u16 wBSSfindMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr);
u16 wBSSsearchMACaddr(PWB32_ADAPTER Adapter, u8 *pbMacAddr, u8 band);
u16 wBSSaddScanData(PWB32_ADAPTER, u16, psRXDATA);
u16 wBSSUpdateScanData(PWB32_ADAPTER Adapter, u16 wBssIdx, psRXDATA psRcvData);
u16 wBSScreateIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);
void DesiredRate2BSSdescriptor(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData,
void vBSSdescriptionInit(struct wb35_adapter * adapter);
void vBSSfoundList(struct wb35_adapter * adapter);
u8 boChanFilter(struct wb35_adapter * adapter, u8 ChanNo);
u16 wBSSallocateEntry(struct wb35_adapter * adapter);
u16 wBSSGetEntry(struct wb35_adapter * adapter);
void vSimpleHouseKeeping(struct wb35_adapter * adapter);
u16 wBSShouseKeeping(struct wb35_adapter * adapter);
void ClearBSSdescpt(struct wb35_adapter * adapter, u16 i);
u16 wBSSfindBssID(struct wb35_adapter * adapter, u8 *pbBssid);
u16 wBSSfindDedicateCandidate(struct wb35_adapter * adapter, struct SSID_Element *psSsid, u8 *pbBssid);
u16 wBSSfindMACaddr(struct wb35_adapter * adapter, u8 *pbMacAddr);
u16 wBSSsearchMACaddr(struct wb35_adapter * adapter, u8 *pbMacAddr, u8 band);
u16 wBSSaddScanData(struct wb35_adapter *, u16, psRXDATA);
u16 wBSSUpdateScanData(struct wb35_adapter * adapter, u16 wBssIdx, psRXDATA psRcvData);
u16 wBSScreateIBSSdata(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData);
void DesiredRate2BSSdescriptor(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData,
u8 *pBasicRateSet, u8 BasicRateCount,
u8 *pOperationRateSet, u8 OperationRateCount);
void DesiredRate2InfoElement(PWB32_ADAPTER Adapter, u8 *addr, u16 *iFildOffset,
void DesiredRate2InfoElement(struct wb35_adapter * adapter, u8 *addr, u16 *iFildOffset,
u8 *pBasicRateSet, u8 BasicRateCount,
u8 *pOperationRateSet, u8 OperationRateCount);
void BSSAddIBSSdata(PWB32_ADAPTER Adapter, PWB_BSSDESCRIPTION psDesData);
void BSSAddIBSSdata(struct wb35_adapter * adapter, PWB_BSSDESCRIPTION psDesData);
unsigned char boCmpMacAddr( u8 *, u8 *);
unsigned char boCmpSSID(struct SSID_Element *psSSID1, struct SSID_Element *psSSID2);
u16 wBSSfindSSID(PWB32_ADAPTER Adapter, struct SSID_Element *psSsid);
u16 wRoamingQuery(PWB32_ADAPTER Adapter);
void vRateToBitmap(PWB32_ADAPTER Adapter, u16 index);
u8 bRateToBitmapIndex(PWB32_ADAPTER Adapter, u8 bRate);
u16 wBSSfindSSID(struct wb35_adapter * adapter, struct SSID_Element *psSsid);
u16 wRoamingQuery(struct wb35_adapter * adapter);
void vRateToBitmap(struct wb35_adapter * adapter, u16 index);
u8 bRateToBitmapIndex(struct wb35_adapter * adapter, u8 bRate);
u8 bBitmapToRate(u8 i);
unsigned char boIsERPsta(PWB32_ADAPTER Adapter, u16 i);
unsigned char boCheckConnect(PWB32_ADAPTER Adapter);
unsigned char boCheckSignal(PWB32_ADAPTER Adapter);
void AddIBSSIe(PWB32_ADAPTER Adapter,PWB_BSSDESCRIPTION psDesData );//added by ws for WPA_None06/01/04
void BssScanUpToDate(PWB32_ADAPTER Adapter);
void BssUpToDate(PWB32_ADAPTER Adapter);
unsigned char boIsERPsta(struct wb35_adapter * adapter, u16 i);
unsigned char boCheckConnect(struct wb35_adapter * adapter);
unsigned char boCheckSignal(struct wb35_adapter * adapter);
void AddIBSSIe(struct wb35_adapter * adapter,PWB_BSSDESCRIPTION psDesData );//added by ws for WPA_None06/01/04
void BssScanUpToDate(struct wb35_adapter * adapter);
void BssUpToDate(struct wb35_adapter * adapter);
void RateSort(u8 *RateArray, u8 num, u8 mode);
void RateReSortForSRate(PWB32_ADAPTER Adapter, u8 *RateArray, u8 num);
void Assemble_IE(PWB32_ADAPTER Adapter, u16 wBssIdx);
void SetMaxTxRate(PWB32_ADAPTER Adapter);
void RateReSortForSRate(struct wb35_adapter * adapter, u8 *RateArray, u8 num);
void Assemble_IE(struct wb35_adapter * adapter, u16 wBssIdx);
void SetMaxTxRate(struct wb35_adapter * adapter);

void CreateWpaIE(PWB32_ADAPTER Adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
void CreateWpaIE(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
struct Association_Request_Frame_Body* msgBody, u16 iMSindex); //added by WS 05/14/05

#ifdef _WPA2_
void CreateRsnIE(PWB32_ADAPTER Adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
void CreateRsnIE(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
struct Association_Request_Frame_Body* msgBody, u16 iMSindex);//added by WS 05/14/05

u16 SearchPmkid(PWB32_ADAPTER Adapter, struct Management_Frame* msgHeader,
u16 SearchPmkid(struct wb35_adapter * adapter, struct Management_Frame* msgHeader,
struct PMKID_Information_Element * AssoReq_PMKID );
#endif

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/winbond/bssdscpt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ typedef struct BSSDescriptionElement
u16 wState; // the current state of the system
u16 wIndex; // THIS BSS element entry index

void* psAdapter; // pointer to THIS Adapter
void* psadapter; // pointer to THIS adapter
OS_TIMER nTimer; // MLME timer

// Authentication
Expand Down Expand Up @@ -148,9 +148,9 @@ typedef struct BSSDescriptionElement

} WB_BSSDESCRIPTION, *PWB_BSSDESCRIPTION;

#define wBSSConnectedSTA(Adapter) \
((u16)(Adapter)->sLocalPara.wConnectedSTAindex)
#define wBSSConnectedSTA(adapter) \
((u16)(adapter)->sLocalPara.wConnectedSTAindex)

#define psBSS(i) (&(Adapter->asBSSDescriptElement[(i)]))
#define psBSS(i) (&(adapter->asBSSDescriptElement[(i)]))


4 changes: 2 additions & 2 deletions trunk/drivers/staging/winbond/ds_tkip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ typedef struct tkip
} tkip_t;

//void _append_data( u8 *pData, u16 size, tkip_t *p );
void Mds_MicGet( void* Adapter, void* pRxLayer1, u8 *pKey, u8 *pMic );
void Mds_MicFill( void* Adapter, void* pDes, u8 *XmitBufAddress );
void Mds_MicGet( void* adapter, void* pRxLayer1, u8 *pKey, u8 *pMic );
void Mds_MicFill( void* adapter, void* pDes, u8 *XmitBufAddress );



8 changes: 4 additions & 4 deletions trunk/drivers/staging/winbond/linux/wb35reg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ Wb35Reg_EP0VM_start( phw_data_t pHwData )
{
struct wb35_reg *reg = &pHwData->reg;

if (OS_ATOMIC_INC( pHwData->Adapter, &reg->RegFireCount) == 1) {
if (OS_ATOMIC_INC( pHwData->adapter, &reg->RegFireCount) == 1) {
reg->EP0vm_state = VM_RUNNING;
Wb35Reg_EP0VM(pHwData);
} else
OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );
OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );
}

void
Expand Down Expand Up @@ -447,7 +447,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData )

cleanup:
reg->EP0vm_state = VM_STOP;
OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );
OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );
}


Expand All @@ -465,7 +465,7 @@ Wb35Reg_EP0VM_complete(struct urb *urb)

if (pHwData->SurpriseRemove) { // Let WbWlanHalt to handle surprise remove
reg->EP0vm_state = VM_STOP;
OS_ATOMIC_DEC( pHwData->Adapter, &reg->RegFireCount );
OS_ATOMIC_DEC( pHwData->adapter, &reg->RegFireCount );
} else {
// Complete to send, remove the URB from the first
spin_lock_irq( &reg->EP0VM_spin_lock );
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/winbond/linux/wb35rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ void Wb35Rx_start(phw_data_t pHwData)
PWB35RX pWb35Rx = &pHwData->Wb35Rx;

// Allow only one thread to run into the Wb35Rx() function
if (OS_ATOMIC_INC(pHwData->Adapter, &pWb35Rx->RxFireCounter) == 1) {
if (OS_ATOMIC_INC(pHwData->adapter, &pWb35Rx->RxFireCounter) == 1) {
pWb35Rx->EP3vm_state = VM_RUNNING;
Wb35Rx(pHwData);
} else
OS_ATOMIC_DEC(pHwData->Adapter, &pWb35Rx->RxFireCounter);
OS_ATOMIC_DEC(pHwData->adapter, &pWb35Rx->RxFireCounter);
}

// This function cannot reentrain
Expand Down Expand Up @@ -81,7 +81,7 @@ void Wb35Rx( phw_data_t pHwData )
error:
// VM stop
pWb35Rx->EP3vm_state = VM_STOP;
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Rx->RxFireCounter );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Rx->RxFireCounter );
}

void Wb35Rx_Complete(struct urb *urb)
Expand Down Expand Up @@ -156,7 +156,7 @@ void Wb35Rx_Complete(struct urb *urb)

error:
pWb35Rx->RxOwner[ RxBufferId ] = 1; // Set the owner to hardware
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Rx->RxFireCounter );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Rx->RxFireCounter );
pWb35Rx->EP3vm_state = VM_STOP;
}

Expand Down
30 changes: 15 additions & 15 deletions trunk/drivers/staging/winbond/linux/wb35tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ void Wb35Tx_start(phw_data_t pHwData)
PWB35TX pWb35Tx = &pHwData->Wb35Tx;

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


void Wb35Tx(phw_data_t pHwData)
{
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
PADAPTER Adapter = pHwData->Adapter;
struct wb35_adapter *adapter = pHwData->adapter;
u8 *pTxBufferAddress;
PMDS pMds = &Adapter->Mds;
PMDS pMds = &adapter->Mds;
struct urb * pUrb = (struct urb *)pWb35Tx->Tx4Urb;
int retv;
u32 SendIndex;
Expand Down Expand Up @@ -81,16 +81,16 @@ void Wb35Tx(phw_data_t pHwData)

cleanup:
pWb35Tx->EP4vm_state = VM_STOP;
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Tx->TxFireCounter );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Tx->TxFireCounter );
}


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

printk("wb35: tx complete\n");
// Variable setting
Expand All @@ -113,12 +113,12 @@ void Wb35Tx_complete(struct urb * pUrb)
goto error;
}

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

error:
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Tx->TxFireCounter );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Tx->TxFireCounter );
pWb35Tx->EP4vm_state = VM_STOP;
}

Expand Down Expand Up @@ -211,12 +211,12 @@ void Wb35Tx_EP2VM_start(phw_data_t pHwData)
PWB35TX pWb35Tx = &pHwData->Wb35Tx;

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


Expand Down Expand Up @@ -252,15 +252,15 @@ void Wb35Tx_EP2VM(phw_data_t pHwData)
return;
error:
pWb35Tx->EP2vm_state = VM_STOP;
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Tx->TxResultCount );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Tx->TxResultCount );
}


void Wb35Tx_EP2VM_complete(struct urb * pUrb)
{
phw_data_t pHwData = pUrb->context;
T02_DESCRIPTOR T02, TSTATUS;
PADAPTER Adapter = (PADAPTER)pHwData->Adapter;
struct wb35_adapter *adapter = pHwData->adapter;
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;
u32 i;
Expand Down Expand Up @@ -295,13 +295,13 @@ void Wb35Tx_EP2VM_complete(struct urb * pUrb)
T02.value |= ((cpu_to_le32(pltmp[i]) & 0xff) << 24);

TSTATUS.value = T02.value; //20061009 anson's endian
Mds_SendComplete( Adapter, &TSTATUS );
Mds_SendComplete( adapter, &TSTATUS );
T02.value = cpu_to_le32(pltmp[i]) >> 8;
}

return;
error:
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Tx->TxResultCount );
OS_ATOMIC_DEC( pHwData->adapter, &pWb35Tx->TxResultCount );
pWb35Tx->EP2vm_state = VM_STOP;
}

24 changes: 12 additions & 12 deletions trunk/drivers/staging/winbond/linux/wbusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static struct ieee80211_channel wbsoft_channels[] = {

int wbsoft_enabled;
struct ieee80211_hw *my_dev;
PADAPTER my_adapter;
struct wb35_adapter * my_adapter;

static int wbsoft_add_interface(struct ieee80211_hw *dev,
struct ieee80211_if_init_conf *conf)
Expand Down Expand Up @@ -187,7 +187,7 @@ struct wbsoft_priv {

static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table)
{
PADAPTER Adapter;
struct wb35_adapter *adapter;
PWBLINUX pWbLinux;
PWBUSB pWbUsb;
struct usb_host_interface *interface;
Expand All @@ -211,11 +211,11 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
if (ltmp) // Is already initialized?
goto error;

Adapter = kzalloc(sizeof(ADAPTER), GFP_KERNEL);
adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);

my_adapter = Adapter;
pWbLinux = &Adapter->WbLinux;
pWbUsb = &Adapter->sHwData.WbUsb;
my_adapter = adapter;
pWbLinux = &adapter->WbLinux;
pWbUsb = &adapter->sHwData.WbUsb;
pWbUsb->udev = udev;

interface = intf->cur_altsetting;
Expand All @@ -226,7 +226,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
pWbUsb->IsUsb20 = 1;
}

if (!WbWLanInitialize(Adapter)) {
if (!WbWLanInitialize(adapter)) {
printk("[w35und]WbWLanInitialize fail\n");
goto error;
}
Expand All @@ -248,7 +248,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id

SET_IEEE80211_DEV(dev, &udev->dev);
{
phw_data_t pHwData = &Adapter->sHwData;
phw_data_t pHwData = &adapter->sHwData;
unsigned char dev_addr[MAX_ADDR_LEN];
hal_get_permanent_address(pHwData, dev_addr);
SET_IEEE80211_PERM_ADDR(dev, dev_addr);
Expand Down Expand Up @@ -284,7 +284,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
BUG_ON(res);
}

usb_set_intfdata( intf, Adapter );
usb_set_intfdata( intf, adapter );

printk("[w35und] _probe OK\n");
return 0;
Expand Down Expand Up @@ -335,13 +335,13 @@ WbUsb_destroy(phw_data_t pHwData)
static void wb35_disconnect(struct usb_interface *intf)
{
PWBLINUX pWbLinux;
PADAPTER Adapter = usb_get_intfdata(intf);
struct wb35_adapter * adapter = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL);

pWbLinux = &Adapter->WbLinux;
pWbLinux = &adapter->WbLinux;

// Card remove
WbWlanHalt(Adapter);
WbWlanHalt(adapter);

}

Expand Down
Loading

0 comments on commit e163072

Please sign in to comment.