diff options
-rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 3 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_info.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_ate.c | 72 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_ate.h | 32 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_config.h | 6 |
5 files changed, 5 insertions, 110 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 591d1e2158d..ce2e2623fb1 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c | |||
@@ -1526,9 +1526,6 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( | |||
1526 | #ifdef LINUX | 1526 | #ifdef LINUX |
1527 | NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); | 1527 | NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); |
1528 | #endif | 1528 | #endif |
1529 | #ifdef UCOS | ||
1530 | NdisMoveMemory(net_pkt_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); | ||
1531 | #endif | ||
1532 | } | 1529 | } |
1533 | #endif // CONFIG_STA_SUPPORT // | 1530 | #endif // CONFIG_STA_SUPPORT // |
1534 | } | 1531 | } |
diff --git a/drivers/staging/rt2860/common/cmm_info.c b/drivers/staging/rt2860/common/cmm_info.c index 8bafb5581fc..091e4928260 100644 --- a/drivers/staging/rt2860/common/cmm_info.c +++ b/drivers/staging/rt2860/common/cmm_info.c | |||
@@ -1864,7 +1864,6 @@ CHAR *GetAuthMode(CHAR auth) | |||
1864 | return "UNKNOW"; | 1864 | return "UNKNOW"; |
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | #if 1 //#ifndef UCOS | ||
1868 | /* | 1867 | /* |
1869 | ========================================================================== | 1868 | ========================================================================== |
1870 | Description: | 1869 | Description: |
@@ -2072,7 +2071,6 @@ VOID RTMPIoctlGetMacTable( | |||
2072 | 2071 | ||
2073 | kfree(msg); | 2072 | kfree(msg); |
2074 | } | 2073 | } |
2075 | #endif // UCOS // | ||
2076 | 2074 | ||
2077 | #ifdef DOT11_N_SUPPORT | 2075 | #ifdef DOT11_N_SUPPORT |
2078 | INT Set_BASetup_Proc( | 2076 | INT Set_BASetup_Proc( |
diff --git a/drivers/staging/rt2860/rt_ate.c b/drivers/staging/rt2860/rt_ate.c index 1ed73c9e6b6..0082f0fc268 100644 --- a/drivers/staging/rt2860/rt_ate.c +++ b/drivers/staging/rt2860/rt_ate.c | |||
@@ -496,9 +496,7 @@ static INT ATECmdHandler( | |||
496 | UINT i=0, atemode; | 496 | UINT i=0, atemode; |
497 | PRXD_STRUC pRxD; | 497 | PRXD_STRUC pRxD; |
498 | PRTMP_TX_RING pTxRing = &pAd->TxRing[QID_AC_BE]; | 498 | PRTMP_TX_RING pTxRing = &pAd->TxRing[QID_AC_BE]; |
499 | #ifndef UCOS | ||
500 | NDIS_STATUS Status = NDIS_STATUS_SUCCESS; | 499 | NDIS_STATUS Status = NDIS_STATUS_SUCCESS; |
501 | #endif // UCOS // | ||
502 | #ifdef RT_BIG_ENDIAN | 500 | #ifdef RT_BIG_ENDIAN |
503 | PTXD_STRUC pDestTxD; | 501 | PTXD_STRUC pDestTxD; |
504 | TXD_STRUC TxD; | 502 | TXD_STRUC TxD; |
@@ -523,13 +521,12 @@ static INT ATECmdHandler( | |||
523 | { | 521 | { |
524 | ATEDBGPRINT(RT_DEBUG_TRACE, ("ATE: ATESTART\n")); | 522 | ATEDBGPRINT(RT_DEBUG_TRACE, ("ATE: ATESTART\n")); |
525 | 523 | ||
526 | #ifndef UCOS | ||
527 | // check if we have removed the firmware | 524 | // check if we have removed the firmware |
528 | if (!(ATE_ON(pAd))) | 525 | if (!(ATE_ON(pAd))) |
529 | { | 526 | { |
530 | NICEraseFirmware(pAd); | 527 | NICEraseFirmware(pAd); |
531 | } | 528 | } |
532 | #endif // !UCOS // | 529 | |
533 | atemode = pAd->ate.Mode; | 530 | atemode = pAd->ate.Mode; |
534 | pAd->ate.Mode = ATE_START; | 531 | pAd->ate.Mode = ATE_START; |
535 | // pAd->ate.TxDoneCount = pAd->ate.TxCount; | 532 | // pAd->ate.TxDoneCount = pAd->ate.TxCount; |
@@ -658,9 +655,9 @@ static INT ATECmdHandler( | |||
658 | // | 655 | // |
659 | // LinkDown(pAd, FALSE); | 656 | // LinkDown(pAd, FALSE); |
660 | // AsicEnableBssSync(pAd); | 657 | // AsicEnableBssSync(pAd); |
661 | #ifndef UCOS | 658 | |
662 | netif_stop_queue(pAd->net_dev); | 659 | netif_stop_queue(pAd->net_dev); |
663 | #endif // !UCOS // | 660 | |
664 | // | 661 | // |
665 | // If we skip "LinkDown()", we should disable protection | 662 | // If we skip "LinkDown()", we should disable protection |
666 | // to prevent from sending out RTS or CTS-to-self. | 663 | // to prevent from sending out RTS or CTS-to-self. |
@@ -694,7 +691,6 @@ static INT ATECmdHandler( | |||
694 | // Abort Tx, RX DMA. | 691 | // Abort Tx, RX DMA. |
695 | RtmpDmaEnable(pAd, 0); | 692 | RtmpDmaEnable(pAd, 0); |
696 | 693 | ||
697 | #ifndef UCOS | ||
698 | pAd->ate.bFWLoading = TRUE; | 694 | pAd->ate.bFWLoading = TRUE; |
699 | Status = NICLoadFirmware(pAd); | 695 | Status = NICLoadFirmware(pAd); |
700 | if (Status != NDIS_STATUS_SUCCESS) | 696 | if (Status != NDIS_STATUS_SUCCESS) |
@@ -702,7 +698,7 @@ static INT ATECmdHandler( | |||
702 | ATEDBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware failed, Status[=0x%08x]\n", Status)); | 698 | ATEDBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware failed, Status[=0x%08x]\n", Status)); |
703 | return FALSE; | 699 | return FALSE; |
704 | } | 700 | } |
705 | #endif // !UCOS // | 701 | |
706 | pAd->ate.Mode = ATE_STOP; | 702 | pAd->ate.Mode = ATE_STOP; |
707 | 703 | ||
708 | 704 | ||
@@ -777,9 +773,8 @@ static INT ATECmdHandler( | |||
777 | #ifdef CONFIG_STA_SUPPORT | 773 | #ifdef CONFIG_STA_SUPPORT |
778 | RTMPStationStart(pAd); | 774 | RTMPStationStart(pAd); |
779 | #endif // CONFIG_STA_SUPPORT // | 775 | #endif // CONFIG_STA_SUPPORT // |
780 | #ifndef UCOS | 776 | |
781 | netif_start_queue(pAd->net_dev); | 777 | netif_start_queue(pAd->net_dev); |
782 | #endif // !UCOS // | ||
783 | } | 778 | } |
784 | else if (!strcmp(arg, "TXCARR")) // Tx Carrier | 779 | else if (!strcmp(arg, "TXCARR")) // Tx Carrier |
785 | { | 780 | { |
@@ -2078,7 +2073,6 @@ INT Set_ATE_Write_RF4_Proc( | |||
2078 | TRUE if all parameters are OK, FALSE otherwise | 2073 | TRUE if all parameters are OK, FALSE otherwise |
2079 | ========================================================================== | 2074 | ========================================================================== |
2080 | */ | 2075 | */ |
2081 | #ifndef UCOS | ||
2082 | INT Set_ATE_Load_E2P_Proc( | 2076 | INT Set_ATE_Load_E2P_Proc( |
2083 | IN PRTMP_ADAPTER pAd, | 2077 | IN PRTMP_ADAPTER pAd, |
2084 | IN PUCHAR arg) | 2078 | IN PUCHAR arg) |
@@ -2173,44 +2167,6 @@ INT Set_ATE_Load_E2P_Proc( | |||
2173 | return ret; | 2167 | return ret; |
2174 | 2168 | ||
2175 | } | 2169 | } |
2176 | #else | ||
2177 | INT Set_ATE_Load_E2P_Proc( | ||
2178 | IN PRTMP_ADAPTER pAd, | ||
2179 | IN PUCHAR arg) | ||
2180 | { | ||
2181 | USHORT WriteEEPROM[(EEPROM_SIZE/2)]; | ||
2182 | struct iwreq *wrq = (struct iwreq *)arg; | ||
2183 | |||
2184 | ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __func__, wrq->u.data.length)); | ||
2185 | |||
2186 | if (wrq->u.data.length != EEPROM_SIZE) | ||
2187 | { | ||
2188 | ate_print("%s: error length (=%d) from host\n", | ||
2189 | __func__, wrq->u.data.length); | ||
2190 | return FALSE; | ||
2191 | } | ||
2192 | else/* (wrq->u.data.length == EEPROM_SIZE) */ | ||
2193 | { | ||
2194 | /* zero the e2p buffer */ | ||
2195 | NdisZeroMemory((PUCHAR)WriteEEPROM, EEPROM_SIZE); | ||
2196 | |||
2197 | /* fill the local buffer */ | ||
2198 | NdisMoveMemory((PUCHAR)WriteEEPROM, wrq->u.data.pointer, wrq->u.data.length); | ||
2199 | |||
2200 | do | ||
2201 | { | ||
2202 | /* write the content of .bin file to EEPROM */ | ||
2203 | rt_ee_write_all(pAd, WriteEEPROM); | ||
2204 | |||
2205 | } while(FALSE); | ||
2206 | } | ||
2207 | |||
2208 | ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __func__)); | ||
2209 | |||
2210 | return TRUE; | ||
2211 | |||
2212 | } | ||
2213 | #endif // !UCOS // | ||
2214 | 2170 | ||
2215 | INT Set_ATE_Read_E2P_Proc( | 2171 | INT Set_ATE_Read_E2P_Proc( |
2216 | IN PRTMP_ADAPTER pAd, | 2172 | IN PRTMP_ADAPTER pAd, |
@@ -3590,20 +3546,6 @@ static VOID memcpy_exl(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); | |||
3590 | static VOID memcpy_exs(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); | 3546 | static VOID memcpy_exs(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, ULONG len); |
3591 | static VOID RTMP_IO_READ_BULK(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, UINT32 len); | 3547 | static VOID RTMP_IO_READ_BULK(PRTMP_ADAPTER pAd, UCHAR *dst, UCHAR *src, UINT32 len); |
3592 | 3548 | ||
3593 | #ifdef UCOS | ||
3594 | int ate_copy_to_user( | ||
3595 | IN PUCHAR payload, | ||
3596 | IN PUCHAR msg, | ||
3597 | IN INT len) | ||
3598 | { | ||
3599 | memmove(payload, msg, len); | ||
3600 | return 0; | ||
3601 | } | ||
3602 | |||
3603 | #undef copy_to_user | ||
3604 | #define copy_to_user(x,y,z) ate_copy_to_user((PUCHAR)x, (PUCHAR)y, z) | ||
3605 | #endif // UCOS // | ||
3606 | |||
3607 | #define LEN_OF_ARG 16 | 3549 | #define LEN_OF_ARG 16 |
3608 | 3550 | ||
3609 | VOID RtmpDoAte( | 3551 | VOID RtmpDoAte( |
@@ -3669,9 +3611,7 @@ VOID RtmpDoAte( | |||
3669 | // We will get this command either QA is closed or ated is killed by user. | 3611 | // We will get this command either QA is closed or ated is killed by user. |
3670 | case RACFG_CMD_ATE_STOP: | 3612 | case RACFG_CMD_ATE_STOP: |
3671 | { | 3613 | { |
3672 | #ifndef UCOS | ||
3673 | INT32 ret; | 3614 | INT32 ret; |
3674 | #endif // !UCOS // | ||
3675 | 3615 | ||
3676 | ATEDBGPRINT(RT_DEBUG_TRACE,("RACFG_CMD_ATE_STOP\n")); | 3616 | ATEDBGPRINT(RT_DEBUG_TRACE,("RACFG_CMD_ATE_STOP\n")); |
3677 | 3617 | ||
@@ -3708,13 +3648,11 @@ VOID RtmpDoAte( | |||
3708 | // kill ATE daemon when leaving ATE mode. | 3648 | // kill ATE daemon when leaving ATE mode. |
3709 | // We must kill ATE daemon first before setting ATESTOP, | 3649 | // We must kill ATE daemon first before setting ATESTOP, |
3710 | // or Microsoft will report sth. wrong. | 3650 | // or Microsoft will report sth. wrong. |
3711 | #ifndef UCOS | ||
3712 | ret = KILL_THREAD_PID(pAdapter->ate.AtePid, SIGTERM, 1); | 3651 | ret = KILL_THREAD_PID(pAdapter->ate.AtePid, SIGTERM, 1); |
3713 | if (ret) | 3652 | if (ret) |
3714 | { | 3653 | { |
3715 | ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name)); | 3654 | ATEDBGPRINT(RT_DEBUG_ERROR, ("%s: unable to signal thread\n", pAdapter->net_dev->name)); |
3716 | } | 3655 | } |
3717 | #endif // !UCOS // | ||
3718 | } | 3656 | } |
3719 | 3657 | ||
3720 | // AP might have in ATE_STOP mode due to cmd from QA. | 3658 | // AP might have in ATE_STOP mode due to cmd from QA. |
diff --git a/drivers/staging/rt2860/rt_ate.h b/drivers/staging/rt2860/rt_ate.h index 38f5c4af546..18381c3346b 100644 --- a/drivers/staging/rt2860/rt_ate.h +++ b/drivers/staging/rt2860/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 | #define EEPROM_SIZE 0x200 | 33 | #define EEPROM_SIZE 0x200 |
@@ -36,34 +35,6 @@ | |||
36 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2860STA/e2p.bin" | 35 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2860STA/e2p.bin" |
37 | #endif // CONFIG_STA_SUPPORT // | 36 | #endif // CONFIG_STA_SUPPORT // |
38 | 37 | ||
39 | #else // !UCOS // | ||
40 | #define fATE_LOAD_EEPROM 0x0C43 | ||
41 | #ifdef CONFIG_PRINTK | ||
42 | extern INT ConsoleResponse(IN PUCHAR buff); | ||
43 | extern int (*remote_display)(char *); | ||
44 | extern void puts (const char *s); | ||
45 | |||
46 | /* specificly defined to redirect and show ate-related messages to host. */ | ||
47 | /* Try to define ate_print as a macro. */ | ||
48 | #define ate_print(fmt, args...) \ | ||
49 | do{ int (*org_remote_display)(char *) = NULL; \ | ||
50 | org_remote_display = remote_display;\ | ||
51 | /* Save original "remote_display" */\ | ||
52 | remote_display = (int (*)(char *))ConsoleResponse; \ | ||
53 | printk(fmt, ## args); \ | ||
54 | /* Restore the remote_display function pointer */ \ | ||
55 | remote_display = org_remote_display; }while(0) | ||
56 | |||
57 | #define ATEDBGPRINT(Level, Fmt) \ | ||
58 | { \ | ||
59 | if ((Level) <= RTDebugLevel) \ | ||
60 | { \ | ||
61 | ate_print Fmt; \ | ||
62 | } \ | ||
63 | } | ||
64 | #endif // CONFIG_PRINTK // | ||
65 | #endif // !UCOS // | ||
66 | |||
67 | #define ATE_ON(_p) (((_p)->ate.Mode) != ATE_STOP) | 38 | #define ATE_ON(_p) (((_p)->ate.Mode) != ATE_STOP) |
68 | 39 | ||
69 | /* RT2880_iNIC will define "RT2860". */ | 40 | /* RT2880_iNIC will define "RT2860". */ |
@@ -132,12 +103,9 @@ do{ int (*org_remote_display)(char *) = NULL; \ | |||
132 | /* RT2880_iNIC will define RT2860. */ | 103 | /* RT2880_iNIC will define RT2860. */ |
133 | #define EEPROM_SIZE 0x200 | 104 | #define EEPROM_SIZE 0x200 |
134 | /* iNIC has its own EEPROM_BIN_FILE_NAME */ | 105 | /* iNIC has its own EEPROM_BIN_FILE_NAME */ |
135 | #ifndef UCOS | ||
136 | #ifdef CONFIG_STA_SUPPORT | 106 | #ifdef CONFIG_STA_SUPPORT |
137 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2860STA/e2p.bin" | 107 | #define EEPROM_BIN_FILE_NAME "/etc/Wireless/RT2860STA/e2p.bin" |
138 | #endif // CONFIG_STA_SUPPORT // | 108 | #endif // CONFIG_STA_SUPPORT // |
139 | #endif // !UCOS // | ||
140 | |||
141 | 109 | ||
142 | 110 | ||
143 | VOID rt_ee_read_all( | 111 | VOID rt_ee_read_all( |
diff --git a/drivers/staging/rt2860/rt_config.h b/drivers/staging/rt2860/rt_config.h index a67024fb437..570cab2d86c 100644 --- a/drivers/staging/rt2860/rt_config.h +++ b/drivers/staging/rt2860/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 |