kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: w35und: Merge mlmetxrx.c to mds.c

Browse source 
This patch merges mlmetxrx.c to mds.c because it's small and the functions are
only used in mto.c.

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2010-11-28 23:00:05 +02:00 committed by Greg Kroah-Hartman
parent 37b0544a4a
commit 01b5ceeca5
5 changed files with 38 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/winbond/Makefile
View file

@ -1,6 +1,5 @@
w35und-y := \ w35und-y := \
mds.o \ mds.o \
mlmetxrx.o \
mto.o \ mto.o \
phy_calibration.o \ phy_calibration.o \
reg.o \ reg.o \

39
drivers/staging/winbond/mds.c
View file

@ -1,5 +1,4 @@
#include "mds_f.h" #include "mds_f.h"
#include "mlmetxrx_f.h"
#include "mto.h" #include "mto.h"
#include "wbhal.h" #include "wbhal.h"
#include "wblinux_f.h" #include "wblinux_f.h"
@ -397,6 +396,44 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *
} }
static void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
{
desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU;
desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len;
desc->buffer_total_size += adapter->sMlmeFrame.len;
desc->buffer_number++;
desc->Type = adapter->sMlmeFrame.DataType;
}
static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
{
int i;
/* Reclaim the data buffer */
for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
break;
}
if (adapter->sMlmeFrame.TxMMPDUInUse[i])
adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
else {
/* Something wrong
PD43 Add debug code here??? */
}
}
static void MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
{
/* Reclaim the data buffer */
adapter->sMlmeFrame.len = 0;
MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
/* Return resource */
adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
}
void void
Mds_Tx(struct wbsoft_priv *adapter) Mds_Tx(struct wbsoft_priv *adapter)
{ {

60
drivers/staging/winbond/mlmetxrx.c
View file

@ -1,60 +0,0 @@
/* ============================================================================
Module Name:
MLMETxRx.C
Description:
The interface between MDS (MAC Data Service) and MLME.
Revision History:
--------------------------------------------------------------------------
200209 UN20 Jennifer Xu
Initial Release
20021108 PD43 Austin Liu
20030117 PD43 Austin Liu
Deleted MLMEReturnPacket and MLMEProcThread()
Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
============================================================================ */
#include "mds_f.h"
void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
{
desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU;
desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len;
desc->buffer_total_size += adapter->sMlmeFrame.len;
desc->buffer_number++;
desc->Type = adapter->sMlmeFrame.DataType;
}
static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
{
int i;
/* Reclaim the data buffer */
for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
break;
}
if (adapter->sMlmeFrame.TxMMPDUInUse[i])
adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
else {
/* Something wrong
PD43 Add debug code here??? */
}
}
void
MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
{
/* Reclaim the data buffer */
adapter->sMlmeFrame.len = 0;
MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
/* Return resource */
adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
}

19
drivers/staging/winbond/mlmetxrx_f.h
View file

@ -1,19 +0,0 @@
/* ================================================================
// MLMETxRx.H --
//
// Functions defined in MLMETxRx.c.
//
// Copyright (c) 2002 Winbond Electrics Corp. All Rights Reserved.
//================================================================ */
#ifndef _MLMETXRX_H
#define _MLMETXRX_H
#include "core.h"
void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes);
void
MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
unsigned char SendOK);
#endif

1
drivers/staging/winbond/wbusb.c
View file

@ -14,7 +14,6 @@
#include "core.h" #include "core.h"
#include "mds_f.h" #include "mds_f.h"
#include "mlmetxrx_f.h"
#include "mto.h" #include "mto.h"
#include "wbhal.h" #include "wbhal.h"
#include "wb35reg_f.h" #include "wb35reg_f.h"