|
@@ -98,8 +98,7 @@
|
|
|
******************************************************************************/
|
|
|
|
|
|
/* A matrix which maps channels to frequencies */
|
|
|
-#define MAX_CHAN_FREQ_MAP_ENTRIES 50
|
|
|
-static const long chan_freq_list[][MAX_CHAN_FREQ_MAP_ENTRIES] =
|
|
|
+static const long chan_freq_list[][2] =
|
|
|
{
|
|
|
{1,2412},
|
|
|
{2,2417},
|
|
@@ -846,7 +845,7 @@ int wl_is_a_valid_chan( int channel )
|
|
|
}
|
|
|
|
|
|
/* Iterate through the matrix and retrieve the frequency */
|
|
|
- for( i = 0; i < MAX_CHAN_FREQ_MAP_ENTRIES; i++ ) {
|
|
|
+ for( i = 0; i < ARRAY_SIZE(chan_freq_list); i++ ) {
|
|
|
if( chan_freq_list[i][0] == channel ) {
|
|
|
return 1;
|
|
|
}
|
|
@@ -884,7 +883,7 @@ int wl_is_a_valid_freq( long frequency )
|
|
|
|
|
|
|
|
|
/* Iterate through the matrix and retrieve the channel */
|
|
|
- for( i = 0; i < MAX_CHAN_FREQ_MAP_ENTRIES; i++ ) {
|
|
|
+ for( i = 0; i < ARRAY_SIZE(chan_freq_list); i++ ) {
|
|
|
if( chan_freq_list[i][1] == frequency ) {
|
|
|
return 1;
|
|
|
}
|
|
@@ -927,7 +926,7 @@ long wl_get_freq_from_chan( int channel )
|
|
|
}
|
|
|
|
|
|
/* Iterate through the matrix and retrieve the frequency */
|
|
|
- for( i = 0; i < MAX_CHAN_FREQ_MAP_ENTRIES; i++ ) {
|
|
|
+ for( i = 0; i < ARRAY_SIZE(chan_freq_list); i++ ) {
|
|
|
if( chan_freq_list[i][0] == channel ) {
|
|
|
return chan_freq_list[i][1];
|
|
|
}
|
|
@@ -965,7 +964,7 @@ int wl_get_chan_from_freq( long frequency )
|
|
|
|
|
|
|
|
|
/* Iterate through the matrix and retrieve the channel */
|
|
|
- for( i = 0; i < MAX_CHAN_FREQ_MAP_ENTRIES; i++ ) {
|
|
|
+ for( i = 0; i < ARRAY_SIZE(chan_freq_list); i++ ) {
|
|
|
if( chan_freq_list[i][1] == frequency ) {
|
|
|
return chan_freq_list[i][0];
|
|
|
}
|