diff options
| -rw-r--r-- | drivers/staging/rt2860/common/eeprom.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/rtmp_init.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rt2860/rtmp.h | 7 | ||||
| -rw-r--r-- | drivers/staging/rt2860/sta_ioctl.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rt2870/common/rtusb_io.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rt2870/rt2870.h | 16 |
6 files changed, 9 insertions, 45 deletions
diff --git a/drivers/staging/rt2860/common/eeprom.c b/drivers/staging/rt2860/common/eeprom.c index 3a529667067..fb5e52a00bf 100644 --- a/drivers/staging/rt2860/common/eeprom.c +++ b/drivers/staging/rt2860/common/eeprom.c @@ -291,8 +291,7 @@ VOID RTMP_EEPROM_WRITE16( #endif } -//2008/09/11:KH add to support efuse<-- -#ifdef RT30xx +#ifdef RT2870 /* ======================================================================== @@ -1485,6 +1484,4 @@ NTSTATUS eFuseWriteRegistersFromBin( return TRUE; } - -#endif // RT30xx // -//2008/09/11:KH add to support efuse--> +#endif diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index 87684948bfc..df0e1e9a8d2 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c @@ -2186,10 +2186,8 @@ NDIS_STATUS NICInitializeAsic( UINT32 MacCsr0 = 0; NTSTATUS Status; UCHAR Value = 0xff; -#endif // RT2870 // -#ifdef RT30xx UINT32 eFuseCtrl; -#endif // RT30xx // +#endif USHORT KeyIdx; INT i,apidx; @@ -2501,8 +2499,7 @@ NDIS_STATUS NICInitializeAsic( 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; @@ -2513,9 +2510,8 @@ NDIS_STATUS NICInitializeAsic( else { 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. diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index 5d1fb007983..92411246cf9 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h @@ -2938,12 +2938,9 @@ typedef struct _RTMP_ADAPTER UINT8 PM_FlgSuspend; -#ifdef RT30xx -//======efuse +#ifdef RT2870 BOOLEAN bUseEfuse; - BOOLEAN bEEPROMFile; -#endif // RT30xx // - +#endif } RTMP_ADAPTER, *PRTMP_ADAPTER; // diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 1556bf32e50..b6cdf13fbfa 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c @@ -229,13 +229,11 @@ static struct { {"ForceGF", Set_ForceGF_Proc}, {"LongRetry", Set_LongRetryLimit_Proc}, {"ShortRetry", Set_ShortRetryLimit_Proc}, -//2008/09/11:KH add to support efuse<-- -#ifdef RT30xx +#ifdef RT2870 {"efuseFreeNumber", set_eFuseGetFreeBlockCount_Proc}, {"efuseDump", set_eFusedump_Proc}, {"efuseLoadFromBin", set_eFuseLoadFromBin_Proc}, -#endif // RT30xx // -//2008/09/11:KH add to support efuse--> +#endif {NULL,} }; diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c index ff311e90772..94a3c5e0b2d 100644 --- a/drivers/staging/rt2870/common/rtusb_io.c +++ b/drivers/staging/rt2870/common/rtusb_io.c @@ -803,13 +803,9 @@ NTSTATUS RTUSBReadEEPROM( { NTSTATUS Status = STATUS_SUCCESS; -#ifdef RT30xx if(pAd->bUseEfuse) - { Status =eFuseRead(pAd, Offset, pData, length); - } else -#endif // RT30xx // { Status = RTUSB_VendorRequest( pAd, @@ -848,13 +844,9 @@ NTSTATUS RTUSBWriteEEPROM( { NTSTATUS Status = STATUS_SUCCESS; -#ifdef RT30xx if(pAd->bUseEfuse) - { Status = eFuseWrite(pAd, Offset, pData, length); - } else -#endif // RT30xx // { Status = RTUSB_VendorRequest( pAd, diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index 1261764e87a..131f3329ac9 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h @@ -135,7 +135,6 @@ typedef struct _MGMT_STRUC { /* ----------------- EEPROM Related MACRO ----------------- */ -#ifdef RT30xx #define RT28xx_EEPROM_READ16(pAd, offset, var) \ do { \ RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \ @@ -150,21 +149,6 @@ typedef struct _MGMT_STRUC { _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) \ |