FHSS: Read timestamp from MAC/PHY instead of using FHSS own timestamp

Author: Jarkko Paso

nanostack/fhss_api.h

@@ -215,6 +215,13 @@ typedef int mac_read_mac_address(const fhss_api_t *fhss_api, uint8_t *mac_addres
  */
 typedef uint32_t mac_read_datarate(const fhss_api_t *fhss_api);
 
+/**
+ * @brief Read 32-bit timestamp.
+ * @param fhss_api FHSS instance.
+ * @return Timestamp.
+ */
+typedef uint32_t mac_read_timestamp(const fhss_api_t *fhss_api);
+
 /**
  * @brief Change channel.
  * @param fhss_api FHSS instance.
@@ -287,6 +294,7 @@ struct fhss_callback {
     mac_read_tx_queue_size *read_tx_queue_size;                 /**< Read MAC TX queue size. */
     mac_read_mac_address *read_mac_address;                     /**< Read MAC address. */
     mac_read_datarate *read_datarate;                           /**< Read PHY datarate. */
+    mac_read_timestamp *read_timestamp;                         /**< Read timestamp. */
     mac_change_channel *change_channel;                         /**< Change channel. */
     mac_send_fhss_frame *send_fhss_frame;                       /**< Send FHSS frame. */
     mac_synch_lost_notification *synch_lost_notification;       /**< Send notification when FHSS synchronization is lost. */

source/MAC/IEEE802_15_4/mac_fhss_callbacks.c

@@ -65,6 +65,17 @@ uint32_t mac_read_phy_datarate(const fhss_api_t *fhss_api)
     return datarate;
 }
 
+uint32_t mac_read_phy_timestamp(const fhss_api_t *fhss_api)
+{
+    protocol_interface_rf_mac_setup_s *mac_setup = get_sw_mac_ptr_by_fhss_api(fhss_api);
+    if (!mac_setup) {
+        return 0;
+    }
+    uint32_t timestamp;
+    mac_setup->dev_driver->phy_driver->extension(PHY_EXTENSION_GET_TIMESTAMP, (uint8_t *)&timestamp);
+    return timestamp;
+}
+
 int mac_set_channel(const fhss_api_t *fhss_api, uint8_t channel_number)
 {
     protocol_interface_rf_mac_setup_s *mac_setup = get_sw_mac_ptr_by_fhss_api(fhss_api);

source/MAC/IEEE802_15_4/mac_fhss_callbacks.h

@@ -21,6 +21,7 @@
 uint16_t mac_read_tx_queue_sizes(const fhss_api_t *fhss_api, bool broadcast_queue);
 int mac_read_64bit_mac_address(const fhss_api_t *fhss_api, uint8_t *mac_address);
 uint32_t mac_read_phy_datarate(const fhss_api_t *fhss_api);
+uint32_t mac_read_phy_timestamp(const fhss_api_t *fhss_api);
 int mac_set_channel(const fhss_api_t *fhss_api, uint8_t channel_number);
 int mac_fhss_frame_tx(const fhss_api_t *fhss_api, int frame_type);
 int mac_synch_lost(const fhss_api_t *fhss_api);

source/MAC/IEEE802_15_4/sw_mac.c

@@ -176,6 +176,7 @@ int ns_sw_mac_fhss_register(mac_api_t *mac_api, fhss_api_t *fhss_api)
     fhss_callback_t callbacks;
     callbacks.read_tx_queue_size = &mac_read_tx_queue_sizes;
     callbacks.read_datarate = &mac_read_phy_datarate;
+    callbacks.read_timestamp = &mac_read_phy_timestamp;
     callbacks.read_mac_address = &mac_read_64bit_mac_address;
     callbacks.change_channel = &mac_set_channel;
     callbacks.send_fhss_frame = &mac_fhss_frame_tx;

source/Service_Libs/fhss/fhss_ws.c

@@ -174,7 +174,7 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
     }
     cur_slot--;
     uint32_t remaining_time = (fhss_structure->platform_functions.fhss_get_remaining_slots(fhss_unicast_handler, fhss_structure->fhss_api) / 1000);
-    uint32_t time_to_tx = (tx_time - fhss_structure->fhss_api->read_timestamp(fhss_structure->fhss_api)) / 1000;
+    uint32_t time_to_tx = (tx_time - fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api)) / 1000;
     uint64_t ms_since_seq_start = (cur_slot * dwell_time) + (dwell_time-remaining_time) + time_to_tx;
     uint32_t seq_length = 0x10000;
     if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_TR51CF) {
@@ -193,7 +193,7 @@ static uint32_t fhss_ws_calculate_broadcast_interval_offset(fhss_structure_t *fh
     if (fhss_structure->ws->is_on_bc_channel == true) {
         remaining_time += (broadcast_interval - dwell_time);
     }
-    uint32_t time_to_tx = (tx_time - fhss_structure->fhss_api->read_timestamp(fhss_structure->fhss_api)) / 1000;
+    uint32_t time_to_tx = (tx_time - fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api)) / 1000;
     return (broadcast_interval-remaining_time) + time_to_tx;
 }
 
@@ -592,7 +592,7 @@ int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure)
     fhss_structure->fhss_api->data_tx_done = &fhss_ws_data_tx_done_callback;
     fhss_structure->fhss_api->data_tx_fail = &fhss_ws_data_tx_fail_callback;
     fhss_structure->fhss_api->synch_state_set = &fhss_ws_synch_state_set_callback;
-    fhss_structure->fhss_api->read_timestamp = &fhss_read_timestamp_cb;
+    fhss_structure->fhss_api->read_timestamp = NULL;
     fhss_structure->fhss_api->get_retry_period = NULL;
     fhss_structure->fhss_api->write_synch_info = &fhss_ws_write_synch_info_callback;
     fhss_structure->fhss_api->init_callbacks = &fhss_init_callbacks_cb;
@@ -612,7 +612,7 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
         return -1;
     }
 
-    uint32_t time_from_reception_ms = (fhss_structure->fhss_api->read_timestamp(fhss_structure->fhss_api) - bc_timing_info->bt_rx_timestamp)/1000;
+    uint32_t time_from_reception_ms = (fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - bc_timing_info->bt_rx_timestamp)/1000;
     uint32_t true_bc_interval_offset = (bc_timing_info->broadcast_interval_offset + time_from_reception_ms) % bc_timing_info->broadcast_interval;
     uint32_t timeout = ((bc_timing_info->broadcast_interval-true_bc_interval_offset)*1000);
     fhss_start_timer(fhss_structure, timeout, fhss_broadcast_handler);