diff options
Diffstat (limited to 'drivers/staging/rt2870')
-rw-r--r-- | drivers/staging/rt2870/common/ba_action.c | 3 | ||||
-rw-r--r-- | drivers/staging/rt2870/common/cmm_info.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt_ate.c | 66 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt_ate.h | 28 | ||||
-rw-r--r-- | drivers/staging/rt2870/rt_config.h | 6 |
5 files changed, 0 insertions, 105 deletions
diff --git a/drivers/staging/rt2870/common/ba_action.c b/drivers/staging/rt2870/common/ba_action.c index d9f738177e2..1edf51aa4a8 100644 --- a/drivers/staging/rt2870/common/ba_action.c +++ b/drivers/staging/rt2870/common/ba_action.c | |||
@@ -1522,9 +1522,6 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( | |||
1522 | #ifdef LINUX | 1522 | #ifdef LINUX |
1523 | NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); | 1523 | NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); |
1524 | #endif | 1524 | #endif |
1525 | #ifdef UCOS | ||
1526 | NdisMoveMemory(net_pkt_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); | ||
1527 | #endif | ||
1528 | } | 1525 | } |
1529 | #endif // CONFIG_STA_SUPPORT // | 1526 | #endif // CONFIG_STA_SUPPORT // |
1530 | } | 1527 | } |
diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c index e3a4add59a0..2b2db91bac3 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) | |||
2154 | return "UNKNOW"; | 2154 | return "UNKNOW"; |
2155 | } | 2155 | } |
2156 | 2156 | ||
2157 | #if 1 //#ifndef UCOS | ||
2158 | /* | 2157 | /* |
2159 | ========================================================================== | 2158 | ========================================================================== |
2160 | Description: | 2159 | Description: |
@@ -2368,7 +2367,6 @@ VOID RTMPIoctlGetMacTable( | |||
2368 | 2367 | ||
2369 | kfree(msg); | 2368 | kfree(msg); |
2370 | } | 2369 | } |
2371 | #endif // UCOS // | ||
2372 | 2370 | ||
2373 | #ifdef DOT11_N_SUPPORT | 2371 | #ifdef DOT11_N_SUPPORT |
2374 | INT Set_BASetup_Proc( | 2372 | INT Set_BASetup_Proc( |
diff --git a/drivers/staging/rt2870/rt_ate.c b/drivers/staging/rt2870/rt_ate.c index 27c763ee927..895b095a3aa 100644 --- a/drivers/staging/rt2870/rt_ate.c +++ b/drivers/staging/rt2870/rt_ate.c | |||
@@ -27,10 +27,6 @@ | |||
27 | 27 | ||
28 | #include "rt_config.h" | 28 | #include "rt_config.h" |
29 | 29 | ||
30 | #ifdef UCOS | ||
31 | INT IoctlResponse(PUCHAR payload, PUCHAR msg, INT len); | ||
32 | #endif // UCOS // | ||
33 | |||
34 | #ifdef RALINK_ATE | 30 | #ifdef RALINK_ATE |
35 | 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 | 31 | 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 |
36 | extern RTMP_RF_REGS RF2850RegTable[]; | 32 | extern RTMP_RF_REGS RF2850RegTable[]; |
@@ -41,11 +37,6 @@ extern UCHAR EpToQueue[]; | |||
41 | extern VOID RTUSBRejectPendingPackets( IN PRTMP_ADAPTER pAd); | 37 | extern VOID RTUSBRejectPendingPackets( IN PRTMP_ADAPTER pAd); |
42 | #endif // RT2870 // | 38 | #endif // RT2870 // |
43 | 39 | ||
44 | #ifdef UCOS | ||
45 | extern INT ConsoleResponse(IN PUCHAR buff); | ||
46 | extern int (*remote_display)(char *); | ||
47 | #endif // UCOS // | ||
48 | |||
49 | static CHAR CCKRateTable[] = {0, 1, 2, 3, 8, 9, 10, 11, -1}; /* CCK Mode. */ | 40 | static CHAR CCKRateTable[] = {0, 1, 2, 3, 8, 9, 10, 11, -1}; /* CCK Mode. */ |
50 | static CHAR OFDMRateTable[] = {0, 1, 2, 3, 4, 5, 6, 7, -1}; /* OFDM Mode. */ | 41 | static CHAR OFDMRateTable[] = {0, 1, 2, 3, 4, 5, 6, 7, -1}; /* OFDM Mode. */ |
51 | static CHAR HTMIXRateTable[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1}; /* HT Mix Mode. */ | 42 | 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( | |||
2247 | TRUE if all parameters are OK, FALSE otherwise | 2238 | TRUE if all parameters are OK, FALSE otherwise |
2248 | ========================================================================== | 2239 | ========================================================================== |
2249 | */ | 2240 | */ |
2250 | #ifndef UCOS | ||
2251 | INT Set_ATE_Load_E2P_Proc( | 2241 | INT Set_ATE_Load_E2P_Proc( |
2252 | IN PRTMP_ADAPTER pAd, | 2242 | IN PRTMP_ADAPTER pAd, |
2253 | IN PUCHAR arg) | 2243 | IN PUCHAR arg) |
@@ -2342,44 +2332,6 @@ INT Set_ATE_Load_E2P_Proc( | |||
2342 | return ret; | 2332 | return ret; |
2343 | 2333 | ||
2344 | } | 2334 | } |
2345 | #else | ||
2346 | INT Set_ATE_Load_E2P_Proc( | ||
2347 | IN PRTMP_ADAPTER pAd, | ||
2348 | IN PUCHAR arg) | ||
2349 | { | ||
2350 | USHORT WriteEEPROM[(EEPROM_SIZE/2)]; | ||
2351 | struct iwreq *wrq = (struct iwreq *)arg; | ||
2352 | |||
2353 | ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __func__, wrq->u.data.length)); | ||
2354 | |||
2355 | if (wrq->u.data.length != EEPROM_SIZE) | ||
2356 | { | ||
2357 | ate_print("%s: error length (=%d) from host\n", | ||
2358 | __func__, wrq->u.data.length); | ||
2359 | return FALSE; | ||
2360 | } | ||
2361 | else/* (wrq->u.data.length == EEPROM_SIZE) */ | ||
2362 | { | ||
2363 | /* zero the e2p buffer */ | ||
2364 | NdisZeroMemory((PUCHAR)WriteEEPROM, EEPROM_SIZE); | ||
2365 | |||
2366 | /* fill the local buffer */ | ||
2367 | NdisMoveMemory((PUCHAR)WriteEEPROM, wrq->u.data.pointer, wrq->u.data.length); | ||
2368 | |||
2369 | do | ||
2370 | { | ||
2371 | /* write the content of .bin file to EEPROM */ | ||
2372 | rt_ee_write_all(pAd, WriteEEPROM); | ||
2373 | |||
2374 | } while(FALSE); | ||
2375 | } | ||
2376 | |||
2377 | ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __func__)); | ||
2378 | |||
2379 | return TRUE; | ||
2380 | |||
2381 | } | ||
2382 | #endif // !UCOS // | ||
2383 | 2335 | ||
2384 | INT Set_ATE_Read_E2P_Proc( | 2336 | INT Set_ATE_Read_E2P_Proc( |
2385 | IN PRTMP_ADAPTER pAd, | 2337 | IN PRTMP_ADAPTER pAd, |
@@ -4039,20 +3991,6 @@ static VOID memcpy_exl(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); | |||
4039 | static VOID memcpy_exs(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); | 3991 | static VOID memcpy_exs(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); |
4040 | static VOID RTMP_IO_READ_BULK(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, UINT32 len); | 3992 | static VOID RTMP_IO_READ_BULK(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, UINT32 len); |
4041 | 3993 | ||
4042 | #ifdef UCOS | ||
4043 | int ate_copy_to_user( | ||
4044 | IN PUCHAR payload, | ||
4045 | IN PUCHAR msg, | ||
4046 | IN INT len) | ||
4047 | { | ||
4048 | memmove(payload, msg, len); | ||
4049 | return 0; | ||
4050 | } | ||
4051 | |||
4052 | #undef copy_to_user | ||
4053 | #define copy_to_user(x,y,z) ate_copy_to_user((PUCHAR)x, (PUCHAR)y, z) | ||
4054 | #endif // UCOS // | ||
4055 | |||
4056 | #define LEN_OF_ARG 16 | 3994 | #define LEN_OF_ARG 16 |
4057 | 3995 | ||
4058 | VOID RtmpDoAte( | 3996 | VOID RtmpDoAte( |
@@ -4118,9 +4056,7 @@ VOID RtmpDoAte( | |||
4118 | // We will get this command either QA is closed or ated is killed by user. | 4056 | // We will get this command either QA is closed or ated is killed by user. |
4119 | case RACFG_CMD_ATE_STOP: | 4057 | case RACFG_CMD_ATE_STOP: |
4120 | { | 4058 | { |
4121 | #ifndef UCOS | ||
4122 | INT32 ret; | 4059 | INT32 ret; |
4123 | #endif // !UCOS // | ||
4124 | 4060 | ||
4125 | ATEDBGPRINT(RT_DEBUG_TRACE,("RACFG_CMD_ATE_STOP\n")); | 4061 | ATEDBGPRINT(RT_DEBUG_TRACE,("RACFG_CMD_ATE_STOP\n")); |
4126 | 4062 | ||
@@ -4157,13 +4093,11 @@ VOID RtmpDoAte( | |||
4157 | // kill ATE daemon when leaving ATE mode. | 4093 | // kill ATE daemon when leaving ATE mode. |
4158 | // We must kill ATE daemon first before setting ATESTOP, | 4094 | // We must kill ATE daemon first before setting ATESTOP, |
4159 | // or Microsoft will report sth. wrong. | 4095 | // or Microsoft will report sth. wrong. |
4160 | #ifndef UCOS | ||
4161 | ret = KILL_THREAD_PID(pAdapter->ate.AtePid, SIGTERM, 1); | 4096 | ret = KILL_THREAD_PID(pAdapter->ate.AtePid, SIGTERM, 1); |
4162 | if (ret) | 4097 | if (ret) |
4163 | { | 4098 | { |
4164 | ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name)); | 4099 | ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name)); |
4165 | } | 4100 | } |
4166 | #endif // !UCOS // | ||
4167 | } | 4101 | } |
4168 | 4102 | ||
4169 | // AP might have in ATE_STOP mode due to cmd from QA. | 4103 | // 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 841d1518140..cd8e706dc69 100644 --- a/drivers/staging/rt2870/rt_ate.h +++ b/drivers/staging/rt2870/rt_ate.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #ifndef __ATE_H__ | 28 | #ifndef __ATE_H__ |
29 | #define __ATE_H__ | 29 | #define __ATE_H__ |
30 | 30 | ||
31 | #ifndef UCOS | ||
32 | #define ate_print printk | 31 | #define ate_print printk |
33 | #define ATEDBGPRINT DBGPRINT | 32 | #define ATEDBGPRINT DBGPRINT |
34 | 33 | ||
@@ -38,33 +37,6 @@ | |||
38 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2870STA/e2p.bin" | 37 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2870STA/e2p.bin" |
39 | #endif // CONFIG_STA_SUPPORT // | 38 | #endif // CONFIG_STA_SUPPORT // |
40 | #endif // RT2870 // | 39 | #endif // RT2870 // |
41 | #else // !UCOS // | ||
42 | #define fATE_LOAD_EEPROM 0x0C43 | ||
43 | #ifdef CONFIG_PRINTK | ||
44 | extern INT ConsoleResponse(IN PUCHAR buff); | ||
45 | extern int (*remote_display)(char *); | ||
46 | extern void puts (const char *s); | ||
47 | |||
48 | /* specificly defined to redirect and show ate-related messages to host. */ | ||
49 | /* Try to define ate_print as a macro. */ | ||
50 | #define ate_print(fmt, args...) \ | ||
51 | do{ int (*org_remote_display)(char *) = NULL; \ | ||
52 | org_remote_display = remote_display;\ | ||
53 | /* Save original "remote_display" */\ | ||
54 | remote_display = (int (*)(char *))ConsoleResponse; \ | ||
55 | printk(fmt, ## args); \ | ||
56 | /* Restore the remote_display function pointer */ \ | ||
57 | remote_display = org_remote_display; }while(0) | ||
58 | |||
59 | #define ATEDBGPRINT(Level, Fmt) \ | ||
60 | { \ | ||
61 | if ((Level) <= RTDebugLevel) \ | ||
62 | { \ | ||
63 | ate_print Fmt; \ | ||
64 | } \ | ||
65 | } | ||
66 | #endif // CONFIG_PRINTK // | ||
67 | #endif // !UCOS // | ||
68 | 40 | ||
69 | #define ATE_ON(_p) (((_p)->ate.Mode) != ATE_STOP) | 41 | #define ATE_ON(_p) (((_p)->ate.Mode) != ATE_STOP) |
70 | 42 | ||
diff --git a/drivers/staging/rt2870/rt_config.h b/drivers/staging/rt2870/rt_config.h index e3fe2642633..d899687f3bf 100644 --- a/drivers/staging/rt2870/rt_config.h +++ b/drivers/staging/rt2870/rt_config.h | |||
@@ -41,12 +41,6 @@ | |||
41 | #define __RT_CONFIG_H__ | 41 | #define __RT_CONFIG_H__ |
42 | 42 | ||
43 | #include "rtmp_type.h" | 43 | #include "rtmp_type.h" |
44 | #ifdef UCOS | ||
45 | #include "includes.h" | ||
46 | #include <stdio.h> | ||
47 | #include "rt_ucos.h" | ||
48 | #endif | ||
49 | |||
50 | #ifdef LINUX | 44 | #ifdef LINUX |
51 | #include "rt_linux.h" | 45 | #include "rt_linux.h" |
52 | #endif | 46 | #endif |