Merge pull request ARMmbed#2067 from ARMmbed/IOTTHD-3413

MAC: Cleaning data indication callback

nanostack/platform/arm_hal_phy.h

@@ -54,6 +54,12 @@ typedef enum {
  PHY_LINK_CCA_PREPARE, /**< Prepare for CCA after CSMA-CA: changes to CCA channel and gives permission to TX. See PHY_LINK_CCA_PREPARE status definitions for return values */
 } phy_link_tx_status_e;
 
+/** MAC filtering modes. Set corresponding bit to 1 (1 << MAC_FRAME_VERSION_X) in PHY_EXTENSION_FILTERING_SUPPORT request when PHY can handle the filtering of this frame type.
+ * NOTE: Currently MAC supports filtering and Acking only 802.15.4-2015 frames. Any other frame version must be filtered and Acked by PHY with either HW or SW solution. */
+typedef enum {
+ MAC_FRAME_VERSION_2 = 2 /**< 802.15.4-2015 */
+} phy_link_filters_e;
+
 /** Extension types */
 typedef enum {
  PHY_EXTENSION_CTRL_PENDING_BIT, /**< Control MAC pending bit for indirect data. */
@@ -70,7 +76,8 @@ typedef enum {
  PHY_EXTENSION_GET_TIMESTAMP, /**< Read 32-bit constant monotonic time stamp in us */
  PHY_EXTENSION_SET_CSMA_PARAMETERS, /**< CSMA parameter's are given by phy_csma_params_t structure remember type cast uint8_t pointer to structure type*/
  PHY_EXTENSION_GET_SYMBOLS_PER_SECOND, /**< Read Symbols per seconds which will help to convert symbol time to real time */
- PHY_EXTENSION_SET_RF_CONFIGURATION /**< Set RF configuration using phy_rf_channel_parameters_s structure */
+ PHY_EXTENSION_SET_RF_CONFIGURATION, /**< Set RF configuration using phy_rf_channel_parameters_s structure */
+ PHY_EXTENSION_FILTERING_SUPPORT /**< Return filtering modes that can be supported by the PHY driver. See phy_link_filters_e */
 } phy_extension_type_e;
 
 /** Address types */

source/MAC/IEEE802_15_4/mac_defines.h

@@ -192,6 +192,7 @@ typedef struct protocol_interface_rf_mac_setup {
  unsigned macCurrentBE: 4;
  uint8_t macMaxCSMABackoffs;
  uint8_t backoff_period_in_10us; // max 2550us - it's 320us for standard 250kbps
+ uint8_t mac_frame_filters;
  /* MAC channel parameters */
  channel_list_s mac_channel_list;
  uint8_t scan_duration; //Needed???

source/MAC/IEEE802_15_4/mac_header_helper_functions.c

@@ -267,6 +267,9 @@ const uint8_t *mac_header_parse_fcf_dsn(mac_fcf_sequence_t *header, const uint8_
  } else {
  header->DSN = 0;
  }
+ //Check PanID presents at header
+ header->DstPanPresents = mac_dst_panid_present(header);
+ header->SrcPanPresents = mac_src_panid_present(header);
  return ptr;
 
 }

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -362,8 +362,6 @@ static int8_t mac_virtual_data_req_handler(protocol_interface_rf_mac_setup_s *rf
  }
 
  mac_header_parse_fcf_dsn(&buffer->fcf_dsn, data_ptr);
- buffer->fcf_dsn.DstPanPresents = mac_dst_panid_present(&buffer->fcf_dsn);
- buffer->fcf_dsn.SrcPanPresents = mac_src_panid_present(&buffer->fcf_dsn);
  // Use MAC sequence as handle
  buffer->msduHandle = buffer->fcf_dsn.DSN;
  memcpy(buffer->mac_payload, data_ptr, data_length);
@@ -982,11 +980,6 @@ static void mac_data_interface_frame_handler(mac_pre_parsed_frame_t *buf)
  mcps_sap_pre_parsed_frame_buffer_free(buf);
  return;
  }
-
- if (mac_filter_modify_link_quality(rf_mac_setup->mac_interface_id, buf) == 1) {
- mcps_sap_pre_parsed_frame_buffer_free(buf);
- return;
- }
  /* push data to stack if sniffer mode is enabled */
  if (rf_mac_setup->macProminousMode) {
  mac_nap_tun_data_handler(buf, rf_mac_setup);
@@ -1607,9 +1600,8 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
  return 0;
 }
 
-int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, const mac_fcf_sequence_t *fcf, const uint8_t *data_ptr, const mcps_ack_data_payload_t *ack_payload, uint32_t rx_time)
+int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, const mac_fcf_sequence_t *fcf, const uint8_t *data_ptr, const mcps_ack_data_payload_t *ack_payload)
 {
- (void)rx_time;
  phy_device_driver_s *dev_driver = rf_ptr->dev_driver->phy_driver;
  dev_driver_tx_buffer_s *tx_buf = &rf_ptr->dev_driver_tx_buffer;
 

source/MAC/IEEE802_15_4/mac_mcps_sap.h

@@ -214,6 +214,6 @@ uint8_t mcps_sap_purge_reg_handler(struct protocol_interface_rf_mac_setup *rf_ma
 
 int8_t mcps_pd_data_rebuild(struct protocol_interface_rf_mac_setup *rf_ptr, mac_pre_build_frame_t *buffer);
 
-int8_t mcps_generic_ack_build(struct protocol_interface_rf_mac_setup *rf_ptr, const mac_fcf_sequence_t *fcf, const uint8_t *data_ptr, const mcps_ack_data_payload_t *ack_payload, uint32_t rx_time);
+int8_t mcps_generic_ack_build(struct protocol_interface_rf_mac_setup *rf_ptr, const mac_fcf_sequence_t *fcf, const uint8_t *data_ptr, const mcps_ack_data_payload_t *ack_payload);
 
 #endif /* MAC_IEEE802_15_4_MAC_MCPS_SAP_H_ */

source/MAC/IEEE802_15_4/mac_mlme.c

@@ -1154,6 +1154,10 @@ protocol_interface_rf_mac_setup_s *mac_mlme_data_base_allocate(uint8_t *mac64, a
  bool rf_support = false;
  dev_driver->phy_driver->extension(PHY_EXTENSION_DYNAMIC_RF_SUPPORTED, (uint8_t *)&rf_support);
  entry->rf_csma_extension_supported = rf_support;
+ dev_driver->phy_driver->extension(PHY_EXTENSION_FILTERING_SUPPORT, (uint8_t *)&entry->mac_frame_filters);
+ if (entry->mac_frame_filters & (1 << MAC_FRAME_VERSION_2)) {
+ tr_debug("PHY supports 802.15.4-2015 frame filtering");
+ }
  mac_mlme_set_symbol_rate(entry);
 
  //How many 10us ticks backoff period is for waiting 20symbols which is typically 10 bytes time