Skip to content

Commit

Permalink
Merge branch 'release_internal' into release_external
Browse files Browse the repository at this point in the history
* release_internal:
  Renamed symbol to micro seconds.
  Added ND proxy support to ws border router
  • Loading branch information
deepakvenugopal committed Aug 8, 2018
2 parents 27ba18e + b693eae commit 4a188ea
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nanostack/platform/arm_hal_phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ typedef enum {
PHY_EXTENSION_CONVERT_SIGNAL_INFO, /**< Convert signal info. */
PHY_EXTENSION_ACCEPT_ANY_BEACON, /**< Set boolean true or false for accept beacon from other Pan-ID than configured. Default value should be false */
PHY_EXTENSION_SET_TX_TIME, /**< Net library sets transmission time based on global time stamp. Max. 65ms from setting to TX. If TX time is set to zero, it should be ignored.*/
PHY_EXTENSION_READ_RX_TIME, /**< Read the time of last reception based on global symbol time stamp. */
PHY_EXTENSION_READ_TX_FINNISH_TIME, /**< Read the time of last finished TX symbol based on global time stamp. */
PHY_EXTENSION_READ_RX_TIME, /**< Read the time of last reception based on global micro seconds time stamp. */
PHY_EXTENSION_READ_TX_FINNISH_TIME, /**< Read the time of last finished TX micro seconds based on global time stamp. */
PHY_EXTENSION_DYNAMIC_RF_SUPPORTED, /**< Read status for support Radio driver support for set TX time, CCA and Timestamp read. Also PHY_LINK_CCA_PREPARE tx status must be supported also*/
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*/
Expand Down

0 comments on commit 4a188ea

Please sign in to comment.