Skip to content

Commit ab651bf

Browse files
Rafal-Nordicanangl
Rafal-Nordic
authored and
anangl
committed
nrfs: Added explicit enum values
Added explicit enum values for better resistance to change Signed-off-by: Rafal Dyla <[email protected]>
1 parent a657948 commit ab651bf

20 files changed

+110
-110
lines changed

‎nrfs/include/internal/requests/nrfs_reqs_common.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,20 @@
5252
extern "C" {
5353
#endif
5454

55+
/* Warning! Do not change the order of this enumeration */
5556
enum {
56-
NRFS_SERVICE_ID_CLOCK,
57-
NRFS_SERVICE_ID_DIAG,
58-
NRFS_SERVICE_ID_DVFS,
59-
NRFS_SERVICE_ID_GDPWR,
60-
NRFS_SERVICE_ID_MRAM,
61-
NRFS_SERVICE_ID_PMIC,
62-
NRFS_SERVICE_ID_RESET,
63-
NRFS_SERVICE_ID_TEMP,
64-
NRFS_SERVICE_ID_USB,
65-
NRFS_SERVICE_ID_GDFS,
66-
NRFS_SERVICE_ID_SWEXT,
67-
NRFS_SERVICE_ID_AUDIOPLL
57+
NRFS_SERVICE_ID_CLOCK = 0,
58+
NRFS_SERVICE_ID_DIAG = 1,
59+
NRFS_SERVICE_ID_DVFS = 2,
60+
NRFS_SERVICE_ID_GDPWR = 3,
61+
NRFS_SERVICE_ID_MRAM = 4,
62+
NRFS_SERVICE_ID_PMIC = 5,
63+
NRFS_SERVICE_ID_RESET = 6,
64+
NRFS_SERVICE_ID_TEMP = 7,
65+
NRFS_SERVICE_ID_USB = 8,
66+
NRFS_SERVICE_ID_GDFS = 9,
67+
NRFS_SERVICE_ID_SWEXT = 10,
68+
NRFS_SERVICE_ID_AUDIOPLL = 11,
6869
};
6970

7071
#ifdef __cplusplus

‎nrfs/include/internal/services/nrfs_clock.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,28 @@ typedef enum __NRFS_PACKED {
2828

2929
/** @brief Clock source option. */
3030
typedef enum __NRFS_PACKED {
31-
NRFS_CLOCK_SRC_LFCLK_DEFAULT = 0,
32-
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT,
33-
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT_HP,
31+
NRFS_CLOCK_SRC_LFCLK_DEFAULT = 0,
32+
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT = 1,
33+
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT_HP = 2,
3434

35-
NRFS_CLOCK_SRC_LFCLK_LFLPRC,
36-
NRFS_CLOCK_SRC_LFCLK_LFRC,
35+
NRFS_CLOCK_SRC_LFCLK_LFLPRC = 3,
36+
NRFS_CLOCK_SRC_LFCLK_LFRC = 4,
3737

38-
NRFS_CLOCK_SRC_LFCLK_XO_PIXO,
39-
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE,
40-
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE,
41-
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SQUARE,
38+
NRFS_CLOCK_SRC_LFCLK_XO_PIXO = 5,
39+
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE = 6,
40+
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE = 7,
41+
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SQUARE = 8,
4242

43-
NRFS_CLOCK_SRC_LFCLK_SYNTH,
43+
NRFS_CLOCK_SRC_LFCLK_SYNTH = 9,
4444

45-
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE_HP,
46-
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE_HP,
45+
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE_HP = 10,
46+
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE_HP = 11,
4747
}nrfs_clock_src_t;
4848

4949
/** @brief HSFLL120 Mode options. */
5050
typedef enum __NRFS_PACKED {
5151
NRFS_CLOCK_HSFLL_MODE_OPEN = 0,
52-
NRFS_CLOCK_HSFLL_MODE_CLOSED,
52+
NRFS_CLOCK_HSFLL_MODE_CLOSED = 1,
5353
}nrfs_clock_hsfll_mode_t;
5454

5555
/** @brief Clock service notification data structure. */

‎nrfs/include/internal/services/nrfs_diag.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ extern "C" {
1515

1616
/** @brief System Diagnostics register access type. */
1717
typedef enum __NRFS_PACKED {
18-
DIAG_REG_READ = 0, /** Register read */
19-
DIAG_REG_WRITE, /** Register write */
20-
DIAG_REG_INVALID, /** Register access invalid */
18+
DIAG_REG_READ = 0, /** Register read */
19+
DIAG_REG_WRITE = 1, /** Register write */
20+
DIAG_REG_INVALID = 2, /** Register access invalid */
2121
} diag_reg_access_type_t;
2222

2323
/** @brief System Diagnostics register access. */

‎nrfs/include/internal/services/nrfs_gdpwr.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ extern "C" {
1515

1616
/** @brief Power domain selection */
1717
typedef enum __NRFS_PACKED {
18-
GDPWR_GD_FAST_ACTIVE_0,
19-
GDPWR_GD_FAST_ACTIVE_1,
20-
GDPWR_GD_FAST_MAIN,
21-
GDPWR_GD_SLOW_ACTIVE,
22-
GDPWR_GD_SLOW_MAIN
18+
GDPWR_GD_FAST_ACTIVE_0 = 0,
19+
GDPWR_GD_FAST_ACTIVE_1 = 1,
20+
GDPWR_GD_FAST_MAIN = 2,
21+
GDPWR_GD_SLOW_ACTIVE = 3,
22+
GDPWR_GD_SLOW_MAIN = 4,
2323
} gdpwr_power_domain_t;
2424

2525
typedef enum __NRFS_PACKED {
26-
GDPWR_POWER_REQUEST_CLEAR,
27-
GDPWR_POWER_REQUEST_SET
26+
GDPWR_POWER_REQUEST_CLEAR = 0,
27+
GDPWR_POWER_REQUEST_SET = 1,
2828
} gdpwr_request_type_t;
2929

3030
/** @brief Power domain data structure. */

‎nrfs/include/internal/services/nrfs_mram.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ extern "C" {
1515

1616
/** @brief MRAM set latency requests. */
1717
typedef enum __NRFS_PACKED {
18-
MRAM_LATENCY_ALLOWED,
19-
MRAM_LATENCY_NOT_ALLOWED,
20-
MRAM_LATENCY_INTERNAL_REQ
18+
MRAM_LATENCY_ALLOWED = 0,
19+
MRAM_LATENCY_NOT_ALLOWED = 1,
20+
MRAM_LATENCY_INTERNAL_REQ = 2,
2121
} mram_latency_request_t;
2222

2323
/** @brief MRAM set latency data structure. */

‎nrfs/include/internal/services/nrfs_pmic.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,34 @@ typedef enum __NRFS_PACKED {
2121

2222
/** @brief PMIC BLE RADIO TX power. */
2323
typedef enum __NRFS_PACKED {
24-
PMIC_BLE_RADIO_TXPOWER_POS10DBM, /** +10 dBm */
25-
PMIC_BLE_RADIO_TXPOWER_POS9DBM, /** +9 dBm */
26-
PMIC_BLE_RADIO_TXPOWER_POS8DBM, /** +8 dBm */
27-
PMIC_BLE_RADIO_TXPOWER_POS7DBM, /** +7 dBm */
28-
PMIC_BLE_RADIO_TXPOWER_POS6DBM, /** +6 dBm */
29-
PMIC_BLE_RADIO_TXPOWER_POS5DBM, /** +5 dBm */
30-
PMIC_BLE_RADIO_TXPOWER_POS4DBM, /** +4 dBm */
31-
PMIC_BLE_RADIO_TXPOWER_POS3DBM, /** +3 dBm */
32-
PMIC_BLE_RADIO_TXPOWER_POS2DBM, /** +2 dBm */
33-
PMIC_BLE_RADIO_TXPOWER_POS1DBM, /** +1 dBm */
34-
PMIC_BLE_RADIO_TXPOWER_0DBM, /** 0 dBm */
35-
PMIC_BLE_RADIO_TXPOWER_NEG1DBM, /** -1 dBm */
36-
PMIC_BLE_RADIO_TXPOWER_NEG2DBM, /** -2 dBm */
37-
PMIC_BLE_RADIO_TXPOWER_NEG4DBM, /** -4 dBm */
38-
PMIC_BLE_RADIO_TXPOWER_NEG8DBM, /** -8 dBm */
39-
PMIC_BLE_RADIO_TXPOWER_NEG12DBM, /** -12 dBm */
40-
PMIC_BLE_RADIO_TXPOWER_NEG16DBM, /** -16 dBm */
41-
PMIC_BLE_RADIO_TXPOWER_NEG20DBM, /** -20 dBm */
42-
PMIC_BLE_RADIO_TXPOWER_NEG30DBM, /** -30 dBm */
43-
PMIC_BLE_RADIO_TXPOWER_NEG40DBM, /** -40 dBm */
44-
PMIC_BLE_RADIO_TXPOWER_NEG70DBM /** -70 dBm */
24+
PMIC_BLE_RADIO_TXPOWER_POS10DBM = 0, /** +10 dBm */
25+
PMIC_BLE_RADIO_TXPOWER_POS9DBM = 1, /** +9 dBm */
26+
PMIC_BLE_RADIO_TXPOWER_POS8DBM = 2, /** +8 dBm */
27+
PMIC_BLE_RADIO_TXPOWER_POS7DBM = 3, /** +7 dBm */
28+
PMIC_BLE_RADIO_TXPOWER_POS6DBM = 4, /** +6 dBm */
29+
PMIC_BLE_RADIO_TXPOWER_POS5DBM = 5, /** +5 dBm */
30+
PMIC_BLE_RADIO_TXPOWER_POS4DBM = 6, /** +4 dBm */
31+
PMIC_BLE_RADIO_TXPOWER_POS3DBM = 7, /** +3 dBm */
32+
PMIC_BLE_RADIO_TXPOWER_POS2DBM = 8, /** +2 dBm */
33+
PMIC_BLE_RADIO_TXPOWER_POS1DBM = 9, /** +1 dBm */
34+
PMIC_BLE_RADIO_TXPOWER_0DBM = 10, /** 0 dBm */
35+
PMIC_BLE_RADIO_TXPOWER_NEG1DBM = 11, /** -1 dBm */
36+
PMIC_BLE_RADIO_TXPOWER_NEG2DBM = 12, /** -2 dBm */
37+
PMIC_BLE_RADIO_TXPOWER_NEG4DBM = 13, /** -4 dBm */
38+
PMIC_BLE_RADIO_TXPOWER_NEG8DBM = 14, /** -8 dBm */
39+
PMIC_BLE_RADIO_TXPOWER_NEG12DBM = 15, /** -12 dBm */
40+
PMIC_BLE_RADIO_TXPOWER_NEG16DBM = 16, /** -16 dBm */
41+
PMIC_BLE_RADIO_TXPOWER_NEG20DBM = 17, /** -20 dBm */
42+
PMIC_BLE_RADIO_TXPOWER_NEG30DBM = 18, /** -30 dBm */
43+
PMIC_BLE_RADIO_TXPOWER_NEG40DBM = 19, /** -40 dBm */
44+
PMIC_BLE_RADIO_TXPOWER_NEG70DBM = 20, /** -70 dBm */
4545
} pmic_ble_radio_txpower_t;
4646

4747
/** @brief PMIC TEST IF register access type. */
4848
typedef enum __NRFS_PACKED {
49-
PMIC_REG_READ, /** Register read */
50-
PMIC_REG_WRITE, /** Register write */
51-
PMIC_REG_INVALID, /** Register access invalid */
49+
PMIC_REG_READ = 0, /** Register read */
50+
PMIC_REG_WRITE = 1, /** Register write */
51+
PMIC_REG_INVALID = 2, /** Register access invalid */
5252
} pmic_reg_access_type_t;
5353

5454
/** @brief PMIC TEST IF register access. */
@@ -130,8 +130,8 @@ typedef struct __NRFS_PACKED {
130130

131131
/** @brief PMIC available info. */
132132
typedef enum __NRFS_PACKED {
133-
PMIC_NOT_AVAILABLE,
134-
PMIC_AVAILABLE
133+
PMIC_NOT_AVAILABLE = 0,
134+
PMIC_AVAILABLE = 1,
135135
} pmic_available_t;
136136

137137
/** @brief PMIC info data structure. */

‎nrfs/include/internal/services/nrfs_swext.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ extern "C" {
1515

1616
/** @brief SWEXT pdclamp options. */
1717
typedef enum __NRFS_PACKED {
18-
SWEXT_PD_CLAMP_DISABLED,
19-
SWEXT_PD_CLAMP_ENABLED
18+
SWEXT_PD_CLAMP_DISABLED = 0,
19+
SWEXT_PD_CLAMP_ENABLED = 1,
2020
} swext_pd_clamp_t;
2121

2222
/** @brief SWEXT data structure. */
@@ -34,8 +34,8 @@ typedef struct __NRFS_PACKED {
3434

3535
/** @brief SWEXT response status. */
3636
typedef enum __NRFS_PACKED {
37-
SWEXT_OUTPUT_ENABLED,
38-
SWEXT_OVERCURRENT
37+
SWEXT_OUTPUT_ENABLED = 0,
38+
SWEXT_OVERCURRENT = 1,
3939
} nrfs_swext_status_t;
4040

4141
/** @brief SWEXT notification structure. */

‎nrfs/include/nrfs_common.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
/** @brief Return codes. */
2626
typedef enum __NRFS_PACKED {
27-
NRFS_SUCCESS, /**< Success. */
28-
NRFS_ERR_INVALID_STATE, /**< Invalid state. */
29-
NRFS_ERR_IPC, /**< IPC error. */
27+
NRFS_SUCCESS = 0, /** Success. */
28+
NRFS_ERR_INVALID_STATE = 1, /** Invalid state. */
29+
NRFS_ERR_IPC = 2, /** IPC error. */
3030
} nrfs_err_t;
3131

3232
#endif /* NRFS_COMMON_H */

‎nrfs/include/services/nrfs_audiopll.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ extern "C" {
1515

1616
/** @brief Audio PLL service event types. */
1717
typedef enum __NRFS_PACKED {
18-
NRFS_AUDIOPLL_EVT_ENABLED, /** Audio PLL enabled. */
19-
NRFS_AUDIOPLL_EVT_DISABLED, /** Audio PLL disabled. */
20-
NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED, /** Audio PLL new frequency setting confirmed. */
21-
NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED, /** Audio PLL new prescaler setting confirmed. */
22-
NRFS_AUDIOPLL_EVT_FREQ_INC_CONFIRMED, /** Audio PLL new frequency inc setting. */
23-
NRFS_AUDIOPLL_EVT_REJECT, /** Request rejected. */
18+
NRFS_AUDIOPLL_EVT_ENABLED = 0, /** Audio PLL enabled. */
19+
NRFS_AUDIOPLL_EVT_DISABLED = 1, /** Audio PLL disabled. */
20+
NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED = 2, /** Audio PLL new frequency setting confirmed. */
21+
NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED = 3, /** Audio PLL new prescaler setting confirmed. */
22+
NRFS_AUDIOPLL_EVT_FREQ_INC_CONFIRMED = 4, /** Audio PLL new frequency inc setting. */
23+
NRFS_AUDIOPLL_EVT_REJECT = 5, /** Request rejected. */
2424
} nrfs_audiopll_evt_type_t;
2525

2626
/** @brief Audio PLL service response data structure. */

‎nrfs/include/services/nrfs_clock.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ extern "C" {
1515

1616
/** @brief Clock service event types. */
1717
typedef enum __NRFS_PACKED {
18-
NRFS_CLOCK_EVT_APPLIED, /** Request applied successfully. */
19-
NRFS_CLOCK_EVT_REJECT, /** Request rejected. */
20-
NRFS_CLOCK_EVT_CHANGE, /** Clock event changed. */
18+
NRFS_CLOCK_EVT_APPLIED = 0, /** Request applied successfully. */
19+
NRFS_CLOCK_EVT_REJECT = 1, /** Request rejected. */
20+
NRFS_CLOCK_EVT_CHANGE = 2, /** Clock event changed. */
2121
} nrfs_clock_evt_type_t;
2222

2323
/** @brief Clock service event. */

0 commit comments

Comments
 (0)