UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: w35und: merge rest of wbhal.c to phy_calibration.c 

Impact: cleanup

The remaining functions are local to phy_calibration.c so move them
there and remove wbhal.c.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2009-04-08 11:51:22 +03:00 committed by Greg Kroah-Hartman
parent 40abfccbc7
commit dd68e1b4ff
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/winbond/Makefile
View File

@ -7,7 +7,6 @@ w35und-objs := \
wb35reg.o \
wb35rx.o \
wb35tx.o \
wbhal.o \
wbusb.o \

19
drivers/staging/winbond/phy_calibration.c
View File

@ -340,6 +340,25 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos)
}
}
static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)
{
if (number < 0x1000)
number += 0x1000;
return Wb35Reg_ReadSync(pHwData, number, pValue);
}
#define hw_get_dxx_reg( _A, _B, _C ) hal_get_dxx_reg( _A, _B, (u32 *)_C )
static unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)
{
unsigned char ret;
if (number < 0x1000)
number += 0x1000;
ret = Wb35Reg_WriteSync(pHwData, number, value);
return ret;
}
#define hw_set_dxx_reg( _A, _B, _C ) hal_set_dxx_reg( _A, _B, (u32)_C )
void _reset_rx_cal(struct hw_data *phw_data)
{

20
drivers/staging/winbond/wbhal.c
View File

@ -1,20 +0,0 @@
#include "sysdef.h"
#include "wbhal_f.h"
#include "wblinux_f.h"
unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)
{
if (number < 0x1000)
number += 0x1000;
return Wb35Reg_ReadSync(pHwData, number, pValue);
}
unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)
{
unsigned char ret;
if (number < 0x1000)
number += 0x1000;
ret = Wb35Reg_WriteSync(pHwData, number, value);
return ret;
}

4
drivers/staging/winbond/wbhal_f.h
View File

@ -52,8 +52,6 @@ u32 hal_get_bss_pk_cnt( struct hw_data * pHwData );
#define PHY_DEBUG( msg, args... )
unsigned char hal_get_dxx_reg( struct hw_data * pHwData, u16 number, u32 * pValue );
unsigned char hal_set_dxx_reg( struct hw_data * pHwData, u16 number, u32 value );
#define hal_get_time_count( _P ) (_P->time_count/10) // return 100ms count
#define hal_detect_error( _P ) (_P->WbUsb.DetectCount)
@ -68,7 +66,5 @@ unsigned char hal_set_dxx_reg( struct hw_data * pHwData, u16 number, u32 valu
#define hal_join_request_stop(_A)
#define hw_get_cxx_reg( _A, _B, _C )
#define hw_set_cxx_reg( _A, _B, _C )
#define hw_get_dxx_reg( _A, _B, _C ) hal_get_dxx_reg( _A, _B, (u32 *)_C )
#define hw_set_dxx_reg( _A, _B, _C ) hal_set_dxx_reg( _A, _B, (u32)_C )