Skip to content

Commit 2d87ac2

Browse files
committed
modules: fix power module
fix power module errors Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>
1 parent ee84ae2 commit 2d87ac2

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

app/src/modules/power/power.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ static void state_running_run(void *o)
167167

168168
static void event_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
169169
{
170+
ARG_UNUSED(dev);
171+
ARG_UNUSED(cb);
172+
170173
if (pins & BIT(NPM1300_EVENT_VBUS_DETECTED)) {
171174
LOG_WRN("Vbus detected");
172175
}
@@ -176,14 +179,14 @@ static void event_callback(const struct device *dev, struct gpio_callback *cb, u
176179
}
177180
}
178181

179-
static int subscribe_to_vsbus_events(const struct device *pmic, struct gpio_callback *event_cb)
182+
static int subscribe_to_vsbus_events(const struct device *device, struct gpio_callback *event_cb)
180183
{
181184
int err;
182185

183186
gpio_init_callback(event_cb, event_callback, BIT(NPM1300_EVENT_VBUS_DETECTED) |
184-
BIT(NPM1300_EVENT_VBUS_REMOVED));
187+
BIT(NPM1300_EVENT_VBUS_REMOVED));
185188

186-
err = mfd_npm1300_add_callback(pmic, event_cb);
189+
err = mfd_npm1300_add_callback(device, event_cb);
187190
if (err) {
188191
LOG_ERR("mfd_npm1300_add_callback, error: %d", err);
189192
return err;

tests/module/power/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ target_sources(app
2424
target_include_directories(app PRIVATE src)
2525

2626
zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
27+
zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/drivers/mfd/)
2728
zephyr_include_directories(${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_fuel_gauge/include/)
2829
zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
2930
zephyr_include_directories(${ASSET_TRACKER_TEMPLATE_DIR}/app/src/common)

tests/module/power/src/main.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ FAKE_VALUE_FUNC(int, task_wdt_add, uint32_t, task_wdt_callback_t, void *);
1919
FAKE_VALUE_FUNC(float, nrf_fuel_gauge_process, float, float, float, float, bool, void *);
2020
FAKE_VALUE_FUNC(int, charger_read_sensors, float *, float *, float *, int32_t *);
2121
FAKE_VALUE_FUNC(int, nrf_fuel_gauge_init, const struct nrf_fuel_gauge_init_parameters *, void *);
22+
FAKE_VALUE_FUNC(int, mfd_npm1300_add_callback, const struct device *, struct gpio_callback *);
2223

2324
ZBUS_MSG_SUBSCRIBER_DEFINE(power_subscriber);
2425
ZBUS_CHAN_ADD_OBS(POWER_CHAN, power_subscriber, 0);

0 commit comments

Comments
 (0)