Skip to content

Commit 29c5187

Browse files
Konstantinos Sotiropoulosjoerchan
authored andcommitted
mpsl: rev a6eb2142530bae19b27388929bdf101f1c280856
CHANGELOG.rst contains the list of changes. Signed-off-by: Konstantinos Sotiropoulos <[email protected]> (cherry picked from commit 6f38908) Signed-off-by: Joakim Andersson <[email protected]>
1 parent df3d5aa commit 29c5187

File tree

13 files changed

+30
-16
lines changed

13 files changed

+30
-16
lines changed

mpsl/CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Added
1717

1818
* Added a new signal to the MPSL timeslot: ``MPSL_TIMESLOT_SIGNAL_OVERSTAYED``.
1919
This signal is given to the application when a timeslot session is closed too late. (DRGN-14677)
20-
20+
2121
* Added a new clock configuration option :c:member:`skip_wait_lfclk_started` in :c:struct:`mpsl_clock_lfclk_cfg_t`,
2222
which does not wait for the start of Low Frequency Clock. (DRGN-14204)
23-
23+
2424
* Added macro MPSL_RESERVED_PPI_CHANNELS for a bit mask of (D)PPI channels
2525
reserved by MPSL (DRGN-13356).
2626

mpsl/include/mpsl.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ int32_t mpsl_init(mpsl_clock_lfclk_cfg_t const * p_clock_config, IRQn_Type low_p
8181
void mpsl_uninit(void);
8282

8383
/** @brief Returns true if MPSL is already initialized, false otherwise.
84+
*
85+
* @returns True if initialized, false if not.
8486
*/
8587
bool mpsl_is_initialized(void);
8688

mpsl/include/mpsl_fem_protocol_api.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@ typedef struct
4949
/** Implementation of the event. */
5050
union
5151
{
52+
/** Parameters when type is @ref MPSL_FEM_EVENT_TYPE_TIMER. */
5253
struct
5354
{
5455
/** Pointer to a 1-us resolution timer instance. */
5556
NRF_TIMER_Type * p_timer_instance;
57+
58+
/** Counter period parameters */
5659
struct
5760
{
5861
/** Timer value when the Front End Module can start preparing PA/LNA. */
@@ -61,10 +64,13 @@ typedef struct
6164
uint32_t end;
6265
/** Time interval in which the timer should start and end. */
6366
} counter_period;
67+
6468
/** Mask of the compare channels that can be used by the Front End Module to schedule its own tasks. */
6569
uint8_t compare_channel_mask;
6670
/** Event generated by the timer, used in case of type equal to @ref mpsl_fem_event_type_t::MPSL_FEM_EVENT_TYPE_TIMER. */
6771
} timer;
72+
73+
/** Parameters when type is @ref MPSL_FEM_EVENT_TYPE_GENERIC. */
6874
struct
6975
{
7076
/** Address of event register. */

mpsl/include/mpsl_timeslot.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,12 @@ typedef mpsl_timeslot_signal_return_param_t * (*mpsl_timeslot_callback_t) (mpsl_
247247
*
248248
* @note Resource configuration can only be performed when all timeslots are closed.
249249
*
250-
* void* p_mem; Pointer to a memory location for timeslot sessions.
251-
* The size of the memory block needs to be at least n_sessions * MPSL_TIMESLOT_CONTEXT_SIZE bytes.
250+
* @param[in] p_mem Pointer to a memory location for timeslot sessions.
251+
* The size of the memory block needs to be at least
252+
* n_sessions * @ref MPSL_TIMESLOT_CONTEXT_SIZE bytes.
252253
* The memory needs to reside in RAM.
253254
* The pointer needs to be aligned to a 4-byte boundary.
254-
* uint8_t n_sessions Number of timeslot sessions.
255+
* @param[in] n_sessions Number of timeslot sessions.
255256
* Maximum number of supported timeslot sessions is @ref MPSL_TIMESLOT_CONTEXT_COUNT_MAX.
256257
*
257258
* @retval 0 The configuration was applied successfully.

mpsl/include/mpsl_tx_power.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef enum
3838
MPSL_PHY_BLE_2M,
3939
MPSL_PHY_BLE_LR125Kbit,
4040
MPSL_PHY_BLE_LR500Kbit,
41-
MPSL_PHY_Ieee802154_250Kbit
41+
MPSL_PHY_Ieee802154_250Kbit,
4242
} mpsl_phy_t;
4343

4444
/** TX power, dBm. */
@@ -50,14 +50,19 @@ typedef struct
5050
mpsl_phy_t phy; /**< The PHY that this envelope applies to. */
5151
union
5252
{
53+
/** Tx power per channel when @ref mpsl_tx_power_envelope_t::phy is a Bluetooth LE PHY. */
5354
mpsl_tx_power_t tx_power_ble[MPSL_TOTAL_NUM_OF_BLE_CHANNELS];
55+
56+
/** Tx power per channel when @ref mpsl_tx_power_envelope_t::phy is a 802.15.4 PHY. */
5457
mpsl_tx_power_t tx_power_802154[MPSL_TOTAL_NUM_OF_802154_CHANNELS];
55-
} envelope; /**< Array of maximum TX power value per channel. From 11 to 26 for 802.15.4 protocol. From 0 to 40 for Bluetooth LE protocol. */
58+
} envelope; /**< Array of maximum TX power value per channel. From 11 to 26 for 802.15.4 protocol.
59+
From 0 to 40 for Bluetooth LE protocol. */
5660
} mpsl_tx_power_envelope_t;
5761

5862
/** @brief Sets maximum TX power envelope. If the PHY already has an envelope configured, it will be over-written.
5963
*
60-
* @note Calling this function while an envelope is being used to limit current TX Power may lead to undefined behavior.
64+
* @note Calling this function while an envelope is being used to limit current TX Power
65+
* may lead to undefined behavior.
6166
*
6267
* @note The memory for the provided envelope is not copied and must be valid until it is replaced
6368
* with another envelope for the same PHY.
0 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
description: Multi-Protocol Service Layer (MPSL)
2-
git_revision: 2b7721e4d01d50621f6e8585babab3a3313c9a6e
3-
timestamp: '2021-02-09T12:39:09Z'
2+
git_revision: a6eb2142530bae19b27388929bdf101f1c280856
3+
timestamp: '2021-02-25T17:53:33Z'
0 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
description: Multi-Protocol Service Layer (MPSL)
2-
git_revision: 2b7721e4d01d50621f6e8585babab3a3313c9a6e
3-
timestamp: '2021-02-09T12:37:01Z'
2+
git_revision: a6eb2142530bae19b27388929bdf101f1c280856
3+
timestamp: '2021-02-25T17:54:23Z'
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)