Skip to content

L
linux
Commit 3d33a60a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rt3070: remove dead UCOS code 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cfdf82bc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 127 deletions
drivers/staging/rt3070/common/ba_action.c
View file @ 3d33a60a
......@@ -1561,9 +1561,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 //
......
drivers/staging/rt3070/common/cmm_info.c
View file @ 3d33a60a
......@@ -1833,7 +1833,6 @@ CHAR *GetAuthMode(CHAR auth)
return "UNKNOW";
}
#if 1 //#ifndef UCOS
/*
==========================================================================
Description:
......@@ -2048,7 +2047,6 @@ VOID RTMPIoctlGetMacTable(
kfree(msg);
}
#endif // UCOS //
#ifdef DOT11_N_SUPPORT
INT Set_BASetup_Proc(
......
drivers/staging/rt3070/rt_ate.c
View file @ 3d33a60a
......@@ -27,10 +27,6 @@
#include "rt_config.h"
#ifdef UCOS
INT IoctlResponse(PUCHAR payload, PUCHAR msg, INT len);
#endif // UCOS //
#define ATE_BBP_REG_NUM 168
UCHAR restore_BBP[ATE_BBP_REG_NUM]={0};
......@@ -51,11 +47,6 @@ extern UCHAR NUM_OF_3020_CHNL;
//2008/07/10:KH adds to support 3070 ATE-->
#endif // RT30xx //
#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. */
......@@ -2444,7 +2435,6 @@ INT SET_ATE_3070RF_Proc(
TRUE if all parameters are OK, FALSE otherwise
==========================================================================
*/
#ifndef UCOS
INT Set_ATE_Load_E2P_Proc(
IN PRTMP_ADAPTER pAd,
IN PUCHAR arg)
......@@ -2539,44 +2529,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,
......@@ -4300,20 +4252,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(
......@@ -4379,9 +4317,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"));
......@@ -4418,36 +4354,12 @@ 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_proc(pAdapter->ate.AtePid, SIGTERM, 1);
if (ret)
{
ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name));
}
#endif // !UCOS //
}
#ifdef UCOS
// Roger add to avoid error message after close QA
if (pAdapter->CSRBaseAddress == RT2860_CSR_ADDR)
{
// prepare feedback as soon as we can to avoid QA timeout.
pRaCfg->length = htons(2);
pRaCfg->status = htons(0);
wrq->u.data.length = sizeof(pRaCfg->magic_no) + sizeof(pRaCfg->command_type)
+ sizeof(pRaCfg->command_id) + sizeof(pRaCfg->length)
+ sizeof(pRaCfg->sequence) + ntohs(pRaCfg->length);
ATEDBGPRINT(RT_DEBUG_TRACE, ("wrq->u.data.length = %d\n", wrq->u.data.length));
if (copy_to_user(wrq->u.data.pointer, pRaCfg, wrq->u.data.length))
{
ATEDBGPRINT(RT_DEBUG_TRACE, ("copy_to_user() fail in case RACFG_CMD_AP_START\n"));
Status = -EFAULT;
}
}
#endif // UCOS //
// AP might have in ATE_STOP mode due to cmd from QA.
if (ATE_ON(pAdapter))
......
drivers/staging/rt3070/rt_ate.h
View file @ 3d33a60a
......@@ -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)
......
drivers/staging/rt3070/rt_config.h
View file @ 3d33a60a
......@@ -41,12 +41,6 @@
#define __RT_CONFIG_H__
#include "rtmp_type.h"
#ifdef UCOS
#include "includes.h"
#include <stdio.h>
#include "rt_ucos.h"
#endif
#ifdef LINUX
#include "rt_linux.h"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7