Merge pull request #2135 from ARMmbed/IOTTHD-3232

MAC: Implemented PHY statistics

Author: Jarkko Paso

nanostack/platform/arm_hal_phy.h

@@ -184,6 +184,13 @@ typedef struct phy_device_channel_page_s {
     const phy_rf_channel_configuration_s *rf_channel_configuration; ///< Pointer to channel configuration
 } phy_device_channel_page_s;
 
+/** PHY statistics */
+typedef struct phy_rf_statistics_s {
+    uint32_t crc_fails;        ///< CRC failures
+    uint32_t tx_timeouts;      ///< transmission timeouts
+    uint32_t rx_timeouts;      ///< reception timeouts
+} phy_rf_statistics_s;
+
 /** Virtual data request */
 typedef struct virtual_data_req_s {
     uint16_t parameter_length;      /**< Length of user specified header. Can be zero. */
@@ -283,6 +290,7 @@ typedef struct phy_device_driver_s {
     arm_net_virtual_config_tx_fn *virtual_config_tx_cb;             /**< Virtual config send callback. Initialized by \ref arm_net_phy_register(). */
     arm_net_virtual_confirmation_rx_fn *virtual_confirmation_rx_cb; /**< Virtual confirmation receive callback. Initialized by \ref arm_net_phy_register(). */
     uint16_t tunnel_type; /**< Tun driver type. */
+    phy_rf_statistics_s *phy_rf_statistics;                         /**< PHY statistics. */
 } phy_device_driver_s;
 
 

nanostack/sw_mac.h

@@ -33,6 +33,7 @@ struct mac_api_s;
 struct mac_description_storage_size_s;
 struct fhss_api;
 struct mac_statistics_s;
+struct phy_rf_statistics_s;
 
 /**
  * @brief Creates 802.15.4 MAC API instance which will use RF driver given
@@ -81,6 +82,14 @@ extern struct fhss_api *ns_sw_mac_get_fhss_api(struct mac_api_s *mac_api);
  */
 extern int ns_sw_mac_statistics_start(struct mac_api_s *mac_api, struct mac_statistics_s *mac_statistics);
 
+/**
+ * @brief Start collecting statistics from PHY driver.
+ * @param mac_api MAC instance.
+ * @param phy_statistics Statistics storage.
+ * @return 0 on success, -1 on fail.
+ */
+extern int ns_sw_mac_phy_statistics_start(struct mac_api_s *mac_api, struct phy_rf_statistics_s *phy_statistics);
+
 /**
  * @brief Read current timestamp.
  * @param mac_api MAC instance.

source/MAC/IEEE802_15_4/sw_mac.c

@@ -700,6 +700,19 @@ void sw_mac_stats_update(protocol_interface_rf_mac_setup_s *setup, mac_stats_typ
     }
 }
 
+int ns_sw_mac_phy_statistics_start(struct mac_api_s *mac_api, phy_rf_statistics_s *phy_statistics)
+{
+    if (!mac_api || !phy_statistics) {
+        return -1;
+    }
+    protocol_interface_rf_mac_setup_s *mac_setup = get_sw_mac_ptr_by_mac_api(mac_api);
+    if (!mac_setup) {
+        return -1;
+    }
+    mac_setup->dev_driver->phy_driver->phy_rf_statistics = phy_statistics;
+    return 0;
+}
+
 uint32_t ns_sw_mac_read_current_timestamp(struct mac_api_s *mac_api)
 {
     if (!mac_api) {