From: Bartlomiej Zolnierkiewicz Date: Sun, 26 Apr 2009 14:04:43 +0000 (+0200) Subject: Staging: rt2870: remove dead UCOS code X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cfdf82bc3db57b99982bce9280ad2bf6b179ee3a;p=linux-beck.git Staging: rt2870: remove dead UCOS code Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rt2870/common/ba_action.c b/drivers/staging/rt2870/common/ba_action.c index d9f738177e2b..1edf51aa4a80 100644 --- a/drivers/staging/rt2870/common/ba_action.c +++ b/drivers/staging/rt2870/common/ba_action.c @@ -1521,9 +1521,6 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( { #ifdef LINUX NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); -#endif -#ifdef UCOS - NdisMoveMemory(net_pkt_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); #endif } #endif // CONFIG_STA_SUPPORT // diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c index e3a4add59a06..2b2db91bac3b 100644 --- a/drivers/staging/rt2870/common/cmm_info.c +++ b/drivers/staging/rt2870/common/cmm_info.c @@ -2154,7 +2154,6 @@ CHAR *GetAuthMode(CHAR auth) return "UNKNOW"; } -#if 1 //#ifndef UCOS /* ========================================================================== Description: @@ -2368,7 +2367,6 @@ VOID RTMPIoctlGetMacTable( kfree(msg); } -#endif // UCOS // #ifdef DOT11_N_SUPPORT INT Set_BASetup_Proc( diff --git a/drivers/staging/rt2870/rt_ate.c b/drivers/staging/rt2870/rt_ate.c index 27c763ee9276..895b095a3aa1 100644 --- a/drivers/staging/rt2870/rt_ate.c +++ b/drivers/staging/rt2870/rt_ate.c @@ -27,10 +27,6 @@ #include "rt_config.h" -#ifdef UCOS -INT IoctlResponse(PUCHAR payload, PUCHAR msg, INT len); -#endif // UCOS // - #ifdef RALINK_ATE UCHAR TemplateFrame[24] = {0x08/* Data type */,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0xAA,0xBB,0x12,0x34,0x56,0x00,0x11,0x22,0xAA,0xBB,0xCC,0x00,0x00}; // 802.11 MAC Header, Type:Data, Length:24bytes extern RTMP_RF_REGS RF2850RegTable[]; @@ -41,11 +37,6 @@ extern UCHAR EpToQueue[]; extern VOID RTUSBRejectPendingPackets( IN PRTMP_ADAPTER pAd); #endif // RT2870 // -#ifdef UCOS -extern INT ConsoleResponse(IN PUCHAR buff); -extern int (*remote_display)(char *); -#endif // UCOS // - static CHAR CCKRateTable[] = {0, 1, 2, 3, 8, 9, 10, 11, -1}; /* CCK Mode. */ static CHAR OFDMRateTable[] = {0, 1, 2, 3, 4, 5, 6, 7, -1}; /* OFDM Mode. */ static CHAR HTMIXRateTable[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1}; /* HT Mix Mode. */ @@ -2247,7 +2238,6 @@ INT Set_ATE_Write_RF4_Proc( TRUE if all parameters are OK, FALSE otherwise ========================================================================== */ -#ifndef UCOS INT Set_ATE_Load_E2P_Proc( IN PRTMP_ADAPTER pAd, IN PUCHAR arg) @@ -2342,44 +2332,6 @@ INT Set_ATE_Load_E2P_Proc( return ret; } -#else -INT Set_ATE_Load_E2P_Proc( - IN PRTMP_ADAPTER pAd, - IN PUCHAR arg) -{ - USHORT WriteEEPROM[(EEPROM_SIZE/2)]; - struct iwreq *wrq = (struct iwreq *)arg; - - ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __func__, wrq->u.data.length)); - - if (wrq->u.data.length != EEPROM_SIZE) - { - ate_print("%s: error length (=%d) from host\n", - __func__, wrq->u.data.length); - return FALSE; - } - else/* (wrq->u.data.length == EEPROM_SIZE) */ - { - /* zero the e2p buffer */ - NdisZeroMemory((PUCHAR)WriteEEPROM, EEPROM_SIZE); - - /* fill the local buffer */ - NdisMoveMemory((PUCHAR)WriteEEPROM, wrq->u.data.pointer, wrq->u.data.length); - - do - { - /* write the content of .bin file to EEPROM */ - rt_ee_write_all(pAd, WriteEEPROM); - - } while(FALSE); - } - - ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __func__)); - - return TRUE; - -} -#endif // !UCOS // INT Set_ATE_Read_E2P_Proc( IN PRTMP_ADAPTER pAd, @@ -4039,20 +3991,6 @@ static VOID memcpy_exl(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); static VOID memcpy_exs(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); static VOID RTMP_IO_READ_BULK(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, UINT32 len); -#ifdef UCOS -int ate_copy_to_user( - IN PUCHAR payload, - IN PUCHAR msg, - IN INT len) -{ - memmove(payload, msg, len); - return 0; -} - -#undef copy_to_user -#define copy_to_user(x,y,z) ate_copy_to_user((PUCHAR)x, (PUCHAR)y, z) -#endif // UCOS // - #define LEN_OF_ARG 16 VOID RtmpDoAte( @@ -4118,9 +4056,7 @@ VOID RtmpDoAte( // We will get this command either QA is closed or ated is killed by user. case RACFG_CMD_ATE_STOP: { -#ifndef UCOS INT32 ret; -#endif // !UCOS // ATEDBGPRINT(RT_DEBUG_TRACE,("RACFG_CMD_ATE_STOP\n")); @@ -4157,13 +4093,11 @@ VOID RtmpDoAte( // kill ATE daemon when leaving ATE mode. // We must kill ATE daemon first before setting ATESTOP, // or Microsoft will report sth. wrong. -#ifndef UCOS ret = KILL_THREAD_PID(pAdapter->ate.AtePid, SIGTERM, 1); if (ret) { ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name)); } -#endif // !UCOS // } // AP might have in ATE_STOP mode due to cmd from QA. diff --git a/drivers/staging/rt2870/rt_ate.h b/drivers/staging/rt2870/rt_ate.h index 841d1518140b..cd8e706dc698 100644 --- a/drivers/staging/rt2870/rt_ate.h +++ b/drivers/staging/rt2870/rt_ate.h @@ -28,7 +28,6 @@ #ifndef __ATE_H__ #define __ATE_H__ -#ifndef UCOS #define ate_print printk #define ATEDBGPRINT DBGPRINT @@ -38,33 +37,6 @@ #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2870STA/e2p.bin" #endif // CONFIG_STA_SUPPORT // #endif // RT2870 // -#else // !UCOS // -#define fATE_LOAD_EEPROM 0x0C43 -#ifdef CONFIG_PRINTK -extern INT ConsoleResponse(IN PUCHAR buff); -extern int (*remote_display)(char *); -extern void puts (const char *s); - -/* specificly defined to redirect and show ate-related messages to host. */ -/* Try to define ate_print as a macro. */ -#define ate_print(fmt, args...) \ -do{ int (*org_remote_display)(char *) = NULL; \ - org_remote_display = remote_display;\ - /* Save original "remote_display" */\ - remote_display = (int (*)(char *))ConsoleResponse; \ - printk(fmt, ## args); \ - /* Restore the remote_display function pointer */ \ - remote_display = org_remote_display; }while(0) - -#define ATEDBGPRINT(Level, Fmt) \ -{ \ - if ((Level) <= RTDebugLevel) \ - { \ - ate_print Fmt; \ - } \ -} -#endif // CONFIG_PRINTK // -#endif // !UCOS // #define ATE_ON(_p) (((_p)->ate.Mode) != ATE_STOP) diff --git a/drivers/staging/rt2870/rt_config.h b/drivers/staging/rt2870/rt_config.h index e3fe2642633a..d899687f3bfb 100644 --- a/drivers/staging/rt2870/rt_config.h +++ b/drivers/staging/rt2870/rt_config.h @@ -41,12 +41,6 @@ #define __RT_CONFIG_H__ #include "rtmp_type.h" -#ifdef UCOS -#include "includes.h" -#include -#include "rt_ucos.h" -#endif - #ifdef LINUX #include "rt_linux.h" #endif