aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2860
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r--drivers/staging/rt2860/chlist.h50
1 files changed, 23 insertions, 27 deletions
diff --git a/drivers/staging/rt2860/chlist.h b/drivers/staging/rt2860/chlist.h
index ada65e5ac61..1231e69d518 100644
--- a/drivers/staging/rt2860/chlist.h
+++ b/drivers/staging/rt2860/chlist.h
@@ -73,35 +73,31 @@ struct rt_ch_freq_map {
73extern struct rt_ch_freq_map CH_HZ_ID_MAP[]; 73extern struct rt_ch_freq_map CH_HZ_ID_MAP[];
74extern int CH_HZ_ID_MAP_NUM; 74extern int CH_HZ_ID_MAP_NUM;
75 75
76#define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \ 76#define MAP_CHANNEL_ID_TO_KHZ(_ch, _khz) \
77 do{ \ 77 do { \
78 int _chIdx; \ 78 int _chIdx; \
79 for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ 79 for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\
80 { \ 80 if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) { \
81 if ((_ch) == CH_HZ_ID_MAP[_chIdx].channel) \ 81 (_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000;\
82 { \ 82 break; \
83 (_khz) = CH_HZ_ID_MAP[_chIdx].freqKHz * 1000; \ 83 } \
84 break; \ 84 } \
85 } \ 85 if (_chIdx == CH_HZ_ID_MAP_NUM) \
86 } \ 86 (_khz) = 2412000; \
87 if (_chIdx == CH_HZ_ID_MAP_NUM) \ 87 } while (0)
88 (_khz) = 2412000; \
89 }while(0)
90 88
91#define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \ 89#define MAP_KHZ_TO_CHANNEL_ID(_khz, _ch) \
92 do{ \ 90 do { \
93 int _chIdx; \ 91 int _chIdx; \
94 for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++)\ 92 for (_chIdx = 0; _chIdx < CH_HZ_ID_MAP_NUM; _chIdx++) {\
95 { \ 93 if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) {\
96 if ((_khz) == CH_HZ_ID_MAP[_chIdx].freqKHz) \ 94 (_ch) = CH_HZ_ID_MAP[_chIdx].channel; \
97 { \ 95 break; \
98 (_ch) = CH_HZ_ID_MAP[_chIdx].channel; \ 96 } \
99 break; \ 97 } \
100 } \ 98 if (_chIdx == CH_HZ_ID_MAP_NUM) \
101 } \ 99 (_ch) = 1; \
102 if (_chIdx == CH_HZ_ID_MAP_NUM) \ 100 } while (0)
103 (_ch) = 1; \
104 }while(0)
105 101
106void BuildChannelListEx(struct rt_rtmp_adapter *pAd); 102void BuildChannelListEx(struct rt_rtmp_adapter *pAd);
107 103