Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 126575
b: refs/heads/master
c: 1e8a2b6
h: refs/heads/master
i:
  126573: dc44752
  126571: 671d947
  126567: 07dea45
  126559: b43ab87
v: v3
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 3a225e2 commit bc847b0
Show file tree
Hide file tree
Showing 19 changed files with 184 additions and 205 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: ac418b8faaaad7a17474c8fba5c2e5917c91cf31
refs/heads/master: 1e8a2b60339a050f4fd383e332a5dd66b75f4f02
44 changes: 0 additions & 44 deletions trunk/drivers/staging/winbond/adapter.h
View file

This file was deleted.

70 changes: 35 additions & 35 deletions trunk/drivers/staging/winbond/bss_f.h
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
#ifndef __WINBOND_BSS_F_H
#define __WINBOND_BSS_F_H

#include "adapter.h"
#include "core.h"

struct PMKID_Information_Element;

//
// BSS descriptor DataBase management global function
//

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

void CreateWpaIE(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
void CreateWpaIE(struct wbsoft_priv * 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(struct wb35_adapter * adapter, u16* iFildOffset, u8 *msg, struct Management_Frame* msgHeader,
void CreateRsnIE(struct wbsoft_priv * 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(struct wb35_adapter * adapter, struct Management_Frame* msgHeader,
u16 SearchPmkid(struct wbsoft_priv * adapter, struct Management_Frame* msgHeader,
struct PMKID_Information_Element * AssoReq_PMKID );
#endif

Expand Down
38 changes: 36 additions & 2 deletions trunk/drivers/staging/winbond/core.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,44 @@
#ifndef __WINBOND_CORE_H
#define __WINBOND_CORE_H

#include "adapter.h"
#include <linux/wireless.h>

#include "bssdscpt.h"
#include "mto.h"
#include "wbhal_s.h"

#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)

#define WB_MAX_LINK_NAME_LEN 40

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

WB_LOCALDESCRIPT sLocalPara; // Myself connected parameters
PWB_BSSDESCRIPTION asBSSDescriptElement;

MLME_FRAME sMlmeFrame; // connect to peerSTA parameters

MTO_PARAMETERS sMtoPara; // MTO_struct ...
hw_data_t sHwData; //For HAL
MDS Mds;

spinlock_t SpinLock;
u32 shutdown;

atomic_t ThreadCount;

u32 RxByteCount;
u32 TxByteCount;

struct sk_buff *skb_array[WBLINUX_PACKET_ARRAY_SIZE];
struct sk_buff *packet_return;
s32 skb_SetIndex;
s32 skb_GetIndex;
s32 netif_state_stop; // 1: stop 0: normal
struct iw_statistics iw_stats;

u8 LinkName[WB_MAX_LINK_NAME_LEN];
};

#endif /* __WINBOND_CORE_H */
16 changes: 8 additions & 8 deletions trunk/drivers/staging/winbond/mds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "wblinux_f.h"

void
Mds_reset_descriptor(struct wb35_adapter * adapter)
Mds_reset_descriptor(struct wbsoft_priv * adapter)
{
PMDS pMds = &adapter->Mds;

Expand All @@ -21,7 +21,7 @@ Mds_reset_descriptor(struct wb35_adapter * adapter)
}

unsigned char
Mds_initial(struct wb35_adapter * adapter)
Mds_initial(struct wbsoft_priv * adapter)
{
PMDS pMds = &adapter->Mds;

Expand All @@ -35,13 +35,13 @@ Mds_initial(struct wb35_adapter * adapter)
}

void
Mds_Destroy(struct wb35_adapter * adapter)
Mds_Destroy(struct wbsoft_priv * adapter)
{
vRxTimerStop(adapter);
}

void
Mds_Tx(struct wb35_adapter * adapter)
Mds_Tx(struct wbsoft_priv * adapter)
{
phw_data_t pHwData = &adapter->sHwData;
PMDS pMds = &adapter->Mds;
Expand Down Expand Up @@ -183,7 +183,7 @@ Mds_Tx(struct wb35_adapter * adapter)
}

void
Mds_SendComplete(struct wb35_adapter * adapter, PT02_DESCRIPTOR pT02)
Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
{
PMDS pMds = &adapter->Mds;
phw_data_t pHwData = &adapter->sHwData;
Expand Down Expand Up @@ -236,7 +236,7 @@ Mds_SendComplete(struct wb35_adapter * adapter, PT02_DESCRIPTOR pT02)
}

void
Mds_HeaderCopy(struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer)
Mds_HeaderCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer)
{
PMDS pMds = &adapter->Mds;
u8 *src_buffer = pDes->buffer_address[0];//931130.5.g
Expand Down Expand Up @@ -333,7 +333,7 @@ Mds_HeaderCopy(struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer

// The function return the 4n size of usb pk
u16
Mds_BodyCopy(struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer)
Mds_BodyCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer)
{
PT00_DESCRIPTOR pT00;
PMDS pMds = &adapter->Mds;
Expand Down Expand Up @@ -436,7 +436,7 @@ Mds_BodyCopy(struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer)


void
Mds_DurationSet( struct wb35_adapter * adapter, PDESCRIPTOR pDes, u8 *buffer )
Mds_DurationSet( struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *buffer )
{
PT00_DESCRIPTOR pT00;
PT01_DESCRIPTOR pT01;
Expand Down
36 changes: 18 additions & 18 deletions trunk/drivers/staging/winbond/mds_f.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
#define __WINBOND_MDS_F_H

#include "wbhal_s.h"
#include "adapter.h"
#include "core.h"

unsigned char Mds_initial( struct wb35_adapter *adapter );
void Mds_Destroy( struct wb35_adapter *adapter );
void Mds_Tx( struct wb35_adapter *adapter );
void Mds_HeaderCopy( struct wb35_adapter *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
u16 Mds_BodyCopy( struct wb35_adapter *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
void Mds_DurationSet( struct wb35_adapter *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
void Mds_SendComplete( struct wb35_adapter *adapter, PT02_DESCRIPTOR pT02 );
void Mds_MpduProcess( struct wb35_adapter *adapter, PDESCRIPTOR pRxDes );
void Mds_reset_descriptor( struct wb35_adapter *adapter );
unsigned char Mds_initial( struct wbsoft_priv *adapter );
void Mds_Destroy( struct wbsoft_priv *adapter );
void Mds_Tx( struct wbsoft_priv *adapter );
void Mds_HeaderCopy( struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
u16 Mds_BodyCopy( struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
void Mds_DurationSet( struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer );
void Mds_SendComplete( struct wbsoft_priv *adapter, PT02_DESCRIPTOR pT02 );
void Mds_MpduProcess( struct wbsoft_priv *adapter, PDESCRIPTOR pRxDes );
void Mds_reset_descriptor( struct wbsoft_priv *adapter );
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 vRxTimerStop(struct wb35_adapter *adapter);
void vRxTimerInit(struct wbsoft_priv *adapter);
void vRxTimerStart(struct wbsoft_priv *adapter, int timeout_value);
void vRxTimerStop(struct wbsoft_priv *adapter);

// For Asynchronous indicating. The routine collocates with USB.
void Mds_MsduProcess( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1, u8 SlotIndex);
void Mds_MsduProcess( struct wbsoft_priv *adapter, PRXLAYER1 pRxLayer1, u8 SlotIndex);

// For data frame sending 20060802
u16 MDS_GetPacketSize( struct wb35_adapter *adapter );
void MDS_GetNextPacket( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void MDS_GetNextPacketComplete( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK );
u16 MDS_GetPacketSize( struct wbsoft_priv *adapter );
void MDS_GetNextPacket( struct wbsoft_priv *adapter, PDESCRIPTOR pDes );
void MDS_GetNextPacketComplete( struct wbsoft_priv *adapter, PDESCRIPTOR pDes );
void MDS_SendResult( struct wbsoft_priv *adapter, u8 PacketId, unsigned char SendOK );

#endif
12 changes: 6 additions & 6 deletions trunk/drivers/staging/winbond/mlmetxrx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "mds_f.h"

void MLMEResetTxRx(struct wb35_adapter * adapter)
void MLMEResetTxRx(struct wbsoft_priv * adapter)
{
s32 i;

Expand Down Expand Up @@ -55,7 +55,7 @@ void MLMEResetTxRx(struct wb35_adapter * adapter)
//=============================================================================

/* FIXME: Should this just be replaced with kmalloc() and kfree()? */
u8 *MLMEGetMMPDUBuffer(struct wb35_adapter * adapter)
u8 *MLMEGetMMPDUBuffer(struct wbsoft_priv * adapter)
{
s32 i;
u8 *returnVal;
Expand All @@ -73,7 +73,7 @@ u8 *MLMEGetMMPDUBuffer(struct wb35_adapter * adapter)
}

//=============================================================================
u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType)
u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
/* DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
FRAME_TYPE_802_11_DATA */
{
Expand All @@ -98,7 +98,7 @@ u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType
return true;
}

void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc)
void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR desc)
{
desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
Expand All @@ -109,7 +109,7 @@ void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc)
desc->Type = adapter->sMlmeFrame.DataType;
}

void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData)
void MLMEfreeMMPDUBuffer(struct wbsoft_priv * adapter, s8 *pData)
{
int i;

Expand All @@ -127,7 +127,7 @@ void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData)
}

void
MLME_SendComplete(struct wb35_adapter * adapter, u8 PacketID, unsigned char SendOK)
MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
{
MLME_TXCALLBACK TxCallback;

Expand Down
Loading

0 comments on commit bc847b0

Please sign in to comment.