Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: rt2870: add eFuse support

Browse source 
rt3070:
* remove unused bEEPROMFile field from RTMP_ADAPTER

rt2870:
* propagate eFuse support from rt3070

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-08-23 15:31:54 +02:00 • committed by Greg Kroah-Hartman
parent 30d36c28d0
commit 5cc86f28ca
6 changed files with 9 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/rt2860/common/eeprom.c
View file

@ -291,8 +291,7 @@ VOID RTMP_EEPROM_WRITE16(
#endif #endif
} }
//2008/09/11:KH add to support efuse<-- #ifdef RT2870
#ifdef RT30xx
/* /*
======================================================================== ========================================================================
@ -1485,6 +1484,4 @@ NTSTATUS eFuseWriteRegistersFromBin(
return TRUE; return TRUE;
} }
#endif
#endif // RT30xx //
//2008/09/11:KH add to support efuse-->

10
drivers/staging/rt2860/common/rtmp_init.c
View file

@ -2186,10 +2186,8 @@ NDIS_STATUS NICInitializeAsic(
UINT32 MacCsr0 = 0; UINT32 MacCsr0 = 0;
NTSTATUS Status; NTSTATUS Status;
UCHAR Value = 0xff; UCHAR Value = 0xff;
#endif // RT2870 //
#ifdef RT30xx
UINT32 eFuseCtrl; UINT32 eFuseCtrl;
#endif // RT30xx // #endif
USHORT KeyIdx; USHORT KeyIdx;
INT i,apidx; INT i,apidx;
@ -2501,8 +2499,7 @@ NDIS_STATUS NICInitializeAsic(
Counter&=0xffffff00; Counter&=0xffffff00;
Counter|=0x000001e; Counter|=0x000001e;
RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter); RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);
#endif // RT2870 //
#ifdef RT30xx
pAd->bUseEfuse=FALSE; pAd->bUseEfuse=FALSE;
RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl); RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl);
pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0; pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0;
@ -2513,9 +2510,8 @@ NDIS_STATUS NICInitializeAsic(
else else
{ {
DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n")); DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));
} }
#endif // RT30xx // #endif
{ {
// for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT. // for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT.

7
drivers/staging/rt2860/rtmp.h
View file

@ -2938,12 +2938,9 @@ typedef struct _RTMP_ADAPTER
UINT8 PM_FlgSuspend; UINT8 PM_FlgSuspend;
#ifdef RT30xx #ifdef RT2870
//======efuse
BOOLEAN bUseEfuse; BOOLEAN bUseEfuse;
BOOLEAN bEEPROMFile; #endif
#endif // RT30xx //
} RTMP_ADAPTER, *PRTMP_ADAPTER; } RTMP_ADAPTER, *PRTMP_ADAPTER;
// //

6
drivers/staging/rt2860/sta_ioctl.c
View file

@ -229,13 +229,11 @@ static struct {
{"ForceGF", Set_ForceGF_Proc}, {"ForceGF", Set_ForceGF_Proc},
{"LongRetry", Set_LongRetryLimit_Proc}, {"LongRetry", Set_LongRetryLimit_Proc},
{"ShortRetry", Set_ShortRetryLimit_Proc}, {"ShortRetry", Set_ShortRetryLimit_Proc},
//2008/09/11:KH add to support efuse<-- #ifdef RT2870
#ifdef RT30xx
{"efuseFreeNumber", set_eFuseGetFreeBlockCount_Proc}, {"efuseFreeNumber", set_eFuseGetFreeBlockCount_Proc},
{"efuseDump", set_eFusedump_Proc}, {"efuseDump", set_eFusedump_Proc},
{"efuseLoadFromBin", set_eFuseLoadFromBin_Proc}, {"efuseLoadFromBin", set_eFuseLoadFromBin_Proc},
#endif // RT30xx // #endif
//2008/09/11:KH add to support efuse-->
{NULL,} {NULL,}
}; };

8
drivers/staging/rt2870/common/rtusb_io.c
View file

@ -803,13 +803,9 @@ NTSTATUS RTUSBReadEEPROM(
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
#ifdef RT30xx
if(pAd->bUseEfuse) if(pAd->bUseEfuse)
{
Status =eFuseRead(pAd, Offset, pData, length); Status =eFuseRead(pAd, Offset, pData, length);
}
else else
#endif // RT30xx //
{ {
Status = RTUSB_VendorRequest( Status = RTUSB_VendorRequest(
pAd, pAd,
@ -848,13 +844,9 @@ NTSTATUS RTUSBWriteEEPROM(
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
#ifdef RT30xx
if(pAd->bUseEfuse) if(pAd->bUseEfuse)
{
Status = eFuseWrite(pAd, Offset, pData, length); Status = eFuseWrite(pAd, Offset, pData, length);
}
else else
#endif // RT30xx //
{ {
Status = RTUSB_VendorRequest( Status = RTUSB_VendorRequest(
pAd, pAd,

16
drivers/staging/rt2870/rt2870.h
View file

@ -135,7 +135,6 @@ typedef struct _MGMT_STRUC {
/* ----------------- EEPROM Related MACRO ----------------- */ /* ----------------- EEPROM Related MACRO ----------------- */
#ifdef RT30xx
#define RT28xx_EEPROM_READ16(pAd, offset, var) \ #define RT28xx_EEPROM_READ16(pAd, offset, var) \
do { \ do { \
RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \ RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \
@ -150,21 +149,6 @@ typedef struct _MGMT_STRUC {
_tmpVar = cpu2le16(var); \ _tmpVar = cpu2le16(var); \
RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \ RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \
}while(0) }while(0)
#endif // RT30xx //
#ifndef RT30xx
#define RT28xx_EEPROM_READ16(pAd, offset, var) \
do { \
RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \
var = le2cpu16(var); \
}while(0)
#define RT28xx_EEPROM_WRITE16(pAd, offset, var) \
do{ \
USHORT _tmpVar; \
_tmpVar = cpu2le16(var); \
RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \
}while(0)
#endif // RT30xx //
/* ----------------- TASK/THREAD Related MACRO ----------------- */ /* ----------------- TASK/THREAD Related MACRO ----------------- */
#define RT28XX_TASK_THREAD_INIT(pAd, Status) \ #define RT28XX_TASK_THREAD_INIT(pAd, Status) \