diff --git a/doc/reference/power_management/index.rst b/doc/reference/power_management/index.rst index 060f19ea93a..3bada639d11 100644 --- a/doc/reference/power_management/index.rst +++ b/doc/reference/power_management/index.rst @@ -241,8 +241,8 @@ Zephyr RTOS power management subsystem provides a control function interface to device drivers to indicate power management operations to perform. The supported PM control commands are: -* PM_DEVICE_SET_POWER_STATE -* PM_DEVICE_GET_POWER_STATE +* PM_DEVICE_STATE_SET +* PM_DEVICE_STATE_GET Each device driver defines: @@ -298,7 +298,7 @@ Device Set Power State int pm_device_state_set(const struct device *dev, uint32_t device_power_state, pm_device_cb cb, void *arg); Calls the :c:func:`pm_control()` handler function implemented by the -device driver with PM_DEVICE_SET_POWER_STATE command. +device driver with PM_DEVICE_STATE_SET command. Device Get Power State ---------------------- @@ -308,7 +308,7 @@ Device Get Power State int pm_device_state_get(const struct device *dev, uint32_t * device_power_state); Calls the :c:func:`pm_control()` handler function implemented by the -device driver with PM_DEVICE_GET_POWER_STATE command. +device driver with PM_DEVICE_STATE_GET command. Busy Status Indication ====================== diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c index e61f4f4ce3e..3cc33ba5cb9 100644 --- a/drivers/display/display_st7735r.c +++ b/drivers/display/display_st7735r.c @@ -526,7 +526,7 @@ static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command, struct st7735r_data *data = (struct st7735r_data *)dev->data; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = st7735r_exit_sleep(data); if (ret < 0) { @@ -543,7 +543,7 @@ static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command, break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = data->pm_state; break; diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c index 90ffbb8b21c..2b4411c85ec 100644 --- a/drivers/display/display_st7789v.c +++ b/drivers/display/display_st7789v.c @@ -415,7 +415,7 @@ static int st7789v_pm_control(const struct device *dev, uint32_t ctrl_command, struct st7789v_data *data = (struct st7789v_data *)dev->data; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { st7789v_exit_sleep(data); data->pm_state = PM_DEVICE_ACTIVE_STATE; @@ -426,7 +426,7 @@ static int st7789v_pm_control(const struct device *dev, uint32_t ctrl_command, ret = 0; } break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = data->pm_state; break; default: diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index 2ea0528e073..d12eca90545 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -299,7 +299,7 @@ static int entropy_cc13xx_cc26xx_pm_control(const struct device *dev, struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev); int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != data->pm_state) { @@ -307,7 +307,7 @@ static int entropy_cc13xx_cc26xx_pm_control(const struct device *dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index 9613f3e38f6..72f3c7d7f10 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -198,7 +198,7 @@ static int eth_mcux_device_pm_control(const struct device *dev, goto out; } - if (command == PM_DEVICE_SET_POWER_STATE) { + if (command == PM_DEVICE_STATE_SET) { if (*(uint32_t *)context == PM_DEVICE_SUSPEND_STATE) { LOG_DBG("Suspending"); diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index c82b0a613c4..81f9798866a 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -576,7 +576,7 @@ static int spi_flash_at45_pm_control(const struct device *dev, const struct spi_flash_at45_config *dev_config = get_dev_config(dev); int err = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != dev_data->pm_state) { @@ -606,7 +606,7 @@ static int spi_flash_at45_pm_control(const struct device *dev, dev_data->pm_state = new_state; } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = dev_data->pm_state; } diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index cce25e9abb4..5fc84ecb5b3 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -465,13 +465,13 @@ static int gpio_dw_device_ctrl(const struct device *port, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { if (*((uint32_t *)context) == PM_DEVICE_SUSPEND_STATE) { ret = gpio_dw_suspend_port(port); } else if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = gpio_dw_resume_from_suspend_port(port); } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = gpio_dw_get_power_state(port); } diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index 1a46568c4f8..4ccf76b8999 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -373,7 +373,7 @@ static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != get_dev_data(dev)->pm_state) { @@ -381,7 +381,7 @@ static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = get_dev_data(dev)->pm_state; } diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 50f6d674885..fa726c8191e 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -220,7 +220,7 @@ static int twi_nrfx_pm_control(const struct device *dev, int ret = 0; uint32_t pm_current_state = get_dev_data(dev)->pm_state; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != pm_current_state) { @@ -250,7 +250,7 @@ static int twi_nrfx_pm_control(const struct device *dev, } } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = get_dev_data(dev)->pm_state; } diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 2b72db5e778..f386a91ea6b 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -270,7 +270,7 @@ static int twim_nrfx_pm_control(const struct device *dev, int ret = 0; uint32_t pm_current_state = get_dev_data(dev)->pm_state; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != pm_current_state) { @@ -301,7 +301,7 @@ static int twim_nrfx_pm_control(const struct device *dev, } } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = get_dev_data(dev)->pm_state; } diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c index eb6a002a703..8ee9a7002f0 100644 --- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c +++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c @@ -198,13 +198,13 @@ static int arc_v2_irq_unit_device_ctrl(const struct device *dev, int ret = 0; unsigned int key = arch_irq_lock(); - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { if (*((uint32_t *)context) == PM_DEVICE_SUSPEND_STATE) { ret = arc_v2_irq_unit_suspend(dev); } else if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = arc_v2_irq_unit_resume(dev); } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = arc_v2_irq_unit_get_state(dev); } diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c index 710a8515af6..f9c5299732d 100644 --- a/drivers/interrupt_controller/intc_ioapic.c +++ b/drivers/interrupt_controller/intc_ioapic.c @@ -309,13 +309,13 @@ static int ioapic_device_ctrl(const struct device *dev, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { if (*((uint32_t *)context) == PM_DEVICE_SUSPEND_STATE) { ret = ioapic_suspend(dev); } else if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = ioapic_resume_from_suspend(dev); } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = ioapic_device_power_state; } diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c index 89e3c00335d..3b0e2b04ec0 100644 --- a/drivers/interrupt_controller/intc_loapic.c +++ b/drivers/interrupt_controller/intc_loapic.c @@ -408,13 +408,13 @@ static int loapic_device_ctrl(const struct device *port, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { if (*((uint32_t *)context) == PM_DEVICE_SUSPEND_STATE) { ret = loapic_suspend(port); } else if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = loapic_resume(port); } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = loapic_device_power_state; } diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c index 202f1f55df7..d4da909c3bc 100644 --- a/drivers/led/led_pwm.c +++ b/drivers/led/led_pwm.c @@ -181,11 +181,11 @@ static int led_pwm_pm_control(const struct device *dev, uint32_t ctrl_command, int err; switch (ctrl_command) { - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: err = led_pwm_pm_get_state(dev, context); break; - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: err = led_pwm_pm_set_state(dev, *((uint32_t *)context)); break; diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index 54cd2b69100..f6ed909e008 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -322,7 +322,7 @@ static int pwm_nrfx_pm_control(const struct device *dev, { int err = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != (*current_state)) { @@ -334,7 +334,7 @@ static int pwm_nrfx_pm_control(const struct device *dev, } } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = (*current_state); } diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index a75fc428c0f..7f5a08b0920 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -416,7 +416,7 @@ static int apds9960_device_ctrl(const struct device *dev, struct apds9960_data *data = dev->data; int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t device_pm_state = *(uint32_t *)context; if (device_pm_state == PM_DEVICE_ACTIVE_STATE) { @@ -441,7 +441,7 @@ static int apds9960_device_ctrl(const struct device *dev, } } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = PM_DEVICE_ACTIVE_STATE; } diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 3803a0d0c1f..ca0db40f8a8 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -398,7 +398,7 @@ int bme280_pm_ctrl(const struct device *dev, uint32_t ctrl_command, int ret = 0; /* Set power state */ - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_pm_state = *((const uint32_t *)context); if (new_pm_state != data->pm_state) { @@ -429,7 +429,7 @@ int bme280_pm_ctrl(const struct device *dev, uint32_t ctrl_command, } /* Get power state */ else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/sensor/bmp388/bmp388.c b/drivers/sensor/bmp388/bmp388.c index 6e7000cde82..5ee14643c62 100644 --- a/drivers/sensor/bmp388/bmp388.c +++ b/drivers/sensor/bmp388/bmp388.c @@ -595,9 +595,9 @@ static int bmp388_device_ctrl( { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { ret = bmp388_set_power_state(dev, *((uint32_t *)context)); - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = bmp388_get_power_state(dev); } diff --git a/drivers/sensor/fdc2x1x/fdc2x1x.c b/drivers/sensor/fdc2x1x/fdc2x1x.c index 53ba80f4725..62c94a670c2 100644 --- a/drivers/sensor/fdc2x1x/fdc2x1x.c +++ b/drivers/sensor/fdc2x1x/fdc2x1x.c @@ -549,7 +549,7 @@ static int fdc2x1x_device_pm_ctrl(const struct device *dev, uint32_t new_state; int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { new_state = *(uint32_t *)context; if (new_state != data->pm_state) { switch (new_state) { @@ -563,7 +563,7 @@ static int fdc2x1x_device_pm_ctrl(const struct device *dev, ret = -EINVAL; } } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 8a2b7040d04..b2e181e5851 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -529,14 +529,14 @@ static int lis2mdl_pm_control(const struct device *dev, uint32_t ctrl_command, uint32_t new_state; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: new_state = *((const uint32_t *)context); if (new_state != current_state) { status = lis2mdl_set_power_state(lis2mdl, config, new_state); } break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = current_state; break; default: diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c index 10e4af5ec63..ff5bb2653e7 100644 --- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c +++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c @@ -276,11 +276,11 @@ static int qdec_nrfx_pm_control(const struct device *dev, LOG_DBG(""); switch (ctrl_command) { - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: err = qdec_nrfx_pm_get_state(data, context); break; - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: err = qdec_nrfx_pm_set_state(data, *((uint32_t *)context)); break; diff --git a/drivers/sensor/vcnl4040/vcnl4040.c b/drivers/sensor/vcnl4040/vcnl4040.c index 3c3c211e480..332dea8b88b 100644 --- a/drivers/sensor/vcnl4040/vcnl4040.c +++ b/drivers/sensor/vcnl4040/vcnl4040.c @@ -224,7 +224,7 @@ static int vcnl4040_device_ctrl(const struct device *dev, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t device_pm_state = *(uint32_t *)context; uint16_t ps_conf; @@ -274,7 +274,7 @@ static int vcnl4040_device_ctrl(const struct device *dev, #endif } - } else if (ctrl_command == PM_DEVICE_GET_POWER_STATE) { + } else if (ctrl_command == PM_DEVICE_STATE_GET) { *((uint32_t *)context) = PM_DEVICE_ACTIVE_STATE; } diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index 7ce96fa49b0..4dcc39829d5 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -449,7 +449,7 @@ static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != get_dev_data(dev)->pm_state) { @@ -457,7 +457,7 @@ static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = get_dev_data(dev)->pm_state; } diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c index de0a7b28cb6..965722cdd24 100644 --- a/drivers/serial/uart_npcx.c +++ b/drivers/serial/uart_npcx.c @@ -454,10 +454,10 @@ static int uart_npcx_pm_control(const struct device *dev, uint32_t ctrl_command, int ret = 0; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: ret = uart_npcx_set_power_state(dev, *((uint32_t *)context)); break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: ret = uart_npcx_get_power_state(dev, (uint32_t *)context); break; default: diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c index c905dc525cb..7dee9a3b51f 100644 --- a/drivers/serial/uart_nrfx_uart.c +++ b/drivers/serial/uart_nrfx_uart.c @@ -1162,7 +1162,7 @@ static int uart_nrfx_pm_control(const struct device *dev, { static uint32_t current_state = PM_DEVICE_ACTIVE_STATE; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != current_state) { @@ -1170,7 +1170,7 @@ static int uart_nrfx_pm_control(const struct device *dev, current_state = new_state; } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = current_state; } diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index 7a153878089..fda27b8d0a2 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -1867,14 +1867,14 @@ static int uarte_nrfx_pm_control(const struct device *dev, { struct uarte_nrfx_data *data = get_dev_data(dev); - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != data->pm_state) { uarte_nrfx_set_power_state(dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index f1fea416435..a667ce68837 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -1466,14 +1466,14 @@ static int uart_stm32_pm_control(const struct device *dev, { struct uart_stm32_data *data = DEV_DATA(dev); - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != data->pm_state) { uart_stm32_set_power_state(dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index cef96b70592..4cdeb322cbd 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -256,7 +256,7 @@ static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, { int ret = 0; - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != get_dev_data(dev)->pm_state) { @@ -264,7 +264,7 @@ static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, new_state); } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = get_dev_data(dev)->pm_state; } diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index dd9a4b99d26..a422efae9d8 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -292,7 +292,7 @@ static int spi_nrfx_pm_control(const struct device *dev, struct spi_nrfx_data *data = get_dev_data(dev); const struct spi_nrfx_config *config = get_dev_config(dev); - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != data->pm_state) { @@ -319,7 +319,7 @@ static int spi_nrfx_pm_control(const struct device *dev, } } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index ed5b3abb9ef..ff84506e834 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -340,7 +340,7 @@ static int spim_nrfx_pm_control(const struct device *dev, struct spi_nrfx_data *data = get_dev_data(dev); const struct spi_nrfx_config *config = get_dev_config(dev); - if (ctrl_command == PM_DEVICE_SET_POWER_STATE) { + if (ctrl_command == PM_DEVICE_STATE_SET) { uint32_t new_state = *((const uint32_t *)context); if (new_state != data->pm_state) { @@ -367,7 +367,7 @@ static int spim_nrfx_pm_control(const struct device *dev, } } } else { - __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_GET_POWER_STATE); + __ASSERT_NO_MSG(ctrl_command == PM_DEVICE_STATE_GET); *((uint32_t *)context) = data->pm_state; } diff --git a/include/pm/device.h b/include/pm/device.h index d226c553d27..7e90bfcef7f 100644 --- a/include/pm/device.h +++ b/include/pm/device.h @@ -74,8 +74,8 @@ struct device; #define PM_DEVICE_OFF_STATE 5 /* Constants defining support device power commands */ -#define PM_DEVICE_SET_POWER_STATE 1 -#define PM_DEVICE_GET_POWER_STATE 2 +#define PM_DEVICE_STATE_SET 1 +#define PM_DEVICE_STATE_GET 2 typedef void (*pm_device_cb)(const struct device *dev, int status, void *context, void *arg); diff --git a/samples/subsys/pm/device_pm/src/dummy_driver.c b/samples/subsys/pm/device_pm/src/dummy_driver.c index 83d80035e21..4691e4bb335 100644 --- a/samples/subsys/pm/device_pm/src/dummy_driver.c +++ b/samples/subsys/pm/device_pm/src/dummy_driver.c @@ -121,14 +121,14 @@ static int dummy_device_pm_ctrl(const struct device *dev, int ret = 0; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = dummy_resume_from_suspend(dev); } else { ret = dummy_suspend(dev); } break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = dummy_get_power_state(dev); break; default: diff --git a/samples/subsys/pm/device_pm/src/dummy_parent.c b/samples/subsys/pm/device_pm/src/dummy_parent.c index 5699e104e49..8a3a1c44b17 100644 --- a/samples/subsys/pm/device_pm/src/dummy_parent.c +++ b/samples/subsys/pm/device_pm/src/dummy_parent.c @@ -52,14 +52,14 @@ static int dummy_parent_pm_ctrl(const struct device *dev, int ret = 0; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = dummy_resume_from_suspend(dev); } else { ret = dummy_suspend(dev); } break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = dummy_get_power_state(dev); break; default: diff --git a/subsys/pm/device.c b/subsys/pm/device.c index b1b0ac46366..8823ca21532 100644 --- a/subsys/pm/device.c +++ b/subsys/pm/device.c @@ -190,7 +190,7 @@ int pm_device_state_set(const struct device *dev, uint32_t device_power_state, return -ENOSYS; } - return dev->pm_control(dev, PM_DEVICE_SET_POWER_STATE, + return dev->pm_control(dev, PM_DEVICE_STATE_SET, &device_power_state, cb, arg); } @@ -200,6 +200,6 @@ int pm_device_state_get(const struct device *dev, uint32_t *device_power_state) return -ENOSYS; } - return dev->pm_control(dev, PM_DEVICE_GET_POWER_STATE, + return dev->pm_control(dev, PM_DEVICE_STATE_GET, device_power_state, NULL, NULL); } diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c index d4ac8657e7c..c6c8e1e64e3 100644 --- a/tests/net/pm/src/main.c +++ b/tests/net/pm/src/main.c @@ -27,7 +27,7 @@ static int fake_dev_pm_control(const struct device *dev, uint32_t command, struct fake_dev_context *ctx = dev->data; int ret = 0; - if (command == PM_DEVICE_SET_POWER_STATE) { + if (command == PM_DEVICE_STATE_SET) { if (*(uint32_t *)context == PM_DEVICE_SUSPEND_STATE) { ret = net_if_suspend(ctx->iface); if (ret == -EBUSY) { diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.c b/tests/subsys/pm/power_mgmt/src/dummy_driver.c index d380d256605..553ef464f25 100644 --- a/tests/subsys/pm/power_mgmt/src/dummy_driver.c +++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.c @@ -45,14 +45,14 @@ static int dummy_device_pm_ctrl(const struct device *dev, int ret = 0; switch (ctrl_command) { - case PM_DEVICE_SET_POWER_STATE: + case PM_DEVICE_STATE_SET: if (*((uint32_t *)context) == PM_DEVICE_ACTIVE_STATE) { ret = dummy_resume_from_suspend(dev); } else { ret = dummy_suspend(dev); } break; - case PM_DEVICE_GET_POWER_STATE: + case PM_DEVICE_STATE_GET: *((uint32_t *)context) = dummy_get_power_state(dev); break; default: