diff options
| -rw-r--r-- | CORE/SERVICES/WMA/regdomain.c | 17 | ||||
| -rw-r--r-- | CORE/SERVICES/WMA/regdomain_common.h | 3 |
2 files changed, 16 insertions, 4 deletions
diff --git a/CORE/SERVICES/WMA/regdomain.c b/CORE/SERVICES/WMA/regdomain.c index 39bbe313aadb..5385bf6ec48c 100644 --- a/CORE/SERVICES/WMA/regdomain.c +++ b/CORE/SERVICES/WMA/regdomain.c @@ -92,6 +92,9 @@ regdm_op_class_map_t global_op_class[] = { {125, 20, BW20, {149, 153, 157, 161, 165, 169}}, {126, 40, BW40_LOW_PRIMARY, {149, 157}}, {127, 40, BW40_HIGH_PRIMARY, {153, 161}}, + {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, + 112, 116, 120, 124, 128, 132, 136, 140, 144, + 149, 153, 157, 161}}, {0, 0, 0, {0}}, }; @@ -99,19 +102,23 @@ regdm_op_class_map_t global_op_class[] = { regdm_op_class_map_t us_op_class[] = { {1, 20, BW20, {36, 40, 44, 48}}, {2, 20, BW20, {52, 56, 60, 64}}, - {4, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}}, + {4, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, + 144}}, {5, 20, BW20, {149, 153, 157, 161, 165}}, {12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}}, {22, 40, BW40_LOW_PRIMARY, {36, 44}}, {23, 40, BW40_LOW_PRIMARY, {52, 60}}, - {24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}}, + {24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132, 140}}, {26, 40, BW40_LOW_PRIMARY, {149, 157}}, {27, 40, BW40_HIGH_PRIMARY, {40, 48}}, {28, 40, BW40_HIGH_PRIMARY, {56, 64}}, - {29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, + {29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136, 144}}, {31, 40, BW40_HIGH_PRIMARY, {153, 161}}, {32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7}}, {33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11}}, + {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, + 112, 116, 120, 124, 128, 132, 136, 140, 144, + 149, 153, 157, 161}}, {0, 0, 0, {0}}, }; @@ -130,6 +137,8 @@ regdm_op_class_map_t euro_op_class[] = { {11, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9}}, {12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13}}, {17, 20, BW20, {149, 153, 157, 161, 165, 169}}, + {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, + 116, 120, 124, 128}}, {0, 0, 0, {0}}, }; @@ -146,6 +155,8 @@ regdm_op_class_map_t japan_op_class[] = { {41, 40, BW40_HIGH_PRIMARY, {40, 48}}, {42, 40, BW40_HIGH_PRIMARY, {56, 64}}, {44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, + {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, + 116, 120, 124, 128}}, {0, 0, 0, {0}}, }; diff --git a/CORE/SERVICES/WMA/regdomain_common.h b/CORE/SERVICES/WMA/regdomain_common.h index 0aa323ff6318..34500fbc76c7 100644 --- a/CORE/SERVICES/WMA/regdomain_common.h +++ b/CORE/SERVICES/WMA/regdomain_common.h @@ -80,7 +80,7 @@ #include <a_types.h> #include "wlan_defs.h" -#define MAX_CHANNELS_PER_OPERATING_CLASS 15 +#define MAX_CHANNELS_PER_OPERATING_CLASS 25 enum EnumRd { /* @@ -1842,6 +1842,7 @@ typedef enum offset BW20 = 0, BW40_LOW_PRIMARY = 1, BW40_HIGH_PRIMARY = 3, + BW80, BWALL } offset_t; |