(via MbedOS) ws: added support for brazilian regulatory domain

artokin · May 13, 2020 · f7a15fa · f7a15fa
1 parent c397edb
commit f7a15fa
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 9 deletions.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -545,8 +545,8 @@ static uint8_t ws_generate_exluded_channel_list_from_active_channels(ws_excluded
 
 static void ws_fhss_configure_channel_masks(protocol_interface_info_entry_t *cur, fhss_ws_configuration_t *fhss_configuration)
 {
- ws_generate_channel_list(fhss_configuration->channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
- ws_generate_channel_list(fhss_configuration->unicast_channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+ ws_generate_channel_list(fhss_configuration->channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain, cur->ws_info->hopping_schdule.operating_class);
+ ws_generate_channel_list(fhss_configuration->unicast_channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain, cur->ws_info->hopping_schdule.operating_class);
  // using bitwise AND operation for user set channel mask to remove channels not allowed in this device
  for (uint8_t n = 0; n < 8; n++) {
  fhss_configuration->unicast_channel_mask[n] &= cur->ws_info->cfg->fhss.fhss_channel_mask[n];
@@ -2832,7 +2832,7 @@ static void ws_set_asynch_channel_list(protocol_interface_info_entry_t *cur, asy
  uint16_t channel_number = cur->ws_info->cfg->fhss.fhss_uc_fixed_channel;
  async_req->channel_list.channel_mask[0 + (channel_number / 32)] = (1 << (channel_number % 32));
  } else {
- ws_generate_channel_list(async_req->channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+ ws_generate_channel_list(async_req->channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain, cur->ws_info->hopping_schdule.operating_class);
  }
 
  async_req->channel_list.channel_page = CHANNEL_PAGE_10;

diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c
@@ -49,12 +49,34 @@ uint8_t DEVICE_MIN_SENS = 174 - 93;
 
 uint16_t test_max_child_count_override = 0xffff;
 
-
-int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_channels, uint8_t regulatory_domain)
+int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_channels, uint8_t regulatory_domain, uint8_t operating_class)
 {
- (void)regulatory_domain;
- for (uint8_t i = 0; i < number_of_channels; i++) {
- channel_mask[0 + (i / 32)] |= (1 << (i % 32));
+ uint32_t excluded_start_channel = 0xFFFFFFFF;
+ uint32_t excluded_end_channel = 0xFFFFFFFF;
+
+ if (regulatory_domain == REG_DOMAIN_BZ) {
+ if (operating_class == 1) {
+ excluded_start_channel = 26;
+ excluded_end_channel = 64;
+ } else if (operating_class == 2) {
+ excluded_start_channel = 12;
+ excluded_end_channel = 32;
+ } else if (operating_class == 3) {
+ excluded_start_channel = 7;
+ excluded_end_channel = 21;
+ }
+ }
+
+ // Clear channel mask
+ for (uint8_t i = 0; i < 8; i++) {
+ channel_mask[i] = 0;
+ }
+
+ // Set channel maks outside excluded channels
+ for (uint16_t i = 0; i < number_of_channels; i++) {
+ if (i < excluded_start_channel || i > excluded_end_channel) {
+ channel_mask[0 + (i / 32)] |= (1 << (i % 32));
+ }
  }
  return 0;
 }
@@ -159,6 +181,19 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur,
  } else {
  return -1;
  }
+ } else if (hopping_schdule->regulatory_domain == REG_DOMAIN_BZ) {
+ if (hopping_schdule->operating_class == 1) {
+ hopping_schdule->ch0_freq = 9022;
+ hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+ } else if (hopping_schdule->operating_class == 2) {
+ hopping_schdule->ch0_freq = 9024;
+ hopping_schdule->channel_spacing = CHANNEL_SPACING_400;
+ } else if (hopping_schdule->operating_class == 3) {
+ hopping_schdule->ch0_freq = 9026;
+ hopping_schdule->channel_spacing = CHANNEL_SPACING_600;
+ } else {
+ return -1;
+ }
  } else if (hopping_schdule->regulatory_domain == REG_DOMAIN_JP) {
  if (hopping_schdule->operating_class == 1) {
  hopping_schdule->ch0_freq = 9206;
@@ -189,6 +224,7 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur,
  if (!hopping_schdule->number_of_channels) {
  return -1;
  }
+
  return 0;
 }
 
@@ -232,6 +268,14 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
  } else if (operating_class == 3) {
  return 12;
  }
+ } else if (regulatory_domain == REG_DOMAIN_BZ) {
+ if (operating_class == 1) {
+ return 129;
+ } else if (operating_class == 2) {
+ return 64;
+ } else if (operating_class == 3) {
+ return 42;
+ }
  } else if (regulatory_domain == REG_DOMAIN_WW) {
  if (operating_class == 1) {
  // TODO we dont support this yet, but it is used as test value

diff --git a/source/6LoWPAN/ws/ws_common.h b/source/6LoWPAN/ws/ws_common.h
@@ -113,7 +113,7 @@ typedef struct ws_info_s {
 
 #ifdef HAVE_WS
 
-int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_channels, uint8_t regulatory_domain);
+int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_channels, uint8_t regulatory_domain, uint8_t operating_class);
 
 uint32_t ws_decode_channel_spacing(uint8_t channel_spacing);