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>
-//2008/09/11:KH add to support efuse<--
-#ifdef RT30xx
/*
========================================================================
/*
========================================================================
-
-#endif // RT30xx //
-//2008/09/11:KH add to support efuse-->
UINT32 MacCsr0 = 0;
NTSTATUS Status;
UCHAR Value = 0xff;
UINT32 MacCsr0 = 0;
NTSTATUS Status;
UCHAR Value = 0xff;
-#endif // RT2870 //
-#ifdef RT30xx
USHORT KeyIdx;
INT i,apidx;
USHORT KeyIdx;
INT i,apidx;
Counter&=0xffffff00;
Counter|=0x000001e;
RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);
Counter&=0xffffff00;
Counter|=0x000001e;
RTMP_IO_WRITE32(pAd, USB_CYC_CFG, Counter);
-#endif // RT2870 //
-#ifdef RT30xx
pAd->bUseEfuse=FALSE;
RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl);
pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0;
pAd->bUseEfuse=FALSE;
RTMP_IO_READ32(pAd, EFUSE_CTRL, &eFuseCtrl);
pAd->bUseEfuse = ( (eFuseCtrl & 0x80000000) == 0x80000000) ? 1 : 0;
else
{
DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));
else
{
DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));
{
// 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.
-#ifdef RT30xx
-//======efuse
- BOOLEAN bEEPROMFile;
-#endif // RT30xx //
-
} RTMP_ADAPTER, *PRTMP_ADAPTER;
//
} RTMP_ADAPTER, *PRTMP_ADAPTER;
//
{"ForceGF", Set_ForceGF_Proc},
{"LongRetry", Set_LongRetryLimit_Proc},
{"ShortRetry", Set_ShortRetryLimit_Proc},
{"ForceGF", Set_ForceGF_Proc},
{"LongRetry", Set_LongRetryLimit_Proc},
{"ShortRetry", Set_ShortRetryLimit_Proc},
-//2008/09/11:KH add to support efuse<--
-#ifdef RT30xx
{"efuseFreeNumber", set_eFuseGetFreeBlockCount_Proc},
{"efuseDump", set_eFusedump_Proc},
{"efuseLoadFromBin", set_eFuseLoadFromBin_Proc},
{"efuseFreeNumber", set_eFuseGetFreeBlockCount_Proc},
{"efuseDump", set_eFusedump_Proc},
{"efuseLoadFromBin", set_eFuseLoadFromBin_Proc},
-#endif // RT30xx //
-//2008/09/11:KH add to support efuse-->
{
NTSTATUS Status = STATUS_SUCCESS;
{
NTSTATUS Status = STATUS_SUCCESS;
Status =eFuseRead(pAd, Offset, pData, length);
Status =eFuseRead(pAd, Offset, pData, length);
{
Status = RTUSB_VendorRequest(
pAd,
{
Status = RTUSB_VendorRequest(
pAd,
{
NTSTATUS Status = STATUS_SUCCESS;
{
NTSTATUS Status = STATUS_SUCCESS;
Status = eFuseWrite(pAd, Offset, pData, length);
Status = eFuseWrite(pAd, Offset, pData, length);
{
Status = RTUSB_VendorRequest(
pAd,
{
Status = RTUSB_VendorRequest(
pAd,
/* ----------------- EEPROM Related MACRO ----------------- */
/* ----------------- EEPROM Related MACRO ----------------- */
#define RT28xx_EEPROM_READ16(pAd, offset, var) \
do { \
RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \
#define RT28xx_EEPROM_READ16(pAd, offset, var) \
do { \
RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \
_tmpVar = cpu2le16(var); \
RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \
}while(0)
_tmpVar = cpu2le16(var); \
RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \
}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 ----------------- */
#define RT28XX_TASK_THREAD_INIT(pAd, Status) \
/* ----------------- TASK/THREAD Related MACRO ----------------- */
#define RT28XX_TASK_THREAD_INIT(pAd, Status) \