Skip to content

nrfs: Added explicit enum values #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

nrfs: Added explicit enum values #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions nrfs/include/internal/requests/nrfs_reqs_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,20 @@
extern "C" {
#endif

/* Warning! Do not change the order of this enumeration */
enum {
NRFS_SERVICE_ID_CLOCK,
NRFS_SERVICE_ID_DIAG,
NRFS_SERVICE_ID_DVFS,
NRFS_SERVICE_ID_GDPWR,
NRFS_SERVICE_ID_MRAM,
NRFS_SERVICE_ID_PMIC,
NRFS_SERVICE_ID_RESET,
NRFS_SERVICE_ID_TEMP,
NRFS_SERVICE_ID_USB,
NRFS_SERVICE_ID_GDFS,
NRFS_SERVICE_ID_SWEXT,
NRFS_SERVICE_ID_AUDIOPLL
NRFS_SERVICE_ID_CLOCK = 0,
NRFS_SERVICE_ID_DIAG = 1,
NRFS_SERVICE_ID_DVFS = 2,
NRFS_SERVICE_ID_GDPWR = 3,
NRFS_SERVICE_ID_MRAM = 4,
NRFS_SERVICE_ID_PMIC = 5,
NRFS_SERVICE_ID_RESET = 6,
NRFS_SERVICE_ID_TEMP = 7,
NRFS_SERVICE_ID_USB = 8,
NRFS_SERVICE_ID_GDFS = 9,
NRFS_SERVICE_ID_SWEXT = 10,
NRFS_SERVICE_ID_AUDIOPLL = 11,
};

#ifdef __cplusplus
Expand Down
26 changes: 13 additions & 13 deletions nrfs/include/internal/services/nrfs_clock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ typedef enum __NRFS_PACKED {

/** @brief Clock source option. */
typedef enum __NRFS_PACKED {
NRFS_CLOCK_SRC_LFCLK_DEFAULT = 0,
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT,
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT_HP,
NRFS_CLOCK_SRC_LFCLK_DEFAULT = 0,
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT = 1,
NRFS_CLOCK_SRC_LFCLK_XO_DEFAULT_HP = 2,

NRFS_CLOCK_SRC_LFCLK_LFLPRC,
NRFS_CLOCK_SRC_LFCLK_LFRC,
NRFS_CLOCK_SRC_LFCLK_LFLPRC = 3,
NRFS_CLOCK_SRC_LFCLK_LFRC = 4,

NRFS_CLOCK_SRC_LFCLK_XO_PIXO,
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SQUARE,
NRFS_CLOCK_SRC_LFCLK_XO_PIXO = 5,
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE = 6,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE = 7,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SQUARE = 8,

NRFS_CLOCK_SRC_LFCLK_SYNTH,
NRFS_CLOCK_SRC_LFCLK_SYNTH = 9,

NRFS_CLOCK_SRC_LFCLK_XO_PIERCE_HP,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE_HP,
NRFS_CLOCK_SRC_LFCLK_XO_PIERCE_HP = 10,
NRFS_CLOCK_SRC_LFCLK_XO_EXT_SINE_HP = 11,
}nrfs_clock_src_t;

/** @brief HSFLL120 Mode options. */
typedef enum __NRFS_PACKED {
NRFS_CLOCK_HSFLL_MODE_OPEN = 0,
NRFS_CLOCK_HSFLL_MODE_CLOSED,
NRFS_CLOCK_HSFLL_MODE_CLOSED = 1,
}nrfs_clock_hsfll_mode_t;

/** @brief Clock service notification data structure. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/internal/services/nrfs_diag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {

/** @brief System Diagnostics register access type. */
typedef enum __NRFS_PACKED {
DIAG_REG_READ = 0, /** Register read */
DIAG_REG_WRITE, /** Register write */
DIAG_REG_INVALID, /** Register access invalid */
DIAG_REG_READ = 0, /** Register read */
DIAG_REG_WRITE = 1, /** Register write */
DIAG_REG_INVALID = 2, /** Register access invalid */
} diag_reg_access_type_t;

/** @brief System Diagnostics register access. */
Expand Down
14 changes: 7 additions & 7 deletions nrfs/include/internal/services/nrfs_gdpwr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ extern "C" {

/** @brief Power domain selection */
typedef enum __NRFS_PACKED {
GDPWR_GD_FAST_ACTIVE_0,
GDPWR_GD_FAST_ACTIVE_1,
GDPWR_GD_FAST_MAIN,
GDPWR_GD_SLOW_ACTIVE,
GDPWR_GD_SLOW_MAIN
GDPWR_GD_FAST_ACTIVE_0 = 0,
GDPWR_GD_FAST_ACTIVE_1 = 1,
GDPWR_GD_FAST_MAIN = 2,
GDPWR_GD_SLOW_ACTIVE = 3,
GDPWR_GD_SLOW_MAIN = 4,
} gdpwr_power_domain_t;

typedef enum __NRFS_PACKED {
GDPWR_POWER_REQUEST_CLEAR,
GDPWR_POWER_REQUEST_SET
GDPWR_POWER_REQUEST_CLEAR = 0,
GDPWR_POWER_REQUEST_SET = 1,
} gdpwr_request_type_t;

/** @brief Power domain data structure. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/internal/services/nrfs_mram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {

/** @brief MRAM set latency requests. */
typedef enum __NRFS_PACKED {
MRAM_LATENCY_ALLOWED,
MRAM_LATENCY_NOT_ALLOWED,
MRAM_LATENCY_INTERNAL_REQ
MRAM_LATENCY_ALLOWED = 0,
MRAM_LATENCY_NOT_ALLOWED = 1,
MRAM_LATENCY_INTERNAL_REQ = 2,
} mram_latency_request_t;

/** @brief MRAM set latency data structure. */
Expand Down
52 changes: 26 additions & 26 deletions nrfs/include/internal/services/nrfs_pmic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ typedef enum __NRFS_PACKED {

/** @brief PMIC BLE RADIO TX power. */
typedef enum __NRFS_PACKED {
PMIC_BLE_RADIO_TXPOWER_POS10DBM, /** +10 dBm */
PMIC_BLE_RADIO_TXPOWER_POS9DBM, /** +9 dBm */
PMIC_BLE_RADIO_TXPOWER_POS8DBM, /** +8 dBm */
PMIC_BLE_RADIO_TXPOWER_POS7DBM, /** +7 dBm */
PMIC_BLE_RADIO_TXPOWER_POS6DBM, /** +6 dBm */
PMIC_BLE_RADIO_TXPOWER_POS5DBM, /** +5 dBm */
PMIC_BLE_RADIO_TXPOWER_POS4DBM, /** +4 dBm */
PMIC_BLE_RADIO_TXPOWER_POS3DBM, /** +3 dBm */
PMIC_BLE_RADIO_TXPOWER_POS2DBM, /** +2 dBm */
PMIC_BLE_RADIO_TXPOWER_POS1DBM, /** +1 dBm */
PMIC_BLE_RADIO_TXPOWER_0DBM, /** 0 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG1DBM, /** -1 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG2DBM, /** -2 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG4DBM, /** -4 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG8DBM, /** -8 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG12DBM, /** -12 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG16DBM, /** -16 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG20DBM, /** -20 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG30DBM, /** -30 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG40DBM, /** -40 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG70DBM /** -70 dBm */
PMIC_BLE_RADIO_TXPOWER_POS10DBM = 0, /** +10 dBm */
PMIC_BLE_RADIO_TXPOWER_POS9DBM = 1, /** +9 dBm */
PMIC_BLE_RADIO_TXPOWER_POS8DBM = 2, /** +8 dBm */
PMIC_BLE_RADIO_TXPOWER_POS7DBM = 3, /** +7 dBm */
PMIC_BLE_RADIO_TXPOWER_POS6DBM = 4, /** +6 dBm */
PMIC_BLE_RADIO_TXPOWER_POS5DBM = 5, /** +5 dBm */
PMIC_BLE_RADIO_TXPOWER_POS4DBM = 6, /** +4 dBm */
PMIC_BLE_RADIO_TXPOWER_POS3DBM = 7, /** +3 dBm */
PMIC_BLE_RADIO_TXPOWER_POS2DBM = 8, /** +2 dBm */
PMIC_BLE_RADIO_TXPOWER_POS1DBM = 9, /** +1 dBm */
PMIC_BLE_RADIO_TXPOWER_0DBM = 10, /** 0 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG1DBM = 11, /** -1 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG2DBM = 12, /** -2 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG4DBM = 13, /** -4 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG8DBM = 14, /** -8 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG12DBM = 15, /** -12 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG16DBM = 16, /** -16 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG20DBM = 17, /** -20 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG30DBM = 18, /** -30 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG40DBM = 19, /** -40 dBm */
PMIC_BLE_RADIO_TXPOWER_NEG70DBM = 20, /** -70 dBm */
} pmic_ble_radio_txpower_t;

/** @brief PMIC TEST IF register access type. */
typedef enum __NRFS_PACKED {
PMIC_REG_READ, /** Register read */
PMIC_REG_WRITE, /** Register write */
PMIC_REG_INVALID, /** Register access invalid */
PMIC_REG_READ = 0, /** Register read */
PMIC_REG_WRITE = 1, /** Register write */
PMIC_REG_INVALID = 2, /** Register access invalid */
} pmic_reg_access_type_t;

/** @brief PMIC TEST IF register access. */
Expand Down Expand Up @@ -130,8 +130,8 @@ typedef struct __NRFS_PACKED {

/** @brief PMIC available info. */
typedef enum __NRFS_PACKED {
PMIC_NOT_AVAILABLE,
PMIC_AVAILABLE
PMIC_NOT_AVAILABLE = 0,
PMIC_AVAILABLE = 1,
} pmic_available_t;

/** @brief PMIC info data structure. */
Expand Down
8 changes: 4 additions & 4 deletions nrfs/include/internal/services/nrfs_swext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

/** @brief SWEXT pdclamp options. */
typedef enum __NRFS_PACKED {
SWEXT_PD_CLAMP_DISABLED,
SWEXT_PD_CLAMP_ENABLED
SWEXT_PD_CLAMP_DISABLED = 0,
SWEXT_PD_CLAMP_ENABLED = 1,
} swext_pd_clamp_t;

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

/** @brief SWEXT response status. */
typedef enum __NRFS_PACKED {
SWEXT_OUTPUT_ENABLED,
SWEXT_OVERCURRENT
SWEXT_OUTPUT_ENABLED = 0,
SWEXT_OVERCURRENT = 1,
} nrfs_swext_status_t;

/** @brief SWEXT notification structure. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/nrfs_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

/** @brief Return codes. */
typedef enum __NRFS_PACKED {
NRFS_SUCCESS, /**< Success. */
NRFS_ERR_INVALID_STATE, /**< Invalid state. */
NRFS_ERR_IPC, /**< IPC error. */
NRFS_SUCCESS = 0, /** Success. */
NRFS_ERR_INVALID_STATE = 1, /** Invalid state. */
NRFS_ERR_IPC = 2, /** IPC error. */
} nrfs_err_t;

#endif /* NRFS_COMMON_H */
12 changes: 6 additions & 6 deletions nrfs/include/services/nrfs_audiopll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ extern "C" {

/** @brief Audio PLL service event types. */
typedef enum __NRFS_PACKED {
NRFS_AUDIOPLL_EVT_ENABLED, /** Audio PLL enabled. */
NRFS_AUDIOPLL_EVT_DISABLED, /** Audio PLL disabled. */
NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED, /** Audio PLL new frequency setting confirmed. */
NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED, /** Audio PLL new prescaler setting confirmed. */
NRFS_AUDIOPLL_EVT_FREQ_INC_CONFIRMED, /** Audio PLL new frequency inc setting. */
NRFS_AUDIOPLL_EVT_REJECT, /** Request rejected. */
NRFS_AUDIOPLL_EVT_ENABLED = 0, /** Audio PLL enabled. */
NRFS_AUDIOPLL_EVT_DISABLED = 1, /** Audio PLL disabled. */
NRFS_AUDIOPLL_EVT_FREQ_CONFIRMED = 2, /** Audio PLL new frequency setting confirmed. */
NRFS_AUDIOPLL_EVT_PRESCALER_CONFIRMED = 3, /** Audio PLL new prescaler setting confirmed. */
NRFS_AUDIOPLL_EVT_FREQ_INC_CONFIRMED = 4, /** Audio PLL new frequency inc setting. */
NRFS_AUDIOPLL_EVT_REJECT = 5, /** Request rejected. */
} nrfs_audiopll_evt_type_t;

/** @brief Audio PLL service response data structure. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/services/nrfs_clock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {

/** @brief Clock service event types. */
typedef enum __NRFS_PACKED {
NRFS_CLOCK_EVT_APPLIED, /** Request applied successfully. */
NRFS_CLOCK_EVT_REJECT, /** Request rejected. */
NRFS_CLOCK_EVT_CHANGE, /** Clock event changed. */
NRFS_CLOCK_EVT_APPLIED = 0, /** Request applied successfully. */
NRFS_CLOCK_EVT_REJECT = 1, /** Request rejected. */
NRFS_CLOCK_EVT_CHANGE = 2, /** Clock event changed. */
} nrfs_clock_evt_type_t;

/** @brief Clock service event. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/services/nrfs_diag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {

/** @brief System Diagnostics Service response notification types. */
typedef enum __NRFS_PACKED {
NRFS_DIAG_EVT_APPLIED = 0, /** Request applied succesfully */
NRFS_DIAG_EVT_REJECT, /** Request rejected. */
NRFS_DIAG_EVT_REG_RSP, /** Response for register request */
NRFS_DIAG_EVT_APPLIED = 0, /** Request applied succesfully */
NRFS_DIAG_EVT_REJECT = 1, /** Request rejected. */
NRFS_DIAG_EVT_REG_RSP = 2, /** Response for register request */
} nrfs_diag_evt_type_t;

/** @brief System Diagnostics Service response data structure. */
Expand Down
12 changes: 6 additions & 6 deletions nrfs/include/services/nrfs_dvfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ extern "C" {

/** @brief Dynamic Voltage and Frequency Scaling service event types. */
typedef enum __NRFS_PACKED {
NRFS_DVFS_EVT_REJECT, /** General purpose event for rejected requests. */
NRFS_DVFS_EVT_INIT_PREPARATION, /** ABB Oppoint has been set correctly. Ready for second step of initialization sequence. */
NRFS_DVFS_EVT_INIT_DONE, /** ABB Oppoint has been set correctly. Initialization sequence completed. */
NRFS_DVFS_EVT_OPPOINT_REQ_CONFIRMED, /** Request for operating frequency change has been registered. Please standby. */
NRFS_DVFS_EVT_OPPOINT_SCALING_PREPARE, /** Prepare for voltage scaling. Awaiting the @p nrfs_dvfs_ready_to_scale response. */
NRFS_DVFS_EVT_OPPOINT_SCALING_DONE, /** Voltage scaling done, new oppoint can be applied. */
NRFS_DVFS_EVT_REJECT = 0, /** General purpose event for rejected requests. */
NRFS_DVFS_EVT_INIT_PREPARATION = 1, /** ABB Oppoint has been set correctly. Ready for second step of initialization sequence. */
NRFS_DVFS_EVT_INIT_DONE = 2, /** ABB Oppoint has been set correctly. Initialization sequence completed. */
NRFS_DVFS_EVT_OPPOINT_REQ_CONFIRMED = 3, /** Request for operating frequency change has been registered. Please standby. */
NRFS_DVFS_EVT_OPPOINT_SCALING_PREPARE = 4, /** Prepare for voltage scaling. Awaiting the @p nrfs_dvfs_ready_to_scale response. */
NRFS_DVFS_EVT_OPPOINT_SCALING_DONE = 5, /** Voltage scaling done, new oppoint can be applied. */
} nrfs_dvfs_evt_type_t;

/** @brief Dynamic Voltage and Frequency Scaling service event. */
Expand Down
4 changes: 2 additions & 2 deletions nrfs/include/services/nrfs_gdfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

/** @brief Global Domain Frequency Scaling service event types. */
typedef enum __NRFS_PACKED {
NRFS_GDFS_EVT_REJECT, /** General purpose event for rejected requests. */
NRFS_GDFS_EVT_FREQ_CONFIRMED, /** Frequency has been achieved. */
NRFS_GDFS_EVT_REJECT = 0, /** General purpose event for rejected requests. */
NRFS_GDFS_EVT_FREQ_CONFIRMED = 1, /** Frequency has been achieved. */
} nrfs_gdfs_evt_type_t;

/** @brief Global Domain Frequency Scaling service event. */
Expand Down
4 changes: 2 additions & 2 deletions nrfs/include/services/nrfs_gdpwr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

/** @brief Global domain power request service response notification types. */
typedef enum __NRFS_PACKED {
NRFS_GDPWR_REQ_APPLIED, /** Request accepted. */
NRFS_GDPWR_REQ_REJECTED /** Request rejected. */
NRFS_GDPWR_REQ_APPLIED = 0, /** Request accepted. */
NRFS_GDPWR_REQ_REJECTED = 1, /** Request rejected. */
} nrfs_gdpwr_evt_type_t;

/** @brief Global domain power request service response data structure. */
Expand Down
5 changes: 2 additions & 3 deletions nrfs/include/services/nrfs_mram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ extern "C" {

/** @brief MRAM latency service response notification types. */
typedef enum __NRFS_PACKED {
NRFS_MRAM_LATENCY_REQ_APPLIED, /** sent only as a response to
the request MRAM_LATENCY_NOT_ALLOWED */
NRFS_MRAM_LATENCY_REQ_REJECTED, /** Request rejected. */
NRFS_MRAM_LATENCY_REQ_APPLIED = 0, /** sent only as a response to the request MRAM_LATENCY_NOT_ALLOWED */
NRFS_MRAM_LATENCY_REQ_REJECTED = 1, /** Request rejected. */
} nrfs_mram_latency_evt_type_t;

/** @brief MRAM latency service response data structure. */
Expand Down
8 changes: 4 additions & 4 deletions nrfs/include/services/nrfs_pmic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ extern "C" {

/** @brief PMIC Service response notification types. */
typedef enum __NRFS_PACKED {
NRFS_PMIC_EVT_APPLIED, /** Request applied succesfully */
NRFS_PMIC_EVT_REJECT, /** Request rejected. */
NRFS_PMIC_EVT_TEST_IF_RSP, /** Response for TEST_IF request */
NRFS_PMIC_EVT_INFO_RSP, /** Response for INFO IF request */
NRFS_PMIC_EVT_APPLIED = 0, /** Request applied succesfully */
NRFS_PMIC_EVT_REJECT = 1, /** Request rejected. */
NRFS_PMIC_EVT_TEST_IF_RSP = 2, /** Response for TEST_IF request */
NRFS_PMIC_EVT_INFO_RSP = 3, /** Response for INFO IF request */
} nrfs_pmic_evt_type_t;

/** @brief PMIC Service response data structure. */
Expand Down
4 changes: 2 additions & 2 deletions nrfs/include/services/nrfs_reset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

/** @brief Reset service event types. */
typedef enum __NRFS_PACKED {
NRFS_RESET_EVT_DONE, /** Reset done. */
NRFS_RESET_EVT_REJECT, /** Request rejected. */
NRFS_RESET_EVT_DONE = 0, /** Reset done. */
NRFS_RESET_EVT_REJECT = 1, /** Request rejected. */
} nrfs_reset_evt_type_t;

/** @brief Reset service event. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/services/nrfs_swext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern "C" {

/** @brief SWEXT control service response notification types. */
typedef enum __NRFS_PACKED {
NRFS_SWEXT_EVT_ENABLED = 0, /** Output enabled. */
NRFS_SWEXT_EVT_OVERCURRENT = 1, /** Overcurrent detected. SWEXT is powered down. */
NRFS_SWEXT_EVT_REJECTED = 2, /** Request rejected. */
NRFS_SWEXT_EVT_ENABLED = 0, /** Output enabled. */
NRFS_SWEXT_EVT_OVERCURRENT = 1, /** Overcurrent detected. SWEXT is powered down. */
NRFS_SWEXT_EVT_REJECTED = 2, /** Request rejected. */
} nrfs_swext_evt_type_t;

/** @brief SWEXT control service response data structure. */
Expand Down
6 changes: 3 additions & 3 deletions nrfs/include/services/nrfs_temp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ extern "C" {

/** @brief Temperature service event types. */
typedef enum __NRFS_PACKED {
NRFS_TEMP_EVT_MEASURE_DONE, /** Temperature measurement done. */
NRFS_TEMP_EVT_MEASURE_DONE = 0, /** Temperature measurement done. */
#ifdef NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED
NRFS_TEMP_EVT_CHANGE, /** Temperature threshold crossed. */
NRFS_TEMP_EVT_CHANGE = 1, /** Temperature threshold crossed. */
#endif
NRFS_TEMP_EVT_REJECT, /** Request rejected. */
NRFS_TEMP_EVT_REJECT = 2, /** Request rejected. */
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be reordered? NRF_TEMP_EVT_REJECT assign 1 and NRFS_TEMP_EVT_CHANGE to 2 to make things not change?
I tried searching for NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED and haven't found it, so I assume NRFS_TEMP_EVT_REJECT used to map to 1 and NRFS_TEMP_EVT_CHANGE wasn't used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried searching for NRFS_TEMP_SERVICE_SUBSCRIPTION_ENABLED and haven't found it, so I assume NRFS_TEMP_EVT_REJECT used to map to 1 and NRFS_TEMP_EVT_CHANGE wasn't used?
These changes are merged in the upstream zephyr and still waiting for merging in the ncs (nrfconnect/sdk-zephyr#3050)
Current order is ok, it ensures compatibility with platforms which still have temp_subscription (nrf9230)
Explicit enum values should now fix the potential problem of using incompatible ncs/soc bundle versions. REJECT will be always interpreted as 2, regardless of whether SCFW has temp_subscription.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicit enum values should now fix the potential problem of using incompatible ncs/soc bundle versions
Nice, thanks!

} nrfs_temp_evt_type_t;

/** @brief Temperature service event. */
Expand Down
4 changes: 2 additions & 2 deletions nrfs/include/services/nrfs_usb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

/** @brief USB VBUS detector service event types. */
typedef enum __NRFS_PACKED {
NRFS_USB_EVT_VBUS_STATUS_CHANGE, /** VBUS voltage detection status has changed. */
NRFS_USB_EVT_REJECT, /** Request rejected. */
NRFS_USB_EVT_VBUS_STATUS_CHANGE = 0, /** VBUS voltage detection status has changed. */
NRFS_USB_EVT_REJECT = 1, /** Request rejected. */
} nrfs_usb_evt_type_t;

/** @brief USB VBUS detector service event. */
Expand Down