diff --git a/arch/arc/core/arc_smp.c b/arch/arc/core/arc_smp.c index 35069be880c5..ef5d387cfca9 100644 --- a/arch/arc/core/arc_smp.c +++ b/arch/arc/core/arc_smp.c @@ -108,7 +108,7 @@ void arch_sched_ipi(void) } } -static int arc_smp_init(struct device *dev) +static int arc_smp_init(const struct device *dev) { ARG_UNUSED(dev); struct arc_connect_bcr bcr; diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c index 3c0d466fb3d1..6ab6678f4314 100644 --- a/arch/arc/core/cache.c +++ b/arch/arc/core/cache.c @@ -155,7 +155,7 @@ static void init_dcache_line_size(void) } #endif -static int init_dcache(struct device *unused) +static int init_dcache(const struct device *unused) { ARG_UNUSED(unused); diff --git a/arch/arc/core/mpu/arc_mpu_v2_internal.h b/arch/arc/core/mpu/arc_mpu_v2_internal.h index 640ce8666f79..ae94ea19b60d 100644 --- a/arch/arc/core/mpu/arc_mpu_v2_internal.h +++ b/arch/arc/core/mpu/arc_mpu_v2_internal.h @@ -373,7 +373,7 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write) * This function provides the default configuration mechanism for the Memory * Protection Unit (MPU). */ -static int arc_mpu_init(struct device *arg) +static int arc_mpu_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/arch/arc/core/mpu/arc_mpu_v3_internal.h b/arch/arc/core/mpu/arc_mpu_v3_internal.h index 6d1d80d5ace3..2385bba32e42 100644 --- a/arch/arc/core/mpu/arc_mpu_v3_internal.h +++ b/arch/arc/core/mpu/arc_mpu_v3_internal.h @@ -836,7 +836,7 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write) * This function provides the default configuration mechanism for the Memory * Protection Unit (MPU). */ -static int arc_mpu_init(struct device *arg) +static int arc_mpu_init(const struct device *arg) { ARG_UNUSED(arg); u32_t num_regions; diff --git a/arch/arc/core/secureshield/arc_sjli.c b/arch/arc/core/secureshield/arc_sjli.c index 02d8c5b9f7d2..1a6c8a5ea037 100644 --- a/arch/arc/core/secureshield/arc_sjli.c +++ b/arch/arc/core/secureshield/arc_sjli.c @@ -48,7 +48,7 @@ static void sjli_table_init(void) /* * @brief initializaiton of secureshield related functions. */ -static int arc_secureshield_init(struct device *arg) +static int arc_secureshield_init(const struct device *arg) { sjli_table_init(); diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c index 88c6ff0d3d34..74a6ad1f9395 100644 --- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c +++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c @@ -299,7 +299,7 @@ void arm_core_mpu_configure_dynamic_mpu_regions(const struct k_mem_partition * This function provides the default configuration mechanism for the Memory * Protection Unit (MPU). */ -static int arm_mpu_init(struct device *arg) +static int arm_mpu_init(const struct device *arg) { u32_t r_index; diff --git a/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c index 6451591e2a50..1582032cc397 100644 --- a/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c +++ b/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c @@ -578,7 +578,7 @@ void arm_core_mpu_configure_dynamic_mpu_regions(const struct k_mem_partition * This function provides the default configuration mechanism for the Memory * Protection Unit (MPU). */ -static int nxp_mpu_init(struct device *arg) +static int nxp_mpu_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/arch/arm/core/aarch64/arm_mmu.c b/arch/arm/core/aarch64/arm_mmu.c index 1ee25f3c8007..c891c5159289 100644 --- a/arch/arm/core/aarch64/arm_mmu.c +++ b/arch/arm/core/aarch64/arm_mmu.c @@ -432,7 +432,7 @@ static void enable_mmu_el1(unsigned int flags) * This function provides the default configuration mechanism for the Memory * Management Unit (MMU). */ -static int arm_mmu_init(struct device *arg) +static int arm_mmu_init(const struct device *arg) { u64_t val; unsigned int idx, flags = 0; diff --git a/arch/x86/core/ia32/cache.c b/arch/x86/core/ia32/cache.c index b04290d8a131..5dccc2cda0b8 100644 --- a/arch/x86/core/ia32/cache.c +++ b/arch/x86/core/ia32/cache.c @@ -97,7 +97,7 @@ static void init_cache_line_size(void) #define init_cache_line_size() do { } while ((0)) #endif -static int init_cache(struct device *unused) +static int init_cache(const struct device *unused) { ARG_UNUSED(unused); diff --git a/arch/x86/core/multiboot.c b/arch/x86/core/multiboot.c index e9150195ad5b..c0286573c58c 100644 --- a/arch/x86/core/multiboot.c +++ b/arch/x86/core/multiboot.c @@ -109,7 +109,7 @@ static struct framebuf_dev_data multiboot_framebuf_data = { .height = CONFIG_MULTIBOOT_FRAMEBUF_Y }; -static int multiboot_framebuf_init(struct device *dev) +static int multiboot_framebuf_init(const struct device *dev) { struct framebuf_dev_data *data = FRAMEBUF_DATA(dev); struct multiboot_info *info = &multiboot_info; diff --git a/arch/x86/core/spec_ctrl.c b/arch/x86/core/spec_ctrl.c index 8603dba6e430..9e215dc32570 100644 --- a/arch/x86/core/spec_ctrl.c +++ b/arch/x86/core/spec_ctrl.c @@ -37,7 +37,7 @@ static u32_t cpuid_extended_features(void) return edx; } -static int spec_ctrl_init(struct device *dev) +static int spec_ctrl_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arc/em_starterkit/pmodmux.c b/boards/arc/em_starterkit/pmodmux.c index 3c4d9e1e2ee4..bf24793489bf 100644 --- a/boards/arc/em_starterkit/pmodmux.c +++ b/boards/arc/em_starterkit/pmodmux.c @@ -124,7 +124,7 @@ #define PM6_LR_CSS_STAT ((1 << BIT2) << PM6_OFFSET) -static int pmod_mux_init(struct device *device) +static int pmod_mux_init(const struct device *device) { volatile u32_t *mux_regs = (u32_t *)(PMODMUX_BASE_ADDR); diff --git a/boards/arc/hsdk/pinmux.c b/boards/arc/hsdk/pinmux.c index 9c38130d1505..1927fbc25eaf 100644 --- a/boards/arc/hsdk/pinmux.c +++ b/boards/arc/hsdk/pinmux.c @@ -8,11 +8,11 @@ #include #include -static int board_pinmux_init(struct device *device) +static int board_pinmux_init(const struct device *device) { ARG_UNUSED(device); - struct device *pinmux = device_get_binding(CONFIG_PINMUX_NAME); + const struct device *pinmux = device_get_binding(CONFIG_PINMUX_NAME); if (pinmux == NULL) { return -ENXIO; diff --git a/boards/arm/96b_aerocore2/pinmux.c b/boards/arm/96b_aerocore2/pinmux.c index 0ae6849e481d..28bca9e841d8 100644 --- a/boards/arm/96b_aerocore2/pinmux.c +++ b/boards/arm/96b_aerocore2/pinmux.c @@ -98,7 +98,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_argonkey/pinmux.c b/boards/arm/96b_argonkey/pinmux.c index 259fcfbc4841..6003bf4dfa93 100644 --- a/boards/arm/96b_argonkey/pinmux.c +++ b/boards/arm/96b_argonkey/pinmux.c @@ -56,7 +56,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_avenger96/pinmux.c b/boards/arm/96b_avenger96/pinmux.c index cb93cd7e17a5..d3d2168870f0 100644 --- a/boards/arm/96b_avenger96/pinmux.c +++ b/boards/arm/96b_avenger96/pinmux.c @@ -24,7 +24,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_carbon/pinmux.c b/boards/arm/96b_carbon/pinmux.c index a4a8da843411..86793afffc61 100644 --- a/boards/arm/96b_carbon/pinmux.c +++ b/boards/arm/96b_carbon/pinmux.c @@ -56,7 +56,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_meerkat96/pinmux.c b/boards/arm/96b_meerkat96/pinmux.c index 17f649523e86..86b4ea56f1d9 100644 --- a/boards/arm/96b_meerkat96/pinmux.c +++ b/boards/arm/96b_meerkat96/pinmux.c @@ -7,7 +7,7 @@ #include #include "device_imx.h" -static int meerakt96_pinmux_init(struct device *dev) +static int meerakt96_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/96b_neonkey/pinmux.c b/boards/arm/96b_neonkey/pinmux.c index 8d444399f4b2..f95d93e155b0 100644 --- a/boards/arm/96b_neonkey/pinmux.c +++ b/boards/arm/96b_neonkey/pinmux.c @@ -40,7 +40,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_stm32_sensor_mez/pinmux.c b/boards/arm/96b_stm32_sensor_mez/pinmux.c index f6264f9b090a..3b786960331c 100644 --- a/boards/arm/96b_stm32_sensor_mez/pinmux.c +++ b/boards/arm/96b_stm32_sensor_mez/pinmux.c @@ -86,7 +86,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/96b_wistrio/pinmux.c b/boards/arm/96b_wistrio/pinmux.c index 05cc13da30a8..5492697e20b5 100644 --- a/boards/arm/96b_wistrio/pinmux.c +++ b/boards/arm/96b_wistrio/pinmux.c @@ -40,10 +40,10 @@ static const struct pin_config pinconf[] = { {STM32_PIN_PB7, STM32_PUSHPULL_PULLUP}, }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); - struct device *gpioa, *gpiob, *gpioh; + const struct device *gpioa, *gpiob, *gpioh; stm32_setup_pins(pinconf, ARRAY_SIZE(pinconf)); diff --git a/boards/arm/actinius_icarus/board.c b/boards/arm/actinius_icarus/board.c index b34f02432353..2579469b8ae1 100644 --- a/boards/arm/actinius_icarus/board.c +++ b/boards/arm/actinius_icarus/board.c @@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_ICARUS_LOG_LEVEL); static void select_sim(void) { - struct device *port = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); + const struct device *port = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); if (!port) { LOG_ERR("Could not get GPIO Device Binding"); @@ -31,7 +31,7 @@ static void select_sim(void) #endif } -static int board_actinius_icarus_init(struct device *dev) +static int board_actinius_icarus_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c index 9f80e2094f2d..bfa44e8549df 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c +++ b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c @@ -8,11 +8,11 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); #if ATMEL_SAM0_DT_SERCOM_CHECK(4, atmel_sam0_spi) - struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); + const struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); #endif ARG_UNUSED(dev); diff --git a/boards/arm/adafruit_feather_stm32f405/pinmux.c b/boards/arm/adafruit_feather_stm32f405/pinmux.c index acc2a1a6dec2..b5d89290f2b4 100644 --- a/boards/arm/adafruit_feather_stm32f405/pinmux.c +++ b/boards/arm/adafruit_feather_stm32f405/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/adafruit_trinket_m0/pinmux.c b/boards/arm/adafruit_trinket_m0/pinmux.c index f9788ea3c52b..38cd5a794733 100644 --- a/boards/arm/adafruit_trinket_m0/pinmux.c +++ b/boards/arm/adafruit_trinket_m0/pinmux.c @@ -8,9 +8,9 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); ARG_UNUSED(dev); diff --git a/boards/arm/arduino_zero/pinmux.c b/boards/arm/arduino_zero/pinmux.c index e9c935bfe478..0fce0e29b009 100644 --- a/boards/arm/arduino_zero/pinmux.c +++ b/boards/arm/arduino_zero/pinmux.c @@ -8,10 +8,10 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); - struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); ARG_UNUSED(dev); diff --git a/boards/arm/atsamd20_xpro/pinmux.c b/boards/arm/atsamd20_xpro/pinmux.c index 6f6f2af37f4c..a79bf58fcaba 100644 --- a/boards/arm/atsamd20_xpro/pinmux.c +++ b/boards/arm/atsamd20_xpro/pinmux.c @@ -8,10 +8,10 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); - struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); ARG_UNUSED(dev); diff --git a/boards/arm/atsamd21_xpro/pinmux.c b/boards/arm/atsamd21_xpro/pinmux.c index 57bf1c4d9df4..5966633772ff 100644 --- a/boards/arm/atsamd21_xpro/pinmux.c +++ b/boards/arm/atsamd21_xpro/pinmux.c @@ -8,10 +8,10 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); - struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); ARG_UNUSED(dev); diff --git a/boards/arm/atsame54_xpro/pinmux.c b/boards/arm/atsame54_xpro/pinmux.c index ae6928804f05..a7a76e5f88c9 100644 --- a/boards/arm/atsame54_xpro/pinmux.c +++ b/boards/arm/atsame54_xpro/pinmux.c @@ -8,12 +8,12 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding("PINMUX_A"); - struct device *muxb = device_get_binding("PINMUX_B"); - struct device *muxc = device_get_binding("PINMUX_C"); - struct device *muxd = device_get_binding("PINMUX_D"); + const struct device *muxa = device_get_binding("PINMUX_A"); + const struct device *muxb = device_get_binding("PINMUX_B"); + const struct device *muxc = device_get_binding("PINMUX_C"); + const struct device *muxd = device_get_binding("PINMUX_D"); ARG_UNUSED(dev); ARG_UNUSED(muxa); diff --git a/boards/arm/atsamr21_xpro/pinmux.c b/boards/arm/atsamr21_xpro/pinmux.c index 9e7a8387b6d2..795ff50732a5 100644 --- a/boards/arm/atsamr21_xpro/pinmux.c +++ b/boards/arm/atsamr21_xpro/pinmux.c @@ -9,11 +9,11 @@ #include #include -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { - struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); - struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); - struct device *muxc = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_c))); + const struct device *muxa = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_a))); + const struct device *muxb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_b))); + const struct device *muxc = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_c))); ARG_UNUSED(dev); diff --git a/boards/arm/b_l072z_lrwan1/pinmux.c b/boards/arm/b_l072z_lrwan1/pinmux.c index e1a381fa2a71..0e9f1a130ef5 100644 --- a/boards/arm/b_l072z_lrwan1/pinmux.c +++ b/boards/arm/b_l072z_lrwan1/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/black_f407ve/pinmux.c b/boards/arm/black_f407ve/pinmux.c index 4035c3605286..0037ee24ed5b 100644 --- a/boards/arm/black_f407ve/pinmux.c +++ b/boards/arm/black_f407ve/pinmux.c @@ -49,7 +49,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_black_f407ve_init(struct device *port) +static int pinmux_black_f407ve_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/black_f407zg_pro/pinmux.c b/boards/arm/black_f407zg_pro/pinmux.c index 633d489e2790..2bbe72049337 100644 --- a/boards/arm/black_f407zg_pro/pinmux.c +++ b/boards/arm/black_f407zg_pro/pinmux.c @@ -50,7 +50,7 @@ static const struct pin_config pinconf[] = { }; -static int pinmux_black_f407zg_init(struct device *port) +static int pinmux_black_f407zg_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/cc3220sf_launchxl/pinmux.c b/boards/arm/cc3220sf_launchxl/pinmux.c index 3b2c13ed2376..80ffb514204b 100644 --- a/boards/arm/cc3220sf_launchxl/pinmux.c +++ b/boards/arm/cc3220sf_launchxl/pinmux.c @@ -91,7 +91,7 @@ #define I2C_CC32XX_PIN_16_I2C_SCL 0x90F /*!< PIN 16 is used for I2C_SCL */ #define I2C_CC32XX_PIN_17_I2C_SDA 0x910 /*!< PIN 17 is used for I2C_SDA */ -int pinmux_initialize(struct device *port) +int pinmux_initialize(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/cc3235sf_launchxl/pinmux.c b/boards/arm/cc3235sf_launchxl/pinmux.c index 7892075cc13f..032a42fb01f2 100644 --- a/boards/arm/cc3235sf_launchxl/pinmux.c +++ b/boards/arm/cc3235sf_launchxl/pinmux.c @@ -66,7 +66,7 @@ #define I2C_CC32XX_PIN_16_I2C_SCL 0x90F /*!< PIN 16 is used for I2C_SCL */ #define I2C_CC32XX_PIN_17_I2C_SDA 0x910 /*!< PIN 17 is used for I2C_SDA */ -int pinmux_initialize(struct device *port) +int pinmux_initialize(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/colibri_imx7d_m4/pinmux.c b/boards/arm/colibri_imx7d_m4/pinmux.c index 7920642ff1b1..297afe3d0625 100644 --- a/boards/arm/colibri_imx7d_m4/pinmux.c +++ b/boards/arm/colibri_imx7d_m4/pinmux.c @@ -7,7 +7,7 @@ #include #include "device_imx.h" -static int colibri_imx7d_m4_pinmux_init(struct device *dev) +static int colibri_imx7d_m4_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c b/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c index 24aec0a958f4..21d003f6789b 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c +++ b/boards/arm/cy8ckit_062_wifi_bt_m0/pinmux.c @@ -13,7 +13,7 @@ #include "pinmux/pinmux.h" -static int pinmux_init(struct device *port) +static int pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c b/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c index 24aec0a958f4..21d003f6789b 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c +++ b/boards/arm/cy8ckit_062_wifi_bt_m4/pinmux.c @@ -13,7 +13,7 @@ #include "pinmux/pinmux.h" -static int pinmux_init(struct device *port) +static int pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/degu_evk/board.c b/boards/arm/degu_evk/board.c index 1b53d47c6fde..52b2f01f3df7 100644 --- a/boards/arm/degu_evk/board.c +++ b/boards/arm/degu_evk/board.c @@ -7,13 +7,13 @@ #include #include -static int board_degu_evk_init(struct device *dev) +static int board_degu_evk_init(const struct device *dev) { ARG_UNUSED(dev); - struct device *gpio0 = + const struct device *gpio0 = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); - struct device *gpio1 = + const struct device *gpio1 = device_get_binding(DT_LABEL(DT_NODELABEL(gpio1))); /* diff --git a/boards/arm/disco_l475_iot1/pinmux.c b/boards/arm/disco_l475_iot1/pinmux.c index ac3ef312a63e..6c5483c6a223 100644 --- a/boards/arm/disco_l475_iot1/pinmux.c +++ b/boards/arm/disco_l475_iot1/pinmux.c @@ -58,7 +58,7 @@ static const struct pin_config pinconf[] = { }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/dragino_lsn50/pinmux.c b/boards/arm/dragino_lsn50/pinmux.c index 4aab0f438ad3..e6c270f5dcc6 100644 --- a/boards/arm/dragino_lsn50/pinmux.c +++ b/boards/arm/dragino_lsn50/pinmux.c @@ -24,7 +24,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/efm32gg_stk3701a/board.c b/boards/arm/efm32gg_stk3701a/board.c index 2cbbd64f50dc..6075e7d88c49 100644 --- a/boards/arm/efm32gg_stk3701a/board.c +++ b/boards/arm/efm32gg_stk3701a/board.c @@ -11,9 +11,9 @@ #include #include "em_cmu.h" -static int efm32gg_stk3701a_init(struct device *dev) +static int efm32gg_stk3701a_init(const struct device *dev) { - struct device *cur_dev; + const struct device *cur_dev; ARG_UNUSED(dev); diff --git a/boards/arm/efm32hg_slstk3400a/board.c b/boards/arm/efm32hg_slstk3400a/board.c index f8485af46861..e6b5bc5d423f 100644 --- a/boards/arm/efm32hg_slstk3400a/board.c +++ b/boards/arm/efm32hg_slstk3400a/board.c @@ -9,9 +9,9 @@ #include #include -static int efm32hg_slstk3400a_init(struct device *dev) +static int efm32hg_slstk3400a_init(const struct device *dev) { - struct device *bce_dev; /* Board Controller Enable Gpio Device */ + const struct device *bce_dev; /* Board Controller Enable Gpio Device */ ARG_UNUSED(dev); diff --git a/boards/arm/efm32pg_stk3402a/board.c b/boards/arm/efm32pg_stk3402a/board.c index 65ffc219ad73..99eea511e2a6 100644 --- a/boards/arm/efm32pg_stk3402a/board.c +++ b/boards/arm/efm32pg_stk3402a/board.c @@ -9,9 +9,9 @@ #include #include -static int efm32pg_stk3402a_init(struct device *dev) +static int efm32pg_stk3402a_init(const struct device *dev) { - struct device *bce_dev; /* Board Controller Enable Gpio Device */ + const struct device *bce_dev; /* Board Controller Enable Gpio Device */ ARG_UNUSED(dev); diff --git a/boards/arm/efm32wg_stk3800/board.c b/boards/arm/efm32wg_stk3800/board.c index 26ce8287f215..de6960a7ad3e 100644 --- a/boards/arm/efm32wg_stk3800/board.c +++ b/boards/arm/efm32wg_stk3800/board.c @@ -9,9 +9,9 @@ #include #include -static int efm32wg_stk3800_init(struct device *dev) +static int efm32wg_stk3800_init(const struct device *dev) { - struct device *bce_dev; /* Board Controller Enable Gpio Device */ + const struct device *bce_dev; /* Board Controller Enable Gpio Device */ ARG_UNUSED(dev); diff --git a/boards/arm/efr32_radio/board.c b/boards/arm/efr32_radio/board.c index 4299a0a37f3a..93642f868c4b 100644 --- a/boards/arm/efr32_radio/board.c +++ b/boards/arm/efr32_radio/board.c @@ -12,9 +12,9 @@ #define VCOM_ENABLE_GPIO_NAME "GPIO_A" #define VCOM_ENABLE_GPIO_PIN 5 -static int efr32_radio_init(struct device *dev) +static int efr32_radio_init(const struct device *dev) { - struct device *vce_dev; /* Virtual COM Port Enable GPIO Device */ + const struct device *vce_dev; /* Virtual COM Port Enable GPIO Device */ ARG_UNUSED(dev); diff --git a/boards/arm/frdm_k22f/pinmux.c b/boards/arm/frdm_k22f/pinmux.c index 08f1770a24ea..e1e4263186b4 100644 --- a/boards/arm/frdm_k22f/pinmux.c +++ b/boards/arm/frdm_k22f/pinmux.c @@ -8,28 +8,28 @@ #include #include -static int frdm_k22f_pinmux_init(struct device *dev) +static int frdm_k22f_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - struct device *portd = + const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - struct device *porte = + const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/frdm_k64f/pinmux.c b/boards/arm/frdm_k64f/pinmux.c index 3492f9f25f90..e4166e9bc786 100644 --- a/boards/arm/frdm_k64f/pinmux.c +++ b/boards/arm/frdm_k64f/pinmux.c @@ -8,28 +8,28 @@ #include #include -static int frdm_k64f_pinmux_init(struct device *dev) +static int frdm_k64f_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - struct device *portd = + const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - struct device *porte = + const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/frdm_k82f/pinmux.c b/boards/arm/frdm_k82f/pinmux.c index ef1ca779f0da..b297ccb091db 100644 --- a/boards/arm/frdm_k82f/pinmux.c +++ b/boards/arm/frdm_k82f/pinmux.c @@ -8,28 +8,28 @@ #include #include -static int frdm_k82f_pinmux_init(struct device *dev) +static int frdm_k82f_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - __unused struct device *porta = + __unused const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - __unused struct device *portb = + __unused const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - __unused struct device *portc = + __unused const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - __unused struct device *portd = + __unused const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - __unused struct device *porte = + __unused const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/frdm_kl25z/pinmux.c b/boards/arm/frdm_kl25z/pinmux.c index 6bac8102358c..8b89e6d5eb4c 100644 --- a/boards/arm/frdm_kl25z/pinmux.c +++ b/boards/arm/frdm_kl25z/pinmux.c @@ -8,28 +8,28 @@ #include #include -static int frdm_kl25z_pinmux_init(struct device *dev) +static int frdm_kl25z_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #if defined(CONFIG_PINMUX_MCUX_PORTC) - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - struct device *portd = + const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #if defined(CONFIG_PINMUX_MCUX_PORTE) - struct device *porte = + const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/frdm_kw41z/pinmux.c b/boards/arm/frdm_kw41z/pinmux.c index f2caf0f42b76..15dd4a6c0de8 100644 --- a/boards/arm/frdm_kw41z/pinmux.c +++ b/boards/arm/frdm_kw41z/pinmux.c @@ -8,20 +8,20 @@ #include #include -static int frdm_kw41z_pinmux_init(struct device *dev) +static int frdm_kw41z_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif diff --git a/boards/arm/google_kukui/pinmux.c b/boards/arm/google_kukui/pinmux.c index 08d34d863d6e..3b5b6ef5d938 100644 --- a/boards/arm/google_kukui/pinmux.c +++ b/boards/arm/google_kukui/pinmux.c @@ -27,7 +27,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/hexiwear_k64/pinmux.c b/boards/arm/hexiwear_k64/pinmux.c index 6c6b6a1bae56..8460045535f7 100644 --- a/boards/arm/hexiwear_k64/pinmux.c +++ b/boards/arm/hexiwear_k64/pinmux.c @@ -9,24 +9,24 @@ #include #include -static int hexiwear_k64_pinmux_init(struct device *dev) +static int hexiwear_k64_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - struct device *portd = + const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - struct device *porte = + const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif @@ -52,7 +52,7 @@ static int hexiwear_k64_pinmux_init(struct device *dev) /* 3V3B_EN */ pinmux_pin_set(portb, 12, PORT_PCR_MUX(kPORT_MuxAsGpio)); - struct device *gpiob = + const struct device *gpiob = device_get_binding(DT_LABEL(DT_NODELABEL(gpiob))); gpio_pin_configure(gpiob, 12, GPIO_OUTPUT_LOW); @@ -84,13 +84,13 @@ static int hexiwear_k64_pinmux_init(struct device *dev) #endif #if defined(CONFIG_MAX30101) && DT_NODE_HAS_STATUS(DT_NODELABEL(gpioa), okay) - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); /* LDO - MAX30101 power supply */ pinmux_pin_set(porta, 29, PORT_PCR_MUX(kPORT_MuxAsGpio)); - struct device *gpioa = + const struct device *gpioa = device_get_binding(DT_LABEL(DT_NODELABEL(gpioa))); gpio_pin_configure(gpioa, 29, GPIO_OUTPUT_HIGH); @@ -99,7 +99,7 @@ static int hexiwear_k64_pinmux_init(struct device *dev) #ifdef CONFIG_BATTERY_SENSE pinmux_pin_set(portc, 14, PORT_PCR_MUX(kPORT_MuxAsGpio)); - struct device *gpioc = + const struct device *gpioc = device_get_binding(DT_LABEL(DT_NODELABEL(gpioc))); gpio_pin_configure(gpioc, 14, GPIO_OUTPUT_LOW); diff --git a/boards/arm/hexiwear_kw40z/pinmux.c b/boards/arm/hexiwear_kw40z/pinmux.c index 8f6bebeb68ba..a517caa0be71 100644 --- a/boards/arm/hexiwear_kw40z/pinmux.c +++ b/boards/arm/hexiwear_kw40z/pinmux.c @@ -8,17 +8,17 @@ #include #include -static int hexiwear_kw40z_pinmux_init(struct device *dev) +static int hexiwear_kw40z_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif diff --git a/boards/arm/ip_k66f/pinmux.c b/boards/arm/ip_k66f/pinmux.c index 1557df90e34c..4ee7809df0e5 100644 --- a/boards/arm/ip_k66f/pinmux.c +++ b/boards/arm/ip_k66f/pinmux.c @@ -8,12 +8,12 @@ #include #include -static int ip_k66f_pinmux_init(struct device *dev) +static int ip_k66f_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif diff --git a/boards/arm/lpcxpresso54114/pinmux.c b/boards/arm/lpcxpresso54114/pinmux.c index abcab00553c8..b32b86d92eca 100644 --- a/boards/arm/lpcxpresso54114/pinmux.c +++ b/boards/arm/lpcxpresso54114/pinmux.c @@ -9,17 +9,17 @@ #include #include -static int lpcxpresso_54114_pinmux_init(struct device *dev) +static int lpcxpresso_54114_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_LPC_PORT0 - struct device *port0 = + const struct device *port0 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT0_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_LPC_PORT1 - struct device *port1 = + const struct device *port1 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT1_NAME); #endif diff --git a/boards/arm/lpcxpresso55s16/pinmux.c b/boards/arm/lpcxpresso55s16/pinmux.c index 288e703734e9..7b6cff6db901 100644 --- a/boards/arm/lpcxpresso55s16/pinmux.c +++ b/boards/arm/lpcxpresso55s16/pinmux.c @@ -9,17 +9,17 @@ #include #include -static int lpcxpresso_55s16_pinmux_init(struct device *dev) +static int lpcxpresso_55s16_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_LPC_PORT0 - __unused struct device *port0 = + __unused const struct device *port0 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT0_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_LPC_PORT1 - __unused struct device *port1 = + __unused const struct device *port1 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT1_NAME); #endif diff --git a/boards/arm/lpcxpresso55s69/pinmux.c b/boards/arm/lpcxpresso55s69/pinmux.c index 3a55887b3287..53d0b5338efd 100644 --- a/boards/arm/lpcxpresso55s69/pinmux.c +++ b/boards/arm/lpcxpresso55s69/pinmux.c @@ -9,17 +9,17 @@ #include #include -static int lpcxpresso_55s69_pinmux_init(struct device *dev) +static int lpcxpresso_55s69_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_LPC_PORT0 - struct device *port0 = + const struct device *port0 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT0_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_LPC_PORT1 - struct device *port1 = + const struct device *port1 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT1_NAME); #endif diff --git a/boards/arm/mec1501modular_assy6885/pinmux.c b/boards/arm/mec1501modular_assy6885/pinmux.c index d264d26a4261..2cddb567bdbc 100644 --- a/boards/arm/mec1501modular_assy6885/pinmux.c +++ b/boards/arm/mec1501modular_assy6885/pinmux.c @@ -13,22 +13,22 @@ struct pinmux_ports_t { #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_000_036), okay) - struct device *porta; + const struct device *porta; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_040_076), okay) - struct device *portb; + const struct device *portb; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_100_136), okay) - struct device *portc; + const struct device *portc; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_140_176), okay) - struct device *portd; + const struct device *portd; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_200_236), okay) - struct device *porte; + const struct device *porte; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_240_276), okay) - struct device *portf; + const struct device *portf; #endif }; @@ -98,38 +98,38 @@ static void i2c_pinmux(struct pinmux_ports_t *p, uint8_t port_sel) } } -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); struct pinmux_ports_t pinmux_ports; #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_000_036), okay) - struct device *porta = + const struct device *porta = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_000_036))); pinmux_ports.porta = porta; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_040_076), okay) - struct device *portb = + const struct device *portb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_040_076))); pinmux_ports.portb = portb; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_100_136), okay) - struct device *portc = + const struct device *portc = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_100_136))); pinmux_ports.portc = portc; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_140_176), okay) - struct device *portd = + const struct device *portd = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_140_176))); pinmux_ports.portd = portd; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_200_236), okay) - struct device *porte = + const struct device *porte = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_200_236))); pinmux_ports.porte = porte; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_240_276), okay) - struct device *portf = + const struct device *portf = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_240_276))); pinmux_ports.portf = portf; #endif diff --git a/boards/arm/mec15xxevb_assy6853/pinmux.c b/boards/arm/mec15xxevb_assy6853/pinmux.c index ceef9b27e1a9..28963148cb7c 100644 --- a/boards/arm/mec15xxevb_assy6853/pinmux.c +++ b/boards/arm/mec15xxevb_assy6853/pinmux.c @@ -13,22 +13,22 @@ struct pinmux_ports_t { #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_000_036), okay) - struct device *porta; + const struct device *porta; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_040_076), okay) - struct device *portb; + const struct device *portb; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_100_136), okay) - struct device *portc; + const struct device *portc; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_140_176), okay) - struct device *portd; + const struct device *portd; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_200_236), okay) - struct device *porte; + const struct device *porte; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_240_276), okay) - struct device *portf; + const struct device *portf; #endif }; @@ -98,38 +98,38 @@ static void i2c_pinmux(struct pinmux_ports_t *p, uint8_t port_sel) } } -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); struct pinmux_ports_t pinmux_ports; #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_000_036), okay) - struct device *porta = + const struct device *porta = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_000_036))); pinmux_ports.porta = porta; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_040_076), okay) - struct device *portb = + const struct device *portb = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_040_076))); pinmux_ports.portb = portb; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_100_136), okay) - struct device *portc = + const struct device *portc = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_100_136))); pinmux_ports.portc = portc; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_140_176), okay) - struct device *portd = + const struct device *portd = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_140_176))); pinmux_ports.portd = portd; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_200_236), okay) - struct device *porte = + const struct device *porte = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_200_236))); pinmux_ports.porte = porte; #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_240_276), okay) - struct device *portf = + const struct device *portf = device_get_binding(DT_LABEL(DT_NODELABEL(pinmux_240_276))); pinmux_ports.portf = portf; #endif diff --git a/boards/arm/mec2016evb_assy6797/pinmux.c b/boards/arm/mec2016evb_assy6797/pinmux.c index 6f3e93bc2489..93a4057719e8 100644 --- a/boards/arm/mec2016evb_assy6797/pinmux.c +++ b/boards/arm/mec2016evb_assy6797/pinmux.c @@ -10,7 +10,7 @@ #include "soc.h" -static int board_pinmux_init(struct device *dev) +static int board_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c b/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c index 28f74e2d1251..acf90e556e78 100644 --- a/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c +++ b/boards/arm/mikroe_mini_m4_for_stm32/pinmux.c @@ -39,7 +39,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/mimxrt1010_evk/pinmux.c b/boards/arm/mimxrt1010_evk/pinmux.c index d32414a81ad9..f7bf17cb0baa 100644 --- a/boards/arm/mimxrt1010_evk/pinmux.c +++ b/boards/arm/mimxrt1010_evk/pinmux.c @@ -8,7 +8,7 @@ #include #include -static int mimxrt1010_evk_init(struct device *dev) +static int mimxrt1010_evk_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/mimxrt1015_evk/pinmux.c b/boards/arm/mimxrt1015_evk/pinmux.c index d96148e1ac90..5adad957f6f9 100644 --- a/boards/arm/mimxrt1015_evk/pinmux.c +++ b/boards/arm/mimxrt1015_evk/pinmux.c @@ -8,7 +8,7 @@ #include #include -static int mimxrt1015_evk_init(struct device *dev) +static int mimxrt1015_evk_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/mimxrt1020_evk/pinmux.c b/boards/arm/mimxrt1020_evk/pinmux.c index fa34560cc23f..e2d1b863aaa9 100644 --- a/boards/arm/mimxrt1020_evk/pinmux.c +++ b/boards/arm/mimxrt1020_evk/pinmux.c @@ -16,7 +16,7 @@ static gpio_pin_config_t enet_gpio_config = { }; #endif -static int mimxrt1020_evk_init(struct device *dev) +static int mimxrt1020_evk_init(const struct device *dev) { ARG_UNUSED(dev); @@ -148,7 +148,7 @@ static int mimxrt1020_evk_init(struct device *dev) } #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) -static int mimxrt1020_evk_phy_reset(struct device *dev) +static int mimxrt1020_evk_phy_reset(const struct device *dev) { /* RESET PHY chip. */ k_busy_wait(USEC_PER_MSEC * 10U); diff --git a/boards/arm/mimxrt1050_evk/pinmux.c b/boards/arm/mimxrt1050_evk/pinmux.c index d46598aa5122..56223176edde 100644 --- a/boards/arm/mimxrt1050_evk/pinmux.c +++ b/boards/arm/mimxrt1050_evk/pinmux.c @@ -102,7 +102,7 @@ static void mimxrt1050_evk_usdhc_pinmux( } #endif -static int mimxrt1050_evk_init(struct device *dev) +static int mimxrt1050_evk_init(const struct device *dev) { ARG_UNUSED(dev); @@ -317,7 +317,7 @@ static int mimxrt1050_evk_init(struct device *dev) } #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) -static int mimxrt1050_evk_phy_reset(struct device *dev) +static int mimxrt1050_evk_phy_reset(const struct device *dev) { /* RESET PHY chip. */ k_busy_wait(USEC_PER_MSEC * 10U); diff --git a/boards/arm/mimxrt1060_evk/pinmux.c b/boards/arm/mimxrt1060_evk/pinmux.c index 8d4ff6bf4b34..8cd80c723787 100644 --- a/boards/arm/mimxrt1060_evk/pinmux.c +++ b/boards/arm/mimxrt1060_evk/pinmux.c @@ -85,7 +85,7 @@ static void mimxrt1060_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed, } #endif -static int mimxrt1060_evk_init(struct device *dev) +static int mimxrt1060_evk_init(const struct device *dev) { ARG_UNUSED(dev); @@ -272,7 +272,7 @@ static int mimxrt1060_evk_init(struct device *dev) } #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) -static int mimxrt1060_evk_phy_reset(struct device *dev) +static int mimxrt1060_evk_phy_reset(const struct device *dev) { /* RESET PHY chip. */ k_busy_wait(USEC_PER_MSEC * 10U); diff --git a/boards/arm/mimxrt1064_evk/pinmux.c b/boards/arm/mimxrt1064_evk/pinmux.c index aeadb430ff61..c91b18040fe7 100644 --- a/boards/arm/mimxrt1064_evk/pinmux.c +++ b/boards/arm/mimxrt1064_evk/pinmux.c @@ -85,7 +85,7 @@ static void mimxrt1064_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed, } #endif -static int mimxrt1064_evk_init(struct device *dev) +static int mimxrt1064_evk_init(const struct device *dev) { ARG_UNUSED(dev); @@ -276,7 +276,7 @@ static int mimxrt1064_evk_init(struct device *dev) } #if DT_NODE_HAS_STATUS(DT_NODELABEL(enet), okay) -static int mimxrt1064_evk_phy_reset(struct device *dev) +static int mimxrt1064_evk_phy_reset(const struct device *dev) { /* RESET PHY chip. */ k_busy_wait(USEC_PER_MSEC * 10U); diff --git a/boards/arm/mm_swiftio/pinmux.c b/boards/arm/mm_swiftio/pinmux.c index 908229daaacb..a8dc1c7c625e 100644 --- a/boards/arm/mm_swiftio/pinmux.c +++ b/boards/arm/mm_swiftio/pinmux.c @@ -102,7 +102,7 @@ static void mm_swiftio_usdhc_pinmux( } #endif -static int mm_swiftio_init(struct device *dev) +static int mm_swiftio_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/mps2_an385/pinmux.c b/boards/arm/mps2_an385/pinmux.c index ebe1cc1cb151..997848d1da55 100644 --- a/boards/arm/mps2_an385/pinmux.c +++ b/boards/arm/mps2_an385/pinmux.c @@ -155,7 +155,7 @@ static void arm_mps2_pinmux_defaults(void) CMSDK_AHB_GPIO2_DEV->altfuncset = gpio_2; } -static int arm_mps2_pinmux_init(struct device *port) +static int arm_mps2_pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/mps2_an521/pinmux.c b/boards/arm/mps2_an521/pinmux.c index ebc279745699..968e90237d84 100644 --- a/boards/arm/mps2_an521/pinmux.c +++ b/boards/arm/mps2_an521/pinmux.c @@ -155,7 +155,7 @@ static void arm_mps2_pinmux_defaults(void) CMSDK_AHB_GPIO2_DEV->altfuncset = gpio_2; } -static int arm_mps2_pinmux_init(struct device *port) +static int arm_mps2_pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nrf52840dongle_nrf52840/board.c b/boards/arm/nrf52840dongle_nrf52840/board.c index dd0f0d44bdcc..fb614b2fc30d 100644 --- a/boards/arm/nrf52840dongle_nrf52840/board.c +++ b/boards/arm/nrf52840dongle_nrf52840/board.c @@ -7,7 +7,7 @@ #include #include -static int board_nrf52840dongle_nrf52840_init(struct device *dev) +static int board_nrf52840dongle_nrf52840_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c b/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c index fad030dfb981..62acba0e1b1f 100644 --- a/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c +++ b/boards/arm/nrf5340pdk_nrf5340/nrf5340_cpunet_reset.c @@ -49,7 +49,7 @@ static void remoteproc_mgr_config(void) } #endif /* !CONFIG_TRUSTED_EXECUTION_NONSECURE */ -static int remoteproc_mgr_boot(struct device *dev) +static int remoteproc_mgr_boot(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/nrf9160_innblue21/innblue21_board_init.c b/boards/arm/nrf9160_innblue21/innblue21_board_init.c index 7db1bf2387a0..590c4b4acba5 100644 --- a/boards/arm/nrf9160_innblue21/innblue21_board_init.c +++ b/boards/arm/nrf9160_innblue21/innblue21_board_init.c @@ -11,7 +11,7 @@ #define VDD_5V0_PWR_CTRL_GPIO_PIN 21 /* ENABLE_5V0_BOOST --> speed sensor */ /* Configures the pin as output and sets them high. */ -static void config_pin(struct device *gpio, int pin) +static void config_pin(const struct device *gpio, int pin) { int err; @@ -26,9 +26,9 @@ static void config_pin(struct device *gpio, int pin) k_sleep(K_MSEC(10)); } -static int pwr_ctrl_init(struct device *dev) +static int pwr_ctrl_init(const struct device *dev) { - struct device *gpio; + const struct device *gpio; /* Get handle of the GPIO device. */ gpio = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); diff --git a/boards/arm/nrf9160_innblue22/innblue22_board_init.c b/boards/arm/nrf9160_innblue22/innblue22_board_init.c index 732625ea826f..5c9f9fb6b34c 100644 --- a/boards/arm/nrf9160_innblue22/innblue22_board_init.c +++ b/boards/arm/nrf9160_innblue22/innblue22_board_init.c @@ -9,9 +9,9 @@ #define VDD_5V0_PWR_CTRL_GPIO_PIN 21 /* ENABLE_5V0_BOOST --> speed sensor */ -static int pwr_ctrl_init(struct device *dev) +static int pwr_ctrl_init(const struct device *dev) { - struct device *gpio; + const struct device *gpio; int err = -ENODEV; /* Get handle of the GPIO device. */ diff --git a/boards/arm/nrf9160dk_nrf52840/board.c b/boards/arm/nrf9160dk_nrf52840/board.c index 44147c712318..5910f43890d3 100644 --- a/boards/arm/nrf9160dk_nrf52840/board.c +++ b/boards/arm/nrf9160dk_nrf52840/board.c @@ -171,7 +171,8 @@ static void config_print(void) IS_ENABLED(CONFIG_BOARD_NRF9160DK_SWITCH1_ARDUINO)); } -static int pins_configure(struct device *port, const struct pin_config cfg[], +static int pins_configure(const struct device *port, + const struct pin_config cfg[], size_t pins) { int err; @@ -197,7 +198,7 @@ static int pins_configure(struct device *port, const struct pin_config cfg[], return 0; } -static void chip_reset(struct device *gpio, +static void chip_reset(const struct device *gpio, struct gpio_callback *cb, u32_t pins) { const u32_t stamp = k_cycle_get_32(); @@ -208,7 +209,7 @@ static void chip_reset(struct device *gpio, NVIC_SystemReset(); } -static void reset_pin_wait_low(struct device *port, u32_t pin) +static void reset_pin_wait_low(const struct device *port, u32_t pin) { int val; @@ -218,11 +219,12 @@ static void reset_pin_wait_low(struct device *port, u32_t pin) } while (val > 0); } -static int reset_pin_configure(struct device *p0, struct device *p1) +static int reset_pin_configure(const struct device *p0, + const struct device *p1) { int err; u32_t pin = 0; - struct device *port = NULL; + const struct device *port = NULL; static struct gpio_callback gpio_ctx; @@ -283,11 +285,11 @@ static int reset_pin_configure(struct device *p0, struct device *p1) return 0; } -static int init(struct device *dev) +static int init(const struct device *dev) { int rc; - struct device *p0; - struct device *p1; + const struct device *p0; + const struct device *p1; p0 = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); if (!p0) { diff --git a/boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c b/boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c index bd0516644ee3..3227ec5dfe6c 100644 --- a/boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c +++ b/boards/arm/nrf9160dk_nrf9160/nrf52840_reset.c @@ -16,11 +16,11 @@ BUILD_ASSERT(RESET_PIN > 16 && RESET_PIN < 24, "Selected pin is not connected to nRF52840"); -int bt_hci_transport_setup(struct device *h4) +int bt_hci_transport_setup(const struct device *h4) { int err; char c; - struct device *port; + const struct device *port; port = device_get_binding(DT_LABEL(DT_NODELABEL(gpio0))); if (!port) { diff --git a/boards/arm/nucleo_f030r8/pinmux.c b/boards/arm/nucleo_f030r8/pinmux.c index 6d8602811202..ba09f745d8fa 100644 --- a/boards/arm/nucleo_f030r8/pinmux.c +++ b/boards/arm/nucleo_f030r8/pinmux.c @@ -49,7 +49,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f070rb/pinmux.c b/boards/arm/nucleo_f070rb/pinmux.c index 604969961722..7f850c6d903f 100644 --- a/boards/arm/nucleo_f070rb/pinmux.c +++ b/boards/arm/nucleo_f070rb/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f091rc/pinmux.c b/boards/arm/nucleo_f091rc/pinmux.c index ec4a774d672f..d3e3256598b7 100644 --- a/boards/arm/nucleo_f091rc/pinmux.c +++ b/boards/arm/nucleo_f091rc/pinmux.c @@ -45,7 +45,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f103rb/pinmux.c b/boards/arm/nucleo_f103rb/pinmux.c index 1e11fadb938d..3c31135010e2 100644 --- a/boards/arm/nucleo_f103rb/pinmux.c +++ b/boards/arm/nucleo_f103rb/pinmux.c @@ -50,7 +50,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f207zg/pinmux.c b/boards/arm/nucleo_f207zg/pinmux.c index 20e98555e490..29462f80db86 100644 --- a/boards/arm/nucleo_f207zg/pinmux.c +++ b/boards/arm/nucleo_f207zg/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f302r8/pinmux.c b/boards/arm/nucleo_f302r8/pinmux.c index e372008a4bfd..d0711e95b49c 100644 --- a/boards/arm/nucleo_f302r8/pinmux.c +++ b/boards/arm/nucleo_f302r8/pinmux.c @@ -46,7 +46,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f303re/pinmux.c b/boards/arm/nucleo_f303re/pinmux.c index 97b8c6ae71a9..c1d30001b247 100644 --- a/boards/arm/nucleo_f303re/pinmux.c +++ b/boards/arm/nucleo_f303re/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f334r8/pinmux.c b/boards/arm/nucleo_f334r8/pinmux.c index db16c5a3a533..aa8adda8271c 100644 --- a/boards/arm/nucleo_f334r8/pinmux.c +++ b/boards/arm/nucleo_f334r8/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f401re/pinmux.c b/boards/arm/nucleo_f401re/pinmux.c index adb8111cd4c3..53b8abbf90e3 100644 --- a/boards/arm/nucleo_f401re/pinmux.c +++ b/boards/arm/nucleo_f401re/pinmux.c @@ -50,7 +50,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f411re/pinmux.c b/boards/arm/nucleo_f411re/pinmux.c index a93ff23bc2d7..37dad181d1dd 100644 --- a/boards/arm/nucleo_f411re/pinmux.c +++ b/boards/arm/nucleo_f411re/pinmux.c @@ -45,7 +45,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f412zg/pinmux.c b/boards/arm/nucleo_f412zg/pinmux.c index 637aba9f78eb..23b6549a1660 100644 --- a/boards/arm/nucleo_f412zg/pinmux.c +++ b/boards/arm/nucleo_f412zg/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f413zh/pinmux.c b/boards/arm/nucleo_f413zh/pinmux.c index ba61d48d8202..0468b378bdf7 100644 --- a/boards/arm/nucleo_f413zh/pinmux.c +++ b/boards/arm/nucleo_f413zh/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f429zi/pinmux.c b/boards/arm/nucleo_f429zi/pinmux.c index 65e9300a153c..28b849e96057 100644 --- a/boards/arm/nucleo_f429zi/pinmux.c +++ b/boards/arm/nucleo_f429zi/pinmux.c @@ -56,7 +56,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f446re/pinmux.c b/boards/arm/nucleo_f446re/pinmux.c index 170b85caa1bc..82c944f2297b 100644 --- a/boards/arm/nucleo_f446re/pinmux.c +++ b/boards/arm/nucleo_f446re/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f746zg/pinmux.c b/boards/arm/nucleo_f746zg/pinmux.c index 7690b7ffbd3c..dfb87713fb4f 100644 --- a/boards/arm/nucleo_f746zg/pinmux.c +++ b/boards/arm/nucleo_f746zg/pinmux.c @@ -73,7 +73,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f756zg/pinmux.c b/boards/arm/nucleo_f756zg/pinmux.c index 556b431f346e..2abce1a26415 100644 --- a/boards/arm/nucleo_f756zg/pinmux.c +++ b/boards/arm/nucleo_f756zg/pinmux.c @@ -66,7 +66,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_f767zi/pinmux.c b/boards/arm/nucleo_f767zi/pinmux.c index b31bec15a178..bbbf50136dea 100644 --- a/boards/arm/nucleo_f767zi/pinmux.c +++ b/boards/arm/nucleo_f767zi/pinmux.c @@ -73,7 +73,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_g071rb/pinmux.c b/boards/arm/nucleo_g071rb/pinmux.c index c90572b77066..527d202f430a 100644 --- a/boards/arm/nucleo_g071rb/pinmux.c +++ b/boards/arm/nucleo_g071rb/pinmux.c @@ -21,7 +21,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_g431rb/pinmux.c b/boards/arm/nucleo_g431rb/pinmux.c index 296834f16f06..cd1e0e8b6724 100644 --- a/boards/arm/nucleo_g431rb/pinmux.c +++ b/boards/arm/nucleo_g431rb/pinmux.c @@ -63,7 +63,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_g474re/pinmux.c b/boards/arm/nucleo_g474re/pinmux.c index e9a37d5fb3c7..60e90770ea4f 100644 --- a/boards/arm/nucleo_g474re/pinmux.c +++ b/boards/arm/nucleo_g474re/pinmux.c @@ -63,7 +63,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_h743zi/pinmux.c b/boards/arm/nucleo_h743zi/pinmux.c index 445e72331fcd..34f31e0862ed 100644 --- a/boards/arm/nucleo_h743zi/pinmux.c +++ b/boards/arm/nucleo_h743zi/pinmux.c @@ -30,7 +30,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l053r8/pinmux.c b/boards/arm/nucleo_l053r8/pinmux.c index a13c7babf1b4..33e1baa6e0aa 100644 --- a/boards/arm/nucleo_l053r8/pinmux.c +++ b/boards/arm/nucleo_l053r8/pinmux.c @@ -33,7 +33,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l073rz/pinmux.c b/boards/arm/nucleo_l073rz/pinmux.c index 58a9fda68a4b..fffb29fc49ff 100644 --- a/boards/arm/nucleo_l073rz/pinmux.c +++ b/boards/arm/nucleo_l073rz/pinmux.c @@ -39,7 +39,7 @@ static const struct pin_config pinconf[] = { #endif /* dac1 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l152re/pinmux.c b/boards/arm/nucleo_l152re/pinmux.c index 1764ed2e3fb7..08a3e6b6acf2 100644 --- a/boards/arm/nucleo_l152re/pinmux.c +++ b/boards/arm/nucleo_l152re/pinmux.c @@ -26,7 +26,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l432kc/pinmux.c b/boards/arm/nucleo_l432kc/pinmux.c index 9f0f26795761..3cc58cbc1c7a 100644 --- a/boards/arm/nucleo_l432kc/pinmux.c +++ b/boards/arm/nucleo_l432kc/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l452re/pinmux.c b/boards/arm/nucleo_l452re/pinmux.c index bd2d53309500..fdbec0aed14e 100644 --- a/boards/arm/nucleo_l452re/pinmux.c +++ b/boards/arm/nucleo_l452re/pinmux.c @@ -43,7 +43,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l476rg/pinmux.c b/boards/arm/nucleo_l476rg/pinmux.c index c69217b1d888..7452e2d51bb1 100644 --- a/boards/arm/nucleo_l476rg/pinmux.c +++ b/boards/arm/nucleo_l476rg/pinmux.c @@ -71,7 +71,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l496zg/pinmux.c b/boards/arm/nucleo_l496zg/pinmux.c index e06038271741..c36b3b3d1db5 100644 --- a/boards/arm/nucleo_l496zg/pinmux.c +++ b/boards/arm/nucleo_l496zg/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l4r5zi/pinmux.c b/boards/arm/nucleo_l4r5zi/pinmux.c index c00e75c847da..cd74f013c7f5 100644 --- a/boards/arm/nucleo_l4r5zi/pinmux.c +++ b/boards/arm/nucleo_l4r5zi/pinmux.c @@ -72,7 +72,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_l552ze_q/pinmux.c b/boards/arm/nucleo_l552ze_q/pinmux.c index 10ff6803287c..a260cf9835d6 100644 --- a/boards/arm/nucleo_l552ze_q/pinmux.c +++ b/boards/arm/nucleo_l552ze_q/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/nucleo_wb55rg/pinmux.c b/boards/arm/nucleo_wb55rg/pinmux.c index 1e7f3fc2b855..8f92d15e4cf5 100644 --- a/boards/arm/nucleo_wb55rg/pinmux.c +++ b/boards/arm/nucleo_wb55rg/pinmux.c @@ -50,7 +50,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/olimex_stm32_e407/pinmux.c b/boards/arm/olimex_stm32_e407/pinmux.c index 3e375495e4fc..1aeda0cc7272 100644 --- a/boards/arm/olimex_stm32_e407/pinmux.c +++ b/boards/arm/olimex_stm32_e407/pinmux.c @@ -52,7 +52,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/olimex_stm32_h407/pinmux.c b/boards/arm/olimex_stm32_h407/pinmux.c index 0c4b563a35b7..c39fbd681986 100644 --- a/boards/arm/olimex_stm32_h407/pinmux.c +++ b/boards/arm/olimex_stm32_h407/pinmux.c @@ -32,7 +32,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/olimex_stm32_p405/pinmux.c b/boards/arm/olimex_stm32_p405/pinmux.c index a7c940af1cda..ae29191f028b 100644 --- a/boards/arm/olimex_stm32_p405/pinmux.c +++ b/boards/arm/olimex_stm32_p405/pinmux.c @@ -24,7 +24,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/olimexino_stm32/pinmux.c b/boards/arm/olimexino_stm32/pinmux.c index c1f3a2698ac1..cb726263f3a6 100644 --- a/boards/arm/olimexino_stm32/pinmux.c +++ b/boards/arm/olimexino_stm32/pinmux.c @@ -64,7 +64,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/particle_argon/board.c b/boards/arm/particle_argon/board.c index e0ed973704f0..a6d559cb3402 100644 --- a/boards/arm/particle_argon/board.c +++ b/boards/arm/particle_argon/board.c @@ -11,7 +11,7 @@ static inline void external_antenna(bool on) { - struct device *ufl_gpio_dev, *pcb_gpio_dev; + const struct device *ufl_gpio_dev, *pcb_gpio_dev; ufl_gpio_dev = device_get_binding(SKY_UFLn_GPIO_NAME); if (!ufl_gpio_dev) { @@ -35,7 +35,7 @@ static inline void external_antenna(bool on) : GPIO_OUTPUT_ACTIVE)); } -static int board_particle_argon_init(struct device *dev) +static int board_particle_argon_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/particle_boron/board.c b/boards/arm/particle_boron/board.c index bcfa7183a94d..0e5714a3efa5 100644 --- a/boards/arm/particle_boron/board.c +++ b/boards/arm/particle_boron/board.c @@ -11,7 +11,7 @@ static inline void external_antenna(bool on) { - struct device *gpio_dev; + const struct device *gpio_dev; /* * On power-up the SKY13351 is left uncontrolled, so neither @@ -30,14 +30,14 @@ static inline void external_antenna(bool on) : GPIO_OUTPUT_INACTIVE)); } -static int board_particle_boron_init(struct device *dev) +static int board_particle_boron_init(const struct device *dev) { ARG_UNUSED(dev); external_antenna(false); #if defined(CONFIG_MODEM_UBLOX_SARA) - struct device *gpio_dev; + const struct device *gpio_dev; /* Enable the serial buffer for SARA-R4 modem */ gpio_dev = device_get_binding(SERIAL_BUFFER_ENABLE_GPIO_NAME); diff --git a/boards/arm/particle_xenon/board.c b/boards/arm/particle_xenon/board.c index 9b9246b4f803..dc10fdcc08ce 100644 --- a/boards/arm/particle_xenon/board.c +++ b/boards/arm/particle_xenon/board.c @@ -11,7 +11,7 @@ static inline void external_antenna(bool on) { - struct device *ufl_gpio_dev, *pcb_gpio_dev; + const struct device *ufl_gpio_dev, *pcb_gpio_dev; ufl_gpio_dev = device_get_binding(SKY_UFLn_GPIO_NAME); if (!ufl_gpio_dev) { @@ -35,7 +35,7 @@ static inline void external_antenna(bool on) : GPIO_OUTPUT_ACTIVE)); } -static int board_particle_xenon_init(struct device *dev) +static int board_particle_xenon_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/pico_pi_m4/pinmux.c b/boards/arm/pico_pi_m4/pinmux.c index abf4a0bb95cc..9a39fea1be82 100644 --- a/boards/arm/pico_pi_m4/pinmux.c +++ b/boards/arm/pico_pi_m4/pinmux.c @@ -8,7 +8,7 @@ #include #include "device_imx.h" -static int pico_pi_m4_pinmux_init(struct device *dev) +static int pico_pi_m4_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c index e654a28119f3..144205083920 100644 --- a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c +++ b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c @@ -68,9 +68,9 @@ void timer0_nrf_isr(void *arg) z_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { - struct device *clock; + const struct device *clock; ARG_UNUSED(device); diff --git a/boards/arm/reel_board/board.c b/boards/arm/reel_board/board.c index e3b409d0a776..3e9b649b5927 100644 --- a/boards/arm/reel_board/board.c +++ b/boards/arm/reel_board/board.c @@ -10,7 +10,7 @@ /* Peripheral voltage ON/OFF GPIO */ #define PERIPH_PON_PIN 0 -static int board_reel_board_init(struct device *dev) +static int board_reel_board_init(const struct device *dev) { ARG_UNUSED(dev); volatile NRF_GPIO_Type *gpio = NRF_P1; diff --git a/boards/arm/sam4e_xpro/pinmux.c b/boards/arm/sam4e_xpro/pinmux.c index 244a68893a08..961f522f3cf7 100644 --- a/boards/arm/sam4e_xpro/pinmux.c +++ b/boards/arm/sam4e_xpro/pinmux.c @@ -6,7 +6,7 @@ #include -static int sam4e_xpro_init(struct device *dev) +static int sam4e_xpro_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/sam_e70_xplained/pinmux.c b/boards/arm/sam_e70_xplained/pinmux.c index 70fc506692bd..301207e1f228 100644 --- a/boards/arm/sam_e70_xplained/pinmux.c +++ b/boards/arm/sam_e70_xplained/pinmux.c @@ -23,7 +23,7 @@ static const struct soc_gpio_pin pwm_ext2_pin8 = { }; #endif -static int sam_e70_xplained_init(struct device *dev) +static int sam_e70_xplained_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/sam_v71_xult/pinmux.c b/boards/arm/sam_v71_xult/pinmux.c index 60be81fe8320..452cdc087a0d 100644 --- a/boards/arm/sam_v71_xult/pinmux.c +++ b/boards/arm/sam_v71_xult/pinmux.c @@ -24,7 +24,7 @@ static const struct soc_gpio_pin pwm_ext2_pin8 = { }; #endif -static int sam_v71_xplained_init(struct device *dev) +static int sam_v71_xplained_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/sensortile_box/pinmux.c b/boards/arm/sensortile_box/pinmux.c index 83a1273a0eaf..b6326c858534 100644 --- a/boards/arm/sensortile_box/pinmux.c +++ b/boards/arm/sensortile_box/pinmux.c @@ -55,7 +55,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/steval_fcu001v1/pinmux.c b/boards/arm/steval_fcu001v1/pinmux.c index 2460eef94217..f09f1e1e7e29 100644 --- a/boards/arm/steval_fcu001v1/pinmux.c +++ b/boards/arm/steval_fcu001v1/pinmux.c @@ -27,7 +27,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm3210c_eval/pinmux.c b/boards/arm/stm3210c_eval/pinmux.c index 122a05ee4e90..d5aa739bf174 100644 --- a/boards/arm/stm3210c_eval/pinmux.c +++ b/boards/arm/stm3210c_eval/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32373c_eval/pinmux.c b/boards/arm/stm32373c_eval/pinmux.c index de4fd6c1fbef..1f37cd193c6a 100644 --- a/boards/arm/stm32373c_eval/pinmux.c +++ b/boards/arm/stm32373c_eval/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32_min_dev/pinmux.c b/boards/arm/stm32_min_dev/pinmux.c index eb8b158310a9..7d8540a2f596 100644 --- a/boards/arm/stm32_min_dev/pinmux.c +++ b/boards/arm/stm32_min_dev/pinmux.c @@ -62,7 +62,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f030_demo/pinmux.c b/boards/arm/stm32f030_demo/pinmux.c index b8afc1fd52af..5c75ba43d768 100644 --- a/boards/arm/stm32f030_demo/pinmux.c +++ b/boards/arm/stm32f030_demo/pinmux.c @@ -21,7 +21,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f072_eval/pinmux.c b/boards/arm/stm32f072_eval/pinmux.c index 91eab41c42d6..c6965a9b17fc 100644 --- a/boards/arm/stm32f072_eval/pinmux.c +++ b/boards/arm/stm32f072_eval/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f072b_disco/pinmux.c b/boards/arm/stm32f072b_disco/pinmux.c index 5c15e139fb37..21dfb30f20c1 100644 --- a/boards/arm/stm32f072b_disco/pinmux.c +++ b/boards/arm/stm32f072b_disco/pinmux.c @@ -39,7 +39,7 @@ static const struct pin_config pinconf[] = { }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f0_disco/pinmux.c b/boards/arm/stm32f0_disco/pinmux.c index 906b61b71067..4246aa8b7ee6 100644 --- a/boards/arm/stm32f0_disco/pinmux.c +++ b/boards/arm/stm32f0_disco/pinmux.c @@ -25,7 +25,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f3_disco/pinmux.c b/boards/arm/stm32f3_disco/pinmux.c index 4eda61de50ba..d8cea39f6e36 100644 --- a/boards/arm/stm32f3_disco/pinmux.c +++ b/boards/arm/stm32f3_disco/pinmux.c @@ -56,7 +56,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f411e_disco/pinmux.c b/boards/arm/stm32f411e_disco/pinmux.c index dcff3daf12e9..605f8aee9e34 100644 --- a/boards/arm/stm32f411e_disco/pinmux.c +++ b/boards/arm/stm32f411e_disco/pinmux.c @@ -23,7 +23,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f412g_disco/pinmux.c b/boards/arm/stm32f412g_disco/pinmux.c index 493a8a2fe54c..8d665dfe6495 100644 --- a/boards/arm/stm32f412g_disco/pinmux.c +++ b/boards/arm/stm32f412g_disco/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f429i_disc1/pinmux.c b/boards/arm/stm32f429i_disc1/pinmux.c index 0fb88e007164..8454168c9feb 100644 --- a/boards/arm/stm32f429i_disc1/pinmux.c +++ b/boards/arm/stm32f429i_disc1/pinmux.c @@ -44,7 +44,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f469i_disco/pinmux.c b/boards/arm/stm32f469i_disco/pinmux.c index 0da43f1f1d94..693aa2e6e5b8 100644 --- a/boards/arm/stm32f469i_disco/pinmux.c +++ b/boards/arm/stm32f469i_disco/pinmux.c @@ -38,7 +38,7 @@ static const struct pin_config pinconf[] = { }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f4_disco/pinmux.c b/boards/arm/stm32f4_disco/pinmux.c index 2cb3380b8760..f64f8233d559 100644 --- a/boards/arm/stm32f4_disco/pinmux.c +++ b/boards/arm/stm32f4_disco/pinmux.c @@ -39,7 +39,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f723e_disco/pinmux.c b/boards/arm/stm32f723e_disco/pinmux.c index b33b542097a3..dd39e0188381 100644 --- a/boards/arm/stm32f723e_disco/pinmux.c +++ b/boards/arm/stm32f723e_disco/pinmux.c @@ -45,7 +45,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_USB_DC_STM32 */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f746g_disco/pinmux.c b/boards/arm/stm32f746g_disco/pinmux.c index 4cacdf688152..0e5faef576a0 100644 --- a/boards/arm/stm32f746g_disco/pinmux.c +++ b/boards/arm/stm32f746g_disco/pinmux.c @@ -69,7 +69,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32f769i_disco/pinmux.c b/boards/arm/stm32f769i_disco/pinmux.c index 9b01367efc6d..11063938e817 100644 --- a/boards/arm/stm32f769i_disco/pinmux.c +++ b/boards/arm/stm32f769i_disco/pinmux.c @@ -46,7 +46,7 @@ static const struct pin_config pinconf[] = { #endif /* CONFIG_ETH_STM32_HAL */ }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32g0316_disco/pinmux.c b/boards/arm/stm32g0316_disco/pinmux.c index 748be0157098..12afa9a552b7 100644 --- a/boards/arm/stm32g0316_disco/pinmux.c +++ b/boards/arm/stm32g0316_disco/pinmux.c @@ -17,7 +17,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32h747i_disco/pinmux.c b/boards/arm/stm32h747i_disco/pinmux.c index dbb93248dfad..9744ab8ecaab 100644 --- a/boards/arm/stm32h747i_disco/pinmux.c +++ b/boards/arm/stm32h747i_disco/pinmux.c @@ -24,7 +24,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32l1_disco/pinmux.c b/boards/arm/stm32l1_disco/pinmux.c index de096eb30b77..2860af5f92a6 100644 --- a/boards/arm/stm32l1_disco/pinmux.c +++ b/boards/arm/stm32l1_disco/pinmux.c @@ -51,7 +51,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32l476g_disco/pinmux.c b/boards/arm/stm32l476g_disco/pinmux.c index 3092d14751fa..2ed2ff6c4bbe 100644 --- a/boards/arm/stm32l476g_disco/pinmux.c +++ b/boards/arm/stm32l476g_disco/pinmux.c @@ -20,7 +20,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32l496g_disco/pinmux.c b/boards/arm/stm32l496g_disco/pinmux.c index f80088a81326..9e5e752861cb 100644 --- a/boards/arm/stm32l496g_disco/pinmux.c +++ b/boards/arm/stm32l496g_disco/pinmux.c @@ -49,7 +49,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32mp157c_dk2/pinmux.c b/boards/arm/stm32mp157c_dk2/pinmux.c index f16c820b739b..0ee5c27d8b1e 100644 --- a/boards/arm/stm32mp157c_dk2/pinmux.c +++ b/boards/arm/stm32mp157c_dk2/pinmux.c @@ -46,7 +46,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/stm32vl_disco/pinmux.c b/boards/arm/stm32vl_disco/pinmux.c index edccd644a73c..1b36fe8fe788 100644 --- a/boards/arm/stm32vl_disco/pinmux.c +++ b/boards/arm/stm32vl_disco/pinmux.c @@ -55,7 +55,7 @@ static const struct pin_config pinconf[] = { #endif }; -static int pinmux_stm32_init(struct device *port) +static int pinmux_stm32_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/thingy52_nrf52832/board.c b/boards/arm/thingy52_nrf52832/board.c index 1d81408bc866..84b40efef279 100644 --- a/boards/arm/thingy52_nrf52832/board.c +++ b/boards/arm/thingy52_nrf52832/board.c @@ -16,10 +16,10 @@ struct pwr_ctrl_cfg { u32_t pin; }; -static int pwr_ctrl_init(struct device *dev) +static int pwr_ctrl_init(const struct device *dev) { const struct pwr_ctrl_cfg *cfg = dev->config_info; - struct device *gpio; + const struct device *gpio; gpio = device_get_binding(cfg->port); if (!gpio) { diff --git a/boards/arm/twr_ke18f/pinmux.c b/boards/arm/twr_ke18f/pinmux.c index 3c9450b854c0..ec489c1d94bc 100644 --- a/boards/arm/twr_ke18f/pinmux.c +++ b/boards/arm/twr_ke18f/pinmux.c @@ -8,29 +8,29 @@ #include #include -static int twr_ke18f_pinmux_init(struct device *dev) +static int twr_ke18f_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - __unused struct device *porta = + __unused const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - __unused struct device *portb = + __unused const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - __unused struct device *portc = + __unused const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - __unused struct device *portd = + __unused const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - __unused struct device *porte = + __unused const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/twr_kv58f220m/pinmux.c b/boards/arm/twr_kv58f220m/pinmux.c index 3a3862da6a9c..323226a6a3b3 100644 --- a/boards/arm/twr_kv58f220m/pinmux.c +++ b/boards/arm/twr_kv58f220m/pinmux.c @@ -8,28 +8,28 @@ #include #include -static int twr_kv58f220m_pinmux_init(struct device *dev) +static int twr_kv58f220m_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - __unused struct device *porta = + __unused const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - __unused struct device *portb = + __unused const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - __unused struct device *portc = + __unused const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - __unused struct device *portd = + __unused const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTE - __unused struct device *porte = + __unused const struct device *porte = device_get_binding(CONFIG_PINMUX_MCUX_PORTE_NAME); #endif diff --git a/boards/arm/udoo_neo_full_m4/pinmux.c b/boards/arm/udoo_neo_full_m4/pinmux.c index cde3e7d0419f..990a9749e6a6 100644 --- a/boards/arm/udoo_neo_full_m4/pinmux.c +++ b/boards/arm/udoo_neo_full_m4/pinmux.c @@ -7,7 +7,7 @@ #include #include "device_imx.h" -static int udoo_neo_full_m4_init(struct device *dev) +static int udoo_neo_full_m4_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/boards/arm/usb_kw24d512/pinmux.c b/boards/arm/usb_kw24d512/pinmux.c index 0249f87dddae..e45e2fb5025d 100644 --- a/boards/arm/usb_kw24d512/pinmux.c +++ b/boards/arm/usb_kw24d512/pinmux.c @@ -8,24 +8,24 @@ #include #include -static int usb_kw24d512_pinmux_init(struct device *dev) +static int usb_kw24d512_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #ifdef CONFIG_PINMUX_MCUX_PORTA - struct device *porta = + const struct device *porta = device_get_binding(CONFIG_PINMUX_MCUX_PORTA_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTB - struct device *portb = + const struct device *portb = device_get_binding(CONFIG_PINMUX_MCUX_PORTB_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTC - struct device *portc = + const struct device *portc = device_get_binding(CONFIG_PINMUX_MCUX_PORTC_NAME); #endif #ifdef CONFIG_PINMUX_MCUX_PORTD - struct device *portd = + const struct device *portd = device_get_binding(CONFIG_PINMUX_MCUX_PORTD_NAME); #endif diff --git a/boards/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c index e926db0dfa55..abd91841c70d 100644 --- a/boards/arm/v2m_beetle/pinmux.c +++ b/boards/arm/v2m_beetle/pinmux.c @@ -135,7 +135,7 @@ static void arm_v2m_beetle_pinmux_defaults(void) CMSDK_AHB_GPIO1_DEV->data |= (0x1 << 15); } -static int arm_v2m_beetle_pinmux_init(struct device *port) +static int arm_v2m_beetle_pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/v2m_musca/pinmux.c b/boards/arm/v2m_musca/pinmux.c index cc8f46ce9533..1012c0e38e44 100644 --- a/boards/arm/v2m_musca/pinmux.c +++ b/boards/arm/v2m_musca/pinmux.c @@ -58,7 +58,7 @@ static void arm_musca_pinmux_defaults(void) } #endif -static int arm_musca_pinmux_init(struct device *port) +static int arm_musca_pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/v2m_musca_b1/pinmux.c b/boards/arm/v2m_musca_b1/pinmux.c index 71e82ad92652..bae20161fb20 100644 --- a/boards/arm/v2m_musca_b1/pinmux.c +++ b/boards/arm/v2m_musca_b1/pinmux.c @@ -59,7 +59,7 @@ static void arm_musca_b1_pinmux_defaults(void) } #endif -static int arm_musca_pinmux_init(struct device *port) +static int arm_musca_pinmux_init(const struct device *port) { ARG_UNUSED(port); diff --git a/boards/arm/warp7_m4/pinmux.c b/boards/arm/warp7_m4/pinmux.c index 61f350fa6a12..75b1810d5bc8 100644 --- a/boards/arm/warp7_m4/pinmux.c +++ b/boards/arm/warp7_m4/pinmux.c @@ -7,7 +7,7 @@ #include #include "device_imx.h" -static int warp7_m4_pinmux_init(struct device *dev) +static int warp7_m4_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #if defined(CONFIG_FXOS8700) || defined(CONFIG_FXAS21002) diff --git a/boards/posix/nrf52_bsim/bstests_entry.c b/boards/posix/nrf52_bsim/bstests_entry.c index d192f53e37d4..1e1cf4216f4a 100644 --- a/boards/posix/nrf52_bsim/bstests_entry.c +++ b/boards/posix/nrf52_bsim/bstests_entry.c @@ -191,7 +191,7 @@ bool bst_irq_sniffer(int irq_number) } } -static int bst_fake_device_driver_pre2_init(struct device *arg) +static int bst_fake_device_driver_pre2_init(const struct device *arg) { ARG_UNUSED(arg); if (current_test && current_test->test_fake_ddriver_prekernel_f) { @@ -200,7 +200,7 @@ static int bst_fake_device_driver_pre2_init(struct device *arg) return 0; } -static int bst_fake_device_driver_post_init(struct device *arg) +static int bst_fake_device_driver_post_init(const struct device *arg) { ARG_UNUSED(arg); if (current_test && current_test->test_fake_ddriver_postkernel_f) { diff --git a/boards/posix/nrf52_bsim/trace_hook.c b/boards/posix/nrf52_bsim/trace_hook.c index 89436c1d404b..b2feb9590b8d 100644 --- a/boards/posix/nrf52_bsim/trace_hook.c +++ b/boards/posix/nrf52_bsim/trace_hook.c @@ -59,7 +59,7 @@ void posix_flush_stdout(void) * * @return 0 if successful, otherwise failed. */ -static int printk_init(struct device *arg) +static int printk_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/boards/riscv/hifive1/pinmux.c b/boards/riscv/hifive1/pinmux.c index 6e36f159fc63..9be8df7e651b 100644 --- a/boards/riscv/hifive1/pinmux.c +++ b/boards/riscv/hifive1/pinmux.c @@ -8,11 +8,11 @@ #include #include -static int hifive1_pinmux_init(struct device *dev) +static int hifive1_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); - struct device *p = device_get_binding(CONFIG_PINMUX_SIFIVE_0_NAME); + const struct device *p = device_get_binding(CONFIG_PINMUX_SIFIVE_0_NAME); /* UART0 RX */ pinmux_pin_set(p, 16, SIFIVE_PINMUX_IOF0); diff --git a/boards/riscv/hifive1_revb/pinmux.c b/boards/riscv/hifive1_revb/pinmux.c index 605645da960b..6ff750e5ca0e 100644 --- a/boards/riscv/hifive1_revb/pinmux.c +++ b/boards/riscv/hifive1_revb/pinmux.c @@ -8,11 +8,11 @@ #include #include -static int hifive1_revb_pinmux_init(struct device *dev) +static int hifive1_revb_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); - struct device *p = device_get_binding(CONFIG_PINMUX_SIFIVE_0_NAME); + const struct device *p = device_get_binding(CONFIG_PINMUX_SIFIVE_0_NAME); #ifdef CONFIG_UART_SIFIVE #ifdef CONFIG_UART_SIFIVE_PORT_0 diff --git a/boards/riscv/rv32m1_vega/pinmux.c b/boards/riscv/rv32m1_vega/pinmux.c index f2ccfba00a5a..27cf14c494b8 100644 --- a/boards/riscv/rv32m1_vega/pinmux.c +++ b/boards/riscv/rv32m1_vega/pinmux.c @@ -10,33 +10,33 @@ #include #ifdef CONFIG_BT_CTLR_DEBUG_PINS -struct device *vega_debug_portb; -struct device *vega_debug_portc; -struct device *vega_debug_portd; +const struct device *vega_debug_portb; +const struct device *vega_debug_portc; +const struct device *vega_debug_portd; #endif -static int rv32m1_vega_pinmux_init(struct device *dev) +static int rv32m1_vega_pinmux_init(const struct device *dev) { ARG_UNUSED(dev); #if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay) - __unused struct device *porta = + __unused const struct device *porta = device_get_binding(DT_LABEL(DT_NODELABEL(porta))); #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(portb), okay) - __unused struct device *portb = + __unused const struct device *portb = device_get_binding(DT_LABEL(DT_NODELABEL(portb))); #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(portc), okay) - __unused struct device *portc = + __unused const struct device *portc = device_get_binding(DT_LABEL(DT_NODELABEL(portc))); #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(portd), okay) - __unused struct device *portd = + __unused const struct device *portd = device_get_binding(DT_LABEL(DT_NODELABEL(portd))); #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(porte), okay) - __unused struct device *porte = + __unused const struct device *porte = device_get_binding(DT_LABEL(DT_NODELABEL(porte))); #endif @@ -112,7 +112,7 @@ static int rv32m1_vega_pinmux_init(struct device *dev) pinmux_pin_set(portd, 4, PORT_PCR_MUX(kPORT_MuxAsGpio)); pinmux_pin_set(portd, 5, PORT_PCR_MUX(kPORT_MuxAsGpio)); - struct device *gpio_dev = + const struct device *gpio_dev = device_get_binding(DT_LABEL(DT_NODELABEL(gpiob))); gpio_pin_configure(gpio_dev, 29, GPIO_OUTPUT); diff --git a/boards/xtensa/intel_s1000_crb/pinmux.c b/boards/xtensa/intel_s1000_crb/pinmux.c index 93fa51738e54..510f84770419 100644 --- a/boards/xtensa/intel_s1000_crb/pinmux.c +++ b/boards/xtensa/intel_s1000_crb/pinmux.c @@ -21,9 +21,9 @@ * Please note that a call to pinmux_pin_set is only needed when a setting * that is not default is required */ -static int intel_s1000_pinmux_init(struct device *dev) +static int intel_s1000_pinmux_init(const struct device *dev) { - struct device *pinmux; + const struct device *pinmux; pinmux = device_get_binding(CONFIG_PINMUX_NAME); diff --git a/doc/guides/dts/howtos.rst b/doc/guides/dts/howtos.rst index f0702d645114..4bb6a47fbba4 100644 --- a/doc/guides/dts/howtos.rst +++ b/doc/guides/dts/howtos.rst @@ -373,8 +373,8 @@ device-specific configuration and data structures and API functions, like this: }; /* Implement driver API functions (drivers/some_api.h callbacks): */ - static int my_driver_api_func1(struct device *dev, u32_t *foo) { /* ... */ } - static int my_driver_api_func2(struct device *dev, u64_t bar) { /* ... */ } + static int my_driver_api_func1(const struct device *dev, u32_t *foo) { /* ... */ } + static int my_driver_api_func2(const struct device *dev, u64_t bar) { /* ... */ } static struct some_api my_api_funcs = { .func1 = my_driver_api_func1, .func2 = my_driver_api_func2, diff --git a/doc/reference/drivers/index.rst b/doc/reference/drivers/index.rst index 94c7d7582d73..a36c83458042 100644 --- a/doc/reference/drivers/index.rst +++ b/doc/reference/drivers/index.rst @@ -104,7 +104,7 @@ split into read-only and runtime-mutable parts. At a high level we have: struct device_config { char *name; - int (*init)(struct device *device); + int (*init)(const struct device *device); const void *config_info; [...] }; @@ -134,15 +134,15 @@ A subsystem API definition typically looks like this: .. code-block:: C - typedef int (*subsystem_do_this_t)(struct device *device, int foo, int bar); - typedef void (*subsystem_do_that_t)(struct device *device, void *baz); + typedef int (*subsystem_do_this_t)(const struct device *device, int foo, int bar); + typedef void (*subsystem_do_that_t)(const struct device *device, void *baz); struct subsystem_api { subsystem_do_this_t do_this; subsystem_do_that_t do_that; }; - static inline int subsystem_do_this(struct device *device, int foo, int bar) + static inline int subsystem_do_this(const struct device *device, int foo, int bar) { struct subsystem_api *api; @@ -150,7 +150,7 @@ A subsystem API definition typically looks like this: return api->do_this(device, foo, bar); } - static inline void subsystem_do_that(struct device *device, void *baz) + static inline void subsystem_do_that(const struct device *device, void *baz) { struct subsystem_api *api; @@ -163,12 +163,12 @@ of these APIs, and populate an instance of subsystem_api structure: .. code-block:: C - static int my_driver_do_this(struct device *device, int foo, int bar) + static int my_driver_do_this(const struct device *device, int foo, int bar) { ... } - static void my_driver_do_that(struct device *device, void *baz) + static void my_driver_do_that(const struct device *device, void *baz) { ... } @@ -205,19 +205,19 @@ A device-specific API definition typically looks like this: #include - int specific_do_this(struct device *device, int foo); + int specific_do_this(const struct device *device, int foo); A driver implementing extensions to the subsystem will define the real implementation of both the subsystem API and the specific APIs: .. code-block:: C - static int generic_do_whatever(struct device *device, void *arg) + static int generic_do_whatever(const struct device *device, void *arg) { ... } - static int specific_do_this(struct device *device, int foo) + static int specific_do_this(const struct device *device, int foo) { ... } @@ -242,7 +242,7 @@ with a different interrupt line. In ``drivers/subsystem/subsystem_my_driver.h``: .. code-block:: C - typedef void (*my_driver_config_irq_t)(struct device *device); + typedef void (*my_driver_config_irq_t)(const struct device *device); struct my_driver_config { u32_t base_addr; @@ -253,13 +253,13 @@ In the implementation of the common init function: .. code-block:: C - void my_driver_isr(struct device *device) + void my_driver_isr(const struct device *device) { /* Handle interrupt */ ... } - int my_driver_init(struct device *device) + int my_driver_init(const struct device *device) { const struct my_driver_config *config = device->config_info; diff --git a/doc/reference/networking/8021Qav.rst b/doc/reference/networking/8021Qav.rst index c943b6cda263..d5a80999e753 100644 --- a/doc/reference/networking/8021Qav.rst +++ b/doc/reference/networking/8021Qav.rst @@ -23,7 +23,7 @@ also priority queues ``ETHERNET_PRIORITY_QUEUES`` need to be supported. .. code-block:: none - static enum ethernet_hw_caps eth_get_capabilities(struct device *dev) + static enum ethernet_hw_caps eth_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); diff --git a/doc/reference/networking/can_api.rst b/doc/reference/networking/can_api.rst index 256454e74c92..8caf9961a46c 100644 --- a/doc/reference/networking/can_api.rst +++ b/doc/reference/networking/can_api.rst @@ -178,7 +178,7 @@ occurred. It does not block until the message is sent like the example above. } } - int send_function(struct device *can_dev) + int send_function(const struct device *can_dev) { struct zcan_frame frame = { .id_type = CAN_EXTENDED_IDENTIFIER, diff --git a/doc/reference/power_management/index.rst b/doc/reference/power_management/index.rst index 33a110b0d52c..81e1a77e1696 100644 --- a/doc/reference/power_management/index.rst +++ b/doc/reference/power_management/index.rst @@ -279,7 +279,7 @@ Default Initializer Function .. code-block:: c - int device_pm_control_nop(struct device *unused_device, u32_t unused_ctrl_command, void *unused_context); + int device_pm_control_nop(const struct device *unused_device, u32_t unused_ctrl_command, void *unused_context); If the driver doesn't implement any power control operations, the driver can @@ -299,7 +299,7 @@ Get Device List .. code-block:: c - void device_list_get(struct device **device_list, int *device_count); + void device_list_get(const struct device **device_list, int *device_count); The Zephyr RTOS kernel internally maintains a list of all devices in the system. The SOC interface uses this API to get the device list. The SOC interface can use the list to @@ -315,7 +315,7 @@ Device Set Power State .. code-block:: c - int device_set_power_state(struct device *device, u32_t device_power_state, device_pm_cb cb, void *arg); + int device_set_power_state(const struct device *device, u32_t device_power_state, device_pm_cb cb, void *arg); Calls the :c:func:`device_pm_control()` handler function implemented by the device driver with DEVICE_PM_SET_POWER_STATE command. @@ -325,7 +325,7 @@ Device Get Power State .. code-block:: c - int device_get_power_state(struct device *device, u32_t * device_power_state); + int device_get_power_state(const struct device *device, u32_t * device_power_state); Calls the :c:func:`device_pm_control()` handler function implemented by the device driver with DEVICE_PM_GET_POWER_STATE command. @@ -364,7 +364,7 @@ Indicate Busy Status API .. code-block:: c - void device_busy_set(struct device *busy_dev); + void device_busy_set(const struct device *busy_dev); Sets a bit corresponding to the device, in a data structure maintained by the kernel, to indicate whether or not it is in the middle of a transaction. @@ -374,7 +374,7 @@ Clear Busy Status API .. code-block:: c - void device_busy_clear(struct device *busy_dev); + void device_busy_clear(const struct device *busy_dev); Clears the bit corresponding to the device in a data structure maintained by the kernel to indicate that the device is not in the middle of @@ -385,7 +385,7 @@ Check Busy Status of Single Device API .. code-block:: c - int device_busy_check(struct device *chk_dev); + int device_busy_check(const struct device *chk_dev); Checks whether a device is busy. The API returns 0 if the device is not busy. @@ -425,7 +425,7 @@ Enable Device Idle Power Management of a Device API .. code-block:: c - void device_pm_enable(struct device *dev); + void device_pm_enable(const struct device *dev); Enbles Idle Power Management of the device. @@ -434,7 +434,7 @@ Disable Device Idle Power Management of a Device API .. code-block:: c - void device_pm_disable(struct device *dev); + void device_pm_disable(const struct device *dev); Disables Idle Power Management of the device. @@ -443,7 +443,7 @@ Resume Device asynchronously API .. code-block:: c - int device_pm_get(struct device *dev); + int device_pm_get(const struct device *dev); Marks the device as being used. This API will asynchronously bring the device to resume state. The API returns 0 on success. @@ -453,7 +453,7 @@ Resume Device synchronously API .. code-block:: c - int device_pm_get_sync(struct device *dev); + int device_pm_get_sync(const struct device *dev); Marks the device as being used. It will bring up or resume the device if it is in suspended state based on the device @@ -465,7 +465,7 @@ Suspend Device asynchronously API .. code-block:: c - int device_pm_put(struct device *dev); + int device_pm_put(const struct device *dev); Marks the device as being released. This API asynchronously put the device to suspend state if not already in suspend state. @@ -476,7 +476,7 @@ Suspend Device synchronously API .. code-block:: c - int device_pm_put_sync(struct device *dev); + int device_pm_put_sync(const struct device *dev); Marks the device as being released. It will put the device to suspended state if is is in active state based on the device diff --git a/doc/reference/usermode/kernelobjects.rst b/doc/reference/usermode/kernelobjects.rst index 258379e8e014..bb2e21efeac7 100644 --- a/doc/reference/usermode/kernelobjects.rst +++ b/doc/reference/usermode/kernelobjects.rst @@ -8,7 +8,7 @@ A kernel object can be one of three classes of data: * A core kernel object, such as a semaphore, thread, pipe, etc. * A thread stack, which is an array of :c:type:`struct z_thread_stack_element` and declared with :c:macro:`K_THREAD_STACK_DEFINE()` -* A device driver instance (struct device) that belongs to one of a defined +* A device driver instance (const struct device) that belongs to one of a defined set of subsystems The set of known kernel objects and driver subsystems is defined in diff --git a/drivers/adc/adc_context.h b/drivers/adc/adc_context.h index 3b4267e0d4c0..c0467ec0ea85 100644 --- a/drivers/adc/adc_context.h +++ b/drivers/adc/adc_context.h @@ -206,7 +206,7 @@ static inline void adc_context_start_read(struct adc_context *ctx, * function if required and takes further actions accordingly. */ static inline void adc_context_on_sampling_done(struct adc_context *ctx, - struct device *dev) + const struct device *dev) { if (ctx->sequence.options) { adc_sequence_callback callback = ctx->options.callback; diff --git a/drivers/adc/adc_handlers.c b/drivers/adc/adc_handlers.c index 954f09e7f40a..175ad4799b72 100644 --- a/drivers/adc/adc_handlers.c +++ b/drivers/adc/adc_handlers.c @@ -8,8 +8,8 @@ #include #include -static inline int z_vrfy_adc_channel_setup(struct device *dev, - const struct adc_channel_cfg *user_channel_cfg) +static inline int z_vrfy_adc_channel_setup(const struct device *dev, + const struct adc_channel_cfg *user_channel_cfg) { struct adc_channel_cfg channel_cfg; @@ -18,7 +18,8 @@ static inline int z_vrfy_adc_channel_setup(struct device *dev, (struct adc_channel_cfg *)user_channel_cfg, sizeof(struct adc_channel_cfg))); - return z_impl_adc_channel_setup((struct device *)dev, &channel_cfg); + return z_impl_adc_channel_setup((const struct device *)dev, + &channel_cfg); } #include @@ -47,8 +48,8 @@ static bool copy_sequence(struct adc_sequence *dst, return true; } -static inline int z_vrfy_adc_read(struct device *dev, - const struct adc_sequence *user_sequence) +static inline int z_vrfy_adc_read(const struct device *dev, + const struct adc_sequence *user_sequence) { struct adc_sequence sequence; @@ -63,14 +64,14 @@ static inline int z_vrfy_adc_read(struct device *dev, "ADC sequence callbacks forbidden from user mode")); } - return z_impl_adc_read((struct device *)dev, &sequence); + return z_impl_adc_read((const struct device *)dev, &sequence); } #include #ifdef CONFIG_ADC_ASYNC -static inline int z_vrfy_adc_read_async(struct device *dev, - const struct adc_sequence *user_sequence, - struct k_poll_signal *async) +static inline int z_vrfy_adc_read_async(const struct device *dev, + const struct adc_sequence *user_sequence, + struct k_poll_signal *async) { struct adc_sequence sequence; struct adc_sequence_options options; @@ -85,7 +86,7 @@ static inline int z_vrfy_adc_read_async(struct device *dev, } Z_OOPS(Z_SYSCALL_OBJ(async, K_OBJ_POLL_SIGNAL)); - return z_impl_adc_read_async((struct device *)dev, &sequence, + return z_impl_adc_read_async((const struct device *)dev, &sequence, (struct k_poll_signal *)async); } #include diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c index f3eeaf167db3..d6783dda9f7b 100644 --- a/drivers/adc/adc_lmp90xxx.c +++ b/drivers/adc/adc_lmp90xxx.c @@ -121,7 +121,7 @@ struct lmp90xxx_config { struct lmp90xxx_data { struct adc_context ctx; - struct device *spi_dev; + const struct device *spi_dev; struct spi_cs_control spi_cs; struct gpio_callback drdyb_cb; struct k_mutex ura_lock; @@ -172,7 +172,7 @@ static inline u8_t lmp90xxx_inst2_sz(size_t len) } } -static int lmp90xxx_read_reg(struct device *dev, u8_t addr, u8_t *dptr, +static int lmp90xxx_read_reg(const struct device *dev, u8_t addr, u8_t *dptr, size_t len) { const struct lmp90xxx_config *config = dev->config_info; @@ -241,12 +241,12 @@ static int lmp90xxx_read_reg(struct device *dev, u8_t addr, u8_t *dptr, return err; } -static int lmp90xxx_read_reg8(struct device *dev, u8_t addr, u8_t *val) +static int lmp90xxx_read_reg8(const struct device *dev, u8_t addr, u8_t *val) { return lmp90xxx_read_reg(dev, addr, val, sizeof(val)); } -static int lmp90xxx_write_reg(struct device *dev, u8_t addr, u8_t *dptr, +static int lmp90xxx_write_reg(const struct device *dev, u8_t addr, u8_t *dptr, size_t len) { const struct lmp90xxx_config *config = dev->config_info; @@ -305,12 +305,12 @@ static int lmp90xxx_write_reg(struct device *dev, u8_t addr, u8_t *dptr, return err; } -static int lmp90xxx_write_reg8(struct device *dev, u8_t addr, u8_t val) +static int lmp90xxx_write_reg8(const struct device *dev, u8_t addr, u8_t val) { return lmp90xxx_write_reg(dev, addr, &val, sizeof(val)); } -static int lmp90xxx_soft_reset(struct device *dev) +static int lmp90xxx_soft_reset(const struct device *dev) { int err; @@ -325,7 +325,8 @@ static int lmp90xxx_soft_reset(struct device *dev) LMP90XXX_REG_AND_CNV_RST); } -static inline bool lmp90xxx_has_channel(struct device *dev, u8_t channel) +static inline bool lmp90xxx_has_channel(const struct device *dev, + u8_t channel) { const struct lmp90xxx_config *config = dev->config_info; @@ -336,7 +337,7 @@ static inline bool lmp90xxx_has_channel(struct device *dev, u8_t channel) } } -static inline bool lmp90xxx_has_input(struct device *dev, u8_t input) +static inline bool lmp90xxx_has_input(const struct device *dev, u8_t input) { const struct lmp90xxx_config *config = dev->config_info; @@ -376,7 +377,7 @@ static inline int lmp90xxx_acq_time_to_odr(u16_t acq_time) return -EINVAL; } -static int lmp90xxx_adc_channel_setup(struct device *dev, +static int lmp90xxx_adc_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { struct lmp90xxx_data *data = dev->driver_data; @@ -493,7 +494,7 @@ static int lmp90xxx_validate_buffer_size(const struct adc_sequence *sequence) return 0; } -static int lmp90xxx_adc_start_read(struct device *dev, +static int lmp90xxx_adc_start_read(const struct device *dev, const struct adc_sequence *sequence) { const struct lmp90xxx_config *config = dev->config_info; @@ -524,7 +525,7 @@ static int lmp90xxx_adc_start_read(struct device *dev, return adc_context_wait_for_completion(&data->ctx); } -static int lmp90xxx_adc_read_async(struct device *dev, +static int lmp90xxx_adc_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -538,7 +539,7 @@ static int lmp90xxx_adc_read_async(struct device *dev, return err; } -static int lmp90xxx_adc_read(struct device *dev, +static int lmp90xxx_adc_read(const struct device *dev, const struct adc_sequence *sequence) { return lmp90xxx_adc_read_async(dev, sequence, NULL); @@ -566,7 +567,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, } } -static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel, +static int lmp90xxx_adc_read_channel(const struct device *dev, u8_t channel, s32_t *result) { const struct lmp90xxx_config *config = dev->config_info; @@ -646,7 +647,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel, return 0; } -static void lmp90xxx_acquisition_thread(struct device *dev) +static void lmp90xxx_acquisition_thread(const struct device *dev) { struct lmp90xxx_data *data = dev->driver_data; u8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */ @@ -698,7 +699,7 @@ static void lmp90xxx_acquisition_thread(struct device *dev) } } -static void lmp90xxx_drdyb_callback(struct device *port, +static void lmp90xxx_drdyb_callback(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct lmp90xxx_data *data = @@ -709,7 +710,7 @@ static void lmp90xxx_drdyb_callback(struct device *port, } #ifdef CONFIG_ADC_LMP90XXX_GPIO -int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin) +int lmp90xxx_gpio_set_output(const struct device *dev, u8_t pin) { struct lmp90xxx_data *data = dev->driver_data; int err = 0; @@ -734,7 +735,7 @@ int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin) return err; } -int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin) +int lmp90xxx_gpio_set_input(const struct device *dev, u8_t pin) { struct lmp90xxx_data *data = dev->driver_data; int err = 0; @@ -759,7 +760,8 @@ int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin) return err; } -int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value) +int lmp90xxx_gpio_set_pin_value(const struct device *dev, u8_t pin, + bool value) { struct lmp90xxx_data *data = dev->driver_data; int err = 0; @@ -786,7 +788,8 @@ int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value) return err; } -int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value) +int lmp90xxx_gpio_get_pin_value(const struct device *dev, u8_t pin, + bool *value) { struct lmp90xxx_data *data = dev->driver_data; int err = 0; @@ -808,7 +811,8 @@ int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value) return err; } -int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value) +int lmp90xxx_gpio_port_get_raw(const struct device *dev, + gpio_port_value_t *value) { struct lmp90xxx_data *data = dev->driver_data; u8_t tmp; @@ -824,7 +828,7 @@ int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value) return err; } -int lmp90xxx_gpio_port_set_masked_raw(struct device *dev, +int lmp90xxx_gpio_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -847,7 +851,8 @@ int lmp90xxx_gpio_port_set_masked_raw(struct device *dev, return err; } -int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) +int lmp90xxx_gpio_port_set_bits_raw(const struct device *dev, + gpio_port_pins_t pins) { struct lmp90xxx_data *data = dev->driver_data; int err = 0; @@ -868,7 +873,7 @@ int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) return err; } -int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev, +int lmp90xxx_gpio_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins) { struct lmp90xxx_data *data = dev->driver_data; @@ -890,7 +895,8 @@ int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev, return err; } -int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) +int lmp90xxx_gpio_port_toggle_bits(const struct device *dev, + gpio_port_pins_t pins) { struct lmp90xxx_data *data = dev->driver_data; u8_t tmp; @@ -911,11 +917,11 @@ int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) #endif /* CONFIG_ADC_LMP90XXX_GPIO */ -static int lmp90xxx_init(struct device *dev) +static int lmp90xxx_init(const struct device *dev) { const struct lmp90xxx_config *config = dev->config_info; struct lmp90xxx_data *data = dev->driver_data; - struct device *drdyb_dev; + const struct device *drdyb_dev; int err; k_mutex_init(&data->ura_lock); diff --git a/drivers/adc/adc_mchp_xec.c b/drivers/adc/adc_mchp_xec.c index 91860d5100a9..fe4c42f82e7a 100644 --- a/drivers/adc/adc_mchp_xec.c +++ b/drivers/adc/adc_mchp_xec.c @@ -76,7 +76,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, } } -static int adc_xec_channel_setup(struct device *dev, +static int adc_xec_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; @@ -146,7 +146,7 @@ static bool adc_xec_validate_buffer_size(const struct adc_sequence *sequence) return true; } -static int adc_xec_start_read(struct device *dev, +static int adc_xec_start_read(const struct device *dev, const struct adc_sequence *sequence) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; @@ -191,7 +191,7 @@ static int adc_xec_start_read(struct device *dev, return adc_context_wait_for_completion(&data->ctx); } -static int adc_xec_read(struct device *dev, +static int adc_xec_read(const struct device *dev, const struct adc_sequence *sequence) { struct adc_xec_data *data = dev->driver_data; @@ -205,7 +205,7 @@ static int adc_xec_read(struct device *dev, } #if defined(CONFIG_ADC_ASYNC) -static int adc_xec_read_async(struct device *dev, +static int adc_xec_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -220,7 +220,7 @@ static int adc_xec_read_async(struct device *dev, } #endif /* CONFIG_ADC_ASYNC */ -static void xec_adc_get_sample(struct device *dev) +static void xec_adc_get_sample(const struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; struct adc_xec_data *data = dev->driver_data; @@ -251,7 +251,7 @@ static void xec_adc_get_sample(struct device *dev) adc_regs->status_reg = ch_status; } -static void adc_xec_isr(struct device *dev) +static void adc_xec_isr(const struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; struct adc_xec_data *data = dev->driver_data; @@ -282,7 +282,7 @@ struct adc_driver_api adc_xec_api = { .ref_internal = XEC_ADC_VREF_ANALOG, }; -static int adc_xec_init(struct device *dev) +static int adc_xec_init(const struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; struct adc_xec_data *data = dev->driver_data; diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c index 9369ceecad6f..a3e9be70b42e 100644 --- a/drivers/adc/adc_mcp320x.c +++ b/drivers/adc/adc_mcp320x.c @@ -35,7 +35,7 @@ struct mcp320x_config { struct mcp320x_data { struct adc_context ctx; - struct device *spi_dev; + const struct device *spi_dev; struct spi_cs_control spi_cs; u16_t *buffer; u16_t *repeat_buffer; @@ -48,7 +48,7 @@ struct mcp320x_data { CONFIG_ADC_MCP320X_ACQUISITION_THREAD_STACK_SIZE); }; -static int mcp320x_channel_setup(struct device *dev, +static int mcp320x_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { const struct mcp320x_config *config = dev->config_info; @@ -82,7 +82,7 @@ static int mcp320x_channel_setup(struct device *dev, return 0; } -static int mcp320x_validate_buffer_size(struct device *dev, +static int mcp320x_validate_buffer_size(const struct device *dev, const struct adc_sequence *sequence) { const struct mcp320x_config *config = dev->config_info; @@ -108,7 +108,7 @@ static int mcp320x_validate_buffer_size(struct device *dev, return 0; } -static int mcp320x_start_read(struct device *dev, +static int mcp320x_start_read(const struct device *dev, const struct adc_sequence *sequence) { const struct mcp320x_config *config = dev->config_info; @@ -138,7 +138,7 @@ static int mcp320x_start_read(struct device *dev, return adc_context_wait_for_completion(&data->ctx); } -static int mcp320x_read_async(struct device *dev, +static int mcp320x_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -152,7 +152,7 @@ static int mcp320x_read_async(struct device *dev, return err; } -static int mcp320x_read(struct device *dev, +static int mcp320x_read(const struct device *dev, const struct adc_sequence *sequence) { return mcp320x_read_async(dev, sequence, NULL); @@ -178,7 +178,8 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, } } -static int mcp320x_read_channel(struct device *dev, u8_t channel, u16_t *result) +static int mcp320x_read_channel(const struct device *dev, u8_t channel, + u16_t *result) { const struct mcp320x_config *config = dev->config_info; struct mcp320x_data *data = dev->driver_data; @@ -236,7 +237,7 @@ static int mcp320x_read_channel(struct device *dev, u8_t channel, u16_t *result) return 0; } -static void mcp320x_acquisition_thread(struct device *dev) +static void mcp320x_acquisition_thread(const struct device *dev) { struct mcp320x_data *data = dev->driver_data; u16_t result = 0; @@ -270,7 +271,7 @@ static void mcp320x_acquisition_thread(struct device *dev) } } -static int mcp320x_init(struct device *dev) +static int mcp320x_init(const struct device *dev) { const struct mcp320x_config *config = dev->config_info; struct mcp320x_data *data = dev->driver_data; diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c index 21743c039710..132493f0664b 100644 --- a/drivers/adc/adc_mcux_adc12.c +++ b/drivers/adc/adc_mcux_adc12.c @@ -25,11 +25,11 @@ struct mcux_adc12_config { adc12_clock_divider_t clock_div; adc12_reference_voltage_source_t ref_src; uint32_t sample_clk_count; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_adc12_data { - struct device *dev; + const struct device *dev; struct adc_context ctx; u16_t *buffer; u16_t *repeat_buffer; @@ -37,7 +37,7 @@ struct mcux_adc12_data { u8_t channel_id; }; -static int mcux_adc12_channel_setup(struct device *dev, +static int mcux_adc12_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { u8_t channel_id = channel_cfg->channel_id; @@ -70,7 +70,7 @@ static int mcux_adc12_channel_setup(struct device *dev, return 0; } -static int mcux_adc12_start_read(struct device *dev, +static int mcux_adc12_start_read(const struct device *dev, const struct adc_sequence *sequence) { const struct mcux_adc12_config *config = dev->config_info; @@ -130,7 +130,7 @@ static int mcux_adc12_start_read(struct device *dev, return error; } -static int mcux_adc12_read_async(struct device *dev, +static int mcux_adc12_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -144,13 +144,13 @@ static int mcux_adc12_read_async(struct device *dev, return error; } -static int mcux_adc12_read(struct device *dev, +static int mcux_adc12_read(const struct device *dev, const struct adc_sequence *sequence) { return mcux_adc12_read_async(dev, sequence, NULL); } -static void mcux_adc12_start_channel(struct device *dev) +static void mcux_adc12_start_channel(const struct device *dev) { const struct mcux_adc12_config *config = dev->config_info; struct mcux_adc12_data *data = dev->driver_data; @@ -190,7 +190,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static void mcux_adc12_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_adc12_config *config = dev->config_info; struct mcux_adc12_data *data = dev->driver_data; ADC_Type *base = config->base; @@ -211,7 +211,7 @@ static void mcux_adc12_isr(void *arg) } } -static int mcux_adc12_init(struct device *dev) +static int mcux_adc12_init(const struct device *dev) { const struct mcux_adc12_config *config = dev->config_info; struct mcux_adc12_data *data = dev->driver_data; @@ -260,7 +260,7 @@ static const struct adc_driver_api mcux_adc12_driver_api = { (kADC12_ReferenceVoltageSourceVref)) #define ACD12_MCUX_INIT(n) \ - static void mcux_adc12_config_func_##n(struct device *dev); \ + static void mcux_adc12_config_func_##n(const struct device *dev); \ \ ASSERT_WITHIN_RANGE(DT_INST_PROP(n, clk_source), 0, 3, \ "Invalid clock source"); \ @@ -290,7 +290,7 @@ static const struct adc_driver_api mcux_adc12_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_adc12_driver_api); \ \ - static void mcux_adc12_config_func_##n(struct device *dev) \ + static void mcux_adc12_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), mcux_adc12_isr, \ diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c index 49de71843dc7..b34dd1e6f9ae 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -19,11 +19,11 @@ LOG_MODULE_REGISTER(adc_mcux_adc16); struct mcux_adc16_config { ADC_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_adc16_data { - struct device *dev; + const struct device *dev; struct adc_context ctx; u16_t *buffer; u16_t *repeat_buffer; @@ -31,7 +31,7 @@ struct mcux_adc16_data { u8_t channel_id; }; -static int mcux_adc16_channel_setup(struct device *dev, +static int mcux_adc16_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { u8_t channel_id = channel_cfg->channel_id; @@ -64,7 +64,8 @@ static int mcux_adc16_channel_setup(struct device *dev, return 0; } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { const struct mcux_adc16_config *config = dev->config_info; struct mcux_adc16_data *data = dev->driver_data; @@ -131,7 +132,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) return error; } -static int mcux_adc16_read(struct device *dev, +static int mcux_adc16_read(const struct device *dev, const struct adc_sequence *sequence) { struct mcux_adc16_data *data = dev->driver_data; @@ -145,7 +146,7 @@ static int mcux_adc16_read(struct device *dev, } #ifdef CONFIG_ADC_ASYNC -static int mcux_adc16_read_async(struct device *dev, +static int mcux_adc16_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -160,7 +161,7 @@ static int mcux_adc16_read_async(struct device *dev, } #endif -static void mcux_adc16_start_channel(struct device *dev) +static void mcux_adc16_start_channel(const struct device *dev) { const struct mcux_adc16_config *config = dev->config_info; struct mcux_adc16_data *data = dev->driver_data; @@ -204,7 +205,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static void mcux_adc16_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_adc16_config *config = dev->config_info; struct mcux_adc16_data *data = dev->driver_data; ADC_Type *base = config->base; @@ -225,7 +226,7 @@ static void mcux_adc16_isr(void *arg) } } -static int mcux_adc16_init(struct device *dev) +static int mcux_adc16_init(const struct device *dev) { const struct mcux_adc16_config *config = dev->config_info; struct mcux_adc16_data *data = dev->driver_data; @@ -276,7 +277,7 @@ static const struct adc_driver_api mcux_adc16_driver_api = { }; #define ACD16_MCUX_INIT(n) \ - static void mcux_adc16_config_func_##n(struct device *dev); \ + static void mcux_adc16_config_func_##n(const struct device *dev); \ \ static const struct mcux_adc16_config mcux_adc16_config_##n = { \ .base = (ADC_Type *)DT_INST_REG_ADDR(n), \ @@ -295,7 +296,7 @@ static const struct adc_driver_api mcux_adc16_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_adc16_driver_api); \ \ - static void mcux_adc16_config_func_##n(struct device *dev) \ + static void mcux_adc16_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), \ mcux_adc16_isr, \ diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c index 40de7efdcf50..65b752332b92 100644 --- a/drivers/adc/adc_nrfx_adc.c +++ b/drivers/adc/adc_nrfx_adc.c @@ -31,7 +31,7 @@ static nrfx_adc_channel_t m_channels[CONFIG_ADC_NRFX_ADC_CHANNEL_COUNT]; /* Implementation of the ADC driver API function: adc_channel_setup. */ -static int adc_nrfx_channel_setup(struct device *dev, +static int adc_nrfx_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { u8_t channel_id = channel_cfg->channel_id; @@ -136,7 +136,8 @@ static int check_buffer_size(const struct adc_sequence *sequence, return 0; } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { int error; u32_t selected_channels = sequence->channels; @@ -210,7 +211,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) } /* Implementation of the ADC driver API function: adc_read. */ -static int adc_nrfx_read(struct device *dev, +static int adc_nrfx_read(const struct device *dev, const struct adc_sequence *sequence) { int error; @@ -224,7 +225,7 @@ static int adc_nrfx_read(struct device *dev, #ifdef CONFIG_ADC_ASYNC /* Implementation of the ADC driver API function: adc_read_sync. */ -static int adc_nrfx_read_async(struct device *dev, +static int adc_nrfx_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -242,14 +243,14 @@ DEVICE_DECLARE(adc_0); static void event_handler(const nrfx_adc_evt_t *p_event) { - struct device *dev = DEVICE_GET(adc_0); + const struct device *dev = DEVICE_GET(adc_0); if (p_event->type == NRFX_ADC_EVT_DONE) { adc_context_on_sampling_done(&m_data.ctx, dev); } } -static int init_adc(struct device *dev) +static int init_adc(const struct device *dev) { const nrfx_adc_config_t config = NRFX_ADC_DEFAULT_CONFIG; diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c index f67d52943ee9..b23a02ab7043 100644 --- a/drivers/adc/adc_nrfx_saadc.c +++ b/drivers/adc/adc_nrfx_saadc.c @@ -28,7 +28,7 @@ static struct driver_data m_data = { /* Implementation of the ADC driver API function: adc_channel_setup. */ -static int adc_nrfx_channel_setup(struct device *dev, +static int adc_nrfx_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { nrf_saadc_channel_config_t config = { @@ -253,7 +253,8 @@ static int check_buffer_size(const struct adc_sequence *sequence, return 0; } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { int error; u32_t selected_channels = sequence->channels; @@ -337,7 +338,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) } /* Implementation of the ADC driver API function: adc_read. */ -static int adc_nrfx_read(struct device *dev, +static int adc_nrfx_read(const struct device *dev, const struct adc_sequence *sequence) { int error; @@ -351,7 +352,7 @@ static int adc_nrfx_read(struct device *dev, #ifdef CONFIG_ADC_ASYNC /* Implementation of the ADC driver API function: adc_read_async. */ -static int adc_nrfx_read_async(struct device *dev, +static int adc_nrfx_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -367,7 +368,7 @@ static int adc_nrfx_read_async(struct device *dev, static void saadc_irq_handler(void *param) { - struct device *dev = (struct device *)param; + const struct device *dev = (const struct device *)param; if (nrf_saadc_event_check(NRF_SAADC, NRF_SAADC_EVENT_END)) { nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_END); @@ -393,7 +394,7 @@ static void saadc_irq_handler(void *param) DEVICE_DECLARE(adc_0); -static int init_saadc(struct device *dev) +static int init_saadc(const struct device *dev) { nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_END); nrf_saadc_event_clear(NRF_SAADC, NRF_SAADC_EVENT_CALIBRATEDONE); diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c index 1bd92273346c..2ee6de69ad2c 100644 --- a/drivers/adc/adc_sam0.c +++ b/drivers/adc/adc_sam0.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(adc_sam0, CONFIG_ADC_LOG_LEVEL); struct adc_sam0_data { struct adc_context ctx; - struct device *dev; + const struct device *dev; u16_t *buffer; @@ -55,7 +55,7 @@ struct adc_sam0_cfg { u32_t freq; u16_t prescaler; - void (*config_func)(struct device *dev); + void (*config_func)(const struct device *dev); }; #define DEV_CFG(dev) \ @@ -74,7 +74,7 @@ static void wait_synchronization(Adc *const adc) #endif } -static int adc_sam0_acquisition_to_clocks(struct device *dev, +static int adc_sam0_acquisition_to_clocks(const struct device *dev, u16_t acquisition_time) { const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); @@ -119,7 +119,7 @@ static int adc_sam0_acquisition_to_clocks(struct device *dev, return (int)scaled_acq; } -static int adc_sam0_channel_setup(struct device *dev, +static int adc_sam0_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); @@ -281,7 +281,7 @@ static int adc_sam0_channel_setup(struct device *dev, return 0; } -static void adc_sam0_start_conversion(struct device *dev) +static void adc_sam0_start_conversion(const struct device *dev) { const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); Adc *const adc = cfg->regs; @@ -333,7 +333,8 @@ static int check_buffer_size(const struct adc_sequence *sequence, return 0; } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); struct adc_sam0_data *data = DEV_DATA(dev); @@ -415,7 +416,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) return error; } -static int adc_sam0_read(struct device *dev, +static int adc_sam0_read(const struct device *dev, const struct adc_sequence *sequence) { struct adc_sam0_data *data = DEV_DATA(dev); @@ -430,7 +431,7 @@ static int adc_sam0_read(struct device *dev, static void adc_sam0_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct adc_sam0_data *data = DEV_DATA(dev); const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); Adc *const adc = cfg->regs; @@ -454,7 +455,7 @@ static void adc_sam0_isr(void *arg) adc_context_on_sampling_done(&data->ctx, dev); } -static int adc_sam0_init(struct device *dev) +static int adc_sam0_init(const struct device *dev) { const struct adc_sam0_cfg *const cfg = DEV_CFG(dev); struct adc_sam0_data *data = DEV_DATA(dev); @@ -498,7 +499,7 @@ static int adc_sam0_init(struct device *dev) } #ifdef CONFIG_ADC_ASYNC -static int adc_sam0_read_async(struct device *dev, +static int adc_sam0_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -587,7 +588,7 @@ do { \ #endif #define ADC_SAM0_DEVICE(n) \ - static void adc_sam0_config_##n(struct device *dev); \ + static void adc_sam0_config_##n(const struct device *dev); \ static const struct adc_sam0_cfg adc_sam_cfg_##n = { \ .regs = (Adc *)DT_INST_REG_ADDR(n), \ ADC_SAM0_CLOCK_CONTROL(n) \ @@ -607,7 +608,7 @@ do { \ &adc_sam_cfg_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &adc_sam0_api); \ - static void adc_sam0_config_##n(struct device *dev) \ + static void adc_sam0_config_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index e3c11336e7df..b02cf0022900 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -33,11 +33,11 @@ LOG_MODULE_REGISTER(adc_sam_afec); #define CONF_ADC_PRESCALER ((SOC_ATMEL_SAM_MCK_FREQ_HZ / 15000000) - 1) -typedef void (*cfg_func_t)(struct device *dev); +typedef void (*cfg_func_t)(const struct device *dev); struct adc_sam_data { struct adc_context ctx; - struct device *dev; + const struct device *dev; /* Pointer to the buffer in the sequence. */ u16_t *buffer; @@ -68,7 +68,7 @@ struct adc_sam_cfg { #define DEV_DATA(dev) \ ((struct adc_sam_data *)(dev)->driver_data) -static int adc_sam_channel_setup(struct device *dev, +static int adc_sam_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg) { const struct adc_sam_cfg * const cfg = DEV_CFG(dev); @@ -118,7 +118,7 @@ static int adc_sam_channel_setup(struct device *dev, return 0; } -static void adc_sam_start_conversion(struct device *dev) +static void adc_sam_start_conversion(const struct device *dev) { const struct adc_sam_cfg *const cfg = DEV_CFG(dev); struct adc_sam_data *data = DEV_DATA(dev); @@ -183,7 +183,8 @@ static int check_buffer_size(const struct adc_sequence *sequence, return 0; } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { struct adc_sam_data *data = DEV_DATA(dev); int error = 0; @@ -247,7 +248,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) return error; } -static int adc_sam_read(struct device *dev, +static int adc_sam_read(const struct device *dev, const struct adc_sequence *sequence) { struct adc_sam_data *data = DEV_DATA(dev); @@ -260,7 +261,7 @@ static int adc_sam_read(struct device *dev, return error; } -static int adc_sam_init(struct device *dev) +static int adc_sam_init(const struct device *dev) { const struct adc_sam_cfg *const cfg = DEV_CFG(dev); struct adc_sam_data *data = DEV_DATA(dev); @@ -301,7 +302,7 @@ static int adc_sam_init(struct device *dev) } #ifdef CONFIG_ADC_ASYNC -static int adc_sam_read_async(struct device *dev, +static int adc_sam_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -326,7 +327,7 @@ static const struct adc_driver_api adc_sam_api = { static void adc_sam_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct adc_sam_data *data = DEV_DATA(dev); const struct adc_sam_cfg *const cfg = DEV_CFG(dev); Afec *const afec = cfg->regs; @@ -350,7 +351,7 @@ static void adc_sam_isr(void *arg) } #define ADC_SAM_INIT(n) \ - static void adc##n##_sam_cfg_func(struct device *dev); \ + static void adc##n##_sam_cfg_func(const struct device *dev); \ \ static const struct adc_sam_cfg adc##n##_sam_cfg = { \ .regs = (Afec *)DT_INST_REG_ADDR(n), \ @@ -371,7 +372,7 @@ static void adc_sam_isr(void *arg) CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &adc_sam_api); \ \ - static void adc##n##_sam_cfg_func(struct device *dev) \ + static void adc##n##_sam_cfg_func(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), \ adc_sam_isr, \ diff --git a/drivers/adc/adc_shell.c b/drivers/adc/adc_shell.c index b404011cd83e..7811cbaffe7b 100644 --- a/drivers/adc/adc_shell.c +++ b/drivers/adc/adc_shell.c @@ -118,7 +118,7 @@ static int get_adc_from_list(char *name) static int cmd_adc_channel(const struct shell *shell, size_t argc, char **argv) { int retval = 0; - struct device *adc_dev; + const struct device *adc_dev; int chosen_adc; if (argc != args_no.channel) { @@ -175,7 +175,7 @@ static const struct gain_string_to_enum gain_list[] = { static int cmd_adc_gain(const struct shell *shell, size_t argc, char **argv) { int retval = -EINVAL; - struct device *adc_dev; + const struct device *adc_dev; int chosen_adc; int i; @@ -207,7 +207,7 @@ static int cmd_adc_gain(const struct shell *shell, size_t argc, char **argv) static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv) { int retval = 0; - struct device *adc_dev; + const struct device *adc_dev; int chosen_adc; u16_t acq_time; @@ -255,7 +255,7 @@ static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv) static int cmd_adc_reso(const struct shell *shell, size_t argc, char **argv) { int retval = 0; - struct device *adc_dev; + const struct device *adc_dev; int chosen_adc; if (argc != args_no.resolution || @@ -305,7 +305,7 @@ static const struct reference_string_to_enum reference_list[] = { static int cmd_adc_ref(const struct shell *shell, size_t argc, char **argv) { int retval = -EINVAL; - struct device *adc_dev; + const struct device *adc_dev; int chosen_adc; int i; @@ -339,7 +339,7 @@ static int cmd_adc_read(const struct shell *shell, size_t argc, char **argv) { int retval = 0; int chosen_adc = -1; - struct device *adc_dev; + const struct device *adc_dev; u16_t m_sample_buffer[BUFFER_SIZE]; if (argc != args_no.read) { diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index a5a0602b8051..66ca2a4d93ef 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -203,7 +203,7 @@ static const u32_t table_samp_time[] = { struct adc_stm32_data { struct adc_context ctx; - struct device *dev; + const struct device *dev; u16_t *buffer; u16_t *repeat_buffer; @@ -220,7 +220,7 @@ struct adc_stm32_cfg { void (*irq_cfg_func)(void); struct stm32_pclken pclken; - struct device *p_dev; + const struct device *p_dev; }; static int check_buffer_size(const struct adc_sequence *sequence, @@ -243,7 +243,7 @@ static int check_buffer_size(const struct adc_sequence *sequence, return 0; } -static void adc_stm32_start_conversion(struct device *dev) +static void adc_stm32_start_conversion(const struct device *dev) { const struct adc_stm32_cfg *config = dev->config_info; ADC_TypeDef *adc = (ADC_TypeDef *)config->base; @@ -263,7 +263,8 @@ static void adc_stm32_start_conversion(struct device *dev) #endif } -static int start_read(struct device *dev, const struct adc_sequence *sequence) +static int start_read(const struct device *dev, + const struct adc_sequence *sequence) { const struct adc_stm32_cfg *config = dev->config_info; struct adc_stm32_data *data = dev->driver_data; @@ -387,7 +388,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static void adc_stm32_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct adc_stm32_data *data = (struct adc_stm32_data *)dev->driver_data; const struct adc_stm32_cfg *config = (const struct adc_stm32_cfg *)dev->config_info; @@ -400,7 +401,7 @@ static void adc_stm32_isr(void *arg) LOG_DBG("ISR triggered."); } -static int adc_stm32_read(struct device *dev, +static int adc_stm32_read(const struct device *dev, const struct adc_sequence *sequence) { struct adc_stm32_data *data = dev->driver_data; @@ -414,7 +415,7 @@ static int adc_stm32_read(struct device *dev, } #ifdef CONFIG_ADC_ASYNC -static int adc_stm32_read_async(struct device *dev, +static int adc_stm32_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -446,7 +447,7 @@ static int adc_stm32_check_acq_time(u16_t acq_time) return -EINVAL; } -static void adc_stm32_setup_speed(struct device *dev, u8_t id, +static void adc_stm32_setup_speed(const struct device *dev, u8_t id, u8_t acq_time_index) { const struct adc_stm32_cfg *config = @@ -463,8 +464,8 @@ static void adc_stm32_setup_speed(struct device *dev, u8_t id, #endif } -static int adc_stm32_channel_setup(struct device *dev, - const struct adc_channel_cfg *channel_cfg) +static int adc_stm32_channel_setup(const struct device *dev, + const struct adc_channel_cfg *channel_cfg) { #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32L0X) struct adc_stm32_data *data = dev->driver_data; @@ -520,7 +521,7 @@ static int adc_stm32_channel_setup(struct device *dev, !defined(CONFIG_SOC_SERIES_STM32F7X) && \ !defined(CONFIG_SOC_SERIES_STM32F1X) && \ !defined(CONFIG_SOC_SERIES_STM32L1X) -static void adc_stm32_calib(struct device *dev) +static void adc_stm32_calib(const struct device *dev) { const struct adc_stm32_cfg *config = (const struct adc_stm32_cfg *)dev->config_info; @@ -542,11 +543,11 @@ static void adc_stm32_calib(struct device *dev) } #endif -static int adc_stm32_init(struct device *dev) +static int adc_stm32_init(const struct device *dev) { struct adc_stm32_data *data = dev->driver_data; const struct adc_stm32_cfg *config = dev->config_info; - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); ADC_TypeDef *adc = (ADC_TypeDef *)config->base; diff --git a/drivers/audio/intel_dmic.c b/drivers/audio/intel_dmic.c index be8e82377db1..1d72d1b7cdde 100644 --- a/drivers/audio/intel_dmic.c +++ b/drivers/audio/intel_dmic.c @@ -133,7 +133,7 @@ static struct _dmic_pdata { u8_t num_streams; u8_t reserved; struct _stream_data streams[DMIC_MAX_STREAMS]; - struct device *dma_dev; + const struct device *dma_dev; } dmic_private; static inline void dmic_parse_channel_map(u32_t channel_map_lo, @@ -714,8 +714,9 @@ static int source_ipm_helper(struct pdm_chan_cfg *config, u32_t *source_mask, return ipm; } -static int configure_registers(struct device *dev, - struct dmic_configuration *hw_cfg, struct dmic_cfg *config) +static int configure_registers(const struct device *dev, + struct dmic_configuration *hw_cfg, + struct dmic_cfg *config) { u8_t skew; u8_t swap_mask; @@ -1004,7 +1005,7 @@ static void dmic_dma_callback(void *arg, u32_t chan, int err_code) } } -static int dmic_set_config(struct device *dev, struct dmic_cfg *config) +static int dmic_set_config(const struct device *dev, struct dmic_cfg *config) { struct decim_modes modes_a; struct decim_modes modes_b; @@ -1107,7 +1108,7 @@ static int dmic_set_config(struct device *dev, struct dmic_cfg *config) } /* start the DMIC for capture */ -static void dmic_start(struct device *dev) +static void dmic_start(const struct device *dev) { struct _stream_data *stream; unsigned int key; @@ -1257,7 +1258,8 @@ static void dmic_stop(void) } } -static int dmic_trigger_device(struct device *dev, enum dmic_trigger cmd) +static int dmic_trigger_device(const struct device *dev, + enum dmic_trigger cmd) { unsigned int key; @@ -1292,7 +1294,7 @@ static inline u8_t dmic_parse_clk_skew_map(u32_t skew_map, u8_t pdm) return (u8_t)((skew_map >> ((pdm & BIT_MASK(3)) * 4U)) & BIT_MASK(4)); } -static int dmic_initialize_device(struct device *dev) +static int dmic_initialize_device(const struct device *dev) { int stream; struct _stream_data *stream_data; @@ -1315,7 +1317,8 @@ static int dmic_initialize_device(struct device *dev) return 0; } -static int dmic_configure_device(struct device *dev, struct dmic_cfg *config) +static int dmic_configure_device(const struct device *dev, + struct dmic_cfg *config) { int ret = 0; @@ -1333,8 +1336,8 @@ static int dmic_configure_device(struct device *dev, struct dmic_cfg *config) return ret; } -static int dmic_read_device(struct device *dev, u8_t stream, - void **buffer, size_t *size, s32_t timeout) +static int dmic_read_device(const struct device *dev, u8_t stream, + void **buffer, size_t *size, s32_t timeout) { int ret; diff --git a/drivers/audio/mpxxdtyy-i2s.c b/drivers/audio/mpxxdtyy-i2s.c index 1626e98be354..470a9dd10d23 100644 --- a/drivers/audio/mpxxdtyy-i2s.c +++ b/drivers/audio/mpxxdtyy-i2s.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(mpxxdtyy); K_MEM_SLAB_DEFINE(rx_pdm_i2s_mslab, PDM_BLOCK_MAX_SIZE_BYTES, NUM_RX_BLOCKS, 1); -int mpxxdtyy_i2s_read(struct device *dev, u8_t stream, void **buffer, +int mpxxdtyy_i2s_read(const struct device *dev, u8_t stream, void **buffer, size_t *size, s32_t timeout) { int ret; @@ -51,7 +51,7 @@ int mpxxdtyy_i2s_read(struct device *dev, u8_t stream, void **buffer, return 0; } -int mpxxdtyy_i2s_trigger(struct device *dev, enum dmic_trigger cmd) +int mpxxdtyy_i2s_trigger(const struct device *dev, enum dmic_trigger cmd) { int ret; struct mpxxdtyy_data *const data = DEV_DATA(dev); @@ -89,7 +89,7 @@ int mpxxdtyy_i2s_trigger(struct device *dev, enum dmic_trigger cmd) return 0; } -int mpxxdtyy_i2s_configure(struct device *dev, struct dmic_cfg *cfg) +int mpxxdtyy_i2s_configure(const struct device *dev, struct dmic_cfg *cfg) { int ret; struct mpxxdtyy_data *const data = DEV_DATA(dev); diff --git a/drivers/audio/mpxxdtyy.c b/drivers/audio/mpxxdtyy.c index 3dd304d8a9d0..f6b6f1a8c2cc 100644 --- a/drivers/audio/mpxxdtyy.c +++ b/drivers/audio/mpxxdtyy.c @@ -45,7 +45,7 @@ static u8_t right_channel(u8_t a, u8_t b) return ch_demux[a & CHANNEL_MASK] | (ch_demux[b & CHANNEL_MASK] << 4); } -u16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg) +u16_t sw_filter_lib_init(const struct device *dev, struct dmic_cfg *cfg) { struct mpxxdtyy_data *const data = DEV_DATA(dev); TPDMFilter_InitStruct *pdm_filter = &data->pdm_filter[0]; @@ -148,7 +148,7 @@ static const struct _dmic_ops mpxxdtyy_driver_api = { #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s) */ }; -static int mpxxdtyy_initialize(struct device *dev) +static int mpxxdtyy_initialize(const struct device *dev) { struct mpxxdtyy_data *const data = DEV_DATA(dev); diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h index 81b3c8c158c4..493ec28d5f66 100644 --- a/drivers/audio/mpxxdtyy.h +++ b/drivers/audio/mpxxdtyy.h @@ -25,23 +25,23 @@ extern "C" { ((struct mpxxdtyy_data *const)(dev)->driver_data) struct mpxxdtyy_data { - struct device *comm_master; + const struct device *comm_master; enum dmic_state state; TPDMFilter_InitStruct pdm_filter[2]; size_t pcm_mem_size; struct k_mem_slab *pcm_mem_slab; }; -u16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg); +u16_t sw_filter_lib_init(const struct device *dev, struct dmic_cfg *cfg); int sw_filter_lib_run(TPDMFilter_InitStruct *pdm_filter, void *pdm_block, void *pcm_block, size_t pdm_size, size_t pcm_size); #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s) -int mpxxdtyy_i2s_read(struct device *dev, u8_t stream, void **buffer, +int mpxxdtyy_i2s_read(const struct device *dev, u8_t stream, void **buffer, size_t *size, s32_t timeout); -int mpxxdtyy_i2s_trigger(struct device *dev, enum dmic_trigger cmd); -int mpxxdtyy_i2s_configure(struct device *dev, struct dmic_cfg *cfg); +int mpxxdtyy_i2s_trigger(const struct device *dev, enum dmic_trigger cmd); +int mpxxdtyy_i2s_configure(const struct device *dev, struct dmic_cfg *cfg); #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s) */ #ifdef __cplusplus diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c index 3d72e03a6dd0..fcf46ce0f4e6 100644 --- a/drivers/audio/tlv320dac310x.c +++ b/drivers/audio/tlv320dac310x.c @@ -25,10 +25,10 @@ LOG_MODULE_REGISTER(tlv320dac310x); #define CODEC_OUTPUT_VOLUME_MIN (-78 * 2) struct codec_driver_config { - struct device *i2c_device; + const struct device *i2c_device; const char *i2c_dev_name; u8_t i2c_address; - struct device *gpio_device; + const struct device *gpio_device; const char *gpio_dev_name; u32_t gpio_pin; int gpio_flags; @@ -55,25 +55,28 @@ static struct codec_driver_data codec_device_data; #define DEV_DATA(dev) \ ((struct codec_driver_data *const)(dev)->driver_data) -static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val); -static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val); -static void codec_soft_reset(struct device *dev); -static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg); -static int codec_configure_clocks(struct device *dev, - struct audio_codec_cfg *cfg); -static int codec_configure_filters(struct device *dev, audio_dai_cfg_t *cfg); +static void codec_write_reg(const struct device *dev, struct reg_addr reg, + u8_t val); +static void codec_read_reg(const struct device *dev, struct reg_addr reg, + u8_t *val); +static void codec_soft_reset(const struct device *dev); +static int codec_configure_dai(const struct device *dev, audio_dai_cfg_t *cfg); +static int codec_configure_clocks(const struct device *dev, + struct audio_codec_cfg *cfg); +static int codec_configure_filters(const struct device *dev, + audio_dai_cfg_t *cfg); static enum osr_multiple codec_get_osr_multiple(audio_dai_cfg_t *cfg); -static void codec_configure_output(struct device *dev); -static int codec_set_output_volume(struct device *dev, int vol); +static void codec_configure_output(const struct device *dev); +static int codec_set_output_volume(const struct device *dev, int vol); #if (LOG_LEVEL >= LOG_LEVEL_DEBUG) -static void codec_read_all_regs(struct device *dev); +static void codec_read_all_regs(const struct device *dev); #define CODEC_DUMP_REGS(dev) codec_read_all_regs((dev)) #else #define CODEC_DUMP_REGS(dev) #endif -static int codec_initialize(struct device *dev) +static int codec_initialize(const struct device *dev) { struct codec_driver_config *const dev_cfg = DEV_CFG(dev); @@ -96,8 +99,8 @@ static int codec_initialize(struct device *dev) return 0; } -static int codec_configure(struct device *dev, - struct audio_codec_cfg *cfg) +static int codec_configure(const struct device *dev, + struct audio_codec_cfg *cfg) { struct codec_driver_config *const dev_cfg = DEV_CFG(dev); int ret; @@ -127,7 +130,7 @@ static int codec_configure(struct device *dev, return ret; } -static void codec_start_output(struct device *dev) +static void codec_start_output(const struct device *dev) { /* powerup DAC channels */ codec_write_reg(dev, DATA_PATH_SETUP_ADDR, DAC_LR_POWERUP_DEFAULT); @@ -138,7 +141,7 @@ static void codec_start_output(struct device *dev) CODEC_DUMP_REGS(dev); } -static void codec_stop_output(struct device *dev) +static void codec_stop_output(const struct device *dev) { /* mute DAC channels */ codec_write_reg(dev, VOL_CTRL_ADDR, VOL_CTRL_MUTE_DEFAULT); @@ -147,21 +150,22 @@ static void codec_stop_output(struct device *dev) codec_write_reg(dev, DATA_PATH_SETUP_ADDR, DAC_LR_POWERDN_DEFAULT); } -static void codec_mute_output(struct device *dev) +static void codec_mute_output(const struct device *dev) { /* mute DAC channels */ codec_write_reg(dev, VOL_CTRL_ADDR, VOL_CTRL_MUTE_DEFAULT); } -static void codec_unmute_output(struct device *dev) +static void codec_unmute_output(const struct device *dev) { /* unmute DAC channels */ codec_write_reg(dev, VOL_CTRL_ADDR, VOL_CTRL_UNMUTE_DEFAULT); } -static int codec_set_property(struct device *dev, - audio_property_t property, audio_channel_t channel, - audio_property_value_t val) +static int codec_set_property(const struct device *dev, + audio_property_t property, + audio_channel_t channel, + audio_property_value_t val) { /* individual channel control not currently supported */ if (channel != AUDIO_CHANNEL_ALL) { @@ -189,13 +193,14 @@ static int codec_set_property(struct device *dev, return -EINVAL; } -static int codec_apply_properties(struct device *dev) +static int codec_apply_properties(const struct device *dev) { /* nothing to do because there is nothing cached */ return 0; } -static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val) +static void codec_write_reg(const struct device *dev, struct reg_addr reg, + u8_t val) { struct codec_driver_data *const dev_data = DEV_DATA(dev); struct codec_driver_config *const dev_cfg = DEV_CFG(dev); @@ -213,7 +218,8 @@ static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val) reg.page, reg.reg_addr, val); } -static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val) +static void codec_read_reg(const struct device *dev, struct reg_addr reg, + u8_t *val) { struct codec_driver_data *const dev_data = DEV_DATA(dev); struct codec_driver_config *const dev_cfg = DEV_CFG(dev); @@ -231,13 +237,13 @@ static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val) reg.page, reg.reg_addr, *val); } -static void codec_soft_reset(struct device *dev) +static void codec_soft_reset(const struct device *dev) { /* soft reset the DAC */ codec_write_reg(dev, SOFT_RESET_ADDR, SOFT_RESET_ASSERT); } -static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg) +static int codec_configure_dai(const struct device *dev, audio_dai_cfg_t *cfg) { u8_t val; @@ -274,8 +280,8 @@ static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg) return 0; } -static int codec_configure_clocks(struct device *dev, - struct audio_codec_cfg *cfg) +static int codec_configure_clocks(const struct device *dev, + struct audio_codec_cfg *cfg) { int dac_clk, mod_clk; struct i2s_config *i2s; @@ -373,7 +379,8 @@ static int codec_configure_clocks(struct device *dev, return 0; } -static int codec_configure_filters(struct device *dev, audio_dai_cfg_t *cfg) +static int codec_configure_filters(const struct device *dev, + audio_dai_cfg_t *cfg) { enum proc_block proc_blk; @@ -413,7 +420,7 @@ static enum osr_multiple codec_get_osr_multiple(audio_dai_cfg_t *cfg) return osr; } -static void codec_configure_output(struct device *dev) +static void codec_configure_output(const struct device *dev) { u8_t val; @@ -453,7 +460,7 @@ static void codec_configure_output(struct device *dev) codec_write_reg(dev, HEADPHONE_DRV_ADDR, val); } -static int codec_set_output_volume(struct device *dev, int vol) +static int codec_set_output_volume(const struct device *dev, int vol) { u8_t vol_val; int vol_index; @@ -492,7 +499,7 @@ static int codec_set_output_volume(struct device *dev, int vol) } #if (LOG_LEVEL >= LOG_LEVEL_DEBUG) -static void codec_read_all_regs(struct device *dev) +static void codec_read_all_regs(const struct device *dev) { u8_t val; diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c index 754c88dded4a..d6cbbfbcf145 100644 --- a/drivers/bluetooth/hci/h4.c +++ b/drivers/bluetooth/hci/h4.c @@ -67,7 +67,7 @@ static struct { .fifo = Z_FIFO_INITIALIZER(tx.fifo), }; -static struct device *h4_dev; +static const struct device *h4_dev; static inline void h4_get_type(void) { @@ -219,7 +219,7 @@ static void rx_thread(void *p1, void *p2, void *p3) } } -static size_t h4_discard(struct device *uart, size_t len) +static size_t h4_discard(const struct device *uart, size_t len) { u8_t buf[33]; @@ -389,7 +389,7 @@ static inline void process_rx(void) } } -static void bt_uart_isr(struct device *unused) +static void bt_uart_isr(const struct device *unused) { ARG_UNUSED(unused); @@ -420,7 +420,7 @@ static int h4_send(struct net_buf *buf) * * @return 0 on success, negative error value on failure */ -int __weak bt_hci_transport_setup(struct device *dev) +int __weak bt_hci_transport_setup(const struct device *dev) { h4_discard(h4_dev, 32); return 0; @@ -458,7 +458,7 @@ static const struct bt_hci_driver drv = { .send = h4_send, }; -static int bt_uart_init(struct device *unused) +static int bt_uart_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c index 6b71be25d61a..519bed24c8fa 100644 --- a/drivers/bluetooth/hci/h5.c +++ b/drivers/bluetooth/hci/h5.c @@ -125,7 +125,7 @@ static const u8_t conf_rsp[] = { 0x04, 0x7b }; #define SIG_BUF_SIZE (BT_BUF_RESERVE + MAX_SIG_LEN) NET_BUF_POOL_DEFINE(h5_pool, SIGNAL_COUNT, SIG_BUF_SIZE, 0, NULL); -static struct device *h5_dev; +static const struct device *h5_dev; static void h5_reset_rx(void) { @@ -411,7 +411,7 @@ static inline struct net_buf *get_evt_buf(u8_t evt) return bt_buf_get_evt(evt, false, K_NO_WAIT); } -static void bt_uart_isr(struct device *unused) +static void bt_uart_isr(const struct device *unused) { static int remaining; u8_t byte; @@ -752,7 +752,7 @@ static const struct bt_hci_driver drv = { .send = h5_queue, }; -static int bt_uart_init(struct device *unused) +static int bt_uart_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c index 6ae94823ee2d..9572d58d6077 100644 --- a/drivers/bluetooth/hci/ipm_stm32wb.c +++ b/drivers/bluetooth/hci/ipm_stm32wb.c @@ -532,7 +532,7 @@ static const struct bt_hci_driver drv = { .send = bt_ipm_send, }; -static int _bt_ipm_init(struct device *unused) +static int _bt_ipm_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/hci/rpmsg.c b/drivers/bluetooth/hci/rpmsg.c index 7158f57e8071..2d2a73410915 100644 --- a/drivers/bluetooth/hci/rpmsg.c +++ b/drivers/bluetooth/hci/rpmsg.c @@ -207,7 +207,7 @@ static const struct bt_hci_driver drv = { .bus = BT_HCI_DRIVER_BUS_IPM, }; -static int bt_rpmsg_init(struct device *unused) +static int bt_rpmsg_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/hci/rpmsg_nrf53.c b/drivers/bluetooth/hci/rpmsg_nrf53.c index 6a5d497981d8..09f0f6ebd180 100644 --- a/drivers/bluetooth/hci/rpmsg_nrf53.c +++ b/drivers/bluetooth/hci/rpmsg_nrf53.c @@ -24,8 +24,8 @@ static K_THREAD_STACK_DEFINE(bt_rpmsg_rx_thread_stack, CONFIG_BT_RPMSG_NRF53_RX_STACK_SIZE); static struct k_thread bt_rpmsg_rx_thread_data; -static struct device *ipm_tx_handle; -static struct device *ipm_rx_handle; +static const struct device *ipm_tx_handle; +static const struct device *ipm_rx_handle; /* Configuration defines */ diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c index 600961462b0d..416dd5b4d50d 100644 --- a/drivers/bluetooth/hci/spi.c +++ b/drivers/bluetooth/hci/spi.c @@ -68,8 +68,8 @@ static u8_t rxmsg[SPI_MAX_MSG_LEN]; static u8_t txmsg[SPI_MAX_MSG_LEN]; -static struct device *irq_dev; -static struct device *rst_dev; +static const struct device *irq_dev; +static const struct device *rst_dev; static struct gpio_callback gpio_cb; @@ -105,7 +105,7 @@ void spi_dump_message(const u8_t *pre, u8_t *buf, u8_t size) {} #endif #if defined(CONFIG_BT_SPI_BLUENRG) -static struct device *cs_dev; +static const struct device *cs_dev; /* Define a limit when reading IRQ high */ /* It can be required to be increased for */ /* some particular cases. */ @@ -126,7 +126,7 @@ struct bluenrg_aci_cmd_ll_param { static int bt_spi_send_aci_config_data_controller_mode(void); #endif /* CONFIG_BT_BLUENRG_ACI */ -static struct device *spi_dev; +static const struct device *spi_dev; static struct spi_config spi_conf = { .frequency = DT_INST_PROP(0, spi_max_frequency), @@ -166,7 +166,8 @@ static inline u16_t bt_spi_get_evt(u8_t *rxmsg) return (rxmsg[EVT_VENDOR_CODE_MSB] << 8) | rxmsg[EVT_VENDOR_CODE_LSB]; } -static void bt_spi_isr(struct device *unused1, struct gpio_callback *unused2, +static void bt_spi_isr(const struct device *unused1, + struct gpio_callback *unused2, u32_t unused3) { BT_DBG(""); @@ -531,7 +532,7 @@ static const struct bt_hci_driver drv = { .send = bt_spi_send, }; -static int bt_spi_init(struct device *unused) +static int bt_spi_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c index 3b34c2fc54a0..9523990a8980 100644 --- a/drivers/bluetooth/hci/userchan.c +++ b/drivers/bluetooth/hci/userchan.c @@ -208,7 +208,7 @@ static const struct bt_hci_driver drv = { .send = uc_send, }; -static int bt_uc_init(struct device *unused) +static int bt_uc_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/drivers/bluetooth/util.h b/drivers/bluetooth/util.h index 503800c0a9b8..b1433f5be07e 100644 --- a/drivers/bluetooth/util.h +++ b/drivers/bluetooth/util.h @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -static inline void bt_uart_drain(struct device *dev) +static inline void bt_uart_drain(const struct device *dev) { u8_t c; diff --git a/drivers/can/can_common.c b/drivers/can/can_common.c index eb49b4169ea9..ac28c8d09d2e 100644 --- a/drivers/can/can_common.c +++ b/drivers/can/can_common.c @@ -39,7 +39,7 @@ static void can_msgq_put(struct zcan_frame *frame, void *arg) } } -int z_impl_can_attach_msgq(struct device *dev, struct k_msgq *msg_q, +int z_impl_can_attach_msgq(const struct device *dev, struct k_msgq *msg_q, const struct zcan_filter *filter) { const struct can_driver_api *api = dev->driver_api; @@ -128,7 +128,7 @@ static void can_work_isr_put(struct zcan_frame *frame, void *arg) k_work_submit_to_queue(work->work_queue, &work->work_item); } -int can_attach_workq(struct device *dev, struct k_work_q *work_q, +int can_attach_workq(const struct device *dev, struct k_work_q *work_q, struct zcan_work *work, can_rx_callback_t callback, void *callback_arg, const struct zcan_filter *filter) diff --git a/drivers/can/can_handlers.c b/drivers/can/can_handlers.c index 6b2fee13de49..f96c80a3e2f8 100644 --- a/drivers/can/can_handlers.c +++ b/drivers/can/can_handlers.c @@ -7,18 +7,20 @@ #include #include -static inline int z_vrfy_can_configure(struct device *dev, enum can_mode mode, +static inline int z_vrfy_can_configure(const struct device *dev, + enum can_mode mode, u32_t bitrate) { Z_OOPS(Z_SYSCALL_DRIVER_CAN(dev, configure)); - return z_impl_can_configure((struct device *)dev, (enum can_mode)mode, - (u32_t)bitrate); + return z_impl_can_configure((const struct device *)dev, + (enum can_mode)mode, + (u32_t)bitrate); } #include -static inline int z_vrfy_can_send(struct device *dev, +static inline int z_vrfy_can_send(const struct device *dev, const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback_isr, @@ -35,15 +37,15 @@ static inline int z_vrfy_can_send(struct device *dev, Z_OOPS(Z_SYSCALL_MEMORY_READ((void *)callback_arg, sizeof(void *))); - return z_impl_can_send((struct device *)dev, - (const struct zcan_frame *)msg, - (k_timeout_t)timeout, - (can_tx_callback_t) callback_isr, - (void *)callback_arg); + return z_impl_can_send((const struct device *)dev, + (const struct zcan_frame *)msg, + (k_timeout_t)timeout, + (can_tx_callback_t) callback_isr, + (void *)callback_arg); } #include -static inline int z_vrfy_can_attach_msgq(struct device *dev, +static inline int z_vrfy_can_attach_msgq(const struct device *dev, struct k_msgq *msgq, const struct zcan_filter *filter) { @@ -53,23 +55,23 @@ static inline int z_vrfy_can_attach_msgq(struct device *dev, sizeof(struct zcan_filter))); Z_OOPS(Z_SYSCALL_OBJ(msgq, K_OBJ_MSGQ)); - return z_impl_can_attach_msgq((struct device *)dev, - (struct k_msgq *)msgq, - (const struct zcan_filter *) filter); + return z_impl_can_attach_msgq((const struct device *)dev, + (struct k_msgq *)msgq, + (const struct zcan_filter *) filter); } #include -static inline void z_vrfy_can_detach(struct device *dev, int filter_id) +static inline void z_vrfy_can_detach(const struct device *dev, int filter_id) { Z_OOPS(Z_SYSCALL_DRIVER_CAN(dev, detach)); - z_impl_can_detach((struct device *)dev, (int)filter_id); + z_impl_can_detach((const struct device *)dev, (int)filter_id); } #include static inline -enum can_state z_vrfy_can_get_state(struct device *dev, +enum can_state z_vrfy_can_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { @@ -85,7 +87,8 @@ enum can_state z_vrfy_can_get_state(struct device *dev, #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -static inline int z_vrfy_can_recover(struct device *dev, k_timeout_t timeout) +static inline int z_vrfy_can_recover(const struct device *dev, + k_timeout_t timeout) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_CAN)); diff --git a/drivers/can/can_loopback.c b/drivers/can/can_loopback.c index 03675f19d950..92951e52161c 100644 --- a/drivers/can/can_loopback.c +++ b/drivers/can/can_loopback.c @@ -88,7 +88,8 @@ void tx_thread(void *data_arg, void *arg2, void *arg3) } } -int can_loopback_send(struct device *dev, const struct zcan_frame *frame, +int can_loopback_send(const struct device *dev, + const struct zcan_frame *frame, k_timeout_t timeout, can_tx_callback_t callback, void *callback_arg) { @@ -144,7 +145,7 @@ static inline int get_free_filter(struct can_loopback_filter *filters) return CAN_NO_FREE_FILTER; } -int can_loopback_attach_isr(struct device *dev, can_rx_callback_t isr, +int can_loopback_attach_isr(const struct device *dev, can_rx_callback_t isr, void *cb_arg, const struct zcan_filter *filter) { @@ -182,7 +183,7 @@ int can_loopback_attach_isr(struct device *dev, can_rx_callback_t isr, return filter_id; } -void can_loopback_detach(struct device *dev, int filter_id) +void can_loopback_detach(const struct device *dev, int filter_id) { struct can_loopback_data *data = DEV_DATA(dev); @@ -192,7 +193,7 @@ void can_loopback_detach(struct device *dev, int filter_id) k_mutex_unlock(&data->mtx); } -int can_loopback_configure(struct device *dev, enum can_mode mode, +int can_loopback_configure(const struct device *dev, enum can_mode mode, u32_t bitrate) { struct can_loopback_data *data = DEV_DATA(dev); @@ -203,7 +204,7 @@ int can_loopback_configure(struct device *dev, enum can_mode mode, return 0; } -static enum can_state can_loopback_get_state(struct device *dev, +static enum can_state can_loopback_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { ARG_UNUSED(dev); @@ -217,7 +218,7 @@ static enum can_state can_loopback_get_state(struct device *dev, } #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -int can_loopback_recover(struct device *dev, k_timeout_t timeout) +int can_loopback_recover(const struct device *dev, k_timeout_t timeout) { ARG_UNUSED(dev); ARG_UNUSED(timeout); @@ -226,7 +227,7 @@ int can_loopback_recover(struct device *dev, k_timeout_t timeout) } #endif /* CONFIG_CAN_AUTO_BUS_OFF_RECOVERY */ -static void can_loopback_register_state_change_isr(struct device *dev, +static void can_loopback_register_state_change_isr(const struct device *dev, can_state_change_isr_t isr) { ARG_UNUSED(dev); @@ -246,7 +247,7 @@ static const struct can_driver_api can_api_funcs = { }; -static int can_loopback_init(struct device *dev) +static int can_loopback_init(const struct device *dev) { struct can_loopback_data *data = DEV_DATA(dev); k_tid_t tx_tid; @@ -285,9 +286,9 @@ DEVICE_AND_API_INIT(can_loopback_1, CONFIG_CAN_LOOPBACK_DEV_NAME, #include "socket_can_generic.h" -static int socket_can_init_1(struct device *dev) +static int socket_can_init_1(const struct device *dev) { - struct device *can_dev = DEVICE_GET(can_loopback_1); + const struct device *can_dev = DEVICE_GET(can_loopback_1); struct socket_can_context *socket_context = dev->driver_data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c index 2cd5074e938e..3b89410bf2f6 100644 --- a/drivers/can/can_mcp2515.c +++ b/drivers/can/can_mcp2515.c @@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(mcp2515_can); #include "can_mcp2515.h" -static int mcp2515_cmd_soft_reset(struct device *dev) +static int mcp2515_cmd_soft_reset(const struct device *dev) { u8_t cmd_buf[] = { MCP2515_OPCODE_RESET }; @@ -31,7 +31,8 @@ static int mcp2515_cmd_soft_reset(struct device *dev) return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx); } -static int mcp2515_cmd_bit_modify(struct device *dev, u8_t reg_addr, u8_t mask, +static int mcp2515_cmd_bit_modify(const struct device *dev, u8_t reg_addr, + u8_t mask, u8_t data) { u8_t cmd_buf[] = { MCP2515_OPCODE_BIT_MODIFY, reg_addr, mask, data }; @@ -46,7 +47,7 @@ static int mcp2515_cmd_bit_modify(struct device *dev, u8_t reg_addr, u8_t mask, return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx); } -static int mcp2515_cmd_write_reg(struct device *dev, u8_t reg_addr, +static int mcp2515_cmd_write_reg(const struct device *dev, u8_t reg_addr, u8_t *buf_data, u8_t buf_len) { u8_t cmd_buf[] = { MCP2515_OPCODE_WRITE, reg_addr }; @@ -76,8 +77,8 @@ static int mcp2515_cmd_write_reg(struct device *dev, u8_t reg_addr, * 4: TX Buffer 2, Start at TXB2SIDH (0x51) * 5: TX Buffer 2, Start at TXB2D0 (0x56) */ -static int mcp2515_cmd_load_tx_buffer(struct device *dev, u8_t abc, - u8_t *buf_data, u8_t buf_len) +static int mcp2515_cmd_load_tx_buffer(const struct device *dev, u8_t abc, + u8_t *buf_data, u8_t buf_len) { __ASSERT(abc <= 5, "abc <= 5"); @@ -101,7 +102,7 @@ static int mcp2515_cmd_load_tx_buffer(struct device *dev, u8_t abc, * opcode that respectively initiate transmission for buffers TXB0, TXB1 and * TXB2. */ -static int mcp2515_cmd_rts(struct device *dev, u8_t nnn) +static int mcp2515_cmd_rts(const struct device *dev, u8_t nnn) { __ASSERT(nnn < BIT(MCP2515_TX_CNT), "nnn < BIT(MCP2515_TX_CNT)"); @@ -117,7 +118,7 @@ static int mcp2515_cmd_rts(struct device *dev, u8_t nnn) return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx); } -static int mcp2515_cmd_read_reg(struct device *dev, u8_t reg_addr, +static int mcp2515_cmd_read_reg(const struct device *dev, u8_t reg_addr, u8_t *buf_data, u8_t buf_len) { u8_t cmd_buf[] = { MCP2515_OPCODE_READ, reg_addr }; @@ -152,8 +153,8 @@ static int mcp2515_cmd_read_reg(struct device *dev, u8_t reg_addr, * 2: Receive Buffer 1, Start at RXB1SIDH (0x71) * 3: Receive Buffer 1, Start at RXB1D0 (0x76) */ -static int mcp2515_cmd_read_rx_buffer(struct device *dev, u8_t nm, - u8_t *buf_data, u8_t buf_len) +static int mcp2515_cmd_read_rx_buffer(const struct device *dev, u8_t nm, + u8_t *buf_data, u8_t buf_len) { __ASSERT(nm <= 0x03, "nm <= 0x03"); @@ -253,7 +254,7 @@ static void mcp2515_convert_mcp2515frame_to_zcanframe(const u8_t *source, } } -const int mcp2515_set_mode(struct device *dev, u8_t mcp2515_mode) +const int mcp2515_set_mode(const struct device *dev, u8_t mcp2515_mode) { u8_t canstat; @@ -271,7 +272,7 @@ const int mcp2515_set_mode(struct device *dev, u8_t mcp2515_mode) return 0; } -static int mcp2515_configure(struct device *dev, enum can_mode mode, +static int mcp2515_configure(const struct device *dev, enum can_mode mode, u32_t bitrate) { const struct mcp2515_config *dev_cfg = DEV_CFG(dev); @@ -381,9 +382,10 @@ static int mcp2515_configure(struct device *dev, enum can_mode mode, return ret; } -static int mcp2515_send(struct device *dev, const struct zcan_frame *msg, - k_timeout_t timeout, can_tx_callback_t callback, - void *callback_arg) +static int mcp2515_send(const struct device *dev, + const struct zcan_frame *msg, + k_timeout_t timeout, can_tx_callback_t callback, + void *callback_arg) { struct mcp2515_data *dev_data = DEV_DATA(dev); u8_t tx_idx = 0U; @@ -443,7 +445,8 @@ static int mcp2515_send(struct device *dev, const struct zcan_frame *msg, return 0; } -static int mcp2515_attach_isr(struct device *dev, can_rx_callback_t rx_cb, +static int mcp2515_attach_isr(const struct device *dev, + can_rx_callback_t rx_cb, void *cb_arg, const struct zcan_filter *filter) { @@ -477,7 +480,7 @@ static int mcp2515_attach_isr(struct device *dev, can_rx_callback_t rx_cb, return filter_idx; } -static void mcp2515_detach(struct device *dev, int filter_nr) +static void mcp2515_detach(const struct device *dev, int filter_nr) { struct mcp2515_data *dev_data = DEV_DATA(dev); @@ -486,7 +489,7 @@ static void mcp2515_detach(struct device *dev, int filter_nr) k_mutex_unlock(&dev_data->mutex); } -static void mcp2515_register_state_change_isr(struct device *dev, +static void mcp2515_register_state_change_isr(const struct device *dev, can_state_change_isr_t isr) { struct mcp2515_data *dev_data = DEV_DATA(dev); @@ -518,7 +521,8 @@ static u8_t mcp2515_filter_match(struct zcan_frame *msg, return 1; } -static void mcp2515_rx_filter(struct device *dev, struct zcan_frame *msg) +static void mcp2515_rx_filter(const struct device *dev, + struct zcan_frame *msg) { struct mcp2515_data *dev_data = DEV_DATA(dev); u8_t filter_idx = 0U; @@ -547,7 +551,7 @@ static void mcp2515_rx_filter(struct device *dev, struct zcan_frame *msg) k_mutex_unlock(&dev_data->mutex); } -static void mcp2515_rx(struct device *dev, u8_t rx_idx) +static void mcp2515_rx(const struct device *dev, u8_t rx_idx) { __ASSERT(rx_idx < MCP2515_RX_CNT, "rx_idx < MCP2515_RX_CNT"); @@ -564,7 +568,7 @@ static void mcp2515_rx(struct device *dev, u8_t rx_idx) mcp2515_rx_filter(dev, &msg); } -static void mcp2515_tx_done(struct device *dev, u8_t tx_idx) +static void mcp2515_tx_done(const struct device *dev, u8_t tx_idx) { struct mcp2515_data *dev_data = DEV_DATA(dev); @@ -580,7 +584,7 @@ static void mcp2515_tx_done(struct device *dev, u8_t tx_idx) k_sem_give(&dev_data->tx_sem); } -static enum can_state mcp2515_get_state(struct device *dev, +static enum can_state mcp2515_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { u8_t eflg; @@ -616,7 +620,7 @@ static enum can_state mcp2515_get_state(struct device *dev, return CAN_ERROR_ACTIVE; } -static void mcp2515_handle_errors(struct device *dev) +static void mcp2515_handle_errors(const struct device *dev) { struct mcp2515_data *dev_data = DEV_DATA(dev); can_state_change_isr_t state_change_isr = dev_data->state_change_isr; @@ -632,14 +636,14 @@ static void mcp2515_handle_errors(struct device *dev) } #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -static void mcp2515_recover(struct device *dev, k_timeout_t timeout) +static void mcp2515_recover(const struct device *dev, k_timeout_t timeout) { ARG_UNUSED(dev); ARG_UNUSED(timeout); } #endif -static void mcp2515_handle_interrupts(struct device *dev) +static void mcp2515_handle_interrupts(const struct device *dev) { const struct mcp2515_config *dev_cfg = DEV_CFG(dev); struct mcp2515_data *dev_data = DEV_DATA(dev); @@ -707,7 +711,7 @@ static void mcp2515_handle_interrupts(struct device *dev) } } -static void mcp2515_int_thread(struct device *dev) +static void mcp2515_int_thread(const struct device *dev) { struct mcp2515_data *dev_data = DEV_DATA(dev); @@ -717,7 +721,7 @@ static void mcp2515_int_thread(struct device *dev) } } -static void mcp2515_int_gpio_callback(struct device *dev, +static void mcp2515_int_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mcp2515_data *dev_data = @@ -739,7 +743,7 @@ static const struct can_driver_api can_api_funcs = { }; -static int mcp2515_init(struct device *dev) +static int mcp2515_init(const struct device *dev) { const struct mcp2515_config *dev_cfg = DEV_CFG(dev); struct mcp2515_data *dev_data = DEV_DATA(dev); diff --git a/drivers/can/can_mcp2515.h b/drivers/can/can_mcp2515.h index 6aae4e237c7a..9708eb183434 100644 --- a/drivers/can/can_mcp2515.h +++ b/drivers/can/can_mcp2515.h @@ -26,14 +26,14 @@ struct mcp2515_tx_cb { struct mcp2515_data { /* spi device data */ - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control spi_cs_ctrl; #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */ /* interrupt data */ - struct device *int_gpio; + const struct device *int_gpio; struct gpio_callback int_gpio_cb; struct k_thread int_thread; k_thread_stack_t *int_thread_stack; diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c index 97d224237377..848c4de03a3c 100644 --- a/drivers/can/can_mcux_flexcan.c +++ b/drivers/can/can_mcux_flexcan.c @@ -60,7 +60,7 @@ struct mcux_flexcan_config { u32_t prop_seg; u32_t phase_seg1; u32_t phase_seg2; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_flexcan_rx_callback { @@ -92,12 +92,13 @@ struct mcux_flexcan_data { can_state_change_isr_t state_change_isr; }; -static int mcux_flexcan_configure(struct device *dev, enum can_mode mode, +static int mcux_flexcan_configure(const struct device *dev, + enum can_mode mode, u32_t bitrate) { const struct mcux_flexcan_config *config = dev->config_info; flexcan_config_t flexcan_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; clock_dev = device_get_binding(config->clock_name); @@ -245,7 +246,8 @@ static int mcux_get_tx_alloc(struct mcux_flexcan_data *data) return alloc >= MCUX_FLEXCAN_MAX_TX ? -1 : alloc; } -static int mcux_flexcan_send(struct device *dev, const struct zcan_frame *msg, +static int mcux_flexcan_send(const struct device *dev, + const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback_isr, void *callback_arg) { @@ -295,7 +297,8 @@ static int mcux_flexcan_send(struct device *dev, const struct zcan_frame *msg, return CAN_TX_OK; } -static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr, +static int mcux_flexcan_attach_isr(const struct device *dev, + can_rx_callback_t isr, void *callback_arg, const struct zcan_filter *filter) { @@ -350,7 +353,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr, return alloc; } -static void mcux_flexcan_register_state_change_isr(struct device *dev, +static void mcux_flexcan_register_state_change_isr(const struct device *dev, can_state_change_isr_t isr) { struct mcux_flexcan_data *data = dev->driver_data; @@ -358,7 +361,7 @@ static void mcux_flexcan_register_state_change_isr(struct device *dev, data->state_change_isr = isr; } -static enum can_state mcux_flexcan_get_state(struct device *dev, +static enum can_state mcux_flexcan_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { const struct mcux_flexcan_config *config = dev->config_info; @@ -384,7 +387,7 @@ static enum can_state mcux_flexcan_get_state(struct device *dev, } #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout) +int mcux_flexcan_recover(const struct device *dev, k_timeout_t timeout) { const struct mcux_flexcan_config *config = dev->config_info; int ret = 0; @@ -412,7 +415,7 @@ int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout) } #endif /* CONFIG_CAN_AUTO_BUS_OFF_RECOVERY */ -static void mcux_flexcan_detach(struct device *dev, int filter_id) +static void mcux_flexcan_detach(const struct device *dev, int filter_id) { const struct mcux_flexcan_config *config = dev->config_info; struct mcux_flexcan_data *data = dev->driver_data; @@ -440,7 +443,7 @@ static void mcux_flexcan_detach(struct device *dev, int filter_id) k_mutex_unlock(&data->rx_mutex); } -static inline void mcux_flexcan_transfer_error_status(struct device *dev, +static inline void mcux_flexcan_transfer_error_status(const struct device *dev, u32_t error) { const struct mcux_flexcan_config *config = dev->config_info; @@ -517,7 +520,7 @@ static inline void mcux_flexcan_transfer_error_status(struct device *dev, } } -static inline void mcux_flexcan_transfer_tx_idle(struct device *dev, +static inline void mcux_flexcan_transfer_tx_idle(const struct device *dev, u32_t mb) { struct mcux_flexcan_data *data = dev->driver_data; @@ -542,7 +545,7 @@ static inline void mcux_flexcan_transfer_tx_idle(struct device *dev, } } -static inline void mcux_flexcan_transfer_rx_idle(struct device *dev, +static inline void mcux_flexcan_transfer_rx_idle(const struct device *dev, u32_t mb) { const struct mcux_flexcan_config *config = dev->config_info; @@ -583,7 +586,7 @@ static void mcux_flexcan_transfer_callback(CAN_Type *base, status_t status, u32_t result, void *userData) { - struct device *dev = (struct device *)userData; + const struct device *dev = (const struct device *)userData; switch (status) { case kStatus_FLEXCAN_ErrorStatus: @@ -605,14 +608,14 @@ static void mcux_flexcan_transfer_callback(CAN_Type *base, static void mcux_flexcan_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_flexcan_config *config = dev->config_info; struct mcux_flexcan_data *data = dev->driver_data; FLEXCAN_TransferHandleIRQ(config->base, &data->handle); } -static int mcux_flexcan_init(struct device *dev) +static int mcux_flexcan_init(const struct device *dev) { const struct mcux_flexcan_config *config = dev->config_info; struct mcux_flexcan_data *data = dev->driver_data; @@ -632,7 +635,8 @@ static int mcux_flexcan_init(struct device *dev) } FLEXCAN_TransferCreateHandle(config->base, &data->handle, - mcux_flexcan_transfer_callback, dev); + mcux_flexcan_transfer_callback, + (void *)dev); config->irq_config_func(dev); @@ -657,7 +661,7 @@ static const struct can_driver_api mcux_flexcan_driver_api = { }; #if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) -static void mcux_flexcan_config_func_0(struct device *dev); +static void mcux_flexcan_config_func_0(const struct device *dev); static const struct mcux_flexcan_config mcux_flexcan_config_0 = { .base = (CAN_Type *) DT_INST_REG_ADDR(0), @@ -681,7 +685,7 @@ DEVICE_AND_API_INIT(can_mcux_flexcan_0, DT_INST_LABEL(0), &mcux_flexcan_config_0, POST_KERNEL, CONFIG_CAN_INIT_PRIORITY, &mcux_flexcan_driver_api); -static void mcux_flexcan_config_func_0(struct device *dev) +static void mcux_flexcan_config_func_0(const struct device *dev) { #if DT_INST_IRQ_HAS_NAME(0, rx_warning) IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, rx_warning, irq), @@ -727,9 +731,9 @@ static void mcux_flexcan_config_func_0(struct device *dev) #include "socket_can_generic.h" -static int socket_can_init_0(struct device *dev) +static int socket_can_init_0(const struct device *dev) { - struct device *can_dev = DEVICE_GET(can_mcux_flexcan_0); + const struct device *can_dev = DEVICE_GET(can_mcux_flexcan_0); struct socket_can_context *socket_context = dev->driver_data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", @@ -759,7 +763,7 @@ NET_DEVICE_INIT(socket_can_flexcan_0, SOCKET_CAN_NAME_1, socket_can_init_0, #endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) */ #if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) -static void mcux_flexcan_config_func_1(struct device *dev); +static void mcux_flexcan_config_func_1(const struct device *dev); static const struct mcux_flexcan_config mcux_flexcan_config_1 = { .base = (CAN_Type *) DT_INST_REG_ADDR(1), @@ -783,7 +787,7 @@ DEVICE_AND_API_INIT(can_mcux_flexcan_1, DT_INST_LABEL(1), &mcux_flexcan_config_1, POST_KERNEL, CONFIG_CAN_INIT_PRIORITY, &mcux_flexcan_driver_api); -static void mcux_flexcan_config_func_1(struct device *dev) +static void mcux_flexcan_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(1, warning, irq), DT_INST_IRQ_BY_NAME(1, warning, priority), diff --git a/drivers/can/can_net.c b/drivers/can/can_net.c index c132e06886bf..036ea57aa40b 100644 --- a/drivers/can/can_net.c +++ b/drivers/can/can_net.c @@ -16,7 +16,7 @@ struct mcast_filter_mapping { }; struct net_can_context { - struct device *can_dev; + const struct device *can_dev; struct net_if *iface; int recv_filter_id; struct mcast_filter_mapping mcast_mapping[NET_IF_MAX_IPV6_MADDR]; @@ -88,7 +88,8 @@ static inline void can_set_lladdr(struct net_pkt *pkt, struct zcan_frame *frame) net_buf_pull(buf, sizeof(u16_t)); } -static int net_can_send(struct device *dev, const struct zcan_frame *frame, +static int net_can_send(const struct device *dev, + const struct zcan_frame *frame, can_tx_callback_t cb, void *cb_arg, k_timeout_t timeout) { struct net_can_context *ctx = dev->driver_data; @@ -172,7 +173,7 @@ static inline int attach_mcast_filter(struct net_can_context *ctx, static void mcast_cb(struct net_if *iface, const struct in6_addr *addr, bool is_joined) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_can_context *ctx = dev->driver_data; struct mcast_filter_mapping *filter_mapping; int filter_id; @@ -205,7 +206,7 @@ static void mcast_cb(struct net_if *iface, const struct in6_addr *addr, static void net_can_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_can_context *ctx = dev->driver_data; ctx->iface = iface; @@ -217,7 +218,7 @@ static void net_can_iface_init(struct net_if *iface) net_if_mcast_mon_register(&mcast_monitor, iface, mcast_cb); } -static int can_attach_filter(struct device *dev, can_rx_callback_t cb, +static int can_attach_filter(const struct device *dev, can_rx_callback_t cb, void *cb_arg, const struct zcan_filter *filter) { @@ -226,7 +227,7 @@ static int can_attach_filter(struct device *dev, can_rx_callback_t cb, return can_attach_isr(ctx->can_dev, cb, cb_arg, filter); } -static void can_detach_filter(struct device *dev, int filter_id) +static void can_detach_filter(const struct device *dev, int filter_id) { struct net_can_context *ctx = dev->driver_data; @@ -312,7 +313,7 @@ static inline int can_attach_all_mcast_filter(struct net_can_context *ctx) } #endif /*CONFIG_NET_L2_CANBUS_ETH_TRANSLATOR*/ -static int can_enable(struct device *dev, bool enable) +static int can_enable(const struct device *dev, bool enable) { struct net_can_context *ctx = dev->driver_data; @@ -370,9 +371,9 @@ static struct net_can_api net_can_api_inst = { .enable = can_enable, }; -static int net_can_init(struct device *dev) +static int net_can_init(const struct device *dev) { - struct device *can_dev; + const struct device *can_dev; struct net_can_context *ctx = dev->driver_data; can_dev = device_get_binding(DT_CHOSEN_ZEPHYR_CAN_PRIMARY_LABEL); diff --git a/drivers/can/can_shell.c b/drivers/can/can_shell.c index 898e0edbfe36..5e63d6c8abcf 100644 --- a/drivers/can/can_shell.c +++ b/drivers/can/can_shell.c @@ -209,7 +209,7 @@ static void print_frame(struct zcan_frame *frame, void *arg) static int cmd_config(const struct shell *shell, size_t argc, char **argv) { - struct device *can_dev; + const struct device *can_dev; int pos = 1; bool silent = false, loopback = false; enum can_mode mode; @@ -257,7 +257,7 @@ static int cmd_config(const struct shell *shell, size_t argc, char **argv) static int cmd_send(const struct shell *shell, size_t argc, char **argv) { - struct device *can_dev; + const struct device *can_dev; int pos = 1; bool rtr = false, ext = false; struct zcan_frame frame; @@ -308,7 +308,7 @@ static int cmd_send(const struct shell *shell, size_t argc, char **argv) static int cmd_attach(const struct shell *shell, size_t argc, char **argv) { - struct device *can_dev; + const struct device *can_dev; int pos = 1; bool rtr = false, ext = false, rtr_mask = false; struct zcan_filter filter; @@ -384,7 +384,7 @@ static int cmd_attach(const struct shell *shell, size_t argc, char **argv) static int cmd_detach(const struct shell *shell, size_t argc, char **argv) { - struct device *can_dev; + const struct device *can_dev; char *end_ptr; long id; diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c index d865dce8dbe4..eac4bb45bff6 100644 --- a/drivers/can/can_stm32.c +++ b/drivers/can/can_stm32.c @@ -175,12 +175,12 @@ void can_stm32_tx_isr_handler(CAN_TypeDef *can, struct can_stm32_data *data) static void can_stm32_isr(void *arg) { - struct device *dev; + const struct device *dev; struct can_stm32_data *data; const struct can_stm32_config *cfg; CAN_TypeDef *can; - dev = (struct device *)arg; + dev = (const struct device *)arg; data = DEV_DATA(dev); cfg = DEV_CFG(dev); can = cfg->can; @@ -197,12 +197,12 @@ static void can_stm32_isr(void *arg) static void can_stm32_rx_isr(void *arg) { - struct device *dev; + const struct device *dev; struct can_stm32_data *data; const struct can_stm32_config *cfg; CAN_TypeDef *can; - dev = (struct device *)arg; + dev = (const struct device *)arg; data = DEV_DATA(dev); cfg = DEV_CFG(dev); can = cfg->can; @@ -212,12 +212,12 @@ static void can_stm32_rx_isr(void *arg) static void can_stm32_tx_isr(void *arg) { - struct device *dev; + const struct device *dev; struct can_stm32_data *data; const struct can_stm32_config *cfg; CAN_TypeDef *can; - dev = (struct device *)arg; + dev = (const struct device *)arg; data = DEV_DATA(dev); cfg = DEV_CFG(dev); can = cfg->can; @@ -227,12 +227,12 @@ static void can_stm32_tx_isr(void *arg) static void can_stm32_state_change_isr(void *arg) { - struct device *dev; + const struct device *dev; struct can_stm32_data *data; const struct can_stm32_config *cfg; CAN_TypeDef *can; - dev = (struct device *)arg; + dev = (const struct device *)arg; data = DEV_DATA(dev); cfg = DEV_CFG(dev); can = cfg->can; @@ -297,14 +297,14 @@ static int can_leave_sleep_mode(CAN_TypeDef *can) return 0; } -int can_stm32_runtime_configure(struct device *dev, enum can_mode mode, +int can_stm32_runtime_configure(const struct device *dev, enum can_mode mode, u32_t bitrate) { CAN_HandleTypeDef hcan; const struct can_stm32_config *cfg = DEV_CFG(dev); CAN_TypeDef *can = cfg->can; struct can_stm32_data *data = DEV_DATA(dev); - struct device *clock; + const struct device *clock; u32_t clock_rate; u32_t prescaler; u32_t reg_mode; @@ -383,7 +383,7 @@ int can_stm32_runtime_configure(struct device *dev, enum can_mode mode, return ret; } -static int can_stm32_init(struct device *dev) +static int can_stm32_init(const struct device *dev) { const struct can_stm32_config *cfg = DEV_CFG(dev); struct can_stm32_data *data = DEV_DATA(dev); @@ -391,7 +391,7 @@ static int can_stm32_init(struct device *dev) #if DT_NODE_HAS_STATUS(DT_NODELABEL(can2), okay) CAN_TypeDef *master_can = cfg->master_can; #endif - struct device *clock; + const struct device *clock; int ret; k_mutex_init(&data->inst_mutex); @@ -458,7 +458,7 @@ static int can_stm32_init(struct device *dev) return 0; } -static void can_stm32_register_state_change_isr(struct device *dev, +static void can_stm32_register_state_change_isr(const struct device *dev, can_state_change_isr_t isr) { struct can_stm32_data *data = DEV_DATA(dev); @@ -474,7 +474,7 @@ static void can_stm32_register_state_change_isr(struct device *dev, } } -static enum can_state can_stm32_get_state(struct device *dev, +static enum can_state can_stm32_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { const struct can_stm32_config *cfg = DEV_CFG(dev); @@ -500,7 +500,7 @@ static enum can_state can_stm32_get_state(struct device *dev, } #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -int can_stm32_recover(struct device *dev, k_timeout_t timeout) +int can_stm32_recover(const struct device *dev, k_timeout_t timeout) { const struct can_stm32_config *cfg = DEV_CFG(dev); struct can_stm32_data *data = DEV_DATA(dev); @@ -541,7 +541,7 @@ int can_stm32_recover(struct device *dev, k_timeout_t timeout) #endif /* CONFIG_CAN_AUTO_BUS_OFF_RECOVERY */ -int can_stm32_send(struct device *dev, const struct zcan_frame *msg, +int can_stm32_send(const struct device *dev, const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback, void *callback_arg) { @@ -951,7 +951,8 @@ static inline int can_stm32_set_filter(const struct zcan_filter *filter, return filter_nr; } -static inline int can_stm32_attach(struct device *dev, can_rx_callback_t cb, +static inline int can_stm32_attach(const struct device *dev, + can_rx_callback_t cb, void *cb_arg, const struct zcan_filter *filter) { @@ -970,7 +971,7 @@ static inline int can_stm32_attach(struct device *dev, can_rx_callback_t cb, return filter_nr; } -int can_stm32_attach_isr(struct device *dev, can_rx_callback_t isr, +int can_stm32_attach_isr(const struct device *dev, can_rx_callback_t isr, void *cb_arg, const struct zcan_filter *filter) { @@ -983,7 +984,7 @@ int can_stm32_attach_isr(struct device *dev, can_rx_callback_t isr, return filter_nr; } -void can_stm32_detach(struct device *dev, int filter_nr) +void can_stm32_detach(const struct device *dev, int filter_nr) { const struct can_stm32_config *cfg = DEV_CFG(dev); struct can_stm32_data *data = DEV_DATA(dev); @@ -1103,9 +1104,9 @@ static void config_can_1_irq(CAN_TypeDef *can) #include "socket_can_generic.h" -static int socket_can_init_1(struct device *dev) +static int socket_can_init_1(const struct device *dev) { - struct device *can_dev = DEVICE_GET(can_stm32_1); + const struct device *can_dev = DEVICE_GET(can_stm32_1); struct socket_can_context *socket_context = dev->driver_data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", @@ -1186,9 +1187,9 @@ static void config_can_2_irq(CAN_TypeDef *can) #include "socket_can_generic.h" -static int socket_can_init_2(struct device *dev) +static int socket_can_init_2(const struct device *dev) { - struct device *can_dev = DEVICE_GET(can_stm32_2); + const struct device *can_dev = DEVICE_GET(can_stm32_2); struct socket_can_context *socket_context = dev->driver_data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", diff --git a/drivers/can/socket_can_generic.h b/drivers/can/socket_can_generic.h index 25f56075bbf1..5ba07778eb68 100644 --- a/drivers/can/socket_can_generic.h +++ b/drivers/can/socket_can_generic.h @@ -24,7 +24,7 @@ CAN_DEFINE_MSGQ(socket_can_msgq, 5); K_THREAD_STACK_DEFINE(rx_thread_stack, RX_THREAD_STACK_SIZE); struct socket_can_context { - struct device *can_dev; + const struct device *can_dev; struct net_if *iface; struct k_msgq *msgq; @@ -35,7 +35,7 @@ struct socket_can_context { static inline void socket_can_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct socket_can_context *socket_context = dev->driver_data; socket_context->iface = iface; @@ -53,7 +53,8 @@ static inline void tx_irq_callback(u32_t error_flags, void *arg) } /* This is called by net_if.c when packet is about to be sent */ -static inline int socket_can_send(struct device *dev, struct net_pkt *pkt) +static inline int socket_can_send(const struct device *dev, + struct net_pkt *pkt) { struct socket_can_context *socket_context = dev->driver_data; int ret; @@ -75,7 +76,7 @@ static inline int socket_can_send(struct device *dev, struct net_pkt *pkt) return -ret; } -static inline int socket_can_setsockopt(struct device *dev, void *obj, +static inline int socket_can_setsockopt(const struct device *dev, void *obj, int level, int optname, const void *optval, socklen_t optlen) { @@ -102,7 +103,7 @@ static inline int socket_can_setsockopt(struct device *dev, void *obj, return 0; } -static inline void socket_can_close(struct device *dev, int filter_id) +static inline void socket_can_close(const struct device *dev, int filter_id) { struct socket_can_context *socket_context = dev->driver_data; diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c index 7a55235da5be..9e1ef61f383f 100644 --- a/drivers/clock_control/beetle_clock_control.c +++ b/drivers/clock_control/beetle_clock_control.c @@ -80,7 +80,7 @@ static inline void beetle_apb_set_clock_off(u8_t bit, bit, state); } -static inline int beetle_clock_control_on(struct device *dev, +static inline int beetle_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system) { struct arm_clock_control_t *beetle_cc = @@ -104,7 +104,7 @@ static inline int beetle_clock_control_on(struct device *dev, return 0; } -static inline int beetle_clock_control_off(struct device *dev, +static inline int beetle_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system) { struct arm_clock_control_t *beetle_cc = @@ -127,9 +127,9 @@ static inline int beetle_clock_control_off(struct device *dev, return 0; } -static int beetle_clock_control_get_subsys_rate(struct device *clock, - clock_control_subsys_t sub_system, - u32_t *rate) +static int beetle_clock_control_get_subsys_rate(const struct device *clock, + clock_control_subsys_t sub_system, + u32_t *rate) { #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL const struct beetle_clock_control_cfg_t * const cfg = @@ -215,7 +215,7 @@ static int beetle_pll_enable(u32_t mainclk) } #endif /* CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL */ -static int beetle_clock_control_init(struct device *dev) +static int beetle_clock_control_init(const struct device *dev) { #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL const struct beetle_clock_control_cfg_t * const cfg = diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c index 67aa04bfc67e..095c8401ffa6 100644 --- a/drivers/clock_control/clock_control_mcux_ccm.c +++ b/drivers/clock_control/clock_control_mcux_ccm.c @@ -22,19 +22,19 @@ static const clock_name_t lpspi_clocks[] = { kCLOCK_SysPllPfd2Clk, }; -static int mcux_ccm_on(struct device *dev, +static int mcux_ccm_on(const struct device *dev, clock_control_subsys_t sub_system) { return 0; } -static int mcux_ccm_off(struct device *dev, +static int mcux_ccm_off(const struct device *dev, clock_control_subsys_t sub_system) { return 0; } -static int mcux_ccm_get_subsys_rate(struct device *dev, +static int mcux_ccm_get_subsys_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -94,7 +94,7 @@ static int mcux_ccm_get_subsys_rate(struct device *dev, return 0; } -static int mcux_ccm_init(struct device *dev) +static int mcux_ccm_init(const struct device *dev) { return 0; } diff --git a/drivers/clock_control/clock_control_mcux_mcg.c b/drivers/clock_control/clock_control_mcux_mcg.c index 219e2b169c2a..b227b03d5063 100644 --- a/drivers/clock_control/clock_control_mcux_mcg.c +++ b/drivers/clock_control/clock_control_mcux_mcg.c @@ -18,17 +18,19 @@ #include LOG_MODULE_REGISTER(clock_control_mcg); -static int mcux_mcg_on(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_mcg_on(const struct device *dev, + clock_control_subsys_t sub_system) { return 0; } -static int mcux_mcg_off(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_mcg_off(const struct device *dev, + clock_control_subsys_t sub_system) { return 0; } -static int mcux_mcg_get_rate(struct device *dev, +static int mcux_mcg_get_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -48,7 +50,7 @@ static int mcux_mcg_get_rate(struct device *dev, return 0; } -static int mcux_mcg_init(struct device *dev) +static int mcux_mcg_init(const struct device *dev) { return 0; } diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c index 18fbee2b3a2d..a8d3d8b7a663 100644 --- a/drivers/clock_control/clock_control_mcux_pcc.c +++ b/drivers/clock_control/clock_control_mcux_pcc.c @@ -28,7 +28,7 @@ struct mcux_pcc_config { #define MAKE_PCC_REGADDR(base, offset) ((base) + (offset)) #endif -static inline clock_ip_name_t clock_ip(struct device *dev, +static inline clock_ip_name_t clock_ip(const struct device *dev, clock_control_subsys_t sub_system) { u32_t offset = POINTER_TO_UINT(sub_system); @@ -36,19 +36,21 @@ static inline clock_ip_name_t clock_ip(struct device *dev, return MAKE_PCC_REGADDR(DEV_BASE(dev), offset); } -static int mcux_pcc_on(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_pcc_on(const struct device *dev, + clock_control_subsys_t sub_system) { CLOCK_EnableClock(clock_ip(dev, sub_system)); return 0; } -static int mcux_pcc_off(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_pcc_off(const struct device *dev, + clock_control_subsys_t sub_system) { CLOCK_DisableClock(clock_ip(dev, sub_system)); return 0; } -static int mcux_pcc_get_rate(struct device *dev, +static int mcux_pcc_get_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -56,7 +58,7 @@ static int mcux_pcc_get_rate(struct device *dev, return 0; } -static int mcux_pcc_init(struct device *dev) +static int mcux_pcc_init(const struct device *dev) { return 0; } diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c index bd8ac50a1af1..931c129a856f 100644 --- a/drivers/clock_control/clock_control_mcux_scg.c +++ b/drivers/clock_control/clock_control_mcux_scg.c @@ -18,17 +18,19 @@ #include LOG_MODULE_REGISTER(clock_control_scg); -static int mcux_scg_on(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_scg_on(const struct device *dev, + clock_control_subsys_t sub_system) { return 0; } -static int mcux_scg_off(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_scg_off(const struct device *dev, + clock_control_subsys_t sub_system) { return 0; } -static int mcux_scg_get_rate(struct device *dev, +static int mcux_scg_get_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -92,7 +94,7 @@ static int mcux_scg_get_rate(struct device *dev, return 0; } -static int mcux_scg_init(struct device *dev) +static int mcux_scg_init(const struct device *dev) { #if DT_INST_NODE_HAS_PROP(0, clkout_source) CLOCK_SetClkOutSel(DT_INST_PROP(0, clkout_source)); diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c index c9d1e952d7fb..5a611f355361 100644 --- a/drivers/clock_control/clock_control_mcux_sim.c +++ b/drivers/clock_control/clock_control_mcux_sim.c @@ -15,7 +15,8 @@ #include LOG_MODULE_REGISTER(clock_control); -static int mcux_sim_on(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_sim_on(const struct device *dev, + clock_control_subsys_t sub_system) { clock_ip_name_t clock_ip_name = (clock_ip_name_t) sub_system; @@ -24,7 +25,8 @@ static int mcux_sim_on(struct device *dev, clock_control_subsys_t sub_system) return 0; } -static int mcux_sim_off(struct device *dev, clock_control_subsys_t sub_system) +static int mcux_sim_off(const struct device *dev, + clock_control_subsys_t sub_system) { clock_ip_name_t clock_ip_name = (clock_ip_name_t) sub_system; @@ -33,7 +35,7 @@ static int mcux_sim_off(struct device *dev, clock_control_subsys_t sub_system) return 0; } -static int mcux_sim_get_subsys_rate(struct device *dev, +static int mcux_sim_get_subsys_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -75,7 +77,7 @@ static int mcux_sim_get_subsys_rate(struct device *dev, #endif #endif -static int mcux_sim_init(struct device *dev) +static int mcux_sim_init(const struct device *dev) { #ifdef NXP_KINETIS_SIM_CLKOUT_DIVIDER SIM->CHIPCTL = (SIM->CHIPCTL & ~SIM_CHIPCTL_CLKOUTDIV_MASK) diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c index b45518a0cf2b..5d5c32d8ba46 100644 --- a/drivers/clock_control/clock_control_rv32m1_pcc.c +++ b/drivers/clock_control/clock_control_rv32m1_pcc.c @@ -21,7 +21,7 @@ struct rv32m1_pcc_config { #define DEV_CFG(dev) ((struct rv32m1_pcc_config *)(dev->config_info)) #define DEV_BASE(dev) (DEV_CFG(dev)->base_address) -static inline clock_ip_name_t clock_ip(struct device *dev, +static inline clock_ip_name_t clock_ip(const struct device *dev, clock_control_subsys_t sub_system) { u32_t offset = POINTER_TO_UINT(sub_system); @@ -29,19 +29,21 @@ static inline clock_ip_name_t clock_ip(struct device *dev, return MAKE_PCC_REGADDR(DEV_BASE(dev), offset); } -static int rv32m1_pcc_on(struct device *dev, clock_control_subsys_t sub_system) +static int rv32m1_pcc_on(const struct device *dev, + clock_control_subsys_t sub_system) { CLOCK_EnableClock(clock_ip(dev, sub_system)); return 0; } -static int rv32m1_pcc_off(struct device *dev, clock_control_subsys_t sub_system) +static int rv32m1_pcc_off(const struct device *dev, + clock_control_subsys_t sub_system) { CLOCK_DisableClock(clock_ip(dev, sub_system)); return 0; } -static int rv32m1_pcc_get_rate(struct device *dev, +static int rv32m1_pcc_get_rate(const struct device *dev, clock_control_subsys_t sub_system, u32_t *rate) { @@ -49,7 +51,7 @@ static int rv32m1_pcc_get_rate(struct device *dev, return 0; } -static int rv32m1_pcc_init(struct device *dev) +static int rv32m1_pcc_init(const struct device *dev) { return 0; } diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c index 79bdf1873686..c6de1d3a1db0 100644 --- a/drivers/clock_control/clock_stm32_ll_common.c +++ b/drivers/clock_control/clock_stm32_ll_common.c @@ -76,7 +76,7 @@ static u32_t get_bus_clock(u32_t clock, u32_t prescaler) return clock / prescaler; } -static inline int stm32_clock_control_on(struct device *dev, +static inline int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -128,7 +128,7 @@ static inline int stm32_clock_control_on(struct device *dev, } -static inline int stm32_clock_control_off(struct device *dev, +static inline int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -179,7 +179,7 @@ static inline int stm32_clock_control_off(struct device *dev, } -static int stm32_clock_control_get_subsys_rate(struct device *clock, +static int stm32_clock_control_get_subsys_rate(const struct device *clock, clock_control_subsys_t sub_system, u32_t *rate) { @@ -282,7 +282,7 @@ static inline void stm32_clock_control_mco_init(void) #endif /* CONFIG_CLOCK_STM32_MCO2_SRC_NOCLOCK */ } -static int stm32_clock_control_init(struct device *dev) +static int stm32_clock_control_init(const struct device *dev) { LL_UTILS_ClkInitTypeDef s_ClkInitStruct; u32_t hclk_prescaler; diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c index d523967a7b53..1cc099c754d8 100644 --- a/drivers/clock_control/clock_stm32_ll_h7.c +++ b/drivers/clock_control/clock_stm32_ll_h7.c @@ -61,7 +61,7 @@ static u32_t get_bus_clock(u32_t clock, u32_t prescaler) return clock / prescaler; } -static inline int stm32_clock_control_on(struct device *dev, +static inline int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -106,7 +106,7 @@ static inline int stm32_clock_control_on(struct device *dev, return 0; } -static inline int stm32_clock_control_off(struct device *dev, +static inline int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -151,9 +151,9 @@ static inline int stm32_clock_control_off(struct device *dev, return 0; } -static int stm32_clock_control_get_subsys_rate(struct device *clock, - clock_control_subsys_t sub_system, - u32_t *rate) +static int stm32_clock_control_get_subsys_rate(const struct device *clock, + clock_control_subsys_t sub_system, + u32_t *rate) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); /* @@ -212,7 +212,7 @@ static struct clock_control_driver_api stm32_clock_control_api = { .get_rate = stm32_clock_control_get_subsys_rate, }; -static int stm32_clock_control_init(struct device *dev) +static int stm32_clock_control_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c index 642af657f5c3..0f7777bf7660 100644 --- a/drivers/clock_control/clock_stm32_ll_mp1.c +++ b/drivers/clock_control/clock_stm32_ll_mp1.c @@ -12,7 +12,7 @@ /** * @brief fill in AHB/APB buses configuration structure */ -static inline int stm32_clock_control_on(struct device *dev, +static inline int stm32_clock_control_on(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -63,7 +63,7 @@ static inline int stm32_clock_control_on(struct device *dev, return 0; } -static inline int stm32_clock_control_off(struct device *dev, +static inline int stm32_clock_control_off(const struct device *dev, clock_control_subsys_t sub_system) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -114,9 +114,9 @@ static inline int stm32_clock_control_off(struct device *dev, return 0; } -static int stm32_clock_control_get_subsys_rate(struct device *clock, - clock_control_subsys_t sub_system, - u32_t *rate) +static int stm32_clock_control_get_subsys_rate(const struct device *clock, + clock_control_subsys_t sub_system, + u32_t *rate) { struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system); @@ -399,7 +399,7 @@ static struct clock_control_driver_api stm32_clock_control_api = { .get_rate = stm32_clock_control_get_subsys_rate, }; -static int stm32_clock_control_init(struct device *dev) +static int stm32_clock_control_init(const struct device *dev) { ARG_UNUSED(dev); return 0; diff --git a/drivers/clock_control/nrf_clock_calibration.c b/drivers/clock_control/nrf_clock_calibration.c index 315213b4a92e..521b85054bfc 100644 --- a/drivers/clock_control/nrf_clock_calibration.c +++ b/drivers/clock_control/nrf_clock_calibration.c @@ -38,20 +38,20 @@ static volatile int total_cnt; /* Total number of calibrations. */ static volatile int total_skips_cnt; /* Total number of skipped calibrations. */ /* Callback called on hfclk started. */ -static void cal_hf_on_callback(struct device *dev, +static void cal_hf_on_callback(const struct device *dev, clock_control_subsys_t subsys, void *user_data); static struct clock_control_async_data cal_hf_on_data = { .cb = cal_hf_on_callback }; -static void cal_lf_on_callback(struct device *dev, +static void cal_lf_on_callback(const struct device *dev, clock_control_subsys_t subsys, void *user_data); static struct clock_control_async_data cal_lf_on_data = { .cb = cal_lf_on_callback }; -static struct device *clk_dev; -static struct device *temp_sensor; +static const struct device *clk_dev; +static const struct device *temp_sensor; static void measure_temperature(struct k_work *work); static K_WORK_DEFINE(temp_measure_work, measure_temperature); @@ -81,7 +81,7 @@ static void lf_release(void) clock_control_off(clk_dev, CLOCK_CONTROL_NRF_SUBSYS_LF); } -static void cal_lf_on_callback(struct device *dev, +static void cal_lf_on_callback(const struct device *dev, clock_control_subsys_t subsys, void *user_data) { hf_request(); @@ -132,7 +132,7 @@ static void timeout_handler(struct k_timer *timer) /* Called when HFCLK XTAL is on. Schedules temperature measurement or triggers * calibration. */ -static void cal_hf_on_callback(struct device *dev, +static void cal_hf_on_callback(const struct device *dev, clock_control_subsys_t subsys, void *user_data) { if ((temp_sensor == NULL) || !IS_ENABLED(CONFIG_MULTITHREADING)) { @@ -215,7 +215,7 @@ static void measure_temperature(struct k_work *work) #define TEMP_NODE DT_INST(0, nordic_nrf_temp) #if DT_NODE_HAS_STATUS(TEMP_NODE, okay) -static inline struct device *temp_device(void) +static inline const struct device *temp_device(void) { return device_get_binding(DT_LABEL(TEMP_NODE)); } @@ -223,7 +223,7 @@ static inline struct device *temp_device(void) #define temp_device() NULL #endif -void z_nrf_clock_calibration_init(struct device *dev) +void z_nrf_clock_calibration_init(const struct device *dev) { /* Anomaly 36: After watchdog timeout reset, CPU lockup reset, soft * reset, or pin reset EVENTS_DONE and EVENTS_CTTO are not reset. diff --git a/drivers/clock_control/nrf_clock_calibration.h b/drivers/clock_control/nrf_clock_calibration.h index d1f5d9c34dbc..cfc8763906eb 100644 --- a/drivers/clock_control/nrf_clock_calibration.h +++ b/drivers/clock_control/nrf_clock_calibration.h @@ -17,7 +17,7 @@ extern "C" { * * @param hfclk_dev HFCLK device. */ -void z_nrf_clock_calibration_init(struct device *hfclk_dev); +void z_nrf_clock_calibration_init(const struct device *hfclk_dev); /** * @brief Calibration interrupts handler diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c index 4225519b8d3c..5f95487895f8 100644 --- a/drivers/clock_control/nrf_power_clock.c +++ b/drivers/clock_control/nrf_power_clock.c @@ -58,7 +58,7 @@ struct nrf_clock_control_config { subsys[CLOCK_CONTROL_NRF_TYPE_COUNT]; }; -static void clkstarted_handle(struct device *dev, +static void clkstarted_handle(const struct device *dev, enum clock_control_nrf_type type); /* Return true if given event has enabled interrupt and is triggered. Event @@ -100,8 +100,8 @@ static void clock_irqs_enable(void) (0)))); } -static struct nrf_clock_control_sub_data *get_sub_data(struct device *dev, - enum clock_control_nrf_type type) +static struct nrf_clock_control_sub_data *get_sub_data(const struct device *dev, + enum clock_control_nrf_type type) { struct nrf_clock_control_data *data = dev->driver_data; @@ -109,7 +109,7 @@ static struct nrf_clock_control_sub_data *get_sub_data(struct device *dev, } static const struct nrf_clock_control_sub_config *get_sub_config( - struct device *dev, + const struct device *dev, enum clock_control_nrf_type type) { const struct nrf_clock_control_config *config = @@ -118,7 +118,7 @@ static const struct nrf_clock_control_sub_config *get_sub_config( return &config->subsys[type]; } -static enum clock_control_status get_status(struct device *dev, +static enum clock_control_status get_status(const struct device *dev, clock_control_subsys_t subsys) { enum clock_control_nrf_type type = (enum clock_control_nrf_type)subsys; @@ -137,7 +137,7 @@ static enum clock_control_status get_status(struct device *dev, return CLOCK_CONTROL_STATUS_OFF; } -static int clock_stop(struct device *dev, clock_control_subsys_t subsys) +static int clock_stop(const struct device *dev, clock_control_subsys_t subsys) { enum clock_control_nrf_type type = (enum clock_control_nrf_type)subsys; const struct nrf_clock_control_sub_config *config; @@ -226,7 +226,7 @@ static inline void anomaly_132_workaround(void) #endif } -static int clock_async_start(struct device *dev, +static int clock_async_start(const struct device *dev, clock_control_subsys_t subsys, struct clock_control_async_data *data) { @@ -285,7 +285,8 @@ static int clock_async_start(struct device *dev, return 0; } -static int clock_start(struct device *dev, clock_control_subsys_t sub_system) +static int clock_start(const struct device *dev, + clock_control_subsys_t sub_system) { return clock_async_start(dev, sub_system, NULL); } @@ -300,7 +301,7 @@ static int clock_start(struct device *dev, clock_control_subsys_t sub_system) */ void nrf_power_clock_isr(void *arg); -static int clk_init(struct device *dev) +static int clk_init(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), nrf_power_clock_isr, 0, 0); @@ -353,7 +354,7 @@ DEVICE_AND_API_INIT(clock_nrf, DT_INST_LABEL(0), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &clock_control_api); -static void clkstarted_handle(struct device *dev, +static void clkstarted_handle(const struct device *dev, enum clock_control_nrf_type type) { struct nrf_clock_control_sub_data *sub_data = get_sub_data(dev, type); @@ -407,7 +408,7 @@ static void usb_power_isr(void) void nrf_power_clock_isr(void *arg) { ARG_UNUSED(arg); - struct device *dev = DEVICE_GET(clock_nrf); + const struct device *dev = DEVICE_GET(clock_nrf); if (clock_event_check_and_clean(NRF_CLOCK_EVENT_HFCLKSTARTED, NRF_CLOCK_INT_HF_STARTED_MASK)) { diff --git a/drivers/console/gsm_mux.c b/drivers/console/gsm_mux.c index 4b0923ec9c32..66df4d0d8cfb 100644 --- a/drivers/console/gsm_mux.c +++ b/drivers/console/gsm_mux.c @@ -77,7 +77,7 @@ struct gsm_mux { /* UART device to use. This device is the real UART, not the * muxed one. */ - struct device *uart; + const struct device *uart; /* Buf to use when TX mux packet (hdr + data). For RX it only contains * the data (not hdr). @@ -136,7 +136,7 @@ struct gsm_dlci { dlci_command_cb_t command_cb; gsm_mux_dlci_created_cb_t dlci_created_cb; void *user_data; - struct device *uart; + const struct device *uart; enum gsm_dlci_state state; enum gsm_dlci_mode mode; int num; @@ -977,7 +977,8 @@ static struct gsm_dlci *gsm_dlci_get_free(void) } static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *mux, u8_t address, - struct device *uart, gsm_mux_dlci_created_cb_t dlci_created_cb, + const struct device *uart, + gsm_mux_dlci_created_cb_t dlci_created_cb, void *user_data) { struct gsm_dlci *dlci; @@ -1039,7 +1040,7 @@ static int gsm_mux_process_pkt(struct gsm_mux *mux) } if (dlci == NULL) { - struct device *uart; + const struct device *uart; uart = uart_mux_find(dlci_address); if (uart == NULL) { @@ -1400,7 +1401,7 @@ static void dlci_done(struct gsm_dlci *dlci, bool connected) } int gsm_dlci_create(struct gsm_mux *mux, - struct device *uart, + const struct device *uart, int dlci_address, gsm_mux_dlci_created_cb_t dlci_created_cb, void *user_data, @@ -1440,7 +1441,7 @@ int gsm_dlci_id(struct gsm_dlci *dlci) return dlci->num; } -struct gsm_mux *gsm_mux_create(struct device *uart) +struct gsm_mux *gsm_mux_create(const struct device *uart) { struct gsm_mux *mux = NULL; int i; diff --git a/drivers/console/gsm_mux.h b/drivers/console/gsm_mux.h index 268b86c22a37..140f4a526136 100644 --- a/drivers/console/gsm_mux.h +++ b/drivers/console/gsm_mux.h @@ -20,7 +20,7 @@ struct gsm_dlci; void gsm_mux_recv_buf(struct gsm_mux *mux, u8_t *buf, int len); int gsm_mux_send(struct gsm_mux *mux, u8_t dlci_address, const u8_t *buf, size_t size); -struct gsm_mux *gsm_mux_create(struct device *uart); +struct gsm_mux *gsm_mux_create(const struct device *uart); int gsm_mux_disconnect(struct gsm_mux *mux, k_timeout_t timeout); void gsm_mux_init(void); @@ -29,7 +29,7 @@ typedef void (*gsm_mux_dlci_created_cb_t)(struct gsm_dlci *dlci, void *user_data); int gsm_dlci_create(struct gsm_mux *mux, - struct device *uart, + const struct device *uart, int dlci_address, gsm_mux_dlci_created_cb_t dlci_created_cb, void *user_data, diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c index 47876c37bab2..ab920356f01d 100644 --- a/drivers/console/ipm_console_receiver.c +++ b/drivers/console/ipm_console_receiver.c @@ -21,12 +21,12 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3) u8_t size32; u16_t type; int ret, key; - struct device *d; + const struct device *d; const struct ipm_console_receiver_config_info *config_info; struct ipm_console_receiver_runtime_data *driver_data; int pos; - d = (struct device *)arg1; + d = (const struct device *)arg1; driver_data = d->driver_data; config_info = d->config_info; ARG_UNUSED(arg2); @@ -87,7 +87,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3) static void ipm_console_receive_callback(void *context, u32_t id, volatile void *data) { - struct device *d; + const struct device *d; struct ipm_console_receiver_runtime_data *driver_data; int ret; @@ -115,12 +115,12 @@ static void ipm_console_receive_callback(void *context, u32_t id, } -int ipm_console_receiver_init(struct device *d) +int ipm_console_receiver_init(const struct device *d) { const struct ipm_console_receiver_config_info *config_info = d->config_info; struct ipm_console_receiver_runtime_data *driver_data = d->driver_data; - struct device *ipm; + const struct device *ipm; ipm = device_get_binding(config_info->bind_to); @@ -142,10 +142,11 @@ int ipm_console_receiver_init(struct device *d) ring_buf_init(&driver_data->rb, config_info->rb_size32, config_info->ring_buf_data); - ipm_register_callback(ipm, ipm_console_receive_callback, d); + ipm_register_callback(ipm, ipm_console_receive_callback, (void *)d); k_thread_create(&driver_data->rx_thread, config_info->thread_stack, - CONFIG_IPM_CONSOLE_STACK_SIZE, ipm_console_thread, d, + CONFIG_IPM_CONSOLE_STACK_SIZE, ipm_console_thread, + (void *)d, NULL, NULL, K_PRIO_COOP(IPM_CONSOLE_PRI), 0, K_NO_WAIT); ipm_set_enabled(ipm, 1); diff --git a/drivers/console/ipm_console_sender.c b/drivers/console/ipm_console_sender.c index c92e8e9be33e..4c29ec0111ef 100644 --- a/drivers/console/ipm_console_sender.c +++ b/drivers/console/ipm_console_sender.c @@ -13,7 +13,7 @@ #include #include -static struct device *ipm_console_device; +static const struct device *ipm_console_device; static int consoleOut(int character) { @@ -33,7 +33,7 @@ static int consoleOut(int character) extern void __printk_hook_install(int (*fn)(int)); extern void __stdout_hook_install(int (*fn)(int)); -int ipm_console_sender_init(struct device *d) +int ipm_console_sender_init(const struct device *d) { const struct ipm_console_sender_config_info *config_info; diff --git a/drivers/console/native_posix_console.c b/drivers/console/native_posix_console.c index 354156f987e6..2c1376835be6 100644 --- a/drivers/console/native_posix_console.c +++ b/drivers/console/native_posix_console.c @@ -256,7 +256,7 @@ static void native_stdio_runner(void *p1, void *p2, void *p3) } #endif /* CONFIG_NATIVE_POSIX_STDIN_CONSOLE */ -static int native_posix_console_init(struct device *arg) +static int native_posix_console_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c index d568f50f18a7..7dc304eb2696 100644 --- a/drivers/console/ram_console.c +++ b/drivers/console/ram_console.c @@ -26,7 +26,7 @@ static int ram_console_out(int character) return character; } -static int ram_console_init(struct device *d) +static int ram_console_init(const struct device *d) { ARG_UNUSED(d); __printk_hook_install(ram_console_out); diff --git a/drivers/console/rtt_console.c b/drivers/console/rtt_console.c index 555aac130c07..281156c48fc1 100644 --- a/drivers/console/rtt_console.c +++ b/drivers/console/rtt_console.c @@ -78,7 +78,7 @@ static int rtt_console_out(int character) return character; } -static int rtt_console_init(struct device *d) +static int rtt_console_init(const struct device *d) { ARG_UNUSED(d); diff --git a/drivers/console/semihost_console.c b/drivers/console/semihost_console.c index fbe276cdbfae..51106c7adc87 100644 --- a/drivers/console/semihost_console.c +++ b/drivers/console/semihost_console.c @@ -26,7 +26,7 @@ static int semihost_console_out(int ch) return ch; } -static int semihost_console_init(struct device *dev) +static int semihost_console_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c index 1e7d5378d8c4..59937324b428 100644 --- a/drivers/console/uart_console.c +++ b/drivers/console/uart_console.c @@ -37,7 +37,7 @@ #include #endif -static struct device *uart_console_dev; +static const struct device *uart_console_dev; #ifdef CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS @@ -133,7 +133,7 @@ static u8_t (*completion_cb)(char *line, u8_t len); #define ANSI_HOME 'H' #define ANSI_DEL '~' -static int read_uart(struct device *uart, u8_t *buf, unsigned int size) +static int read_uart(const struct device *uart, u8_t *buf, unsigned int size) { int rx; @@ -433,7 +433,7 @@ static bool handle_mcumgr(struct console_input *cmd, uint8_t byte) #endif /* CONFIG_UART_CONSOLE_MCUMGR */ -static void uart_console_isr(struct device *unused) +static void uart_console_isr(const struct device *unused) { ARG_UNUSED(unused); @@ -591,7 +591,7 @@ static void uart_console_hook_install(void) * * @return 0 if successful, otherwise failed. */ -static int uart_console_init(struct device *arg) +static int uart_console_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/drivers/console/uart_mcumgr.c b/drivers/console/uart_mcumgr.c index 40416005f5ab..edf5f00e824a 100644 --- a/drivers/console/uart_mcumgr.c +++ b/drivers/console/uart_mcumgr.c @@ -16,7 +16,7 @@ #include #include -static struct device *uart_mcumgr_dev; +static const struct device *uart_mcumgr_dev; /** Callback to execute when a valid fragment has been received. */ static uart_mcumgr_recv_fn *uart_mgumgr_recv_cb; @@ -115,7 +115,7 @@ static struct uart_mcumgr_rx_buf *uart_mcumgr_rx_byte(u8_t byte) /** * ISR that is called when UART bytes are received. */ -static void uart_mcumgr_isr(struct device *unused) +static void uart_mcumgr_isr(const struct device *unused) { struct uart_mcumgr_rx_buf *rx_buf; u8_t buf[32]; @@ -161,7 +161,7 @@ int uart_mcumgr_send(const u8_t *data, int len) return mcumgr_serial_tx_pkt(data, len, uart_mcumgr_send_raw, NULL); } -static void uart_mcumgr_setup(struct device *uart) +static void uart_mcumgr_setup(const struct device *uart) { u8_t c; diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c index b7abd833b683..90415784e185 100644 --- a/drivers/console/uart_mux.c +++ b/drivers/console/uart_mux.c @@ -42,7 +42,7 @@ static struct k_work_q uart_mux_workq; */ struct uart_mux { /* The real UART device that is shared between muxed UARTs */ - struct device *uart; + const struct device *uart; /* GSM mux related to this UART */ struct gsm_mux *mux; @@ -97,7 +97,7 @@ struct uart_mux_dev_data { struct uart_mux_config cfg; /* This UART mux device */ - struct device *dev; + const struct device *dev; /* The UART device where we are running on top of */ struct uart_mux *real_uart; @@ -218,7 +218,7 @@ static void uart_mux_tx_work(struct k_work *work) ring_buf_get_finish(dev_data->tx_ringbuf, len); } -static int uart_mux_init(struct device *dev) +static int uart_mux_init(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -269,7 +269,7 @@ static void uart_mux_isr(void *user_data) } } -static void uart_mux_flush_isr(struct device *dev) +static void uart_mux_flush_isr(const struct device *dev) { u8_t c; @@ -301,7 +301,7 @@ static void dlci_created_cb(struct gsm_dlci *dlci, bool connected, } } -static int init_real_uart(struct device *mux, struct device *uart, +static int init_real_uart(const struct device *mux, const struct device *uart, struct uart_mux **mux_uart) { bool found = false; @@ -364,7 +364,7 @@ static int init_real_uart(struct device *mux, struct device *uart, } /* This will bind the physical (real) UART to this muxed UART */ -static int attach(struct device *mux_uart, struct device *uart, +static int attach(const struct device *mux_uart, const struct device *uart, int dlci_address, uart_mux_attach_cb_t cb, void *user_data) { @@ -417,7 +417,7 @@ static int attach(struct device *mux_uart, struct device *uart, return -ENOENT; } -static int uart_mux_poll_in(struct device *dev, unsigned char *p_char) +static int uart_mux_poll_in(const struct device *dev, unsigned char *p_char) { ARG_UNUSED(dev); ARG_UNUSED(p_char); @@ -425,7 +425,8 @@ static int uart_mux_poll_in(struct device *dev, unsigned char *p_char) return -ENOTSUP; } -static void uart_mux_poll_out(struct device *dev, unsigned char out_char) +static void uart_mux_poll_out(const struct device *dev, + unsigned char out_char) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -436,14 +437,14 @@ static void uart_mux_poll_out(struct device *dev, unsigned char out_char) (void)gsm_dlci_send(dev_data->dlci, &out_char, 1); } -static int uart_mux_err_check(struct device *dev) +static int uart_mux_err_check(const struct device *dev) { ARG_UNUSED(dev); return -ENOTSUP; } -static int uart_mux_configure(struct device *dev, +static int uart_mux_configure(const struct device *dev, const struct uart_config *cfg) { ARG_UNUSED(dev); @@ -452,7 +453,8 @@ static int uart_mux_configure(struct device *dev, return -ENOTSUP; } -static int uart_mux_config_get(struct device *dev, struct uart_config *cfg) +static int uart_mux_config_get(const struct device *dev, + struct uart_config *cfg) { ARG_UNUSED(dev); ARG_UNUSED(cfg); @@ -460,7 +462,8 @@ static int uart_mux_config_get(struct device *dev, struct uart_config *cfg) return -ENOTSUP; } -static int uart_mux_fifo_fill(struct device *dev, const u8_t *tx_data, int len) +static int uart_mux_fifo_fill(const struct device *dev, const u8_t *tx_data, + int len) { struct uart_mux_dev_data *dev_data; size_t wrote; @@ -494,7 +497,8 @@ static int uart_mux_fifo_fill(struct device *dev, const u8_t *tx_data, int len) return wrote; } -static int uart_mux_fifo_read(struct device *dev, u8_t *rx_data, const int size) +static int uart_mux_fifo_read(const struct device *dev, u8_t *rx_data, + const int size) { struct uart_mux_dev_data *dev_data; u32_t len; @@ -521,7 +525,7 @@ static int uart_mux_fifo_read(struct device *dev, u8_t *rx_data, const int size) return len; } -static void uart_mux_irq_tx_enable(struct device *dev) +static void uart_mux_irq_tx_enable(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -536,7 +540,7 @@ static void uart_mux_irq_tx_enable(struct device *dev) } } -static void uart_mux_irq_tx_disable(struct device *dev) +static void uart_mux_irq_tx_disable(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -547,7 +551,7 @@ static void uart_mux_irq_tx_disable(struct device *dev) dev_data->tx_enabled = false; } -static int uart_mux_irq_tx_ready(struct device *dev) +static int uart_mux_irq_tx_ready(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -562,7 +566,7 @@ static int uart_mux_irq_tx_ready(struct device *dev) return dev_data->tx_ready; } -static void uart_mux_irq_rx_enable(struct device *dev) +static void uart_mux_irq_rx_enable(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -577,7 +581,7 @@ static void uart_mux_irq_rx_enable(struct device *dev) } } -static void uart_mux_irq_rx_disable(struct device *dev) +static void uart_mux_irq_rx_disable(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -588,14 +592,14 @@ static void uart_mux_irq_rx_disable(struct device *dev) dev_data->rx_enabled = false; } -static int uart_mux_irq_tx_complete(struct device *dev) +static int uart_mux_irq_tx_complete(const struct device *dev) { ARG_UNUSED(dev); return -ENOTSUP; } -static int uart_mux_irq_rx_ready(struct device *dev) +static int uart_mux_irq_rx_ready(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -610,17 +614,17 @@ static int uart_mux_irq_rx_ready(struct device *dev) return dev_data->rx_ready; } -static void uart_mux_irq_err_enable(struct device *dev) +static void uart_mux_irq_err_enable(const struct device *dev) { ARG_UNUSED(dev); } -static void uart_mux_irq_err_disable(struct device *dev) +static void uart_mux_irq_err_disable(const struct device *dev) { ARG_UNUSED(dev); } -static int uart_mux_irq_is_pending(struct device *dev) +static int uart_mux_irq_is_pending(const struct device *dev) { struct uart_mux_dev_data *dev_data = DEV_DATA(dev); @@ -639,14 +643,14 @@ static int uart_mux_irq_is_pending(struct device *dev) return 0; } -static int uart_mux_irq_update(struct device *dev) +static int uart_mux_irq_update(const struct device *dev) { ARG_UNUSED(dev); return 1; } -static void uart_mux_irq_callback_set(struct device *dev, +static void uart_mux_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *user_data) { @@ -684,7 +688,7 @@ static struct uart_mux_driver_api uart_mux_driver_api = { .attach = attach, }; -struct device *uart_mux_alloc(void) +const struct device *uart_mux_alloc(void) { sys_snode_t *sn, *sns; @@ -704,7 +708,7 @@ struct device *uart_mux_alloc(void) return NULL; } -struct device *z_impl_uart_mux_find(int dlci_address) +const struct device *z_impl_uart_mux_find(int dlci_address) { sys_snode_t *sn, *sns; @@ -728,7 +732,7 @@ struct device *z_impl_uart_mux_find(int dlci_address) return NULL; } -int uart_mux_send(struct device *uart, const u8_t *buf, size_t size) +int uart_mux_send(const struct device *uart, const u8_t *buf, size_t size) { struct uart_mux_dev_data *dev_data = DEV_DATA(uart); @@ -759,7 +763,7 @@ int uart_mux_send(struct device *uart, const u8_t *buf, size_t size) return 0; } -int uart_mux_recv(struct device *mux, struct gsm_dlci *dlci, u8_t *data, +int uart_mux_recv(const struct device *mux, struct gsm_dlci *dlci, u8_t *data, size_t len) { struct uart_mux_dev_data *dev_data = DEV_DATA(mux); @@ -835,7 +839,7 @@ UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_CFG_DATA, _) UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEV_DATA, _) UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEVICE, _) -static int init_uart_mux(struct device *device) +static int init_uart_mux(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/console/uart_mux_internal.h b/drivers/console/uart_mux_internal.h index 1e6551d6130c..d85520efe396 100644 --- a/drivers/console/uart_mux_internal.h +++ b/drivers/console/uart_mux_internal.h @@ -20,7 +20,7 @@ extern "C" { * * @return 0 if data was sent, <0 if error */ -int uart_mux_send(struct device *uart, const u8_t *buf, size_t size); +int uart_mux_send(const struct device *uart, const u8_t *buf, size_t size); /** * @brief Receive unmuxed data. @@ -33,7 +33,7 @@ int uart_mux_send(struct device *uart, const u8_t *buf, size_t size); * @retval >=0 No errors, number of bytes received * @retval <0 Error */ -int uart_mux_recv(struct device *mux, struct gsm_dlci *dlci, +int uart_mux_recv(const struct device *mux, struct gsm_dlci *dlci, u8_t *data, size_t len); #ifdef __cplusplus diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c index 629f988f23c4..3a4a041bd85b 100644 --- a/drivers/console/uart_pipe.c +++ b/drivers/console/uart_pipe.c @@ -21,14 +21,14 @@ LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL); #include #include -static struct device *uart_pipe_dev; +static const struct device *uart_pipe_dev; static u8_t *recv_buf; static size_t recv_buf_len; static uart_pipe_recv_cb app_cb; static size_t recv_off; -static void uart_pipe_rx(struct device *dev) +static void uart_pipe_rx(const struct device *dev) { /* As per the API, the interrupt may be an edge so keep * reading from the FIFO until it's empty. @@ -53,7 +53,7 @@ static void uart_pipe_rx(struct device *dev) } } -static void uart_pipe_isr(struct device *dev) +static void uart_pipe_isr(const struct device *dev) { uart_irq_update(dev); @@ -75,7 +75,7 @@ int uart_pipe_send(const u8_t *data, int len) return 0; } -static void uart_pipe_setup(struct device *uart) +static void uart_pipe_setup(const struct device *uart) { u8_t c; diff --git a/drivers/console/xtensa_sim_console.c b/drivers/console/xtensa_sim_console.c index beb33670ff1d..0d4b8e357f74 100644 --- a/drivers/console/xtensa_sim_console.c +++ b/drivers/console/xtensa_sim_console.c @@ -63,7 +63,7 @@ static void xt_sim_console_hook_install(void) * @brief Initialize the console/debug port * @return 0 if successful, otherwise failed. */ -static int xt_sim_console_init(struct device *arg) +static int xt_sim_console_init(const struct device *arg) { ARG_UNUSED(arg); xt_sim_console_hook_install(); diff --git a/drivers/counter/counter_cmos.c b/drivers/counter/counter_cmos.c index 51d012b80dba..62ff1f8bcaee 100644 --- a/drivers/counter/counter_cmos.c +++ b/drivers/counter/counter_cmos.c @@ -128,7 +128,7 @@ static u32_t hinnant(int y, int m, int d) * This function is long, but linear and easy to follow. */ -int get_value(struct device *dev, u32_t *ticks) +int get_value(const struct device *dev, u32_t *ticks) { struct state state, state2; u64_t *pun = (u64_t *) &state; @@ -192,7 +192,7 @@ int get_value(struct device *dev, u32_t *ticks) return 0; } -static int init(struct device *dev) +static int init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c index 820a706d4d86..98dbbfa9ab4e 100644 --- a/drivers/counter/counter_gecko_rtcc.c +++ b/drivers/counter/counter_gecko_rtcc.c @@ -67,7 +67,7 @@ static u8_t chan_id2cc_idx(u8_t chan_id) return cc_idx; } -static int counter_gecko_start(struct device *dev) +static int counter_gecko_start(const struct device *dev) { ARG_UNUSED(dev); @@ -76,7 +76,7 @@ static int counter_gecko_start(struct device *dev) return 0; } -static int counter_gecko_stop(struct device *dev) +static int counter_gecko_stop(const struct device *dev) { ARG_UNUSED(dev); @@ -85,7 +85,7 @@ static int counter_gecko_stop(struct device *dev) return 0; } -static int counter_gecko_get_value(struct device *dev, u32_t *ticks) +static int counter_gecko_get_value(const struct device *dev, u32_t *ticks) { ARG_UNUSED(dev); @@ -93,7 +93,7 @@ static int counter_gecko_get_value(struct device *dev, u32_t *ticks) return 0; } -static int counter_gecko_set_top_value(struct device *dev, +static int counter_gecko_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { struct counter_gecko_data *const dev_data = DEV_DATA(dev); @@ -146,21 +146,21 @@ static int counter_gecko_set_top_value(struct device *dev, return err; } -static u32_t counter_gecko_get_top_value(struct device *dev) +static u32_t counter_gecko_get_top_value(const struct device *dev) { ARG_UNUSED(dev); return RTCC_ChannelCCVGet(1); } -static u32_t counter_gecko_get_max_relative_alarm(struct device *dev) +static u32_t counter_gecko_get_max_relative_alarm(const struct device *dev) { ARG_UNUSED(dev); return RTCC_ChannelCCVGet(1); } -static int counter_gecko_set_alarm(struct device *dev, u8_t chan_id, +static int counter_gecko_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { u32_t count = RTCC_CounterGet(); @@ -204,7 +204,7 @@ static int counter_gecko_set_alarm(struct device *dev, u8_t chan_id, return 0; } -static int counter_gecko_cancel_alarm(struct device *dev, u8_t chan_id) +static int counter_gecko_cancel_alarm(const struct device *dev, u8_t chan_id) { struct counter_gecko_data *const dev_data = DEV_DATA(dev); @@ -224,14 +224,14 @@ static int counter_gecko_cancel_alarm(struct device *dev, u8_t chan_id) return 0; } -static u32_t counter_gecko_get_pending_int(struct device *dev) +static u32_t counter_gecko_get_pending_int(const struct device *dev) { ARG_UNUSED(dev); return 0; } -static int counter_gecko_init(struct device *dev) +static int counter_gecko_init(const struct device *dev) { const struct counter_gecko_config *const dev_cfg = DEV_CFG(dev); @@ -323,11 +323,11 @@ static const struct counter_driver_api counter_gecko_driver_api = { /* RTCC0 */ -static struct device DEVICE_NAME_GET(counter_gecko_0); +DEVICE_DECLARE(counter_gecko_0); ISR_DIRECT_DECLARE(counter_gecko_isr_0) { - struct device *const dev = DEVICE_GET(counter_gecko_0); + const struct device *const dev = DEVICE_GET(counter_gecko_0); struct counter_gecko_data *const dev_data = DEV_DATA(dev); counter_alarm_callback_t alarm_callback; u32_t count = RTCC_CounterGet(); diff --git a/drivers/counter/counter_handlers.c b/drivers/counter/counter_handlers.c index 5f373972c698..931ccb5489e5 100644 --- a/drivers/counter/counter_handlers.c +++ b/drivers/counter/counter_handlers.c @@ -11,10 +11,10 @@ * instance and return an integral value */ #define COUNTER_HANDLER(name) \ - static inline int z_vrfy_counter_##name(struct device *dev) \ + static inline int z_vrfy_counter_##name(const struct device *dev) \ { \ Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, name)); \ - return z_impl_counter_ ## name((struct device *)dev); \ + return z_impl_counter_ ## name((const struct device *)dev); \ } COUNTER_HANDLER(get_pending_int) @@ -64,17 +64,18 @@ static inline u64_t z_vrfy_counter_ticks_to_us(const struct device *dev, } #include -static inline int z_vrfy_counter_get_value(struct device *dev, +static inline int z_vrfy_counter_get_value(const struct device *dev, u32_t *ticks) { Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_value)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(ticks, sizeof(*ticks))); - return z_impl_counter_get_value((struct device *)dev, ticks); + return z_impl_counter_get_value((const struct device *)dev, ticks); } #include -static inline int z_vrfy_counter_set_channel_alarm(struct device *dev, - u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) +static inline int z_vrfy_counter_set_channel_alarm(const struct device *dev, + u8_t chan_id, + const struct counter_alarm_cfg *alarm_cfg) { struct counter_alarm_cfg cfg_copy; @@ -82,22 +83,23 @@ static inline int z_vrfy_counter_set_channel_alarm(struct device *dev, Z_OOPS(z_user_from_copy(&cfg_copy, alarm_cfg, sizeof(cfg_copy))); Z_OOPS(Z_SYSCALL_VERIFY_MSG(cfg_copy.callback == 0, "callbacks may not be set from user mode")); - return z_impl_counter_set_channel_alarm((struct device *)dev, - (u8_t)chan_id, (const struct counter_alarm_cfg *)&cfg_copy); + return z_impl_counter_set_channel_alarm((const struct device *)dev, + (u8_t)chan_id, + (const struct counter_alarm_cfg *)&cfg_copy); } #include -static inline int z_vrfy_counter_cancel_channel_alarm(struct device *dev, +static inline int z_vrfy_counter_cancel_channel_alarm(const struct device *dev, u8_t chan_id) { Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, cancel_alarm)); - return z_vrfy_counter_cancel_channel_alarm((struct device *)dev, + return z_vrfy_counter_cancel_channel_alarm((const struct device *)dev, (u8_t)chan_id); } #include -static inline int z_vrfy_counter_set_top_value(struct device *dev, +static inline int z_vrfy_counter_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { @@ -107,46 +109,48 @@ static inline int z_vrfy_counter_set_top_value(struct device *dev, Z_OOPS(z_user_from_copy(&cfg_copy, cfg, sizeof(cfg_copy))); Z_OOPS(Z_SYSCALL_VERIFY_MSG(cfg_copy.callback == 0, "callbacks may not be set from user mode")); - return z_impl_counter_set_top_value((struct device *)dev, + return z_impl_counter_set_top_value((const struct device *)dev, (const struct counter_top_cfg *) &cfg_copy); } #include -static inline u32_t z_vrfy_counter_get_top_value(struct device *dev) +static inline u32_t z_vrfy_counter_get_top_value(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_top_value)); - return z_impl_counter_get_top_value((struct device *)dev); + return z_impl_counter_get_top_value((const struct device *)dev); } #include static inline u32_t z_vrfy_counter_get_max_top_value(const struct device *dev) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER)); - return z_impl_counter_get_max_top_value((struct device *)dev); + return z_impl_counter_get_max_top_value((const struct device *)dev); } #include -static inline u32_t z_vrfy_counter_get_max_relative_alarm(struct device *dev) +static inline u32_t z_vrfy_counter_get_max_relative_alarm(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_max_relative_alarm)); - return z_impl_counter_get_max_relative_alarm((struct device *)dev); + return z_impl_counter_get_max_relative_alarm((const struct device *)dev); } #include -static inline u32_t z_vrfy_counter_get_guard_period(struct device *dev, +static inline u32_t z_vrfy_counter_get_guard_period(const struct device *dev, u32_t flags) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER)); - return z_impl_counter_get_guard_period((struct device *)dev, flags); + return z_impl_counter_get_guard_period((const struct device *)dev, + flags); } #include -static inline int z_vrfy_counter_set_guard_period(struct device *dev, +static inline int z_vrfy_counter_set_guard_period(const struct device *dev, u32_t ticks, u32_t flags) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER)); - return z_impl_counter_set_guard_period((struct device *)dev, ticks, + return z_impl_counter_set_guard_period((const struct device *)dev, + ticks, flags); } #include diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c index 4a3b9beac585..62a7c7cc9831 100644 --- a/drivers/counter/counter_imx_epit.c +++ b/drivers/counter/counter_imx_epit.c @@ -23,7 +23,7 @@ struct imx_epit_data { volatile void *user_data; }; -static inline const struct imx_epit_config *get_epit_config(struct device *dev) +static inline const struct imx_epit_config *get_epit_config(const struct device *dev) { return CONTAINER_OF(dev->config_info, struct imx_epit_config, info); @@ -31,7 +31,7 @@ static inline const struct imx_epit_config *get_epit_config(struct device *dev) static void imx_epit_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; EPIT_Type *base = get_epit_config(dev)->base; struct imx_epit_data *driver_data = dev->driver_data; @@ -42,7 +42,7 @@ static void imx_epit_isr(void *arg) } } -static void imx_epit_init(struct device *dev) +static void imx_epit_init(const struct device *dev) { struct imx_epit_config *config = (struct imx_epit_config *) get_epit_config(dev); @@ -61,7 +61,7 @@ static void imx_epit_init(struct device *dev) EPIT_Init(base, &epit_config); } -static int imx_epit_start(struct device *dev) +static int imx_epit_start(const struct device *dev) { EPIT_Type *base = get_epit_config(dev)->base; @@ -77,7 +77,7 @@ static int imx_epit_start(struct device *dev) return 0; } -static int imx_epit_stop(struct device *dev) +static int imx_epit_stop(const struct device *dev) { EPIT_Type *base = get_epit_config(dev)->base; @@ -87,7 +87,7 @@ static int imx_epit_stop(struct device *dev) return 0; } -static int imx_epit_get_value(struct device *dev, u32_t *ticks) +static int imx_epit_get_value(const struct device *dev, u32_t *ticks) { EPIT_Type *base = get_epit_config(dev)->base; @@ -96,7 +96,7 @@ static int imx_epit_get_value(struct device *dev, u32_t *ticks) return 0; } -static int imx_epit_set_top_value(struct device *dev, +static int imx_epit_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { EPIT_Type *base = get_epit_config(dev)->base; @@ -121,21 +121,21 @@ static int imx_epit_set_top_value(struct device *dev, return 0; } -static u32_t imx_epit_get_pending_int(struct device *dev) +static u32_t imx_epit_get_pending_int(const struct device *dev) { EPIT_Type *base = get_epit_config(dev)->base; return EPIT_GetStatusFlag(base) ? 1U : 0U; } -static u32_t imx_epit_get_top_value(struct device *dev) +static u32_t imx_epit_get_top_value(const struct device *dev) { EPIT_Type *base = get_epit_config(dev)->base; return EPIT_GetCounterLoadValue(base); } -static u32_t imx_epit_get_max_relative_alarm(struct device *dev) +static u32_t imx_epit_get_max_relative_alarm(const struct device *dev) { return COUNTER_MAX_RELOAD; } @@ -151,7 +151,7 @@ static const struct counter_driver_api imx_epit_driver_api = { }; #define COUNTER_IMX_EPIT_DEVICE(idx) \ -static int imx_epit_config_func_##idx(struct device *dev); \ +static int imx_epit_config_func_##idx(const struct device *dev); \ static const struct imx_epit_config imx_epit_##idx##z_config = { \ .info = { \ .max_top_value = COUNTER_MAX_RELOAD, \ @@ -168,7 +168,7 @@ DEVICE_AND_API_INIT(epit_##idx, DT_INST_LABEL(idx), \ &imx_epit_##idx##_data, &imx_epit_##idx##z_config.info, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &imx_epit_driver_api); \ -static int imx_epit_config_func_##idx(struct device *dev) \ +static int imx_epit_config_func_##idx(const struct device *dev) \ { \ imx_epit_init(dev); \ IRQ_CONNECT(DT_INST_IRQN(idx), \ diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c index dd70f95e347e..3a95565b6b8e 100644 --- a/drivers/counter/counter_ll_stm32_rtc.c +++ b/drivers/counter/counter_ll_stm32_rtc.c @@ -57,10 +57,10 @@ struct rtc_stm32_data { ((const struct rtc_stm32_config * const)(dev)->config_info) -static void rtc_stm32_irq_config(struct device *dev); +static void rtc_stm32_irq_config(const struct device *dev); -static int rtc_stm32_start(struct device *dev) +static int rtc_stm32_start(const struct device *dev) { ARG_UNUSED(dev); @@ -70,7 +70,7 @@ static int rtc_stm32_start(struct device *dev) } -static int rtc_stm32_stop(struct device *dev) +static int rtc_stm32_stop(const struct device *dev) { ARG_UNUSED(dev); @@ -80,7 +80,7 @@ static int rtc_stm32_stop(struct device *dev) } -static u32_t rtc_stm32_read(struct device *dev) +static u32_t rtc_stm32_read(const struct device *dev) { struct tm now = { 0 }; time_t ts; @@ -116,13 +116,13 @@ static u32_t rtc_stm32_read(struct device *dev) return ticks; } -static int rtc_stm32_get_value(struct device *dev, u32_t *ticks) +static int rtc_stm32_get_value(const struct device *dev, u32_t *ticks) { *ticks = rtc_stm32_read(dev); return 0; } -static int rtc_stm32_set_alarm(struct device *dev, u8_t chan_id, +static int rtc_stm32_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { struct tm alarm_tm; @@ -180,7 +180,7 @@ static int rtc_stm32_set_alarm(struct device *dev, u8_t chan_id, } -static int rtc_stm32_cancel_alarm(struct device *dev, u8_t chan_id) +static int rtc_stm32_cancel_alarm(const struct device *dev, u8_t chan_id) { LL_RTC_DisableWriteProtection(RTC); LL_RTC_ClearFlag_ALRA(RTC); @@ -194,13 +194,13 @@ static int rtc_stm32_cancel_alarm(struct device *dev, u8_t chan_id) } -static u32_t rtc_stm32_get_pending_int(struct device *dev) +static u32_t rtc_stm32_get_pending_int(const struct device *dev) { return LL_RTC_IsActiveFlag_ALRA(RTC) != 0; } -static u32_t rtc_stm32_get_top_value(struct device *dev) +static u32_t rtc_stm32_get_top_value(const struct device *dev) { const struct counter_config_info *info = dev->config_info; @@ -208,7 +208,7 @@ static u32_t rtc_stm32_get_top_value(struct device *dev) } -static int rtc_stm32_set_top_value(struct device *dev, +static int rtc_stm32_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { const struct counter_config_info *info = dev->config_info; @@ -224,7 +224,7 @@ static int rtc_stm32_set_top_value(struct device *dev, } -static u32_t rtc_stm32_get_max_relative_alarm(struct device *dev) +static u32_t rtc_stm32_get_max_relative_alarm(const struct device *dev) { const struct counter_config_info *info = dev->config_info; @@ -234,7 +234,7 @@ static u32_t rtc_stm32_get_max_relative_alarm(struct device *dev) void rtc_stm32_isr(void *arg) { - struct device *const dev = (struct device *)arg; + const struct device *const dev = (const struct device *)arg; struct rtc_stm32_data *data = DEV_DATA(dev); counter_alarm_callback_t alarm_callback = data->callback; @@ -262,9 +262,9 @@ void rtc_stm32_isr(void *arg) } -static int rtc_stm32_init(struct device *dev) +static int rtc_stm32_init(const struct device *dev) { - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); const struct rtc_stm32_config *cfg = DEV_CFG(dev); __ASSERT_NO_MSG(clk); @@ -393,7 +393,7 @@ DEVICE_AND_API_INIT(rtc_stm32, DT_INST_LABEL(0), &rtc_stm32_init, &rtc_data, &rtc_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &rtc_stm32_driver_api); -static void rtc_stm32_irq_config(struct device *dev) +static void rtc_stm32_irq_config(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/counter/counter_mchp_xec.c b/drivers/counter/counter_mchp_xec.c index 35149422d565..a16cacb1b7e9 100644 --- a/drivers/counter/counter_mchp_xec.c +++ b/drivers/counter/counter_mchp_xec.c @@ -57,7 +57,7 @@ struct counter_xec_data { #define COUNTER_XEC_DATA(_dev) \ ((struct counter_xec_data *)dev->driver_data) -static int counter_xec_start(struct device *dev) +static int counter_xec_start(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); @@ -72,7 +72,7 @@ static int counter_xec_start(struct device *dev) return 0; } -static int counter_xec_stop(struct device *dev) +static int counter_xec_stop(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); uint32_t reg; @@ -98,7 +98,7 @@ static int counter_xec_stop(struct device *dev) return 0; } -static int counter_xec_get_value(struct device *dev, u32_t *ticks) +static int counter_xec_get_value(const struct device *dev, u32_t *ticks) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); @@ -106,7 +106,7 @@ static int counter_xec_get_value(struct device *dev, u32_t *ticks) return 0; } -static int counter_xec_set_alarm(struct device *dev, u8_t chan_id, +static int counter_xec_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); @@ -151,7 +151,7 @@ static int counter_xec_set_alarm(struct device *dev, u8_t chan_id, } -static int counter_xec_cancel_alarm(struct device *dev, u8_t chan_id) +static int counter_xec_cancel_alarm(const struct device *dev, u8_t chan_id) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); struct counter_xec_data *data = COUNTER_XEC_DATA(dev); @@ -172,21 +172,21 @@ static int counter_xec_cancel_alarm(struct device *dev, u8_t chan_id) return 0; } -static u32_t counter_xec_get_pending_int(struct device *dev) +static u32_t counter_xec_get_pending_int(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); return counter->STS; } -static u32_t counter_xec_get_top_value(struct device *dev) +static u32_t counter_xec_get_top_value(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); return counter->PRLD; } -static int counter_xec_set_top_value(struct device *dev, +static int counter_xec_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); @@ -241,14 +241,14 @@ static int counter_xec_set_top_value(struct device *dev, return ret; } -static u32_t counter_xec_get_max_relative_alarm(struct device *dev) +static u32_t counter_xec_get_max_relative_alarm(const struct device *dev) { const struct counter_xec_config *counter_cfg = COUNTER_XEC_CONFIG(dev); return counter_cfg->info.max_top_value; } -static void counter_xec_isr(struct device *dev) +static void counter_xec_isr(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); const struct counter_xec_config *counter_cfg = COUNTER_XEC_CONFIG(dev); @@ -287,7 +287,7 @@ static const struct counter_driver_api counter_xec_api = { .get_max_relative_alarm = counter_xec_get_max_relative_alarm, }; -static int counter_xec_init(struct device *dev) +static int counter_xec_init(const struct device *dev) { BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev); const struct counter_xec_config *counter_cfg = COUNTER_XEC_CONFIG(dev); diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c index 8315c234ea79..5f492f72ebe5 100644 --- a/drivers/counter/counter_mcux_gpt.c +++ b/drivers/counter/counter_mcux_gpt.c @@ -26,7 +26,7 @@ struct mcux_gpt_data { void *top_user_data; }; -static int mcux_gpt_start(struct device *dev) +static int mcux_gpt_start(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; @@ -35,7 +35,7 @@ static int mcux_gpt_start(struct device *dev) return 0; } -static int mcux_gpt_stop(struct device *dev) +static int mcux_gpt_stop(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; @@ -44,7 +44,7 @@ static int mcux_gpt_stop(struct device *dev) return 0; } -static int mcux_gpt_get_value(struct device *dev, u32_t *ticks) +static int mcux_gpt_get_value(const struct device *dev, u32_t *ticks) { const struct mcux_gpt_config *config = dev->config_info; @@ -52,7 +52,7 @@ static int mcux_gpt_get_value(struct device *dev, u32_t *ticks) return 0; } -static int mcux_gpt_set_alarm(struct device *dev, u8_t chan_id, +static int mcux_gpt_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { const struct mcux_gpt_config *config = dev->config_info; @@ -84,7 +84,7 @@ static int mcux_gpt_set_alarm(struct device *dev, u8_t chan_id, return 0; } -static int mcux_gpt_cancel_alarm(struct device *dev, u8_t chan_id) +static int mcux_gpt_cancel_alarm(const struct device *dev, u8_t chan_id) { const struct mcux_gpt_config *config = dev->config_info; struct mcux_gpt_data *data = dev->driver_data; @@ -102,7 +102,7 @@ static int mcux_gpt_cancel_alarm(struct device *dev, u8_t chan_id) void mcux_gpt_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; const struct mcux_gpt_config *config = dev->config_info; struct mcux_gpt_data *data = dev->driver_data; u32_t current = GPT_GetCurrentTimerCount(config->base); @@ -126,14 +126,14 @@ void mcux_gpt_isr(void *p) } } -static u32_t mcux_gpt_get_pending_int(struct device *dev) +static u32_t mcux_gpt_get_pending_int(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; return GPT_GetStatusFlags(config->base, kGPT_OutputCompare1Flag); } -static int mcux_gpt_set_top_value(struct device *dev, +static int mcux_gpt_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { const struct mcux_gpt_config *config = dev->config_info; @@ -153,21 +153,21 @@ static int mcux_gpt_set_top_value(struct device *dev, return 0; } -static u32_t mcux_gpt_get_top_value(struct device *dev) +static u32_t mcux_gpt_get_top_value(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; return config->info.max_top_value; } -static u32_t mcux_gpt_get_max_relative_alarm(struct device *dev) +static u32_t mcux_gpt_get_max_relative_alarm(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; return config->info.max_top_value; } -static int mcux_gpt_init(struct device *dev) +static int mcux_gpt_init(const struct device *dev) { const struct mcux_gpt_config *config = dev->config_info; gpt_config_t gptConfig; @@ -215,7 +215,7 @@ static const struct counter_driver_api mcux_gpt_driver_api = { }, \ }; \ \ - static int mcux_gpt_## n ##_init(struct device *dev); \ + static int mcux_gpt_## n ##_init(const struct device *dev); \ DEVICE_AND_API_INIT(mcux_gpt ## n, \ DT_INST_LABEL(n), \ mcux_gpt_## n ##_init, \ @@ -225,7 +225,7 @@ static const struct counter_driver_api mcux_gpt_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_gpt_driver_api); \ \ - static int mcux_gpt_## n ##_init(struct device *dev) \ + static int mcux_gpt_## n ##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c index 5a2d093dd5a3..60abfcd94b89 100644 --- a/drivers/counter/counter_mcux_lptmr.c +++ b/drivers/counter/counter_mcux_lptmr.c @@ -18,7 +18,7 @@ struct mcux_lptmr_config { lptmr_timer_mode_t mode; lptmr_pin_select_t pin; lptmr_pin_polarity_t polarity; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_lptmr_data { @@ -26,7 +26,7 @@ struct mcux_lptmr_data { void *top_user_data; }; -static int mcux_lptmr_start(struct device *dev) +static int mcux_lptmr_start(const struct device *dev) { const struct mcux_lptmr_config *config = dev->config_info; @@ -37,7 +37,7 @@ static int mcux_lptmr_start(struct device *dev) return 0; } -static int mcux_lptmr_stop(struct device *dev) +static int mcux_lptmr_stop(const struct device *dev) { const struct mcux_lptmr_config *config = dev->config_info; @@ -48,7 +48,7 @@ static int mcux_lptmr_stop(struct device *dev) return 0; } -static int mcux_lptmr_get_value(struct device *dev, u32_t *ticks) +static int mcux_lptmr_get_value(const struct device *dev, u32_t *ticks) { const struct mcux_lptmr_config *config = dev->config_info; @@ -57,8 +57,8 @@ static int mcux_lptmr_get_value(struct device *dev, u32_t *ticks) return 0; } -static int mcux_lptmr_set_top_value(struct device *dev, - const struct counter_top_cfg *cfg) +static int mcux_lptmr_set_top_value(const struct device *dev, + const struct counter_top_cfg *cfg) { const struct mcux_lptmr_config *config = dev->config_info; struct mcux_lptmr_data *data = dev->driver_data; @@ -85,7 +85,7 @@ static int mcux_lptmr_set_top_value(struct device *dev, return 0; } -static u32_t mcux_lptmr_get_pending_int(struct device *dev) +static u32_t mcux_lptmr_get_pending_int(const struct device *dev) { const struct mcux_lptmr_config *config = dev->config_info; u32_t mask = LPTMR_CSR_TCF_MASK | LPTMR_CSR_TIE_MASK; @@ -96,14 +96,14 @@ static u32_t mcux_lptmr_get_pending_int(struct device *dev) return ((flags & mask) == mask); } -static u32_t mcux_lptmr_get_top_value(struct device *dev) +static u32_t mcux_lptmr_get_top_value(const struct device *dev) { const struct mcux_lptmr_config *config = dev->config_info; return (config->base->CMR & LPTMR_CMR_COMPARE_MASK) + 1U; } -static u32_t mcux_lptmr_get_max_relative_alarm(struct device *dev) +static u32_t mcux_lptmr_get_max_relative_alarm(const struct device *dev) { ARG_UNUSED(dev); @@ -113,7 +113,7 @@ static u32_t mcux_lptmr_get_max_relative_alarm(struct device *dev) static void mcux_lptmr_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct mcux_lptmr_config *config = dev->config_info; struct mcux_lptmr_data *data = dev->driver_data; u32_t flags; @@ -126,7 +126,7 @@ static void mcux_lptmr_isr(void *arg) } } -static int mcux_lptmr_init(struct device *dev) +static int mcux_lptmr_init(const struct device *dev) { const struct mcux_lptmr_config *config = dev->config_info; lptmr_config_t lptmr_config; @@ -210,7 +210,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1, #if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) static struct mcux_lptmr_data mcux_lptmr_data_0; -static void mcux_lptmr_irq_config_0(struct device *dev); +static void mcux_lptmr_irq_config_0(const struct device *dev); static struct mcux_lptmr_config mcux_lptmr_config_0 = { .info = { @@ -248,7 +248,7 @@ DEVICE_AND_API_INIT(mcux_lptmr_0, DT_INST_LABEL(0), POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_lptmr_driver_api); -static void mcux_lptmr_irq_config_0(struct device *dev) +static void mcux_lptmr_irq_config_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), mcux_lptmr_isr, DEVICE_GET(mcux_lptmr_0), 0); diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c index b8d4faba68ab..ae90cd99e4cf 100644 --- a/drivers/counter/counter_mcux_rtc.c +++ b/drivers/counter/counter_mcux_rtc.c @@ -23,10 +23,10 @@ struct mcux_rtc_data { struct mcux_rtc_config { struct counter_config_info info; RTC_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; -static int mcux_rtc_start(struct device *dev) +static int mcux_rtc_start(const struct device *dev) { const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = @@ -41,7 +41,7 @@ static int mcux_rtc_start(struct device *dev) return 0; } -static int mcux_rtc_stop(struct device *dev) +static int mcux_rtc_stop(const struct device *dev) { const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = @@ -59,7 +59,7 @@ static int mcux_rtc_stop(struct device *dev) return 0; } -static u32_t mcux_rtc_read(struct device *dev) +static u32_t mcux_rtc_read(const struct device *dev) { const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = @@ -81,13 +81,13 @@ static u32_t mcux_rtc_read(struct device *dev) return ticks; } -static int mcux_rtc_get_value(struct device *dev, u32_t *ticks) +static int mcux_rtc_get_value(const struct device *dev, u32_t *ticks) { *ticks = mcux_rtc_read(dev); return 0; } -static int mcux_rtc_set_alarm(struct device *dev, u8_t chan_id, +static int mcux_rtc_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { const struct counter_config_info *info = dev->config_info; @@ -127,7 +127,7 @@ static int mcux_rtc_set_alarm(struct device *dev, u8_t chan_id, return 0; } -static int mcux_rtc_cancel_alarm(struct device *dev, u8_t chan_id) +static int mcux_rtc_cancel_alarm(const struct device *dev, u8_t chan_id) { struct mcux_rtc_data *data = dev->driver_data; @@ -141,7 +141,7 @@ static int mcux_rtc_cancel_alarm(struct device *dev, u8_t chan_id) return 0; } -static int mcux_rtc_set_top_value(struct device *dev, +static int mcux_rtc_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { const struct counter_config_info *info = dev->config_info; @@ -166,7 +166,7 @@ static int mcux_rtc_set_top_value(struct device *dev, return 0; } -static u32_t mcux_rtc_get_pending_int(struct device *dev) +static u32_t mcux_rtc_get_pending_int(const struct device *dev) { const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = @@ -175,14 +175,14 @@ static u32_t mcux_rtc_get_pending_int(struct device *dev) return RTC_GetStatusFlags(config->base) & RTC_SR_TAF_MASK; } -static u32_t mcux_rtc_get_top_value(struct device *dev) +static u32_t mcux_rtc_get_top_value(const struct device *dev) { const struct counter_config_info *info = dev->config_info; return info->max_top_value; } -static u32_t mcux_rtc_get_max_relative_alarm(struct device *dev) +static u32_t mcux_rtc_get_max_relative_alarm(const struct device *dev) { const struct counter_config_info *info = dev->config_info; @@ -191,7 +191,7 @@ static u32_t mcux_rtc_get_max_relative_alarm(struct device *dev) static void mcux_rtc_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); @@ -231,7 +231,7 @@ static void mcux_rtc_isr(void *arg) RTC_StartTimer(config->base); } -static int mcux_rtc_init(struct device *dev) +static int mcux_rtc_init(const struct device *dev) { const struct counter_config_info *info = dev->config_info; const struct mcux_rtc_config *config = @@ -264,7 +264,7 @@ static const struct counter_driver_api mcux_rtc_driver_api = { static struct mcux_rtc_data mcux_rtc_data_0; -static void mcux_rtc_irq_config_0(struct device *dev); +static void mcux_rtc_irq_config_0(const struct device *dev); static struct mcux_rtc_config mcux_rtc_config_0 = { .base = (RTC_Type *)DT_INST_REG_ADDR(0), @@ -283,7 +283,7 @@ DEVICE_AND_API_INIT(rtc, DT_INST_LABEL(0), &mcux_rtc_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_rtc_driver_api); -static void mcux_rtc_irq_config_0(struct device *dev) +static void mcux_rtc_irq_config_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c index 3478196fc3cf..b719b9628ffa 100644 --- a/drivers/counter/counter_nrfx_rtc.c +++ b/drivers/counter/counter_nrfx_rtc.c @@ -66,38 +66,38 @@ struct counter_nrfx_config { LOG_INSTANCE_PTR_DECLARE(log); }; -static inline struct counter_nrfx_data *get_dev_data(struct device *dev) +static inline struct counter_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline const struct counter_nrfx_config *get_nrfx_config( - struct device *dev) + const struct device *dev) { return CONTAINER_OF(dev->config_info, struct counter_nrfx_config, info); } -static int start(struct device *dev) +static int start(const struct device *dev) { nrf_rtc_task_trigger(get_nrfx_config(dev)->rtc, NRF_RTC_TASK_START); return 0; } -static int stop(struct device *dev) +static int stop(const struct device *dev) { nrf_rtc_task_trigger(get_nrfx_config(dev)->rtc, NRF_RTC_TASK_STOP); return 0; } -static u32_t read(struct device *dev) +static u32_t read(const struct device *dev) { return nrf_rtc_counter_get(get_nrfx_config(dev)->rtc); } -static int get_value(struct device *dev, u32_t *ticks) +static int get_value(const struct device *dev, u32_t *ticks) { *ticks = read(dev); return 0; @@ -112,7 +112,8 @@ static inline bool is_bit_mask(u32_t val) /* Function calculates distance between to values assuming that one first * argument is in front and that values wrap. */ -static u32_t ticks_sub(struct device *dev, u32_t val, u32_t old, u32_t top) +static u32_t ticks_sub(const struct device *dev, u32_t val, u32_t old, + u32_t top) { if (IS_FIXED_TOP(dev)) { return (val - old) & COUNTER_MAX_TOP_VALUE; @@ -137,7 +138,8 @@ static u32_t skip_zero_on_custom_top(u32_t val, u32_t top) return val; } -static u32_t ticks_add(struct device *dev, u32_t val1, u32_t val2, u32_t top) +static u32_t ticks_add(const struct device *dev, u32_t val1, u32_t val2, + u32_t top) { u32_t sum = val1 + val2; @@ -154,7 +156,7 @@ static u32_t ticks_add(struct device *dev, u32_t val1, u32_t val2, u32_t top) return skip_zero_on_custom_top(sum, top); } -static void set_cc_int_pending(struct device *dev, u8_t chan) +static void set_cc_int_pending(const struct device *dev, u8_t chan) { atomic_or(&get_dev_data(dev)->ipend_adj, BIT(chan)); NRFX_IRQ_PENDING_SET(NRFX_IRQ_NUMBER_GET(get_nrfx_config(dev)->rtc)); @@ -173,7 +175,7 @@ static void set_cc_int_pending(struct device *dev, u8_t chan) * is used in the callback to return original CC value which was requested by * the user. */ -static void handle_next_tick_case(struct device *dev, u8_t chan, +static void handle_next_tick_case(const struct device *dev, u8_t chan, u32_t now, u32_t val) { val = ticks_add(dev, val, 1, get_dev_data(dev)->top); @@ -215,7 +217,7 @@ static void handle_next_tick_case(struct device *dev, u8_t chan, * enabled. * */ -static int set_cc(struct device *dev, u8_t chan, u32_t val, u32_t flags) +static int set_cc(const struct device *dev, u8_t chan, u32_t val, u32_t flags) { __ASSERT_NO_MSG(get_dev_data(dev)->guard_period < get_dev_data(dev)->top); @@ -321,7 +323,7 @@ static int set_cc(struct device *dev, u8_t chan, u32_t val, u32_t flags) return err; } -static int set_channel_alarm(struct device *dev, u8_t chan, +static int set_channel_alarm(const struct device *dev, u8_t chan, const struct counter_alarm_cfg *alarm_cfg) { const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); @@ -342,7 +344,7 @@ static int set_channel_alarm(struct device *dev, u8_t chan, return set_cc(dev, chan, alarm_cfg->ticks, alarm_cfg->flags); } -static void disable(struct device *dev, u8_t chan) +static void disable(const struct device *dev, u8_t chan) { const struct counter_nrfx_config *config = get_nrfx_config(dev); NRF_RTC_Type *rtc = config->rtc; @@ -354,14 +356,14 @@ static void disable(struct device *dev, u8_t chan) config->ch_data[chan].callback = NULL; } -static int cancel_alarm(struct device *dev, u8_t chan_id) +static int cancel_alarm(const struct device *dev, u8_t chan_id) { disable(dev, chan_id); return 0; } -static int ppi_setup(struct device *dev, u8_t chan) +static int ppi_setup(const struct device *dev, u8_t chan) { #if CONFIG_COUNTER_RTC_WITH_PPI_WRAP const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); @@ -404,7 +406,7 @@ static int ppi_setup(struct device *dev, u8_t chan) return 0; } -static void ppi_free(struct device *dev, u8_t chan) +static void ppi_free(const struct device *dev, u8_t chan) { #if CONFIG_COUNTER_RTC_WITH_PPI_WRAP const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); @@ -433,13 +435,13 @@ static void ppi_free(struct device *dev, u8_t chan) /* Return true if counter must be cleared by the CPU. It is cleared * automatically in case of max top value or PPI usage. */ -static bool sw_wrap_required(struct device *dev) +static bool sw_wrap_required(const struct device *dev) { return (get_dev_data(dev)->top != COUNTER_MAX_TOP_VALUE) && !IS_PPI_WRAP(dev); } -static int set_fixed_top_value(struct device *dev, +static int set_fixed_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { NRF_RTC_Type *rtc = get_nrfx_config(dev)->rtc; @@ -463,7 +465,8 @@ static int set_fixed_top_value(struct device *dev, return 0; } -static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg) +static int set_top_value(const struct device *dev, + const struct counter_top_cfg *cfg) { const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); NRF_RTC_Type *rtc = nrfx_config->rtc; @@ -517,14 +520,14 @@ static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg) return err; } -static u32_t get_pending_int(struct device *dev) +static u32_t get_pending_int(const struct device *dev) { return 0; } -static int init_rtc(struct device *dev, u32_t prescaler) +static int init_rtc(const struct device *dev, u32_t prescaler) { - struct device *clock; + const struct device *clock; const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); struct counter_top_cfg top_cfg = { .ticks = COUNTER_MAX_TOP_VALUE @@ -550,28 +553,29 @@ static int init_rtc(struct device *dev, u32_t prescaler) return err; } -static u32_t get_top_value(struct device *dev) +static u32_t get_top_value(const struct device *dev) { return get_dev_data(dev)->top; } -static u32_t get_max_relative_alarm(struct device *dev) +static u32_t get_max_relative_alarm(const struct device *dev) { return get_dev_data(dev)->top; } -static u32_t get_guard_period(struct device *dev, u32_t flags) +static u32_t get_guard_period(const struct device *dev, u32_t flags) { return get_dev_data(dev)->guard_period; } -static int set_guard_period(struct device *dev, u32_t guard, u32_t flags) +static int set_guard_period(const struct device *dev, u32_t guard, + u32_t flags) { get_dev_data(dev)->guard_period = guard; return 0; } -static void top_irq_handle(struct device *dev) +static void top_irq_handle(const struct device *dev) { NRF_RTC_Type *rtc = get_nrfx_config(dev)->rtc; counter_top_callback_t cb = get_dev_data(dev)->top_cb; @@ -597,7 +601,7 @@ static void top_irq_handle(struct device *dev) } } -static void alarm_irq_handle(struct device *dev, u32_t chan) +static void alarm_irq_handle(const struct device *dev, u32_t chan) { NRF_RTC_Type *rtc = get_nrfx_config(dev)->rtc; nrf_rtc_event_t evt = RTC_CHANNEL_EVENT_ADDR(chan); @@ -631,7 +635,7 @@ static void alarm_irq_handle(struct device *dev, u32_t chan) } } -static void irq_handler(struct device *dev) +static void irq_handler(const struct device *dev) { top_irq_handle(dev); @@ -668,7 +672,7 @@ static const struct counter_driver_api counter_nrfx_driver_api = { RTC_PRESCALER_PRESCALER_Msk, \ "RTC prescaler out of range"); \ DEVICE_DECLARE(rtc_##idx); \ - static int counter_##idx##_init(struct device *dev) \ + static int counter_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(RTC(idx)), DT_IRQ(RTC(idx), priority), \ irq_handler, DEVICE_GET(rtc_##idx), 0); \ diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c index a8cf16e9f939..0c053044ae49 100644 --- a/drivers/counter/counter_nrfx_timer.c +++ b/drivers/counter/counter_nrfx_timer.c @@ -50,19 +50,19 @@ struct counter_timer_config { nrf_timer_frequency_t freq; }; -static inline struct counter_nrfx_data *get_dev_data(struct device *dev) +static inline struct counter_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline const struct counter_nrfx_config *get_nrfx_config( - struct device *dev) + const struct device *dev) { return CONTAINER_OF(dev->config_info, struct counter_nrfx_config, info); } -static int start(struct device *dev) +static int start(const struct device *dev) { nrf_timer_task_trigger(get_nrfx_config(dev)->timer, NRF_TIMER_TASK_START); @@ -70,7 +70,7 @@ static int start(struct device *dev) return 0; } -static int stop(struct device *dev) +static int stop(const struct device *dev) { nrf_timer_task_trigger(get_nrfx_config(dev)->timer, NRF_TIMER_TASK_SHUTDOWN); @@ -78,17 +78,17 @@ static int stop(struct device *dev) return 0; } -static u32_t get_top_value(struct device *dev) +static u32_t get_top_value(const struct device *dev) { return nrf_timer_cc_get(get_nrfx_config(dev)->timer, TOP_CH); } -static u32_t get_max_relative_alarm(struct device *dev) +static u32_t get_max_relative_alarm(const struct device *dev) { return get_top_value(dev); } -static u32_t read(struct device *dev) +static u32_t read(const struct device *dev) { NRF_TIMER_Type *timer = get_nrfx_config(dev)->timer; @@ -98,7 +98,7 @@ static u32_t read(struct device *dev) return nrf_timer_cc_get(timer, COUNTER_READ_CC); } -static int get_value(struct device *dev, u32_t *ticks) +static int get_value(const struct device *dev, u32_t *ticks) { *ticks = read(dev); return 0; @@ -133,13 +133,13 @@ static u32_t ticks_sub(u32_t val, u32_t old, u32_t top) return (val >= old) ? (val - old) : val + top + 1 - old; } -static void set_cc_int_pending(struct device *dev, u8_t chan) +static void set_cc_int_pending(const struct device *dev, u8_t chan) { atomic_or(&get_dev_data(dev)->cc_int_pending, BIT(chan)); NRFX_IRQ_PENDING_SET(NRFX_IRQ_NUMBER_GET(get_nrfx_config(dev)->timer)); } -static int set_cc(struct device *dev, u8_t id, u32_t val, u32_t flags) +static int set_cc(const struct device *dev, u8_t id, u32_t val, u32_t flags) { __ASSERT_NO_MSG(get_dev_data(dev)->guard_period < get_top_value(dev)); bool absolute = flags & COUNTER_ALARM_CFG_ABSOLUTE; @@ -212,7 +212,7 @@ static int set_cc(struct device *dev, u8_t id, u32_t val, u32_t flags) return err; } -static int set_alarm(struct device *dev, u8_t chan, +static int set_alarm(const struct device *dev, u8_t chan, const struct counter_alarm_cfg *alarm_cfg) { const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); @@ -232,7 +232,7 @@ static int set_alarm(struct device *dev, u8_t chan, return set_cc(dev, chan, alarm_cfg->ticks, alarm_cfg->flags); } -static int cancel_alarm(struct device *dev, u8_t chan_id) +static int cancel_alarm(const struct device *dev, u8_t chan_id) { const struct counter_nrfx_config *config = get_nrfx_config(dev); u32_t int_mask = nrf_timer_compare_int_get(ID_TO_CC(chan_id)); @@ -243,7 +243,8 @@ static int cancel_alarm(struct device *dev, u8_t chan_id) return 0; } -static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg) +static int set_top_value(const struct device *dev, + const struct counter_top_cfg *cfg) { const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev); NRF_TIMER_Type *timer = get_nrfx_config(dev)->timer; @@ -282,12 +283,12 @@ static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg) return err; } -static u32_t get_pending_int(struct device *dev) +static u32_t get_pending_int(const struct device *dev) { return 0; } -static int init_timer(struct device *dev, +static int init_timer(const struct device *dev, const struct counter_timer_config *config) { NRF_TIMER_Type *reg = get_nrfx_config(dev)->timer; @@ -303,12 +304,13 @@ static int init_timer(struct device *dev, return 0; } -static u32_t get_guard_period(struct device *dev, u32_t flags) +static u32_t get_guard_period(const struct device *dev, u32_t flags) { return get_dev_data(dev)->guard_period; } -static int set_guard_period(struct device *dev, u32_t guard, u32_t flags) +static int set_guard_period(const struct device *dev, u32_t guard, + u32_t flags) { __ASSERT_NO_MSG(guard < get_top_value(dev)); @@ -316,7 +318,7 @@ static int set_guard_period(struct device *dev, u32_t guard, u32_t flags) return 0; } -static void top_irq_handle(struct device *dev) +static void top_irq_handle(const struct device *dev) { NRF_TIMER_Type *reg = get_nrfx_config(dev)->timer; counter_top_callback_t cb = get_dev_data(dev)->top_cb; @@ -329,7 +331,7 @@ static void top_irq_handle(struct device *dev) } } -static void alarm_irq_handle(struct device *dev, u32_t id) +static void alarm_irq_handle(const struct device *dev, u32_t id) { u32_t cc = ID_TO_CC(id); NRF_TIMER_Type *reg = get_nrfx_config(dev)->timer; @@ -359,7 +361,7 @@ static void alarm_irq_handle(struct device *dev, u32_t id) } } -static void irq_handler(struct device *dev) +static void irq_handler(const struct device *dev) { top_irq_handle(dev); @@ -396,7 +398,7 @@ static const struct counter_driver_api counter_nrfx_driver_api = { TIMER_PRESCALER_PRESCALER_Msk, \ "TIMER prescaler out of range"); \ DEVICE_DECLARE(timer_##idx); \ - static int counter_##idx##_init(struct device *dev) \ + static int counter_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(TIMER(idx)), DT_IRQ(TIMER(idx), priority), \ irq_handler, DEVICE_GET(timer_##idx), 0); \ diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c index c7abd983ddf1..db5add3b4cdd 100644 --- a/drivers/counter/counter_sam0_tc32.c +++ b/drivers/counter/counter_sam0_tc32.c @@ -38,7 +38,7 @@ struct counter_sam0_tc32_config { #endif u16_t prescaler; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; #define DEV_CFG(dev) ((const struct counter_sam0_tc32_config *const) \ @@ -76,7 +76,7 @@ static void read_synchronize_count(TcCount32 *regs) #endif } -static int counter_sam0_tc32_start(struct device *dev) +static int counter_sam0_tc32_start(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -90,7 +90,7 @@ static int counter_sam0_tc32_start(struct device *dev) return 0; } -static int counter_sam0_tc32_stop(struct device *dev) +static int counter_sam0_tc32_stop(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -106,7 +106,7 @@ static int counter_sam0_tc32_stop(struct device *dev) return 0; } -static u32_t counter_sam0_tc32_read(struct device *dev) +static u32_t counter_sam0_tc32_read(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -115,13 +115,14 @@ static u32_t counter_sam0_tc32_read(struct device *dev) return tc->COUNT.reg; } -static int counter_sam0_tc32_get_value(struct device *dev, u32_t *ticks) +static int counter_sam0_tc32_get_value(const struct device *dev, u32_t *ticks) { *ticks = counter_sam0_tc32_read(dev); return 0; } -static void counter_sam0_tc32_relative_alarm(struct device *dev, u32_t ticks) +static void counter_sam0_tc32_relative_alarm(const struct device *dev, + u32_t ticks) { struct counter_sam0_tc32_data *data = DEV_DATA(dev); const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); @@ -179,7 +180,7 @@ static void counter_sam0_tc32_relative_alarm(struct device *dev, u32_t ticks) tc->INTENSET.reg = TC_INTFLAG_MC1; } -static int counter_sam0_tc32_set_alarm(struct device *dev, u8_t chan_id, +static int counter_sam0_tc32_set_alarm(const struct device *dev, u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { struct counter_sam0_tc32_data *data = DEV_DATA(dev); @@ -216,7 +217,8 @@ static int counter_sam0_tc32_set_alarm(struct device *dev, u8_t chan_id, return 0; } -static int counter_sam0_tc32_cancel_alarm(struct device *dev, u8_t chan_id) +static int counter_sam0_tc32_cancel_alarm(const struct device *dev, + u8_t chan_id) { struct counter_sam0_tc32_data *data = DEV_DATA(dev); const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); @@ -234,8 +236,8 @@ static int counter_sam0_tc32_cancel_alarm(struct device *dev, u8_t chan_id) return 0; } -static int counter_sam0_tc32_set_top_value(struct device *dev, - const struct counter_top_cfg *top_cfg) +static int counter_sam0_tc32_set_top_value(const struct device *dev, + const struct counter_top_cfg *top_cfg) { struct counter_sam0_tc32_data *data = DEV_DATA(dev); const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); @@ -280,7 +282,7 @@ static int counter_sam0_tc32_set_top_value(struct device *dev, return err; } -static u32_t counter_sam0_tc32_get_pending_int(struct device *dev) +static u32_t counter_sam0_tc32_get_pending_int(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -288,7 +290,7 @@ static u32_t counter_sam0_tc32_get_pending_int(struct device *dev) return tc->INTFLAG.reg & (TC_INTFLAG_MC0 | TC_INTFLAG_MC1); } -static u32_t counter_sam0_tc32_get_top_value(struct device *dev) +static u32_t counter_sam0_tc32_get_top_value(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -301,14 +303,14 @@ static u32_t counter_sam0_tc32_get_top_value(struct device *dev) return tc->CC[0].reg; } -static u32_t counter_sam0_tc32_get_max_relative_alarm(struct device *dev) +static u32_t counter_sam0_tc32_get_max_relative_alarm(const struct device *dev) { return counter_sam0_tc32_get_top_value(dev) - 1; } static void counter_sam0_tc32_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct counter_sam0_tc32_data *data = DEV_DATA(dev); const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -335,7 +337,7 @@ static void counter_sam0_tc32_isr(void *arg) } } -static int counter_sam0_tc32_initialize(struct device *dev) +static int counter_sam0_tc32_initialize(const struct device *dev) { const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev); TcCount32 *tc = cfg->regs; @@ -419,7 +421,7 @@ static const struct counter_driver_api counter_sam0_tc32_driver_api = { (DT_INST_PROP(n, prescaler)), (1)) #define COUNTER_SAM0_TC32_DEVICE(n) \ - static void counter_sam0_tc32_config_##n(struct device *dev); \ + static void counter_sam0_tc32_config_##n(const struct device *dev); \ static const struct counter_sam0_tc32_config \ \ counter_sam0_tc32_dev_config_##n = { \ @@ -448,7 +450,7 @@ static const struct counter_driver_api counter_sam0_tc32_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &counter_sam0_tc32_driver_api); \ \ - static void counter_sam0_tc32_config_##n(struct device *dev) \ + static void counter_sam0_tc32_config_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c index 5ef70bb3fac0..cbdf7ca600b8 100644 --- a/drivers/counter/maxim_ds3231.c +++ b/drivers/counter/maxim_ds3231.c @@ -77,9 +77,9 @@ struct ds3231_config { }; struct ds3231_data { - struct device *ds3231; - struct device *i2c; - struct device *isw; + const struct device *ds3231; + const struct device *i2c; + const struct device *isw; struct register_map registers; struct k_sem lock; @@ -144,7 +144,7 @@ struct ds3231_data { * * Caches and returns the value with the changes applied. */ -static int sc_ctrl(struct device *dev, +static int sc_ctrl(const struct device *dev, u8_t set, u8_t clear) { @@ -168,7 +168,7 @@ static int sc_ctrl(struct device *dev, return rc; } -int maxim_ds3231_ctrl_update(struct device *dev, +int maxim_ds3231_ctrl_update(const struct device *dev, u8_t set_bits, u8_t clear_bits) { @@ -194,7 +194,7 @@ int maxim_ds3231_ctrl_update(struct device *dev, * Returns the value as originally read (disregarding the effect of * clears and sets). */ -static inline int rsc_stat(struct device *dev, +static inline int rsc_stat(const struct device *dev, u8_t set, u8_t clear) { @@ -226,7 +226,7 @@ static inline int rsc_stat(struct device *dev, return rc; } -int maxim_ds3231_stat_update(struct device *dev, +int maxim_ds3231_stat_update(const struct device *dev, u8_t set_bits, u8_t clear_bits) { @@ -245,7 +245,7 @@ int maxim_ds3231_stat_update(struct device *dev, * Look for current users of the interrupt/square-wave signal and * enable monitoring iff at least one consumer is active. */ -static void validate_isw_monitoring(struct device *dev) +static void validate_isw_monitoring(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct ds3231_config *cfg = dev->config_info; @@ -446,7 +446,7 @@ static u32_t decode_rtc(struct ds3231_data *data) return data->rtc_registers; } -static int update_registers(struct device *dev) +static int update_registers(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct ds3231_config *cfg = dev->config_info; @@ -467,7 +467,7 @@ static int update_registers(struct device *dev) return 0; } -int maxim_ds3231_get_alarm(struct device *dev, +int maxim_ds3231_get_alarm(const struct device *dev, u8_t id, struct maxim_ds3231_alarm *cp) { @@ -514,7 +514,7 @@ int maxim_ds3231_get_alarm(struct device *dev, return rv; } -static int cancel_alarm(struct device *dev, +static int cancel_alarm(const struct device *dev, u8_t id) { struct ds3231_data *data = dev->driver_data; @@ -525,7 +525,7 @@ static int cancel_alarm(struct device *dev, return sc_ctrl(dev, 0, MAXIM_DS3231_ALARM1 << id); } -static int ds3231_counter_cancel_alarm(struct device *dev, +static int ds3231_counter_cancel_alarm(const struct device *dev, u8_t id) { struct ds3231_data *data = dev->driver_data; @@ -552,7 +552,7 @@ static int ds3231_counter_cancel_alarm(struct device *dev, return rv; } -static int set_alarm(struct device *dev, +static int set_alarm(const struct device *dev, u8_t id, const struct maxim_ds3231_alarm *cp) { @@ -601,7 +601,7 @@ static int set_alarm(struct device *dev, return rc; } -int maxim_ds3231_set_alarm(struct device *dev, +int maxim_ds3231_set_alarm(const struct device *dev, u8_t id, const struct maxim_ds3231_alarm *cp) { @@ -616,7 +616,7 @@ int maxim_ds3231_set_alarm(struct device *dev, return rc; } -int maxim_ds3231_check_alarms(struct device *dev) +int maxim_ds3231_check_alarms(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct register_map *rp = &data->registers; @@ -638,7 +638,7 @@ int maxim_ds3231_check_alarms(struct device *dev) return rv; } -static int check_handled_alarms(struct device *dev) +static int check_handled_alarms(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct register_map *rp = &data->registers; @@ -659,7 +659,7 @@ static int check_handled_alarms(struct device *dev) return rv; } -static void counter_alarm_forwarder(struct device *dev, +static void counter_alarm_forwarder(const struct device *dev, u8_t id, u32_t syncclock, void *ud) @@ -671,7 +671,7 @@ static void alarm_worker(struct k_work *work) { struct ds3231_data *data = CONTAINER_OF(work, struct ds3231_data, alarm_work); - struct device *ds3231 = data->ds3231; + const struct device *ds3231 = data->ds3231; const struct ds3231_config *cfg = ds3231->config_info; k_sem_take(&data->lock, K_FOREVER); @@ -747,7 +747,7 @@ static void sqw_worker(struct k_work *work) syncclock - data->isw_syncclock); } -static int read_time(struct device *dev, +static int read_time(const struct device *dev, time_t *time) { struct ds3231_data *data = dev->driver_data; @@ -765,7 +765,7 @@ static int read_time(struct device *dev, return rc; } -static int ds3231_counter_get_value(struct device *dev, +static int ds3231_counter_get_value(const struct device *dev, u32_t *ticks) { struct ds3231_data *data = dev->driver_data; @@ -784,7 +784,7 @@ static int ds3231_counter_get_value(struct device *dev, return rc; } -static void sync_finish(struct device *dev, +static void sync_finish(const struct device *dev, int rc) { struct ds3231_data *data = dev->driver_data; @@ -816,7 +816,7 @@ static void sync_finish(struct device *dev, } } -static void sync_prep_read(struct device *dev) +static void sync_prep_read(const struct device *dev) { struct ds3231_data *data = dev->driver_data; int rc = sc_ctrl(dev, 0U, MAXIM_DS3231_REG_CTRL_INTCN @@ -830,7 +830,7 @@ static void sync_prep_read(struct device *dev) validate_isw_monitoring(dev); } -static void sync_finish_read(struct device *dev) +static void sync_finish_read(const struct device *dev) { struct ds3231_data *data = dev->driver_data; time_t time = 0; @@ -851,7 +851,7 @@ static void sync_timer_handler(struct k_timer *tmr) k_work_submit(&data->sync_work); } -static void sync_prep_write(struct device *dev) +static void sync_prep_write(const struct device *dev) { struct ds3231_data *data = dev->driver_data; u32_t syncclock = maxim_ds3231_read_syncclock(dev); @@ -883,7 +883,7 @@ static void sync_prep_write(struct device *dev) LOG_INF("sync %u in %u ms after %u", (u32_t)when, rem_ms, syncclock); } -static void sync_finish_write(struct device *dev) +static void sync_finish_write(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct ds3231_config *cfg = dev->config_info; @@ -967,7 +967,7 @@ static void sync_worker(struct k_work *work) } } -static void isw_gpio_callback(struct device *port, +static void isw_gpio_callback(const struct device *port, struct gpio_callback *cb, u32_t pins) { @@ -984,7 +984,7 @@ static void isw_gpio_callback(struct device *port, } } -int z_impl_maxim_ds3231_get_syncpoint(struct device *dev, +int z_impl_maxim_ds3231_get_syncpoint(const struct device *dev, struct maxim_ds3231_syncpoint *syncpoint) { struct ds3231_data *data = dev->driver_data; @@ -1004,7 +1004,7 @@ int z_impl_maxim_ds3231_get_syncpoint(struct device *dev, return rv; } -int maxim_ds3231_synchronize(struct device *dev, +int maxim_ds3231_synchronize(const struct device *dev, struct sys_notify *notify) { struct ds3231_data *data = dev->driver_data; @@ -1042,7 +1042,7 @@ int maxim_ds3231_synchronize(struct device *dev, return rv; } -int z_impl_maxim_ds3231_req_syncpoint(struct device *dev, +int z_impl_maxim_ds3231_req_syncpoint(const struct device *dev, struct k_poll_signal *sig) { struct ds3231_data *data = dev->driver_data; @@ -1075,7 +1075,7 @@ int z_impl_maxim_ds3231_req_syncpoint(struct device *dev, return rv; } -int maxim_ds3231_set(struct device *dev, +int maxim_ds3231_set(const struct device *dev, const struct maxim_ds3231_syncpoint *syncpoint, struct sys_notify *notify) { @@ -1115,11 +1115,11 @@ int maxim_ds3231_set(struct device *dev, return rv; } -static int ds3231_init(struct device *dev) +static int ds3231_init(const struct device *dev) { struct ds3231_data *data = dev->driver_data; const struct ds3231_config *cfg = dev->config_info; - struct device *i2c = device_get_binding(cfg->bus_name); + const struct device *i2c = device_get_binding(cfg->bus_name); int rc; /* Initialize and take the lock */ @@ -1155,7 +1155,7 @@ static int ds3231_init(struct device *dev) */ if (cfg->isw_gpios.ctrl != NULL) { - struct device *gpio = device_get_binding(cfg->isw_gpios.ctrl); + const struct device *gpio = device_get_binding(cfg->isw_gpios.ctrl); if (gpio == NULL) { LOG_WRN("Failed to get INTn/SQW GPIO %s", @@ -1199,17 +1199,17 @@ static int ds3231_init(struct device *dev) return rc; } -static int ds3231_counter_start(struct device *dev) +static int ds3231_counter_start(const struct device *dev) { return -EALREADY; } -static int ds3231_counter_stop(struct device *dev) +static int ds3231_counter_stop(const struct device *dev) { return -ENOTSUP; } -int ds3231_counter_set_alarm(struct device *dev, +int ds3231_counter_set_alarm(const struct device *dev, u8_t id, const struct counter_alarm_cfg *alarm_cfg) { @@ -1265,23 +1265,23 @@ int ds3231_counter_set_alarm(struct device *dev, return rc; } -static u32_t ds3231_counter_get_top_value(struct device *dev) +static u32_t ds3231_counter_get_top_value(const struct device *dev) { return UINT32_MAX; } -static u32_t ds3231_counter_get_pending_int(struct device *dev) +static u32_t ds3231_counter_get_pending_int(const struct device *dev) { return 0; } -static int ds3231_counter_set_top_value(struct device *dev, +static int ds3231_counter_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { return -ENOTSUP; } -static u32_t ds3231_counter_get_max_relative_alarm(struct device *dev) +static u32_t ds3231_counter_get_max_relative_alarm(const struct device *dev) { return UINT32_MAX; } @@ -1333,7 +1333,7 @@ DEVICE_AND_API_INIT(ds3231_0, DT_INST_LABEL(0), #include -int z_vrfy_maxim_ds3231_get_syncpoint(struct device *dev, +int z_vrfy_maxim_ds3231_get_syncpoint(const struct device *dev, struct maxim_ds3231_syncpoint *syncpoint) { struct maxim_ds3231_syncpoint value; @@ -1353,7 +1353,7 @@ int z_vrfy_maxim_ds3231_get_syncpoint(struct device *dev, #include -int z_vrfy_maxim_ds3231_req_syncpoint(struct device *dev, +int z_vrfy_maxim_ds3231_req_syncpoint(const struct device *dev, struct k_poll_signal *sig) { Z_OOPS(Z_SYSCALL_SPECIFIC_DRIVER(dev, K_OBJ_DRIVER_COUNTER, &ds3231_api)); diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c index 6e7dd4794f47..7aaa0f279388 100644 --- a/drivers/counter/timer_dtmr_cmsdk_apb.c +++ b/drivers/counter/timer_dtmr_cmsdk_apb.c @@ -15,7 +15,7 @@ #include "dualtimer_cmsdk_apb.h" -typedef void (*dtimer_config_func_t)(struct device *dev); +typedef void (*dtimer_config_func_t)(const struct device *dev); struct dtmr_cmsdk_apb_cfg { struct counter_config_info info; @@ -35,7 +35,7 @@ struct dtmr_cmsdk_apb_dev_data { u32_t load; }; -static int dtmr_cmsdk_apb_start(struct device *dev) +static int dtmr_cmsdk_apb_start(const struct device *dev) { const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -50,7 +50,7 @@ static int dtmr_cmsdk_apb_start(struct device *dev) return 0; } -static int dtmr_cmsdk_apb_stop(struct device *dev) +static int dtmr_cmsdk_apb_stop(const struct device *dev) { const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -61,7 +61,7 @@ static int dtmr_cmsdk_apb_stop(struct device *dev) return 0; } -static int dtmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks) +static int dtmr_cmsdk_apb_get_value(const struct device *dev, u32_t *ticks) { const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -71,7 +71,7 @@ static int dtmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks) return 0; } -static int dtmr_cmsdk_apb_set_top_value(struct device *dev, +static int dtmr_cmsdk_apb_set_top_value(const struct device *dev, const struct counter_top_cfg *top_cfg) { const struct dtmr_cmsdk_apb_cfg * const cfg = @@ -106,7 +106,7 @@ static int dtmr_cmsdk_apb_set_top_value(struct device *dev, return 0; } -static u32_t dtmr_cmsdk_apb_get_top_value(struct device *dev) +static u32_t dtmr_cmsdk_apb_get_top_value(const struct device *dev) { struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; @@ -115,7 +115,7 @@ static u32_t dtmr_cmsdk_apb_get_top_value(struct device *dev) return ticks; } -static u32_t dtmr_cmsdk_apb_get_pending_int(struct device *dev) +static u32_t dtmr_cmsdk_apb_get_pending_int(const struct device *dev) { const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -134,7 +134,7 @@ static const struct counter_driver_api dtmr_cmsdk_apb_api = { static void dtmr_cmsdk_apb_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -145,14 +145,14 @@ static void dtmr_cmsdk_apb_isr(void *arg) } } -static int dtmr_cmsdk_apb_init(struct device *dev) +static int dtmr_cmsdk_apb_init(const struct device *dev) { const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config_info; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(CONFIG_ARM_CLOCK_CONTROL_DEV_NAME); #ifdef CONFIG_SOC_SERIES_BEETLE @@ -171,7 +171,7 @@ static int dtmr_cmsdk_apb_init(struct device *dev) ((volatile struct dualtimer_cmsdk_apb *)DT_INST_REG_ADDR(inst)) #define DTIMER_CMSDK_INIT(inst) \ - static void dtimer_cmsdk_apb_config_##inst(struct device *dev); \ + static void dtimer_cmsdk_apb_config_##inst(const struct device *dev); \ \ static const struct dtmr_cmsdk_apb_cfg \ dtmr_cmsdk_apb_cfg_##inst = { \ @@ -207,7 +207,7 @@ static int dtmr_cmsdk_apb_init(struct device *dev) CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &dtmr_cmsdk_apb_api); \ \ - static void dtimer_cmsdk_apb_config_##inst(struct device *dev) \ + static void dtimer_cmsdk_apb_config_##inst(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(inst), \ DT_INST_IRQ(inst, priority), \ diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c index 45cdfc489471..d94a697d497a 100644 --- a/drivers/counter/timer_tmr_cmsdk_apb.c +++ b/drivers/counter/timer_tmr_cmsdk_apb.c @@ -15,7 +15,7 @@ #include "timer_cmsdk_apb.h" -typedef void (*timer_config_func_t)(struct device *dev); +typedef void (*timer_config_func_t)(const struct device *dev); struct tmr_cmsdk_apb_cfg { struct counter_config_info info; @@ -36,7 +36,7 @@ struct tmr_cmsdk_apb_dev_data { u32_t load; }; -static int tmr_cmsdk_apb_start(struct device *dev) +static int tmr_cmsdk_apb_start(const struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -50,7 +50,7 @@ static int tmr_cmsdk_apb_start(struct device *dev) return 0; } -static int tmr_cmsdk_apb_stop(struct device *dev) +static int tmr_cmsdk_apb_stop(const struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -60,7 +60,7 @@ static int tmr_cmsdk_apb_stop(struct device *dev) return 0; } -static int tmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks) +static int tmr_cmsdk_apb_get_value(const struct device *dev, u32_t *ticks) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -71,7 +71,7 @@ static int tmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks) return 0; } -static int tmr_cmsdk_apb_set_top_value(struct device *dev, +static int tmr_cmsdk_apb_set_top_value(const struct device *dev, const struct counter_top_cfg *top_cfg) { const struct tmr_cmsdk_apb_cfg * const cfg = @@ -101,7 +101,7 @@ static int tmr_cmsdk_apb_set_top_value(struct device *dev, return 0; } -static u32_t tmr_cmsdk_apb_get_top_value(struct device *dev) +static u32_t tmr_cmsdk_apb_get_top_value(const struct device *dev) { struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; @@ -110,7 +110,7 @@ static u32_t tmr_cmsdk_apb_get_top_value(struct device *dev) return ticks; } -static u32_t tmr_cmsdk_apb_get_pending_int(struct device *dev) +static u32_t tmr_cmsdk_apb_get_pending_int(const struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -129,7 +129,7 @@ static const struct counter_driver_api tmr_cmsdk_apb_api = { static void tmr_cmsdk_apb_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; @@ -140,14 +140,14 @@ static void tmr_cmsdk_apb_isr(void *arg) } } -static int tmr_cmsdk_apb_init(struct device *dev) +static int tmr_cmsdk_apb_init(const struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config_info; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(CONFIG_ARM_CLOCK_CONTROL_DEV_NAME); #ifdef CONFIG_SOC_SERIES_BEETLE @@ -163,7 +163,7 @@ static int tmr_cmsdk_apb_init(struct device *dev) } #define TIMER_CMSDK_INIT(inst) \ - static void timer_cmsdk_apb_config_##inst(struct device *dev); \ + static void timer_cmsdk_apb_config_##inst(const struct device *dev); \ \ static const struct tmr_cmsdk_apb_cfg tmr_cmsdk_apb_cfg_##inst = { \ .info = { \ @@ -194,7 +194,7 @@ static int tmr_cmsdk_apb_init(struct device *dev) CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &tmr_cmsdk_apb_api); \ \ - static void timer_cmsdk_apb_config_##inst(struct device *dev) \ + static void timer_cmsdk_apb_config_##inst(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(inst), \ DT_INST_IRQ(inst, priority), \ diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c index 9b955ab3ecaa..8445cc1d6ad3 100644 --- a/drivers/crypto/crypto_ataes132a.c +++ b/drivers/crypto/crypto_ataes132a.c @@ -37,7 +37,7 @@ static void ataes132a_init_states(void) } } -static int ataes132a_send_command(struct device *dev, u8_t opcode, +static int ataes132a_send_command(const struct device *dev, u8_t opcode, u8_t mode, u8_t *params, u8_t nparams, u8_t *response, u8_t *nresponse) @@ -164,7 +164,7 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode, return 0; } -int ataes132a_init(struct device *dev) +int ataes132a_init(const struct device *dev) { struct ataes132a_device_data *ataes132a = dev->driver_data; const struct ataes132a_device_config *cfg = dev->config_info; @@ -189,7 +189,7 @@ int ataes132a_init(struct device *dev) return 0; } -int ataes132a_aes_ccm_decrypt(struct device *dev, +int ataes132a_aes_ccm_decrypt(const struct device *dev, u8_t key_id, struct ataes132a_mac_mode *mac_mode, struct ataes132a_mac_packet *mac_packet, @@ -389,7 +389,7 @@ int ataes132a_aes_ccm_decrypt(struct device *dev, return 0; } -int ataes132a_aes_ccm_encrypt(struct device *dev, +int ataes132a_aes_ccm_encrypt(const struct device *dev, u8_t key_id, struct ataes132a_mac_mode *mac_mode, struct cipher_aead_pkt *aead_op, @@ -577,7 +577,7 @@ int ataes132a_aes_ccm_encrypt(struct device *dev, return 0; } -int ataes132a_aes_ecb_block(struct device *dev, +int ataes132a_aes_ecb_block(const struct device *dev, u8_t key_id, struct cipher_pkt *pkt) { @@ -668,7 +668,7 @@ int ataes132a_aes_ecb_block(struct device *dev, static int do_ccm_encrypt_mac(struct cipher_ctx *ctx, struct cipher_aead_pkt *aead_op, u8_t *nonce) { - struct device *dev = ctx->device; + const struct device *dev = ctx->device; struct ataes132a_driver_state *state = ctx->drv_sessn_state; struct ataes132a_mac_mode mac_mode; u8_t key_id; @@ -717,7 +717,7 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx, static int do_ccm_decrypt_auth(struct cipher_ctx *ctx, struct cipher_aead_pkt *aead_op, u8_t *nonce) { - struct device *dev = ctx->device; + const struct device *dev = ctx->device; struct ataes132a_driver_state *state = ctx->drv_sessn_state; struct ataes132a_mac_mode mac_mode; u8_t key_id; @@ -762,7 +762,7 @@ static int do_ccm_decrypt_auth(struct cipher_ctx *ctx, static int do_block(struct cipher_ctx *ctx, struct cipher_pkt *pkt) { - struct device *dev = ctx->device; + const struct device *dev = ctx->device; struct ataes132a_driver_state *state = ctx->drv_sessn_state; u8_t key_id; @@ -780,7 +780,7 @@ static int do_block(struct cipher_ctx *ctx, struct cipher_pkt *pkt) return ataes132a_aes_ecb_block(dev, key_id, pkt); } -static int ataes132a_session_free(struct device *dev, +static int ataes132a_session_free(const struct device *dev, struct cipher_ctx *session) { struct ataes132a_driver_state *state = session->drv_sessn_state; @@ -792,7 +792,8 @@ static int ataes132a_session_free(struct device *dev, return 0; } -static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx, +static int ataes132a_session_setup(const struct device *dev, + struct cipher_ctx *ctx, enum cipher_algo algo, enum cipher_mode mode, enum cipher_op op_type) { @@ -876,7 +877,7 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx, return 0; } -static int ataes132a_query_caps(struct device *dev) +static int ataes132a_query_caps(const struct device *dev) { return (CAP_OPAQUE_KEY_HNDL | CAP_SEPARATE_IO_BUFS | CAP_SYNC_OPS | CAP_AUTONONCE); diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h index ef7e21d2a23c..c47c5de07eb9 100644 --- a/drivers/crypto/crypto_ataes132a_priv.h +++ b/drivers/crypto/crypto_ataes132a_priv.h @@ -136,7 +136,7 @@ void ataes132a_atmel_crc(u8_t *input, u8_t length, *(u16_t *)output = crc << 8 | crc >> 8; } -static inline int burst_write_i2c(struct device *dev, u16_t dev_addr, +static inline int burst_write_i2c(const struct device *dev, u16_t dev_addr, u16_t start_addr, u8_t *buf, u8_t num_bytes) { @@ -158,7 +158,7 @@ static inline int burst_write_i2c(struct device *dev, u16_t dev_addr, } -static inline int burst_read_i2c(struct device *dev, u16_t dev_addr, +static inline int burst_read_i2c(const struct device *dev, u16_t dev_addr, u16_t start_addr, u8_t *buf, u8_t num_bytes) { @@ -179,13 +179,13 @@ static inline int burst_read_i2c(struct device *dev, u16_t dev_addr, return api->transfer(dev, msg, 2, dev_addr); } -static inline int read_reg_i2c(struct device *dev, u16_t dev_addr, +static inline int read_reg_i2c(const struct device *dev, u16_t dev_addr, u16_t reg_addr, u8_t *value) { return burst_read_i2c(dev, dev_addr, reg_addr, value, 1); } -static inline int write_reg_i2c(struct device *dev, u16_t dev_addr, +static inline int write_reg_i2c(const struct device *dev, u16_t dev_addr, u16_t reg_addr, u8_t value) { return burst_write_i2c(dev, dev_addr, reg_addr, &value, 1); @@ -198,7 +198,7 @@ struct ataes132a_device_config { }; struct ataes132a_device_data { - struct device *i2c; + const struct device *i2c; u8_t command_buffer[64]; struct k_sem device_sem; }; @@ -252,7 +252,7 @@ struct ataes132a_mac_mode { * * @return Returns 0 in case of success and an error code otherwise. */ -int ataes132a_init(struct device *i2c_dev); +int ataes132a_init(const struct device *i2c_dev); /** * @brief ATAES132A CCM decrypt function @@ -311,7 +311,7 @@ int ataes132a_init(struct device *i2c_dev); * * @return Returns 0 in case of success and an error code otherwise. */ -int ataes132a_aes_ccm_decrypt(struct device *i2c_dev, +int ataes132a_aes_ccm_decrypt(const struct device *i2c_dev, u8_t key_id, struct ataes132a_mac_mode *mac_mode, struct ataes132a_mac_packet *mac_packet, @@ -359,7 +359,7 @@ int ataes132a_aes_ccm_decrypt(struct device *i2c_dev, * * @return Returns 0 in case of success and an error code otherwise. */ -int ataes132a_aes_ccm_encrypt(struct device *i2c_dev, +int ataes132a_aes_ccm_encrypt(const struct device *i2c_dev, u8_t key_id, struct ataes132a_mac_mode *mac_mode, struct cipher_aead_pkt *aead_op, @@ -387,7 +387,7 @@ int ataes132a_aes_ccm_encrypt(struct device *i2c_dev, * * @return Returns 0 in case of success and an error code otherwise. */ -int ataes132a_aes_ecb_block(struct device *i2c_dev, +int ataes132a_aes_ecb_block(const struct device *i2c_dev, u8_t key_id, struct cipher_pkt *pkt); diff --git a/drivers/crypto/crypto_mtls_shim.c b/drivers/crypto/crypto_mtls_shim.c index 0c14c74c8d5b..a67b6e59aa45 100644 --- a/drivers/crypto/crypto_mtls_shim.c +++ b/drivers/crypto/crypto_mtls_shim.c @@ -300,9 +300,10 @@ static int mtls_get_unused_session_index(void) return -1; } -static int mtls_session_setup(struct device *dev, struct cipher_ctx *ctx, - enum cipher_algo algo, enum cipher_mode mode, - enum cipher_op op_type) +static int mtls_session_setup(const struct device *dev, + struct cipher_ctx *ctx, + enum cipher_algo algo, enum cipher_mode mode, + enum cipher_op op_type) { mbedtls_aes_context *aes_ctx; mbedtls_ccm_context *ccm_ctx; @@ -431,7 +432,7 @@ static int mtls_session_setup(struct device *dev, struct cipher_ctx *ctx, return ret; } -static int mtls_session_free(struct device *dev, struct cipher_ctx *ctx) +static int mtls_session_free(const struct device *dev, struct cipher_ctx *ctx) { struct mtls_shim_session *mtls_session = (struct mtls_shim_session *)ctx->drv_sessn_state; @@ -450,12 +451,12 @@ static int mtls_session_free(struct device *dev, struct cipher_ctx *ctx) return 0; } -static int mtls_query_caps(struct device *dev) +static int mtls_query_caps(const struct device *dev) { return MTLS_SUPPORT; } -static int mtls_shim_init(struct device *dev) +static int mtls_shim_init(const struct device *dev) { return 0; } diff --git a/drivers/crypto/crypto_nrf_ecb.c b/drivers/crypto/crypto_nrf_ecb.c index 173a7d0cb920..c312458a4f3a 100644 --- a/drivers/crypto/crypto_nrf_ecb.c +++ b/drivers/crypto/crypto_nrf_ecb.c @@ -63,7 +63,7 @@ static int do_ecb_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt) return 0; } -static int nrf_ecb_driver_init(struct device *dev) +static int nrf_ecb_driver_init(const struct device *dev) { ARG_UNUSED(dev); @@ -72,14 +72,15 @@ static int nrf_ecb_driver_init(struct device *dev) return 0; } -static int nrf_ecb_query_caps(struct device *dev) +static int nrf_ecb_query_caps(const struct device *dev) { ARG_UNUSED(dev); return (CAP_RAW_KEY | CAP_SEPARATE_IO_BUFS | CAP_SYNC_OPS); } -static int nrf_ecb_session_setup(struct device *dev, struct cipher_ctx *ctx, +static int nrf_ecb_session_setup(const struct device *dev, + struct cipher_ctx *ctx, enum cipher_algo algo, enum cipher_mode mode, enum cipher_op op_type) { @@ -118,7 +119,8 @@ static int nrf_ecb_session_setup(struct device *dev, struct cipher_ctx *ctx, return 0; } -static int nrf_ecb_session_free(struct device *dev, struct cipher_ctx *sessn) +static int nrf_ecb_session_free(const struct device *dev, + struct cipher_ctx *sessn) { ARG_UNUSED(dev); ARG_UNUSED(sessn); diff --git a/drivers/crypto/crypto_stm32.c b/drivers/crypto/crypto_stm32.c index 8df84414bd8c..45d45e768c90 100644 --- a/drivers/crypto/crypto_stm32.c +++ b/drivers/crypto/crypto_stm32.c @@ -237,7 +237,7 @@ static int crypto_stm32_ctr_decrypt(struct cipher_ctx *ctx, return ret; } -static int crypto_stm32_get_unused_session_index(struct device *dev) +static int crypto_stm32_get_unused_session_index(const struct device *dev) { int i; @@ -258,7 +258,7 @@ static int crypto_stm32_get_unused_session_index(struct device *dev) return -1; } -static int crypto_stm32_session_setup(struct device *dev, +static int crypto_stm32_session_setup(const struct device *dev, struct cipher_ctx *ctx, enum cipher_algo algo, enum cipher_mode mode, @@ -382,7 +382,7 @@ static int crypto_stm32_session_setup(struct device *dev, return 0; } -static int crypto_stm32_session_free(struct device *dev, +static int crypto_stm32_session_free(const struct device *dev, struct cipher_ctx *ctx) { int i; @@ -416,14 +416,14 @@ static int crypto_stm32_session_free(struct device *dev, return 0; } -static int crypto_stm32_query_caps(struct device *dev) +static int crypto_stm32_query_caps(const struct device *dev) { return CRYP_SUPPORT; } -static int crypto_stm32_init(struct device *dev) +static int crypto_stm32_init(const struct device *dev) { - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); struct crypto_stm32_data *data = CRYPTO_STM32_DATA(dev); const struct crypto_stm32_config *cfg = CRYPTO_STM32_CFG(dev); diff --git a/drivers/crypto/crypto_tc_shim.c b/drivers/crypto/crypto_tc_shim.c index c563417f02a8..d422a8d34434 100644 --- a/drivers/crypto/crypto_tc_shim.c +++ b/drivers/crypto/crypto_tc_shim.c @@ -190,9 +190,9 @@ static int get_unused_session(void) return i; } -static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx, - enum cipher_algo algo, enum cipher_mode mode, - enum cipher_op op_type) +static int tc_session_setup(const struct device *dev, struct cipher_ctx *ctx, + enum cipher_algo algo, enum cipher_mode mode, + enum cipher_op op_type) { struct tc_shim_drv_state *data; int idx; @@ -286,12 +286,12 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx, return 0; } -static int tc_query_caps(struct device *dev) +static int tc_query_caps(const struct device *dev) { return (CAP_RAW_KEY | CAP_SEPARATE_IO_BUFS | CAP_SYNC_OPS); } -static int tc_session_free(struct device *dev, struct cipher_ctx *sessn) +static int tc_session_free(const struct device *dev, struct cipher_ctx *sessn) { struct tc_shim_drv_state *data = sessn->drv_sessn_state; @@ -302,7 +302,7 @@ static int tc_session_free(struct device *dev, struct cipher_ctx *sessn) return 0; } -static int tc_shim_init(struct device *dev) +static int tc_shim_init(const struct device *dev) { int i; diff --git a/drivers/dac/dac_handlers.c b/drivers/dac/dac_handlers.c index be5795fd65be..743071e8a9d0 100644 --- a/drivers/dac/dac_handlers.c +++ b/drivers/dac/dac_handlers.c @@ -8,8 +8,8 @@ #include #include -static inline int z_vrfy_dac_channel_setup(struct device *dev, - const struct dac_channel_cfg *user_channel_cfg) +static inline int z_vrfy_dac_channel_setup(const struct device *dev, + const struct dac_channel_cfg *user_channel_cfg) { struct dac_channel_cfg channel_cfg; @@ -18,15 +18,17 @@ static inline int z_vrfy_dac_channel_setup(struct device *dev, (struct dac_channel_cfg *)user_channel_cfg, sizeof(struct dac_channel_cfg))); - return z_impl_dac_channel_setup((struct device *)dev, &channel_cfg); + return z_impl_dac_channel_setup((const struct device *)dev, + &channel_cfg); } #include -static inline int z_vrfy_dac_write_value(struct device *dev, - u8_t channel, u32_t value) +static inline int z_vrfy_dac_write_value(const struct device *dev, + u8_t channel, u32_t value) { Z_OOPS(Z_SYSCALL_DRIVER_DAC(dev, write_value)); - return z_impl_dac_write_value((struct device *)dev, channel, value); + return z_impl_dac_write_value((const struct device *)dev, channel, + value); } #include diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c index d5cbe620d168..0430c7245def 100644 --- a/drivers/dac/dac_mcux_dac.c +++ b/drivers/dac/dac_mcux_dac.c @@ -24,7 +24,7 @@ struct mcux_dac_data { bool configured; }; -static int mcux_dac_channel_setup(struct device *dev, +static int mcux_dac_channel_setup(const struct device *dev, const struct dac_channel_cfg *channel_cfg) { const struct mcux_dac_config *config = dev->config_info; @@ -52,7 +52,8 @@ static int mcux_dac_channel_setup(struct device *dev, return 0; } -static int mcux_dac_write_value(struct device *dev, u8_t channel, u32_t value) +static int mcux_dac_write_value(const struct device *dev, u8_t channel, + u32_t value) { const struct mcux_dac_config *config = dev->config_info; struct mcux_dac_data *data = dev->driver_data; @@ -81,7 +82,7 @@ static int mcux_dac_write_value(struct device *dev, u8_t channel, u32_t value) return 0; } -static int mcux_dac_init(struct device *dev) +static int mcux_dac_init(const struct device *dev) { return 0; } diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c index 3ae90e62c77e..d0142c427021 100644 --- a/drivers/dac/dac_mcux_dac32.c +++ b/drivers/dac/dac_mcux_dac32.c @@ -25,7 +25,7 @@ struct mcux_dac32_data { bool configured; }; -static int mcux_dac32_channel_setup(struct device *dev, +static int mcux_dac32_channel_setup(const struct device *dev, const struct dac_channel_cfg *channel_cfg) { const struct mcux_dac32_config *config = dev->config_info; @@ -54,7 +54,8 @@ static int mcux_dac32_channel_setup(struct device *dev, return 0; } -static int mcux_dac32_write_value(struct device *dev, u8_t channel, u32_t value) +static int mcux_dac32_write_value(const struct device *dev, u8_t channel, + u32_t value) { const struct mcux_dac32_config *config = dev->config_info; struct mcux_dac32_data *data = dev->driver_data; @@ -83,7 +84,7 @@ static int mcux_dac32_write_value(struct device *dev, u8_t channel, u32_t value) return 0; } -static int mcux_dac32_init(struct device *dev) +static int mcux_dac32_init(const struct device *dev) { return 0; } diff --git a/drivers/dac/dac_shell.c b/drivers/dac/dac_shell.c index 246d54f54860..f4c2331a182e 100644 --- a/drivers/dac/dac_shell.c +++ b/drivers/dac/dac_shell.c @@ -30,7 +30,7 @@ static const struct args_index args_indx = { static int cmd_setup(const struct shell *shell, size_t argc, char **argv) { struct dac_channel_cfg cfg; - struct device *dac; + const struct device *dac; int err; dac = device_get_binding(argv[args_indx.device]); @@ -53,7 +53,7 @@ static int cmd_setup(const struct shell *shell, size_t argc, char **argv) static int cmd_write_value(const struct shell *shell, size_t argc, char **argv) { - struct device *dac; + const struct device *dac; u8_t channel; u32_t value; int err; diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c index b9cadef315b1..78d95c78d738 100644 --- a/drivers/dac/dac_stm32.c +++ b/drivers/dac/dac_stm32.c @@ -50,7 +50,7 @@ struct dac_stm32_data { u8_t resolution; }; -static int dac_stm32_write_value(struct device *dev, +static int dac_stm32_write_value(const struct device *dev, u8_t channel, u32_t value) { struct dac_stm32_data *data = dev->driver_data; @@ -73,7 +73,7 @@ static int dac_stm32_write_value(struct device *dev, return 0; } -static int dac_stm32_channel_setup(struct device *dev, +static int dac_stm32_channel_setup(const struct device *dev, const struct dac_channel_cfg *channel_cfg) { struct dac_stm32_data *data = dev->driver_data; @@ -107,12 +107,12 @@ static int dac_stm32_channel_setup(struct device *dev, return 0; } -static int dac_stm32_init(struct device *dev) +static int dac_stm32_init(const struct device *dev) { const struct dac_stm32_cfg *cfg = dev->config_info; /* enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); if (clock_control_on(clk, diff --git a/drivers/display/display_dummy.c b/drivers/display/display_dummy.c index b90f98239e1b..884fc455f2fb 100644 --- a/drivers/display/display_dummy.c +++ b/drivers/display/display_dummy.c @@ -14,7 +14,7 @@ struct dummy_display_data { static struct dummy_display_data dummy_display_data; -static int dummy_display_init(struct device *dev) +static int dummy_display_init(const struct device *dev) { struct dummy_display_data *disp_data = (struct dummy_display_data *)dev->driver_data; diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c index 501a1cb41fd6..3fb443398f6f 100644 --- a/drivers/display/display_ili9340.c +++ b/drivers/display/display_ili9340.c @@ -21,10 +21,10 @@ LOG_MODULE_REGISTER(display_ili9340); struct ili9340_data { #if DT_INST_NODE_HAS_PROP(0, reset_gpios) - struct device *reset_gpio; + const struct device *reset_gpio; #endif - struct device *command_data_gpio; - struct device *spi_dev; + const struct device *command_data_gpio; + const struct device *spi_dev; struct spi_config spi_config; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control cs_ctrl; @@ -47,7 +47,7 @@ static void ili9340_exit_sleep(struct ili9340_data *data) k_sleep(K_MSEC(120)); } -static int ili9340_init(struct device *dev) +static int ili9340_init(const struct device *dev) { struct ili9340_data *data = (struct ili9340_data *)dev->driver_data; diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c index 5f3fb83aee67..319b65eb302e 100644 --- a/drivers/display/display_mcux_elcdif.c +++ b/drivers/display/display_mcux_elcdif.c @@ -25,7 +25,7 @@ K_MEM_POOL_DEFINE(mcux_elcdif_pool, struct mcux_elcdif_config { LCDIF_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); elcdif_rgb_mode_config_t rgb_mode; enum display_pixel_format pixel_format; u8_t bits_per_pixel; @@ -166,7 +166,7 @@ static void mcux_elcdif_get_capabilities(const struct device *dev, static void mcux_elcdif_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_elcdif_config *config = dev->config_info; struct mcux_elcdif_data *data = dev->driver_data; u32_t status; @@ -177,7 +177,7 @@ static void mcux_elcdif_isr(void *arg) k_sem_give(&data->sem); } -static int mcux_elcdif_init(struct device *dev) +static int mcux_elcdif_init(const struct device *dev) { const struct mcux_elcdif_config *config = dev->config_info; struct mcux_elcdif_data *data = dev->driver_data; @@ -225,7 +225,7 @@ static const struct display_driver_api mcux_elcdif_api = { .set_orientation = mcux_elcdif_set_orientation, }; -static void mcux_elcdif_config_func_1(struct device *dev); +static void mcux_elcdif_config_func_1(const struct device *dev); static struct mcux_elcdif_config mcux_elcdif_config_1 = { .base = (LCDIF_Type *) DT_INST_REG_ADDR(0), @@ -260,7 +260,7 @@ DEVICE_AND_API_INIT(mcux_elcdif_1, DT_INST_LABEL(0), POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_elcdif_api); -static void mcux_elcdif_config_func_1(struct device *dev) +static void mcux_elcdif_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c index ed657ed0e103..09b99a1d6028 100644 --- a/drivers/display/display_sdl.c +++ b/drivers/display/display_sdl.c @@ -26,7 +26,7 @@ struct sdl_display_data { static struct sdl_display_data sdl_display_data; -static int sdl_display_init(struct device *dev) +static int sdl_display_init(const struct device *dev) { struct sdl_display_data *disp_data = (struct sdl_display_data *)dev->driver_data; diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c index b2933442815e..3f2818ec847c 100644 --- a/drivers/display/display_st7789v.c +++ b/drivers/display/display_st7789v.c @@ -37,16 +37,16 @@ static u8_t st7789v_ram_param[] = DT_INST_PROP(0, ram_param); static u8_t st7789v_rgb_param[] = DT_INST_PROP(0, rgb_param); struct st7789v_data { - struct device *spi_dev; + const struct device *spi_dev; struct spi_config spi_config; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control cs_ctrl; #endif #if DT_INST_NODE_HAS_PROP(0, reset_gpios) - struct device *reset_gpio; + const struct device *reset_gpio; #endif - struct device *cmd_data_gpio; + const struct device *cmd_data_gpio; u16_t height; u16_t width; @@ -334,7 +334,7 @@ static void st7789v_lcd_init(struct st7789v_data *p_st7789v) sizeof(st7789v_rgb_param)); } -static int st7789v_init(struct device *dev) +static int st7789v_init(const struct device *dev) { struct st7789v_data *data = (struct st7789v_data *)dev->driver_data; @@ -407,7 +407,7 @@ static void st7789v_enter_sleep(struct st7789v_data *data) st7789v_transmit(data, ST7789V_CMD_SLEEP_IN, NULL, 0); } -static int st7789v_pm_control(struct device *dev, u32_t ctrl_command, +static int st7789v_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; diff --git a/drivers/display/gd7965.c b/drivers/display/gd7965.c index 26ae332dd065..2a30a6633904 100644 --- a/drivers/display/gd7965.c +++ b/drivers/display/gd7965.c @@ -56,10 +56,10 @@ LOG_MODULE_REGISTER(gd7965, CONFIG_DISPLAY_LOG_LEVEL); struct gd7965_data { - struct device *reset; - struct device *dc; - struct device *busy; - struct device *spi_dev; + const struct device *reset; + const struct device *dc; + const struct device *busy; + const struct device *spi_dev; struct spi_config spi_config; #if defined(GD7965_CS_CNTRL) struct spi_cs_control cs_ctrl; @@ -279,7 +279,7 @@ static int gd7965_set_pixel_format(const struct device *dev, return -ENOTSUP; } -static int gd7965_clear_and_write_buffer(struct device *dev, +static int gd7965_clear_and_write_buffer(const struct device *dev, u8_t pattern, bool update) { struct display_buffer_descriptor desc = { @@ -311,7 +311,7 @@ static int gd7965_clear_and_write_buffer(struct device *dev, return 0; } -static int gd7965_controller_init(struct device *dev) +static int gd7965_controller_init(const struct device *dev) { struct gd7965_data *driver = dev->driver_data; u8_t tmp[GD7965_TRES_REG_LENGTH]; @@ -389,7 +389,7 @@ static int gd7965_controller_init(struct device *dev) return 0; } -static int gd7965_init(struct device *dev) +static int gd7965_init(const struct device *dev) { struct gd7965_data *driver = dev->driver_data; diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c index d1a768deacf1..57d2a22cda06 100644 --- a/drivers/display/grove_lcd_rgb.c +++ b/drivers/display/grove_lcd_rgb.c @@ -28,7 +28,7 @@ struct command { }; struct glcd_data { - struct device *i2c; + const struct device *i2c; u8_t input_set; u8_t display_switch; u8_t function; @@ -85,7 +85,7 @@ static u8_t color_define[][3] = { /******************************************** * PRIVATE FUNCTIONS *******************************************/ -static void rgb_reg_set(struct device * const i2c, u8_t addr, u8_t dta) +static void rgb_reg_set(const struct device * const i2c, u8_t addr, u8_t dta) { u8_t data[2] = { addr, dta }; @@ -102,7 +102,7 @@ static inline void sleep(u32_t sleep_in_ms) /******************************************** * PUBLIC FUNCTIONS *******************************************/ -void glcd_print(struct device *port, char *data, u32_t size) +void glcd_print(const struct device *port, char *data, u32_t size) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config_info; @@ -117,7 +117,7 @@ void glcd_print(struct device *port, char *data, u32_t size) } -void glcd_cursor_pos_set(struct device *port, u8_t col, u8_t row) +void glcd_cursor_pos_set(const struct device *port, u8_t col, u8_t row) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config_info; @@ -138,7 +138,7 @@ void glcd_cursor_pos_set(struct device *port, u8_t col, u8_t row) } -void glcd_clear(struct device *port) +void glcd_clear(const struct device *port) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config_info; @@ -151,7 +151,7 @@ void glcd_clear(struct device *port) } -void glcd_display_state_set(struct device *port, u8_t opt) +void glcd_display_state_set(const struct device *port, u8_t opt) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config_info; @@ -168,7 +168,7 @@ void glcd_display_state_set(struct device *port, u8_t opt) } -u8_t glcd_display_state_get(struct device *port) +u8_t glcd_display_state_get(const struct device *port) { struct glcd_data *dev = port->driver_data; @@ -176,7 +176,7 @@ u8_t glcd_display_state_get(struct device *port) } -void glcd_input_state_set(struct device *port, u8_t opt) +void glcd_input_state_set(const struct device *port, u8_t opt) { const struct glcd_driver * const rom = port->config_info; struct glcd_data *dev = port->driver_data; @@ -191,7 +191,7 @@ void glcd_input_state_set(struct device *port, u8_t opt) } -u8_t glcd_input_state_get(struct device *port) +u8_t glcd_input_state_get(const struct device *port) { struct glcd_data *dev = port->driver_data; @@ -199,7 +199,7 @@ u8_t glcd_input_state_get(struct device *port) } -void glcd_color_select(struct device *port, u8_t color) +void glcd_color_select(const struct device *port, u8_t color) { if (color > 3) { LOG_WRN("selected color is too high a value"); @@ -211,7 +211,7 @@ void glcd_color_select(struct device *port, u8_t color) } -void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b) +void glcd_color_set(const struct device *port, u8_t r, u8_t g, u8_t b) { struct glcd_data * const dev = port->driver_data; @@ -221,7 +221,7 @@ void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b) } -void glcd_function_set(struct device *port, u8_t opt) +void glcd_function_set(const struct device *port, u8_t opt) { const struct glcd_driver * const rom = port->config_info; struct glcd_data *dev = port->driver_data; @@ -237,7 +237,7 @@ void glcd_function_set(struct device *port, u8_t opt) } -u8_t glcd_function_get(struct device *port) +u8_t glcd_function_get(const struct device *port) { struct glcd_data *dev = port->driver_data; @@ -245,7 +245,7 @@ u8_t glcd_function_get(struct device *port) } -int glcd_initialize(struct device *port) +int glcd_initialize(const struct device *port) { struct glcd_data *dev = port->driver_data; u8_t cmd; diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c index 1247b406ac5b..b1ab39c5a6e0 100644 --- a/drivers/display/mb_display.c +++ b/drivers/display/mb_display.c @@ -82,7 +82,7 @@ #define SCROLL_DEFAULT_DURATION_MS 80 struct mb_display { - struct device *dev; /* GPIO device */ + const struct device *dev; /* GPIO device */ struct k_timer timer; /* Rendering timer */ @@ -426,7 +426,7 @@ struct mb_display *mb_display_get(void) return &display; } -static int mb_display_init(struct device *dev) +static int mb_display_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c index db50f8186904..121baa082f4f 100644 --- a/drivers/display/ssd1306.c +++ b/drivers/display/ssd1306.c @@ -47,8 +47,8 @@ LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL); #endif struct ssd1306_data { - struct device *reset; - struct device *i2c; + const struct device *reset; + const struct device *i2c; u8_t contrast; u8_t scan_mode; }; @@ -77,7 +77,7 @@ static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg, reg, mask, val); } -static inline int ssd1306_set_panel_orientation(struct device *dev) +static inline int ssd1306_set_panel_orientation(const struct device *dev) { struct ssd1306_data *driver = dev->driver_data; u8_t cmd_buf[] = { @@ -95,7 +95,7 @@ static inline int ssd1306_set_panel_orientation(struct device *dev) DT_INST_REG_ADDR(0)); } -static inline int ssd1306_set_timing_setting(struct device *dev) +static inline int ssd1306_set_timing_setting(const struct device *dev) { struct ssd1306_data *driver = dev->driver_data; u8_t cmd_buf[] = { @@ -117,7 +117,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev) DT_INST_REG_ADDR(0)); } -static inline int ssd1306_set_hardware_config(struct device *dev) +static inline int ssd1306_set_hardware_config(const struct device *dev) { struct ssd1306_data *driver = dev->driver_data; u8_t cmd_buf[] = { @@ -350,7 +350,7 @@ static int ssd1306_set_pixel_format(const struct device *dev, return -ENOTSUP; } -static int ssd1306_init_device(struct device *dev) +static int ssd1306_init_device(const struct device *dev) { struct ssd1306_data *driver = dev->driver_data; @@ -410,7 +410,7 @@ static int ssd1306_init_device(struct device *dev) return 0; } -static int ssd1306_init(struct device *dev) +static int ssd1306_init(const struct device *dev) { struct ssd1306_data *driver = dev->driver_data; diff --git a/drivers/display/ssd16xx.c b/drivers/display/ssd16xx.c index a2b31c768ec3..e1fcaf9ff9ca 100644 --- a/drivers/display/ssd16xx.c +++ b/drivers/display/ssd16xx.c @@ -56,10 +56,10 @@ LOG_MODULE_REGISTER(ssd16xx); #define SSD16XX_PIXELS_PER_BYTE 8 struct ssd16xx_data { - struct device *reset; - struct device *dc; - struct device *busy; - struct device *spi_dev; + const struct device *reset; + const struct device *dc; + const struct device *busy; + const struct device *spi_dev; struct spi_config spi_config; #if defined(SSD16XX_CS_CNTRL) struct spi_cs_control cs_ctrl; @@ -390,7 +390,7 @@ static int ssd16xx_set_pixel_format(const struct device *dev, return -ENOTSUP; } -static int ssd16xx_clear_cntlr_mem(struct device *dev, u8_t ram_cmd, +static int ssd16xx_clear_cntlr_mem(const struct device *dev, u8_t ram_cmd, bool update) { struct ssd16xx_data *driver = dev->driver_data; @@ -439,7 +439,7 @@ static int ssd16xx_clear_cntlr_mem(struct device *dev, u8_t ram_cmd, return 0; } -static int ssd16xx_controller_init(struct device *dev) +static int ssd16xx_controller_init(const struct device *dev) { int err; u8_t tmp[3]; @@ -545,7 +545,7 @@ static int ssd16xx_controller_init(struct device *dev) return ssd16xx_clear_cntlr_mem(dev, SSD16XX_CMD_WRITE_RAM, true); } -static int ssd16xx_init(struct device *dev) +static int ssd16xx_init(const struct device *dev) { struct ssd16xx_data *driver = dev->driver_data; diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c index 039e77097c32..6680114f24bb 100644 --- a/drivers/dma/dma_dw.c +++ b/drivers/dma/dma_dw.c @@ -55,7 +55,7 @@ static ALWAYS_INLINE u32_t dw_read(u32_t dma_base, u32_t reg) static void dw_dma_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); struct dw_dma_dev_data *const dev_data = DEV_DATA(dev); struct dma_chan_data *chan_data; @@ -114,7 +114,7 @@ static void dw_dma_isr(void *arg) } } -static int dw_dma_config(struct device *dev, u32_t channel, +static int dw_dma_config(const struct device *dev, u32_t channel, struct dma_config *cfg) { struct dw_dma_dev_data *const dev_data = DEV_DATA(dev); @@ -248,8 +248,8 @@ static int dw_dma_config(struct device *dev, u32_t channel, return 0; } -static int dw_dma_reload(struct device *dev, u32_t channel, - u32_t src, u32_t dst, size_t size) +static int dw_dma_reload(const struct device *dev, u32_t channel, + u32_t src, u32_t dst, size_t size) { struct dw_dma_dev_data *const dev_data = DEV_DATA(dev); const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -267,7 +267,7 @@ static int dw_dma_reload(struct device *dev, u32_t channel, return 0; } -static int dw_dma_transfer_start(struct device *dev, u32_t channel) +static int dw_dma_transfer_start(const struct device *dev, u32_t channel) { const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -281,7 +281,7 @@ static int dw_dma_transfer_start(struct device *dev, u32_t channel) return 0; } -static int dw_dma_transfer_stop(struct device *dev, u32_t channel) +static int dw_dma_transfer_stop(const struct device *dev, u32_t channel) { const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -294,7 +294,7 @@ static int dw_dma_transfer_stop(struct device *dev, u32_t channel) return 0; } -static void dw_dma_setup(struct device *dev) +static void dw_dma_setup(const struct device *dev) { const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); struct dw_dma_dev_data *const dev_data = DEV_DATA(dev); @@ -337,7 +337,7 @@ static void dw_dma_setup(struct device *dev) } } -static int dw_dma_init(struct device *dev) +static int dw_dma_init(const struct device *dev) { const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -361,7 +361,7 @@ static const struct dma_driver_api dw_dma_driver_api = { #define DW_DMAC_INIT(inst) \ \ - static struct device DEVICE_NAME_GET(dw_dma##inst); \ + DEVICE_DECLARE(dw_dma##inst); \ \ static struct dw_drv_plat_data dmac##inst = { \ .chan[0] = { \ diff --git a/drivers/dma/dma_handlers.c b/drivers/dma/dma_handlers.c index 78084b2493a7..98143e8b1dbf 100644 --- a/drivers/dma/dma_handlers.c +++ b/drivers/dma/dma_handlers.c @@ -11,16 +11,16 @@ * the validity of the channel ID and returning -errno if it's bogus */ -static inline int z_vrfy_dma_start(struct device *dev, u32_t channel) +static inline int z_vrfy_dma_start(const struct device *dev, u32_t channel) { Z_OOPS(Z_SYSCALL_DRIVER_DMA(dev, start)); - return z_impl_dma_start((struct device *)dev, channel); + return z_impl_dma_start((const struct device *)dev, channel); } #include -static inline int z_vrfy_dma_stop(struct device *dev, u32_t channel) +static inline int z_vrfy_dma_stop(const struct device *dev, u32_t channel) { Z_OOPS(Z_SYSCALL_DRIVER_DMA(dev, stop)); - return z_impl_dma_stop((struct device *)dev, channel); + return z_impl_dma_stop((const struct device *)dev, channel); } #include diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c index 3ee9fa36dd4b..82ec5d3f2f16 100644 --- a/drivers/dma/dma_nios2_msgdma.c +++ b/drivers/dma/dma_nios2_msgdma.c @@ -36,7 +36,7 @@ struct nios2_msgdma_dev_cfg { static void nios2_msgdma_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct nios2_msgdma_dev_cfg *cfg = DEV_CFG(dev); /* Call Altera HAL driver ISR */ @@ -46,7 +46,7 @@ static void nios2_msgdma_isr(void *arg) static void nios2_msgdma_callback(void *context) { struct nios2_msgdma_dev_cfg *dev_cfg = - DEV_CFG((struct device *)context); + DEV_CFG((const struct device *)context); int err_code; u32_t status; @@ -65,7 +65,7 @@ static void nios2_msgdma_callback(void *context) dev_cfg->dma_callback(dev_cfg->callback_arg, 0, err_code); } -static int nios2_msgdma_config(struct device *dev, u32_t channel, +static int nios2_msgdma_config(const struct device *dev, u32_t channel, struct dma_config *cfg) { struct nios2_msgdma_dev_cfg *dev_cfg = DEV_CFG(dev); @@ -140,7 +140,7 @@ static int nios2_msgdma_config(struct device *dev, u32_t channel, ALTERA_MSGDMA_CSR_GLOBAL_INTERRUPT_MASK | ALTERA_MSGDMA_CSR_STOP_ON_ERROR_MASK | ALTERA_MSGDMA_CSR_STOP_ON_EARLY_TERMINATION_MASK, - dev); + (void *)dev); /* Clear the IRQ status */ IOWR_ALTERA_MSGDMA_CSR_STATUS(dev_cfg->msgdma_dev->csr_base, @@ -150,7 +150,8 @@ static int nios2_msgdma_config(struct device *dev, u32_t channel, return status; } -static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel) +static int nios2_msgdma_transfer_start(const struct device *dev, + u32_t channel) { struct nios2_msgdma_dev_cfg *cfg = DEV_CFG(dev); int status; @@ -173,7 +174,7 @@ static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel) return status; } -static int nios2_msgdma_transfer_stop(struct device *dev, u32_t channel) +static int nios2_msgdma_transfer_stop(const struct device *dev, u32_t channel) { struct nios2_msgdma_dev_cfg *cfg = DEV_CFG(dev); int ret = -EIO; @@ -204,9 +205,9 @@ static const struct dma_driver_api nios2_msgdma_driver_api = { }; /* DMA0 */ -static struct device DEVICE_NAME_GET(dma0_nios2); +DEVICE_DECLARE(dma0_nios2); -static int nios2_msgdma0_initialize(struct device *dev) +static int nios2_msgdma0_initialize(const struct device *dev) { struct nios2_msgdma_dev_cfg *dev_cfg = DEV_CFG(dev); diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c index dad970b5fc66..da7a4b816d51 100644 --- a/drivers/dma/dma_sam0.c +++ b/drivers/dma/dma_sam0.c @@ -36,7 +36,7 @@ struct dma_sam0_data { /* Handles DMA interrupts and dispatches to the individual channel */ static void dma_sam0_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct dma_sam0_data *data = DEV_DATA(dev); struct dma_sam0_channel *chdata; u16_t pend = DMA_REGS->INTPEND.reg; @@ -65,7 +65,7 @@ static void dma_sam0_isr(void *arg) } /* Configure a channel */ -static int dma_sam0_config(struct device *dev, u32_t channel, +static int dma_sam0_config(const struct device *dev, u32_t channel, struct dma_config *config) { struct dma_sam0_data *data = DEV_DATA(dev); @@ -263,7 +263,7 @@ static int dma_sam0_config(struct device *dev, u32_t channel, return -EINVAL; } -static int dma_sam0_start(struct device *dev, u32_t channel) +static int dma_sam0_start(const struct device *dev, u32_t channel) { int key = irq_lock(); @@ -294,7 +294,7 @@ static int dma_sam0_start(struct device *dev, u32_t channel) return 0; } -static int dma_sam0_stop(struct device *dev, u32_t channel) +static int dma_sam0_stop(const struct device *dev, u32_t channel) { int key = irq_lock(); @@ -314,7 +314,7 @@ static int dma_sam0_stop(struct device *dev, u32_t channel) return 0; } -static int dma_sam0_reload(struct device *dev, u32_t channel, +static int dma_sam0_reload(const struct device *dev, u32_t channel, u32_t src, u32_t dst, size_t size) { struct dma_sam0_data *data = DEV_DATA(dev); @@ -358,7 +358,7 @@ static int dma_sam0_reload(struct device *dev, u32_t channel, return -EINVAL; } -static int dma_sam0_get_status(struct device *dev, u32_t channel, +static int dma_sam0_get_status(const struct device *dev, u32_t channel, struct dma_status *stat) { struct dma_sam0_data *data = DEV_DATA(dev); @@ -405,7 +405,7 @@ DEVICE_DECLARE(dma_sam0_0); irq_enable(DT_INST_IRQ_BY_IDX(0, n, irq)); \ } while (0) -static int dma_sam0_init(struct device *dev) +static int dma_sam0_init(const struct device *dev) { struct dma_sam0_data *data = DEV_DATA(dev); diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c index 65ee8d10ecf6..9bf1ab514a50 100644 --- a/drivers/dma/dma_sam_xdmac.c +++ b/drivers/dma/dma_sam_xdmac.c @@ -53,7 +53,7 @@ struct sam_xdmac_dev_data { static void sam_xdmac_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev); struct sam_xdmac_dev_data *const dev_data = DEV_DATA(dev); Xdmac *const xdmac = dev_cfg->regs; @@ -82,7 +82,7 @@ static void sam_xdmac_isr(void *arg) } } -int sam_xdmac_channel_configure(struct device *dev, u32_t channel, +int sam_xdmac_channel_configure(const struct device *dev, u32_t channel, struct sam_xdmac_channel_config *param) { const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -124,7 +124,7 @@ int sam_xdmac_channel_configure(struct device *dev, u32_t channel, return 0; } -int sam_xdmac_transfer_configure(struct device *dev, u32_t channel, +int sam_xdmac_transfer_configure(const struct device *dev, u32_t channel, struct sam_xdmac_transfer_config *param) { const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -176,7 +176,7 @@ int sam_xdmac_transfer_configure(struct device *dev, u32_t channel, return 0; } -static int sam_xdmac_config(struct device *dev, u32_t channel, +static int sam_xdmac_config(const struct device *dev, u32_t channel, struct dma_config *cfg) { struct sam_xdmac_dev_data *const dev_data = DEV_DATA(dev); @@ -270,7 +270,7 @@ static int sam_xdmac_config(struct device *dev, u32_t channel, return ret; } -int sam_xdmac_transfer_start(struct device *dev, u32_t channel) +int sam_xdmac_transfer_start(const struct device *dev, u32_t channel) { Xdmac *const xdmac = DEV_CFG(dev)->regs; @@ -291,7 +291,7 @@ int sam_xdmac_transfer_start(struct device *dev, u32_t channel) return 0; } -int sam_xdmac_transfer_stop(struct device *dev, u32_t channel) +int sam_xdmac_transfer_stop(const struct device *dev, u32_t channel) { Xdmac *const xdmac = DEV_CFG(dev)->regs; @@ -316,7 +316,7 @@ int sam_xdmac_transfer_stop(struct device *dev, u32_t channel) return 0; } -static int sam_xdmac_initialize(struct device *dev) +static int sam_xdmac_initialize(const struct device *dev) { const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev); Xdmac *const xdmac = dev_cfg->regs; @@ -348,7 +348,7 @@ static const struct dma_driver_api sam_xdmac_driver_api = { /* DMA0 */ -static struct device DEVICE_NAME_GET(dma0_sam); +DEVICE_DECLARE(dma0_sam); static void dma0_sam_irq_config(void) { diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c index 222e1740d97b..3a142ebbc643 100644 --- a/drivers/dma/dma_stm32.c +++ b/drivers/dma/dma_stm32.c @@ -36,7 +36,7 @@ static u32_t table_p_size[] = { LL_DMA_PDATAALIGN_WORD, }; -static void dma_stm32_dump_stream_irq(struct device *dev, u32_t id) +static void dma_stm32_dump_stream_irq(const struct device *dev, u32_t id) { const struct dma_stm32_config *config = dev->config_info; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); @@ -44,7 +44,7 @@ static void dma_stm32_dump_stream_irq(struct device *dev, u32_t id) stm32_dma_dump_stream_irq(dma, id); } -static void dma_stm32_clear_stream_irq(struct device *dev, u32_t id) +static void dma_stm32_clear_stream_irq(const struct device *dev, u32_t id) { const struct dma_stm32_config *config = dev->config_info; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); @@ -56,7 +56,7 @@ static void dma_stm32_clear_stream_irq(struct device *dev, u32_t id) static void dma_stm32_irq_handler(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct dma_stm32_data *data = dev->driver_data; const struct dma_stm32_config *config = dev->config_info; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); @@ -233,10 +233,10 @@ static int dma_stm32_get_periph_increment(enum dma_addr_adj increment, } #ifdef CONFIG_DMAMUX_STM32 -int dma_stm32_configure(struct device *dev, u32_t id, +int dma_stm32_configure(const struct device *dev, u32_t id, struct dma_config *config) #else -static int dma_stm32_configure(struct device *dev, u32_t id, +static int dma_stm32_configure(const struct device *dev, u32_t id, struct dma_config *config) #endif /* CONFIG_DMAMUX_STM32 */ { @@ -470,10 +470,10 @@ static int dma_stm32_disable_stream(DMA_TypeDef *dma, u32_t id) } #ifdef CONFIG_DMAMUX_STM32 -int dma_stm32_reload(struct device *dev, u32_t id, +int dma_stm32_reload(const struct device *dev, u32_t id, u32_t src, u32_t dst, size_t size) #else -static int dma_stm32_reload(struct device *dev, u32_t id, +static int dma_stm32_reload(const struct device *dev, u32_t id, u32_t src, u32_t dst, size_t size) #endif /* CONFIG_DMAMUX_STM32 */ { @@ -519,9 +519,9 @@ static int dma_stm32_reload(struct device *dev, u32_t id, } #ifdef CONFIG_DMAMUX_STM32 -int dma_stm32_start(struct device *dev, u32_t id) +int dma_stm32_start(const struct device *dev, u32_t id) #else -static int dma_stm32_start(struct device *dev, u32_t id) +static int dma_stm32_start(const struct device *dev, u32_t id) #endif /* CONFIG_DMAMUX_STM32 */ { const struct dma_stm32_config *config = dev->config_info; @@ -544,9 +544,9 @@ static int dma_stm32_start(struct device *dev, u32_t id) } #ifdef CONFIG_DMAMUX_STM32 -int dma_stm32_stop(struct device *dev, u32_t id) +int dma_stm32_stop(const struct device *dev, u32_t id) #else -static int dma_stm32_stop(struct device *dev, u32_t id) +static int dma_stm32_stop(const struct device *dev, u32_t id) #endif /* CONFIG_DMAMUX_STM32 */ { struct dma_stm32_data *data = dev->driver_data; @@ -580,11 +580,11 @@ static int dma_stm32_stop(struct device *dev, u32_t id) struct k_mem_block block; -static int dma_stm32_init(struct device *dev) +static int dma_stm32_init(const struct device *dev) { struct dma_stm32_data *data = dev->driver_data; const struct dma_stm32_config *config = dev->config_info; - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); if (clock_control_on(clk, @@ -628,7 +628,7 @@ static const struct dma_driver_api dma_funcs = { }; #define DMA_INIT(index) \ -static void dma_stm32_config_irq_##index(struct device *dev); \ +static void dma_stm32_config_irq_##index(const struct device *dev); \ \ const struct dma_stm32_config dma_stm32_config_##index = { \ .pclken = { .bus = DT_INST_CLOCKS_CELL(index, bus), \ @@ -669,7 +669,7 @@ do { \ #if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) DMA_INIT(0); -static void dma_stm32_config_irq_0(struct device *dev) +static void dma_stm32_config_irq_0(const struct device *dev) { struct dma_stm32_data *data = dev->driver_data; @@ -695,7 +695,7 @@ static void dma_stm32_config_irq_0(struct device *dev) #if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) DMA_INIT(1); -static void dma_stm32_config_irq_1(struct device *dev) +static void dma_stm32_config_irq_1(const struct device *dev) { struct dma_stm32_data *data = dev->driver_data; diff --git a/drivers/dma/dma_stm32.h b/drivers/dma/dma_stm32.h index 5b10ffc0bfae..3e097d5c19eb 100644 --- a/drivers/dma/dma_stm32.h +++ b/drivers/dma/dma_stm32.h @@ -31,7 +31,7 @@ struct dma_stm32_data { struct dma_stm32_config { struct stm32_pclken pclken; - void (*config_irq)(struct device *dev); + void (*config_irq)(const struct device *dev); bool support_m2m; u32_t base; }; @@ -76,12 +76,12 @@ u32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph); #ifdef CONFIG_DMAMUX_STM32 /* dma_stm32_ api functions are exported to the dmamux_stm32 */ -int dma_stm32_configure(struct device *dev, u32_t id, +int dma_stm32_configure(const struct device *dev, u32_t id, struct dma_config *config); -int dma_stm32_reload(struct device *dev, u32_t id, +int dma_stm32_reload(const struct device *dev, u32_t id, u32_t src, u32_t dst, size_t size); -int dma_stm32_start(struct device *dev, u32_t id); -int dma_stm32_stop(struct device *dev, u32_t id); +int dma_stm32_start(const struct device *dev, u32_t id); +int dma_stm32_stop(const struct device *dev, u32_t id); #endif /* CONFIG_DMAMUX_STM32 */ #endif /* DMA_STM32_H_*/ diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c index 5807e9c24c96..2378fa267bb9 100644 --- a/drivers/dma/dmamux_stm32.c +++ b/drivers/dma/dmamux_stm32.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(dmamux_stm32, CONFIG_DMA_LOG_LEVEL); #define DT_DRV_COMPAT st_stm32_dmamux -int dmamux_stm32_configure(struct device *dev, u32_t id, +int dmamux_stm32_configure(const struct device *dev, u32_t id, struct dma_config *config) { /* device is the dmamux, id is the dmamux channel from 0 */ @@ -76,7 +76,7 @@ int dmamux_stm32_configure(struct device *dev, u32_t id, return 0; } -int dmamux_stm32_start(struct device *dev, u32_t id) +int dmamux_stm32_start(const struct device *dev, u32_t id) { const struct dmamux_stm32_config *dev_config = dev->config_info; @@ -97,7 +97,7 @@ int dmamux_stm32_start(struct device *dev, u32_t id) return 0; } -int dmamux_stm32_stop(struct device *dev, u32_t id) +int dmamux_stm32_stop(const struct device *dev, u32_t id) { const struct dmamux_stm32_config *dev_config = dev->config_info; @@ -118,7 +118,7 @@ int dmamux_stm32_stop(struct device *dev, u32_t id) return 0; } -int dmamux_stm32_reload(struct device *dev, u32_t id, +int dmamux_stm32_reload(const struct device *dev, u32_t id, u32_t src, u32_t dst, size_t size) { const struct dmamux_stm32_config *dev_config = @@ -141,12 +141,12 @@ int dmamux_stm32_reload(struct device *dev, u32_t id, return 0; } -static int dmamux_stm32_init(struct device *dev) +static int dmamux_stm32_init(const struct device *dev) { struct dmamux_stm32_data *data = dev->driver_data; const struct dmamux_stm32_config *config = dev->config_info; - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); if (clock_control_on(clk, diff --git a/drivers/dma/dmamux_stm32.h b/drivers/dma/dmamux_stm32.h index 238b2d181dc0..b6cc90b24e95 100644 --- a/drivers/dma/dmamux_stm32.h +++ b/drivers/dma/dmamux_stm32.h @@ -9,7 +9,7 @@ /* this is the configuration of one dmamux channel */ struct dmamux_stm32_channel { - struct device *dev_dma; /* pointer to the associated dma instance */ + const struct device *dev_dma; /* pointer to the associated dma instance */ u8_t dma_id; /* ref of the associated dma stream for this instance */ }; diff --git a/drivers/eeprom/eeprom_at2x.c b/drivers/eeprom/eeprom_at2x.c index 6b880ff55a1e..19ceca44cf05 100644 --- a/drivers/eeprom/eeprom_at2x.c +++ b/drivers/eeprom/eeprom_at2x.c @@ -53,16 +53,16 @@ struct eeprom_at2x_config { }; struct eeprom_at2x_data { - struct device *bus_dev; + const struct device *bus_dev; #ifdef CONFIG_EEPROM_AT25 struct spi_config spi_cfg; struct spi_cs_control spi_cs; #endif /* CONFIG_EEPROM_AT25 */ - struct device *wp_gpio_dev; + const struct device *wp_gpio_dev; struct k_mutex lock; }; -static inline int eeprom_at2x_write_protect(struct device *dev) +static inline int eeprom_at2x_write_protect(const struct device *dev) { const struct eeprom_at2x_config *config = dev->config_info; struct eeprom_at2x_data *data = dev->driver_data; @@ -74,7 +74,7 @@ static inline int eeprom_at2x_write_protect(struct device *dev) return gpio_pin_set(data->wp_gpio_dev, config->wp_gpio_pin, 1); } -static inline int eeprom_at2x_write_enable(struct device *dev) +static inline int eeprom_at2x_write_enable(const struct device *dev) { const struct eeprom_at2x_config *config = dev->config_info; struct eeprom_at2x_data *data = dev->driver_data; @@ -86,7 +86,7 @@ static inline int eeprom_at2x_write_enable(struct device *dev) return gpio_pin_set(data->wp_gpio_dev, config->wp_gpio_pin, 0); } -static int eeprom_at2x_read(struct device *dev, off_t offset, void *buf, +static int eeprom_at2x_read(const struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -114,7 +114,8 @@ static int eeprom_at2x_read(struct device *dev, off_t offset, void *buf, return 0; } -static size_t eeprom_at2x_limit_write_count(struct device *dev, off_t offset, +static size_t eeprom_at2x_limit_write_count(const struct device *dev, + off_t offset, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -135,7 +136,8 @@ static size_t eeprom_at2x_limit_write_count(struct device *dev, off_t offset, return count; } -static int eeprom_at2x_write(struct device *dev, off_t offset, const void *buf, +static int eeprom_at2x_write(const struct device *dev, off_t offset, + const void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -190,7 +192,7 @@ static int eeprom_at2x_write(struct device *dev, off_t offset, const void *buf, return ret; } -static size_t eeprom_at2x_size(struct device *dev) +static size_t eeprom_at2x_size(const struct device *dev) { const struct eeprom_at2x_config *config = dev->config_info; @@ -198,7 +200,7 @@ static size_t eeprom_at2x_size(struct device *dev) } #ifdef CONFIG_EEPROM_AT24 -static int eeprom_at24_read(struct device *dev, off_t offset, void *buf, +static int eeprom_at24_read(const struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -231,7 +233,7 @@ static int eeprom_at24_read(struct device *dev, off_t offset, void *buf, return err; } -static int eeprom_at24_write(struct device *dev, off_t offset, +static int eeprom_at24_write(const struct device *dev, off_t offset, const void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -278,7 +280,7 @@ static int eeprom_at24_write(struct device *dev, off_t offset, #endif /* CONFIG_EEPROM_AT24 */ #ifdef CONFIG_EEPROM_AT25 -static int eeprom_at25_rdsr(struct device *dev, u8_t *status) +static int eeprom_at25_rdsr(const struct device *dev, u8_t *status) { struct eeprom_at2x_data *data = dev->driver_data; u8_t rdsr[2] = { EEPROM_AT25_RDSR, 0 }; @@ -309,7 +311,7 @@ static int eeprom_at25_rdsr(struct device *dev, u8_t *status) return err; } -static int eeprom_at25_wait_for_idle(struct device *dev) +static int eeprom_at25_wait_for_idle(const struct device *dev) { const struct eeprom_at2x_config *config = dev->config_info; s64_t timeout; @@ -333,7 +335,7 @@ static int eeprom_at25_wait_for_idle(struct device *dev) return -EBUSY; } -static int eeprom_at25_read(struct device *dev, off_t offset, void *buf, +static int eeprom_at25_read(const struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -399,7 +401,7 @@ static int eeprom_at25_read(struct device *dev, off_t offset, void *buf, return spi_transceive(data->bus_dev, &data->spi_cfg, &tx, &rx); } -static int eeprom_at25_wren(struct device *dev) +static int eeprom_at25_wren(const struct device *dev) { struct eeprom_at2x_data *data = dev->driver_data; u8_t cmd = EEPROM_AT25_WREN; @@ -415,7 +417,7 @@ static int eeprom_at25_wren(struct device *dev) return spi_write(data->bus_dev, &data->spi_cfg, &tx); } -static int eeprom_at25_write(struct device *dev, off_t offset, +static int eeprom_at25_write(const struct device *dev, off_t offset, const void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config_info; @@ -476,7 +478,7 @@ static int eeprom_at25_write(struct device *dev, off_t offset, } #endif /* CONFIG_EEPROM_AT25 */ -static int eeprom_at2x_init(struct device *dev) +static int eeprom_at2x_init(const struct device *dev) { const struct eeprom_at2x_config *config = dev->config_info; struct eeprom_at2x_data *data = dev->driver_data; diff --git a/drivers/eeprom/eeprom_handlers.c b/drivers/eeprom/eeprom_handlers.c index c2057f47d7e1..34b4cc858fe4 100644 --- a/drivers/eeprom/eeprom_handlers.c +++ b/drivers/eeprom/eeprom_handlers.c @@ -7,29 +7,30 @@ #include #include -static inline int z_vrfy_eeprom_read(struct device *dev, off_t offset, +static inline int z_vrfy_eeprom_read(const struct device *dev, off_t offset, void *data, size_t len) { Z_OOPS(Z_SYSCALL_DRIVER_EEPROM(dev, read)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(data, len)); - return z_impl_eeprom_read((struct device *)dev, offset, (void *)data, + return z_impl_eeprom_read((const struct device *)dev, offset, + (void *)data, len); } #include -static inline int z_vrfy_eeprom_write(struct device *dev, off_t offset, +static inline int z_vrfy_eeprom_write(const struct device *dev, off_t offset, const void *data, size_t len) { Z_OOPS(Z_SYSCALL_DRIVER_EEPROM(dev, write)); Z_OOPS(Z_SYSCALL_MEMORY_READ(data, len)); - return z_impl_eeprom_write((struct device *)dev, offset, + return z_impl_eeprom_write((const struct device *)dev, offset, (const void *)data, len); } #include -static inline size_t z_vrfy_eeprom_get_size(struct device *dev) +static inline size_t z_vrfy_eeprom_get_size(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_EEPROM(dev, size)); - return z_impl_eeprom_get_size((struct device *)dev); + return z_impl_eeprom_get_size((const struct device *)dev); } #include diff --git a/drivers/eeprom/eeprom_shell.c b/drivers/eeprom/eeprom_shell.c index b3f26003e79f..3df104eedb6d 100644 --- a/drivers/eeprom/eeprom_shell.c +++ b/drivers/eeprom/eeprom_shell.c @@ -32,7 +32,7 @@ static const struct args_index args_indx = { static int cmd_read(const struct shell *shell, size_t argc, char **argv) { u8_t buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE]; - struct device *eeprom; + const struct device *eeprom; off_t offset; size_t len; int err; @@ -70,7 +70,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char **argv) { u8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE]; u8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE]; - struct device *eeprom; + const struct device *eeprom; unsigned long byte; off_t offset; size_t len; @@ -129,7 +129,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char **argv) static int cmd_size(const struct shell *shell, size_t argc, char **argv) { - struct device *eeprom; + const struct device *eeprom; eeprom = device_get_binding(argv[args_indx.device]); if (!eeprom) { @@ -145,7 +145,7 @@ static int cmd_fill(const struct shell *shell, size_t argc, char **argv) { u8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE]; u8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE]; - struct device *eeprom; + const struct device *eeprom; unsigned long pattern; off_t offset; size_t len; diff --git a/drivers/eeprom/eeprom_simulator.c b/drivers/eeprom/eeprom_simulator.c index a8d2fb9ed517..1f7af383bdad 100644 --- a/drivers/eeprom/eeprom_simulator.c +++ b/drivers/eeprom/eeprom_simulator.c @@ -93,7 +93,8 @@ static const char default_eeprom_file_path[] = "eeprom.bin"; static u8_t mock_eeprom[DT_INST_PROP(0, size)]; #endif /* CONFIG_ARCH_POSIX */ -static int eeprom_range_is_valid(struct device *dev, off_t offset, size_t len) +static int eeprom_range_is_valid(const struct device *dev, off_t offset, + size_t len) { const struct eeprom_sim_config *config = DEV_CONFIG(dev); @@ -104,7 +105,7 @@ static int eeprom_range_is_valid(struct device *dev, off_t offset, size_t len) return 0; } -static int eeprom_sim_read(struct device *dev, off_t offset, void *data, +static int eeprom_sim_read(const struct device *dev, off_t offset, void *data, size_t len) { if (!len) { @@ -133,7 +134,8 @@ static int eeprom_sim_read(struct device *dev, off_t offset, void *data, return 0; } -static int eeprom_sim_write(struct device *dev, off_t offset, const void *data, +static int eeprom_sim_write(const struct device *dev, off_t offset, + const void *data, size_t len) { const struct eeprom_sim_config *config = DEV_CONFIG(dev); @@ -192,7 +194,7 @@ static int eeprom_sim_write(struct device *dev, off_t offset, const void *data, return 0; } -static size_t eeprom_sim_size(struct device *dev) +static size_t eeprom_sim_size(const struct device *dev) { const struct eeprom_sim_config *config = DEV_CONFIG(dev); @@ -212,7 +214,7 @@ static const struct eeprom_sim_config eeprom_sim_config_0 = { #ifdef CONFIG_ARCH_POSIX -static int eeprom_mock_init(struct device *dev) +static int eeprom_mock_init(const struct device *dev) { if (eeprom_file_path == NULL) { eeprom_file_path = default_eeprom_file_path; @@ -247,7 +249,7 @@ static int eeprom_mock_init(struct device *dev) #else -static int eeprom_mock_init(struct device *dev) +static int eeprom_mock_init(const struct device *dev) { memset(mock_eeprom, 0xFF, ARRAY_SIZE(mock_eeprom)); return 0; @@ -255,7 +257,7 @@ static int eeprom_mock_init(struct device *dev) #endif /* CONFIG_ARCH_POSIX */ -static int eeprom_sim_init(struct device *dev) +static int eeprom_sim_init(const struct device *dev) { SYNC_INIT(); STATS_INIT_AND_REG(eeprom_sim_stats, STATS_SIZE_32, "eeprom_sim_stats"); diff --git a/drivers/eeprom/eeprom_stm32.c b/drivers/eeprom/eeprom_stm32.c index 87d8e5dc122c..f6e3d99b40c1 100644 --- a/drivers/eeprom/eeprom_stm32.c +++ b/drivers/eeprom/eeprom_stm32.c @@ -20,7 +20,8 @@ struct eeprom_stm32_config { size_t size; }; -static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf, +static int eeprom_stm32_read(const struct device *dev, off_t offset, + void *buf, size_t len) { const struct eeprom_stm32_config *config = dev->config_info; @@ -50,7 +51,7 @@ static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf, return 0; } -static int eeprom_stm32_write(struct device *dev, off_t offset, +static int eeprom_stm32_write(const struct device *dev, off_t offset, const void *buf, size_t len) { const struct eeprom_stm32_config *config = dev->config_info; @@ -98,14 +99,14 @@ static int eeprom_stm32_write(struct device *dev, off_t offset, return ret; } -static size_t eeprom_stm32_size(struct device *dev) +static size_t eeprom_stm32_size(const struct device *dev) { const struct eeprom_stm32_config *config = dev->config_info; return config->size; } -static int eeprom_stm32_init(struct device *dev) +static int eeprom_stm32_init(const struct device *dev) { return 0; } diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index 70cffc0f2139..89e52f96c21f 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -26,12 +26,13 @@ struct entropy_cc13xx_cc26xx_data { DEVICE_DECLARE(entropy_cc13xx_cc26xx); static inline struct entropy_cc13xx_cc26xx_data * -get_dev_data(struct device *dev) +get_dev_data(const struct device *dev) { return dev->driver_data; } -static int entropy_cc13xx_cc26xx_get_entropy(struct device *dev, u8_t *buf, +static int entropy_cc13xx_cc26xx_get_entropy(const struct device *dev, + u8_t *buf, u16_t len) { struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev); @@ -97,7 +98,7 @@ static void entropy_cc13xx_cc26xx_isr(void *arg) } } -static int entropy_cc13xx_cc26xx_init(struct device *dev) +static int entropy_cc13xx_cc26xx_init(const struct device *dev) { struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev); diff --git a/drivers/entropy/entropy_esp32.c b/drivers/entropy/entropy_esp32.c index d4910bb7df73..163c82c292b6 100644 --- a/drivers/entropy/entropy_esp32.c +++ b/drivers/entropy/entropy_esp32.c @@ -28,7 +28,8 @@ static inline u32_t entropy_esp32_get_u32(void) return *rng_data_reg; } -static int entropy_esp32_get_entropy(struct device *device, u8_t *buf, u16_t len) +static int entropy_esp32_get_entropy(const struct device *device, u8_t *buf, + u16_t len) { while (len) { u32_t v = entropy_esp32_get_u32(); @@ -47,7 +48,7 @@ static int entropy_esp32_get_entropy(struct device *device, u8_t *buf, u16_t len return 0; } -static int entropy_esp32_init(struct device *device) +static int entropy_esp32_init(const struct device *device) { return 0; } diff --git a/drivers/entropy/entropy_gecko_trng.c b/drivers/entropy/entropy_gecko_trng.c index 50bd3cf47e75..ed4e01369cf9 100644 --- a/drivers/entropy/entropy_gecko_trng.c +++ b/drivers/entropy/entropy_gecko_trng.c @@ -30,8 +30,9 @@ static void entropy_gecko_trng_read(u8_t *output, size_t len) } } -static int entropy_gecko_trng_get_entropy(struct device *dev, u8_t *buffer, - u16_t length) +static int entropy_gecko_trng_get_entropy(const struct device *dev, + u8_t *buffer, + u16_t length) { size_t count = 0; size_t available; @@ -53,8 +54,9 @@ static int entropy_gecko_trng_get_entropy(struct device *dev, u8_t *buffer, return 0; } -static int entropy_gecko_trng_get_entropy_isr(struct device *dev, u8_t *buf, - u16_t len, u32_t flags) +static int entropy_gecko_trng_get_entropy_isr(const struct device *dev, + u8_t *buf, + u16_t len, u32_t flags) { if ((flags & ENTROPY_BUSYWAIT) == 0U) { @@ -82,7 +84,7 @@ static int entropy_gecko_trng_get_entropy_isr(struct device *dev, u8_t *buf, } } -static int entropy_gecko_trng_init(struct device *device) +static int entropy_gecko_trng_init(const struct device *device) { /* Enable the TRNG0 clock. */ CMU_ClockEnable(cmuClock_TRNG0, true); diff --git a/drivers/entropy/entropy_handlers.c b/drivers/entropy/entropy_handlers.c index 98a4e001f2f6..8b6bff6ac7ea 100644 --- a/drivers/entropy/entropy_handlers.c +++ b/drivers/entropy/entropy_handlers.c @@ -7,13 +7,14 @@ #include #include -static inline int z_vrfy_entropy_get_entropy(struct device *dev, +static inline int z_vrfy_entropy_get_entropy(const struct device *dev, u8_t *buffer, u16_t len) { Z_OOPS(Z_SYSCALL_DRIVER_ENTROPY(dev, get_entropy)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buffer, len)); - return z_impl_entropy_get_entropy((struct device *)dev, (u8_t *)buffer, - len); + return z_impl_entropy_get_entropy((const struct device *)dev, + (u8_t *)buffer, + len); } #include diff --git a/drivers/entropy/entropy_litex.c b/drivers/entropy/entropy_litex.c index 270c6c6d0e6d..11c9e5f37c53 100644 --- a/drivers/entropy/entropy_litex.c +++ b/drivers/entropy/entropy_litex.c @@ -33,7 +33,7 @@ static inline unsigned int prbs_read(volatile u32_t *reg_status, return result; } -static int entropy_prbs_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_prbs_get_entropy(const struct device *dev, u8_t *buffer, u16_t length) { while (length > 0) { @@ -50,7 +50,7 @@ static int entropy_prbs_get_entropy(struct device *dev, u8_t *buffer, return 0; } -static int entropy_prbs_init(struct device *dev) +static int entropy_prbs_init(const struct device *dev) { return 0; } diff --git a/drivers/entropy/entropy_mcux_rng.c b/drivers/entropy/entropy_mcux_rng.c index 4c1353809334..c0422edcac2e 100644 --- a/drivers/entropy/entropy_mcux_rng.c +++ b/drivers/entropy/entropy_mcux_rng.c @@ -17,7 +17,8 @@ struct mcux_entropy_config { RNG_Type *base; }; -static int entropy_mcux_rng_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_mcux_rng_get_entropy(const struct device *dev, + u8_t *buffer, u16_t length) { const struct mcux_entropy_config *config = dev->config_info; @@ -39,14 +40,14 @@ static const struct mcux_entropy_config entropy_mcux_config = { .base = (RNG_Type *)DT_INST_REG_ADDR(0) }; -static int entropy_mcux_rng_init(struct device *); +static int entropy_mcux_rng_init(const struct device *); DEVICE_AND_API_INIT(entropy_mcux_rng, DT_INST_LABEL(0), entropy_mcux_rng_init, NULL, &entropy_mcux_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_mcux_rng_api_funcs); -static int entropy_mcux_rng_init(struct device *dev) +static int entropy_mcux_rng_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/entropy/entropy_mcux_rnga.c b/drivers/entropy/entropy_mcux_rnga.c index 854c62adb839..ee3e6b1113f2 100644 --- a/drivers/entropy/entropy_mcux_rnga.c +++ b/drivers/entropy/entropy_mcux_rnga.c @@ -38,8 +38,9 @@ static u8_t entropy_mcux_rnga_get_uint8(void) return output; } -static int entropy_mcux_rnga_get_entropy(struct device *dev, u8_t *buffer, - u16_t length) +static int entropy_mcux_rnga_get_entropy(const struct device *dev, + u8_t *buffer, + u16_t length) { int i; @@ -56,14 +57,14 @@ static const struct entropy_driver_api entropy_mcux_rnga_api_funcs = { .get_entropy = entropy_mcux_rnga_get_entropy }; -static int entropy_mcux_rnga_init(struct device *); +static int entropy_mcux_rnga_init(const struct device *); DEVICE_AND_API_INIT(entropy_mcux_rnga, DT_INST_LABEL(0), entropy_mcux_rnga_init, NULL, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_mcux_rnga_api_funcs); -static int entropy_mcux_rnga_init(struct device *dev) +static int entropy_mcux_rnga_init(const struct device *dev) { u32_t seed = k_cycle_get_32(); diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c index cb7096546672..fe34ce5503ab 100644 --- a/drivers/entropy/entropy_mcux_trng.c +++ b/drivers/entropy/entropy_mcux_trng.c @@ -17,7 +17,8 @@ struct mcux_entropy_config { TRNG_Type *base; }; -static int entropy_mcux_trng_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_mcux_trng_get_entropy(const struct device *dev, + u8_t *buffer, u16_t length) { const struct mcux_entropy_config *config = dev->config_info; @@ -39,14 +40,14 @@ static struct mcux_entropy_config entropy_mcux_config = { .base = (TRNG_Type *)DT_INST_REG_ADDR(0) }; -static int entropy_mcux_trng_init(struct device *); +static int entropy_mcux_trng_init(const struct device *); DEVICE_AND_API_INIT(entropy_mcux_trng, DT_INST_LABEL(0), entropy_mcux_trng_init, NULL, &entropy_mcux_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_mcux_trng_api_funcs); -static int entropy_mcux_trng_init(struct device *dev) +static int entropy_mcux_trng_init(const struct device *dev) { const struct mcux_entropy_config *config = dev->config_info; trng_config_t conf; diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c index ba84d0a08dfe..50cefd2d0274 100644 --- a/drivers/entropy/entropy_nrf5.c +++ b/drivers/entropy/entropy_nrf5.c @@ -227,7 +227,8 @@ static void isr(void *arg) } } -static int entropy_nrf5_get_entropy(struct device *device, u8_t *buf, u16_t len) +static int entropy_nrf5_get_entropy(const struct device *device, u8_t *buf, + u16_t len) { /* Check if this API is called on correct driver instance. */ __ASSERT_NO_MSG(&entropy_nrf5_data == DEV_DATA(device)); @@ -253,7 +254,8 @@ static int entropy_nrf5_get_entropy(struct device *device, u8_t *buf, u16_t len) return 0; } -static int entropy_nrf5_get_entropy_isr(struct device *dev, u8_t *buf, u16_t len, +static int entropy_nrf5_get_entropy_isr(const struct device *dev, u8_t *buf, + u16_t len, u32_t flags) { u16_t cnt = len; @@ -306,7 +308,7 @@ static int entropy_nrf5_get_entropy_isr(struct device *dev, u8_t *buf, u16_t len return cnt; } -static int entropy_nrf5_init(struct device *device); +static int entropy_nrf5_init(const struct device *device); static const struct entropy_driver_api entropy_nrf5_api_funcs = { .get_entropy = entropy_nrf5_get_entropy, @@ -318,7 +320,7 @@ DEVICE_AND_API_INIT(entropy_nrf5, DT_INST_LABEL(0), PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_nrf5_api_funcs); -static int entropy_nrf5_init(struct device *device) +static int entropy_nrf5_init(const struct device *device) { /* Check if this API is called on correct driver instance. */ __ASSERT_NO_MSG(&entropy_nrf5_data == DEV_DATA(device)); diff --git a/drivers/entropy/entropy_rv32m1_trng.c b/drivers/entropy/entropy_rv32m1_trng.c index 7f36f8c4d655..36b3ef943605 100644 --- a/drivers/entropy/entropy_rv32m1_trng.c +++ b/drivers/entropy/entropy_rv32m1_trng.c @@ -17,8 +17,9 @@ struct rv32m1_entropy_config { TRNG_Type *base; }; -static int entropy_rv32m1_trng_get_entropy(struct device *dev, u8_t *buffer, - u16_t length) +static int entropy_rv32m1_trng_get_entropy(const struct device *dev, + u8_t *buffer, + u16_t length) { const struct rv32m1_entropy_config *config = dev->config_info; status_t status; @@ -39,14 +40,14 @@ static struct rv32m1_entropy_config entropy_rv32m1_config = { .base = (TRNG_Type *)DT_INST_REG_ADDR(0) }; -static int entropy_rv32m1_trng_init(struct device *); +static int entropy_rv32m1_trng_init(const struct device *); DEVICE_AND_API_INIT(entropy_rv32m1_trng, DT_INST_LABEL(0), entropy_rv32m1_trng_init, NULL, &entropy_rv32m1_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_rv32m1_trng_api_funcs); -static int entropy_rv32m1_trng_init(struct device *dev) +static int entropy_rv32m1_trng_init(const struct device *dev) { const struct rv32m1_entropy_config *config = dev->config_info; trng_config_t conf; diff --git a/drivers/entropy/entropy_sam.c b/drivers/entropy/entropy_sam.c index 488ee67a42ce..17885701745e 100644 --- a/drivers/entropy/entropy_sam.c +++ b/drivers/entropy/entropy_sam.c @@ -72,8 +72,9 @@ static int entropy_sam_wait_ready(Trng * const trng, u32_t flags) return 0; } -static int entropy_sam_get_entropy_internal(struct device *dev, u8_t *buffer, - u16_t length, u32_t flags) +static int entropy_sam_get_entropy_internal(const struct device *dev, + u8_t *buffer, + u16_t length, u32_t flags) { Trng *const trng = DEV_CFG(dev)->regs; @@ -98,14 +99,14 @@ static int entropy_sam_get_entropy_internal(struct device *dev, u8_t *buffer, return 0; } -static int entropy_sam_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_sam_get_entropy(const struct device *dev, u8_t *buffer, u16_t length) { return entropy_sam_get_entropy_internal(dev, buffer, length, 0); } -static int entropy_sam_get_entropy_isr(struct device *dev, u8_t *buffer, - u16_t length, u32_t flags) +static int entropy_sam_get_entropy_isr(const struct device *dev, u8_t *buffer, + u16_t length, u32_t flags) { u16_t cnt = length; @@ -152,7 +153,7 @@ static int entropy_sam_get_entropy_isr(struct device *dev, u8_t *buffer, } } -static int entropy_sam_init(struct device *dev) +static int entropy_sam_init(const struct device *dev) { Trng *const trng = DEV_CFG(dev)->regs; diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c index f08f66aa7a23..e46904a33adb 100644 --- a/drivers/entropy/entropy_stm32.c +++ b/drivers/entropy/entropy_stm32.c @@ -25,7 +25,7 @@ struct entropy_stm32_rng_dev_cfg { struct entropy_stm32_rng_dev_data { RNG_TypeDef *rng; - struct device *clock; + const struct device *clock; }; #define DEV_DATA(dev) \ @@ -99,7 +99,8 @@ static int entropy_stm32_wait_ready(RNG_TypeDef *rng) } } -static int entropy_stm32_rng_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_stm32_rng_get_entropy(const struct device *dev, + u8_t *buffer, u16_t length) { struct entropy_stm32_rng_dev_data *dev_data; @@ -141,7 +142,7 @@ static int entropy_stm32_rng_get_entropy(struct device *dev, u8_t *buffer, return 0; } -static int entropy_stm32_rng_init(struct device *dev) +static int entropy_stm32_rng_init(const struct device *dev) { struct entropy_stm32_rng_dev_data *dev_data; const struct entropy_stm32_rng_dev_cfg *dev_cfg; diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c index 7fa786dae722..0542fc34be24 100644 --- a/drivers/entropy/fake_entropy_native_posix.c +++ b/drivers/entropy/fake_entropy_native_posix.c @@ -25,7 +25,8 @@ static unsigned int seed = 0x5678; -static int entropy_native_posix_get_entropy(struct device *dev, u8_t *buffer, +static int entropy_native_posix_get_entropy(const struct device *dev, + u8_t *buffer, u16_t length) { ARG_UNUSED(dev); @@ -47,7 +48,8 @@ static int entropy_native_posix_get_entropy(struct device *dev, u8_t *buffer, return 0; } -static int entropy_native_posix_get_entropy_isr(struct device *dev, u8_t *buf, +static int entropy_native_posix_get_entropy_isr(const struct device *dev, + u8_t *buf, u16_t len, u32_t flags) { ARG_UNUSED(flags); @@ -59,7 +61,7 @@ static int entropy_native_posix_get_entropy_isr(struct device *dev, u8_t *buf, return entropy_native_posix_get_entropy(dev, buf, len); } -static int entropy_native_posix_init(struct device *dev) +static int entropy_native_posix_init(const struct device *dev) { ARG_UNUSED(dev); srandom(seed); diff --git a/drivers/espi/espi_handlers.c b/drivers/espi/espi_handlers.c index 44c0f39c14b4..c865926c00e5 100644 --- a/drivers/espi/espi_handlers.c +++ b/drivers/espi/espi_handlers.c @@ -8,7 +8,8 @@ #include -static inline int z_vrfy_espi_config(struct device *dev, struct espi_cfg *cfg) +static inline int z_vrfy_espi_config(const struct device *dev, + struct espi_cfg *cfg) { struct espi_cfg cfg_copy; @@ -20,7 +21,7 @@ static inline int z_vrfy_espi_config(struct device *dev, struct espi_cfg *cfg) } #include -static inline bool z_vrfy_espi_get_channel_status(struct device *dev, +static inline bool z_vrfy_espi_get_channel_status(const struct device *dev, enum espi_channel ch) { Z_OOPS(Z_SYSCALL_DRIVER_ESPI(dev, get_channel_status)); @@ -29,7 +30,7 @@ static inline bool z_vrfy_espi_get_channel_status(struct device *dev, } #include -static inline int z_vrfy_espi_read_lpc_request(struct device *dev, +static inline int z_vrfy_espi_read_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -45,7 +46,7 @@ static inline int z_vrfy_espi_read_lpc_request(struct device *dev, } #include -static inline int z_vrfy_espi_write_lpc_request(struct device *dev, +static inline int z_vrfy_espi_write_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -58,7 +59,7 @@ static inline int z_vrfy_espi_write_lpc_request(struct device *dev, } #include -static inline int z_vrfy_espi_send_vwire(struct device *dev, +static inline int z_vrfy_espi_send_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t level) { @@ -68,7 +69,7 @@ static inline int z_vrfy_espi_send_vwire(struct device *dev, } #include -static inline int z_vrfy_espi_receive_vwire(struct device *dev, +static inline int z_vrfy_espi_receive_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t *level) { @@ -84,7 +85,7 @@ static inline int z_vrfy_espi_receive_vwire(struct device *dev, } #include -static inline int z_vrfy_espi_read_request(struct device *dev, +static inline int z_vrfy_espi_read_request(const struct device *dev, struct espi_request_packet *req) { int ret; @@ -104,7 +105,7 @@ static inline int z_vrfy_espi_read_request(struct device *dev, } #include -static inline int z_vrfy_espi_write_request(struct device *dev, +static inline int z_vrfy_espi_write_request(const struct device *dev, struct espi_request_packet *req) { int ret; @@ -121,7 +122,7 @@ static inline int z_vrfy_espi_write_request(struct device *dev, } #include -static inline int z_vrfy_espi_send_oob(struct device *dev, +static inline int z_vrfy_espi_send_oob(const struct device *dev, struct espi_oob_packet *pckt) { int ret; @@ -138,7 +139,7 @@ static inline int z_vrfy_espi_send_oob(struct device *dev, } #include -static inline int z_vrfy_espi_receive_oob(struct device *dev, +static inline int z_vrfy_espi_receive_oob(const struct device *dev, struct espi_oob_packet *pckt) { int ret; @@ -157,7 +158,7 @@ static inline int z_vrfy_espi_receive_oob(struct device *dev, } #include -static inline int z_vrfy_espi_read_flash(struct device *dev, +static inline int z_vrfy_espi_read_flash(const struct device *dev, struct espi_flash_packet *pckt) { int ret; @@ -176,7 +177,7 @@ static inline int z_vrfy_espi_read_flash(struct device *dev, } #include -static inline int z_vrfy_espi_write_flash(struct device *dev, +static inline int z_vrfy_espi_write_flash(const struct device *dev, struct espi_flash_packet *pckt) { int ret; @@ -193,7 +194,7 @@ static inline int z_vrfy_espi_write_flash(struct device *dev, } #include -static inline int z_vrfy_espi_flash_erase(struct device *dev, +static inline int z_vrfy_espi_flash_erase(const struct device *dev, struct espi_flash_packet *pckt) { int ret; diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c index f6c353330b6b..e5181eabd5e5 100644 --- a/drivers/espi/espi_mchp_xec.c +++ b/drivers/espi/espi_mchp_xec.c @@ -47,7 +47,7 @@ LOG_MODULE_REGISTER(espi, CONFIG_ESPI_LOG_LEVEL); struct espi_isr { u32_t girq_bit; - void (*the_isr)(struct device *dev); + void (*the_isr)(const struct device *dev); }; struct espi_xec_config { @@ -195,7 +195,7 @@ static u32_t slave_rx_mem[MAX_OOB_BUFFER_SIZE]; static u32_t slave_tx_mem[MAX_OOB_BUFFER_SIZE]; static u32_t slave_mem[MAX_SLAVE_BUFFER_SIZE]; -static int espi_xec_configure(struct device *dev, struct espi_cfg *cfg) +static int espi_xec_configure(const struct device *dev, struct espi_cfg *cfg) { u8_t iomode = 0; u8_t cap0 = ESPI_CAP_REGS->GLB_CAP0; @@ -286,7 +286,8 @@ static int espi_xec_configure(struct device *dev, struct espi_cfg *cfg) return 0; } -static bool espi_xec_channel_ready(struct device *dev, enum espi_channel ch) +static bool espi_xec_channel_ready(const struct device *dev, + enum espi_channel ch) { bool sts; @@ -311,7 +312,7 @@ static bool espi_xec_channel_ready(struct device *dev, enum espi_channel ch) return sts; } -static int espi_xec_read_lpc_request(struct device *dev, +static int espi_xec_read_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -344,7 +345,7 @@ static int espi_xec_read_lpc_request(struct device *dev, return 0; } -static int espi_xec_write_lpc_request(struct device *dev, +static int espi_xec_write_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -387,7 +388,7 @@ static int espi_xec_write_lpc_request(struct device *dev, return 0; } -static int espi_xec_send_vwire(struct device *dev, +static int espi_xec_send_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t level) { struct xec_signal signal_info = vw_tbl[signal]; @@ -425,7 +426,7 @@ static int espi_xec_send_vwire(struct device *dev, return 0; } -static int espi_xec_receive_vwire(struct device *dev, +static int espi_xec_receive_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t *level) { struct xec_signal signal_info = vw_tbl[signal]; @@ -450,7 +451,8 @@ static int espi_xec_receive_vwire(struct device *dev, return 0; } -static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt) +static int espi_xec_send_oob(const struct device *dev, + struct espi_oob_packet *pckt) { int ret; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -496,7 +498,7 @@ static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt) return 0; } -static int espi_xec_receive_oob(struct device *dev, +static int espi_xec_receive_oob(const struct device *dev, struct espi_oob_packet *pckt) { int ret; @@ -528,7 +530,7 @@ static int espi_xec_receive_oob(struct device *dev, return 0; } -static int espi_xec_flash_read(struct device *dev, +static int espi_xec_flash_read(const struct device *dev, struct espi_flash_packet *pckt) { int ret; @@ -576,8 +578,8 @@ static int espi_xec_flash_read(struct device *dev, return 0; } -static int espi_xec_flash_write(struct device *dev, - struct espi_flash_packet *pckt) +static int espi_xec_flash_write(const struct device *dev, + struct espi_flash_packet *pckt) { int ret; u32_t err_mask = MCHP_ESPI_FC_STS_IBERR | @@ -627,7 +629,7 @@ static int espi_xec_flash_write(struct device *dev, return 0; } -static int espi_xec_manage_callback(struct device *dev, +static int espi_xec_manage_callback(const struct device *dev, struct espi_callback *callback, bool set) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -635,7 +637,7 @@ static int espi_xec_manage_callback(struct device *dev, return espi_manage_callback(&data->callbacks, callback, set); } -static void send_slave_bootdone(struct device *dev) +static void send_slave_bootdone(const struct device *dev) { int ret; u8_t boot_done; @@ -648,7 +650,7 @@ static void send_slave_bootdone(struct device *dev) } } #ifdef CONFIG_ESPI_OOB_CHANNEL -static void espi_init_oob(struct device *dev) +static void espi_init_oob(const struct device *dev) { struct espi_xec_config *config = (struct espi_xec_config *) (dev->config_info); @@ -672,7 +674,7 @@ static void espi_init_oob(struct device *dev) #endif #ifdef CONFIG_ESPI_FLASH_CHANNEL -static void espi_init_flash(struct device *dev) +static void espi_init_flash(const struct device *dev) { struct espi_xec_config *config = (struct espi_xec_config *)(dev->config_info); @@ -689,7 +691,7 @@ static void espi_init_flash(struct device *dev) } #endif -static void espi_bus_init(struct device *dev) +static void espi_bus_init(const struct device *dev) { const struct espi_xec_config *config = dev->config_info; @@ -698,7 +700,7 @@ static void espi_bus_init(struct device *dev) MCHP_ESPI_VW_EN_GIRQ_VAL | MCHP_ESPI_PC_GIRQ_VAL; } -static void espi_rst_isr(struct device *dev) +static void espi_rst_isr(const struct device *dev) { u8_t rst_sts; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -732,7 +734,7 @@ static void espi_rst_isr(struct device *dev) * then make its BAR valid. * Refer to microchip eSPI I/O base addresses for default values */ -static void config_sub_devices(struct device *dev) +static void config_sub_devices(const struct device *dev) { #ifdef CONFIG_ESPI_PERIPHERAL_UART /* eSPI logical UART is tied to corresponding physical UART @@ -788,7 +790,7 @@ static void configure_sirq(void) #endif } -static void setup_espi_io_config(struct device *dev, u16_t host_address) +static void setup_espi_io_config(const struct device *dev, u16_t host_address) { ESPI_EIO_BAR_REGS->EC_BAR_IOC = (host_address << 16) | MCHP_ESPI_IO_BAR_HOST_VALID; @@ -802,7 +804,7 @@ static void setup_espi_io_config(struct device *dev, u16_t host_address) ESPI_CAP_REGS->PC_RDY = 1; } -static void espi_pc_isr(struct device *dev) +static void espi_pc_isr(const struct device *dev) { u32_t status = ESPI_PC_REGS->PC_STATUS; @@ -815,7 +817,7 @@ static void espi_pc_isr(struct device *dev) } } -static void espi_vwire_chanel_isr(struct device *dev) +static void espi_vwire_chanel_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); const struct espi_xec_config *config = dev->config_info; @@ -840,7 +842,7 @@ static void espi_vwire_chanel_isr(struct device *dev) } #ifdef CONFIG_ESPI_OOB_CHANNEL -static void espi_oob_down_isr(struct device *dev) +static void espi_oob_down_isr(const struct device *dev) { u32_t status; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -856,7 +858,7 @@ static void espi_oob_down_isr(struct device *dev) } } -static void espi_oob_up_isr(struct device *dev) +static void espi_oob_up_isr(const struct device *dev) { u32_t status; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -885,7 +887,7 @@ static void espi_oob_up_isr(struct device *dev) #endif #ifdef CONFIG_ESPI_FLASH_CHANNEL -static void espi_flash_isr(struct device *dev) +static void espi_flash_isr(const struct device *dev) { u32_t status; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -916,7 +918,7 @@ static void espi_flash_isr(struct device *dev) } #endif -static void vw_pltrst_isr(struct device *dev) +static void vw_pltrst_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); struct espi_event evt = { ESPI_BUS_EVENT_VWIRE_RECEIVED, @@ -938,7 +940,7 @@ static void vw_pltrst_isr(struct device *dev) } /* Send callbacks if enabled and track eSPI host system state */ -static void notify_system_state(struct device *dev, +static void notify_system_state(const struct device *dev, enum espi_vwire_signal signal) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -955,7 +957,7 @@ static void notify_system_state(struct device *dev, espi_send_callbacks(&data->callbacks, dev, evt); } -static void notify_host_warning(struct device *dev, +static void notify_host_warning(const struct device *dev, enum espi_vwire_signal signal) { u8_t status; @@ -992,42 +994,42 @@ static void notify_host_warning(struct device *dev, } } -static void vw_slp3_isr(struct device *dev) +static void vw_slp3_isr(const struct device *dev) { notify_system_state(dev, ESPI_VWIRE_SIGNAL_SLP_S3); } -static void vw_slp4_isr(struct device *dev) +static void vw_slp4_isr(const struct device *dev) { notify_system_state(dev, ESPI_VWIRE_SIGNAL_SLP_S4); } -static void vw_slp5_isr(struct device *dev) +static void vw_slp5_isr(const struct device *dev) { notify_system_state(dev, ESPI_VWIRE_SIGNAL_SLP_S5); } -static void vw_host_rst_warn_isr(struct device *dev) +static void vw_host_rst_warn_isr(const struct device *dev) { notify_host_warning(dev, ESPI_VWIRE_SIGNAL_HOST_RST_WARN); } -static void vw_sus_warn_isr(struct device *dev) +static void vw_sus_warn_isr(const struct device *dev) { notify_host_warning(dev, ESPI_VWIRE_SIGNAL_SUS_WARN); } -static void vw_oob_rst_isr(struct device *dev) +static void vw_oob_rst_isr(const struct device *dev) { notify_host_warning(dev, ESPI_VWIRE_SIGNAL_OOB_RST_WARN); } -static void vw_sus_slp_a_isr(struct device *dev) +static void vw_sus_slp_a_isr(const struct device *dev) { notify_system_state(dev, ESPI_VWIRE_SIGNAL_SLP_A); } -static void ibf_isr(struct device *dev) +static void ibf_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, @@ -1037,7 +1039,7 @@ static void ibf_isr(struct device *dev) espi_send_callbacks(&data->callbacks, dev, evt); } -static void ibf_kbc_isr(struct device *dev) +static void ibf_kbc_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); @@ -1058,7 +1060,7 @@ static void ibf_kbc_isr(struct device *dev) espi_send_callbacks(&data->callbacks, dev, evt); } -static void port80_isr(struct device *dev) +static void port80_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, @@ -1070,7 +1072,7 @@ static void port80_isr(struct device *dev) espi_send_callbacks(&data->callbacks, dev, evt); } -static void port81_isr(struct device *dev) +static void port81_isr(const struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, @@ -1131,7 +1133,7 @@ static u8_t periph_isr_cnt = sizeof(peripherals_isr) / sizeof(struct espi_isr); static void espi_xec_bus_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct espi_xec_config *config = dev->config_info; u32_t girq_result; @@ -1152,7 +1154,7 @@ static void espi_xec_bus_isr(void *arg) static void espi_xec_vw_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct espi_xec_config *config = dev->config_info; u32_t girq_result; @@ -1173,7 +1175,7 @@ static void espi_xec_vw_isr(void *arg) static void espi_xec_periph_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct espi_xec_config *config = dev->config_info; u32_t girq_result; @@ -1192,7 +1194,7 @@ static void espi_xec_periph_isr(void *arg) REG32(MCHP_GIRQ_SRC_ADDR(config->pc_girq_id)) = girq_result; } -static int espi_xec_init(struct device *dev); +static int espi_xec_init(const struct device *dev); static const struct espi_driver_api espi_xec_driver_api = { .config = espi_xec_configure, @@ -1222,7 +1224,7 @@ DEVICE_AND_API_INIT(espi_xec_0, DT_INST_LABEL(0), PRE_KERNEL_2, CONFIG_ESPI_INIT_PRIORITY, &espi_xec_driver_api); -static int espi_xec_init(struct device *dev) +static int espi_xec_init(const struct device *dev) { const struct espi_xec_config *config = dev->config_info; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); diff --git a/drivers/espi/espi_utils.h b/drivers/espi/espi_utils.h index be77ddd5a456..2ef265cd86af 100644 --- a/drivers/espi/espi_utils.h +++ b/drivers/espi/espi_utils.h @@ -49,7 +49,7 @@ static int espi_manage_callback(sys_slist_t *callbacks, * @param pins The details on the event that triggered the callback. */ static inline void espi_send_callbacks(sys_slist_t *list, - struct device *device, + const struct device *device, struct espi_event evt) { struct espi_callback *cb, *tmp; diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c index 2ad6f2e18e0f..96e6a7bdcb61 100644 --- a/drivers/ethernet/eth_e1000.c +++ b/drivers/ethernet/eth_e1000.c @@ -61,7 +61,7 @@ static const char *e1000_reg_to_string(enum e1000_reg_t r) return NULL; } -static enum ethernet_hw_caps e1000_caps(struct device *dev) +static enum ethernet_hw_caps e1000_caps(const struct device *dev) { return ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T | \ ETHERNET_LINK_1000BASE_T; @@ -86,7 +86,7 @@ static int e1000_tx(struct e1000_dev *dev, void *buf, size_t len) return (dev->tx.sta & TDESC_STA_DD) ? 0 : -EIO; } -static int e1000_send(struct device *device, struct net_pkt *pkt) +static int e1000_send(const struct device *device, struct net_pkt *pkt) { struct e1000_dev *dev = device->driver_data; size_t len = net_pkt_get_len(pkt); @@ -138,7 +138,7 @@ static struct net_pkt *e1000_rx(struct e1000_dev *dev) return pkt; } -static void e1000_isr(struct device *device) +static void e1000_isr(const struct device *device) { struct e1000_dev *dev = device->driver_data; u32_t icr = ior32(dev, ICR); /* Cleared upon read */ @@ -165,7 +165,7 @@ static void e1000_isr(struct device *device) #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_I82540EM 0x100e -int e1000_probe(struct device *device) +int e1000_probe(const struct device *device) { const pcie_bdf_t bdf = PCIE_BDF(0, 3, 0); struct e1000_dev *dev = device->driver_data; @@ -182,7 +182,7 @@ int e1000_probe(struct device *device) return retval; } -static struct device DEVICE_NAME_GET(eth_e1000); +DEVICE_DECLARE(eth_e1000); static void e1000_init(struct net_if *iface) { diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c index 5c781683e471..9d4d03b4ee72 100644 --- a/drivers/ethernet/eth_enc28j60.c +++ b/drivers/ethernet/eth_enc28j60.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #define D10D24S 11 -static int eth_enc28j60_soft_reset(struct device *dev) +static int eth_enc28j60_soft_reset(const struct device *dev) { struct eth_enc28j60_runtime *context = dev->driver_data; u8_t buf[2] = { ENC28J60_SPI_SC, 0xFF }; @@ -44,7 +44,7 @@ static int eth_enc28j60_soft_reset(struct device *dev) return spi_write(context->spi, &context->spi_cfg, &tx); } -static void eth_enc28j60_set_bank(struct device *dev, u16_t reg_addr) +static void eth_enc28j60_set_bank(const struct device *dev, u16_t reg_addr) { struct eth_enc28j60_runtime *context = dev->driver_data; u8_t buf[2]; @@ -78,7 +78,7 @@ static void eth_enc28j60_set_bank(struct device *dev, u16_t reg_addr) } } -static void eth_enc28j60_write_reg(struct device *dev, u16_t reg_addr, +static void eth_enc28j60_write_reg(const struct device *dev, u16_t reg_addr, u8_t value) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -98,7 +98,7 @@ static void eth_enc28j60_write_reg(struct device *dev, u16_t reg_addr, spi_write(context->spi, &context->spi_cfg, &tx); } -static void eth_enc28j60_read_reg(struct device *dev, u16_t reg_addr, +static void eth_enc28j60_read_reg(const struct device *dev, u16_t reg_addr, u8_t *value) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -137,7 +137,7 @@ static void eth_enc28j60_read_reg(struct device *dev, u16_t reg_addr, } } -static void eth_enc28j60_set_eth_reg(struct device *dev, u16_t reg_addr, +static void eth_enc28j60_set_eth_reg(const struct device *dev, u16_t reg_addr, u8_t value) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -158,7 +158,8 @@ static void eth_enc28j60_set_eth_reg(struct device *dev, u16_t reg_addr, } -static void eth_enc28j60_clear_eth_reg(struct device *dev, u16_t reg_addr, +static void eth_enc28j60_clear_eth_reg(const struct device *dev, + u16_t reg_addr, u8_t value) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -178,7 +179,8 @@ static void eth_enc28j60_clear_eth_reg(struct device *dev, u16_t reg_addr, spi_write(context->spi, &context->spi_cfg, &tx); } -static void eth_enc28j60_write_mem(struct device *dev, u8_t *data_buffer, +static void eth_enc28j60_write_mem(const struct device *dev, + u8_t *data_buffer, u16_t buf_len) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -220,7 +222,7 @@ static void eth_enc28j60_write_mem(struct device *dev, u8_t *data_buffer, } } -static void eth_enc28j60_read_mem(struct device *dev, u8_t *data_buffer, +static void eth_enc28j60_read_mem(const struct device *dev, u8_t *data_buffer, u16_t buf_len) { struct eth_enc28j60_runtime *context = dev->driver_data; @@ -271,7 +273,7 @@ static void eth_enc28j60_read_mem(struct device *dev, u8_t *data_buffer, } } -static void eth_enc28j60_write_phy(struct device *dev, u16_t reg_addr, +static void eth_enc28j60_write_phy(const struct device *dev, u16_t reg_addr, s16_t data) { u8_t data_mistat; @@ -290,7 +292,7 @@ static void eth_enc28j60_write_phy(struct device *dev, u16_t reg_addr, } while ((data_mistat & ENC28J60_BIT_MISTAT_BUSY)); } -static void eth_enc28j60_gpio_callback(struct device *dev, +static void eth_enc28j60_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -300,7 +302,7 @@ static void eth_enc28j60_gpio_callback(struct device *dev, k_sem_give(&context->int_sem); } -static void eth_enc28j60_init_buffers(struct device *dev) +static void eth_enc28j60_init_buffers(const struct device *dev) { u8_t data_estat; @@ -347,7 +349,7 @@ static void eth_enc28j60_init_buffers(struct device *dev) } while (!(data_estat & ENC28J60_BIT_ESTAT_CLKRDY)); } -static void eth_enc28j60_init_mac(struct device *dev) +static void eth_enc28j60_init_mac(const struct device *dev) { const struct eth_enc28j60_config *config = dev->config_info; struct eth_enc28j60_runtime *context = dev->driver_data; @@ -397,7 +399,7 @@ static void eth_enc28j60_init_mac(struct device *dev) context->mac_address[0]); } -static void eth_enc28j60_init_phy(struct device *dev) +static void eth_enc28j60_init_phy(const struct device *dev) { const struct eth_enc28j60_config *config = dev->config_info; @@ -431,7 +433,7 @@ static struct net_if *get_iface(struct eth_enc28j60_runtime *ctx, #endif } -static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt) +static int eth_enc28j60_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_enc28j60_runtime *context = dev->driver_data; u16_t tx_bufaddr = ENC28J60_TXSTART; @@ -504,7 +506,7 @@ static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag) +static int eth_enc28j60_rx(const struct device *dev, u16_t *vlan_tag) { const struct eth_enc28j60_config *config = dev->config_info; struct eth_enc28j60_runtime *context = dev->driver_data; @@ -657,7 +659,7 @@ static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag) return 0; } -static void eth_enc28j60_rx_thread(struct device *dev) +static void eth_enc28j60_rx_thread(const struct device *dev) { struct eth_enc28j60_runtime *context = dev->driver_data; u16_t vlan_tag = NET_VLAN_TAG_UNSPEC; @@ -677,7 +679,7 @@ static void eth_enc28j60_rx_thread(struct device *dev) } } -static enum ethernet_hw_caps eth_enc28j60_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_enc28j60_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -690,7 +692,7 @@ static enum ethernet_hw_caps eth_enc28j60_get_capabilities(struct device *dev) static void eth_enc28j60_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_enc28j60_runtime *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_address, @@ -715,7 +717,7 @@ static const struct ethernet_api api_funcs = { .send = eth_enc28j60_tx, }; -static int eth_enc28j60_init(struct device *dev) +static int eth_enc28j60_init(const struct device *dev) { const struct eth_enc28j60_config *config = dev->config_info; struct eth_enc28j60_runtime *context = dev->driver_data; diff --git a/drivers/ethernet/eth_enc28j60_priv.h b/drivers/ethernet/eth_enc28j60_priv.h index b90d03b7e403..b8b5aafb2911 100644 --- a/drivers/ethernet/eth_enc28j60_priv.h +++ b/drivers/ethernet/eth_enc28j60_priv.h @@ -232,8 +232,8 @@ struct eth_enc28j60_runtime { CONFIG_ETH_ENC28J60_RX_THREAD_STACK_SIZE); struct k_thread thread; u8_t mac_address[6]; - struct device *gpio; - struct device *spi; + const struct device *gpio; + const struct device *spi; struct spi_cs_control spi_cs; struct spi_config spi_cfg; struct gpio_callback gpio_cb; diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c index 88834d161971..91ebf7c433c5 100644 --- a/drivers/ethernet/eth_enc424j600.c +++ b/drivers/ethernet/eth_enc424j600.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(ethdrv, CONFIG_ETHERNET_LOG_LEVEL); -static void enc424j600_write_sbc(struct device *dev, u8_t cmd) +static void enc424j600_write_sbc(const struct device *dev, u8_t cmd) { struct enc424j600_runtime *context = dev->driver_data; u8_t buf[2] = { cmd, 0xFF }; @@ -39,7 +39,7 @@ static void enc424j600_write_sbc(struct device *dev, u8_t cmd) spi_write(context->spi, &context->spi_cfg, &tx); } -static void enc424j600_write_sfru(struct device *dev, u8_t addr, +static void enc424j600_write_sfru(const struct device *dev, u8_t addr, u16_t value) { struct enc424j600_runtime *context = dev->driver_data; @@ -61,7 +61,7 @@ static void enc424j600_write_sfru(struct device *dev, u8_t addr, spi_write(context->spi, &context->spi_cfg, &tx); } -static void enc424j600_read_sfru(struct device *dev, u8_t addr, +static void enc424j600_read_sfru(const struct device *dev, u8_t addr, u16_t *value) { struct enc424j600_runtime *context = dev->driver_data; @@ -94,7 +94,7 @@ static void enc424j600_read_sfru(struct device *dev, u8_t addr, } } -static void enc424j600_modify_sfru(struct device *dev, u8_t opcode, +static void enc424j600_modify_sfru(const struct device *dev, u8_t opcode, u16_t addr, u16_t value) { struct enc424j600_runtime *context = dev->driver_data; @@ -123,7 +123,8 @@ static void enc424j600_modify_sfru(struct device *dev, u8_t opcode, enc424j600_modify_sfru(dev, ENC424J600_NBC_BFCU, addr, value) -static void enc424j600_write_phy(struct device *dev, u16_t addr, u16_t data) +static void enc424j600_write_phy(const struct device *dev, u16_t addr, + u16_t data) { u16_t mistat; @@ -136,7 +137,8 @@ static void enc424j600_write_phy(struct device *dev, u16_t addr, u16_t data) } while ((mistat & ENC424J600_MISTAT_BUSY)); } -static void enc424j600_read_phy(struct device *dev, u16_t addr, u16_t *data) +static void enc424j600_read_phy(const struct device *dev, u16_t addr, + u16_t *data) { u16_t mistat; @@ -153,7 +155,7 @@ static void enc424j600_read_phy(struct device *dev, u16_t addr, u16_t *data) enc424j600_read_sfru(dev, ENC424J600_SFR3_MIRDL, data); } -static void enc424j600_write_mem(struct device *dev, u8_t opcode, +static void enc424j600_write_mem(const struct device *dev, u8_t opcode, u8_t *data_buffer, u16_t buf_len) { struct enc424j600_runtime *context = dev->driver_data; @@ -179,7 +181,7 @@ static void enc424j600_write_mem(struct device *dev, u8_t opcode, } } -static void enc424j600_read_mem(struct device *dev, u8_t opcode, +static void enc424j600_read_mem(const struct device *dev, u8_t opcode, u8_t *data_buffer, u16_t buf_len) { struct enc424j600_runtime *context = dev->driver_data; @@ -213,7 +215,7 @@ static void enc424j600_read_mem(struct device *dev, u8_t opcode, } } -static void enc424j600_gpio_callback(struct device *dev, +static void enc424j600_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -223,7 +225,7 @@ static void enc424j600_gpio_callback(struct device *dev, k_sem_give(&context->int_sem); } -static void enc424j600_init_filters(struct device *dev) +static void enc424j600_init_filters(const struct device *dev) { u16_t tmp; @@ -239,7 +241,7 @@ static void enc424j600_init_filters(struct device *dev) } } -static void enc424j600_init_phy(struct device *dev) +static void enc424j600_init_phy(const struct device *dev) { u16_t tmp; @@ -261,7 +263,7 @@ static void enc424j600_init_phy(struct device *dev) enc424j600_write_phy(dev, ENC424J600_PSFR_PHCON1, tmp); } -static void enc424j600_setup_mac(struct device *dev) +static void enc424j600_setup_mac(const struct device *dev) { u16_t tmp; u16_t macon2; @@ -302,7 +304,7 @@ static void enc424j600_setup_mac(struct device *dev) } } -static int enc424j600_tx(struct device *dev, struct net_pkt *pkt) +static int enc424j600_tx(const struct device *dev, struct net_pkt *pkt) { struct enc424j600_runtime *context = dev->driver_data; u16_t len = net_pkt_get_len(pkt); @@ -341,7 +343,7 @@ static int enc424j600_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static int enc424j600_rx(struct device *dev) +static int enc424j600_rx(const struct device *dev) { struct enc424j600_runtime *context = dev->driver_data; const struct enc424j600_config *config = dev->config_info; @@ -439,7 +441,7 @@ static int enc424j600_rx(struct device *dev) return 0; } -static void enc424j600_rx_thread(struct device *dev) +static void enc424j600_rx_thread(const struct device *dev) { struct enc424j600_runtime *context = dev->driver_data; u16_t eir; @@ -493,7 +495,7 @@ static void enc424j600_rx_thread(struct device *dev) } } -static enum ethernet_hw_caps enc424j600_get_capabilities(struct device *dev) +static enum ethernet_hw_caps enc424j600_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -502,7 +504,7 @@ static enum ethernet_hw_caps enc424j600_get_capabilities(struct device *dev) static void enc424j600_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct enc424j600_runtime *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_address, @@ -515,7 +517,7 @@ static void enc424j600_iface_init(struct net_if *iface) context->iface_initialized = true; } -static int enc424j600_start_device(struct device *dev) +static int enc424j600_start_device(const struct device *dev) { struct enc424j600_runtime *context = dev->driver_data; u16_t tmp; @@ -545,7 +547,7 @@ static int enc424j600_start_device(struct device *dev) return 0; } -static int enc424j600_stop_device(struct device *dev) +static int enc424j600_stop_device(const struct device *dev) { struct enc424j600_runtime *context = dev->driver_data; u16_t tmp; @@ -594,7 +596,7 @@ static const struct ethernet_api api_funcs = { .stop = enc424j600_stop_device, }; -static int enc424j600_init(struct device *dev) +static int enc424j600_init(const struct device *dev) { const struct enc424j600_config *config = dev->config_info; struct enc424j600_runtime *context = dev->driver_data; diff --git a/drivers/ethernet/eth_enc424j600_priv.h b/drivers/ethernet/eth_enc424j600_priv.h index ee8b48f6f41d..5912ea4dd4a2 100644 --- a/drivers/ethernet/eth_enc424j600_priv.h +++ b/drivers/ethernet/eth_enc424j600_priv.h @@ -293,8 +293,8 @@ struct enc424j600_runtime { struct k_thread thread; u8_t mac_address[6]; - struct device *gpio; - struct device *spi; + const struct device *gpio; + const struct device *spi; struct spi_cs_control spi_cs; struct spi_config spi_cfg; struct gpio_callback gpio_cb; diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c index 39098b849a56..4ff9f36cb492 100644 --- a/drivers/ethernet/eth_gecko.c +++ b/drivers/ethernet/eth_gecko.c @@ -63,7 +63,7 @@ static void link_configure(ETH_TypeDef *eth, u32_t flags) eth->NETWORKCTRL |= (ETH_NETWORKCTRL_ENBTX | ETH_NETWORKCTRL_ENBRX); } -static void eth_gecko_setup_mac(struct device *dev) +static void eth_gecko_setup_mac(const struct device *dev) { const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); ETH_TypeDef *eth = cfg->regs; @@ -134,7 +134,7 @@ static void rx_error_handler(ETH_TypeDef *eth) ETH_RX_ENABLE(eth); } -static struct net_pkt *frame_get(struct device *dev) +static struct net_pkt *frame_get(const struct device *dev) { struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); @@ -234,7 +234,7 @@ static struct net_pkt *frame_get(struct device *dev) return rx_frame; } -static void eth_rx(struct device *dev) +static void eth_rx(const struct device *dev) { struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); struct net_pkt *rx_frame; @@ -260,7 +260,7 @@ static void eth_rx(struct device *dev) } } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); @@ -324,7 +324,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) static void rx_thread(void *arg1, void *unused1, void *unused2) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); int res; @@ -369,7 +369,7 @@ static void rx_thread(void *arg1, void *unused1, void *unused2) static void eth_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); ETH_TypeDef *eth = cfg->regs; @@ -421,7 +421,7 @@ static void eth_isr(void *arg) eth->IFCR = int_clr; } -static void eth_init_clocks(struct device *dev) +static void eth_init_clocks(const struct device *dev) { __ASSERT_NO_MSG(dev != NULL); @@ -429,7 +429,7 @@ static void eth_init_clocks(struct device *dev) CMU_ClockEnable(cmuClock_ETH, true); } -static void eth_init_pins(struct device *dev) +static void eth_init_pins(const struct device *dev) { const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); ETH_TypeDef *eth = cfg->regs; @@ -461,7 +461,7 @@ static void eth_init_pins(struct device *dev) } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); ETH_TypeDef *eth = cfg->regs; @@ -497,7 +497,7 @@ static void generate_mac(u8_t mac_addr[6]) static void eth_iface_init(struct net_if *iface) { - struct device *const dev = net_if_get_device(iface); + const struct device *const dev = net_if_get_device(iface); struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev); const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev); ETH_TypeDef *eth = cfg->regs; @@ -617,7 +617,7 @@ static void eth_iface_init(struct net_if *iface) 0, K_NO_WAIT); } -static enum ethernet_hw_caps eth_gecko_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_gecko_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -631,7 +631,7 @@ static const struct ethernet_api eth_api = { .send = eth_tx, }; -static struct device DEVICE_NAME_GET(eth_gecko); +DEVICE_DECLARE(eth_gecko); static void eth0_irq_config(void) { diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c index 34ac2b9e5eaa..68be004a2207 100644 --- a/drivers/ethernet/eth_liteeth.c +++ b/drivers/ethernet/eth_liteeth.c @@ -72,7 +72,7 @@ struct eth_liteeth_config { void (*config_func)(void); }; -static int eth_initialize(struct device *dev) +static int eth_initialize(const struct device *dev) { const struct eth_liteeth_config *config = dev->config_info; @@ -81,7 +81,7 @@ static int eth_initialize(struct device *dev) return 0; } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { int key; u16_t len; @@ -113,7 +113,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static void eth_rx(struct device *port) +static void eth_rx(const struct device *port) { struct net_pkt *pkt; struct eth_liteeth_dev_data *context = port->driver_data; @@ -158,7 +158,7 @@ static void eth_rx(struct device *port) irq_unlock(key); } -static void eth_irq_handler(struct device *port) +static void eth_irq_handler(const struct device *port) { /* check sram reader events (tx) */ if (sys_read8(LITEETH_TX_EV_PENDING) & LITEETH_EV_TX) { @@ -190,7 +190,7 @@ static const struct eth_liteeth_config eth_config = { static void eth_iface_init(struct net_if *iface) { - struct device *port = net_if_get_device(iface); + const struct device *port = net_if_get_device(iface); struct eth_liteeth_dev_data *context = port->driver_data; static bool init_done; @@ -231,7 +231,7 @@ static void eth_iface_init(struct net_if *iface) init_done = true; } -static enum ethernet_hw_caps eth_caps(struct device *dev) +static enum ethernet_hw_caps eth_caps(const struct device *dev) { ARG_UNUSED(dev); return ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T | diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index a2d6bd1ec354..9ea926122f4e 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -60,7 +60,7 @@ enum eth_mcux_phy_state { eth_mcux_phy_state_closing }; -static void eth_mcux_init(struct device *dev); +static void eth_mcux_init(const struct device *dev); static const char * phy_state_name(enum eth_mcux_phy_state state) __attribute__((unused)); @@ -106,11 +106,11 @@ struct eth_context { #ifdef CONFIG_NET_POWER_MANAGEMENT const char *clock_name; clock_ip_name_t clock; - struct device *clock_dev; + const struct device *clock_dev; #endif enet_handle_t enet_handle; #if defined(CONFIG_PTP_CLOCK_MCUX) - struct device *ptp_clock; + const struct device *ptp_clock; enet_ptp_config_t ptp_config; float clk_ratio; #endif @@ -187,7 +187,7 @@ tx_buffer[CONFIG_ETH_MCUX_TX_BUFFERS][ETH_MCUX_BUFFER_SIZE]; static void eth_mcux_phy_enter_reset(struct eth_context *context); void eth_mcux_phy_stop(struct eth_context *context); -static int eth_mcux_device_pm_control(struct device *dev, u32_t command, +static int eth_mcux_device_pm_control(const struct device *dev, u32_t command, void *context, device_pm_cb cb, void *arg) { struct eth_context *eth_ctx = (struct eth_context *)dev->driver_data; @@ -626,7 +626,7 @@ static bool eth_get_ptp_data(struct net_if *iface, struct net_pkt *pkt, } #endif /* CONFIG_PTP_CLOCK_MCUX */ -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_context *context = dev->driver_data; u16_t total_len = net_pkt_get_len(pkt); @@ -688,7 +688,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static void eth_rx(struct device *iface) +static void eth_rx(const struct device *iface) { struct eth_context *context = iface->driver_data; u16_t vlan_tag = NET_VLAN_TAG_UNSPEC; @@ -845,7 +845,7 @@ static inline void ts_register_tx_event(struct eth_context *context) static void eth_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param) { - struct device *iface = param; + const struct device *iface = param; struct eth_context *context = iface->driver_data; switch (event) { @@ -916,7 +916,7 @@ static void generate_eth1_unique_mac(u8_t *mac_addr) } #endif -static void eth_mcux_init(struct device *dev) +static void eth_mcux_init(const struct device *dev) { struct eth_context *context = dev->driver_data; enet_config_t enet_config; @@ -998,12 +998,12 @@ static void eth_mcux_init(struct device *dev) /* handle PHY setup after SMI initialization */ eth_mcux_phy_setup(context); - ENET_SetCallback(&context->enet_handle, eth_callback, dev); + ENET_SetCallback(&context->enet_handle, eth_callback, (void *)dev); eth_mcux_phy_start(context); } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -1049,7 +1049,7 @@ static void net_if_mcast_cb(struct net_if *iface, const struct in6_addr *addr, bool is_joined) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; struct net_eth_addr mac_addr; @@ -1065,7 +1065,7 @@ static void net_if_mcast_cb(struct net_if *iface, static void eth_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; #if defined(CONFIG_NET_IPV6) @@ -1092,7 +1092,7 @@ static void eth_iface_init(struct net_if *iface) context->config_func(); } -static enum ethernet_hw_caps eth_mcux_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_mcux_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -1109,7 +1109,7 @@ static enum ethernet_hw_caps eth_mcux_get_capabilities(struct device *dev) } #if defined(CONFIG_PTP_CLOCK_MCUX) -static struct device *eth_mcux_get_ptp_clock(struct device *dev) +static const struct device *eth_mcux_get_ptp_clock(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -1129,7 +1129,7 @@ static const struct ethernet_api api_funcs = { #if defined(CONFIG_PTP_CLOCK_MCUX) static void eth_mcux_ptp_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; struct eth_context *context = dev->driver_data; ENET_Ptp1588TimerIRQHandler(context->base, &context->enet_handle); @@ -1139,7 +1139,7 @@ static void eth_mcux_ptp_isr(void *p) #if DT_INST_IRQ_HAS_NAME(0, common) static void eth_mcux_dispacher_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; struct eth_context *context = dev->driver_data; u32_t EIR = ENET_GetInterruptStatus(context->base); int irq_lock_key = irq_lock(); @@ -1162,7 +1162,7 @@ static void eth_mcux_dispacher_isr(void *p) #if DT_INST_IRQ_HAS_NAME(0, rx) static void eth_mcux_rx_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; struct eth_context *context = dev->driver_data; ENET_ReceiveIRQHandler(context->base, &context->enet_handle); @@ -1172,7 +1172,7 @@ static void eth_mcux_rx_isr(void *p) #if DT_INST_IRQ_HAS_NAME(0, tx) static void eth_mcux_tx_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; struct eth_context *context = dev->driver_data; ENET_TransmitIRQHandler(context->base, &context->enet_handle); @@ -1182,7 +1182,7 @@ static void eth_mcux_tx_isr(void *p) #if DT_INST_IRQ_HAS_NAME(0, err_misc) static void eth_mcux_error_isr(void *p) { - struct device *dev = p; + const struct device *dev = p; struct eth_context *context = dev->driver_data; u32_t pending = ENET_GetInterruptStatus(context->base); @@ -1311,7 +1311,8 @@ struct ptp_context { static struct ptp_context ptp_mcux_0_context; -static int ptp_clock_mcux_set(struct device *dev, struct net_ptp_time *tm) +static int ptp_clock_mcux_set(const struct device *dev, + struct net_ptp_time *tm) { struct ptp_context *ptp_context = dev->driver_data; struct eth_context *context = ptp_context->eth_context; @@ -1324,7 +1325,8 @@ static int ptp_clock_mcux_set(struct device *dev, struct net_ptp_time *tm) return 0; } -static int ptp_clock_mcux_get(struct device *dev, struct net_ptp_time *tm) +static int ptp_clock_mcux_get(const struct device *dev, + struct net_ptp_time *tm) { struct ptp_context *ptp_context = dev->driver_data; struct eth_context *context = ptp_context->eth_context; @@ -1337,7 +1339,7 @@ static int ptp_clock_mcux_get(struct device *dev, struct net_ptp_time *tm) return 0; } -static int ptp_clock_mcux_adjust(struct device *dev, int increment) +static int ptp_clock_mcux_adjust(const struct device *dev, int increment) { struct ptp_context *ptp_context = dev->driver_data; struct eth_context *context = ptp_context->eth_context; @@ -1364,7 +1366,7 @@ static int ptp_clock_mcux_adjust(struct device *dev, int increment) return ret; } -static int ptp_clock_mcux_rate_adjust(struct device *dev, float ratio) +static int ptp_clock_mcux_rate_adjust(const struct device *dev, float ratio) { const int hw_inc = NSEC_PER_SEC / CONFIG_ETH_MCUX_PTP_CLOCK_SRC_HZ; struct ptp_context *ptp_context = dev->driver_data; @@ -1422,9 +1424,9 @@ static const struct ptp_clock_driver_api api = { .rate_adjust = ptp_clock_mcux_rate_adjust, }; -static int ptp_mcux_init(struct device *port) +static int ptp_mcux_init(const struct device *port) { - struct device *eth_dev = DEVICE_GET(eth_mcux_0); + const struct device *eth_dev = DEVICE_GET(eth_mcux_0); struct eth_context *context = eth_dev->driver_data; struct ptp_context *ptp_context = port->driver_data; diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c index 4e8947815cfe..bc8198f1164b 100644 --- a/drivers/ethernet/eth_native_posix.c +++ b/drivers/ethernet/eth_native_posix.c @@ -61,7 +61,7 @@ struct eth_context { struct net_stats_eth stats; #endif #if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK) - struct device *ptp_clock; + const struct device *ptp_clock; #endif }; @@ -174,7 +174,7 @@ static void update_gptp(struct net_if *iface, struct net_pkt *pkt, #define update_gptp(iface, pkt, send) #endif /* CONFIG_NET_GPTP */ -static int eth_send(struct device *dev, struct net_pkt *pkt) +static int eth_send(const struct device *dev, struct net_pkt *pkt) { struct eth_context *ctx = dev->driver_data; int count = net_pkt_get_len(pkt); @@ -197,7 +197,7 @@ static int eth_send(struct device *dev, struct net_pkt *pkt) return ret < 0 ? ret : 0; } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { ARG_UNUSED(dev); return 0; @@ -456,7 +456,7 @@ static void eth_iface_init(struct net_if *iface) } static -enum ethernet_hw_caps eth_posix_native_get_capabilities(struct device *dev) +enum ethernet_hw_caps eth_posix_native_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -477,7 +477,7 @@ enum ethernet_hw_caps eth_posix_native_get_capabilities(struct device *dev) } #if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK) -static struct device *eth_get_ptp_clock(struct device *dev) +static const struct device *eth_get_ptp_clock(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -486,7 +486,7 @@ static struct device *eth_get_ptp_clock(struct device *dev) #endif #if defined(CONFIG_NET_STATISTICS_ETHERNET) -static struct net_stats_eth *get_stats(struct device *dev) +static struct net_stats_eth *get_stats(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -494,7 +494,7 @@ static struct net_stats_eth *get_stats(struct device *dev) } #endif -static int set_config(struct device *dev, +static int set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -526,7 +526,7 @@ static int set_config(struct device *dev, } #if defined(CONFIG_NET_VLAN) -static int vlan_setup(struct device *dev, struct net_if *iface, +static int vlan_setup(const struct device *dev, struct net_if *iface, u16_t tag, bool enable) { if (enable) { @@ -539,7 +539,7 @@ static int vlan_setup(struct device *dev, struct net_if *iface, } #endif /* CONFIG_NET_VLAN */ -static int eth_start_device(struct device *dev) +static int eth_start_device(const struct device *dev) { struct eth_context *context = dev->driver_data; int ret; @@ -553,7 +553,7 @@ static int eth_start_device(struct device *dev) return ret; } -static int eth_stop_device(struct device *dev) +static int eth_stop_device(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -595,7 +595,7 @@ struct ptp_context { static struct ptp_context ptp_0_context; -static int ptp_clock_set_native_posix(struct device *clk, +static int ptp_clock_set_native_posix(const struct device *clk, struct net_ptp_time *tm) { ARG_UNUSED(clk); @@ -608,7 +608,7 @@ static int ptp_clock_set_native_posix(struct device *clk, return 0; } -static int ptp_clock_get_native_posix(struct device *clk, +static int ptp_clock_get_native_posix(const struct device *clk, struct net_ptp_time *tm) { ARG_UNUSED(clk); @@ -616,7 +616,7 @@ static int ptp_clock_get_native_posix(struct device *clk, return eth_clock_gettime(tm); } -static int ptp_clock_adjust_native_posix(struct device *clk, +static int ptp_clock_adjust_native_posix(const struct device *clk, int increment) { ARG_UNUSED(clk); @@ -629,7 +629,7 @@ static int ptp_clock_adjust_native_posix(struct device *clk, return 0; } -static int ptp_clock_rate_adjust_native_posix(struct device *clk, +static int ptp_clock_rate_adjust_native_posix(const struct device *clk, float ratio) { ARG_UNUSED(clk); @@ -649,9 +649,9 @@ static const struct ptp_clock_driver_api api = { .rate_adjust = ptp_clock_rate_adjust_native_posix, }; -static int ptp_init(struct device *port) +static int ptp_init(const struct device *port) { - struct device *eth_dev = DEVICE_GET(eth_native_posix); + const struct device *eth_dev = DEVICE_GET(eth_native_posix); struct eth_context *context = eth_dev->driver_data; struct ptp_context *ptp_context = port->driver_data; diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c index 8feea4966377..fa70b593a6a0 100644 --- a/drivers/ethernet/eth_sam_gmac.c +++ b/drivers/ethernet/eth_sam_gmac.c @@ -1350,7 +1350,7 @@ static void eth_rx(struct gmac_queue *queue) u16_t vlan_tag = NET_VLAN_TAG_UNSPEC; struct net_pkt *rx_frame; #if defined(CONFIG_PTP_CLOCK_SAM_GMAC) - struct device *const dev = net_if_get_device(dev_data->iface); + const struct device *const dev = net_if_get_device(dev_data->iface); const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); Gmac *gmac = cfg->regs; struct gptp_hdr *hdr; @@ -1443,7 +1443,7 @@ static int priority2queue(enum net_priority priority) } #endif -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); struct eth_sam_dev_data *const dev_data = DEV_DATA(dev); @@ -1626,7 +1626,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) static void queue0_isr(void *arg) { - struct device *const dev = (struct device *const)arg; + const struct device *const dev = (const struct device *const)arg; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); struct eth_sam_dev_data *const dev_data = DEV_DATA(dev); Gmac *gmac = cfg->regs; @@ -1677,7 +1677,7 @@ static void queue0_isr(void *arg) #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 1 static inline void priority_queue_isr(void *arg, unsigned int queue_idx) { - struct device *const dev = (struct device *const)arg; + const struct device *const dev = (const struct device *const)arg; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); struct eth_sam_dev_data *const dev_data = DEV_DATA(dev); Gmac *gmac = cfg->regs; @@ -1760,7 +1760,7 @@ static void queue5_isr(void *arg) } #endif -static int eth_initialize(struct device *dev) +static int eth_initialize(const struct device *dev) { const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); @@ -1784,7 +1784,7 @@ static int eth_initialize(struct device *dev) #ifdef CONFIG_ETH_SAM_GMAC_MAC_I2C_EEPROM static void get_mac_addr_from_i2c_eeprom(u8_t mac_addr[6]) { - struct device *dev; + const struct device *dev; u32_t iaddr = CONFIG_ETH_SAM_GMAC_MAC_I2C_INT_ADDRESS; dev = device_get_binding(CONFIG_ETH_SAM_GMAC_MAC_I2C_DEV_NAME); @@ -1812,7 +1812,7 @@ static void monitor_work_handler(struct k_work *work) { struct eth_sam_dev_data *const dev_data = CONTAINER_OF(work, struct eth_sam_dev_data, monitor_work); - struct device *const dev = net_if_get_device(dev_data->iface); + const struct device *const dev = net_if_get_device(dev_data->iface); const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); bool link_status; u32_t link_config; @@ -1853,7 +1853,7 @@ static void monitor_work_handler(struct k_work *work) static void eth0_iface_init(struct net_if *iface) { - struct device *const dev = net_if_get_device(iface); + const struct device *const dev = net_if_get_device(iface); struct eth_sam_dev_data *const dev_data = DEV_DATA(dev); const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev); static bool init_done; @@ -1975,7 +1975,7 @@ static void eth0_iface_init(struct net_if *iface) init_done = true; } -static enum ethernet_hw_caps eth_sam_gmac_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_sam_gmac_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -1991,7 +1991,7 @@ static enum ethernet_hw_caps eth_sam_gmac_get_capabilities(struct device *dev) } #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 1 -static int eth_sam_gmac_set_qav_param(struct device *dev, +static int eth_sam_gmac_set_qav_param(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -2033,7 +2033,7 @@ static int eth_sam_gmac_set_qav_param(struct device *dev, } #endif -static int eth_sam_gmac_set_config(struct device *dev, +static int eth_sam_gmac_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -2050,7 +2050,7 @@ static int eth_sam_gmac_set_config(struct device *dev, } #if GMAC_ACTIVE_PRIORITY_QUEUE_NUM >= 1 -static int eth_sam_gmac_get_qav_param(struct device *dev, +static int eth_sam_gmac_get_qav_param(const struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { @@ -2099,7 +2099,7 @@ static int eth_sam_gmac_get_qav_param(struct device *dev, } #endif -static int eth_sam_gmac_get_config(struct device *dev, +static int eth_sam_gmac_get_config(const struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { @@ -2119,7 +2119,7 @@ static int eth_sam_gmac_get_config(struct device *dev, } #if defined(CONFIG_PTP_CLOCK_SAM_GMAC) -static struct device *eth_sam_gmac_get_ptp_clock(struct device *dev) +static const struct device *eth_sam_gmac_get_ptp_clock(const struct device *dev) { struct eth_sam_dev_data *const dev_data = DEV_DATA(dev); @@ -2140,7 +2140,7 @@ static const struct ethernet_api eth_api = { #endif }; -static struct device DEVICE_NAME_GET(eth0_sam_gmac); +DEVICE_DECLARE(eth0_sam_gmac); static void eth0_irq_config(void) { @@ -2374,12 +2374,12 @@ ETH_NET_DEVICE_INIT(eth0_sam_gmac, DT_INST_LABEL(0), #if defined(CONFIG_PTP_CLOCK_SAM_GMAC) struct ptp_context { - struct device *eth_dev; + const struct device *eth_dev; }; static struct ptp_context ptp_gmac_0_context; -static int ptp_clock_sam_gmac_set(struct device *dev, +static int ptp_clock_sam_gmac_set(const struct device *dev, struct net_ptp_time *tm) { struct ptp_context *ptp_context = dev->driver_data; @@ -2393,7 +2393,7 @@ static int ptp_clock_sam_gmac_set(struct device *dev, return 0; } -static int ptp_clock_sam_gmac_get(struct device *dev, +static int ptp_clock_sam_gmac_get(const struct device *dev, struct net_ptp_time *tm) { struct ptp_context *ptp_context = dev->driver_data; @@ -2406,7 +2406,7 @@ static int ptp_clock_sam_gmac_get(struct device *dev, return 0; } -static int ptp_clock_sam_gmac_adjust(struct device *dev, int increment) +static int ptp_clock_sam_gmac_adjust(const struct device *dev, int increment) { struct ptp_context *ptp_context = dev->driver_data; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(ptp_context->eth_dev); @@ -2425,7 +2425,8 @@ static int ptp_clock_sam_gmac_adjust(struct device *dev, int increment) return 0; } -static int ptp_clock_sam_gmac_rate_adjust(struct device *dev, float ratio) +static int ptp_clock_sam_gmac_rate_adjust(const struct device *dev, + float ratio) { return -ENOTSUP; } @@ -2437,9 +2438,9 @@ static const struct ptp_clock_driver_api ptp_api = { .rate_adjust = ptp_clock_sam_gmac_rate_adjust, }; -static int ptp_gmac_init(struct device *port) +static int ptp_gmac_init(const struct device *port) { - struct device *eth_dev = DEVICE_GET(eth0_sam_gmac); + const struct device *eth_dev = DEVICE_GET(eth0_sam_gmac); struct eth_sam_dev_data *dev_data = eth_dev->driver_data; struct ptp_context *ptp_context = port->driver_data; diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h index 6d68b8e4ac17..9f2ae408ac7b 100644 --- a/drivers/ethernet/eth_sam_gmac_priv.h +++ b/drivers/ethernet/eth_sam_gmac_priv.h @@ -272,7 +272,7 @@ struct eth_sam_dev_cfg { struct eth_sam_dev_data { struct net_if *iface; #if defined(CONFIG_PTP_CLOCK_SAM_GMAC) - struct device *ptp_clock; + const struct device *ptp_clock; #endif u8_t mac_addr[6]; struct k_delayed_work monitor_work; diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c index aec8bb6e8e37..f97a554f47a2 100644 --- a/drivers/ethernet/eth_smsc911x.c +++ b/drivers/ethernet/eth_smsc911x.c @@ -411,7 +411,7 @@ int smsc_init(void) /* Driver functions */ -static enum ethernet_hw_caps eth_smsc911x_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_smsc911x_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -419,7 +419,7 @@ static enum ethernet_hw_caps eth_smsc911x_get_capabilities(struct device *dev) } #if defined(CONFIG_NET_STATISTICS_ETHERNET) -static struct net_stats_eth *get_stats(struct device *dev) +static struct net_stats_eth *get_stats(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -429,7 +429,7 @@ static struct net_stats_eth *get_stats(struct device *dev) static void eth_initialize(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; LOG_DBG("eth_initialize"); @@ -471,7 +471,7 @@ static int smsc_write_tx_fifo(const u8_t *buf, u32_t len, bool is_last) return 0; } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { u16_t total_len = net_pkt_get_len(pkt); static u8_t tx_buf[NET_ETH_MAX_FRAME_SIZE] __aligned(4); @@ -553,7 +553,7 @@ static int smsc_read_rx_fifo(struct net_pkt *pkt, u32_t len) return 0; } -static struct net_pkt *smsc_recv_pkt(struct device *dev, u32_t pkt_size) +static struct net_pkt *smsc_recv_pkt(const struct device *dev, u32_t pkt_size) { struct eth_context *context = dev->driver_data; struct net_pkt *pkt; @@ -592,7 +592,7 @@ static struct net_pkt *smsc_recv_pkt(struct device *dev, u32_t pkt_size) return pkt; } -static void eth_smsc911x_isr(struct device *dev) +static void eth_smsc911x_isr(const struct device *dev) { u32_t int_status = SMSC9220->INT_STS; struct eth_context *context = dev->driver_data; @@ -657,9 +657,9 @@ static void eth_smsc911x_isr(struct device *dev) /* Bindings to the platform */ -static struct device DEVICE_NAME_GET(eth_smsc911x_0); +DEVICE_DECLARE(eth_smsc911x_0); -int eth_init(struct device *dev) +int eth_init(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c index 21ce337ad9ae..b6412a401420 100644 --- a/drivers/ethernet/eth_stellaris.c +++ b/drivers/ethernet/eth_stellaris.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include #include "eth_stellaris_priv.h" -static void eth_stellaris_assign_mac(struct device *dev) +static void eth_stellaris_assign_mac(const struct device *dev) { u8_t mac_addr[6] = DT_INST_PROP(0, local_mac_address); u32_t value = 0x0; @@ -37,7 +37,7 @@ static void eth_stellaris_assign_mac(struct device *dev) sys_write32(value, REG_MACIA1); } -static void eth_stellaris_flush(struct device *dev) +static void eth_stellaris_flush(const struct device *dev) { struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); @@ -48,7 +48,7 @@ static void eth_stellaris_flush(struct device *dev) } } -static void eth_stellaris_send_byte(struct device *dev, u8_t byte) +static void eth_stellaris_send_byte(const struct device *dev, u8_t byte) { struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); @@ -61,7 +61,7 @@ static void eth_stellaris_send_byte(struct device *dev, u8_t byte) } } -static int eth_stellaris_send(struct device *dev, struct net_pkt *pkt) +static int eth_stellaris_send(const struct device *dev, struct net_pkt *pkt) { struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); struct net_buf *frag; @@ -104,7 +104,7 @@ static int eth_stellaris_send(struct device *dev, struct net_pkt *pkt) static void eth_stellaris_rx_error(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); u32_t val; eth_stats_update_errors_rx(iface); @@ -118,7 +118,7 @@ static void eth_stellaris_rx_error(struct net_if *iface) sys_write32(val, REG_MACRCTL); } -static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev, +static struct net_pkt *eth_stellaris_rx_pkt(const struct device *dev, struct net_if *iface) { int frame_len, bytes_left; @@ -201,7 +201,7 @@ static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev, return NULL; } -static void eth_stellaris_rx(struct device *dev) +static void eth_stellaris_rx(const struct device *dev) { struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); struct net_if *iface = dev_data->iface; @@ -230,7 +230,7 @@ static void eth_stellaris_rx(struct device *dev) static void eth_stellaris_isr(void *arg) { /* Read the interrupt status */ - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); int isr_val = sys_read32(REG_MACRIS); u32_t lock; @@ -271,7 +271,7 @@ static void eth_stellaris_isr(void *arg) static void eth_stellaris_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); const struct eth_stellaris_config *dev_conf = DEV_CFG(dev); struct eth_stellaris_runtime *dev_data = DEV_DATA(dev); @@ -291,13 +291,13 @@ static void eth_stellaris_init(struct net_if *iface) } #if defined(CONFIG_NET_STATISTICS_ETHERNET) -static struct net_stats_eth *eth_stellaris_stats(struct device *dev) +static struct net_stats_eth *eth_stellaris_stats(const struct device *dev) { return &(DEV_DATA(dev)->stats); } #endif -static int eth_stellaris_dev_init(struct device *dev) +static int eth_stellaris_dev_init(const struct device *dev) { u32_t value; @@ -320,9 +320,9 @@ static int eth_stellaris_dev_init(struct device *dev) return 0; } -static struct device DEVICE_NAME_GET(eth_stellaris); +DEVICE_DECLARE(eth_stellaris); -static void eth_stellaris_irq_config(struct device *dev) +static void eth_stellaris_irq_config(const struct device *dev) { /* Enable Interrupt. */ IRQ_CONNECT(DT_INST_IRQN(0), diff --git a/drivers/ethernet/eth_stellaris_priv.h b/drivers/ethernet/eth_stellaris_priv.h index 16240d6bbd47..591cb83ef06b 100644 --- a/drivers/ethernet/eth_stellaris_priv.h +++ b/drivers/ethernet/eth_stellaris_priv.h @@ -60,7 +60,7 @@ struct eth_stellaris_runtime { #endif }; -typedef void (*eth_stellaris_config_irq_t)(struct device *dev); +typedef void (*eth_stellaris_config_irq_t)(const struct device *dev); struct eth_stellaris_config { u32_t mac_base; diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c index 495a0034dc8c..8edd2e39e3ca 100644 --- a/drivers/ethernet/eth_stm32_hal.c +++ b/drivers/ethernet/eth_stm32_hal.c @@ -92,7 +92,7 @@ static inline void disable_mcast_filter(ETH_HandleTypeDef *heth) heth->Instance->MACFFR = tmp; } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_stm32_hal_dev_data *dev_data = DEV_DATA(dev); ETH_HandleTypeDef *heth; @@ -173,7 +173,7 @@ static struct net_if *get_iface(struct eth_stm32_hal_dev_data *ctx, #endif } -static struct net_pkt *eth_rx(struct device *dev, u16_t *vlan_tag) +static struct net_pkt *eth_rx(const struct device *dev, u16_t *vlan_tag) { struct eth_stm32_hal_dev_data *dev_data; ETH_HandleTypeDef *heth; @@ -268,7 +268,7 @@ static struct net_pkt *eth_rx(struct device *dev, u16_t *vlan_tag) static void rx_thread(void *arg1, void *unused1, void *unused2) { u16_t vlan_tag = NET_VLAN_TAG_UNSPEC; - struct device *dev; + const struct device *dev; struct eth_stm32_hal_dev_data *dev_data; struct net_pkt *pkt; int res; @@ -278,7 +278,7 @@ static void rx_thread(void *arg1, void *unused1, void *unused2) ARG_UNUSED(unused1); ARG_UNUSED(unused2); - dev = (struct device *)arg1; + dev = (const struct device *)arg1; dev_data = DEV_DATA(dev); __ASSERT_NO_MSG(dev_data != NULL); @@ -329,13 +329,13 @@ static void rx_thread(void *arg1, void *unused1, void *unused2) static void eth_isr(void *arg) { - struct device *dev; + const struct device *dev; struct eth_stm32_hal_dev_data *dev_data; ETH_HandleTypeDef *heth; __ASSERT_NO_MSG(arg != NULL); - dev = (struct device *)arg; + dev = (const struct device *)arg; dev_data = DEV_DATA(dev); __ASSERT_NO_MSG(dev_data != NULL); @@ -367,7 +367,7 @@ static void generate_mac(u8_t *mac_addr) } #endif -static int eth_initialize(struct device *dev) +static int eth_initialize(const struct device *dev) { struct eth_stm32_hal_dev_data *dev_data; const struct eth_stm32_hal_dev_cfg *cfg; @@ -463,7 +463,7 @@ static int eth_initialize(struct device *dev) static void eth_iface_init(struct net_if *iface) { - struct device *dev; + const struct device *dev; struct eth_stm32_hal_dev_data *dev_data; __ASSERT_NO_MSG(iface != NULL); @@ -492,7 +492,7 @@ static void eth_iface_init(struct net_if *iface) net_if_flag_set(iface, NET_IF_NO_AUTO_START); } -static enum ethernet_hw_caps eth_stm32_hal_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_stm32_hal_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -503,7 +503,7 @@ static enum ethernet_hw_caps eth_stm32_hal_get_capabilities(struct device *dev) ; } -static int eth_stm32_hal_set_config(struct device *dev, +static int eth_stm32_hal_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -538,7 +538,7 @@ static const struct ethernet_api eth_api = { .send = eth_tx, }; -static struct device DEVICE_NAME_GET(eth0_stm32_hal); +DEVICE_DECLARE(eth0_stm32_hal); static void eth0_irq_config(void) { diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h index ba6605a0b008..69fc2dcabee3 100644 --- a/drivers/ethernet/eth_stm32_hal_priv.h +++ b/drivers/ethernet/eth_stm32_hal_priv.h @@ -35,7 +35,7 @@ struct eth_stm32_hal_dev_data { u8_t mac_addr[6]; ETH_HandleTypeDef heth; /* clock device */ - struct device *clock; + const struct device *clock; struct k_mutex tx_mutex; struct k_sem rx_int_sem; K_THREAD_STACK_MEMBER(rx_thread_stack, diff --git a/drivers/flash/flash_gecko.c b/drivers/flash/flash_gecko.c index e2539dc1e7fb..3483d7791212 100644 --- a/drivers/flash/flash_gecko.c +++ b/drivers/flash/flash_gecko.c @@ -32,7 +32,8 @@ static bool write_range_is_valid(off_t offset, u32_t size); static bool read_range_is_valid(off_t offset, u32_t size); static int erase_flash_block(off_t offset, size_t size); -static int flash_gecko_read(struct device *dev, off_t offset, void *data, +static int flash_gecko_read(const struct device *dev, off_t offset, + void *data, size_t size) { if (!read_range_is_valid(offset, size)) { @@ -48,7 +49,7 @@ static int flash_gecko_read(struct device *dev, off_t offset, void *data, return 0; } -static int flash_gecko_write(struct device *dev, off_t offset, +static int flash_gecko_write(const struct device *dev, off_t offset, const void *data, size_t size) { struct flash_gecko_data *const dev_data = DEV_DATA(dev); @@ -77,7 +78,8 @@ static int flash_gecko_write(struct device *dev, off_t offset, return ret; } -static int flash_gecko_erase(struct device *dev, off_t offset, size_t size) +static int flash_gecko_erase(const struct device *dev, off_t offset, + size_t size) { struct flash_gecko_data *const dev_data = DEV_DATA(dev); int ret; @@ -109,7 +111,7 @@ static int flash_gecko_erase(struct device *dev, off_t offset, size_t size) return ret; } -static int flash_gecko_write_protection(struct device *dev, bool enable) +static int flash_gecko_write_protection(const struct device *dev, bool enable) { struct flash_gecko_data *const dev_data = DEV_DATA(dev); @@ -169,7 +171,7 @@ static const struct flash_pages_layout flash_gecko_0_pages_layout = { .pages_size = DT_PROP(SOC_NV_FLASH_NODE, erase_block_size), }; -void flash_gecko_page_layout(struct device *dev, +void flash_gecko_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -178,7 +180,7 @@ void flash_gecko_page_layout(struct device *dev, } #endif /* CONFIG_FLASH_PAGE_LAYOUT */ -static int flash_gecko_init(struct device *dev) +static int flash_gecko_init(const struct device *dev) { struct flash_gecko_data *const dev_data = DEV_DATA(dev); diff --git a/drivers/flash/flash_handlers.c b/drivers/flash/flash_handlers.c index 5158453f5e02..da948b1d7cd3 100644 --- a/drivers/flash/flash_handlers.c +++ b/drivers/flash/flash_handlers.c @@ -7,35 +7,37 @@ #include #include -static inline int z_vrfy_flash_read(struct device *dev, off_t offset, +static inline int z_vrfy_flash_read(const struct device *dev, off_t offset, void *data, size_t len) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, read)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(data, len)); - return z_impl_flash_read((struct device *)dev, offset, (void *)data, - len); + return z_impl_flash_read((const struct device *)dev, offset, + (void *)data, + len); } #include -static inline int z_vrfy_flash_write(struct device *dev, off_t offset, - const void *data, size_t len) +static inline int z_vrfy_flash_write(const struct device *dev, off_t offset, + const void *data, size_t len) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, write)); Z_OOPS(Z_SYSCALL_MEMORY_READ(data, len)); - return z_impl_flash_write((struct device *)dev, offset, - (const void *)data, len); + return z_impl_flash_write((const struct device *)dev, offset, + (const void *)data, len); } #include -static inline int z_vrfy_flash_write_protection_set(struct device *dev, +static inline int z_vrfy_flash_write_protection_set(const struct device *dev, bool enable) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, write_protection)); - return z_impl_flash_write_protection_set((struct device *)dev, enable); + return z_impl_flash_write_protection_set((const struct device *)dev, + enable); } #include -static inline size_t z_vrfy_flash_get_write_block_size(struct device *dev) +static inline size_t z_vrfy_flash_get_write_block_size(const struct device *dev) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_FLASH)); return z_impl_flash_get_write_block_size(dev); @@ -43,32 +45,34 @@ static inline size_t z_vrfy_flash_get_write_block_size(struct device *dev) #include #ifdef CONFIG_FLASH_PAGE_LAYOUT -static inline int z_vrfy_flash_get_page_info_by_offs(struct device *dev, - off_t offs, - struct flash_pages_info *info) +static inline int z_vrfy_flash_get_page_info_by_offs(const struct device *dev, + off_t offs, + struct flash_pages_info *info) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, page_layout)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(info, sizeof(struct flash_pages_info))); - return z_impl_flash_get_page_info_by_offs((struct device *)dev, offs, - (struct flash_pages_info *)info); + return z_impl_flash_get_page_info_by_offs((const struct device *)dev, + offs, + (struct flash_pages_info *)info); } #include -static inline int z_vrfy_flash_get_page_info_by_idx(struct device *dev, - u32_t idx, - struct flash_pages_info *info) +static inline int z_vrfy_flash_get_page_info_by_idx(const struct device *dev, + u32_t idx, + struct flash_pages_info *info) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, page_layout)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(info, sizeof(struct flash_pages_info))); - return z_impl_flash_get_page_info_by_idx((struct device *)dev, idx, - (struct flash_pages_info *)info); + return z_impl_flash_get_page_info_by_idx((const struct device *)dev, + idx, + (struct flash_pages_info *)info); } #include -static inline size_t z_vrfy_flash_get_page_count(struct device *dev) +static inline size_t z_vrfy_flash_get_page_count(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, page_layout)); - return z_impl_flash_get_page_count((struct device *)dev); + return z_impl_flash_get_page_count((const struct device *)dev); } #include diff --git a/drivers/flash/flash_page_layout.c b/drivers/flash/flash_page_layout.c index 1ac9f216058b..3e53ee91d88c 100644 --- a/drivers/flash/flash_page_layout.c +++ b/drivers/flash/flash_page_layout.c @@ -6,7 +6,7 @@ #include -static int flash_get_page_info(struct device *dev, off_t offs, +static int flash_get_page_info(const struct device *dev, off_t offs, bool use_addr, struct flash_pages_info *info) { const struct flash_driver_api *api = dev->driver_api; @@ -52,19 +52,20 @@ static int flash_get_page_info(struct device *dev, off_t offs, return -EINVAL; /* page of the index doesn't exist */ } -int z_impl_flash_get_page_info_by_offs(struct device *dev, off_t offs, - struct flash_pages_info *info) +int z_impl_flash_get_page_info_by_offs(const struct device *dev, off_t offs, + struct flash_pages_info *info) { return flash_get_page_info(dev, offs, true, info); } -int z_impl_flash_get_page_info_by_idx(struct device *dev, u32_t page_index, - struct flash_pages_info *info) +int z_impl_flash_get_page_info_by_idx(const struct device *dev, + u32_t page_index, + struct flash_pages_info *info) { return flash_get_page_info(dev, page_index, false, info); } -size_t z_impl_flash_get_page_count(struct device *dev) +size_t z_impl_flash_get_page_count(const struct device *dev) { const struct flash_driver_api *api = dev->driver_api; const struct flash_pages_layout *layout; @@ -81,7 +82,8 @@ size_t z_impl_flash_get_page_count(struct device *dev) return count; } -void flash_page_foreach(struct device *dev, flash_page_cb cb, void *data) +void flash_page_foreach(const struct device *dev, flash_page_cb cb, + void *data) { const struct flash_driver_api *api = dev->driver_api; const struct flash_pages_layout *layout; diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c index f5403ae88bc2..6a176df781b8 100644 --- a/drivers/flash/flash_sam.c +++ b/drivers/flash/flash_sam.c @@ -53,18 +53,19 @@ struct flash_sam_dev_data { ((struct flash_sam_dev_data *const)(dev)->driver_data) -static inline void flash_sam_sem_take(struct device *dev) +static inline void flash_sam_sem_take(const struct device *dev) { k_sem_take(&DEV_DATA(dev)->sem, K_FOREVER); } -static inline void flash_sam_sem_give(struct device *dev) +static inline void flash_sam_sem_give(const struct device *dev) { k_sem_give(&DEV_DATA(dev)->sem); } /* Check that the offset is within the flash */ -static bool flash_sam_valid_range(struct device *dev, off_t offset, size_t len) +static bool flash_sam_valid_range(const struct device *dev, off_t offset, + size_t len) { if (offset > CONFIG_FLASH_SIZE * 1024) { return false; @@ -87,7 +88,7 @@ static off_t flash_sam_get_page(off_t offset) * This function checks for errors and waits for the end of the * previous command. */ -static int flash_sam_wait_ready(struct device *dev) +static int flash_sam_wait_ready(const struct device *dev) { Efc *const efc = DEV_CFG(dev)->regs; @@ -125,7 +126,7 @@ static int flash_sam_wait_ready(struct device *dev) } /* This function writes a single page, either fully or partially. */ -static int flash_sam_write_page(struct device *dev, off_t offset, +static int flash_sam_write_page(const struct device *dev, off_t offset, const void *data, size_t len) { Efc *const efc = DEV_CFG(dev)->regs; @@ -151,7 +152,7 @@ static int flash_sam_write_page(struct device *dev, off_t offset, } /* Write data to the flash, page by page */ -static int flash_sam_write(struct device *dev, off_t offset, +static int flash_sam_write(const struct device *dev, off_t offset, const void *data, size_t len) { int rc; @@ -210,7 +211,7 @@ static int flash_sam_write(struct device *dev, off_t offset, } /* Read data from flash */ -static int flash_sam_read(struct device *dev, off_t offset, void *data, +static int flash_sam_read(const struct device *dev, off_t offset, void *data, size_t len) { LOG_DBG("offset = 0x%lx, len = %zu", (long)offset, len); @@ -225,7 +226,7 @@ static int flash_sam_read(struct device *dev, off_t offset, void *data, } /* Erase a single 8KiB block */ -static int flash_sam_erase_block(struct device *dev, off_t offset) +static int flash_sam_erase_block(const struct device *dev, off_t offset) { Efc *const efc = DEV_CFG(dev)->regs; @@ -240,7 +241,7 @@ static int flash_sam_erase_block(struct device *dev, off_t offset) } /* Erase multiple blocks */ -static int flash_sam_erase(struct device *dev, off_t offset, size_t len) +static int flash_sam_erase(const struct device *dev, off_t offset, size_t len) { int rc = 0; off_t i; @@ -289,7 +290,7 @@ static int flash_sam_erase(struct device *dev, off_t offset, size_t len) } /* Enable or disable the write protection */ -static int flash_sam_write_protection(struct device *dev, bool enable) +static int flash_sam_write_protection(const struct device *dev, bool enable) { Efc *const efc = DEV_CFG(dev)->regs; int rc = 0; @@ -321,7 +322,7 @@ static const struct flash_pages_layout flash_sam_pages_layout = { .pages_size = DT_PROP(SOC_NV_FLASH_NODE, erase_block_size), }; -void flash_sam_page_layout(struct device *dev, +void flash_sam_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -330,7 +331,7 @@ void flash_sam_page_layout(struct device *dev, } #endif -static int flash_sam_init(struct device *dev) +static int flash_sam_init(const struct device *dev) { struct flash_sam_dev_data *const data = DEV_DATA(dev); diff --git a/drivers/flash/flash_sam0.c b/drivers/flash/flash_sam0.c index 0edfb4aaedcf..3e3fecf427da 100644 --- a/drivers/flash/flash_sam0.c +++ b/drivers/flash/flash_sam0.c @@ -61,14 +61,14 @@ static const struct flash_pages_layout flash_sam0_pages_layout = { }; #endif -static inline void flash_sam0_sem_take(struct device *dev) +static inline void flash_sam0_sem_take(const struct device *dev) { struct flash_sam0_data *ctx = dev->driver_data; k_sem_take(&ctx->sem, K_FOREVER); } -static inline void flash_sam0_sem_give(struct device *dev) +static inline void flash_sam0_sem_give(const struct device *dev) { struct flash_sam0_data *ctx = dev->driver_data; @@ -130,7 +130,7 @@ static int flash_sam0_check_status(off_t offset) return 0; } -static int flash_sam0_write_page(struct device *dev, off_t offset, +static int flash_sam0_write_page(const struct device *dev, off_t offset, const void *data) { const u32_t *src = data; @@ -169,7 +169,7 @@ static int flash_sam0_write_page(struct device *dev, off_t offset, return 0; } -static int flash_sam0_erase_row(struct device *dev, off_t offset) +static int flash_sam0_erase_row(const struct device *dev, off_t offset) { *FLASH_MEM(offset) = 0U; #ifdef NVMCTRL_CTRLA_CMD_ER @@ -182,7 +182,7 @@ static int flash_sam0_erase_row(struct device *dev, off_t offset) #if CONFIG_SOC_FLASH_SAM0_EMULATE_BYTE_PAGES -static int flash_sam0_commit(struct device *dev) +static int flash_sam0_commit(const struct device *dev) { struct flash_sam0_data *ctx = dev->driver_data; int err; @@ -212,7 +212,7 @@ static int flash_sam0_commit(struct device *dev) return 0; } -static int flash_sam0_write(struct device *dev, off_t offset, +static int flash_sam0_write(const struct device *dev, off_t offset, const void *data, size_t len) { struct flash_sam0_data *ctx = dev->driver_data; @@ -250,7 +250,7 @@ static int flash_sam0_write(struct device *dev, off_t offset, #else /* CONFIG_SOC_FLASH_SAM0_EMULATE_BYTE_PAGES */ -static int flash_sam0_write(struct device *dev, off_t offset, +static int flash_sam0_write(const struct device *dev, off_t offset, const void *data, size_t len) { const u8_t *pdata = data; @@ -289,7 +289,7 @@ static int flash_sam0_write(struct device *dev, off_t offset, #endif -static int flash_sam0_read(struct device *dev, off_t offset, void *data, +static int flash_sam0_read(const struct device *dev, off_t offset, void *data, size_t len) { int err; @@ -304,7 +304,8 @@ static int flash_sam0_read(struct device *dev, off_t offset, void *data, return 0; } -static int flash_sam0_erase(struct device *dev, off_t offset, size_t size) +static int flash_sam0_erase(const struct device *dev, off_t offset, + size_t size) { int err; @@ -338,7 +339,7 @@ static int flash_sam0_erase(struct device *dev, off_t offset, size_t size) return err; } -static int flash_sam0_write_protection(struct device *dev, bool enable) +static int flash_sam0_write_protection(const struct device *dev, bool enable) { off_t offset; int err; @@ -379,7 +380,7 @@ static int flash_sam0_write_protection(struct device *dev, bool enable) } #if CONFIG_FLASH_PAGE_LAYOUT -void flash_sam0_page_layout(struct device *dev, +void flash_sam0_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -388,7 +389,7 @@ void flash_sam0_page_layout(struct device *dev, } #endif -static int flash_sam0_init(struct device *dev) +static int flash_sam0_init(const struct device *dev) { struct flash_sam0_data *ctx = dev->driver_data; diff --git a/drivers/flash/flash_shell.c b/drivers/flash/flash_shell.c index 75e5ffc7e311..90babeefd9f8 100644 --- a/drivers/flash/flash_shell.c +++ b/drivers/flash/flash_shell.c @@ -23,7 +23,7 @@ extern struct device __device_end[]; static u8_t test_arr[TEST_ARR_SIZE]; static int parse_helper(const struct shell *shell, size_t *argc, - char **argv[], struct device **flash_dev, u32_t *addr) + char **argv[], const struct device **flash_dev, u32_t *addr) { char *endptr; @@ -49,7 +49,7 @@ static int parse_helper(const struct shell *shell, size_t *argc, static int cmd_erase(const struct shell *shell, size_t argc, char *argv[]) { - struct device *flash_dev; + const struct device *flash_dev; u32_t page_addr; int result; u32_t size; @@ -92,7 +92,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char *argv[]) { u32_t check_array[BUF_ARRAY_CNT]; u32_t buf_array[BUF_ARRAY_CNT]; - struct device *flash_dev; + const struct device *flash_dev; u32_t w_addr; int ret; int j = 0; @@ -137,7 +137,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char *argv[]) static int cmd_read(const struct shell *shell, size_t argc, char *argv[]) { - struct device *flash_dev; + const struct device *flash_dev; u32_t addr; int cnt; int ret; @@ -168,7 +168,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char *argv[]) static int cmd_test(const struct shell *shell, size_t argc, char *argv[]) { - struct device *flash_dev; + const struct device *flash_dev; u32_t repeat; int result; u32_t addr; @@ -222,7 +222,7 @@ SHELL_DYNAMIC_CMD_CREATE(dsub_device_name, device_name_get); static void device_name_get(size_t idx, struct shell_static_entry *entry) { int device_idx = 0; - struct device *dev; + const struct device *dev; entry->syntax = NULL; entry->handler = NULL; diff --git a/drivers/flash/flash_simulator.c b/drivers/flash/flash_simulator.c index 82728ed0f342..77f539391214 100644 --- a/drivers/flash/flash_simulator.c +++ b/drivers/flash/flash_simulator.c @@ -139,7 +139,8 @@ static bool write_protection; static const struct flash_driver_api flash_sim_api; -static int flash_range_is_valid(struct device *dev, off_t offset, size_t len) +static int flash_range_is_valid(const struct device *dev, off_t offset, + size_t len) { ARG_UNUSED(dev); if ((offset + len > FLASH_SIMULATOR_FLASH_SIZE + @@ -151,7 +152,7 @@ static int flash_range_is_valid(struct device *dev, off_t offset, size_t len) return 1; } -static int flash_wp_set(struct device *dev, bool enable) +static int flash_wp_set(const struct device *dev, bool enable) { ARG_UNUSED(dev); write_protection = enable; @@ -164,7 +165,8 @@ static bool flash_wp_is_set(void) return write_protection; } -static int flash_sim_read(struct device *dev, const off_t offset, void *data, +static int flash_sim_read(const struct device *dev, const off_t offset, + void *data, const size_t len) { ARG_UNUSED(dev); @@ -194,7 +196,7 @@ static int flash_sim_read(struct device *dev, const off_t offset, void *data, return 0; } -static int flash_sim_write(struct device *dev, const off_t offset, +static int flash_sim_write(const struct device *dev, const off_t offset, const void *data, const size_t len) { ARG_UNUSED(dev); @@ -280,7 +282,7 @@ static void unit_erase(const u32_t unit) FLASH_SIMULATOR_ERASE_UNIT); } -static int flash_sim_erase(struct device *dev, const off_t offset, +static int flash_sim_erase(const struct device *dev, const off_t offset, const size_t len) { ARG_UNUSED(dev); @@ -334,7 +336,7 @@ static const struct flash_pages_layout flash_sim_pages_layout = { .pages_size = FLASH_SIMULATOR_ERASE_UNIT, }; -static void flash_sim_page_layout(struct device *dev, +static void flash_sim_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -356,7 +358,7 @@ static const struct flash_driver_api flash_sim_api = { #ifdef CONFIG_ARCH_POSIX -static int flash_mock_init(struct device *dev) +static int flash_mock_init(const struct device *dev) { struct stat f_stat; int rc; @@ -407,7 +409,7 @@ static int flash_mock_init(struct device *dev) #else -static int flash_mock_init(struct device *dev) +static int flash_mock_init(const struct device *dev) { memset(mock_flash, 0xFF, ARRAY_SIZE(mock_flash)); return 0; @@ -415,7 +417,7 @@ static int flash_mock_init(struct device *dev) #endif /* CONFIG_ARCH_POSIX */ -static int flash_init(struct device *dev) +static int flash_init(const struct device *dev) { STATS_INIT_AND_REG(flash_sim_stats, STATS_SIZE_32, "flash_sim_stats"); STATS_INIT_AND_REG(flash_sim_thresholds, STATS_SIZE_32, diff --git a/drivers/flash/flash_stm32.c b/drivers/flash/flash_stm32.c index a914730e23d1..e61abcd6c12b 100644 --- a/drivers/flash/flash_stm32.c +++ b/drivers/flash/flash_stm32.c @@ -63,7 +63,7 @@ LOG_MODULE_REGISTER(flash_stm32, CONFIG_FLASH_LOG_LEVEL); * similarly for flash_stm32_sem_give) to avoid confusion with locking * actual flash pages. */ -static inline void _flash_stm32_sem_take(struct device *dev) +static inline void _flash_stm32_sem_take(const struct device *dev) { #ifdef CONFIG_SOC_SERIES_STM32WBX @@ -74,7 +74,7 @@ static inline void _flash_stm32_sem_take(struct device *dev) k_sem_take(&FLASH_STM32_PRIV(dev)->sem, K_FOREVER); } -static inline void _flash_stm32_sem_give(struct device *dev) +static inline void _flash_stm32_sem_give(const struct device *dev) { k_sem_give(&FLASH_STM32_PRIV(dev)->sem); @@ -95,7 +95,7 @@ static inline void _flash_stm32_sem_give(struct device *dev) #endif #if !defined(CONFIG_SOC_SERIES_STM32WBX) -static int flash_stm32_check_status(struct device *dev) +static int flash_stm32_check_status(const struct device *dev) { u32_t const error = #if defined(FLASH_FLAG_PGAERR) @@ -127,7 +127,7 @@ static int flash_stm32_check_status(struct device *dev) } #endif /* CONFIG_SOC_SERIES_STM32WBX */ -int flash_stm32_wait_flash_idle(struct device *dev) +int flash_stm32_wait_flash_idle(const struct device *dev) { s64_t timeout_time = k_uptime_get() + STM32_FLASH_TIMEOUT; int rc; @@ -150,7 +150,7 @@ int flash_stm32_wait_flash_idle(struct device *dev) return 0; } -static void flash_stm32_flush_caches(struct device *dev, +static void flash_stm32_flush_caches(const struct device *dev, off_t offset, size_t len) { #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32F3X) || \ @@ -179,7 +179,8 @@ static void flash_stm32_flush_caches(struct device *dev, #endif } -static int flash_stm32_read(struct device *dev, off_t offset, void *data, +static int flash_stm32_read(const struct device *dev, off_t offset, + void *data, size_t len) { if (!flash_stm32_valid_range(dev, offset, len, false)) { @@ -199,7 +200,8 @@ static int flash_stm32_read(struct device *dev, off_t offset, void *data, return 0; } -static int flash_stm32_erase(struct device *dev, off_t offset, size_t len) +static int flash_stm32_erase(const struct device *dev, off_t offset, + size_t len) { int rc; @@ -226,7 +228,7 @@ static int flash_stm32_erase(struct device *dev, off_t offset, size_t len) return rc; } -static int flash_stm32_write(struct device *dev, off_t offset, +static int flash_stm32_write(const struct device *dev, off_t offset, const void *data, size_t len) { int rc; @@ -252,7 +254,7 @@ static int flash_stm32_write(struct device *dev, off_t offset, return rc; } -static int flash_stm32_write_protection(struct device *dev, bool enable) +static int flash_stm32_write_protection(const struct device *dev, bool enable) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -311,7 +313,7 @@ static const struct flash_driver_api flash_stm32_api = { #endif }; -static int stm32_flash_init(struct device *dev) +static int stm32_flash_init(const struct device *dev) { #if defined(CONFIG_SOC_SERIES_STM32L4X) || \ defined(CONFIG_SOC_SERIES_STM32F0X) || \ @@ -319,7 +321,7 @@ static int stm32_flash_init(struct device *dev) defined(CONFIG_SOC_SERIES_STM32F3X) || \ defined(CONFIG_SOC_SERIES_STM32G0X) struct flash_stm32_priv *p = FLASH_STM32_PRIV(dev); - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); /* * On STM32F0, Flash interface clock source is always HSI, diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h index 1191d07f0d87..e2c011743ff5 100644 --- a/drivers/flash/flash_stm32.h +++ b/drivers/flash/flash_stm32.h @@ -36,7 +36,7 @@ struct flash_stm32_priv { #define FLASH_STM32_REGS(dev) (FLASH_STM32_PRIV(dev)->regs) #ifdef CONFIG_FLASH_PAGE_LAYOUT -static inline bool flash_stm32_range_exists(struct device *dev, +static inline bool flash_stm32_range_exists(const struct device *dev, off_t offset, u32_t len) { @@ -47,23 +47,24 @@ static inline bool flash_stm32_range_exists(struct device *dev, } #endif /* CONFIG_FLASH_PAGE_LAYOUT */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, u32_t len, bool write); -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len); -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len); -int flash_stm32_wait_flash_idle(struct device *dev); +int flash_stm32_wait_flash_idle(const struct device *dev); #ifdef CONFIG_SOC_SERIES_STM32WBX -int flash_stm32_check_status(struct device *dev); +int flash_stm32_check_status(const struct device *dev); #endif /* CONFIG_SOC_SERIES_STM32WBX */ #ifdef CONFIG_FLASH_PAGE_LAYOUT -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size); #endif diff --git a/drivers/flash/flash_stm32f0x.c b/drivers/flash/flash_stm32f0x.c index 04e3b22d8232..c5da7f0eb6a7 100644 --- a/drivers/flash/flash_stm32f0x.c +++ b/drivers/flash/flash_stm32f0x.c @@ -21,7 +21,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); /* offset and len must be aligned on 2 for write * positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 2 == 0 && len % 2 == 0U)) && @@ -33,7 +34,7 @@ static unsigned int get_page(off_t offset) return offset / FLASH_PAGE_SIZE; } -static int write_hword(struct device *dev, off_t offset, u16_t val) +static int write_hword(const struct device *dev, off_t offset, u16_t val) { volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -74,7 +75,7 @@ static int write_hword(struct device *dev, off_t offset, u16_t val) return rc; } -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t page_address = CONFIG_FLASH_BASE_ADDRESS; @@ -113,7 +114,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -129,7 +131,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -144,7 +146,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32f1x.c b/drivers/flash/flash_stm32f1x.c index d9322ba0cbcb..ce6e4b47b762 100644 --- a/drivers/flash/flash_stm32f1x.c +++ b/drivers/flash/flash_stm32f1x.c @@ -22,7 +22,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); /* offset and len must be aligned on 2 for write * positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 2 == 0 && len % 2 == 0U)) && @@ -34,7 +35,7 @@ static unsigned int get_page(off_t offset) return offset / FLASH_PAGE_SIZE; } -static int write_hword(struct device *dev, off_t offset, u16_t val) +static int write_hword(const struct device *dev, off_t offset, u16_t val) { volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -75,7 +76,7 @@ static int write_hword(struct device *dev, off_t offset, u16_t val) return rc; } -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t page_address = CONFIG_FLASH_BASE_ADDRESS; @@ -114,7 +115,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -130,7 +132,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -145,7 +147,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32f3x.c b/drivers/flash/flash_stm32f3x.c index 922b0beb1775..c47002c7264c 100644 --- a/drivers/flash/flash_stm32f3x.c +++ b/drivers/flash/flash_stm32f3x.c @@ -21,7 +21,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); /* offset and len must be aligned on 2 for write * , positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 2 == 0 && len % 2 == 0U)) && @@ -33,7 +34,7 @@ static unsigned int get_page(off_t offset) return offset / FLASH_PAGE_SIZE; } -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t page_address = CONFIG_FLASH_BASE_ADDRESS; @@ -67,7 +68,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -84,7 +86,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, } -static int write_hword(struct device *dev, off_t offset, u16_t val) +static int write_hword(const struct device *dev, off_t offset, u16_t val) { volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -126,7 +128,7 @@ static int write_hword(struct device *dev, off_t offset, u16_t val) } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -141,7 +143,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32f4x.c b/drivers/flash/flash_stm32f4x.c index 6b1d00a552ff..e6c1048b55d2 100644 --- a/drivers/flash/flash_stm32f4x.c +++ b/drivers/flash/flash_stm32f4x.c @@ -15,7 +15,8 @@ #define STM32F4X_SECTOR_MASK ((u32_t) 0xFFFFFF07) -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { ARG_UNUSED(write); @@ -34,7 +35,7 @@ bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, return flash_stm32_range_exists(dev, offset, len); } -static int write_byte(struct device *dev, off_t offset, u8_t val) +static int write_byte(const struct device *dev, off_t offset, u8_t val) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t tmp; @@ -65,7 +66,7 @@ static int write_byte(struct device *dev, off_t offset, u8_t val) return rc; } -static int erase_sector(struct device *dev, u32_t sector) +static int erase_sector(const struct device *dev, u32_t sector) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t tmp; @@ -105,7 +106,8 @@ static int erase_sector(struct device *dev, u32_t sector) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { struct flash_pages_info info; @@ -134,7 +136,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -223,7 +225,7 @@ static const struct flash_pages_layout stm32f4_flash_layout[] = { #endif /* FLASH_SECTOR_TOTAL == 5 */ #endif/* !defined(FLASH_SECTOR_TOTAL) */ -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32f7x.c b/drivers/flash/flash_stm32f7x.c index 0030958d3676..97db9b9aea29 100644 --- a/drivers/flash/flash_stm32f7x.c +++ b/drivers/flash/flash_stm32f7x.c @@ -16,7 +16,8 @@ #define STM32F7X_SECTOR_MASK ((u32_t) 0xFFFFFF07) -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { ARG_UNUSED(write); @@ -24,7 +25,7 @@ bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, return flash_stm32_range_exists(dev, offset, len); } -static int write_byte(struct device *dev, off_t offset, u8_t val) +static int write_byte(const struct device *dev, off_t offset, u8_t val) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); int rc; @@ -56,7 +57,7 @@ static int write_byte(struct device *dev, off_t offset, u8_t val) return rc; } -static int erase_sector(struct device *dev, u32_t sector) +static int erase_sector(const struct device *dev, u32_t sector) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); int rc; @@ -100,7 +101,8 @@ static int erase_sector(struct device *dev, u32_t sector) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { struct flash_pages_info info; @@ -129,7 +131,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -205,7 +207,7 @@ static const struct flash_pages_layout stm32f7_flash_layout_dual_bank[] = { #error "Unknown flash layout" #endif/* !defined(FLASH_SECTOR_TOTAL) */ -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32g0x.c b/drivers/flash/flash_stm32g0x.c index dca01e12007f..cd72b370558c 100644 --- a/drivers/flash/flash_stm32g0x.c +++ b/drivers/flash/flash_stm32g0x.c @@ -28,7 +28,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); * offset and len must be aligned on 8 for write, * positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 8 == 0 && len % 8 == 0)) && @@ -43,7 +44,7 @@ static unsigned int get_page(off_t offset) return offset >> STM32G0X_PAGE_SHIFT; } -static int write_dword(struct device *dev, off_t offset, u64_t val) +static int write_dword(const struct device *dev, off_t offset, u64_t val) { volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -86,7 +87,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val) return rc; } -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t tmp; @@ -122,7 +123,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -138,7 +140,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -153,7 +155,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32g4x.c b/drivers/flash/flash_stm32g4x.c index 2824f150f727..227760f77136 100644 --- a/drivers/flash/flash_stm32g4x.c +++ b/drivers/flash/flash_stm32g4x.c @@ -24,7 +24,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); * offset and len must be aligned on 8 for write, * positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 8 == 0 && len % 8 == 0U)) && @@ -39,7 +40,7 @@ static unsigned int get_page(off_t offset) return offset >> STM32G4X_PAGE_SHIFT; } -static int write_dword(struct device *dev, off_t offset, u64_t val) +static int write_dword(const struct device *dev, off_t offset, u64_t val) { volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -84,7 +85,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val) return rc; } -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t tmp; @@ -144,7 +145,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -160,7 +162,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -175,7 +177,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32l4x.c b/drivers/flash/flash_stm32l4x.c index 5fb2cf99a47e..1e62f2384fc0 100644 --- a/drivers/flash/flash_stm32l4x.c +++ b/drivers/flash/flash_stm32l4x.c @@ -28,7 +28,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); /* offset and len must be aligned on 8 for write * , positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 8 == 0 && len % 8 == 0U)) && @@ -45,7 +46,7 @@ static unsigned int get_page(off_t offset) return offset >> STM32L4X_PAGE_SHIFT; } -static int write_dword(struct device *dev, off_t offset, u64_t val) +static int write_dword(const struct device *dev, off_t offset, u64_t val) { volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -113,7 +114,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val) #define SOC_NV_FLASH_SIZE DT_REG_SIZE(DT_INST(0, soc_nv_flash)) -static int erase_page(struct device *dev, unsigned int page) +static int erase_page(const struct device *dev, unsigned int page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t tmp; @@ -183,7 +184,8 @@ static int erase_page(struct device *dev, unsigned int page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -199,7 +201,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -215,7 +217,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/flash_stm32wbx.c b/drivers/flash/flash_stm32wbx.c index 23cd953631fb..616c35a0eda5 100644 --- a/drivers/flash/flash_stm32wbx.c +++ b/drivers/flash/flash_stm32wbx.c @@ -24,7 +24,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN); /* offset and len must be aligned on 8 for write, * positive and not beyond end of flash */ -bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len, +bool flash_stm32_valid_range(const struct device *dev, off_t offset, + u32_t len, bool write) { return (!write || (offset % 8 == 0 && len % 8 == 0U)) && @@ -39,7 +40,7 @@ static u32_t get_page(off_t offset) return offset >> STM32WBX_PAGE_SHIFT; } -static int write_dword(struct device *dev, off_t offset, u64_t val) +static int write_dword(const struct device *dev, off_t offset, u64_t val) { volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); @@ -81,7 +82,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val) return 0; } -static int erase_page(struct device *dev, u32_t page) +static int erase_page(const struct device *dev, u32_t page) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); int rc; @@ -117,7 +118,8 @@ static int erase_page(struct device *dev, u32_t page) return rc; } -int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, +int flash_stm32_block_erase_loop(const struct device *dev, + unsigned int offset, unsigned int len) { int i, rc = 0; @@ -133,7 +135,7 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset, return rc; } -int flash_stm32_write_range(struct device *dev, unsigned int offset, +int flash_stm32_write_range(const struct device *dev, unsigned int offset, const void *data, unsigned int len) { int i, rc = 0; @@ -149,7 +151,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset, return rc; } -void flash_stm32_page_layout(struct device *dev, +void flash_stm32_page_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -169,7 +171,7 @@ void flash_stm32_page_layout(struct device *dev, *layout_size = 1; } -int flash_stm32_check_status(struct device *dev) +int flash_stm32_check_status(const struct device *dev) { FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); u32_t error = 0; diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c index 5c5c7dc98623..188e7f24aa20 100644 --- a/drivers/flash/nrf_qspi_nor.c +++ b/drivers/flash/nrf_qspi_nor.c @@ -222,26 +222,26 @@ static inline int qspi_get_zephyr_ret_code(nrfx_err_t res) } } -static inline struct qspi_nor_data *get_dev_data(struct device *dev) +static inline struct qspi_nor_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline void qspi_lock(struct device *dev) +static inline void qspi_lock(const struct device *dev) { struct qspi_nor_data *dev_data = get_dev_data(dev); k_sem_take(&dev_data->sem, K_FOREVER); } -static inline void qspi_unlock(struct device *dev) +static inline void qspi_unlock(const struct device *dev) { struct qspi_nor_data *dev_data = get_dev_data(dev); k_sem_give(&dev_data->sem); } -static inline void qspi_wait_for_completion(struct device *dev, +static inline void qspi_wait_for_completion(const struct device *dev, nrfx_err_t res) { struct qspi_nor_data *dev_data = get_dev_data(dev); @@ -253,7 +253,7 @@ static inline void qspi_wait_for_completion(struct device *dev, } } -static inline void qspi_complete(struct device *dev) +static inline void qspi_complete(const struct device *dev) { struct qspi_nor_data *dev_data = get_dev_data(dev); @@ -269,7 +269,7 @@ static inline void qspi_complete(struct device *dev) */ static void qspi_handler(nrfx_qspi_evt_t event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; if (event == NRFX_QSPI_EVENT_DONE) { qspi_complete(dev); @@ -279,7 +279,7 @@ static void qspi_handler(nrfx_qspi_evt_t event, void *p_context) /* QSPI send custom command */ -static int qspi_send_cmd(struct device *dev, const struct qspi_cmd *cmd) +static int qspi_send_cmd(const struct device *dev, const struct qspi_cmd *cmd) { /* Check input parameters */ if (!cmd) { @@ -312,7 +312,7 @@ static int qspi_send_cmd(struct device *dev, const struct qspi_cmd *cmd) } /* QSPI erase */ -static int qspi_erase(struct device *dev, u32_t addr, u32_t size) +static int qspi_erase(const struct device *dev, u32_t addr, u32_t size) { /* Check input parameters */ if (!size) { @@ -410,7 +410,7 @@ static inline void qspi_fill_init_struct(nrfx_qspi_config_t *initstruct) } /* Configures QSPI memory for the transfer */ -static int qspi_nrfx_configure(struct device *dev) +static int qspi_nrfx_configure(const struct device *dev) { if (!dev) { return -ENXIO; @@ -460,7 +460,7 @@ static int qspi_nrfx_configure(struct device *dev) * expected JEDEC ID * @return 0 on success, negative errno code otherwise */ -static inline int qspi_nor_read_id(struct device *dev, +static inline int qspi_nor_read_id(const struct device *dev, const struct qspi_nor_config *const flash_id) { u8_t rx_b[QSPI_NOR_MAX_ID_LEN]; @@ -488,7 +488,7 @@ static inline int qspi_nor_read_id(struct device *dev, return 0; } -static int qspi_nor_read(struct device *dev, off_t addr, void *dest, +static int qspi_nor_read(const struct device *dev, off_t addr, void *dest, size_t size) { if (!dest) { @@ -526,7 +526,8 @@ static int qspi_nor_read(struct device *dev, off_t addr, void *dest, return qspi_get_zephyr_ret_code(res); } -static int qspi_nor_write(struct device *dev, off_t addr, const void *src, +static int qspi_nor_write(const struct device *dev, off_t addr, + const void *src, size_t size) { if (!src) { @@ -569,7 +570,7 @@ static int qspi_nor_write(struct device *dev, off_t addr, const void *src, return qspi_get_zephyr_ret_code(res); } -static int qspi_nor_erase(struct device *dev, off_t addr, size_t size) +static int qspi_nor_erase(const struct device *dev, off_t addr, size_t size) { struct qspi_nor_data *const driver_data = dev->driver_data; const struct qspi_nor_config *params = dev->config_info; @@ -594,7 +595,7 @@ static int qspi_nor_erase(struct device *dev, off_t addr, size_t size) return ret; } -static int qspi_nor_write_protection_set(struct device *dev, +static int qspi_nor_write_protection_set(const struct device *dev, bool write_protect) { struct qspi_nor_data *const driver_data = dev->driver_data; @@ -620,7 +621,7 @@ static int qspi_nor_write_protection_set(struct device *dev, * @param info The flash info structure * @return 0 on success, negative errno code otherwise */ -static int qspi_nor_configure(struct device *dev) +static int qspi_nor_configure(const struct device *dev) { const struct qspi_nor_config *params = dev->config_info; @@ -644,7 +645,7 @@ static int qspi_nor_configure(struct device *dev) * @param name The flash name * @return 0 on success, negative errno code otherwise */ -static int qspi_nor_init(struct device *dev) +static int qspi_nor_init(const struct device *dev) { IRQ_CONNECT(DT_IRQN(QSPI_NODE), DT_IRQ(QSPI_NODE, priority), nrfx_isr, nrfx_qspi_irq_handler, 0); @@ -668,7 +669,7 @@ static const struct flash_pages_layout dev_layout = { }; #undef LAYOUT_PAGES_COUNT -static void qspi_nor_pages_layout(struct device *dev, +static void qspi_nor_pages_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c index 031ce10d6f5b..9a9497564014 100644 --- a/drivers/flash/soc_flash_mcux.c +++ b/drivers/flash/soc_flash_mcux.c @@ -52,7 +52,8 @@ struct flash_priv { * */ -static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) +static int flash_mcux_erase(const struct device *dev, off_t offset, + size_t len) { struct flash_priv *priv = dev->driver_data; u32_t addr; @@ -74,7 +75,7 @@ static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_mcux_read(struct device *dev, off_t offset, +static int flash_mcux_read(const struct device *dev, off_t offset, void *data, size_t len) { struct flash_priv *priv = dev->driver_data; @@ -92,7 +93,7 @@ static int flash_mcux_read(struct device *dev, off_t offset, return 0; } -static int flash_mcux_write(struct device *dev, off_t offset, +static int flash_mcux_write(const struct device *dev, off_t offset, const void *data, size_t len) { struct flash_priv *priv = dev->driver_data; @@ -115,7 +116,7 @@ static int flash_mcux_write(struct device *dev, off_t offset, return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_mcux_write_protection(struct device *dev, bool enable) +static int flash_mcux_write_protection(const struct device *dev, bool enable) { struct flash_priv *priv = dev->driver_data; int rc = 0; @@ -136,7 +137,7 @@ static const struct flash_pages_layout dev_layout = { .pages_size = DT_PROP(SOC_NV_FLASH_NODE, erase_block_size), }; -static void flash_mcux_pages_layout(struct device *dev, +static void flash_mcux_pages_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -162,7 +163,7 @@ static const struct flash_driver_api flash_mcux_api = { #endif }; -static int flash_mcux_init(struct device *dev) +static int flash_mcux_init(const struct device *dev) { struct flash_priv *priv = dev->driver_data; uint32_t pflash_block_base; diff --git a/drivers/flash/soc_flash_nios2_qspi.c b/drivers/flash/soc_flash_nios2_qspi.c index d1c5d8227b57..82e6444f4a60 100644 --- a/drivers/flash/soc_flash_nios2_qspi.c +++ b/drivers/flash/soc_flash_nios2_qspi.c @@ -61,7 +61,8 @@ struct flash_nios2_qspi_config { struct k_sem sem_lock; }; -static int flash_nios2_qspi_erase(struct device *dev, off_t offset, size_t len) +static int flash_nios2_qspi_erase(const struct device *dev, off_t offset, + size_t len) { struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; @@ -155,7 +156,8 @@ static int flash_nios2_qspi_erase(struct device *dev, off_t offset, size_t len) } -static int flash_nios2_qspi_write_block(struct device *dev, int block_offset, +static int flash_nios2_qspi_write_block(const struct device *dev, + int block_offset, int mem_offset, const void *data, size_t len) { @@ -253,7 +255,7 @@ static int flash_nios2_qspi_write_block(struct device *dev, int block_offset, return rc; } -static int flash_nios2_qspi_write(struct device *dev, off_t offset, +static int flash_nios2_qspi_write(const struct device *dev, off_t offset, const void *data, size_t len) { struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; @@ -319,7 +321,7 @@ static int flash_nios2_qspi_write(struct device *dev, off_t offset, return rc; } -static int flash_nios2_qspi_read(struct device *dev, off_t offset, +static int flash_nios2_qspi_read(const struct device *dev, off_t offset, void *data, size_t len) { struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; @@ -386,7 +388,8 @@ static int flash_nios2_qspi_read(struct device *dev, off_t offset, return rc; } -static int flash_nios2_qspi_write_protection(struct device *dev, bool enable) +static int flash_nios2_qspi_write_protection(const struct device *dev, + bool enable) { struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; @@ -461,7 +464,7 @@ static const struct flash_driver_api flash_nios2_qspi_api = { .write_block_size = NIOS2_WRITE_BLOCK_SIZE, }; -static int flash_nios2_qspi_init(struct device *dev) +static int flash_nios2_qspi_init(const struct device *dev) { struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c index fb877d4a6d57..f71e9089dd00 100644 --- a/drivers/flash/soc_flash_nrf.c +++ b/drivers/flash/soc_flash_nrf.c @@ -163,7 +163,7 @@ static void nvmc_wait_ready(void) } } -static int flash_nrf_read(struct device *dev, off_t addr, +static int flash_nrf_read(const struct device *dev, off_t addr, void *data, size_t len) { if (is_regular_addr_valid(addr, len)) { @@ -181,7 +181,7 @@ static int flash_nrf_read(struct device *dev, off_t addr, return 0; } -static int flash_nrf_write(struct device *dev, off_t addr, +static int flash_nrf_write(const struct device *dev, off_t addr, const void *data, size_t len) { int ret; @@ -218,7 +218,7 @@ static int flash_nrf_write(struct device *dev, off_t addr, return ret; } -static int flash_nrf_erase(struct device *dev, off_t addr, size_t size) +static int flash_nrf_erase(const struct device *dev, off_t addr, size_t size) { u32_t pg_size = nrfx_nvmc_flash_page_size_get(); u32_t n_pages = size / pg_size; @@ -261,7 +261,7 @@ static int flash_nrf_erase(struct device *dev, off_t addr, size_t size) return ret; } -static int flash_nrf_write_protection(struct device *dev, bool enable) +static int flash_nrf_write_protection(const struct device *dev, bool enable) { return 0; } @@ -269,7 +269,7 @@ static int flash_nrf_write_protection(struct device *dev, bool enable) #if defined(CONFIG_FLASH_PAGE_LAYOUT) static struct flash_pages_layout dev_layout; -static void flash_nrf_pages_layout(struct device *dev, +static void flash_nrf_pages_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -293,7 +293,7 @@ static const struct flash_driver_api flash_nrf_api = { #endif }; -static int nrf_flash_init(struct device *dev) +static int nrf_flash_init(const struct device *dev) { SYNC_INIT(); diff --git a/drivers/flash/soc_flash_rv32m1.c b/drivers/flash/soc_flash_rv32m1.c index d7fc85893ce5..afc5b16eb7ad 100644 --- a/drivers/flash/soc_flash_rv32m1.c +++ b/drivers/flash/soc_flash_rv32m1.c @@ -37,7 +37,8 @@ struct flash_priv { * */ -static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) +static int flash_mcux_erase(const struct device *dev, off_t offset, + size_t len) { struct flash_priv *priv = dev->driver_data; u32_t addr; @@ -59,7 +60,7 @@ static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_mcux_read(struct device *dev, off_t offset, +static int flash_mcux_read(const struct device *dev, off_t offset, void *data, size_t len) { struct flash_priv *priv = dev->driver_data; @@ -77,7 +78,7 @@ static int flash_mcux_read(struct device *dev, off_t offset, return 0; } -static int flash_mcux_write(struct device *dev, off_t offset, +static int flash_mcux_write(const struct device *dev, off_t offset, const void *data, size_t len) { struct flash_priv *priv = dev->driver_data; @@ -100,7 +101,7 @@ static int flash_mcux_write(struct device *dev, off_t offset, return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_mcux_write_protection(struct device *dev, bool enable) +static int flash_mcux_write_protection(const struct device *dev, bool enable) { struct flash_priv *priv = dev->driver_data; int rc = 0; @@ -122,7 +123,7 @@ static const struct flash_pages_layout dev_layout = { }; static void flash_mcux_pages_layout( - struct device *dev, + const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -144,7 +145,7 @@ static const struct flash_driver_api flash_mcux_api = { .write_block_size = FSL_FEATURE_FLASH_PFLASH_BLOCK_WRITE_UNIT_SIZE, }; -static int flash_mcux_init(struct device *dev) +static int flash_mcux_init(const struct device *dev) { struct flash_priv *priv = dev->driver_data; u32_t pflash_block_base; diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index 072e44c11d6b..274ed6a9cdde 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -51,7 +51,7 @@ LOG_MODULE_REGISTER(spi_flash_at45, CONFIG_FLASH_LOG_LEVEL); } struct spi_flash_at45_data { - struct device *spi; + const struct device *spi; struct spi_cs_control spi_cs; struct k_sem lock; #if IS_ENABLED(CONFIG_DEVICE_POWER_MANAGEMENT) @@ -76,27 +76,27 @@ struct spi_flash_at45_config { u8_t jedec_id[3]; }; -static struct spi_flash_at45_data *get_dev_data(struct device *dev) +static struct spi_flash_at45_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static const struct spi_flash_at45_config *get_dev_config(struct device *dev) +static const struct spi_flash_at45_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static void acquire(struct device *dev) +static void acquire(const struct device *dev) { k_sem_take(&get_dev_data(dev)->lock, K_FOREVER); } -static void release(struct device *dev) +static void release(const struct device *dev) { k_sem_give(&get_dev_data(dev)->lock); } -static int check_jedec_id(struct device *dev) +static int check_jedec_id(const struct device *dev) { const struct spi_flash_at45_config *cfg = get_dev_config(dev); int err; @@ -147,7 +147,7 @@ static int check_jedec_id(struct device *dev) * - Byte 1 to MSB * of the pointed parameter. */ -static int read_status_register(struct device *dev, u16_t *status) +static int read_status_register(const struct device *dev, u16_t *status) { int err; const u8_t opcode = CMD_READ_STATUS; @@ -182,7 +182,7 @@ static int read_status_register(struct device *dev, u16_t *status) return 0; } -static int wait_until_ready(struct device *dev) +static int wait_until_ready(const struct device *dev) { int err; u16_t status; @@ -194,7 +194,7 @@ static int wait_until_ready(struct device *dev) return err; } -static int configure_page_size(struct device *dev) +static int configure_page_size(const struct device *dev) { int err; u16_t status; @@ -237,7 +237,7 @@ static bool is_valid_request(off_t addr, size_t size, size_t chip_size) return (addr >= 0 && (addr + size) <= chip_size); } -static int spi_flash_at45_read(struct device *dev, off_t offset, +static int spi_flash_at45_read(const struct device *dev, off_t offset, void *data, size_t len) { const struct spi_flash_at45_config *cfg = get_dev_config(dev); @@ -285,7 +285,7 @@ static int spi_flash_at45_read(struct device *dev, off_t offset, return (err != 0) ? -EIO : 0; } -static int perform_write(struct device *dev, off_t offset, +static int perform_write(const struct device *dev, off_t offset, const void *data, size_t len) { int err; @@ -322,7 +322,7 @@ static int perform_write(struct device *dev, off_t offset, return (err != 0) ? -EIO : 0; } -static int spi_flash_at45_write(struct device *dev, off_t offset, +static int spi_flash_at45_write(const struct device *dev, off_t offset, const void *data, size_t len) { const struct spi_flash_at45_config *cfg = get_dev_config(dev); @@ -358,7 +358,7 @@ static int spi_flash_at45_write(struct device *dev, off_t offset, return err; } -static int perform_chip_erase(struct device *dev) +static int perform_chip_erase(const struct device *dev) { int err; u8_t const chip_erase_cmd[] = CMD_CHIP_ERASE; @@ -390,7 +390,8 @@ static bool is_erase_possible(size_t entity_size, (offset & (entity_size - 1)) == 0); } -static int perform_erase_op(struct device *dev, u8_t opcode, off_t offset) +static int perform_erase_op(const struct device *dev, u8_t opcode, + off_t offset) { int err; u8_t const op_and_addr[] = { @@ -420,7 +421,8 @@ static int perform_erase_op(struct device *dev, u8_t opcode, off_t offset) return (err != 0) ? -EIO : 0; } -static int spi_flash_at45_erase(struct device *dev, off_t offset, size_t size) +static int spi_flash_at45_erase(const struct device *dev, off_t offset, + size_t size) { const struct spi_flash_at45_config *cfg = get_dev_config(dev); int err; @@ -471,7 +473,8 @@ static int spi_flash_at45_erase(struct device *dev, off_t offset, size_t size) return err; } -static int spi_flash_at45_write_protection(struct device *dev, bool enable) +static int spi_flash_at45_write_protection(const struct device *dev, + bool enable) { ARG_UNUSED(dev); ARG_UNUSED(enable); @@ -490,7 +493,7 @@ static int spi_flash_at45_write_protection(struct device *dev, bool enable) #if IS_ENABLED(CONFIG_FLASH_PAGE_LAYOUT) static void spi_flash_at45_pages_layout( - struct device *dev, + const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -499,7 +502,7 @@ static void spi_flash_at45_pages_layout( } #endif /* IS_ENABLED(CONFIG_FLASH_PAGE_LAYOUT) */ -static int power_down_op(struct device *dev, u8_t opcode, u32_t delay) +static int power_down_op(const struct device *dev, u8_t opcode, u32_t delay) { int err = 0; const struct spi_buf tx_buf[] = { @@ -524,7 +527,7 @@ static int power_down_op(struct device *dev, u8_t opcode, u32_t delay) return 0; } -static int spi_flash_at45_init(struct device *dev) +static int spi_flash_at45_init(const struct device *dev) { struct spi_flash_at45_data *dev_data = get_dev_data(dev); const struct spi_flash_at45_config *dev_config = get_dev_config(dev); @@ -569,7 +572,8 @@ static int spi_flash_at45_init(struct device *dev) } #if IS_ENABLED(CONFIG_DEVICE_POWER_MANAGEMENT) -static int spi_flash_at45_pm_control(struct device *dev, u32_t ctrl_command, +static int spi_flash_at45_pm_control(const struct device *dev, + u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { struct spi_flash_at45_data *dev_data = get_dev_data(dev); diff --git a/drivers/flash/spi_flash_w25qxxdv.c b/drivers/flash/spi_flash_w25qxxdv.c index e97602c15cbf..6238a60f4ce4 100644 --- a/drivers/flash/spi_flash_w25qxxdv.c +++ b/drivers/flash/spi_flash_w25qxxdv.c @@ -71,7 +71,7 @@ static int spi_flash_wb_access(struct spi_flash_data *ctx, return spi_write(ctx->spi, &ctx->spi_cfg, &tx); } -static inline int spi_flash_wb_id(struct device *dev) +static inline int spi_flash_wb_id(const struct device *dev) { struct spi_flash_data *const driver_data = dev->driver_data; u32_t temp_data; @@ -93,7 +93,7 @@ static inline int spi_flash_wb_id(struct device *dev) return 0; } -static u8_t spi_flash_wb_reg_read(struct device *dev, u8_t reg) +static u8_t spi_flash_wb_reg_read(const struct device *dev, u8_t reg) { struct spi_flash_data *const driver_data = dev->driver_data; @@ -105,7 +105,7 @@ static u8_t spi_flash_wb_reg_read(struct device *dev, u8_t reg) return reg; } -static inline void wait_for_flash_idle(struct device *dev) +static inline void wait_for_flash_idle(const struct device *dev) { u8_t reg; @@ -114,7 +114,7 @@ static inline void wait_for_flash_idle(struct device *dev) } while (reg & W25QXXDV_WIP_BIT); } -static int spi_flash_wb_reg_write(struct device *dev, u8_t reg) +static int spi_flash_wb_reg_write(const struct device *dev, u8_t reg) { struct spi_flash_data *const driver_data = dev->driver_data; @@ -126,7 +126,8 @@ static int spi_flash_wb_reg_write(struct device *dev, u8_t reg) return 0; } -static int spi_flash_wb_read(struct device *dev, off_t offset, void *data, +static int spi_flash_wb_read(const struct device *dev, off_t offset, + void *data, size_t len) { struct spi_flash_data *const driver_data = dev->driver_data; @@ -148,7 +149,7 @@ static int spi_flash_wb_read(struct device *dev, off_t offset, void *data, return ret; } -static int spi_flash_wb_write_protection_set_with_lock(struct device *dev, +static int spi_flash_wb_write_protection_set_with_lock(const struct device *dev, bool enable, bool lock) { struct spi_flash_data *const driver_data = dev->driver_data; @@ -176,13 +177,14 @@ static int spi_flash_wb_write_protection_set_with_lock(struct device *dev, return ret; } -static int spi_flash_wb_write_protection_set(struct device *dev, bool enable) +static int spi_flash_wb_write_protection_set(const struct device *dev, + bool enable) { return spi_flash_wb_write_protection_set_with_lock(dev, enable, true); } -static int spi_flash_wb_program_page(struct device *dev, off_t offset, - const void *data, size_t len) +static int spi_flash_wb_program_page(const struct device *dev, off_t offset, + const void *data, size_t len) { u8_t reg; struct spi_flash_data *const driver_data = dev->driver_data; @@ -209,7 +211,7 @@ static int spi_flash_wb_program_page(struct device *dev, off_t offset, } -static int spi_flash_wb_write(struct device *dev, off_t offset, +static int spi_flash_wb_write(const struct device *dev, off_t offset, const void *data, size_t len) { int ret; @@ -270,7 +272,7 @@ static int spi_flash_wb_write(struct device *dev, off_t offset, return ret; } -static inline int spi_flash_wb_erase_internal(struct device *dev, +static inline int spi_flash_wb_erase_internal(const struct device *dev, off_t offset, size_t size) { struct spi_flash_data *const driver_data = dev->driver_data; @@ -315,7 +317,8 @@ static inline int spi_flash_wb_erase_internal(struct device *dev, need_offset, offset, NULL, 0, true); } -static int spi_flash_wb_erase(struct device *dev, off_t offset, size_t size) +static int spi_flash_wb_erase(const struct device *dev, off_t offset, + size_t size) { struct spi_flash_data *const driver_data = dev->driver_data; int ret = 0; @@ -379,7 +382,7 @@ static int spi_flash_wb_erase(struct device *dev, off_t offset, size_t size) #if defined(CONFIG_FLASH_PAGE_LAYOUT) static struct flash_pages_layout dev_layout; -static void flash_wb_pages_layout(struct device *dev, +static void flash_wb_pages_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { @@ -399,7 +402,7 @@ static const struct flash_driver_api spi_flash_api = { .write_block_size = 1, }; -static int spi_flash_wb_configure(struct device *dev) +static int spi_flash_wb_configure(const struct device *dev) { struct spi_flash_data *data = dev->driver_data; @@ -428,7 +431,7 @@ static int spi_flash_wb_configure(struct device *dev) return spi_flash_wb_id(dev); } -static int spi_flash_init(struct device *dev) +static int spi_flash_init(const struct device *dev) { int ret; diff --git a/drivers/flash/spi_flash_w25qxxdv.h b/drivers/flash/spi_flash_w25qxxdv.h index fa906acb52c9..8f686db08e57 100644 --- a/drivers/flash/spi_flash_w25qxxdv.h +++ b/drivers/flash/spi_flash_w25qxxdv.h @@ -16,7 +16,7 @@ #define DT_DRV_COMPAT winbond_w25q16 struct spi_flash_data { - struct device *spi; + const struct device *spi; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control cs_ctrl; #endif diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index d64c51d86ed7..f62408f8582c 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -70,7 +70,7 @@ LOG_MODULE_REGISTER(spi_nor, CONFIG_FLASH_LOG_LEVEL); * @sem: The semaphore to access to the flash */ struct spi_nor_data { - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control cs_ctrl; @@ -240,7 +240,7 @@ static int exit_dpd(const struct device *const dev) * This means taking the lock and, if necessary, waking the device * from deep power-down mode. */ -static void acquire_device(struct device *dev) +static void acquire_device(const struct device *dev) { if (IS_ENABLED(CONFIG_MULTITHREADING)) { struct spi_nor_data *const driver_data = dev->driver_data; @@ -258,7 +258,7 @@ static void acquire_device(struct device *dev) * This means (optionally) putting the device into deep power-down * mode, and releasing the lock. */ -static void release_device(struct device *dev) +static void release_device(const struct device *dev) { if (IS_ENABLED(CONFIG_SPI_NOR_IDLE_IN_DPD)) { enter_dpd(dev); @@ -278,7 +278,7 @@ static void release_device(struct device *dev) * @param flash_id The flash info structure which contains the expected JEDEC ID * @return 0 on success, negative errno code otherwise */ -static inline int spi_nor_read_id(struct device *dev, +static inline int spi_nor_read_id(const struct device *dev, const struct spi_nor_config *const flash_id) { u8_t buf[SPI_NOR_MAX_ID_LEN]; @@ -301,7 +301,7 @@ static inline int spi_nor_read_id(struct device *dev, * @param dev The device structure * @return 0 on success, negative errno code otherwise */ -static int spi_nor_wait_until_ready(struct device *dev) +static int spi_nor_wait_until_ready(const struct device *dev) { int ret; u8_t reg; @@ -313,7 +313,7 @@ static int spi_nor_wait_until_ready(struct device *dev) return ret; } -static int spi_nor_read(struct device *dev, off_t addr, void *dest, +static int spi_nor_read(const struct device *dev, off_t addr, void *dest, size_t size) { const struct spi_nor_config *params = dev->config_info; @@ -334,7 +334,8 @@ static int spi_nor_read(struct device *dev, off_t addr, void *dest, return ret; } -static int spi_nor_write(struct device *dev, off_t addr, const void *src, +static int spi_nor_write(const struct device *dev, off_t addr, + const void *src, size_t size) { const struct spi_nor_config *params = dev->config_info; @@ -380,7 +381,7 @@ static int spi_nor_write(struct device *dev, off_t addr, const void *src, return ret; } -static int spi_nor_erase(struct device *dev, off_t addr, size_t size) +static int spi_nor_erase(const struct device *dev, off_t addr, size_t size) { const struct spi_nor_config *params = dev->config_info; int ret = 0; @@ -439,7 +440,8 @@ static int spi_nor_erase(struct device *dev, off_t addr, size_t size) return ret; } -static int spi_nor_write_protection_set(struct device *dev, bool write_protect) +static int spi_nor_write_protection_set(const struct device *dev, + bool write_protect) { int ret; @@ -468,7 +470,7 @@ static int spi_nor_write_protection_set(struct device *dev, bool write_protect) * @param info The flash info structure * @return 0 on success, negative errno code otherwise */ -static int spi_nor_configure(struct device *dev) +static int spi_nor_configure(const struct device *dev) { struct spi_nor_data *data = dev->driver_data; const struct spi_nor_config *params = dev->config_info; @@ -517,7 +519,7 @@ static int spi_nor_configure(struct device *dev) * @param name The flash name * @return 0 on success, negative errno code otherwise */ -static int spi_nor_init(struct device *dev) +static int spi_nor_init(const struct device *dev) { if (IS_ENABLED(CONFIG_MULTITHREADING)) { struct spi_nor_data *const driver_data = dev->driver_data; @@ -549,7 +551,7 @@ static const struct flash_pages_layout dev_layout = { }; #undef LAYOUT_PAGES_COUNT -static void spi_nor_pages_layout(struct device *dev, +static void spi_nor_pages_layout(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size) { diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c index e1d74eddf2b0..73e04053eb70 100644 --- a/drivers/gpio/gpio_cc13xx_cc26xx.c +++ b/drivers/gpio/gpio_cc13xx_cc26xx.c @@ -43,12 +43,12 @@ static const struct gpio_driver_config gpio_cc13xx_cc26xx_cfg_0 = { .port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(0), }; -static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port, - u32_t mask); -static int gpio_cc13xx_cc26xx_port_clear_bits_raw(struct device *port, - u32_t mask); +static int gpio_cc13xx_cc26xx_port_set_bits_raw(const struct device *port, + u32_t mask); +static int gpio_cc13xx_cc26xx_port_clear_bits_raw(const struct device *port, + u32_t mask); -static int gpio_cc13xx_cc26xx_config(struct device *port, +static int gpio_cc13xx_cc26xx_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { @@ -108,7 +108,8 @@ static int gpio_cc13xx_cc26xx_config(struct device *port, return 0; } -static int gpio_cc13xx_cc26xx_port_get_raw(struct device *port, u32_t *value) +static int gpio_cc13xx_cc26xx_port_get_raw(const struct device *port, + u32_t *value) { __ASSERT_NO_MSG(value != NULL); @@ -117,8 +118,8 @@ static int gpio_cc13xx_cc26xx_port_get_raw(struct device *port, u32_t *value) return 0; } -static int gpio_cc13xx_cc26xx_port_set_masked_raw(struct device *port, - u32_t mask, u32_t value) +static int gpio_cc13xx_cc26xx_port_set_masked_raw(const struct device *port, + u32_t mask, u32_t value) { GPIO_setMultiDio(mask & value); GPIO_clearMultiDio(mask & ~value); @@ -126,31 +127,34 @@ static int gpio_cc13xx_cc26xx_port_set_masked_raw(struct device *port, return 0; } -static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port, u32_t mask) +static int gpio_cc13xx_cc26xx_port_set_bits_raw(const struct device *port, + u32_t mask) { GPIO_setMultiDio(mask); return 0; } -static int gpio_cc13xx_cc26xx_port_clear_bits_raw(struct device *port, - u32_t mask) +static int gpio_cc13xx_cc26xx_port_clear_bits_raw(const struct device *port, + u32_t mask) { GPIO_clearMultiDio(mask); return 0; } -static int gpio_cc13xx_cc26xx_port_toggle_bits(struct device *port, u32_t mask) +static int gpio_cc13xx_cc26xx_port_toggle_bits(const struct device *port, + u32_t mask) { GPIO_toggleMultiDio(mask); return 0; } -static int gpio_cc13xx_cc26xx_pin_interrupt_configure(struct device *port, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_cc13xx_cc26xx_pin_interrupt_configure(const struct device *port, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { struct gpio_cc13xx_cc26xx_data *data = port->driver_data; u32_t config = 0; @@ -182,7 +186,7 @@ static int gpio_cc13xx_cc26xx_pin_interrupt_configure(struct device *port, return 0; } -static int gpio_cc13xx_cc26xx_manage_callback(struct device *port, +static int gpio_cc13xx_cc26xx_manage_callback(const struct device *port, struct gpio_callback *callback, bool set) { @@ -191,7 +195,7 @@ static int gpio_cc13xx_cc26xx_manage_callback(struct device *port, return gpio_manage_callback(&data->callbacks, callback, set); } -static int gpio_cc13xx_cc26xx_enable_callback(struct device *port, +static int gpio_cc13xx_cc26xx_enable_callback(const struct device *port, gpio_pin_t pin) { struct gpio_cc13xx_cc26xx_data *data = port->driver_data; @@ -202,7 +206,7 @@ static int gpio_cc13xx_cc26xx_enable_callback(struct device *port, return 0; } -static int gpio_cc13xx_cc26xx_disable_callback(struct device *port, +static int gpio_cc13xx_cc26xx_disable_callback(const struct device *port, gpio_pin_t pin) { struct gpio_cc13xx_cc26xx_data *data = port->driver_data; @@ -213,7 +217,7 @@ static int gpio_cc13xx_cc26xx_disable_callback(struct device *port, return 0; } -static u32_t gpio_cc13xx_cc26xx_get_pending_int(struct device *dev) +static u32_t gpio_cc13xx_cc26xx_get_pending_int(const struct device *dev) { return GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK); } @@ -222,7 +226,7 @@ DEVICE_DECLARE(gpio_cc13xx_cc26xx); static void gpio_cc13xx_cc26xx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct gpio_cc13xx_cc26xx_data *data = dev->driver_data; u32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK); @@ -233,7 +237,7 @@ static void gpio_cc13xx_cc26xx_isr(void *arg) gpio_fire_callbacks(&data->callbacks, dev, enabled); } -static int gpio_cc13xx_cc26xx_init(struct device *dev) +static int gpio_cc13xx_cc26xx_init(const struct device *dev) { struct gpio_cc13xx_cc26xx_data *data = dev->driver_data; diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c index 2c107e8b858a..782e4e2a028d 100644 --- a/drivers/gpio/gpio_cc32xx.c +++ b/drivers/gpio/gpio_cc32xx.c @@ -66,10 +66,12 @@ struct gpio_cc32xx_data { #define DEV_DATA(dev) \ ((struct gpio_cc32xx_data *)(dev)->driver_data) -static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask); -static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask); +static int gpio_cc32xx_port_set_bits_raw(const struct device *port, + u32_t mask); +static int gpio_cc32xx_port_clear_bits_raw(const struct device *port, + u32_t mask); -static inline int gpio_cc32xx_config(struct device *port, +static inline int gpio_cc32xx_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { @@ -104,7 +106,7 @@ static inline int gpio_cc32xx_config(struct device *port, return 0; } -static int gpio_cc32xx_port_get_raw(struct device *port, u32_t *value) +static int gpio_cc32xx_port_get_raw(const struct device *port, u32_t *value) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); unsigned long port_base = gpio_config->port_base; @@ -115,8 +117,9 @@ static int gpio_cc32xx_port_get_raw(struct device *port, u32_t *value) return 0; } -static int gpio_cc32xx_port_set_masked_raw(struct device *port, u32_t mask, - u32_t value) +static int gpio_cc32xx_port_set_masked_raw(const struct device *port, + u32_t mask, + u32_t value) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); unsigned long port_base = gpio_config->port_base; @@ -126,7 +129,8 @@ static int gpio_cc32xx_port_set_masked_raw(struct device *port, u32_t mask, return 0; } -static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask) +static int gpio_cc32xx_port_set_bits_raw(const struct device *port, + u32_t mask) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); unsigned long port_base = gpio_config->port_base; @@ -136,7 +140,8 @@ static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask) +static int gpio_cc32xx_port_clear_bits_raw(const struct device *port, + u32_t mask) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); unsigned long port_base = gpio_config->port_base; @@ -146,7 +151,7 @@ static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_cc32xx_port_toggle_bits(struct device *port, u32_t mask) +static int gpio_cc32xx_port_toggle_bits(const struct device *port, u32_t mask) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); unsigned long port_base = gpio_config->port_base; @@ -160,9 +165,10 @@ static int gpio_cc32xx_port_toggle_bits(struct device *port, u32_t mask) return 0; } -static int gpio_cc32xx_pin_interrupt_configure(struct device *port, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_cc32xx_pin_interrupt_configure(const struct device *port, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port); struct gpio_cc32xx_data *data = DEV_DATA(port); @@ -206,8 +212,9 @@ static int gpio_cc32xx_pin_interrupt_configure(struct device *port, return 0; } -static int gpio_cc32xx_manage_callback(struct device *dev, - struct gpio_callback *callback, bool set) +static int gpio_cc32xx_manage_callback(const struct device *dev, + struct gpio_callback *callback, + bool set) { struct gpio_cc32xx_data *data = DEV_DATA(dev); @@ -215,8 +222,8 @@ static int gpio_cc32xx_manage_callback(struct device *dev, } -static int gpio_cc32xx_enable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_cc32xx_enable_callback(const struct device *dev, + gpio_pin_t pin) { struct gpio_cc32xx_data *data = DEV_DATA(dev); @@ -228,8 +235,8 @@ static int gpio_cc32xx_enable_callback(struct device *dev, } -static int gpio_cc32xx_disable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_cc32xx_disable_callback(const struct device *dev, + gpio_pin_t pin) { struct gpio_cc32xx_data *data = DEV_DATA(dev); @@ -242,7 +249,7 @@ static int gpio_cc32xx_disable_callback(struct device *dev, static void gpio_cc32xx_port_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct gpio_cc32xx_config *config = DEV_CFG(dev); struct gpio_cc32xx_data *data = DEV_DATA(dev); u32_t enabled_int, int_status; @@ -256,7 +263,7 @@ static void gpio_cc32xx_port_isr(void *arg) MAP_GPIOIntClear(config->port_base, int_status); /* Call the registered callbacks */ - gpio_fire_callbacks(&data->callbacks, (struct device *)dev, + gpio_fire_callbacks(&data->callbacks, (const struct device *)dev, enabled_int); } @@ -275,7 +282,7 @@ static const struct gpio_driver_api api_funcs = { }; #define GPIO_CC32XX_INIT_FUNC(n) \ - static int gpio_cc32xx_a##n##_init(struct device *dev) \ + static int gpio_cc32xx_a##n##_init(const struct device *dev) \ { \ ARG_UNUSED(dev); \ \ @@ -305,7 +312,7 @@ static const struct gpio_driver_api api_funcs = { .port_num = n \ }; \ \ - static struct device DEVICE_NAME_GET(gpio_cc32xx_a##n); \ + DEVICE_DECLARE(gpio_cc32xx_a##n); \ static struct gpio_cc32xx_data gpio_cc32xx_a##n##_data; \ \ GPIO_CC32XX_INIT_FUNC(n) \ diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c index db5fff62e25b..a218e668cd4b 100644 --- a/drivers/gpio/gpio_cmsdk_ahb.c +++ b/drivers/gpio/gpio_cmsdk_ahb.c @@ -22,7 +22,7 @@ * @brief GPIO driver for ARM CMSDK AHB GPIO */ -typedef void (*gpio_config_func_t)(struct device *port); +typedef void (*gpio_config_func_t)(const struct device *port); struct gpio_cmsdk_ahb_cfg { /* gpio_driver_config needs to be first */ @@ -44,7 +44,7 @@ struct gpio_cmsdk_ahb_dev_data { sys_slist_t gpio_cb; }; -static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, u32_t *value) +static int gpio_cmsdk_ahb_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -53,8 +53,9 @@ static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, u32_t mask, - u32_t value) +static int gpio_cmsdk_ahb_port_set_masked_raw(const struct device *dev, + u32_t mask, + u32_t value) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -63,7 +64,8 @@ static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_cmsdk_ahb_port_set_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -72,7 +74,8 @@ static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_cmsdk_ahb_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -81,7 +84,8 @@ static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_cmsdk_ahb_port_toggle_bits(const struct device *dev, + u32_t mask) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -90,7 +94,8 @@ static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, gpio_flags_t flags) +static int cmsdk_ahb_gpio_config(const struct device *dev, u32_t mask, + gpio_flags_t flags) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -137,16 +142,17 @@ static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, gpio_flags_t fl * * @return 0 if successful, failed otherwise */ -static int gpio_cmsdk_ahb_config(struct device *dev, +static int gpio_cmsdk_ahb_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { return cmsdk_ahb_gpio_config(dev, BIT(pin), flags); } -static int gpio_cmsdk_ahb_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_cmsdk_ahb_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -186,7 +192,7 @@ static int gpio_cmsdk_ahb_pin_interrupt_configure(struct device *dev, static void gpio_cmsdk_ahb_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; struct gpio_cmsdk_ahb_dev_data *data = dev->driver_data; u32_t int_stat; @@ -200,7 +206,7 @@ static void gpio_cmsdk_ahb_isr(void *arg) } -static int gpio_cmsdk_ahb_manage_callback(struct device *dev, +static int gpio_cmsdk_ahb_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -209,7 +215,7 @@ static int gpio_cmsdk_ahb_manage_callback(struct device *dev, return gpio_manage_callback(&data->gpio_cb, callback, set); } -static int gpio_cmsdk_ahb_enable_callback(struct device *dev, +static int gpio_cmsdk_ahb_enable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -219,7 +225,7 @@ static int gpio_cmsdk_ahb_enable_callback(struct device *dev, return 0; } -static int gpio_cmsdk_ahb_disable_callback(struct device *dev, +static int gpio_cmsdk_ahb_disable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; @@ -248,13 +254,13 @@ static const struct gpio_driver_api gpio_cmsdk_ahb_drv_api_funcs = { * @param dev Device struct * @return 0 if successful, failed otherwise. */ -static int gpio_cmsdk_ahb_init(struct device *dev) +static int gpio_cmsdk_ahb_init(const struct device *dev) { const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(CONFIG_ARM_CLOCK_CONTROL_DEV_NAME); #ifdef CONFIG_SOC_SERIES_BEETLE @@ -270,7 +276,7 @@ static int gpio_cmsdk_ahb_init(struct device *dev) } #define CMSDK_AHB_GPIO_DEVICE(n) \ - static void gpio_cmsdk_port_##n##_config_func(struct device *dev); \ + static void gpio_cmsdk_port_##n##_config_func(const struct device *dev); \ \ static const struct gpio_cmsdk_ahb_cfg gpio_cmsdk_port_##n##_config = { \ .common = { \ @@ -296,7 +302,7 @@ static int gpio_cmsdk_ahb_init(struct device *dev) POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &gpio_cmsdk_ahb_drv_api_funcs); \ \ - static void gpio_cmsdk_port_##n##_config_func(struct device *dev) \ + static void gpio_cmsdk_port_##n##_config_func(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index 48bb23e21e96..7dd6dbb93d6a 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -32,8 +32,8 @@ #include #endif -static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask); -static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask); +static int gpio_dw_port_set_bits_raw(const struct device *port, u32_t mask); +static int gpio_dw_port_clear_bits_raw(const struct device *port, u32_t mask); /* * ARC architecture configure IP through IO auxiliary registers. @@ -84,10 +84,10 @@ static void dw_set_bit(u32_t base_addr, u32_t offset, #endif #ifdef CONFIG_GPIO_DW_CLOCK_GATE -static inline void gpio_dw_clock_config(struct device *port) +static inline void gpio_dw_clock_config(const struct device *port) { char *drv = CONFIG_GPIO_DW_CLOCK_GATE_DRV_NAME; - struct device *clk; + const struct device *clk; clk = device_get_binding(drv); if (clk) { @@ -97,7 +97,7 @@ static inline void gpio_dw_clock_config(struct device *port) } } -static inline void gpio_dw_clock_on(struct device *port) +static inline void gpio_dw_clock_on(const struct device *port) { const struct gpio_dw_config *config = port->config_info; struct gpio_dw_runtime *context = port->driver_data; @@ -105,7 +105,7 @@ static inline void gpio_dw_clock_on(struct device *port) clock_control_on(context->clock, config->clock_data); } -static inline void gpio_dw_clock_off(struct device *port) +static inline void gpio_dw_clock_off(const struct device *port) { const struct gpio_dw_config *config = port->config_info; struct gpio_dw_runtime *context = port->driver_data; @@ -206,9 +206,10 @@ static inline u32_t dw_get_dir_port(u32_t base_addr) return ddr_port; } -static int gpio_dw_pin_interrupt_configure(struct device *port, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_dw_pin_interrupt_configure(const struct device *port, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { struct gpio_dw_runtime *context = port->driver_data; const struct gpio_dw_config *config = port->config_info; @@ -271,7 +272,7 @@ static int gpio_dw_pin_interrupt_configure(struct device *port, return 0; } -static inline void dw_pin_config(struct device *port, +static inline void dw_pin_config(const struct device *port, u32_t pin, int flags) { struct gpio_dw_runtime *context = port->driver_data; @@ -303,7 +304,7 @@ static inline void dw_pin_config(struct device *port, } } -static inline int gpio_dw_config(struct device *port, +static inline int gpio_dw_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { @@ -339,7 +340,7 @@ static inline int gpio_dw_config(struct device *port, return 0; } -static int gpio_dw_port_get_raw(struct device *port, u32_t *value) +static int gpio_dw_port_get_raw(const struct device *port, u32_t *value) { struct gpio_dw_runtime *context = port->driver_data; u32_t base_addr = dw_base_to_block_base(context->base_addr); @@ -351,7 +352,7 @@ static int gpio_dw_port_get_raw(struct device *port, u32_t *value) return 0; } -static int gpio_dw_port_set_masked_raw(struct device *port, +static int gpio_dw_port_set_masked_raw(const struct device *port, u32_t mask, u32_t value) { struct gpio_dw_runtime *context = port->driver_data; @@ -367,7 +368,7 @@ static int gpio_dw_port_set_masked_raw(struct device *port, return 0; } -static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask) +static int gpio_dw_port_set_bits_raw(const struct device *port, u32_t mask) { struct gpio_dw_runtime *context = port->driver_data; u32_t base_addr = dw_base_to_block_base(context->base_addr); @@ -382,7 +383,7 @@ static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask) +static int gpio_dw_port_clear_bits_raw(const struct device *port, u32_t mask) { struct gpio_dw_runtime *context = port->driver_data; u32_t base_addr = dw_base_to_block_base(context->base_addr); @@ -397,7 +398,7 @@ static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_dw_port_toggle_bits(struct device *port, u32_t mask) +static int gpio_dw_port_toggle_bits(const struct device *port, u32_t mask) { struct gpio_dw_runtime *context = port->driver_data; u32_t base_addr = dw_base_to_block_base(context->base_addr); @@ -412,7 +413,7 @@ static int gpio_dw_port_toggle_bits(struct device *port, u32_t mask) return 0; } -static inline int gpio_dw_manage_callback(struct device *port, +static inline int gpio_dw_manage_callback(const struct device *port, struct gpio_callback *callback, bool set) { @@ -421,7 +422,7 @@ static inline int gpio_dw_manage_callback(struct device *port, return gpio_manage_callback(&context->callbacks, callback, set); } -static inline int gpio_dw_enable_callback(struct device *port, +static inline int gpio_dw_enable_callback(const struct device *port, gpio_pin_t pin) { struct gpio_dw_runtime *context = port->driver_data; @@ -438,7 +439,7 @@ static inline int gpio_dw_enable_callback(struct device *port, return 0; } -static inline int gpio_dw_disable_callback(struct device *port, +static inline int gpio_dw_disable_callback(const struct device *port, gpio_pin_t pin) { struct gpio_dw_runtime *context = port->driver_data; @@ -455,21 +456,22 @@ static inline int gpio_dw_disable_callback(struct device *port, } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static void gpio_dw_set_power_state(struct device *port, u32_t power_state) +static void gpio_dw_set_power_state(const struct device *port, + u32_t power_state) { struct gpio_dw_runtime *context = port->driver_data; context->device_power_state = power_state; } -static u32_t gpio_dw_get_power_state(struct device *port) +static u32_t gpio_dw_get_power_state(const struct device *port) { struct gpio_dw_runtime *context = port->driver_data; return context->device_power_state; } -static inline int gpio_dw_suspend_port(struct device *port) +static inline int gpio_dw_suspend_port(const struct device *port) { gpio_dw_clock_off(port); gpio_dw_set_power_state(port, DEVICE_PM_SUSPEND_STATE); @@ -477,7 +479,7 @@ static inline int gpio_dw_suspend_port(struct device *port) return 0; } -static inline int gpio_dw_resume_from_suspend_port(struct device *port) +static inline int gpio_dw_resume_from_suspend_port(const struct device *port) { gpio_dw_clock_on(port); gpio_dw_set_power_state(port, DEVICE_PM_ACTIVE_STATE); @@ -488,7 +490,7 @@ static inline int gpio_dw_resume_from_suspend_port(struct device *port) * Implements the driver control management functionality * the *context may include IN data or/and OUT data */ -static int gpio_dw_device_ctrl(struct device *port, u32_t ctrl_command, +static int gpio_dw_device_ctrl(const struct device *port, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -517,7 +519,7 @@ static int gpio_dw_device_ctrl(struct device *port, u32_t ctrl_command, static void gpio_dw_isr(void *arg) { - struct device *port = (struct device *)arg; + const struct device *port = (const struct device *)arg; struct gpio_dw_runtime *context = port->driver_data; u32_t base_addr = dw_base_to_block_base(context->base_addr); u32_t int_status; @@ -552,7 +554,7 @@ static const struct gpio_driver_api api_funcs = { .disable_callback = gpio_dw_disable_callback, }; -static int gpio_dw_initialize(struct device *port) +static int gpio_dw_initialize(const struct device *port) { struct gpio_dw_runtime *context = port->driver_data; const struct gpio_dw_config *config = port->config_info; @@ -582,7 +584,7 @@ static int gpio_dw_initialize(struct device *port) /* Bindings to the plaform */ #ifdef CONFIG_GPIO_DW_0 -static void gpio_config_0_irq(struct device *port); +static void gpio_config_0_irq(const struct device *port); static const struct gpio_dw_config gpio_config_0 = { .common = { @@ -623,7 +625,7 @@ DEVICE_AND_API_INIT(gpio_dw_0, DT_INST_LABEL(0), #else #define INST_0_IRQ_FLAGS 0 #endif -static void gpio_config_0_irq(struct device *port) +static void gpio_config_0_irq(const struct device *port) { #if (DT_INST_IRQN(0) > 0) const struct gpio_dw_config *config = port->config_info; @@ -635,7 +637,7 @@ static void gpio_config_0_irq(struct device *port) INST_0_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_0_IRQ_SHARED) - struct device *shared_irq_dev; + const struct device *shared_irq_dev; shared_irq_dev = device_get_binding(config->shared_irq_dev_name); __ASSERT(shared_irq_dev != NULL, @@ -651,7 +653,7 @@ static void gpio_config_0_irq(struct device *port) #ifdef CONFIG_GPIO_DW_1 -static void gpio_config_1_irq(struct device *port); +static void gpio_config_1_irq(const struct device *port); static const struct gpio_dw_config gpio_dw_config_1 = { .common = { @@ -693,7 +695,7 @@ DEVICE_AND_API_INIT(gpio_dw_1, DT_INST_LABEL(1), #else #define INST_1_IRQ_FLAGS 0 #endif -static void gpio_config_1_irq(struct device *port) +static void gpio_config_1_irq(const struct device *port) { #if (DT_INST_IRQN(1) > 0) const struct gpio_dw_config *config = port->config_info; @@ -705,7 +707,7 @@ static void gpio_config_1_irq(struct device *port) INST_1_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_1_IRQ_SHARED) - struct device *shared_irq_dev; + const struct device *shared_irq_dev; shared_irq_dev = device_get_binding(config->shared_irq_dev_name); __ASSERT(shared_irq_dev != NULL, @@ -720,7 +722,7 @@ static void gpio_config_1_irq(struct device *port) #endif /* CONFIG_GPIO_DW_1 */ #ifdef CONFIG_GPIO_DW_2 -static void gpio_config_2_irq(struct device *port); +static void gpio_config_2_irq(const struct device *port); static const struct gpio_dw_config gpio_dw_config_2 = { .common = { @@ -761,7 +763,7 @@ DEVICE_AND_API_INIT(gpio_dw_2, DT_INST_LABEL(2), #else #define INST_2_IRQ_FLAGS 0 #endif -static void gpio_config_2_irq(struct device *port) +static void gpio_config_2_irq(const struct device *port) { #if (DT_INST_IRQN(2) > 0) const struct gpio_dw_config *config = port->config_info; @@ -773,7 +775,7 @@ static void gpio_config_2_irq(struct device *port) INST_2_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_2_IRQ_SHARED) - struct device *shared_irq_dev; + const struct device *shared_irq_dev; shared_irq_dev = device_get_binding(config->shared_irq_dev_name); __ASSERT(shared_irq_dev != NULL, @@ -788,7 +790,7 @@ static void gpio_config_2_irq(struct device *port) #endif /* CONFIG_GPIO_DW_2 */ #ifdef CONFIG_GPIO_DW_3 -static void gpio_config_3_irq(struct device *port); +static void gpio_config_3_irq(const struct device *port); static const struct gpio_dw_config gpio_dw_config_3 = { .common = { @@ -829,7 +831,7 @@ DEVICE_AND_API_INIT(gpio_dw_3, DT_INST_LABEL(3), #else #define INST_3_IRQ_FLAGS 0 #endif -static void gpio_config_3_irq(struct device *port) +static void gpio_config_3_irq(const struct device *port) { #if (DT_INST_IRQN(3) > 0) const struct gpio_dw_config *config = port->config_info; @@ -841,7 +843,7 @@ static void gpio_config_3_irq(struct device *port) INST_3_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_3_IRQ_SHARED) - struct device *shared_irq_dev; + const struct device *shared_irq_dev; shared_irq_dev = device_get_binding(config->shared_irq_dev_name); __ASSERT(shared_irq_dev != NULL, diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h index 09088eb271ee..3f051903bc6e 100644 --- a/drivers/gpio/gpio_dw.h +++ b/drivers/gpio/gpio_dw.h @@ -15,7 +15,7 @@ extern "C" { #endif -typedef void (*gpio_config_irq_t)(struct device *port); +typedef void (*gpio_config_irq_t)(const struct device *port); struct gpio_dw_config { /* gpio_driver_config needs to be first */ @@ -38,7 +38,7 @@ struct gpio_dw_runtime { struct gpio_driver_data common; u32_t base_addr; #ifdef CONFIG_GPIO_DW_CLOCK_GATE - struct device *clock; + const struct device *clock; #endif sys_slist_t callbacks; #ifdef CONFIG_DEVICE_POWER_MANAGEMENT diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c index 61eb910db6c3..afbc91f6c98b 100644 --- a/drivers/gpio/gpio_esp32.c +++ b/drivers/gpio/gpio_esp32.c @@ -41,7 +41,7 @@ struct gpio_esp32_data { /* gpio_driver_data needs to be first */ struct gpio_driver_data common; - struct device *pinmux; + const struct device *pinmux; struct { volatile u32_t *set_reg; @@ -57,7 +57,7 @@ struct gpio_esp32_data { sys_slist_t cb; }; -static int gpio_esp32_config(struct device *dev, +static int gpio_esp32_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { @@ -116,7 +116,7 @@ static int gpio_esp32_config(struct device *dev, return 0; } -static int gpio_esp32_port_get_raw(struct device *port, u32_t *value) +static int gpio_esp32_port_get_raw(const struct device *port, u32_t *value) { struct gpio_esp32_data *data = port->driver_data; @@ -125,7 +125,7 @@ static int gpio_esp32_port_get_raw(struct device *port, u32_t *value) return 0; } -static int gpio_esp32_port_set_masked_raw(struct device *port, +static int gpio_esp32_port_set_masked_raw(const struct device *port, u32_t mask, u32_t value) { struct gpio_esp32_data *data = port->driver_data; @@ -139,7 +139,7 @@ static int gpio_esp32_port_set_masked_raw(struct device *port, return 0; } -static int gpio_esp32_port_set_bits_raw(struct device *port, +static int gpio_esp32_port_set_bits_raw(const struct device *port, u32_t pins) { struct gpio_esp32_data *data = port->driver_data; @@ -148,7 +148,7 @@ static int gpio_esp32_port_set_bits_raw(struct device *port, return 0; } -static int gpio_esp32_port_clear_bits_raw(struct device *port, +static int gpio_esp32_port_clear_bits_raw(const struct device *port, u32_t pins) { struct gpio_esp32_data *data = port->driver_data; @@ -157,7 +157,7 @@ static int gpio_esp32_port_clear_bits_raw(struct device *port, return 0; } -static int gpio_esp32_port_toggle_bits(struct device *port, +static int gpio_esp32_port_toggle_bits(const struct device *port, u32_t pins) { struct gpio_esp32_data *data = port->driver_data; @@ -214,7 +214,7 @@ static int convert_int_type(enum gpio_int_mode mode, return -EINVAL; } -static int gpio_esp32_pin_interrupt_configure(struct device *port, +static int gpio_esp32_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -251,7 +251,7 @@ static int gpio_esp32_pin_interrupt_configure(struct device *port, return 0; } -static int gpio_esp32_manage_callback(struct device *dev, +static int gpio_esp32_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -260,7 +260,7 @@ static int gpio_esp32_manage_callback(struct device *dev, return gpio_manage_callback(&data->cb, callback, set); } -static int gpio_esp32_enable_callback(struct device *dev, +static int gpio_esp32_enable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_esp32_data *data = dev->driver_data; @@ -270,7 +270,7 @@ static int gpio_esp32_enable_callback(struct device *dev, return 0; } -static int gpio_esp32_disable_callback(struct device *dev, +static int gpio_esp32_disable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_esp32_data *data = dev->driver_data; @@ -280,7 +280,7 @@ static int gpio_esp32_disable_callback(struct device *dev, return 0; } -static void gpio_esp32_fire_callbacks(struct device *device) +static void gpio_esp32_fire_callbacks(const struct device *device) { struct gpio_esp32_data *data = device->driver_data; u32_t values = *data->port.irq_status_reg; @@ -293,7 +293,7 @@ static void gpio_esp32_fire_callbacks(struct device *device) static void gpio_esp32_isr(void *param); -static int gpio_esp32_init(struct device *device) +static int gpio_esp32_init(const struct device *device) { struct gpio_esp32_data *data = device->driver_data; static bool isr_connected; diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c index 330667579ef6..879555a1c524 100644 --- a/drivers/gpio/gpio_gecko.c +++ b/drivers/gpio/gpio_gecko.c @@ -45,7 +45,7 @@ struct gpio_gecko_common_config { struct gpio_gecko_common_data { /* a list of all ports */ - struct device *ports[NUMBER_OF_PORTS]; + const struct device *ports[NUMBER_OF_PORTS]; size_t count; }; @@ -66,13 +66,13 @@ struct gpio_gecko_data { }; static inline void gpio_gecko_add_port(struct gpio_gecko_common_data *data, - struct device *dev) + const struct device *dev) { __ASSERT(dev, "No port device!"); data->ports[data->count++] = dev; } -static int gpio_gecko_configure(struct device *dev, +static int gpio_gecko_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { @@ -125,7 +125,7 @@ static int gpio_gecko_configure(struct device *dev, return 0; } -static int gpio_gecko_port_get_raw(struct device *dev, u32_t *value) +static int gpio_gecko_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_gecko_config *config = dev->config_info; GPIO_P_TypeDef *gpio_base = config->gpio_base; @@ -135,7 +135,8 @@ static int gpio_gecko_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_gecko_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_gecko_port_set_masked_raw(const struct device *dev, + u32_t mask, u32_t value) { const struct gpio_gecko_config *config = dev->config_info; @@ -146,7 +147,7 @@ static int gpio_gecko_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_gecko_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_gecko_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_gecko_config *config = dev->config_info; GPIO_P_TypeDef *gpio_base = config->gpio_base; @@ -160,7 +161,8 @@ static int gpio_gecko_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_gecko_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_gecko_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_gecko_config *config = dev->config_info; GPIO_P_TypeDef *gpio_base = config->gpio_base; @@ -174,7 +176,7 @@ static int gpio_gecko_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_gecko_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_gecko_port_toggle_bits(const struct device *dev, u32_t mask) { const struct gpio_gecko_config *config = dev->config_info; GPIO_P_TypeDef *gpio_base = config->gpio_base; @@ -184,9 +186,10 @@ static int gpio_gecko_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_gecko_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_gecko_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_gecko_config *config = dev->config_info; struct gpio_gecko_data *data = dev->driver_data; @@ -227,7 +230,7 @@ static int gpio_gecko_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_gecko_manage_callback(struct device *dev, +static int gpio_gecko_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { struct gpio_gecko_data *data = dev->driver_data; @@ -235,7 +238,7 @@ static int gpio_gecko_manage_callback(struct device *dev, return gpio_manage_callback(&data->callbacks, callback, set); } -static int gpio_gecko_enable_callback(struct device *dev, +static int gpio_gecko_enable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_gecko_data *data = dev->driver_data; @@ -246,7 +249,7 @@ static int gpio_gecko_enable_callback(struct device *dev, return 0; } -static int gpio_gecko_disable_callback(struct device *dev, +static int gpio_gecko_disable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_gecko_data *data = dev->driver_data; @@ -262,10 +265,10 @@ static int gpio_gecko_disable_callback(struct device *dev, */ static void gpio_gecko_common_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct gpio_gecko_common_data *data = dev->driver_data; u32_t enabled_int, int_status; - struct device *port_dev; + const struct device *port_dev; struct gpio_gecko_data *port_data; int_status = GPIO->IF; @@ -303,7 +306,7 @@ static const struct gpio_driver_api gpio_gecko_common_driver_api = { .disable_callback = gpio_gecko_disable_callback, }; -static int gpio_gecko_common_init(struct device *dev); +static int gpio_gecko_common_init(const struct device *dev); static const struct gpio_gecko_common_config gpio_gecko_common_config = { }; @@ -316,7 +319,7 @@ DEVICE_AND_API_INIT(gpio_gecko_common, DT_LABEL(DT_INST(0, silabs_gecko_gpio)), POST_KERNEL, CONFIG_GPIO_GECKO_COMMON_INIT_PRIORITY, &gpio_gecko_common_driver_api); -static int gpio_gecko_common_init(struct device *dev) +static int gpio_gecko_common_init(const struct device *dev) { gpio_gecko_common_data.count = 0; IRQ_CONNECT(GPIO_EVEN_IRQn, @@ -334,7 +337,7 @@ static int gpio_gecko_common_init(struct device *dev) } #define GPIO_PORT_INIT(idx) \ -static int gpio_gecko_port##idx##_init(struct device *dev); \ +static int gpio_gecko_port##idx##_init(const struct device *dev); \ \ static const struct gpio_gecko_config gpio_gecko_port##idx##_config = { \ .common = { \ @@ -354,7 +357,7 @@ DEVICE_AND_API_INIT(gpio_gecko_port##idx, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &gpio_gecko_driver_api); \ \ -static int gpio_gecko_port##idx##_init(struct device *dev) \ +static int gpio_gecko_port##idx##_init(const struct device *dev) \ { \ gpio_gecko_add_port(&gpio_gecko_common_data, dev); \ return 0; \ diff --git a/drivers/gpio/gpio_handlers.c b/drivers/gpio/gpio_handlers.c index bafad5771408..b44f6db7584c 100644 --- a/drivers/gpio/gpio_handlers.c +++ b/drivers/gpio/gpio_handlers.c @@ -7,89 +7,94 @@ #include #include -static inline int z_vrfy_gpio_config(struct device *port, +static inline int z_vrfy_gpio_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, pin_configure)); - return z_impl_gpio_config((struct device *)port, pin, flags); + return z_impl_gpio_config((const struct device *)port, pin, flags); } #include -static inline int z_vrfy_gpio_port_get_raw(struct device *port, +static inline int z_vrfy_gpio_port_get_raw(const struct device *port, gpio_port_value_t *value) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, port_get_raw)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(value, sizeof(gpio_port_value_t))); - return z_impl_gpio_port_get_raw((struct device *)port, + return z_impl_gpio_port_get_raw((const struct device *)port, (gpio_port_value_t *)value); } #include -static inline int z_vrfy_gpio_port_set_masked_raw(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value) +static inline int z_vrfy_gpio_port_set_masked_raw(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, port_set_masked_raw)); - return z_impl_gpio_port_set_masked_raw((struct device *)port, mask, + return z_impl_gpio_port_set_masked_raw((const struct device *)port, + mask, value); } #include -static inline int z_vrfy_gpio_port_set_bits_raw(struct device *port, +static inline int z_vrfy_gpio_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, port_set_bits_raw)); - return z_impl_gpio_port_set_bits_raw((struct device *)port, pins); + return z_impl_gpio_port_set_bits_raw((const struct device *)port, + pins); } #include -static inline int z_vrfy_gpio_port_clear_bits_raw(struct device *port, +static inline int z_vrfy_gpio_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, port_clear_bits_raw)); - return z_impl_gpio_port_clear_bits_raw((struct device *)port, pins); + return z_impl_gpio_port_clear_bits_raw((const struct device *)port, + pins); } #include -static inline int z_vrfy_gpio_port_toggle_bits(struct device *port, +static inline int z_vrfy_gpio_port_toggle_bits(const struct device *port, gpio_port_pins_t pins) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, port_toggle_bits)); - return z_impl_gpio_port_toggle_bits((struct device *)port, pins); + return z_impl_gpio_port_toggle_bits((const struct device *)port, pins); } #include -static inline int z_vrfy_gpio_pin_interrupt_configure(struct device *port, +static inline int z_vrfy_gpio_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, pin_interrupt_configure)); - return z_impl_gpio_pin_interrupt_configure((struct device *)port, pin, + return z_impl_gpio_pin_interrupt_configure((const struct device *)port, + pin, flags); } #include -static inline int z_vrfy_gpio_enable_callback(struct device *port, - gpio_pin_t pin) +static inline int z_vrfy_gpio_enable_callback(const struct device *port, + gpio_pin_t pin) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, enable_callback)); - return z_impl_gpio_enable_callback((struct device *)port, pin); + return z_impl_gpio_enable_callback((const struct device *)port, pin); } #include -static inline int z_vrfy_gpio_disable_callback(struct device *port, - gpio_pin_t pin) +static inline int z_vrfy_gpio_disable_callback(const struct device *port, + gpio_pin_t pin) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(port, disable_callback)); - return z_impl_gpio_disable_callback((struct device *)port, pin); + return z_impl_gpio_disable_callback((const struct device *)port, pin); } #include -static inline int z_vrfy_gpio_get_pending_int(struct device *dev) +static inline int z_vrfy_gpio_get_pending_int(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_GPIO(dev, get_pending_int)); - return z_impl_gpio_get_pending_int((struct device *)dev); + return z_impl_gpio_get_pending_int((const struct device *)dev); } #include diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c index 5dfb5a31c938..b1552b9079f7 100644 --- a/drivers/gpio/gpio_ht16k33.c +++ b/drivers/gpio/gpio_ht16k33.c @@ -35,11 +35,11 @@ struct gpio_ht16k33_cfg { struct gpio_ht16k33_data { /* gpio_driver_data needs to be first */ struct gpio_driver_data common; - struct device *parent; + const struct device *parent; sys_slist_t callbacks; }; -static int gpio_ht16k33_cfg(struct device *dev, +static int gpio_ht16k33_cfg(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { @@ -55,7 +55,7 @@ static int gpio_ht16k33_cfg(struct device *dev, return 0; } -static int gpio_ht16k33_port_get_raw(struct device *port, +static int gpio_ht16k33_port_get_raw(const struct device *port, gpio_port_value_t *value) { ARG_UNUSED(port); @@ -65,7 +65,7 @@ static int gpio_ht16k33_port_get_raw(struct device *port, return -ENOTSUP; } -static int gpio_ht16k33_port_set_masked_raw(struct device *port, +static int gpio_ht16k33_port_set_masked_raw(const struct device *port, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -77,7 +77,7 @@ static int gpio_ht16k33_port_set_masked_raw(struct device *port, return -ENOTSUP; } -static int gpio_ht16k33_port_set_bits_raw(struct device *port, +static int gpio_ht16k33_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins) { ARG_UNUSED(port); @@ -87,7 +87,7 @@ static int gpio_ht16k33_port_set_bits_raw(struct device *port, return -ENOTSUP; } -static int gpio_ht16k33_port_clear_bits_raw(struct device *port, +static int gpio_ht16k33_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins) { ARG_UNUSED(port); @@ -97,7 +97,7 @@ static int gpio_ht16k33_port_clear_bits_raw(struct device *port, return -ENOTSUP; } -static int gpio_ht16k33_port_toggle_bits(struct device *port, +static int gpio_ht16k33_port_toggle_bits(const struct device *port, gpio_port_pins_t pins) { ARG_UNUSED(port); @@ -107,7 +107,7 @@ static int gpio_ht16k33_port_toggle_bits(struct device *port, return -ENOTSUP; } -static int gpio_ht16k33_pin_interrupt_configure(struct device *port, +static int gpio_ht16k33_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, enum gpio_int_mode int_mode, enum gpio_int_trig int_trig) @@ -121,7 +121,7 @@ static int gpio_ht16k33_pin_interrupt_configure(struct device *port, return 0; } -void ht16k33_process_keyscan_row_data(struct device *dev, +void ht16k33_process_keyscan_row_data(const struct device *dev, u32_t keys) { struct gpio_ht16k33_data *data = dev->driver_data; @@ -129,7 +129,7 @@ void ht16k33_process_keyscan_row_data(struct device *dev, gpio_fire_callbacks(&data->callbacks, dev, keys); } -static int gpio_ht16k33_manage_callback(struct device *dev, +static int gpio_ht16k33_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -138,28 +138,28 @@ static int gpio_ht16k33_manage_callback(struct device *dev, return gpio_manage_callback(&data->callbacks, callback, set); } -static int gpio_ht16k33_enable_callback(struct device *dev, +static int gpio_ht16k33_enable_callback(const struct device *dev, gpio_pin_t pin) { /* All callbacks are always enabled */ return 0; } -static int gpio_ht16k33_disable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_ht16k33_disable_callback(const struct device *dev, + gpio_pin_t pin) { /* Individual callbacks can not be disabled */ return -ENOTSUP; } -static u32_t gpio_ht16k33_get_pending_int(struct device *dev) +static u32_t gpio_ht16k33_get_pending_int(const struct device *dev) { struct gpio_ht16k33_data *data = dev->driver_data; return ht16k33_get_pending_int(data->parent); } -static int gpio_ht16k33_init(struct device *dev) +static int gpio_ht16k33_init(const struct device *dev) { const struct gpio_ht16k33_cfg *config = dev->config_info; struct gpio_ht16k33_data *data = dev->driver_data; diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c index 398ae417982a..cf64d86b0a29 100644 --- a/drivers/gpio/gpio_imx.c +++ b/drivers/gpio/gpio_imx.c @@ -30,7 +30,7 @@ struct imx_gpio_data { u32_t pin_callback_enables; }; -static int imx_gpio_configure(struct device *port, gpio_pin_t pin, +static int imx_gpio_configure(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { const struct imx_gpio_config *config = port->config_info; @@ -68,7 +68,7 @@ static int imx_gpio_configure(struct device *port, gpio_pin_t pin, return 0; } -static int imx_gpio_port_get_raw(struct device *port, u32_t *value) +static int imx_gpio_port_get_raw(const struct device *port, u32_t *value) { const struct imx_gpio_config *config = port->config_info; GPIO_Type *base = config->base; @@ -78,7 +78,7 @@ static int imx_gpio_port_get_raw(struct device *port, u32_t *value) return 0; } -static int imx_gpio_port_set_masked_raw(struct device *port, +static int imx_gpio_port_set_masked_raw(const struct device *port, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -91,7 +91,7 @@ static int imx_gpio_port_set_masked_raw(struct device *port, return 0; } -static int imx_gpio_port_set_bits_raw(struct device *port, +static int imx_gpio_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins) { const struct imx_gpio_config *config = port->config_info; @@ -102,7 +102,7 @@ static int imx_gpio_port_set_bits_raw(struct device *port, return 0; } -static int imx_gpio_port_clear_bits_raw(struct device *port, +static int imx_gpio_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins) { const struct imx_gpio_config *config = port->config_info; @@ -113,7 +113,8 @@ static int imx_gpio_port_clear_bits_raw(struct device *port, return 0; } -static int imx_gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins) +static int imx_gpio_port_toggle_bits(const struct device *port, + gpio_port_pins_t pins) { const struct imx_gpio_config *config = port->config_info; GPIO_Type *base = config->base; @@ -123,7 +124,7 @@ static int imx_gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins) return 0; } -static int imx_gpio_pin_interrupt_configure(struct device *port, +static int imx_gpio_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -179,7 +180,7 @@ static int imx_gpio_pin_interrupt_configure(struct device *port, return 0; } -static int imx_gpio_manage_callback(struct device *port, +static int imx_gpio_manage_callback(const struct device *port, struct gpio_callback *cb, bool set) { struct imx_gpio_data *data = port->driver_data; @@ -187,7 +188,7 @@ static int imx_gpio_manage_callback(struct device *port, return gpio_manage_callback(&data->callbacks, cb, set); } -static int imx_gpio_enable_callback(struct device *port, +static int imx_gpio_enable_callback(const struct device *port, gpio_pin_t pin) { const struct imx_gpio_config *config = port->config_info; @@ -199,7 +200,7 @@ static int imx_gpio_enable_callback(struct device *port, return 0; } -static int imx_gpio_disable_callback(struct device *port, +static int imx_gpio_disable_callback(const struct device *port, gpio_pin_t pin) { const struct imx_gpio_config *config = port->config_info; @@ -213,7 +214,7 @@ static int imx_gpio_disable_callback(struct device *port, static void imx_gpio_port_isr(void *arg) { - struct device *port = (struct device *)arg; + const struct device *port = (const struct device *)arg; const struct imx_gpio_config *config = port->config_info; struct imx_gpio_data *data = port->driver_data; u32_t enabled_int; @@ -238,7 +239,7 @@ static const struct gpio_driver_api imx_gpio_driver_api = { }; #define GPIO_IMX_INIT(n) \ - static int imx_gpio_##n##_init(struct device *port); \ + static int imx_gpio_##n##_init(const struct device *port); \ \ static const struct imx_gpio_config imx_gpio_##n##_config = { \ .common = { \ @@ -258,7 +259,7 @@ static const struct gpio_driver_api imx_gpio_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &imx_gpio_driver_api); \ \ - static int imx_gpio_##n##_init(struct device *port) \ + static int imx_gpio_##n##_init(const struct device *port) \ { \ IRQ_CONNECT(DT_INST_IRQ_BY_IDX(n, 0, irq), \ DT_INST_IRQ_BY_IDX(n, 0, priority), \ diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c index 1f757e9850a1..42424e852760 100644 --- a/drivers/gpio/gpio_intel_apl.c +++ b/drivers/gpio/gpio_intel_apl.c @@ -130,7 +130,7 @@ struct gpio_intel_apl_data { * * @return true if host owns the GPIO pin, false otherwise */ -static bool check_perm(struct device *dev, u32_t raw_pin) +static bool check_perm(const struct device *dev, u32_t raw_pin) { const struct gpio_intel_apl_config *cfg = dev->config_info; struct gpio_intel_apl_data *data = dev->driver_data; @@ -171,9 +171,9 @@ static bool check_perm(struct device *dev, u32_t raw_pin) static int nr_isr_devs; -static struct device *isr_devs[GPIO_INTEL_APL_NR_SUBDEVS]; +static const struct device *isr_devs[GPIO_INTEL_APL_NR_SUBDEVS]; -static int gpio_intel_apl_isr(struct device *dev) +static int gpio_intel_apl_isr(const struct device *dev) { const struct gpio_intel_apl_config *cfg; struct gpio_intel_apl_data *data; @@ -207,7 +207,7 @@ static int gpio_intel_apl_isr(struct device *dev) return 0; } -static int gpio_intel_apl_config(struct device *dev, +static int gpio_intel_apl_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_intel_apl_config *cfg = dev->config_info; @@ -281,9 +281,10 @@ static int gpio_intel_apl_config(struct device *dev, return 0; } -static int gpio_intel_apl_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_intel_apl_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_intel_apl_config *cfg = dev->config_info; struct gpio_intel_apl_data *data = dev->driver_data; @@ -361,7 +362,7 @@ static int gpio_intel_apl_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_intel_apl_manage_callback(struct device *dev, +static int gpio_intel_apl_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -370,7 +371,7 @@ static int gpio_intel_apl_manage_callback(struct device *dev, return gpio_manage_callback(&data->cb, callback, set); } -static int gpio_intel_apl_enable_callback(struct device *dev, +static int gpio_intel_apl_enable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_intel_apl_config *cfg = dev->config_info; @@ -395,7 +396,7 @@ static int gpio_intel_apl_enable_callback(struct device *dev, return 0; } -static int gpio_intel_apl_disable_callback(struct device *dev, +static int gpio_intel_apl_disable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_intel_apl_config *cfg = dev->config_info; @@ -416,7 +417,7 @@ static int gpio_intel_apl_disable_callback(struct device *dev, return 0; } -static int port_get_raw(struct device *dev, u32_t mask, u32_t *value, +static int port_get_raw(const struct device *dev, u32_t mask, u32_t *value, bool read_tx) { const struct gpio_intel_apl_config *cfg = dev->config_info; @@ -456,7 +457,7 @@ static int port_get_raw(struct device *dev, u32_t mask, u32_t *value, return 0; } -static int port_set_raw(struct device *dev, u32_t mask, u32_t value) +static int port_set_raw(const struct device *dev, u32_t mask, u32_t value) { const struct gpio_intel_apl_config *cfg = dev->config_info; struct gpio_intel_apl_data *data = dev->driver_data; @@ -492,7 +493,8 @@ static int port_set_raw(struct device *dev, u32_t mask, u32_t value) return 0; } -static int gpio_intel_apl_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_intel_apl_port_set_masked_raw(const struct device *dev, + u32_t mask, u32_t value) { u32_t port_val; @@ -506,17 +508,20 @@ static int gpio_intel_apl_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_intel_apl_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_intel_apl_port_set_bits_raw(const struct device *dev, + u32_t mask) { return gpio_intel_apl_port_set_masked_raw(dev, mask, mask); } -static int gpio_intel_apl_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_intel_apl_port_clear_bits_raw(const struct device *dev, + u32_t mask) { return gpio_intel_apl_port_set_masked_raw(dev, mask, 0); } -static int gpio_intel_apl_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_intel_apl_port_toggle_bits(const struct device *dev, + u32_t mask) { u32_t port_val; @@ -529,7 +534,7 @@ static int gpio_intel_apl_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_intel_apl_port_get_raw(struct device *dev, u32_t *value) +static int gpio_intel_apl_port_get_raw(const struct device *dev, u32_t *value) { return port_get_raw(dev, 0xFFFFFFFF, value, false); } @@ -547,7 +552,7 @@ static const struct gpio_driver_api gpio_intel_apl_api = { .pin_interrupt_configure = gpio_intel_apl_pin_interrupt_configure, }; -int gpio_intel_apl_init(struct device *dev) +int gpio_intel_apl_init(const struct device *dev) { const struct gpio_intel_apl_config *cfg = dev->config_info; struct gpio_intel_apl_data *data = dev->driver_data; diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c index 86895d8e5d22..83ebf7575fce 100644 --- a/drivers/gpio/gpio_litex.c +++ b/drivers/gpio/gpio_litex.c @@ -78,7 +78,7 @@ static inline u32_t get_port(const struct gpio_litex_cfg *config) /* Driver functions */ -static int gpio_litex_init(struct device *dev) +static int gpio_litex_init(const struct device *dev) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -91,7 +91,7 @@ static int gpio_litex_init(struct device *dev) return 0; } -static int gpio_litex_configure(struct device *dev, +static int gpio_litex_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -129,7 +129,8 @@ static int gpio_litex_configure(struct device *dev, return 0; } -static int gpio_litex_port_get_raw(struct device *dev, gpio_port_value_t *value) +static int gpio_litex_port_get_raw(const struct device *dev, + gpio_port_value_t *value) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -137,7 +138,7 @@ static int gpio_litex_port_get_raw(struct device *dev, gpio_port_value_t *value) return 0; } -static int gpio_litex_port_set_masked_raw(struct device *dev, +static int gpio_litex_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -151,7 +152,7 @@ static int gpio_litex_port_set_masked_raw(struct device *dev, return 0; } -static int gpio_litex_port_set_bits_raw(struct device *dev, +static int gpio_litex_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -164,7 +165,7 @@ static int gpio_litex_port_set_bits_raw(struct device *dev, return 0; } -static int gpio_litex_port_clear_bits_raw(struct device *dev, +static int gpio_litex_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -177,7 +178,7 @@ static int gpio_litex_port_clear_bits_raw(struct device *dev, return 0; } -static int gpio_litex_port_toggle_bits(struct device *dev, +static int gpio_litex_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev); @@ -190,10 +191,10 @@ static int gpio_litex_port_toggle_bits(struct device *dev, return 0; } -static int gpio_litex_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, - enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_litex_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { int ret = 0; diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c index 4c165109abe8..f724b88a3f1d 100644 --- a/drivers/gpio/gpio_lmp90xxx.c +++ b/drivers/gpio/gpio_lmp90xxx.c @@ -31,10 +31,10 @@ struct gpio_lmp90xxx_config { struct gpio_lmp90xxx_data { /* gpio_driver_data needs to be first */ struct gpio_driver_data common; - struct device *parent; + const struct device *parent; }; -static int gpio_lmp90xxx_config(struct device *dev, +static int gpio_lmp90xxx_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { struct gpio_lmp90xxx_data *data = dev->driver_data; @@ -82,7 +82,7 @@ static int gpio_lmp90xxx_config(struct device *dev, return err; } -static int gpio_lmp90xxx_port_get_raw(struct device *dev, +static int gpio_lmp90xxx_port_get_raw(const struct device *dev, gpio_port_value_t *value) { struct gpio_lmp90xxx_data *data = dev->driver_data; @@ -90,7 +90,7 @@ static int gpio_lmp90xxx_port_get_raw(struct device *dev, return lmp90xxx_gpio_port_get_raw(data->parent, value); } -static int gpio_lmp90xxx_port_set_masked_raw(struct device *dev, +static int gpio_lmp90xxx_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -99,7 +99,7 @@ static int gpio_lmp90xxx_port_set_masked_raw(struct device *dev, return lmp90xxx_gpio_port_set_masked_raw(data->parent, mask, value); } -static int gpio_lmp90xxx_port_set_bits_raw(struct device *dev, +static int gpio_lmp90xxx_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins) { struct gpio_lmp90xxx_data *data = dev->driver_data; @@ -107,7 +107,7 @@ static int gpio_lmp90xxx_port_set_bits_raw(struct device *dev, return lmp90xxx_gpio_port_set_bits_raw(data->parent, pins); } -static int gpio_lmp90xxx_port_clear_bits_raw(struct device *dev, +static int gpio_lmp90xxx_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins) { struct gpio_lmp90xxx_data *data = dev->driver_data; @@ -115,7 +115,7 @@ static int gpio_lmp90xxx_port_clear_bits_raw(struct device *dev, return lmp90xxx_gpio_port_clear_bits_raw(data->parent, pins); } -static int gpio_lmp90xxx_port_toggle_bits(struct device *dev, +static int gpio_lmp90xxx_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins) { struct gpio_lmp90xxx_data *data = dev->driver_data; @@ -123,7 +123,7 @@ static int gpio_lmp90xxx_port_toggle_bits(struct device *dev, return lmp90xxx_gpio_port_toggle_bits(data->parent, pins); } -static int gpio_lmp90xxx_pin_interrupt_configure(struct device *dev, +static int gpio_lmp90xxx_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -136,7 +136,7 @@ static int gpio_lmp90xxx_pin_interrupt_configure(struct device *dev, return -ENOTSUP; } -static int gpio_lmp90xxx_init(struct device *dev) +static int gpio_lmp90xxx_init(const struct device *dev) { const struct gpio_lmp90xxx_config *config = dev->config_info; struct gpio_lmp90xxx_data *data = dev->driver_data; diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c index 09fd76906f24..075a074e92a0 100644 --- a/drivers/gpio/gpio_mchp_xec.c +++ b/drivers/gpio/gpio_mchp_xec.c @@ -46,7 +46,7 @@ struct gpio_xec_config { u32_t flags; }; -static int gpio_xec_configure(struct device *dev, +static int gpio_xec_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_xec_config *config = dev->config_info; @@ -128,9 +128,10 @@ static int gpio_xec_configure(struct device *dev, return 0; } -static int gpio_xec_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_xec_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_xec_config *config = dev->config_info; struct gpio_xec_data *drv_data = dev->driver_data; @@ -212,7 +213,7 @@ static int gpio_xec_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_xec_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_xec_port_set_masked_raw(const struct device *dev, u32_t mask, u32_t value) { const struct gpio_xec_config *config = dev->config_info; @@ -225,7 +226,7 @@ static int gpio_xec_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_xec_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_xec_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_xec_config *config = dev->config_info; @@ -237,7 +238,7 @@ static int gpio_xec_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_xec_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_xec_port_clear_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_xec_config *config = dev->config_info; @@ -249,7 +250,7 @@ static int gpio_xec_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_xec_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_xec_port_toggle_bits(const struct device *dev, u32_t mask) { const struct gpio_xec_config *config = dev->config_info; @@ -261,7 +262,7 @@ static int gpio_xec_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_xec_port_get_raw(struct device *dev, u32_t *value) +static int gpio_xec_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_xec_config *config = dev->config_info; @@ -273,7 +274,7 @@ static int gpio_xec_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_xec_manage_callback(struct device *dev, +static int gpio_xec_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { struct gpio_xec_data *data = dev->driver_data; @@ -283,7 +284,7 @@ static int gpio_xec_manage_callback(struct device *dev, return 0; } -static int gpio_xec_enable_callback(struct device *dev, +static int gpio_xec_enable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_xec_data *data = dev->driver_data; @@ -293,7 +294,7 @@ static int gpio_xec_enable_callback(struct device *dev, return 0; } -static int gpio_xec_disable_callback(struct device *dev, +static int gpio_xec_disable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_xec_data *data = dev->driver_data; @@ -305,7 +306,7 @@ static int gpio_xec_disable_callback(struct device *dev, static void gpio_gpio_xec_port_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_xec_config *config = dev->config_info; struct gpio_xec_data *data = dev->driver_data; u32_t girq_result; @@ -337,7 +338,7 @@ static const struct gpio_driver_api gpio_xec_driver_api = { }; #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay) -static int gpio_xec_port000_036_init(struct device *dev); +static int gpio_xec_port000_036_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port000_036_config = { .common = { @@ -363,7 +364,7 @@ DEVICE_AND_API_INIT(gpio_xec_port000_036, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port000_036_init(struct device *dev) +static int gpio_xec_port000_036_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_000_036), irq) const struct gpio_xec_config *config = dev->config_info; @@ -382,7 +383,7 @@ static int gpio_xec_port000_036_init(struct device *dev) #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_000_036), okay) */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay) -static int gpio_xec_port040_076_init(struct device *dev); +static int gpio_xec_port040_076_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port040_076_config = { .common = { @@ -408,7 +409,7 @@ DEVICE_AND_API_INIT(gpio_xec_port040_076, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port040_076_init(struct device *dev) +static int gpio_xec_port040_076_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_040_076), irq) const struct gpio_xec_config *config = dev->config_info; @@ -427,7 +428,7 @@ static int gpio_xec_port040_076_init(struct device *dev) #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_040_076), okay) */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay) -static int gpio_xec_port100_136_init(struct device *dev); +static int gpio_xec_port100_136_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port100_136_config = { .common = { @@ -453,7 +454,7 @@ DEVICE_AND_API_INIT(gpio_xec_port100_136, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port100_136_init(struct device *dev) +static int gpio_xec_port100_136_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_100_136), irq) const struct gpio_xec_config *config = dev->config_info; @@ -472,7 +473,7 @@ static int gpio_xec_port100_136_init(struct device *dev) #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_100_136), okay) */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay) -static int gpio_xec_port140_176_init(struct device *dev); +static int gpio_xec_port140_176_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port140_176_config = { .common = { @@ -498,7 +499,7 @@ DEVICE_AND_API_INIT(gpio_xec_port140_176, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port140_176_init(struct device *dev) +static int gpio_xec_port140_176_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_140_176), irq) const struct gpio_xec_config *config = dev->config_info; @@ -517,7 +518,7 @@ static int gpio_xec_port140_176_init(struct device *dev) #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_140_176), okay) */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay) -static int gpio_xec_port200_236_init(struct device *dev); +static int gpio_xec_port200_236_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port200_236_config = { .common = { @@ -543,7 +544,7 @@ DEVICE_AND_API_INIT(gpio_xec_port200_236, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port200_236_init(struct device *dev) +static int gpio_xec_port200_236_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_200_236), irq) const struct gpio_xec_config *config = dev->config_info; @@ -562,7 +563,7 @@ static int gpio_xec_port200_236_init(struct device *dev) #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_200_236), okay) */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio_240_276), okay) -static int gpio_xec_port240_276_init(struct device *dev); +static int gpio_xec_port240_276_init(const struct device *dev); static const struct gpio_xec_config gpio_xec_port240_276_config = { .common = { @@ -588,7 +589,7 @@ DEVICE_AND_API_INIT(gpio_xec_port240_276, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_xec_driver_api); -static int gpio_xec_port240_276_init(struct device *dev) +static int gpio_xec_port240_276_init(const struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_240_276), irq) const struct gpio_xec_config *config = dev->config_info; diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c index 6ea7f90e6f92..6e320f4b2892 100644 --- a/drivers/gpio/gpio_mcp23s17.c +++ b/drivers/gpio/gpio_mcp23s17.c @@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(gpio_mcp23s17); * * @return 0 if successful, failed otherwise. */ -static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf) +static int read_port_regs(const struct device *dev, u8_t reg, u16_t *buf) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -95,7 +95,7 @@ static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf) * * @return 0 if successful, failed otherwise. */ -static int write_port_regs(struct device *dev, u8_t reg, u16_t value) +static int write_port_regs(const struct device *dev, u8_t reg, u16_t value) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -143,7 +143,7 @@ static int write_port_regs(struct device *dev, u8_t reg, u16_t value) * * @return 0 if successful, failed otherwise */ -static int setup_pin_dir(struct device *dev, u32_t pin, int flags) +static int setup_pin_dir(const struct device *dev, u32_t pin, int flags) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -181,7 +181,8 @@ static int setup_pin_dir(struct device *dev, u32_t pin, int flags) * * @return 0 if successful, failed otherwise */ -static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags) +static int setup_pin_pullupdown(const struct device *dev, u32_t pin, + int flags) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -206,7 +207,7 @@ static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags) return ret; } -static int mcp23s17_config(struct device *dev, +static int mcp23s17_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { struct mcp23s17_drv_data *const drv_data = @@ -242,7 +243,7 @@ static int mcp23s17_config(struct device *dev, return ret; } -static int mcp23s17_port_get_raw(struct device *dev, u32_t *value) +static int mcp23s17_port_get_raw(const struct device *dev, u32_t *value) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -268,7 +269,7 @@ static int mcp23s17_port_get_raw(struct device *dev, u32_t *value) return ret; } -static int mcp23s17_port_set_masked_raw(struct device *dev, +static int mcp23s17_port_set_masked_raw(const struct device *dev, u32_t mask, u32_t value) { struct mcp23s17_drv_data *const drv_data = @@ -296,17 +297,17 @@ static int mcp23s17_port_set_masked_raw(struct device *dev, return ret; } -static int mcp23s17_port_set_bits_raw(struct device *dev, u32_t mask) +static int mcp23s17_port_set_bits_raw(const struct device *dev, u32_t mask) { return mcp23s17_port_set_masked_raw(dev, mask, mask); } -static int mcp23s17_port_clear_bits_raw(struct device *dev, u32_t mask) +static int mcp23s17_port_clear_bits_raw(const struct device *dev, u32_t mask) { return mcp23s17_port_set_masked_raw(dev, mask, 0); } -static int mcp23s17_port_toggle_bits(struct device *dev, u32_t mask) +static int mcp23s17_port_toggle_bits(const struct device *dev, u32_t mask) { struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; @@ -333,7 +334,7 @@ static int mcp23s17_port_toggle_bits(struct device *dev, u32_t mask) return ret; } -static int mcp23s17_pin_interrupt_configure(struct device *dev, +static int mcp23s17_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -357,7 +358,7 @@ static const struct gpio_driver_api api_table = { * @param dev Device struct * @return 0 if successful, failed otherwise. */ -static int mcp23s17_init(struct device *dev) +static int mcp23s17_init(const struct device *dev) { const struct mcp23s17_config *const config = dev->config_info; diff --git a/drivers/gpio/gpio_mcp23s17.h b/drivers/gpio/gpio_mcp23s17.h index 0ce9de1d502b..8f29a7b9c09b 100644 --- a/drivers/gpio/gpio_mcp23s17.h +++ b/drivers/gpio/gpio_mcp23s17.h @@ -63,7 +63,7 @@ struct mcp23s17_drv_data { struct gpio_driver_config data; /** Master SPI device */ - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; struct spi_cs_control mcp23s17_cs_ctrl; diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c index b32ea5ecb0fb..c3ddc95a900d 100644 --- a/drivers/gpio/gpio_mcux.c +++ b/drivers/gpio/gpio_mcux.c @@ -33,7 +33,7 @@ struct gpio_mcux_data { u32_t pin_callback_enables; }; -static int gpio_mcux_configure(struct device *dev, +static int gpio_mcux_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_mcux_config *config = dev->config_info; @@ -100,7 +100,7 @@ static int gpio_mcux_configure(struct device *dev, return 0; } -static int gpio_mcux_port_get_raw(struct device *dev, u32_t *value) +static int gpio_mcux_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_mcux_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -110,7 +110,7 @@ static int gpio_mcux_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_mcux_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_mcux_port_set_masked_raw(const struct device *dev, u32_t mask, u32_t value) { const struct gpio_mcux_config *config = dev->config_info; @@ -121,7 +121,7 @@ static int gpio_mcux_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_mcux_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_mcux_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_mcux_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -131,7 +131,7 @@ static int gpio_mcux_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mcux_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_mcux_port_clear_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_mcux_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -141,7 +141,7 @@ static int gpio_mcux_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mcux_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_mcux_port_toggle_bits(const struct device *dev, u32_t mask) { const struct gpio_mcux_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -151,9 +151,10 @@ static int gpio_mcux_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev, - u32_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static u32_t get_port_pcr_irqc_value_from_flags(const struct device *dev, + u32_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { port_interrupt_t port_interrupt = 0; @@ -184,7 +185,7 @@ static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev, return PORT_PCR_IRQC(port_interrupt); } -static int gpio_mcux_pin_interrupt_configure(struct device *dev, +static int gpio_mcux_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { @@ -219,7 +220,7 @@ static int gpio_mcux_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_mcux_manage_callback(struct device *dev, +static int gpio_mcux_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { struct gpio_mcux_data *data = dev->driver_data; @@ -227,7 +228,7 @@ static int gpio_mcux_manage_callback(struct device *dev, return gpio_manage_callback(&data->callbacks, callback, set); } -static int gpio_mcux_enable_callback(struct device *dev, +static int gpio_mcux_enable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_mcux_data *data = dev->driver_data; @@ -237,7 +238,7 @@ static int gpio_mcux_enable_callback(struct device *dev, return 0; } -static int gpio_mcux_disable_callback(struct device *dev, +static int gpio_mcux_disable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_mcux_data *data = dev->driver_data; @@ -249,7 +250,7 @@ static int gpio_mcux_disable_callback(struct device *dev, static void gpio_mcux_port_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_mcux_config *config = dev->config_info; struct gpio_mcux_data *data = dev->driver_data; u32_t enabled_int, int_status; @@ -290,7 +291,7 @@ static const struct gpio_driver_api gpio_mcux_driver_api = { #define GPIO_PORT_BASE_ADDR(n) DT_REG_ADDR(DT_INST_PHANDLE(n, nxp_kinetis_port)) #define GPIO_DEVICE_INIT_MCUX(n) \ - static int gpio_mcux_port## n ## _init(struct device *dev); \ + static int gpio_mcux_port## n ## _init(const struct device *dev); \ \ static const struct gpio_mcux_config gpio_mcux_port## n ## _config = {\ .common = { \ @@ -311,7 +312,7 @@ static const struct gpio_driver_api gpio_mcux_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &gpio_mcux_driver_api); \ \ - static int gpio_mcux_port## n ##_init(struct device *dev) \ + static int gpio_mcux_port## n ##_init(const struct device *dev) \ { \ IF_ENABLED(DT_INST_IRQ_HAS_IDX(n, 0), \ (GPIO_MCUX_IRQ_INIT(n);)) \ diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c index ded2123e72b8..bf3f31baf09b 100644 --- a/drivers/gpio/gpio_mcux_igpio.c +++ b/drivers/gpio/gpio_mcux_igpio.c @@ -30,7 +30,7 @@ struct mcux_igpio_data { u32_t pin_callback_enables; }; -static int mcux_igpio_configure(struct device *dev, +static int mcux_igpio_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct mcux_igpio_config *config = dev->config_info; @@ -61,7 +61,7 @@ static int mcux_igpio_configure(struct device *dev, return 0; } -static int mcux_igpio_port_get_raw(struct device *dev, u32_t *value) +static int mcux_igpio_port_get_raw(const struct device *dev, u32_t *value) { const struct mcux_igpio_config *config = dev->config_info; GPIO_Type *base = config->base; @@ -71,8 +71,9 @@ static int mcux_igpio_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int mcux_igpio_port_set_masked_raw(struct device *dev, u32_t mask, - u32_t value) +static int mcux_igpio_port_set_masked_raw(const struct device *dev, + u32_t mask, + u32_t value) { const struct mcux_igpio_config *config = dev->config_info; GPIO_Type *base = config->base; @@ -82,7 +83,7 @@ static int mcux_igpio_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int mcux_igpio_port_set_bits_raw(struct device *dev, u32_t mask) +static int mcux_igpio_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct mcux_igpio_config *config = dev->config_info; GPIO_Type *base = config->base; @@ -92,7 +93,8 @@ static int mcux_igpio_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int mcux_igpio_port_clear_bits_raw(struct device *dev, u32_t mask) +static int mcux_igpio_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct mcux_igpio_config *config = dev->config_info; GPIO_Type *base = config->base; @@ -102,7 +104,7 @@ static int mcux_igpio_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int mcux_igpio_port_toggle_bits(struct device *dev, u32_t mask) +static int mcux_igpio_port_toggle_bits(const struct device *dev, u32_t mask) { const struct mcux_igpio_config *config = dev->config_info; GPIO_Type *base = config->base; @@ -112,9 +114,10 @@ static int mcux_igpio_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int mcux_igpio_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int mcux_igpio_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct mcux_igpio_config *config = dev->config_info; struct mcux_igpio_data *data = dev->driver_data; @@ -168,16 +171,17 @@ static int mcux_igpio_pin_interrupt_configure(struct device *dev, return 0; } -static int mcux_igpio_manage_callback(struct device *dev, - struct gpio_callback *callback, bool set) +static int mcux_igpio_manage_callback(const struct device *dev, + struct gpio_callback *callback, + bool set) { struct mcux_igpio_data *data = dev->driver_data; return gpio_manage_callback(&data->callbacks, callback, set); } -static int mcux_igpio_enable_callback(struct device *dev, - gpio_pin_t pin) +static int mcux_igpio_enable_callback(const struct device *dev, + gpio_pin_t pin) { struct mcux_igpio_data *data = dev->driver_data; @@ -186,8 +190,8 @@ static int mcux_igpio_enable_callback(struct device *dev, return 0; } -static int mcux_igpio_disable_callback(struct device *dev, - gpio_pin_t pin) +static int mcux_igpio_disable_callback(const struct device *dev, + gpio_pin_t pin) { struct mcux_igpio_data *data = dev->driver_data; @@ -198,7 +202,7 @@ static int mcux_igpio_disable_callback(struct device *dev, static void mcux_igpio_port_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_igpio_config *config = dev->config_info; struct mcux_igpio_data *data = dev->driver_data; GPIO_Type *base = config->base; @@ -235,7 +239,7 @@ static const struct gpio_driver_api mcux_igpio_driver_api = { } while (0) #define MCUX_IGPIO_INIT(n) \ - static int mcux_igpio_##n##_init(struct device *dev); \ + static int mcux_igpio_##n##_init(const struct device *dev); \ \ static const struct mcux_igpio_config mcux_igpio_##n##_config = {\ .common = { \ @@ -254,7 +258,7 @@ static const struct gpio_driver_api mcux_igpio_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &mcux_igpio_driver_api); \ \ - static int mcux_igpio_##n##_init(struct device *dev) \ + static int mcux_igpio_##n##_init(const struct device *dev) \ { \ MCUX_IGPIO_IRQ_INIT(n, 0); \ \ diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c index 708df141aef0..c2fef9a6456c 100644 --- a/drivers/gpio/gpio_mcux_lpc.c +++ b/drivers/gpio/gpio_mcux_lpc.c @@ -58,7 +58,7 @@ struct gpio_mcux_lpc_data { u32_t isr_list_idx; }; -static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin, +static int gpio_mcux_lpc_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_mcux_lpc_config *config = dev->config_info; @@ -100,7 +100,7 @@ static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin, return 0; } -static int gpio_mcux_lpc_port_get_raw(struct device *dev, u32_t *value) +static int gpio_mcux_lpc_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_mcux_lpc_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -110,7 +110,8 @@ static int gpio_mcux_lpc_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_mcux_lpc_port_set_masked_raw(const struct device *dev, + u32_t mask, u32_t value) { const struct gpio_mcux_lpc_config *config = dev->config_info; @@ -126,7 +127,8 @@ static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_mcux_lpc_port_set_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_mcux_lpc_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -136,7 +138,8 @@ static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_mcux_lpc_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_mcux_lpc_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -146,7 +149,8 @@ static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_mcux_lpc_port_toggle_bits(const struct device *dev, + u32_t mask) { const struct gpio_mcux_lpc_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -158,7 +162,7 @@ static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, u32_t mask) static void gpio_mcux_lpc_port_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_mcux_lpc_config *config = dev->config_info; struct gpio_mcux_lpc_data *data = dev->driver_data; u32_t enabled_int; @@ -228,9 +232,10 @@ static u32_t attach_pin_to_isr(u32_t port, u32_t pin, u32_t isr_no) static void gpio_mcux_lpc_port_isr(void *arg); -static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_mcux_lpc_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_mcux_lpc_config *config = dev->config_info; struct gpio_mcux_lpc_data *data = dev->driver_data; @@ -292,7 +297,7 @@ static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_mcux_lpc_manage_cb(struct device *port, +static int gpio_mcux_lpc_manage_cb(const struct device *port, struct gpio_callback *callback, bool set) { struct gpio_mcux_lpc_data *data = port->driver_data; @@ -300,7 +305,7 @@ static int gpio_mcux_lpc_manage_cb(struct device *port, return gpio_manage_callback(&data->callbacks, callback, set); } -static int gpio_mcux_lpc_enable_cb(struct device *port, +static int gpio_mcux_lpc_enable_cb(const struct device *port, gpio_pin_t pin) { struct gpio_mcux_lpc_data *data = port->driver_data; @@ -310,7 +315,7 @@ static int gpio_mcux_lpc_enable_cb(struct device *port, return 0; } -static int gpio_mcux_lpc_disable_cb(struct device *port, +static int gpio_mcux_lpc_disable_cb(const struct device *port, gpio_pin_t pin) { struct gpio_mcux_lpc_data *data = port->driver_data; @@ -320,7 +325,7 @@ static int gpio_mcux_lpc_disable_cb(struct device *port, return 0; } -static int gpio_mcux_lpc_init(struct device *dev) +static int gpio_mcux_lpc_init(const struct device *dev) { const struct gpio_mcux_lpc_config *config = dev->config_info; struct gpio_mcux_lpc_data *data = dev->driver_data; @@ -351,7 +356,7 @@ static const struct gpio_driver_api gpio_mcux_lpc_driver_api = { }; #ifdef CONFIG_GPIO_MCUX_LPC_PORT0 -static int lpc_gpio_0_init(struct device *dev); +static int lpc_gpio_0_init(const struct device *dev); static const struct gpio_mcux_lpc_config gpio_mcux_lpc_port0_config = { .common = { @@ -372,7 +377,7 @@ DEVICE_AND_API_INIT(gpio_mcux_lpc_port0, DT_INST_LABEL(0), CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &gpio_mcux_lpc_driver_api); -static int lpc_gpio_0_init(struct device *dev) +static int lpc_gpio_0_init(const struct device *dev) { #if DT_INST_IRQ_HAS_IDX(0, 0) || \ DT_INST_IRQ_HAS_IDX(0, 1) || \ @@ -421,7 +426,7 @@ static int lpc_gpio_0_init(struct device *dev) #endif /* CONFIG_GPIO_MCUX_LPC_PORT0 */ #ifdef CONFIG_GPIO_MCUX_LPC_PORT1 -static int lpc_gpio_1_init(struct device *dev); +static int lpc_gpio_1_init(const struct device *dev); static const struct gpio_mcux_lpc_config gpio_mcux_lpc_port1_config = { .common = { @@ -442,7 +447,7 @@ DEVICE_AND_API_INIT(gpio_mcux_lpc_port1, DT_INST_LABEL(1), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_mcux_lpc_driver_api); -static int lpc_gpio_1_init(struct device *dev) +static int lpc_gpio_1_init(const struct device *dev) { #if DT_INST_IRQ_HAS_IDX(1, 0) || \ DT_INST_IRQ_HAS_IDX(1, 1) || \ diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c index 3a158aee2430..cde452e01e25 100644 --- a/drivers/gpio/gpio_mmio32.c +++ b/drivers/gpio/gpio_mmio32.c @@ -29,7 +29,7 @@ #include #include -static int gpio_mmio32_config(struct device *dev, +static int gpio_mmio32_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { struct gpio_mmio32_context *context = dev->driver_data; @@ -62,7 +62,7 @@ static int gpio_mmio32_config(struct device *dev, return 0; } -static int gpio_mmio32_port_get_raw(struct device *dev, u32_t *value) +static int gpio_mmio32_port_get_raw(const struct device *dev, u32_t *value) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = context->config; @@ -72,8 +72,9 @@ static int gpio_mmio32_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_mmio32_port_set_masked_raw(struct device *dev, u32_t mask, - u32_t value) +static int gpio_mmio32_port_set_masked_raw(const struct device *dev, + u32_t mask, + u32_t value) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = context->config; @@ -91,7 +92,7 @@ static int gpio_mmio32_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_mmio32_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_mmio32_port_set_bits_raw(const struct device *dev, u32_t mask) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = context->config; @@ -108,7 +109,8 @@ static int gpio_mmio32_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mmio32_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_mmio32_port_clear_bits_raw(const struct device *dev, + u32_t mask) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = context->config; @@ -125,7 +127,7 @@ static int gpio_mmio32_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_mmio32_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_mmio32_port_toggle_bits(const struct device *dev, u32_t mask) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = context->config; @@ -142,9 +144,10 @@ static int gpio_mmio32_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_mmio32_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_mmio32_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { if (mode != GPIO_INT_MODE_DISABLED) { return -ENOTSUP; @@ -153,7 +156,7 @@ static int gpio_mmio32_pin_interrupt_configure(struct device *dev, return 0; } -static const struct gpio_driver_api gpio_mmio32_api = { +const struct gpio_driver_api gpio_mmio32_api = { .pin_configure = gpio_mmio32_config, .port_get_raw = gpio_mmio32_port_get_raw, .port_set_masked_raw = gpio_mmio32_port_set_masked_raw, @@ -163,13 +166,12 @@ static const struct gpio_driver_api gpio_mmio32_api = { .pin_interrupt_configure = gpio_mmio32_pin_interrupt_configure, }; -int gpio_mmio32_init(struct device *dev) +int gpio_mmio32_init(const struct device *dev) { struct gpio_mmio32_context *context = dev->driver_data; const struct gpio_mmio32_config *config = dev->config_info; context->config = config; - dev->driver_api = &gpio_mmio32_api; return 0; } diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c index 53fa20c5147e..3f11969f2528 100644 --- a/drivers/gpio/gpio_nrfx.c +++ b/drivers/gpio/gpio_nrfx.c @@ -37,12 +37,12 @@ struct gpio_nrfx_cfg { u8_t port_num; }; -static inline struct gpio_nrfx_data *get_port_data(struct device *port) +static inline struct gpio_nrfx_data *get_port_data(const struct device *port) { return port->driver_data; } -static inline const struct gpio_nrfx_cfg *get_port_cfg(struct device *port) +static inline const struct gpio_nrfx_cfg *get_port_cfg(const struct device *port) { return port->config_info; } @@ -90,7 +90,7 @@ static inline u32_t sense_for_pin(const struct gpio_nrfx_data *data, return NRF_GPIO_PIN_SENSE_LOW; } -static int gpiote_pin_int_cfg(struct device *port, u32_t pin) +static int gpiote_pin_int_cfg(const struct device *port, u32_t pin) { struct gpio_nrfx_data *data = get_port_data(port); const struct gpio_nrfx_cfg *cfg = get_port_cfg(port); @@ -127,7 +127,7 @@ static int gpiote_pin_int_cfg(struct device *port, u32_t pin) return res; } -static int gpio_nrfx_config(struct device *port, +static int gpio_nrfx_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; @@ -199,7 +199,7 @@ static int gpio_nrfx_config(struct device *port, return 0; } -static int gpio_nrfx_port_get_raw(struct device *port, u32_t *value) +static int gpio_nrfx_port_get_raw(const struct device *port, u32_t *value) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; @@ -208,7 +208,8 @@ static int gpio_nrfx_port_get_raw(struct device *port, u32_t *value) return 0; } -static int gpio_nrfx_port_set_masked_raw(struct device *port, u32_t mask, +static int gpio_nrfx_port_set_masked_raw(const struct device *port, + u32_t mask, u32_t value) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; @@ -220,7 +221,7 @@ static int gpio_nrfx_port_set_masked_raw(struct device *port, u32_t mask, return 0; } -static int gpio_nrfx_port_set_bits_raw(struct device *port, u32_t mask) +static int gpio_nrfx_port_set_bits_raw(const struct device *port, u32_t mask) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; @@ -229,7 +230,8 @@ static int gpio_nrfx_port_set_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_nrfx_port_clear_bits_raw(struct device *port, u32_t mask) +static int gpio_nrfx_port_clear_bits_raw(const struct device *port, + u32_t mask) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; @@ -238,7 +240,7 @@ static int gpio_nrfx_port_clear_bits_raw(struct device *port, u32_t mask) return 0; } -static int gpio_nrfx_port_toggle_bits(struct device *port, u32_t mask) +static int gpio_nrfx_port_toggle_bits(const struct device *port, u32_t mask) { NRF_GPIO_Type *reg = get_port_cfg(port)->port; u32_t value; @@ -249,9 +251,10 @@ static int gpio_nrfx_port_toggle_bits(struct device *port, u32_t mask) return 0; } -static int gpio_nrfx_pin_interrupt_configure(struct device *port, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_nrfx_pin_interrupt_configure(const struct device *port, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { struct gpio_nrfx_data *data = get_port_data(port); u32_t abs_pin = NRF_GPIO_PIN_MAP(get_port_cfg(port)->port_num, pin); @@ -276,7 +279,7 @@ static int gpio_nrfx_pin_interrupt_configure(struct device *port, return gpiote_pin_int_cfg(port, pin); } -static int gpio_nrfx_manage_callback(struct device *port, +static int gpio_nrfx_manage_callback(const struct device *port, struct gpio_callback *callback, bool set) { @@ -284,7 +287,7 @@ static int gpio_nrfx_manage_callback(struct device *port, callback, set); } -static int gpio_nrfx_pin_manage_callback(struct device *port, +static int gpio_nrfx_pin_manage_callback(const struct device *port, u32_t pin, bool enable) { @@ -295,13 +298,13 @@ static int gpio_nrfx_pin_manage_callback(struct device *port, return gpiote_pin_int_cfg(port, pin); } -static inline int gpio_nrfx_pin_enable_callback(struct device *port, +static inline int gpio_nrfx_pin_enable_callback(const struct device *port, gpio_pin_t pin) { return gpio_nrfx_pin_manage_callback(port, pin, true); } -static inline int gpio_nrfx_pin_disable_callback(struct device *port, +static inline int gpio_nrfx_pin_disable_callback(const struct device *port, gpio_pin_t pin) { return gpio_nrfx_pin_manage_callback(port, pin, false); @@ -320,7 +323,7 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = { .disable_callback = gpio_nrfx_pin_disable_callback }; -static inline u32_t get_level_pins(struct device *port) +static inline u32_t get_level_pins(const struct device *port) { struct gpio_nrfx_data *data = get_port_data(port); @@ -339,7 +342,7 @@ static inline u32_t get_level_pins(struct device *port) return out; } -static void cfg_level_pins(struct device *port) +static void cfg_level_pins(const struct device *port) { const struct gpio_nrfx_data *data = get_port_data(port); const struct gpio_nrfx_cfg *cfg = get_port_cfg(port); @@ -368,7 +371,7 @@ static void cfg_level_pins(struct device *port) * * @return Bitmask where 1 marks pin as trigger source. */ -static u32_t check_level_trigger_pins(struct device *port) +static u32_t check_level_trigger_pins(const struct device *port) { struct gpio_nrfx_data *data = get_port_data(port); const struct gpio_nrfx_cfg *cfg = get_port_cfg(port); @@ -403,7 +406,7 @@ static u32_t check_level_trigger_pins(struct device *port) return out; } -static inline void fire_callbacks(struct device *port, u32_t pins) +static inline void fire_callbacks(const struct device *port, u32_t pins) { struct gpio_nrfx_data *data = get_port_data(port); sys_slist_t *list = &data->callbacks; @@ -495,7 +498,7 @@ static void gpiote_event_handler(void) #define GPIOTE_NODE DT_INST(0, nordic_nrf_gpiote) -static int gpio_nrfx_init(struct device *port) +static int gpio_nrfx_init(const struct device *port) { static bool gpio_initialized; diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c index cfbcb8547b53..a8c26c00a1b4 100644 --- a/drivers/gpio/gpio_pca95xx.c +++ b/drivers/gpio/gpio_pca95xx.c @@ -74,7 +74,7 @@ struct gpio_pca95xx_drv_data { struct gpio_driver_data common; /** Master I2C device */ - struct device *i2c_master; + const struct device *i2c_master; struct { u16_t output; @@ -97,13 +97,13 @@ struct gpio_pca95xx_drv_data { * * @return 0 if successful, failed otherwise. */ -static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf) +static int read_port_regs(const struct device *dev, u8_t reg, u16_t *buf) { const struct gpio_pca95xx_config * const config = dev->config_info; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; - struct device * const i2c_master = drv_data->i2c_master; + const struct device * const i2c_master = drv_data->i2c_master; u16_t i2c_addr = config->i2c_slave_addr; u16_t port_data; int ret; @@ -136,14 +136,14 @@ static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf) * * @return 0 if successful, failed otherwise. */ -static int write_port_regs(struct device *dev, u8_t reg, +static int write_port_regs(const struct device *dev, u8_t reg, u16_t *cache, u16_t value) { const struct gpio_pca95xx_config * const config = dev->config_info; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; - struct device * const i2c_master = drv_data->i2c_master; + const struct device * const i2c_master = drv_data->i2c_master; u16_t i2c_addr = config->i2c_slave_addr; u16_t port_data; int ret; @@ -166,7 +166,7 @@ static int write_port_regs(struct device *dev, u8_t reg, return ret; } -static inline int update_output_regs(struct device *dev, u16_t value) +static inline int update_output_regs(const struct device *dev, u16_t value) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -175,7 +175,7 @@ static inline int update_output_regs(struct device *dev, u16_t value) &drv_data->reg_cache.output, value); } -static inline int update_direction_regs(struct device *dev, u16_t value) +static inline int update_direction_regs(const struct device *dev, u16_t value) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -184,7 +184,7 @@ static inline int update_direction_regs(struct device *dev, u16_t value) &drv_data->reg_cache.dir, value); } -static inline int update_pul_sel_regs(struct device *dev, u16_t value) +static inline int update_pul_sel_regs(const struct device *dev, u16_t value) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -193,7 +193,7 @@ static inline int update_pul_sel_regs(struct device *dev, u16_t value) &drv_data->reg_cache.pud_sel, value); } -static inline int update_pul_en_regs(struct device *dev, u16_t value) +static inline int update_pul_en_regs(const struct device *dev, u16_t value) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -211,7 +211,7 @@ static inline int update_pul_en_regs(struct device *dev, u16_t value) * * @return 0 if successful, failed otherwise */ -static int setup_pin_dir(struct device *dev, u32_t pin, int flags) +static int setup_pin_dir(const struct device *dev, u32_t pin, int flags) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -250,7 +250,8 @@ static int setup_pin_dir(struct device *dev, u32_t pin, int flags) * * @return 0 if successful, failed otherwise */ -static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags) +static int setup_pin_pullupdown(const struct device *dev, u32_t pin, + int flags) { const struct gpio_pca95xx_config * const config = dev->config_info; @@ -308,7 +309,7 @@ static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags) * * @return 0 if successful, failed otherwise */ -static int gpio_pca95xx_config(struct device *dev, +static int gpio_pca95xx_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { int ret; @@ -359,7 +360,7 @@ static int gpio_pca95xx_config(struct device *dev, return ret; } -static int gpio_pca95xx_port_get_raw(struct device *dev, u32_t *value) +static int gpio_pca95xx_port_get_raw(const struct device *dev, u32_t *value) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -385,7 +386,7 @@ static int gpio_pca95xx_port_get_raw(struct device *dev, u32_t *value) return ret; } -static int gpio_pca95xx_port_set_masked_raw(struct device *dev, +static int gpio_pca95xx_port_set_masked_raw(const struct device *dev, u32_t mask, u32_t value) { struct gpio_pca95xx_drv_data * const drv_data = @@ -410,17 +411,19 @@ static int gpio_pca95xx_port_set_masked_raw(struct device *dev, return ret; } -static int gpio_pca95xx_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_pca95xx_port_set_bits_raw(const struct device *dev, + u32_t mask) { return gpio_pca95xx_port_set_masked_raw(dev, mask, mask); } -static int gpio_pca95xx_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_pca95xx_port_clear_bits_raw(const struct device *dev, + u32_t mask) { return gpio_pca95xx_port_set_masked_raw(dev, mask, 0); } -static int gpio_pca95xx_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_pca95xx_port_toggle_bits(const struct device *dev, u32_t mask) { struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; @@ -444,7 +447,7 @@ static int gpio_pca95xx_port_toggle_bits(struct device *dev, u32_t mask) return ret; } -static int gpio_pca95xx_pin_interrupt_configure(struct device *dev, +static int gpio_pca95xx_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -468,13 +471,13 @@ static const struct gpio_driver_api gpio_pca95xx_drv_api_funcs = { * @param dev Device struct * @return 0 if successful, failed otherwise. */ -static int gpio_pca95xx_init(struct device *dev) +static int gpio_pca95xx_init(const struct device *dev) { const struct gpio_pca95xx_config * const config = dev->config_info; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; - struct device *i2c_master; + const struct device *i2c_master; /* Find out the device struct of the I2C master */ i2c_master = device_get_binding((char *)config->i2c_master_dev_name); diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c index 363be99e8bc5..22eda95dd86b 100644 --- a/drivers/gpio/gpio_rv32m1.c +++ b/drivers/gpio/gpio_rv32m1.c @@ -26,7 +26,7 @@ struct gpio_rv32m1_config { unsigned int flags; char *clock_controller; clock_control_subsys_t clock_subsys; - int (*irq_config_func)(struct device *dev); + int (*irq_config_func)(const struct device *dev); }; struct gpio_rv32m1_data { @@ -38,9 +38,10 @@ struct gpio_rv32m1_data { u32_t pin_callback_enables; }; -static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev, - u32_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static u32_t get_port_pcr_irqc_value_from_flags(const struct device *dev, + u32_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { port_interrupt_t port_interrupt = 0; @@ -71,7 +72,7 @@ static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev, return PORT_PCR_IRQC(port_interrupt); } -static int gpio_rv32m1_configure(struct device *dev, +static int gpio_rv32m1_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_rv32m1_config *config = dev->config_info; @@ -156,7 +157,7 @@ static int gpio_rv32m1_configure(struct device *dev, return 0; } -static int gpio_rv32m1_port_get_raw(struct device *dev, u32_t *value) +static int gpio_rv32m1_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_rv32m1_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -166,8 +167,9 @@ static int gpio_rv32m1_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_rv32m1_port_set_masked_raw(struct device *dev, u32_t mask, - u32_t value) +static int gpio_rv32m1_port_set_masked_raw(const struct device *dev, + u32_t mask, + u32_t value) { const struct gpio_rv32m1_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -177,7 +179,7 @@ static int gpio_rv32m1_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_rv32m1_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_rv32m1_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_rv32m1_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -187,7 +189,8 @@ static int gpio_rv32m1_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_rv32m1_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_rv32m1_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -197,7 +200,7 @@ static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_rv32m1_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_rv32m1_port_toggle_bits(const struct device *dev, u32_t mask) { const struct gpio_rv32m1_config *config = dev->config_info; GPIO_Type *gpio_base = config->gpio_base; @@ -207,9 +210,10 @@ static int gpio_rv32m1_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_rv32m1_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_rv32m1_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_rv32m1_config *config = dev->config_info; PORT_Type *port_base = config->port_base; @@ -236,8 +240,9 @@ static int gpio_rv32m1_pin_interrupt_configure(struct device *dev, } -static int gpio_rv32m1_manage_callback(struct device *dev, - struct gpio_callback *callback, bool set) +static int gpio_rv32m1_manage_callback(const struct device *dev, + struct gpio_callback *callback, + bool set) { struct gpio_rv32m1_data *data = dev->driver_data; @@ -246,8 +251,8 @@ static int gpio_rv32m1_manage_callback(struct device *dev, return 0; } -static int gpio_rv32m1_enable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_rv32m1_enable_callback(const struct device *dev, + gpio_pin_t pin) { struct gpio_rv32m1_data *data = dev->driver_data; @@ -256,8 +261,8 @@ static int gpio_rv32m1_enable_callback(struct device *dev, return 0; } -static int gpio_rv32m1_disable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_rv32m1_disable_callback(const struct device *dev, + gpio_pin_t pin) { struct gpio_rv32m1_data *data = dev->driver_data; @@ -268,7 +273,7 @@ static int gpio_rv32m1_disable_callback(struct device *dev, static void gpio_rv32m1_port_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_rv32m1_config *config = dev->config_info; struct gpio_rv32m1_data *data = dev->driver_data; u32_t enabled_int, int_status; @@ -283,10 +288,10 @@ static void gpio_rv32m1_port_isr(void *arg) } -static int gpio_rv32m1_init(struct device *dev) +static int gpio_rv32m1_init(const struct device *dev) { const struct gpio_rv32m1_config *config = dev->config_info; - struct device *clk; + const struct device *clk; int ret; if (config->clock_controller) { @@ -326,7 +331,7 @@ static const struct gpio_driver_api gpio_rv32m1_driver_api = { UTIL_AND(DT_INST_NODE_HAS_PROP(n, clocks), DT_INST_CLOCKS_CELL(n, name)) #define GPIO_RV32M1_INIT(n) \ - static int gpio_rv32m1_##n##_init(struct device *dev); \ + static int gpio_rv32m1_##n##_init(const struct device *dev); \ \ static const struct gpio_rv32m1_config gpio_rv32m1_##n##_config = {\ .common = { \ @@ -351,7 +356,7 @@ static const struct gpio_driver_api gpio_rv32m1_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &gpio_rv32m1_driver_api); \ \ - static int gpio_rv32m1_##n##_init(struct device *dev) \ + static int gpio_rv32m1_##n##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ 0, \ diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c index 817f577eacbe..d74803c7043d 100644 --- a/drivers/gpio/gpio_sam.c +++ b/drivers/gpio/gpio_sam.c @@ -15,7 +15,7 @@ #include "gpio_utils.h" -typedef void (*config_func_t)(struct device *dev); +typedef void (*config_func_t)(const struct device *dev); struct gpio_sam_config { /* gpio_driver_config needs to be first */ @@ -38,7 +38,7 @@ struct gpio_sam_runtime { #define GPIO_SAM_ALL_PINS 0xFFFFFFFF -static int gpio_sam_port_configure(struct device *dev, u32_t mask, +static int gpio_sam_port_configure(const struct device *dev, u32_t mask, gpio_flags_t flags) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); @@ -145,13 +145,13 @@ static int gpio_sam_port_configure(struct device *dev, u32_t mask, return 0; } -static int gpio_sam_config(struct device *dev, gpio_pin_t pin, +static int gpio_sam_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { return gpio_sam_port_configure(dev, BIT(pin), flags); } -static int gpio_sam_port_get_raw(struct device *dev, u32_t *value) +static int gpio_sam_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; @@ -161,7 +161,7 @@ static int gpio_sam_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_sam_port_set_masked_raw(struct device *dev, u32_t mask, +static int gpio_sam_port_set_masked_raw(const struct device *dev, u32_t mask, u32_t value) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); @@ -172,7 +172,7 @@ static int gpio_sam_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_sam_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_sam_port_set_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; @@ -183,7 +183,7 @@ static int gpio_sam_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_sam_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_sam_port_clear_bits_raw(const struct device *dev, u32_t mask) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; @@ -194,7 +194,7 @@ static int gpio_sam_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_sam_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_sam_port_toggle_bits(const struct device *dev, u32_t mask) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; @@ -205,7 +205,8 @@ static int gpio_sam_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_sam_port_interrupt_configure(struct device *dev, u32_t mask, +static int gpio_sam_port_interrupt_configure(const struct device *dev, + u32_t mask, enum gpio_int_mode mode, enum gpio_int_trig trig) { @@ -253,16 +254,17 @@ static int gpio_sam_port_interrupt_configure(struct device *dev, u32_t mask, return 0; } -static int gpio_sam_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_sam_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { return gpio_sam_port_interrupt_configure(dev, BIT(pin), mode, trig); } static void gpio_sam_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; struct gpio_sam_runtime *context = dev->driver_data; @@ -273,7 +275,7 @@ static void gpio_sam_isr(void *arg) gpio_fire_callbacks(&context->cb, dev, int_stat); } -static int gpio_sam_manage_callback(struct device *port, +static int gpio_sam_manage_callback(const struct device *port, struct gpio_callback *callback, bool set) { @@ -282,7 +284,7 @@ static int gpio_sam_manage_callback(struct device *port, return gpio_manage_callback(&context->cb, callback, set); } -static int gpio_sam_enable_callback(struct device *port, +static int gpio_sam_enable_callback(const struct device *port, gpio_pin_t pin) { const struct gpio_sam_config * const cfg = DEV_CFG(port); @@ -293,7 +295,7 @@ static int gpio_sam_enable_callback(struct device *port, return 0; } -static int gpio_sam_disable_callback(struct device *port, +static int gpio_sam_disable_callback(const struct device *port, gpio_pin_t pin) { const struct gpio_sam_config * const cfg = DEV_CFG(port); @@ -317,7 +319,7 @@ static const struct gpio_driver_api gpio_sam_api = { .disable_callback = gpio_sam_disable_callback, }; -int gpio_sam_init(struct device *dev) +int gpio_sam_init(const struct device *dev) { const struct gpio_sam_config * const cfg = DEV_CFG(dev); @@ -330,7 +332,7 @@ int gpio_sam_init(struct device *dev) } #define GPIO_SAM_INIT(n) \ - static void port_##n##_sam_config_func(struct device *dev); \ + static void port_##n##_sam_config_func(const struct device *dev); \ \ static const struct gpio_sam_config port_##n##_sam_config = { \ .common = { \ @@ -349,7 +351,7 @@ int gpio_sam_init(struct device *dev) CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &gpio_sam_api); \ \ - static void port_##n##_sam_config_func(struct device *dev) \ + static void port_##n##_sam_config_func(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), \ gpio_sam_isr, \ diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c index 00743cfc91f5..cf9043d8f9ea 100644 --- a/drivers/gpio/gpio_sam0.c +++ b/drivers/gpio/gpio_sam0.c @@ -45,14 +45,14 @@ struct gpio_sam0_data { #ifdef CONFIG_SAM0_EIC static void gpio_sam0_isr(u32_t pins, void *arg) { - struct device *const dev = (struct device *) arg; + const struct device *const dev = (const struct device *) arg; struct gpio_sam0_data *const data = DEV_DATA(dev); gpio_fire_callbacks(&data->callbacks, dev, pins); } #endif -static int gpio_sam0_config(struct device *dev, gpio_pin_t pin, +static int gpio_sam0_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -107,7 +107,7 @@ static int gpio_sam0_config(struct device *dev, gpio_pin_t pin, return 0; } -static int gpio_sam0_port_get_raw(struct device *dev, +static int gpio_sam0_port_get_raw(const struct device *dev, gpio_port_value_t *value) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -117,7 +117,7 @@ static int gpio_sam0_port_get_raw(struct device *dev, return 0; } -static int gpio_sam0_port_set_masked_raw(struct device *dev, +static int gpio_sam0_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -129,7 +129,7 @@ static int gpio_sam0_port_set_masked_raw(struct device *dev, return 0; } -static int gpio_sam0_port_set_bits_raw(struct device *dev, +static int gpio_sam0_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -139,7 +139,7 @@ static int gpio_sam0_port_set_bits_raw(struct device *dev, return 0; } -static int gpio_sam0_port_clear_bits_raw(struct device *dev, +static int gpio_sam0_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -149,7 +149,7 @@ static int gpio_sam0_port_clear_bits_raw(struct device *dev, return 0; } -static int gpio_sam0_port_toggle_bits(struct device *dev, +static int gpio_sam0_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -161,7 +161,7 @@ static int gpio_sam0_port_toggle_bits(struct device *dev, #ifdef CONFIG_SAM0_EIC -static int gpio_sam0_pin_interrupt_configure(struct device *dev, +static int gpio_sam0_pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -231,7 +231,7 @@ static int gpio_sam0_pin_interrupt_configure(struct device *dev, if (rc == 0) { rc = sam0_eic_acquire(config->id, pin, trigger, (DEV_DATA(dev)->debounce & BIT(pin)) != 0, - gpio_sam0_isr, dev); + gpio_sam0_isr, (void *)dev); } if (rc == 0) { rc = sam0_eic_enable_interrupt(config->id, pin); @@ -252,29 +252,29 @@ static int gpio_sam0_pin_interrupt_configure(struct device *dev, } -static int gpio_sam0_manage_callback(struct device *dev, - struct gpio_callback *callback, bool set) +static int gpio_sam0_manage_callback(const struct device *dev, + struct gpio_callback *callback, bool set) { struct gpio_sam0_data *const data = DEV_DATA(dev); return gpio_manage_callback(&data->callbacks, callback, set); } -int gpio_sam0_enable_callback(struct device *dev, gpio_pin_t pin) +int gpio_sam0_enable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_sam0_config *config = DEV_CFG(dev); return sam0_eic_enable_interrupt(config->id, pin); } -int gpio_sam0_disable_callback(struct device *dev, gpio_pin_t pin) +int gpio_sam0_disable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_sam0_config *config = DEV_CFG(dev); return sam0_eic_disable_interrupt(config->id, pin); } -static u32_t gpio_sam0_get_pending_int(struct device *dev) +static u32_t gpio_sam0_get_pending_int(const struct device *dev) { const struct gpio_sam0_config *config = DEV_CFG(dev); @@ -299,7 +299,7 @@ static const struct gpio_driver_api gpio_sam0_api = { #endif }; -static int gpio_sam0_init(struct device *dev) { return 0; } +static int gpio_sam0_init(const struct device *dev) { return 0; } /* Port A */ #if DT_NODE_HAS_STATUS(DT_NODELABEL(porta), okay) diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c index 1c6e0fb8b82e..46ecea889d5c 100644 --- a/drivers/gpio/gpio_shell.c +++ b/drivers/gpio/gpio_shell.c @@ -50,7 +50,7 @@ static int cmd_gpio_conf(const struct shell *shell, size_t argc, char **argv) { u8_t index = 0U; int type = GPIO_OUTPUT; - struct device *dev; + const struct device *dev; if (argc == args_no.conf && isdigit((unsigned char)argv[args_indx.index][0]) && @@ -83,7 +83,7 @@ static int cmd_gpio_conf(const struct shell *shell, size_t argc, char **argv) static int cmd_gpio_get(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; u8_t index = 0U; int rc; @@ -115,7 +115,7 @@ static int cmd_gpio_get(const struct shell *shell, static int cmd_gpio_set(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; u8_t index = 0U; u8_t value = 0U; diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c index f843aad526c5..1b4c63feaecf 100644 --- a/drivers/gpio/gpio_sifive.c +++ b/drivers/gpio/gpio_sifive.c @@ -114,7 +114,7 @@ static inline int gpio_sifive_plic_to_pin(unsigned int base_irq, int plic_irq) static void gpio_sifive_irq_handler(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct gpio_sifive_data *data = DEV_GPIO_DATA(dev); volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev); @@ -153,7 +153,7 @@ static void gpio_sifive_irq_handler(void *arg) * * @return 0 if successful, failed otherwise */ -static int gpio_sifive_config(struct device *dev, +static int gpio_sifive_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { @@ -193,8 +193,8 @@ static int gpio_sifive_config(struct device *dev, return 0; } -static int gpio_sifive_port_get_raw(struct device *dev, - gpio_port_value_t *value) +static int gpio_sifive_port_get_raw(const struct device *dev, + gpio_port_value_t *value) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); @@ -203,9 +203,9 @@ static int gpio_sifive_port_get_raw(struct device *dev, return 0; } -static int gpio_sifive_port_set_masked_raw(struct device *dev, - gpio_port_pins_t mask, - gpio_port_value_t value) +static int gpio_sifive_port_set_masked_raw(const struct device *dev, + gpio_port_pins_t mask, + gpio_port_value_t value) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); @@ -214,8 +214,8 @@ static int gpio_sifive_port_set_masked_raw(struct device *dev, return 0; } -static int gpio_sifive_port_set_bits_raw(struct device *dev, - gpio_port_pins_t mask) +static int gpio_sifive_port_set_bits_raw(const struct device *dev, + gpio_port_pins_t mask) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); @@ -224,8 +224,8 @@ static int gpio_sifive_port_set_bits_raw(struct device *dev, return 0; } -static int gpio_sifive_port_clear_bits_raw(struct device *dev, - gpio_port_pins_t mask) +static int gpio_sifive_port_clear_bits_raw(const struct device *dev, + gpio_port_pins_t mask) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); @@ -234,8 +234,8 @@ static int gpio_sifive_port_clear_bits_raw(struct device *dev, return 0; } -static int gpio_sifive_port_toggle_bits(struct device *dev, - gpio_port_pins_t mask) +static int gpio_sifive_port_toggle_bits(const struct device *dev, + gpio_port_pins_t mask) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); @@ -244,10 +244,10 @@ static int gpio_sifive_port_toggle_bits(struct device *dev, return 0; } -static int gpio_sifive_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, - enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_sifive_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev); @@ -295,17 +295,17 @@ static int gpio_sifive_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_sifive_manage_callback(struct device *dev, - struct gpio_callback *callback, - bool set) +static int gpio_sifive_manage_callback(const struct device *dev, + struct gpio_callback *callback, + bool set) { struct gpio_sifive_data *data = DEV_GPIO_DATA(dev); return gpio_manage_callback(&data->cb, callback, set); } -static int gpio_sifive_enable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_sifive_enable_callback(const struct device *dev, + gpio_pin_t pin) { const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev); @@ -319,8 +319,8 @@ static int gpio_sifive_enable_callback(struct device *dev, return 0; } -static int gpio_sifive_disable_callback(struct device *dev, - gpio_pin_t pin) +static int gpio_sifive_disable_callback(const struct device *dev, + gpio_pin_t pin) { const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev); @@ -356,7 +356,7 @@ static const struct gpio_driver_api gpio_sifive_driver = { * * @return 0 */ -static int gpio_sifive_init(struct device *dev) +static int gpio_sifive_init(const struct device *dev) { volatile struct gpio_sifive_t *gpio = DEV_GPIO(dev); const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev); diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c index 03b6c0fefb0f..a835536ee7f0 100644 --- a/drivers/gpio/gpio_stellaris.c +++ b/drivers/gpio/gpio_stellaris.c @@ -13,7 +13,7 @@ #include #include "gpio_utils.h" -typedef void (*config_func_t)(struct device *dev); +typedef void (*config_func_t)(const struct device *dev); struct gpio_stellaris_config { /* gpio_driver_config needs to be first */ @@ -59,7 +59,7 @@ enum gpio_regs { static void gpio_stellaris_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct gpio_stellaris_config * const cfg = DEV_CFG(dev); struct gpio_stellaris_runtime *context = DEV_DATA(dev); u32_t base = cfg->base; @@ -70,7 +70,7 @@ static void gpio_stellaris_isr(void *arg) sys_write32(int_stat, GPIO_REG_ADDR(base, GPIO_ICR_OFFSET)); } -static int gpio_stellaris_configure(struct device *dev, +static int gpio_stellaris_configure(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); @@ -114,7 +114,7 @@ static int gpio_stellaris_configure(struct device *dev, return 0; } -static int gpio_stellaris_port_get_raw(struct device *dev, u32_t *value) +static int gpio_stellaris_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -124,8 +124,9 @@ static int gpio_stellaris_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_stellaris_port_set_masked_raw(struct device *dev, u32_t mask, - u32_t value) +static int gpio_stellaris_port_set_masked_raw(const struct device *dev, + u32_t mask, + u32_t value) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -135,7 +136,8 @@ static int gpio_stellaris_port_set_masked_raw(struct device *dev, u32_t mask, return 0; } -static int gpio_stellaris_port_set_bits_raw(struct device *dev, u32_t mask) +static int gpio_stellaris_port_set_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -145,7 +147,8 @@ static int gpio_stellaris_port_set_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_stellaris_port_clear_bits_raw(struct device *dev, u32_t mask) +static int gpio_stellaris_port_clear_bits_raw(const struct device *dev, + u32_t mask) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -155,7 +158,8 @@ static int gpio_stellaris_port_clear_bits_raw(struct device *dev, u32_t mask) return 0; } -static int gpio_stellaris_port_toggle_bits(struct device *dev, u32_t mask) +static int gpio_stellaris_port_toggle_bits(const struct device *dev, + u32_t mask) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -168,9 +172,10 @@ static int gpio_stellaris_port_toggle_bits(struct device *dev, u32_t mask) return 0; } -static int gpio_stellaris_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_stellaris_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); u32_t base = cfg->base; @@ -201,7 +206,7 @@ static int gpio_stellaris_pin_interrupt_configure(struct device *dev, return 0; } -static int gpio_stellaris_init(struct device *dev) +static int gpio_stellaris_init(const struct device *dev) { const struct gpio_stellaris_config *cfg = DEV_CFG(dev); @@ -209,7 +214,7 @@ static int gpio_stellaris_init(struct device *dev) return 0; } -static int gpio_stellaris_enable_callback(struct device *dev, +static int gpio_stellaris_enable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_stellaris_config * const cfg = DEV_CFG(dev); @@ -220,7 +225,7 @@ static int gpio_stellaris_enable_callback(struct device *dev, return 0; } -static int gpio_stellaris_disable_callback(struct device *dev, +static int gpio_stellaris_disable_callback(const struct device *dev, gpio_pin_t pin) { const struct gpio_stellaris_config * const cfg = DEV_CFG(dev); @@ -231,7 +236,7 @@ static int gpio_stellaris_disable_callback(struct device *dev, return 0; } -static int gpio_stellaris_manage_callback(struct device *dev, +static int gpio_stellaris_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -256,7 +261,7 @@ static const struct gpio_driver_api gpio_stellaris_driver_api = { }; #define STELLARIS_GPIO_DEVICE(n) \ - static void port_## n ##_stellaris_config_func(struct device *dev); \ + static void port_## n ##_stellaris_config_func(const struct device *dev); \ \ static struct gpio_stellaris_runtime port_## n ##_stellaris_runtime; \ \ @@ -277,7 +282,7 @@ static const struct gpio_driver_api gpio_stellaris_driver_api = { POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ &gpio_stellaris_driver_api); \ \ - static void port_## n ##_stellaris_config_func(struct device *dev) \ + static void port_## n ##_stellaris_config_func(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c index 28fff40c7c8a..a62a693c7f6c 100644 --- a/drivers/gpio/gpio_stm32.c +++ b/drivers/gpio/gpio_stm32.c @@ -30,7 +30,7 @@ */ static void gpio_stm32_isr(int line, void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct gpio_stm32_data *data = dev->driver_data; if ((BIT(line) & data->cb_pins) != 0) { @@ -290,7 +290,7 @@ static int gpio_stm32_enable_int(int port, int pin) defined(CONFIG_SOC_SERIES_STM32L1X) || \ defined(CONFIG_SOC_SERIES_STM32L4X) || \ defined(CONFIG_SOC_SERIES_STM32G4X) - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); struct stm32_pclken pclken = { #ifdef CONFIG_SOC_SERIES_STM32H7X .bus = STM32_CLOCK_BUS_APB4, @@ -309,7 +309,7 @@ static int gpio_stm32_enable_int(int port, int pin) return 0; } -static int gpio_stm32_port_get_raw(struct device *dev, u32_t *value) +static int gpio_stm32_port_get_raw(const struct device *dev, u32_t *value) { const struct gpio_stm32_config *cfg = dev->config_info; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; @@ -319,7 +319,7 @@ static int gpio_stm32_port_get_raw(struct device *dev, u32_t *value) return 0; } -static int gpio_stm32_port_set_masked_raw(struct device *dev, +static int gpio_stm32_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { @@ -333,7 +333,7 @@ static int gpio_stm32_port_set_masked_raw(struct device *dev, return 0; } -static int gpio_stm32_port_set_bits_raw(struct device *dev, +static int gpio_stm32_port_set_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_stm32_config *cfg = dev->config_info; @@ -348,7 +348,7 @@ static int gpio_stm32_port_set_bits_raw(struct device *dev, return 0; } -static int gpio_stm32_port_clear_bits_raw(struct device *dev, +static int gpio_stm32_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_stm32_config *cfg = dev->config_info; @@ -368,7 +368,7 @@ static int gpio_stm32_port_clear_bits_raw(struct device *dev, return 0; } -static int gpio_stm32_port_toggle_bits(struct device *dev, +static int gpio_stm32_port_toggle_bits(const struct device *dev, gpio_port_pins_t pins) { const struct gpio_stm32_config *cfg = dev->config_info; @@ -386,7 +386,7 @@ static int gpio_stm32_port_toggle_bits(struct device *dev, /** * @brief Configure pin or port */ -static int gpio_stm32_config(struct device *dev, +static int gpio_stm32_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_stm32_config *cfg = dev->config_info; @@ -424,9 +424,10 @@ static int gpio_stm32_config(struct device *dev, return err; } -static int gpio_stm32_pin_interrupt_configure(struct device *dev, - gpio_pin_t pin, enum gpio_int_mode mode, - enum gpio_int_trig trig) +static int gpio_stm32_pin_interrupt_configure(const struct device *dev, + gpio_pin_t pin, + enum gpio_int_mode mode, + enum gpio_int_trig trig) { const struct gpio_stm32_config *cfg = dev->config_info; struct gpio_stm32_data *data = dev->driver_data; @@ -455,7 +456,7 @@ static int gpio_stm32_pin_interrupt_configure(struct device *dev, goto release_lock; } - if (stm32_exti_set_callback(pin, gpio_stm32_isr, dev) != 0) { + if (stm32_exti_set_callback(pin, gpio_stm32_isr, (void *)dev) != 0) { err = -EBUSY; goto release_lock; } @@ -488,7 +489,7 @@ static int gpio_stm32_pin_interrupt_configure(struct device *dev, return err; } -static int gpio_stm32_manage_callback(struct device *dev, +static int gpio_stm32_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -497,7 +498,7 @@ static int gpio_stm32_manage_callback(struct device *dev, return gpio_manage_callback(&data->cb, callback, set); } -static int gpio_stm32_enable_callback(struct device *dev, +static int gpio_stm32_enable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_stm32_data *data = dev->driver_data; @@ -507,7 +508,7 @@ static int gpio_stm32_enable_callback(struct device *dev, return 0; } -static int gpio_stm32_disable_callback(struct device *dev, +static int gpio_stm32_disable_callback(const struct device *dev, gpio_pin_t pin) { struct gpio_stm32_data *data = dev->driver_data; @@ -541,12 +542,12 @@ static const struct gpio_driver_api gpio_stm32_driver = { * * @return 0 */ -static int gpio_stm32_init(struct device *device) +static int gpio_stm32_init(const struct device *device) { const struct gpio_stm32_config *cfg = device->config_info; /* enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); if (clock_control_on(clk, @@ -645,7 +646,7 @@ GPIO_DEVICE_INIT_STM32(k, K); #if defined(CONFIG_SOC_SERIES_STM32F1X) -static int gpio_stm32_afio_init(struct device *device) +static int gpio_stm32_afio_init(const struct device *device) { UNUSED(device); diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c index 5424fc522b92..9a8933849947 100644 --- a/drivers/gpio/gpio_sx1509b.c +++ b/drivers/gpio/gpio_sx1509b.c @@ -60,17 +60,17 @@ struct sx1509b_debounce_state { struct sx1509b_drv_data { /* gpio_driver_data needs to be first */ struct gpio_driver_data common; - struct device *i2c_master; + const struct device *i2c_master; struct sx1509b_pin_state pin_state; struct sx1509b_debounce_state debounce_state; struct k_sem lock; #ifdef CONFIG_GPIO_SX1509B_INTERRUPT - struct device *gpio_int; + const struct device *gpio_int; struct gpio_callback gpio_cb; struct k_work work; struct sx1509b_irq_state irq_state; - struct device *dev; + const struct device *dev; /* user ISR cb */ sys_slist_t cb; /* Enabled INT pins generating a cb */ @@ -148,7 +148,8 @@ enum { * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_reg_write_word_be(struct device *dev, u16_t dev_addr, +static inline int i2c_reg_write_word_be(const struct device *dev, + u16_t dev_addr, u8_t reg_addr, u16_t value) { u8_t tx_buf[3] = { reg_addr, value >> 8, value & 0xff }; @@ -167,7 +168,8 @@ static inline int i2c_reg_write_word_be(struct device *dev, u16_t dev_addr, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_reg_write_byte_be(struct device *dev, u16_t dev_addr, +static inline int i2c_reg_write_byte_be(const struct device *dev, + u16_t dev_addr, u8_t reg_addr, u8_t value) { u8_t tx_buf[3] = { reg_addr, value }; @@ -178,7 +180,7 @@ static inline int i2c_reg_write_byte_be(struct device *dev, u16_t dev_addr, #ifdef CONFIG_GPIO_SX1509B_INTERRUPT static int sx1509b_handle_interrupt(void *arg) { - struct device *dev = (struct device *) arg; + const struct device *dev = (const struct device *) arg; const struct sx1509b_config *cfg = dev->config_info; struct sx1509b_drv_data *drv_data = dev->driver_data; int ret = 0; @@ -219,7 +221,8 @@ static void sx1509b_work_handler(struct k_work *work) sx1509b_handle_interrupt(drv_data->dev); } -static void sx1509_int_cb(struct device *dev, struct gpio_callback *gpio_cb, +static void sx1509_int_cb(const struct device *dev, + struct gpio_callback *gpio_cb, u32_t pins) { struct sx1509b_drv_data *drv_data = CONTAINER_OF(gpio_cb, @@ -231,7 +234,7 @@ static void sx1509_int_cb(struct device *dev, struct gpio_callback *gpio_cb, } #endif -static int sx1509b_config(struct device *dev, +static int sx1509b_config(const struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { @@ -370,7 +373,7 @@ static int sx1509b_config(struct device *dev, return rc; } -static int port_get(struct device *dev, +static int port_get(const struct device *dev, gpio_port_value_t *value) { const struct sx1509b_config *cfg = dev->config_info; @@ -402,7 +405,7 @@ static int port_get(struct device *dev, return rc; } -static int port_write(struct device *dev, +static int port_write(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value, gpio_port_value_t toggle) @@ -433,32 +436,32 @@ static int port_write(struct device *dev, return rc; } -static int port_set_masked(struct device *dev, +static int port_set_masked(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { return port_write(dev, mask, value, 0); } -static int port_set_bits(struct device *dev, +static int port_set_bits(const struct device *dev, gpio_port_pins_t pins) { return port_write(dev, pins, pins, 0); } -static int port_clear_bits(struct device *dev, +static int port_clear_bits(const struct device *dev, gpio_port_pins_t pins) { return port_write(dev, pins, 0, 0); } -static int port_toggle_bits(struct device *dev, +static int port_toggle_bits(const struct device *dev, gpio_port_pins_t pins) { return port_write(dev, 0, 0, pins); } -static int pin_interrupt_configure(struct device *dev, +static int pin_interrupt_configure(const struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) @@ -535,7 +538,7 @@ static int pin_interrupt_configure(struct device *dev, * @param dev Device struct * @return 0 if successful, failed otherwise. */ -static int sx1509b_init(struct device *dev) +static int sx1509b_init(const struct device *dev) { const struct sx1509b_config *cfg = dev->config_info; struct sx1509b_drv_data *drv_data = dev->driver_data; @@ -630,7 +633,7 @@ static int sx1509b_init(struct device *dev) } #ifdef CONFIG_GPIO_SX1509B_INTERRUPT -static int gpio_sx1509b_manage_callback(struct device *dev, +static int gpio_sx1509b_manage_callback(const struct device *dev, struct gpio_callback *callback, bool set) { @@ -639,7 +642,7 @@ static int gpio_sx1509b_manage_callback(struct device *dev, return gpio_manage_callback(&data->cb, callback, set); } -static int gpio_sx1509b_enable_callback(struct device *dev, +static int gpio_sx1509b_enable_callback(const struct device *dev, gpio_pin_t pin) { struct sx1509b_drv_data *data = dev->driver_data; @@ -649,7 +652,7 @@ static int gpio_sx1509b_enable_callback(struct device *dev, return 0; } -static int gpio_sx1509b_disable_callback(struct device *dev, +static int gpio_sx1509b_disable_callback(const struct device *dev, gpio_pin_t pin) { struct sx1509b_drv_data *data = dev->driver_data; diff --git a/drivers/gpio/gpio_utils.h b/drivers/gpio/gpio_utils.h index 4486fe010e6c..18d4345b7a99 100644 --- a/drivers/gpio/gpio_utils.h +++ b/drivers/gpio/gpio_utils.h @@ -59,7 +59,7 @@ static inline int gpio_manage_callback(sys_slist_t *callbacks, * @param pins The actual pin mask that triggered the interrupt */ static inline void gpio_fire_callbacks(sys_slist_t *list, - struct device *port, + const struct device *port, u32_t pins) { struct gpio_callback *cb, *tmp; diff --git a/drivers/hwinfo/hwinfo_sam.c b/drivers/hwinfo/hwinfo_sam.c index b6c633c42fc1..930ab61ff52d 100644 --- a/drivers/hwinfo/hwinfo_sam.c +++ b/drivers/hwinfo/hwinfo_sam.c @@ -62,7 +62,7 @@ __ramfunc static void hwinfo_sam_read_device_id(void) } } -static int hwinfo_sam_init(struct device *arg) +static int hwinfo_sam_init(const struct device *arg) { Efc *efc = (Efc *)DT_REG_ADDR(DT_INST(0, atmel_sam_flash_controller)); u32_t fmr; diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index 00e4173d9425..e213b5678fec 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -44,18 +44,19 @@ struct i2c_cc13xx_cc26xx_config { u32_t sda_pin; }; -static inline struct i2c_cc13xx_cc26xx_data *get_dev_data(struct device *dev) +static inline struct i2c_cc13xx_cc26xx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline const struct i2c_cc13xx_cc26xx_config * -get_dev_config(struct device *dev) +get_dev_config(const struct device *dev) { return dev->config_info; } -static int i2c_cc13xx_cc26xx_transmit(struct device *dev, const u8_t *buf, +static int i2c_cc13xx_cc26xx_transmit(const struct device *dev, + const u8_t *buf, u32_t len, u16_t addr) { const u32_t base = get_dev_config(dev)->base; @@ -123,7 +124,8 @@ static int i2c_cc13xx_cc26xx_transmit(struct device *dev, const u8_t *buf, return -EIO; } -static int i2c_cc13xx_cc26xx_receive(struct device *dev, u8_t *buf, u32_t len, +static int i2c_cc13xx_cc26xx_receive(const struct device *dev, u8_t *buf, + u32_t len, u16_t addr) { const u32_t base = get_dev_config(dev)->base; @@ -195,7 +197,8 @@ static int i2c_cc13xx_cc26xx_receive(struct device *dev, u8_t *buf, u32_t len, return -EIO; } -static int i2c_cc13xx_cc26xx_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_cc13xx_cc26xx_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { int ret = 0; @@ -242,7 +245,8 @@ static int i2c_cc13xx_cc26xx_transfer(struct device *dev, struct i2c_msg *msgs, } #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency) -static int i2c_cc13xx_cc26xx_configure(struct device *dev, u32_t dev_config) +static int i2c_cc13xx_cc26xx_configure(const struct device *dev, + u32_t dev_config) { bool fast; @@ -304,7 +308,7 @@ static void i2c_cc13xx_cc26xx_isr(void *arg) static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg, uintptr_t clientArg) { - struct device *dev = (struct device *)clientArg; + const struct device *dev = (const struct device *)clientArg; int ret = Power_NOTIFYDONE; s16_t res_id; @@ -328,8 +332,8 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg, #endif #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int i2c_cc13xx_cc26xx_set_power_state(struct device *dev, - u32_t new_state) +static int i2c_cc13xx_cc26xx_set_power_state(const struct device *dev, + u32_t new_state) { int ret = 0; @@ -366,8 +370,10 @@ static int i2c_cc13xx_cc26xx_set_power_state(struct device *dev, return ret; } -static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) +static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, + u32_t ctrl_command, + void *context, device_pm_cb cb, + void *arg) { int ret = 0; @@ -391,7 +397,7 @@ static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command, } #endif /* CONFIG_DEVICE_POWER_MANAGEMENT */ -static int i2c_cc13xx_cc26xx_init(struct device *dev) +static int i2c_cc13xx_cc26xx_init(const struct device *dev) { u32_t cfg; int err; diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c index bb5104d655e6..0d0c61e566ea 100644 --- a/drivers/i2c/i2c_cc32xx.c +++ b/drivers/i2c/i2c_cc32xx.c @@ -82,7 +82,8 @@ struct i2c_cc32xx_data { static void configure_i2c_irq(const struct i2c_cc32xx_config *config); #define I2C_CLK_FREQ(n) DT_PROP(DT_INST_PHANDLE(n, clocks), clock_frequency) -static int i2c_cc32xx_configure(struct device *dev, u32_t dev_config_raw) +static int i2c_cc32xx_configure(const struct device *dev, + u32_t dev_config_raw) { u32_t base = DEV_BASE(dev); u32_t bitrate_id; @@ -111,7 +112,8 @@ static int i2c_cc32xx_configure(struct device *dev, u32_t dev_config_raw) return 0; } -static void i2c_cc32xx_prime_transfer(struct device *dev, struct i2c_msg *msg, +static void i2c_cc32xx_prime_transfer(const struct device *dev, + struct i2c_msg *msg, u16_t addr) { struct i2c_cc32xx_data *data = DEV_DATA(dev); @@ -156,7 +158,7 @@ static void i2c_cc32xx_prime_transfer(struct device *dev, struct i2c_msg *msg, } } -static int i2c_cc32xx_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_cc32xx_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { struct i2c_cc32xx_data *data = DEV_DATA(dev); @@ -261,7 +263,7 @@ static void i2c_cc32xx_isr_handle_read(u32_t base, static void i2c_cc32xx_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; u32_t base = DEV_BASE(dev); struct i2c_cc32xx_data *data = DEV_DATA(dev); u32_t err_status; @@ -322,7 +324,7 @@ static void i2c_cc32xx_isr(void *arg) } } -static int i2c_cc32xx_init(struct device *dev) +static int i2c_cc32xx_init(const struct device *dev) { u32_t base = DEV_BASE(dev); const struct i2c_cc32xx_config *config = DEV_CFG(dev); diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 292848f1ae10..fa439927cd55 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(i2c_dw); #include "i2c-priv.h" -static inline void i2c_dw_data_ask(struct device *dev) +static inline void i2c_dw_data_ask(const struct device *dev) { struct i2c_dw_dev_config * const dw = dev->driver_data; u32_t data; @@ -91,7 +91,7 @@ static inline void i2c_dw_data_ask(struct device *dev) } } -static void i2c_dw_data_read(struct device *dev) +static void i2c_dw_data_read(const struct device *dev) { struct i2c_dw_dev_config * const dw = dev->driver_data; @@ -117,7 +117,7 @@ static void i2c_dw_data_read(struct device *dev) } -static int i2c_dw_data_send(struct device *dev) +static int i2c_dw_data_send(const struct device *dev) { struct i2c_dw_dev_config * const dw = dev->driver_data; u32_t data = 0U; @@ -161,7 +161,7 @@ static int i2c_dw_data_send(struct device *dev) return 0; } -static inline void i2c_dw_transfer_complete(struct device *dev) +static inline void i2c_dw_transfer_complete(const struct device *dev) { struct i2c_dw_dev_config * const dw = dev->driver_data; u32_t value; @@ -176,7 +176,7 @@ static inline void i2c_dw_transfer_complete(struct device *dev) static void i2c_dw_isr(void *arg) { - struct device *port = (struct device *)arg; + const struct device *port = (const struct device *)arg; struct i2c_dw_dev_config * const dw = port->driver_data; union ic_interrupt_register intr_stat; u32_t value; @@ -255,7 +255,7 @@ static void i2c_dw_isr(void *arg) } -static int i2c_dw_setup(struct device *dev, u16_t slave_address) +static int i2c_dw_setup(const struct device *dev, u16_t slave_address) { struct i2c_dw_dev_config * const dw = dev->driver_data; u32_t value; @@ -377,7 +377,7 @@ static int i2c_dw_setup(struct device *dev, u16_t slave_address) return 0; } -static int i2c_dw_transfer(struct device *dev, +static int i2c_dw_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t slave_address) { @@ -489,7 +489,7 @@ static int i2c_dw_transfer(struct device *dev, return ret; } -static int i2c_dw_runtime_configure(struct device *dev, u32_t config) +static int i2c_dw_runtime_configure(const struct device *dev, u32_t config) { struct i2c_dw_dev_config * const dw = dev->driver_data; u32_t value = 0U; @@ -598,7 +598,7 @@ static const struct i2c_driver_api funcs = { .transfer = i2c_dw_transfer, }; -static int i2c_dw_initialize(struct device *dev) +static int i2c_dw_initialize(const struct device *dev) { const struct i2c_dw_rom_config * const rom = dev->config_info; struct i2c_dw_dev_config * const dw = dev->driver_data; @@ -621,7 +621,6 @@ static int i2c_dw_initialize(struct device *dev) /* verify that we have a valid DesignWare register first */ if (regs->ic_comp_type != I2C_DW_MAGIC_KEY) { - dev->driver_api = NULL; LOG_DBG("I2C: DesignWare magic key not found, check base " "address. Stopping initialization"); return -EIO; diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h index 89628e6b5071..60d867726e01 100644 --- a/drivers/i2c/i2c_dw.h +++ b/drivers/i2c/i2c_dw.h @@ -33,7 +33,7 @@ extern "C" { #define I2C_DW_MAGIC_KEY 0x44570140 -typedef void (*i2c_isr_cb_t)(struct device *port); +typedef void (*i2c_isr_cb_t)(const struct device *port); #define IC_ACTIVITY (1 << 0) diff --git a/drivers/i2c/i2c_dw_port_x.h b/drivers/i2c/i2c_dw_port_x.h index b57c1cd1df09..f8a402c7be49 100644 --- a/drivers/i2c/i2c_dw_port_x.h +++ b/drivers/i2c/i2c_dw_port_x.h @@ -6,7 +6,7 @@ * This file is a template for cmake and is not meant to be used directly! */ -static void i2c_config_@NUM@(struct device *port); +static void i2c_config_@NUM@(const struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_@NUM@ = { .config_func = i2c_config_@NUM@, @@ -35,7 +35,7 @@ DEVICE_AND_API_INIT(i2c_@NUM@, DT_INST_LABEL(@NUM@), #else #define INST_@NUM@_IRQ_FLAGS 0 #endif -static void i2c_config_@NUM@(struct device *port) +static void i2c_config_@NUM@(const struct device *port) { ARG_UNUSED(port); diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c index a077d5d1d5c2..6f4f5bee4fd5 100644 --- a/drivers/i2c/i2c_esp32.c +++ b/drivers/i2c/i2c_esp32.c @@ -104,7 +104,7 @@ static int i2c_esp32_configure_pins(int pin, int matrix_out, int matrix_in) GPIO_OPEN_DRAIN | GPIO_PULL_UP; const char *device_name = gpio_esp32_get_gpio_for_pin(pin); - struct device *gpio; + const struct device *gpio; int ret; if (!device_name) { @@ -170,7 +170,7 @@ static int i2c_esp32_configure_speed(const struct i2c_esp32_config *config, return 0; } -static int i2c_esp32_configure(struct device *dev, u32_t dev_config) +static int i2c_esp32_configure(const struct device *dev, u32_t dev_config) { const struct i2c_esp32_config *config = dev->config_info; struct i2c_esp32_data *data = dev->driver_data; @@ -278,7 +278,7 @@ static int i2c_esp32_spin_yield(int *counter) return 0; } -static int i2c_esp32_transmit(struct device *dev) +static int i2c_esp32_transmit(const struct device *dev) { const struct i2c_esp32_config *config = dev->config_info; struct i2c_esp32_data *data = dev->driver_data; @@ -301,7 +301,7 @@ static int i2c_esp32_transmit(struct device *dev) return 0; } -static int i2c_esp32_wait(struct device *dev, +static int i2c_esp32_wait(const struct device *dev, volatile struct i2c_esp32_cmd *wait_cmd) { const struct i2c_esp32_config *config = dev->config_info; @@ -328,7 +328,7 @@ static int i2c_esp32_wait(struct device *dev, return 0; } -static int i2c_esp32_transmit_wait(struct device *dev, +static int i2c_esp32_transmit_wait(const struct device *dev, volatile struct i2c_esp32_cmd *wait_cmd) { int ret; @@ -342,7 +342,7 @@ static int i2c_esp32_transmit_wait(struct device *dev, } static volatile struct i2c_esp32_cmd * -i2c_esp32_write_addr(struct device *dev, +i2c_esp32_write_addr(const struct device *dev, volatile struct i2c_esp32_cmd *cmd, struct i2c_msg *msg, u16_t addr) @@ -373,7 +373,7 @@ i2c_esp32_write_addr(struct device *dev, return cmd; } -static int i2c_esp32_read_msg(struct device *dev, u16_t addr, +static int i2c_esp32_read_msg(const struct device *dev, u16_t addr, struct i2c_msg msg) { const struct i2c_esp32_config *config = dev->config_info; @@ -455,7 +455,7 @@ static int i2c_esp32_read_msg(struct device *dev, u16_t addr, return 0; } -static int i2c_esp32_write_msg(struct device *dev, u16_t addr, +static int i2c_esp32_write_msg(const struct device *dev, u16_t addr, struct i2c_msg msg) { const struct i2c_esp32_config *config = dev->config_info; @@ -506,7 +506,7 @@ static int i2c_esp32_write_msg(struct device *dev, u16_t addr, return 0; } -static int i2c_esp32_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_esp32_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { struct i2c_esp32_data *data = dev->driver_data; @@ -542,7 +542,7 @@ static void i2c_esp32_isr(void *arg) I2C_TIME_OUT_INT_ST | I2C_TRANS_COMPLETE_INT_ST | I2C_ARBITRATION_LOST_INT_ST; - struct device *device = arg; + const struct device *device = arg; const struct i2c_esp32_config *config = device->config_info; if (sys_read32(I2C_INT_STATUS_REG(config->index)) & fifo_give_mask) { @@ -559,7 +559,7 @@ static void i2c_esp32_isr(void *arg) sys_write32(~0, I2C_INT_CLR_REG(config->index)); } -static int i2c_esp32_init(struct device *dev); +static int i2c_esp32_init(const struct device *dev); static const struct i2c_driver_api i2c_esp32_driver_api = { .configure = i2c_esp32_configure, @@ -662,7 +662,7 @@ DEVICE_AND_API_INIT(i2c_esp32_1, DT_INST_LABEL(1), &i2c_esp32_init, &i2c_esp32_driver_api); #endif /* DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) */ -static int i2c_esp32_init(struct device *dev) +static int i2c_esp32_init(const struct device *dev) { const struct i2c_esp32_config *config = dev->config_info; struct i2c_esp32_data *data = dev->driver_data; diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c index 4ee8ddcc794a..7a966e128f87 100644 --- a/drivers/i2c/i2c_gecko.c +++ b/drivers/i2c/i2c_gecko.c @@ -47,7 +47,7 @@ struct i2c_gecko_data { u32_t dev_config; }; -void i2c_gecko_config_pins(struct device *dev, +void i2c_gecko_config_pins(const struct device *dev, const struct soc_gpio_pin *pin_sda, const struct soc_gpio_pin *pin_scl) { @@ -66,7 +66,7 @@ void i2c_gecko_config_pins(struct device *dev, #endif } -static int i2c_gecko_configure(struct device *dev, u32_t dev_config_raw) +static int i2c_gecko_configure(const struct device *dev, u32_t dev_config_raw) { I2C_TypeDef *base = DEV_BASE(dev); struct i2c_gecko_config *config = DEV_CFG(dev); @@ -99,7 +99,7 @@ static int i2c_gecko_configure(struct device *dev, u32_t dev_config_raw) return 0; } -static int i2c_gecko_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_gecko_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { I2C_TypeDef *base = DEV_BASE(dev); @@ -163,7 +163,7 @@ static int i2c_gecko_transfer(struct device *dev, struct i2c_msg *msgs, return ret; } -static int i2c_gecko_init(struct device *dev) +static int i2c_gecko_init(const struct device *dev) { struct i2c_gecko_config *config = DEV_CFG(dev); u32_t bitrate_cfg; diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c index 111d73c563b5..270ceeaa5beb 100644 --- a/drivers/i2c/i2c_gpio.c +++ b/drivers/i2c/i2c_gpio.c @@ -51,8 +51,8 @@ struct i2c_gpio_config { /* Driver instance data */ struct i2c_gpio_context { struct i2c_bitbang bitbang; /* Bit-bang library data */ - struct device *scl_gpio; /* GPIO used for I2C SCL line */ - struct device *sda_gpio; /* GPIO used for I2C SDA line */ + const struct device *scl_gpio; /* GPIO used for I2C SCL line */ + const struct device *sda_gpio; /* GPIO used for I2C SDA line */ gpio_pin_t scl_pin; /* Pin on gpio used for SCL line */ gpio_pin_t sda_pin; /* Pin on gpio used for SDA line */ }; @@ -86,14 +86,14 @@ static const struct i2c_bitbang_io io_fns = { .get_sda = &i2c_gpio_get_sda, }; -static int i2c_gpio_configure(struct device *dev, u32_t dev_config) +static int i2c_gpio_configure(const struct device *dev, u32_t dev_config) { struct i2c_gpio_context *context = dev->driver_data; return i2c_bitbang_configure(&context->bitbang, dev_config); } -static int i2c_gpio_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_gpio_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t slave_address) { struct i2c_gpio_context *context = dev->driver_data; @@ -102,7 +102,7 @@ static int i2c_gpio_transfer(struct device *dev, struct i2c_msg *msgs, slave_address); } -static int i2c_gpio_recover_bus(struct device *dev) +static int i2c_gpio_recover_bus(const struct device *dev) { struct i2c_gpio_context *context = dev->driver_data; @@ -115,7 +115,7 @@ static struct i2c_driver_api api = { .recover_bus = i2c_gpio_recover_bus, }; -static int i2c_gpio_init(struct device *dev) +static int i2c_gpio_init(const struct device *dev) { struct i2c_gpio_context *context = dev->driver_data; const struct i2c_gpio_config *config = dev->config_info; diff --git a/drivers/i2c/i2c_handlers.c b/drivers/i2c/i2c_handlers.c index 8d2cbbc5127d..fae33b0c219e 100644 --- a/drivers/i2c/i2c_handlers.c +++ b/drivers/i2c/i2c_handlers.c @@ -8,14 +8,15 @@ #include #include -static inline int z_vrfy_i2c_configure(struct device *dev, u32_t dev_config) +static inline int z_vrfy_i2c_configure(const struct device *dev, + u32_t dev_config) { Z_OOPS(Z_SYSCALL_DRIVER_I2C(dev, configure)); - return z_impl_i2c_configure((struct device *)dev, dev_config); + return z_impl_i2c_configure((const struct device *)dev, dev_config); } #include -static u32_t copy_msgs_and_transfer(struct device *dev, +static u32_t copy_msgs_and_transfer(const struct device *dev, const struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) @@ -37,9 +38,9 @@ static u32_t copy_msgs_and_transfer(struct device *dev, return z_impl_i2c_transfer(dev, copy, num_msgs, addr); } -static inline int z_vrfy_i2c_transfer(struct device *dev, - struct i2c_msg *msgs, u8_t num_msgs, - u16_t addr) +static inline int z_vrfy_i2c_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, + u16_t addr) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C)); @@ -54,27 +55,27 @@ static inline int z_vrfy_i2c_transfer(struct device *dev, Z_OOPS(Z_SYSCALL_MEMORY_ARRAY_READ(msgs, num_msgs, sizeof(struct i2c_msg))); - return copy_msgs_and_transfer((struct device *)dev, + return copy_msgs_and_transfer((const struct device *)dev, (struct i2c_msg *)msgs, (u8_t)num_msgs, (u16_t)addr); } #include -static inline int z_vrfy_i2c_slave_driver_register(struct device *dev) +static inline int z_vrfy_i2c_slave_driver_register(const struct device *dev) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C)); return z_impl_i2c_slave_driver_register(dev); } #include -static inline int z_vrfy_i2c_slave_driver_unregister(struct device *dev) +static inline int z_vrfy_i2c_slave_driver_unregister(const struct device *dev) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C)); return z_vrfy_i2c_slave_driver_unregister(dev); } #include -static inline int z_vrfy_i2c_recover_bus(struct device *dev) +static inline int z_vrfy_i2c_recover_bus(const struct device *dev) { Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C)); return z_impl_i2c_recover_bus(dev); diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c index 1e90d15f4cc3..67395dd91828 100644 --- a/drivers/i2c/i2c_imx.c +++ b/drivers/i2c/i2c_imx.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(i2c_imx); struct i2c_imx_config { I2C_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); u32_t bitrate; }; @@ -47,7 +47,8 @@ struct i2c_imx_data { struct k_sem device_sync_sem; }; -static bool i2c_imx_write(struct device *dev, u8_t *txBuffer, u8_t txSize) +static bool i2c_imx_write(const struct device *dev, u8_t *txBuffer, + u8_t txSize) { I2C_Type *base = DEV_BASE(dev); struct i2c_imx_data *data = DEV_DATA(dev); @@ -80,7 +81,8 @@ static bool i2c_imx_write(struct device *dev, u8_t *txBuffer, u8_t txSize) return transfer->ack; } -static void i2c_imx_read(struct device *dev, u8_t *rxBuffer, u8_t rxSize) +static void i2c_imx_read(const struct device *dev, u8_t *rxBuffer, + u8_t rxSize) { I2C_Type *base = DEV_BASE(dev); struct i2c_imx_data *data = DEV_DATA(dev); @@ -119,7 +121,7 @@ static void i2c_imx_read(struct device *dev, u8_t *rxBuffer, u8_t rxSize) } -static int i2c_imx_configure(struct device *dev, u32_t dev_config_raw) +static int i2c_imx_configure(const struct device *dev, u32_t dev_config_raw) { I2C_Type *base = DEV_BASE(dev); struct i2c_imx_data *data = DEV_DATA(dev); @@ -173,7 +175,7 @@ static int i2c_imx_configure(struct device *dev, u32_t dev_config_raw) return 0; } -static int i2c_imx_send_addr(struct device *dev, u16_t addr, u8_t flags) +static int i2c_imx_send_addr(const struct device *dev, u16_t addr, u8_t flags) { u8_t byte0 = addr << 1; @@ -181,8 +183,8 @@ static int i2c_imx_send_addr(struct device *dev, u16_t addr, u8_t flags) return i2c_imx_write(dev, &byte0, 1); } -static int i2c_imx_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int i2c_imx_transfer(const struct device *dev, struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { I2C_Type *base = DEV_BASE(dev); struct i2c_imx_data *data = DEV_DATA(dev); @@ -267,7 +269,7 @@ static int i2c_imx_transfer(struct device *dev, struct i2c_msg *msgs, static void i2c_imx_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; I2C_Type *base = DEV_BASE(dev); struct i2c_imx_data *data = DEV_DATA(dev); struct i2c_master_transfer *transfer = &data->transfer; @@ -332,7 +334,7 @@ static void i2c_imx_isr(void *arg) } } -static int i2c_imx_init(struct device *dev) +static int i2c_imx_init(const struct device *dev) { const struct i2c_imx_config *config = DEV_CFG(dev); struct i2c_imx_data *data = DEV_DATA(dev); @@ -359,7 +361,7 @@ static const struct i2c_driver_api i2c_imx_driver_api = { }; #define I2C_IMX_INIT(n) \ - static void i2c_imx_config_func_##n(struct device *dev); \ + static void i2c_imx_config_func_##n(const struct device *dev); \ \ static const struct i2c_imx_config i2c_imx_config_##n = { \ .base = (I2C_Type *)DT_INST_REG_ADDR(n), \ @@ -376,7 +378,7 @@ static const struct i2c_driver_api i2c_imx_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &i2c_imx_driver_api); \ \ - static void i2c_imx_config_func_##n(struct device *dev) \ + static void i2c_imx_config_func_##n(const struct device *dev) \ { \ ARG_UNUSED(dev); \ \ diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c index 6a854481a72e..9ac7831c4610 100644 --- a/drivers/i2c/i2c_litex.c +++ b/drivers/i2c/i2c_litex.c @@ -81,7 +81,7 @@ static const struct i2c_bitbang_io i2c_litex_bitbang_io = { .get_sda = i2c_litex_bitbang_get_sda, }; -static int i2c_litex_init(struct device *dev) +static int i2c_litex_init(const struct device *dev) { const struct i2c_litex_cfg *config = GET_I2C_CFG(dev); struct i2c_bitbang *bitbang = GET_I2C_BITBANG(dev); @@ -92,15 +92,15 @@ static int i2c_litex_init(struct device *dev) return 0; } -static int i2c_litex_configure(struct device *dev, u32_t dev_config) +static int i2c_litex_configure(const struct device *dev, u32_t dev_config) { struct i2c_bitbang *bitbang = GET_I2C_BITBANG(dev); return i2c_bitbang_configure(bitbang, dev_config); } -static int i2c_litex_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int i2c_litex_transfer(const struct device *dev, struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { struct i2c_bitbang *bitbang = GET_I2C_BITBANG(dev); diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c index 432ac6db03d0..2866fb81ea4c 100644 --- a/drivers/i2c/i2c_ll_stm32.c +++ b/drivers/i2c/i2c_ll_stm32.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(i2c_ll_stm32); #include "i2c-priv.h" -int i2c_stm32_runtime_configure(struct device *dev, u32_t config) +int i2c_stm32_runtime_configure(const struct device *dev, u32_t config) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -60,7 +60,7 @@ int i2c_stm32_runtime_configure(struct device *dev, u32_t config) #define OPERATION(msg) (((struct i2c_msg *) msg)->flags & I2C_MSG_RW_MASK) -static int i2c_stm32_transfer(struct device *dev, struct i2c_msg *msg, +static int i2c_stm32_transfer(const struct device *dev, struct i2c_msg *msg, u8_t num_msgs, u16_t slave) { struct i2c_stm32_data *data = DEV_DATA(dev); @@ -174,9 +174,9 @@ static const struct i2c_driver_api api_funcs = { #endif }; -static int i2c_stm32_init(struct device *dev) +static int i2c_stm32_init(const struct device *dev) { - struct device *clock = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clock = device_get_binding(STM32_CLOCK_CONTROL_NAME); const struct i2c_stm32_config *cfg = DEV_CFG(dev); u32_t bitrate_cfg; int ret; @@ -273,11 +273,11 @@ static int i2c_stm32_init(struct device *dev) #endif /* CONFIG_I2C_STM32_COMBINED_INTERRUPT */ #define STM32_I2C_IRQ_HANDLER_DECL(name) \ -static void i2c_stm32_irq_config_func_##name(struct device *dev) +static void i2c_stm32_irq_config_func_##name(const struct device *dev) #define STM32_I2C_IRQ_HANDLER_FUNCTION(name) \ .irq_config_func = i2c_stm32_irq_config_func_##name, #define STM32_I2C_IRQ_HANDLER(name) \ -static void i2c_stm32_irq_config_func_##name(struct device *dev) \ +static void i2c_stm32_irq_config_func_##name(const struct device *dev) \ { \ STM32_I2C_IRQ_CONNECT_AND_ENABLE(name); \ } diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h index 7aabf6975b4b..42977acb8dad 100644 --- a/drivers/i2c/i2c_ll_stm32.h +++ b/drivers/i2c/i2c_ll_stm32.h @@ -9,7 +9,7 @@ #ifndef ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_ #define ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_ -typedef void (*irq_config_func_t)(struct device *port); +typedef void (*irq_config_func_t)(const struct device *port); struct i2c_stm32_config { #ifdef CONFIG_I2C_STM32_INTERRUPT @@ -49,12 +49,14 @@ struct i2c_stm32_data { #endif }; -s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, u8_t *flg, +s32_t stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg, + u8_t *flg, u16_t sadr); -s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, u8_t *flg, +s32_t stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg, + u8_t *flg, u16_t sadr); -s32_t stm32_i2c_configure_timing(struct device *dev, u32_t clk); -int i2c_stm32_runtime_configure(struct device *dev, u32_t config); +s32_t stm32_i2c_configure_timing(const struct device *dev, u32_t clk); +int i2c_stm32_runtime_configure(const struct device *dev, u32_t config); void stm32_i2c_event_isr(void *arg); void stm32_i2c_error_isr(void *arg); @@ -63,9 +65,9 @@ void stm32_i2c_combined_isr(void *arg); #endif #ifdef CONFIG_I2C_SLAVE -int i2c_stm32_slave_register(struct device *dev, +int i2c_stm32_slave_register(const struct device *dev, struct i2c_slave_config *config); -int i2c_stm32_slave_unregister(struct device *dev, +int i2c_stm32_slave_unregister(const struct device *dev, struct i2c_slave_config *config); #endif diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c index 2fd07c267977..008d3e86c356 100644 --- a/drivers/i2c/i2c_ll_stm32_v1.c +++ b/drivers/i2c/i2c_ll_stm32_v1.c @@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(i2c_ll_stm32_v1); #ifdef CONFIG_I2C_STM32_INTERRUPT -static void stm32_i2c_disable_transfer_interrupts(struct device *dev) +static void stm32_i2c_disable_transfer_interrupts(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -42,7 +42,7 @@ static void stm32_i2c_disable_transfer_interrupts(struct device *dev) LL_I2C_DisableIT_ERR(i2c); } -static void stm32_i2c_enable_transfer_interrupts(struct device *dev) +static void stm32_i2c_enable_transfer_interrupts(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -54,7 +54,7 @@ static void stm32_i2c_enable_transfer_interrupts(struct device *dev) #endif -static void stm32_i2c_master_finish(struct device *dev) +static void stm32_i2c_master_finish(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -77,7 +77,7 @@ static void stm32_i2c_master_finish(struct device *dev) #endif } -static inline void msg_init(struct device *dev, struct i2c_msg *msg, +static inline void msg_init(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t slave, u32_t transfer) { @@ -114,7 +114,8 @@ static inline void msg_init(struct device *dev, struct i2c_msg *msg, } } -static s32_t msg_end(struct device *dev, u8_t *next_msg_flags, const char *funcname) +static s32_t msg_end(const struct device *dev, u8_t *next_msg_flags, + const char *funcname) { struct i2c_stm32_data *data = DEV_DATA(dev); @@ -153,14 +154,14 @@ static s32_t msg_end(struct device *dev, u8_t *next_msg_flags, const char *funcn #ifdef CONFIG_I2C_STM32_INTERRUPT -static void stm32_i2c_master_mode_end(struct device *dev) +static void stm32_i2c_master_mode_end(const struct device *dev) { struct i2c_stm32_data *data = DEV_DATA(dev); k_sem_give(&data->device_sync_sem); } -static inline void handle_sb(struct device *dev) +static inline void handle_sb(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -194,7 +195,7 @@ static inline void handle_sb(struct device *dev) } } -static inline void handle_addr(struct device *dev) +static inline void handle_addr(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -238,7 +239,7 @@ static inline void handle_addr(struct device *dev) LL_I2C_ClearFlag_ADDR(i2c); } -static inline void handle_txe(struct device *dev) +static inline void handle_txe(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -268,7 +269,7 @@ static inline void handle_txe(struct device *dev) } } -static inline void handle_rxne(struct device *dev) +static inline void handle_rxne(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -315,7 +316,7 @@ static inline void handle_rxne(struct device *dev) } } -static inline void handle_btf(struct device *dev) +static inline void handle_btf(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -358,7 +359,7 @@ static inline void handle_btf(struct device *dev) #if defined(CONFIG_I2C_SLAVE) -static void stm32_i2c_slave_event(struct device *dev) +static void stm32_i2c_slave_event(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -409,7 +410,7 @@ static void stm32_i2c_slave_event(struct device *dev) } /* Attach and start I2C as slave */ -int i2c_stm32_slave_register(struct device *dev, +int i2c_stm32_slave_register(const struct device *dev, struct i2c_slave_config *config) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -455,7 +456,7 @@ int i2c_stm32_slave_register(struct device *dev, return 0; } -int i2c_stm32_slave_unregister(struct device *dev, +int i2c_stm32_slave_unregister(const struct device *dev, struct i2c_slave_config *config) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -489,7 +490,7 @@ int i2c_stm32_slave_unregister(struct device *dev, void stm32_i2c_event_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -518,7 +519,7 @@ void stm32_i2c_event_isr(void *arg) void stm32_i2c_error_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -552,7 +553,7 @@ void stm32_i2c_error_isr(void *arg) stm32_i2c_master_mode_end(dev); } -s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, +s32_t stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t saddr) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -569,7 +570,7 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, return msg_end(dev, next_msg_flags, __func__); } -s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, +s32_t stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t saddr) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -588,7 +589,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, #else -static inline int check_errors(struct device *dev, const char *funcname) +static inline int check_errors(const struct device *dev, const char *funcname) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -638,7 +639,7 @@ static int stm32_i2c_wait_timeout(u16_t *timeout) } } -s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, +s32_t stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t saddr) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -730,7 +731,7 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, return msg_end(dev, next_msg_flags, __func__); } -s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, +s32_t stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t saddr) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -887,7 +888,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, } #endif -s32_t stm32_i2c_configure_timing(struct device *dev, u32_t clock) +s32_t stm32_i2c_configure_timing(const struct device *dev, u32_t clock) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c index f3496f4313be..ebcce9b00c3f 100644 --- a/drivers/i2c/i2c_ll_stm32_v2.c +++ b/drivers/i2c/i2c_ll_stm32_v2.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(i2c_ll_stm32_v2); #include "i2c-priv.h" -static inline void msg_init(struct device *dev, struct i2c_msg *msg, +static inline void msg_init(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, u16_t slave, uint32_t transfer) { @@ -65,7 +65,7 @@ static inline void msg_init(struct device *dev, struct i2c_msg *msg, #ifdef CONFIG_I2C_STM32_INTERRUPT -static void stm32_i2c_disable_transfer_interrupts(struct device *dev) +static void stm32_i2c_disable_transfer_interrupts(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -78,7 +78,7 @@ static void stm32_i2c_disable_transfer_interrupts(struct device *dev) LL_I2C_DisableIT_ERR(i2c); } -static void stm32_i2c_enable_transfer_interrupts(struct device *dev) +static void stm32_i2c_enable_transfer_interrupts(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -89,7 +89,7 @@ static void stm32_i2c_enable_transfer_interrupts(struct device *dev) LL_I2C_EnableIT_ERR(i2c); } -static void stm32_i2c_master_mode_end(struct device *dev) +static void stm32_i2c_master_mode_end(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -109,7 +109,7 @@ static void stm32_i2c_master_mode_end(struct device *dev) } #if defined(CONFIG_I2C_SLAVE) -static void stm32_i2c_slave_event(struct device *dev) +static void stm32_i2c_slave_event(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -174,7 +174,7 @@ static void stm32_i2c_slave_event(struct device *dev) } /* Attach and start I2C as slave */ -int i2c_stm32_slave_register(struct device *dev, +int i2c_stm32_slave_register(const struct device *dev, struct i2c_slave_config *config) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -220,7 +220,7 @@ int i2c_stm32_slave_register(struct device *dev, return 0; } -int i2c_stm32_slave_unregister(struct device *dev, +int i2c_stm32_slave_unregister(const struct device *dev, struct i2c_slave_config *config) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -255,7 +255,7 @@ int i2c_stm32_slave_unregister(struct device *dev, #endif /* defined(CONFIG_I2C_SLAVE) */ -static void stm32_i2c_event(struct device *dev) +static void stm32_i2c_event(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -318,7 +318,7 @@ static void stm32_i2c_event(struct device *dev) stm32_i2c_master_mode_end(dev); } -static int stm32_i2c_error(struct device *dev) +static int stm32_i2c_error(const struct device *dev) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); @@ -352,7 +352,7 @@ static int stm32_i2c_error(struct device *dev) #ifdef CONFIG_I2C_STM32_COMBINED_INTERRUPT void stm32_i2c_combined_isr(void *arg) { - struct device *dev = (struct device *) arg; + const struct device *dev = (const struct device *) arg; if (stm32_i2c_error(dev)) { return; @@ -363,20 +363,20 @@ void stm32_i2c_combined_isr(void *arg) void stm32_i2c_event_isr(void *arg) { - struct device *dev = (struct device *) arg; + const struct device *dev = (const struct device *) arg; stm32_i2c_event(dev); } void stm32_i2c_error_isr(void *arg) { - struct device *dev = (struct device *) arg; + const struct device *dev = (const struct device *) arg; stm32_i2c_error(dev); } #endif -int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, +int stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, uint16_t slave) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -424,7 +424,7 @@ int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, return -EIO; } -int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, +int stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, uint16_t slave) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -474,7 +474,7 @@ int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, } #else /* !CONFIG_I2C_STM32_INTERRUPT */ -static inline int check_errors(struct device *dev, const char *funcname) +static inline int check_errors(const struct device *dev, const char *funcname) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -511,7 +511,8 @@ static inline int check_errors(struct device *dev, const char *funcname) return -EIO; } -static inline int msg_done(struct device *dev, unsigned int current_msg_flags) +static inline int msg_done(const struct device *dev, + unsigned int current_msg_flags) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); I2C_TypeDef *i2c = cfg->i2c; @@ -535,7 +536,7 @@ static inline int msg_done(struct device *dev, unsigned int current_msg_flags) return 0; } -int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, +int stm32_i2c_msg_write(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, uint16_t slave) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -565,7 +566,7 @@ int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, return msg_done(dev, msg->flags); } -int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, +int stm32_i2c_msg_read(const struct device *dev, struct i2c_msg *msg, u8_t *next_msg_flags, uint16_t slave) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); @@ -592,7 +593,7 @@ int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, } #endif -int stm32_i2c_configure_timing(struct device *dev, u32_t clock) +int stm32_i2c_configure_timing(const struct device *dev, u32_t clock) { const struct i2c_stm32_config *cfg = DEV_CFG(dev); struct i2c_stm32_data *data = DEV_DATA(dev); diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c index e8666962837d..19e91f864237 100644 --- a/drivers/i2c/i2c_mchp_xec.c +++ b/drivers/i2c/i2c_mchp_xec.c @@ -146,7 +146,7 @@ static bool check_lines(u32_t ba) (!(MCHP_I2C_SMB_BB_CTRL(ba) & MCHP_I2C_SMB_BB_DATI_RO))); } -static int i2c_xec_configure(struct device *dev, u32_t dev_config_raw) +static int i2c_xec_configure(const struct device *dev, u32_t dev_config_raw) { const struct i2c_xec_config *config = (const struct i2c_xec_config *const) (dev->config_info); @@ -225,7 +225,7 @@ static int i2c_xec_configure(struct device *dev, u32_t dev_config_raw) return 0; } -static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg, +static int i2c_xec_poll_write(const struct device *dev, struct i2c_msg msg, u16_t addr) { const struct i2c_xec_config *config = @@ -288,7 +288,7 @@ static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg, return 0; } -static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg, +static int i2c_xec_poll_read(const struct device *dev, struct i2c_msg msg, u16_t addr) { const struct i2c_xec_config *config = @@ -365,7 +365,7 @@ static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg, return 0; } -static int i2c_xec_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_xec_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { int ret = 0; @@ -386,18 +386,18 @@ static int i2c_xec_transfer(struct device *dev, struct i2c_msg *msgs, } #if defined(CONFIG_I2C_SLAVE) -static int i2c_xec_slave_register(struct device *dev) +static int i2c_xec_slave_register(const struct device *dev) { return -ENOTSUP; } -static int i2c_xec_slave_unregister(struct device *dev) +static int i2c_xec_slave_unregister(const struct device *dev) { return -ENOTSUP; } #endif -static int i2c_xec_init(struct device *dev); +static int i2c_xec_init(const struct device *dev); static const struct i2c_driver_api i2c_xec_driver_api = { .configure = i2c_xec_configure, @@ -408,7 +408,7 @@ static const struct i2c_driver_api i2c_xec_driver_api = { #endif }; -static int i2c_xec_init(struct device *dev) +static int i2c_xec_init(const struct device *dev) { struct i2c_xec_data *data = (struct i2c_xec_data *const) (dev->driver_data); diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c index 8231a5122149..6674b43cbdab 100644 --- a/drivers/i2c/i2c_mcux.c +++ b/drivers/i2c/i2c_mcux.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(i2c_mcux); struct i2c_mcux_config { I2C_Type *base; clock_name_t clock_source; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); u32_t bitrate; }; @@ -38,7 +38,7 @@ struct i2c_mcux_data { status_t callback_status; }; -static int i2c_mcux_configure(struct device *dev, u32_t dev_config_raw) +static int i2c_mcux_configure(const struct device *dev, u32_t dev_config_raw) { I2C_Type *base = DEV_BASE(dev); const struct i2c_mcux_config *config = DEV_CFG(dev); @@ -76,7 +76,7 @@ static int i2c_mcux_configure(struct device *dev, u32_t dev_config_raw) static void i2c_mcux_master_transfer_callback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct i2c_mcux_data *data = DEV_DATA(dev); ARG_UNUSED(handle); @@ -101,8 +101,8 @@ static u32_t i2c_mcux_convert_flags(int msg_flags) return flags; } -static int i2c_mcux_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int i2c_mcux_transfer(const struct device *dev, struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { I2C_Type *base = DEV_BASE(dev); struct i2c_mcux_data *data = DEV_DATA(dev); @@ -162,14 +162,14 @@ static int i2c_mcux_transfer(struct device *dev, struct i2c_msg *msgs, static void i2c_mcux_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; I2C_Type *base = DEV_BASE(dev); struct i2c_mcux_data *data = DEV_DATA(dev); I2C_MasterTransferHandleIRQ(base, &data->handle); } -static int i2c_mcux_init(struct device *dev) +static int i2c_mcux_init(const struct device *dev) { I2C_Type *base = DEV_BASE(dev); const struct i2c_mcux_config *config = DEV_CFG(dev); @@ -184,7 +184,8 @@ static int i2c_mcux_init(struct device *dev) I2C_MasterGetDefaultConfig(&master_config); I2C_MasterInit(base, &master_config, clock_freq); I2C_MasterTransferCreateHandle(base, &data->handle, - i2c_mcux_master_transfer_callback, dev); + i2c_mcux_master_transfer_callback, + (void *)dev); bitrate_cfg = i2c_map_dt_bitrate(config->bitrate); @@ -204,7 +205,7 @@ static const struct i2c_driver_api i2c_mcux_driver_api = { }; #define I2C_DEVICE_INIT_MCUX(n) \ - static void i2c_mcux_config_func_ ## n(struct device *dev); \ + static void i2c_mcux_config_func_ ## n(const struct device *dev); \ \ static const struct i2c_mcux_config i2c_mcux_config_ ## n = { \ .base = (I2C_Type *)DT_INST_REG_ADDR(n),\ @@ -222,7 +223,7 @@ static const struct i2c_driver_api i2c_mcux_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &i2c_mcux_driver_api); \ \ - static void i2c_mcux_config_func_ ## n(struct device *dev) \ + static void i2c_mcux_config_func_ ## n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c index c14d3a2f293b..bb86a166dc11 100644 --- a/drivers/i2c/i2c_mcux_flexcomm.c +++ b/drivers/i2c/i2c_mcux_flexcomm.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(mcux_flexcomm); struct mcux_flexcomm_config { I2C_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); u32_t bitrate; }; @@ -29,7 +29,8 @@ struct mcux_flexcomm_data { status_t callback_status; }; -static int mcux_flexcomm_configure(struct device *dev, u32_t dev_config_raw) +static int mcux_flexcomm_configure(const struct device *dev, + u32_t dev_config_raw) { const struct mcux_flexcomm_config *config = dev->config_info; I2C_Type *base = config->base; @@ -68,7 +69,7 @@ static int mcux_flexcomm_configure(struct device *dev, u32_t dev_config_raw) static void mcux_flexcomm_master_transfer_callback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct mcux_flexcomm_data *data = dev->driver_data; ARG_UNUSED(handle); @@ -93,8 +94,9 @@ static u32_t mcux_flexcomm_convert_flags(int msg_flags) return flags; } -static int mcux_flexcomm_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int mcux_flexcomm_transfer(const struct device *dev, + struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { const struct mcux_flexcomm_config *config = dev->config_info; struct mcux_flexcomm_data *data = dev->driver_data; @@ -156,7 +158,7 @@ static int mcux_flexcomm_transfer(struct device *dev, struct i2c_msg *msgs, static void mcux_flexcomm_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_flexcomm_config *config = dev->config_info; struct mcux_flexcomm_data *data = dev->driver_data; I2C_Type *base = config->base; @@ -164,7 +166,7 @@ static void mcux_flexcomm_isr(void *arg) I2C_MasterTransferHandleIRQ(base, &data->handle); } -static int mcux_flexcomm_init(struct device *dev) +static int mcux_flexcomm_init(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; struct mcux_flexcomm_data *data = dev->driver_data; @@ -180,7 +182,8 @@ static int mcux_flexcomm_init(struct device *dev) I2C_MasterGetDefaultConfig(&master_config); I2C_MasterInit(base, &master_config, clock_freq); I2C_MasterTransferCreateHandle(base, &data->handle, - mcux_flexcomm_master_transfer_callback, dev); + mcux_flexcomm_master_transfer_callback, + (void *)dev); bitrate_cfg = i2c_map_dt_bitrate(config->bitrate); @@ -200,7 +203,7 @@ static const struct i2c_driver_api mcux_flexcomm_driver_api = { }; #define I2C_MCUX_FLEXCOMM_DEVICE(id) \ - static void mcux_flexcomm_config_func_##id(struct device *dev); \ + static void mcux_flexcomm_config_func_##id(const struct device *dev); \ static const struct mcux_flexcomm_config mcux_flexcomm_config_##id = { \ .base = (I2C_Type *) DT_INST_REG_ADDR(id), \ .irq_config_func = mcux_flexcomm_config_func_##id, \ @@ -215,7 +218,7 @@ static const struct i2c_driver_api mcux_flexcomm_driver_api = { POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_flexcomm_driver_api); \ - static void mcux_flexcomm_config_func_##id(struct device *dev) \ + static void mcux_flexcomm_config_func_##id(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(id), \ DT_INST_IRQ(id, priority), \ diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c index 5019bf4d7795..b09b6d25d70c 100644 --- a/drivers/i2c/i2c_mcux_lpi2c.c +++ b/drivers/i2c/i2c_mcux_lpi2c.c @@ -21,7 +21,7 @@ struct mcux_lpi2c_config { LPI2C_Type *base; char *clock_name; clock_control_subsys_t clock_subsys; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); u32_t bitrate; u32_t bus_idle_timeout_ns; }; @@ -32,11 +32,12 @@ struct mcux_lpi2c_data { status_t callback_status; }; -static int mcux_lpi2c_configure(struct device *dev, u32_t dev_config_raw) +static int mcux_lpi2c_configure(const struct device *dev, + u32_t dev_config_raw) { const struct mcux_lpi2c_config *config = dev->config_info; LPI2C_Type *base = config->base; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; u32_t baudrate; @@ -80,7 +81,7 @@ static int mcux_lpi2c_configure(struct device *dev, u32_t dev_config_raw) static void mcux_lpi2c_master_transfer_callback(LPI2C_Type *base, lpi2c_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct mcux_lpi2c_data *data = dev->driver_data; ARG_UNUSED(handle); @@ -105,8 +106,8 @@ static u32_t mcux_lpi2c_convert_flags(int msg_flags) return flags; } -static int mcux_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int mcux_lpi2c_transfer(const struct device *dev, struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { const struct mcux_lpi2c_config *config = dev->config_info; struct mcux_lpi2c_data *data = dev->driver_data; @@ -168,7 +169,7 @@ static int mcux_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, static void mcux_lpi2c_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_lpi2c_config *config = dev->config_info; struct mcux_lpi2c_data *data = dev->driver_data; LPI2C_Type *base = config->base; @@ -176,12 +177,12 @@ static void mcux_lpi2c_isr(void *arg) LPI2C_MasterTransferHandleIRQ(base, &data->handle); } -static int mcux_lpi2c_init(struct device *dev) +static int mcux_lpi2c_init(const struct device *dev) { const struct mcux_lpi2c_config *config = dev->config_info; struct mcux_lpi2c_data *data = dev->driver_data; LPI2C_Type *base = config->base; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq, bitrate_cfg; lpi2c_master_config_t master_config; int error; @@ -222,7 +223,7 @@ static const struct i2c_driver_api mcux_lpi2c_driver_api = { }; #define I2C_MCUX_LPI2C_INIT(n) \ - static void mcux_lpi2c_config_func_##n(struct device *dev); \ + static void mcux_lpi2c_config_func_##n(const struct device *dev); \ \ static const struct mcux_lpi2c_config mcux_lpi2c_config_##n = { \ .base = (LPI2C_Type *)DT_INST_REG_ADDR(n), \ @@ -244,7 +245,7 @@ static const struct i2c_driver_api mcux_lpi2c_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &mcux_lpi2c_driver_api); \ \ - static void mcux_lpi2c_config_func_##n(struct device *dev) \ + static void mcux_lpi2c_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c index 39c47b5faa83..76f5575eb530 100644 --- a/drivers/i2c/i2c_nios2.c +++ b/drivers/i2c/i2c_nios2.c @@ -28,7 +28,7 @@ struct i2c_nios2_config { struct k_sem sem_lock; }; -static int i2c_nios2_configure(struct device *dev, u32_t dev_config) +static int i2c_nios2_configure(const struct device *dev, u32_t dev_config) { struct i2c_nios2_config *config = DEV_CFG(dev); s32_t rc = 0; @@ -59,7 +59,7 @@ static int i2c_nios2_configure(struct device *dev, u32_t dev_config) return rc; } -static int i2c_nios2_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_nios2_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { struct i2c_nios2_config *config = DEV_CFG(dev); @@ -143,14 +143,14 @@ static int i2c_nios2_transfer(struct device *dev, struct i2c_msg *msgs, static void i2c_nios2_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct i2c_nios2_config *config = DEV_CFG(dev); /* Call Altera HAL driver ISR */ alt_handle_irq(&config->i2c_dev, I2C_0_IRQ); } -static int i2c_nios2_init(struct device *dev); +static int i2c_nios2_init(const struct device *dev); static struct i2c_driver_api i2c_nios2_driver_api = { .configure = i2c_nios2_configure, @@ -171,7 +171,7 @@ DEVICE_AND_API_INIT(i2c_nios2_0, DT_INST_LABEL(0), &i2c_nios2_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_nios2_driver_api); -static int i2c_nios2_init(struct device *dev) +static int i2c_nios2_init(const struct device *dev) { struct i2c_nios2_config *config = DEV_CFG(dev); int rc; diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 2f5e6f922d76..82ae291d91b9 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -27,18 +27,19 @@ struct i2c_nrfx_twi_config { nrfx_twi_config_t config; }; -static inline struct i2c_nrfx_twi_data *get_dev_data(struct device *dev) +static inline struct i2c_nrfx_twi_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline -const struct i2c_nrfx_twi_config *get_dev_config(struct device *dev) +const struct i2c_nrfx_twi_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_nrfx_twi_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { int ret = 0; @@ -120,7 +121,7 @@ static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs, static void event_handler(nrfx_twi_evt_t const *p_event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; struct i2c_nrfx_twi_data *dev_data = get_dev_data(dev); switch (p_event->type) { @@ -141,7 +142,7 @@ static void event_handler(nrfx_twi_evt_t const *p_event, void *p_context) k_sem_give(&dev_data->completion_sync); } -static int i2c_nrfx_twi_configure(struct device *dev, u32_t dev_config) +static int i2c_nrfx_twi_configure(const struct device *dev, u32_t dev_config) { nrfx_twi_t const *inst = &(get_dev_config(dev)->twi); @@ -170,11 +171,11 @@ static const struct i2c_driver_api i2c_nrfx_twi_driver_api = { .transfer = i2c_nrfx_twi_transfer, }; -static int init_twi(struct device *dev) +static int init_twi(const struct device *dev) { nrfx_err_t result = nrfx_twi_init(&get_dev_config(dev)->twi, &get_dev_config(dev)->config, - event_handler, dev); + event_handler, (void *)dev); if (result != NRFX_SUCCESS) { LOG_ERR("Failed to initialize device: %s", dev->name); @@ -188,7 +189,7 @@ static int init_twi(struct device *dev) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int twi_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int twi_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -250,7 +251,7 @@ static int twi_nrfx_pm_control(struct device *dev, u32_t ctrl_command, BUILD_ASSERT(I2C_FREQUENCY(idx) != \ I2C_NRFX_TWI_INVALID_FREQUENCY, \ "Wrong I2C " #idx " frequency setting in dts"); \ - static int twi_##idx##_init(struct device *dev) \ + static int twi_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), \ nrfx_isr, nrfx_twi_##idx##_irq_handler, 0); \ diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 2bd94d73990d..52c4c824e0ea 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -27,18 +27,19 @@ struct i2c_nrfx_twim_config { nrfx_twim_config_t config; }; -static inline struct i2c_nrfx_twim_data *get_dev_data(struct device *dev) +static inline struct i2c_nrfx_twim_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline -const struct i2c_nrfx_twim_config *get_dev_config(struct device *dev) +const struct i2c_nrfx_twim_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_nrfx_twim_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { int ret = 0; @@ -91,7 +92,7 @@ static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs, static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; struct i2c_nrfx_twim_data *dev_data = get_dev_data(dev); switch (p_event->type) { @@ -112,7 +113,7 @@ static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context) k_sem_give(&dev_data->completion_sync); } -static int i2c_nrfx_twim_configure(struct device *dev, u32_t dev_config) +static int i2c_nrfx_twim_configure(const struct device *dev, u32_t dev_config) { nrfx_twim_t const *inst = &(get_dev_config(dev)->twim); @@ -141,12 +142,12 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = { .transfer = i2c_nrfx_twim_transfer, }; -static int init_twim(struct device *dev) +static int init_twim(const struct device *dev) { nrfx_err_t result = nrfx_twim_init(&get_dev_config(dev)->twim, &get_dev_config(dev)->config, event_handler, - dev); + (void *)dev); if (result != NRFX_SUCCESS) { LOG_ERR("Failed to initialize device: %s", dev->name); @@ -161,7 +162,7 @@ static int init_twim(struct device *dev) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int twim_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int twim_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -225,7 +226,7 @@ static int twim_nrfx_pm_control(struct device *dev, u32_t ctrl_command, BUILD_ASSERT(I2C_FREQUENCY(idx) != \ I2C_NRFX_TWIM_INVALID_FREQUENCY, \ "Wrong I2C " #idx " frequency setting in dts"); \ - static int twim_##idx##_init(struct device *dev) \ + static int twim_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), \ nrfx_isr, nrfx_twim_##idx##_irq_handler, 0); \ diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c index 2a483eeac2d5..4acf2f704aa5 100644 --- a/drivers/i2c/i2c_rv32m1_lpi2c.c +++ b/drivers/i2c/i2c_rv32m1_lpi2c.c @@ -25,7 +25,7 @@ struct rv32m1_lpi2c_config { clock_ip_name_t clock_ip_name; u32_t clock_ip_src; u32_t bitrate; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct rv32m1_lpi2c_data { @@ -35,10 +35,10 @@ struct rv32m1_lpi2c_data { status_t completion_status; }; -static int rv32m1_lpi2c_configure(struct device *dev, u32_t dev_config) +static int rv32m1_lpi2c_configure(const struct device *dev, u32_t dev_config) { const struct rv32m1_lpi2c_config *config = dev->config_info; - struct device *clk; + const struct device *clk; u32_t baudrate; u32_t clk_freq; int err; @@ -101,7 +101,7 @@ static void rv32m1_lpi2c_master_transfer_callback(LPI2C_Type *base, status_t completionStatus, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct rv32m1_lpi2c_data *data = dev->driver_data; ARG_UNUSED(base); @@ -126,7 +126,8 @@ static u32_t rv32m1_lpi2c_convert_flags(int msg_flags) return flags; } -static int rv32m1_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, +static int rv32m1_lpi2c_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { const struct rv32m1_lpi2c_config *config = dev->config_info; @@ -201,19 +202,19 @@ static int rv32m1_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, static void rv32m1_lpi2c_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct rv32m1_lpi2c_config *config = dev->config_info; struct rv32m1_lpi2c_data *data = dev->driver_data; LPI2C_MasterTransferHandleIRQ(config->base, &data->handle); } -static int rv32m1_lpi2c_init(struct device *dev) +static int rv32m1_lpi2c_init(const struct device *dev) { const struct rv32m1_lpi2c_config *config = dev->config_info; struct rv32m1_lpi2c_data *data = dev->driver_data; lpi2c_master_config_t master_config; - struct device *clk; + const struct device *clk; u32_t clk_freq, dev_cfg; int err; @@ -242,7 +243,7 @@ static int rv32m1_lpi2c_init(struct device *dev) LPI2C_MasterInit(config->base, &master_config, clk_freq); LPI2C_MasterTransferCreateHandle(config->base, &data->handle, rv32m1_lpi2c_master_transfer_callback, - dev); + (void *)dev); dev_cfg = i2c_map_dt_bitrate(config->bitrate); err = rv32m1_lpi2c_configure(dev, dev_cfg | I2C_MODE_MASTER); @@ -262,7 +263,7 @@ static const struct i2c_driver_api rv32m1_lpi2c_driver_api = { }; #define RV32M1_LPI2C_DEVICE(id) \ - static void rv32m1_lpi2c_irq_config_func_##id(struct device *dev); \ + static void rv32m1_lpi2c_irq_config_func_##id(const struct device *dev); \ static const struct rv32m1_lpi2c_config rv32m1_lpi2c_##id##_config = { \ .base = \ (LPI2C_Type *)DT_INST_REG_ADDR(id), \ @@ -287,7 +288,7 @@ static const struct i2c_driver_api rv32m1_lpi2c_driver_api = { &rv32m1_lpi2c_##id##_config, \ POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, \ &rv32m1_lpi2c_driver_api); \ - static void rv32m1_lpi2c_irq_config_func_##id(struct device *dev) \ + static void rv32m1_lpi2c_irq_config_func_##id(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(id), \ 0, \ diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c index 88956eef0b75..81e441d3d18f 100644 --- a/drivers/i2c/i2c_sam0.c +++ b/drivers/i2c/i2c_sam0.c @@ -33,7 +33,7 @@ struct i2c_sam0_dev_config { u32_t pm_apbcmask; u16_t gclk_clkctrl_id; #endif - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #ifdef CONFIG_I2C_SAM0_DMA_DRIVEN char *dma_dev; @@ -54,7 +54,7 @@ struct i2c_sam0_dev_data { struct i2c_sam0_msg msg; #ifdef CONFIG_I2C_SAM0_DMA_DRIVEN - struct device *dma; + const struct device *dma; #endif }; @@ -79,7 +79,7 @@ static void wait_synchronization(SercomI2cm *regs) #endif } -static bool i2c_sam0_terminate_on_error(struct device *dev) +static bool i2c_sam0_terminate_on_error(const struct device *dev) { struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); @@ -128,7 +128,7 @@ static bool i2c_sam0_terminate_on_error(struct device *dev) static void i2c_sam0_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); SercomI2cm *i2c = cfg->regs; @@ -183,7 +183,7 @@ static void i2c_sam0_isr(void *arg) static void i2c_sam0_dma_write_done(void *arg, u32_t id, int error_code) { - struct device *dev = arg; + const struct device *dev = arg; struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); SercomI2cm *i2c = cfg->regs; @@ -218,7 +218,7 @@ static void i2c_sam0_dma_write_done(void *arg, u32_t id, int error_code) i2c->INTENSET.reg = SERCOM_I2CM_INTENSET_MB; } -static bool i2c_sam0_dma_write_start(struct device *dev) +static bool i2c_sam0_dma_write_start(const struct device *dev) { struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); @@ -276,7 +276,7 @@ static bool i2c_sam0_dma_write_start(struct device *dev) static void i2c_sam0_dma_read_done(void *arg, u32_t id, int error_code) { - struct device *dev = arg; + const struct device *dev = arg; struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); SercomI2cm *i2c = cfg->regs; @@ -312,7 +312,7 @@ static void i2c_sam0_dma_read_done(void *arg, u32_t id, int error_code) i2c->INTENSET.reg = SERCOM_I2CM_INTENSET_SB; } -static bool i2c_sam0_dma_read_start(struct device *dev) +static bool i2c_sam0_dma_read_start(const struct device *dev) { struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); @@ -371,7 +371,7 @@ static bool i2c_sam0_dma_read_start(struct device *dev) #endif -static int i2c_sam0_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_sam0_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { struct i2c_sam0_dev_data *data = DEV_DATA(dev); @@ -503,7 +503,7 @@ static int i2c_sam0_transfer(struct device *dev, struct i2c_msg *msgs, return 0; } -static int i2c_sam0_set_apply_bitrate(struct device *dev, u32_t config) +static int i2c_sam0_set_apply_bitrate(const struct device *dev, u32_t config) { const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); SercomI2cm *i2c = cfg->regs; @@ -637,7 +637,7 @@ static int i2c_sam0_set_apply_bitrate(struct device *dev, u32_t config) return 0; } -static int i2c_sam0_configure(struct device *dev, u32_t config) +static int i2c_sam0_configure(const struct device *dev, u32_t config) { const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); SercomI2cm *i2c = cfg->regs; @@ -664,7 +664,7 @@ static int i2c_sam0_configure(struct device *dev, u32_t config) return 0; } -static int i2c_sam0_initialize(struct device *dev) +static int i2c_sam0_initialize(const struct device *dev) { struct i2c_sam0_dev_data *data = DEV_DATA(dev); const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev); @@ -753,7 +753,7 @@ static const struct i2c_driver_api i2c_sam0_driver_api = { #if DT_INST_IRQ_HAS_IDX(0, 3) #define I2C_SAM0_IRQ_HANDLER(n) \ -static void i2c_sam0_irq_config_##n(struct device *dev) \ +static void i2c_sam0_irq_config_##n(const struct device *dev) \ { \ SAM0_I2C_IRQ_CONNECT(n, 0); \ SAM0_I2C_IRQ_CONNECT(n, 1); \ @@ -762,7 +762,7 @@ static void i2c_sam0_irq_config_##n(struct device *dev) \ } #else #define I2C_SAM0_IRQ_HANDLER(n) \ -static void i2c_sam0_irq_config_##n(struct device *dev) \ +static void i2c_sam0_irq_config_##n(const struct device *dev) \ { \ SAM0_I2C_IRQ_CONNECT(n, 0); \ } @@ -792,7 +792,7 @@ static const struct i2c_sam0_dev_config i2c_sam0_dev_config_##n = { \ #endif #define I2C_SAM0_DEVICE(n) \ - static void i2c_sam0_irq_config_##n(struct device *dev); \ + static void i2c_sam0_irq_config_##n(const struct device *dev); \ I2C_SAM0_CONFIG(n); \ static struct i2c_sam0_dev_data i2c_sam0_dev_data_##n; \ DEVICE_AND_API_INIT(i2c_sam0_##n, \ diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index 3ae1522f7d21..c6f3daae7a45 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -104,7 +104,7 @@ static int i2c_clk_set(Twi *const twi, u32_t speed) return 0; } -static int i2c_sam_twi_configure(struct device *dev, u32_t config) +static int i2c_sam_twi_configure(const struct device *dev, u32_t config) { const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev); Twi *const twi = dev_cfg->regs; @@ -178,7 +178,8 @@ static void read_msg_start(Twi *const twi, struct twi_msg *msg, u8_t daddr) twi->TWI_IER = TWI_IER_RXRDY | TWI_IER_TXCOMP | TWI_IER_NACK; } -static int i2c_sam_twi_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_sam_twi_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) { const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -236,7 +237,7 @@ static int i2c_sam_twi_transfer(struct device *dev, struct i2c_msg *msgs, static void i2c_sam_twi_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev); Twi *const twi = dev_cfg->regs; @@ -294,7 +295,7 @@ static void i2c_sam_twi_isr(void *arg) k_sem_give(&dev_data->sem); } -static int i2c_sam_twi_initialize(struct device *dev) +static int i2c_sam_twi_initialize(const struct device *dev) { const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev); @@ -339,7 +340,7 @@ static const struct i2c_driver_api i2c_sam_twi_driver_api = { }; #define I2C_TWI_SAM_INIT(n) \ - static struct device DEVICE_NAME_GET(i2c##n##_sam); \ + DEVICE_DECLARE(i2c##n##_sam); \ \ static void i2c##n##_sam_irq_config(void) \ { \ diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index bfcfeb83c1d1..5692a16acddc 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -104,7 +104,7 @@ static int i2c_clk_set(Twihs *const twihs, u32_t speed) return 0; } -static int i2c_sam_twihs_configure(struct device *dev, u32_t config) +static int i2c_sam_twihs_configure(const struct device *dev, u32_t config) { const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev); Twihs *const twihs = dev_cfg->regs; @@ -180,8 +180,9 @@ static void read_msg_start(Twihs *const twihs, struct twihs_msg *msg, twihs->TWIHS_CR = TWIHS_CR_START | twihs_cr_stop; } -static int i2c_sam_twihs_transfer(struct device *dev, struct i2c_msg *msgs, - u8_t num_msgs, u16_t addr) +static int i2c_sam_twihs_transfer(const struct device *dev, + struct i2c_msg *msgs, + u8_t num_msgs, u16_t addr) { const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev); @@ -223,7 +224,7 @@ static int i2c_sam_twihs_transfer(struct device *dev, struct i2c_msg *msgs, static void i2c_sam_twihs_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev); Twihs *const twihs = dev_cfg->regs; @@ -281,7 +282,7 @@ static void i2c_sam_twihs_isr(void *arg) k_sem_give(&dev_data->sem); } -static int i2c_sam_twihs_initialize(struct device *dev) +static int i2c_sam_twihs_initialize(const struct device *dev) { const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev); @@ -326,7 +327,7 @@ static const struct i2c_driver_api i2c_sam_twihs_driver_api = { }; #define I2C_TWIHS_SAM_INIT(n) \ - static struct device DEVICE_NAME_GET(i2c##n##_sam); \ + DEVICE_DECLARE(i2c##n##_sam); \ \ static void i2c##n##_sam_irq_config(void) \ { \ diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c index 446a0c255231..93a4dbdcebb5 100644 --- a/drivers/i2c/i2c_sbcon.c +++ b/drivers/i2c/i2c_sbcon.c @@ -77,14 +77,14 @@ static const struct i2c_bitbang_io io_fns = { .get_sda = &i2c_sbcon_get_sda, }; -static int i2c_sbcon_configure(struct device *dev, u32_t dev_config) +static int i2c_sbcon_configure(const struct device *dev, u32_t dev_config) { struct i2c_sbcon_context *context = dev->driver_data; return i2c_bitbang_configure(&context->bitbang, dev_config); } -static int i2c_sbcon_transfer(struct device *dev, struct i2c_msg *msgs, +static int i2c_sbcon_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t slave_address) { struct i2c_sbcon_context *context = dev->driver_data; @@ -98,7 +98,7 @@ static struct i2c_driver_api api = { .transfer = i2c_sbcon_transfer, }; -static int i2c_sbcon_init(struct device *dev) +static int i2c_sbcon_init(const struct device *dev) { struct i2c_sbcon_context *context = dev->driver_data; const struct i2c_sbcon_config *config = dev->config_info; diff --git a/drivers/i2c/i2c_shell.c b/drivers/i2c/i2c_shell.c index b3fd0fc244f5..d2e22bfc3ac7 100644 --- a/drivers/i2c/i2c_shell.c +++ b/drivers/i2c/i2c_shell.c @@ -25,7 +25,7 @@ extern struct device __device_end[]; static int cmd_i2c_scan(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; u8_t cnt = 0, first = 0x04, last = 0x77; dev = device_get_binding(argv[1]); @@ -73,7 +73,7 @@ static int cmd_i2c_scan(const struct shell *shell, static int cmd_i2c_recover(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; int err; dev = device_get_binding(argv[1]); @@ -95,7 +95,7 @@ static int cmd_i2c_recover(const struct shell *shell, static int cmd_i2c_write(const struct shell *shell, size_t argc, char **argv) { u8_t buf[MAX_I2C_BYTES]; - struct device *dev; + const struct device *dev; int num_bytes; int reg_addr; int dev_addr; @@ -131,7 +131,7 @@ static int cmd_i2c_write(const struct shell *shell, size_t argc, char **argv) static int cmd_i2c_write_byte(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; int reg_addr; int dev_addr; int out_byte; @@ -158,7 +158,7 @@ static int cmd_i2c_write_byte(const struct shell *shell, static int cmd_i2c_read_byte(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; int reg_addr; int dev_addr; u8_t out; @@ -187,7 +187,7 @@ static int cmd_i2c_read_byte(const struct shell *shell, static int cmd_i2c_read(const struct shell *shell, size_t argc, char **argv) { u8_t buf[MAX_I2C_BYTES]; - struct device *dev; + const struct device *dev; int num_bytes; int reg_addr; int dev_addr; @@ -225,7 +225,7 @@ SHELL_DYNAMIC_CMD_CREATE(dsub_device_name, device_name_get); static void device_name_get(size_t idx, struct shell_static_entry *entry) { int device_idx = 0; - struct device *dev; + const struct device *dev; entry->syntax = NULL; entry->handler = NULL; diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c index b7c9c4d01bb0..6605e263c2bb 100644 --- a/drivers/i2c/i2c_sifive.c +++ b/drivers/i2c/i2c_sifive.c @@ -67,14 +67,14 @@ struct i2c_sifive_cfg { /* Helper functions */ -static inline bool i2c_sifive_busy(struct device *dev) +static inline bool i2c_sifive_busy(const struct device *dev) { const struct i2c_sifive_cfg *config = dev->config_info; return IS_SET(config, REG_STATUS, SF_STATUS_TIP); } -static int i2c_sifive_send_addr(struct device *dev, +static int i2c_sifive_send_addr(const struct device *dev, u16_t addr, u16_t rw_flag) { @@ -105,7 +105,7 @@ static int i2c_sifive_send_addr(struct device *dev, return 0; } -static int i2c_sifive_write_msg(struct device *dev, +static int i2c_sifive_write_msg(const struct device *dev, struct i2c_msg *msg, u16_t addr) { @@ -154,7 +154,7 @@ static int i2c_sifive_write_msg(struct device *dev, return 0; } -static int i2c_sifive_read_msg(struct device *dev, +static int i2c_sifive_read_msg(const struct device *dev, struct i2c_msg *msg, u16_t addr) { @@ -197,7 +197,7 @@ static int i2c_sifive_read_msg(struct device *dev, /* API Functions */ -static int i2c_sifive_configure(struct device *dev, u32_t dev_config) +static int i2c_sifive_configure(const struct device *dev, u32_t dev_config) { const struct i2c_sifive_cfg *config = NULL; u32_t i2c_speed = 0U; @@ -262,7 +262,7 @@ static int i2c_sifive_configure(struct device *dev, u32_t dev_config) return 0; } -static int i2c_sifive_transfer(struct device *dev, +static int i2c_sifive_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr) @@ -298,7 +298,7 @@ static int i2c_sifive_transfer(struct device *dev, return 0; }; -static int i2c_sifive_init(struct device *dev) +static int i2c_sifive_init(const struct device *dev) { const struct i2c_sifive_cfg *config = dev->config_info; u32_t dev_config = 0U; diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c index 3727888b7060..794e317185dc 100644 --- a/drivers/i2c/slave/eeprom_slave.c +++ b/drivers/i2c/slave/eeprom_slave.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(i2c_slave); struct i2c_eeprom_slave_data { - struct device *i2c_controller; + const struct device *i2c_controller; struct i2c_slave_config config; u32_t buffer_size; u8_t *buffer; @@ -40,7 +40,7 @@ struct i2c_eeprom_slave_config { #define DEV_DATA(dev) \ ((struct i2c_eeprom_slave_data * const)(dev)->driver_data) -int eeprom_slave_program(struct device *dev, u8_t *eeprom_data, +int eeprom_slave_program(const struct device *dev, u8_t *eeprom_data, unsigned int length) { struct i2c_eeprom_slave_data *data = dev->driver_data; @@ -54,7 +54,7 @@ int eeprom_slave_program(struct device *dev, u8_t *eeprom_data, return 0; } -int eeprom_slave_read(struct device *dev, u8_t *eeprom_data, +int eeprom_slave_read(const struct device *dev, u8_t *eeprom_data, unsigned int offset) { struct i2c_eeprom_slave_data *data = dev->driver_data; @@ -157,14 +157,14 @@ static int eeprom_slave_stop(struct i2c_slave_config *config) return 0; } -static int eeprom_slave_register(struct device *dev) +static int eeprom_slave_register(const struct device *dev) { struct i2c_eeprom_slave_data *data = dev->driver_data; return i2c_slave_register(data->i2c_controller, &data->config); } -static int eeprom_slave_unregister(struct device *dev) +static int eeprom_slave_unregister(const struct device *dev) { struct i2c_eeprom_slave_data *data = dev->driver_data; @@ -184,7 +184,7 @@ static const struct i2c_slave_callbacks eeprom_callbacks = { .stop = eeprom_slave_stop, }; -static int i2c_eeprom_slave_init(struct device *dev) +static int i2c_eeprom_slave_init(const struct device *dev) { struct i2c_eeprom_slave_data *data = DEV_DATA(dev); const struct i2c_eeprom_slave_config *cfg = DEV_CFG(dev); diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c index 3fbdd8d88ec1..ca28d67f9db2 100644 --- a/drivers/i2s/i2s_cavs.c +++ b/drivers/i2s/i2s_cavs.c @@ -151,7 +151,7 @@ struct i2s_cavs_config { /* Device run time data */ struct i2s_cavs_dev_data { struct i2s_config cfg; - struct device *dev_dma; + const struct device *dev_dma; struct stream tx; struct stream rx; }; @@ -168,9 +168,9 @@ I2S_DEVICE_OBJECT_DECLARE(3); static void i2s_dma_tx_callback(void *, u32_t, int); static void i2s_tx_stream_disable(struct i2s_cavs_dev_data *, - volatile struct i2s_cavs_ssp *const, struct device *); + volatile struct i2s_cavs_ssp *const, const struct device *); static void i2s_rx_stream_disable(struct i2s_cavs_dev_data *, - volatile struct i2s_cavs_ssp *const, struct device *); + volatile struct i2s_cavs_ssp *const, const struct device *); static inline void i2s_purge_stream_buffers(struct stream *strm, struct k_mem_slab *mem_slab) @@ -189,7 +189,7 @@ static inline void i2s_purge_stream_buffers(struct stream *strm, static void i2s_dma_tx_callback(void *arg, u32_t channel, int status) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); @@ -244,7 +244,7 @@ static void i2s_dma_tx_callback(void *arg, u32_t channel, static void i2s_dma_rx_callback(void *arg, u32_t channel, int status) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); volatile struct i2s_cavs_ssp *const ssp = dev_cfg->regs; @@ -300,7 +300,7 @@ static void i2s_dma_rx_callback(void *arg, u32_t channel, int status) } } -static int i2s_cavs_configure(struct device *dev, enum i2s_dir dir, +static int i2s_cavs_configure(const struct device *dev, enum i2s_dir dir, struct i2s_config *i2s_cfg) { const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); @@ -565,7 +565,7 @@ static int i2s_cavs_configure(struct device *dev, enum i2s_dir dir, static int i2s_tx_stream_start(struct i2s_cavs_dev_data *dev_data, volatile struct i2s_cavs_ssp *const ssp, - struct device *dev_dma) + const struct device *dev_dma) { int ret = 0; void *buffer; @@ -610,7 +610,8 @@ static int i2s_tx_stream_start(struct i2s_cavs_dev_data *dev_data, } static int i2s_rx_stream_start(struct i2s_cavs_dev_data *dev_data, - volatile struct i2s_cavs_ssp *const ssp, struct device *dev_dma) + volatile struct i2s_cavs_ssp *const ssp, + const struct device *dev_dma) { int ret = 0; void *buffer; @@ -659,7 +660,7 @@ static int i2s_rx_stream_start(struct i2s_cavs_dev_data *dev_data, static void i2s_tx_stream_disable(struct i2s_cavs_dev_data *dev_data, volatile struct i2s_cavs_ssp *const ssp, - struct device *dev_dma) + const struct device *dev_dma) { struct stream *strm = &dev_data->tx; unsigned int key; @@ -682,7 +683,7 @@ static void i2s_tx_stream_disable(struct i2s_cavs_dev_data *dev_data, static void i2s_rx_stream_disable(struct i2s_cavs_dev_data *dev_data, volatile struct i2s_cavs_ssp *const ssp, - struct device *dev_dma) + const struct device *dev_dma) { struct stream *strm = &dev_data->rx; u32_t data; @@ -705,7 +706,7 @@ static void i2s_rx_stream_disable(struct i2s_cavs_dev_data *dev_data, i2s_purge_stream_buffers(strm, dev_data->cfg.mem_slab); } -static int i2s_cavs_trigger(struct device *dev, enum i2s_dir dir, +static int i2s_cavs_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd) { const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); @@ -767,7 +768,8 @@ static int i2s_cavs_trigger(struct device *dev, enum i2s_dir dir, return ret; } -static int i2s_cavs_read(struct device *dev, void **mem_block, size_t *size) +static int i2s_cavs_read(const struct device *dev, void **mem_block, + size_t *size) { struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); struct stream *strm = &dev_data->rx; @@ -790,7 +792,8 @@ static int i2s_cavs_read(struct device *dev, void **mem_block, size_t *size) return 0; } -static int i2s_cavs_write(struct device *dev, void *mem_block, size_t size) +static int i2s_cavs_write(const struct device *dev, void *mem_block, + size_t size) { struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); struct stream *strm = &dev_data->tx; @@ -817,7 +820,7 @@ static int i2s_cavs_write(struct device *dev, void *mem_block, size_t size) /* clear IRQ sources atm */ static void i2s_cavs_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); volatile struct i2s_cavs_ssp *const ssp = dev_cfg->regs; struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); @@ -839,7 +842,7 @@ static void i2s_cavs_isr(void *arg) } } -static int i2s_cavs_initialize(struct device *dev) +static int i2s_cavs_initialize(const struct device *dev) { const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev); diff --git a/drivers/i2s/i2s_common.c b/drivers/i2s/i2s_common.c index 15dfc117f3bc..2319a59194de 100644 --- a/drivers/i2s/i2s_common.c +++ b/drivers/i2s/i2s_common.c @@ -8,16 +8,16 @@ #include #include -int z_impl_i2s_buf_read(struct device *dev, void *buf, size_t *size) +int z_impl_i2s_buf_read(const struct device *dev, void *buf, size_t *size) { void *mem_block; int ret; - ret = i2s_read((struct device *)dev, &mem_block, size); + ret = i2s_read((const struct device *)dev, &mem_block, size); if (!ret) { struct i2s_config *rx_cfg = - i2s_config_get((struct device *)dev, I2S_DIR_RX); + i2s_config_get((const struct device *)dev, I2S_DIR_RX); memcpy(buf, mem_block, *size); k_mem_slab_free(rx_cfg->mem_slab, &mem_block); @@ -26,13 +26,13 @@ int z_impl_i2s_buf_read(struct device *dev, void *buf, size_t *size) return ret; } -int z_impl_i2s_buf_write(struct device *dev, void *buf, size_t size) +int z_impl_i2s_buf_write(const struct device *dev, void *buf, size_t size) { int ret; struct i2s_config *tx_cfg; void *mem_block; - tx_cfg = i2s_config_get((struct device *)dev, I2S_DIR_TX); + tx_cfg = i2s_config_get((const struct device *)dev, I2S_DIR_TX); if (!tx_cfg) { return -EIO; } @@ -48,7 +48,7 @@ int z_impl_i2s_buf_write(struct device *dev, void *buf, size_t size) memcpy(mem_block, (void *)buf, size); - ret = i2s_write((struct device *)dev, mem_block, size); + ret = i2s_write((const struct device *)dev, mem_block, size); if (ret != 0) { k_mem_slab_free(tx_cfg->mem_slab, &mem_block); } diff --git a/drivers/i2s/i2s_handlers.c b/drivers/i2s/i2s_handlers.c index 13c35e3b7eeb..27384887f257 100644 --- a/drivers/i2s/i2s_handlers.c +++ b/drivers/i2s/i2s_handlers.c @@ -9,8 +9,9 @@ #include -static inline int z_vrfy_i2s_configure(struct device *dev, enum i2s_dir dir, - struct i2s_config *cfg_ptr) +static inline int z_vrfy_i2s_configure(const struct device *dev, + enum i2s_dir dir, + struct i2s_config *cfg_ptr) { struct i2s_config config; int ret = -EINVAL; @@ -36,13 +37,13 @@ static inline int z_vrfy_i2s_configure(struct device *dev, enum i2s_dir dir, goto out; } - ret = z_impl_i2s_configure((struct device *)dev, dir, &config); + ret = z_impl_i2s_configure((const struct device *)dev, dir, &config); out: return ret; } #include -static inline int z_vrfy_i2s_buf_read(struct device *dev, +static inline int z_vrfy_i2s_buf_read(const struct device *dev, void *buf, size_t *size) { void *mem_block; @@ -51,7 +52,7 @@ static inline int z_vrfy_i2s_buf_read(struct device *dev, Z_OOPS(Z_SYSCALL_DRIVER_I2S(dev, read)); - ret = i2s_read((struct device *)dev, &mem_block, &data_size); + ret = i2s_read((const struct device *)dev, &mem_block, &data_size); if (!ret) { struct i2s_config *rx_cfg; @@ -60,7 +61,8 @@ static inline int z_vrfy_i2s_buf_read(struct device *dev, /* Presumed to be configured otherwise the i2s_read() call * would have failed. */ - rx_cfg = i2s_config_get((struct device *)dev, I2S_DIR_RX); + rx_cfg = i2s_config_get((const struct device *)dev, + I2S_DIR_RX); copy_success = z_user_to_copy((void *)buf, mem_block, data_size); @@ -75,7 +77,7 @@ static inline int z_vrfy_i2s_buf_read(struct device *dev, } #include -static inline int z_vrfy_i2s_buf_write(struct device *dev, +static inline int z_vrfy_i2s_buf_write(const struct device *dev, void *buf, size_t size) { int ret; @@ -83,7 +85,7 @@ static inline int z_vrfy_i2s_buf_write(struct device *dev, void *mem_block; Z_OOPS(Z_SYSCALL_DRIVER_I2S(dev, write)); - tx_cfg = i2s_config_get((struct device *)dev, I2S_DIR_TX); + tx_cfg = i2s_config_get((const struct device *)dev, I2S_DIR_TX); if (!tx_cfg) { return -EIO; } @@ -103,7 +105,7 @@ static inline int z_vrfy_i2s_buf_write(struct device *dev, Z_OOPS(ret); } - ret = i2s_write((struct device *)dev, mem_block, size); + ret = i2s_write((const struct device *)dev, mem_block, size); if (ret != 0) { k_mem_slab_free(tx_cfg->mem_slab, &mem_block); } @@ -112,11 +114,12 @@ static inline int z_vrfy_i2s_buf_write(struct device *dev, } #include -static inline int z_vrfy_i2s_trigger(struct device *dev, enum i2s_dir dir, +static inline int z_vrfy_i2s_trigger(const struct device *dev, + enum i2s_dir dir, enum i2s_trigger_cmd cmd) { Z_OOPS(Z_SYSCALL_DRIVER_I2S(dev, trigger)); - return z_impl_i2s_trigger((struct device *)dev, dir, cmd); + return z_impl_i2s_trigger((const struct device *)dev, dir, cmd); } #include diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c index 83ba81c266bf..0970108b5709 100644 --- a/drivers/i2s/i2s_ll_stm32.c +++ b/drivers/i2s/i2s_ll_stm32.c @@ -91,10 +91,10 @@ static int queue_put(struct ring_buf *rb, void *mem_block, size_t size) return 0; } -static int i2s_stm32_enable_clock(struct device *dev) +static int i2s_stm32_enable_clock(const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); - struct device *clk; + const struct device *clk; int ret; clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); @@ -117,7 +117,7 @@ static u16_t plli2s_ms_count; #define pllr(v) z_pllr(v) #endif -static int i2s_stm32_set_clock(struct device *dev, u32_t bit_clk_freq) +static int i2s_stm32_set_clock(const struct device *dev, u32_t bit_clk_freq) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); u32_t pll_src = LL_RCC_PLL_GetMainSource(); @@ -177,7 +177,7 @@ static int i2s_stm32_set_clock(struct device *dev, u32_t bit_clk_freq) return 0; } -static int i2s_stm32_configure(struct device *dev, enum i2s_dir dir, +static int i2s_stm32_configure(const struct device *dev, enum i2s_dir dir, struct i2s_config *i2s_cfg) { const struct i2s_stm32_cfg *const cfg = DEV_CFG(dev); @@ -281,7 +281,7 @@ static int i2s_stm32_configure(struct device *dev, enum i2s_dir dir, return 0; } -static int i2s_stm32_trigger(struct device *dev, enum i2s_dir dir, +static int i2s_stm32_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd) { struct i2s_stm32_data *const dev_data = DEV_DATA(dev); @@ -372,7 +372,8 @@ static int i2s_stm32_trigger(struct device *dev, enum i2s_dir dir, return 0; } -static int i2s_stm32_read(struct device *dev, void **mem_block, size_t *size) +static int i2s_stm32_read(const struct device *dev, void **mem_block, + size_t *size) { struct i2s_stm32_data *const dev_data = DEV_DATA(dev); int ret; @@ -399,7 +400,8 @@ static int i2s_stm32_read(struct device *dev, void **mem_block, size_t *size) return 0; } -static int i2s_stm32_write(struct device *dev, void *mem_block, size_t size) +static int i2s_stm32_write(const struct device *dev, void *mem_block, + size_t size) { struct i2s_stm32_data *const dev_data = DEV_DATA(dev); int ret; @@ -430,10 +432,10 @@ static const struct i2s_driver_api i2s_stm32_driver_api = { }; #define STM32_DMA_NUM_CHANNELS 8 -static struct device *active_dma_rx_channel[STM32_DMA_NUM_CHANNELS]; -static struct device *active_dma_tx_channel[STM32_DMA_NUM_CHANNELS]; +static const struct device *active_dma_rx_channel[STM32_DMA_NUM_CHANNELS]; +static const struct device *active_dma_tx_channel[STM32_DMA_NUM_CHANNELS]; -static int reload_dma(struct device *dev_dma, u32_t channel, +static int reload_dma(const struct device *dev_dma, u32_t channel, struct dma_config *dcfg, void *src, void *dst, u32_t blk_size) { @@ -449,7 +451,7 @@ static int reload_dma(struct device *dev_dma, u32_t channel, return ret; } -static int start_dma(struct device *dev_dma, u32_t channel, +static int start_dma(const struct device *dev_dma, u32_t channel, struct dma_config *dcfg, void *src, bool src_addr_increment, void *dst, bool dst_addr_increment, u8_t fifo_threshold, @@ -486,15 +488,15 @@ static int start_dma(struct device *dev_dma, u32_t channel, return ret; } -static struct device *get_dev_from_rx_dma_channel(u32_t dma_channel); -static struct device *get_dev_from_tx_dma_channel(u32_t dma_channel); -static void rx_stream_disable(struct stream *stream, struct device *dev); -static void tx_stream_disable(struct stream *stream, struct device *dev); +static const struct device *get_dev_from_rx_dma_channel(u32_t dma_channel); +static const struct device *get_dev_from_tx_dma_channel(u32_t dma_channel); +static void rx_stream_disable(struct stream *stream, const struct device *dev); +static void tx_stream_disable(struct stream *stream, const struct device *dev); /* This function is executed in the interrupt context */ static void dma_rx_callback(void *arg, u32_t channel, int status) { - struct device *dev = get_dev_from_rx_dma_channel(channel); + const struct device *dev = get_dev_from_rx_dma_channel(channel); const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); struct stream *stream = &dev_data->rx; @@ -560,7 +562,7 @@ static void dma_rx_callback(void *arg, u32_t channel, int status) static void dma_tx_callback(void *arg, u32_t channel, int status) { - struct device *dev = get_dev_from_tx_dma_channel(channel); + const struct device *dev = get_dev_from_tx_dma_channel(channel); const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); struct stream *stream = &dev_data->tx; @@ -628,7 +630,7 @@ static u32_t i2s_stm32_irq_ovr_count; static void i2s_stm32_isr(void *arg) { - struct device *const dev = (struct device *) arg; + const struct device *const dev = (const struct device *) arg; const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); struct stream *stream = &dev_data->rx; @@ -645,7 +647,7 @@ static void i2s_stm32_isr(void *arg) i2s_stm32_irq_count++; } -static int i2s_stm32_initialize(struct device *dev) +static int i2s_stm32_initialize(const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); @@ -686,7 +688,7 @@ static int i2s_stm32_initialize(struct device *dev) return 0; } -static int rx_stream_start(struct stream *stream, struct device *dev) +static int rx_stream_start(struct stream *stream, const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); @@ -726,7 +728,7 @@ static int rx_stream_start(struct stream *stream, struct device *dev) return 0; } -static int tx_stream_start(struct stream *stream, struct device *dev) +static int tx_stream_start(struct stream *stream, const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); @@ -771,11 +773,11 @@ static int tx_stream_start(struct stream *stream, struct device *dev) return 0; } -static void rx_stream_disable(struct stream *stream, struct device *dev) +static void rx_stream_disable(struct stream *stream, const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); - struct device *dev_dma = dev_data->dev_dma_rx; + const struct device *dev_dma = dev_data->dev_dma_rx; LL_I2S_DisableDMAReq_RX(cfg->i2s); LL_I2S_DisableIT_ERR(cfg->i2s); @@ -791,11 +793,11 @@ static void rx_stream_disable(struct stream *stream, struct device *dev) active_dma_rx_channel[stream->dma_channel] = NULL; } -static void tx_stream_disable(struct stream *stream, struct device *dev) +static void tx_stream_disable(struct stream *stream, const struct device *dev) { const struct i2s_stm32_cfg *cfg = DEV_CFG(dev); struct i2s_stm32_data *const dev_data = DEV_DATA(dev); - struct device *dev_dma = dev_data->dev_dma_tx; + const struct device *dev_dma = dev_data->dev_dma_tx; LL_I2S_DisableDMAReq_TX(cfg->i2s); LL_I2S_DisableIT_ERR(cfg->i2s); @@ -839,12 +841,12 @@ static void tx_queue_drop(struct stream *stream) } } -static struct device *get_dev_from_rx_dma_channel(u32_t dma_channel) +static const struct device *get_dev_from_rx_dma_channel(u32_t dma_channel) { return active_dma_rx_channel[dma_channel]; } -static struct device *get_dev_from_tx_dma_channel(u32_t dma_channel) +static const struct device *get_dev_from_tx_dma_channel(u32_t dma_channel) { return active_dma_tx_channel[dma_channel]; } @@ -882,9 +884,9 @@ static struct device *get_dev_from_tx_dma_channel(u32_t dma_channel) } #define I2S_INIT(index, clk_sel) \ -static struct device DEVICE_NAME_GET(i2s_stm32_##index); \ +DEVICE_DECLARE(i2s_stm32_##index); \ \ -static void i2s_stm32_irq_config_func_##index(struct device *dev); \ +static void i2s_stm32_irq_config_func_##index(const struct device *dev); \ \ static const struct i2s_stm32_cfg i2s_stm32_config_##index = { \ .i2s = (SPI_TypeDef *) DT_REG_ADDR(DT_NODELABEL(i2s##index)), \ @@ -911,7 +913,7 @@ DEVICE_AND_API_INIT(i2s_stm32_##index, \ &i2s_stm32_config_##index, POST_KERNEL, \ CONFIG_I2S_INIT_PRIORITY, &i2s_stm32_driver_api); \ \ -static void i2s_stm32_irq_config_func_##index(struct device *dev) \ +static void i2s_stm32_irq_config_func_##index(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(DT_NODELABEL(i2s##index)), \ DT_IRQ(DT_NODELABEL(i2s##index), priority), \ diff --git a/drivers/i2s/i2s_ll_stm32.h b/drivers/i2s/i2s_ll_stm32.h index 40b18ac1714c..a595da299dea 100644 --- a/drivers/i2s/i2s_ll_stm32.h +++ b/drivers/i2s/i2s_ll_stm32.h @@ -72,7 +72,7 @@ struct i2s_stm32_cfg { SPI_TypeDef *i2s; struct stm32_pclken pclken; u32_t i2s_clk_sel; - void (*irq_config)(struct device *dev); + void (*irq_config)(const struct device *dev); }; struct stream { @@ -92,15 +92,15 @@ struct stream { void *mem_block; bool last_block; bool master; - int (*stream_start)(struct stream *, struct device *dev); - void (*stream_disable)(struct stream *, struct device *dev); + int (*stream_start)(struct stream *, const struct device *dev); + void (*stream_disable)(struct stream *, const struct device *dev); void (*queue_drop)(struct stream *); }; /* Device run time data */ struct i2s_stm32_data { - struct device *dev_dma_tx; - struct device *dev_dma_rx; + const struct device *dev_dma_tx; + const struct device *dev_dma_rx; struct stream rx; struct stream tx; }; diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c index 8cf1876c2e95..fcc196674bcf 100644 --- a/drivers/i2s/i2s_sam_ssc.c +++ b/drivers/i2s/i2s_sam_ssc.c @@ -81,8 +81,10 @@ struct stream { struct ring_buf mem_block_queue; void *mem_block; bool last_block; - int (*stream_start)(struct stream *, Ssc *const, struct device *); - void (*stream_disable)(struct stream *, Ssc *const, struct device *); + int (*stream_start)(struct stream *, Ssc *const, + const struct device *); + void (*stream_disable)(struct stream *, Ssc *const, + const struct device *); void (*queue_drop)(struct stream *); int (*set_data_format)(const struct i2s_sam_dev_cfg *const, struct i2s_config *); @@ -90,7 +92,7 @@ struct stream { /* Device run time data */ struct i2s_sam_dev_data { - struct device *dev_dma; + const struct device *dev_dma; struct stream rx; struct stream tx; }; @@ -103,11 +105,13 @@ struct i2s_sam_dev_data { #define MODULO_INC(val, max) { val = (++val < max) ? val : 0; } -static struct device *get_dev_from_dma_channel(u32_t dma_channel); +static const struct device *get_dev_from_dma_channel(u32_t dma_channel); static void dma_rx_callback(void *, u32_t, int); static void dma_tx_callback(void *, u32_t, int); -static void rx_stream_disable(struct stream *, Ssc *const, struct device *); -static void tx_stream_disable(struct stream *, Ssc *const, struct device *); +static void rx_stream_disable(struct stream *, Ssc *const, + const struct device *); +static void tx_stream_disable(struct stream *, Ssc *const, + const struct device *); /* * Get data from the queue @@ -161,7 +165,7 @@ static int queue_put(struct ring_buf *rb, void *mem_block, size_t size) return 0; } -static int start_dma(struct device *dev_dma, u32_t channel, +static int start_dma(const struct device *dev_dma, u32_t channel, struct dma_config *cfg, void *src, void *dst, u32_t blk_size) { @@ -188,7 +192,7 @@ static int start_dma(struct device *dev_dma, u32_t channel, /* This function is executed in the interrupt context */ static void dma_rx_callback(void *callback_arg, u32_t channel, int status) { - struct device *dev = get_dev_from_dma_channel(channel); + const struct device *dev = get_dev_from_dma_channel(channel); const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); Ssc *const ssc = dev_cfg->regs; @@ -247,7 +251,7 @@ static void dma_rx_callback(void *callback_arg, u32_t channel, int status) /* This function is executed in the interrupt context */ static void dma_tx_callback(void *callback_arg, u32_t channel, int status) { - struct device *dev = get_dev_from_dma_channel(channel); + const struct device *dev = get_dev_from_dma_channel(channel); const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); Ssc *const ssc = dev_cfg->regs; @@ -509,7 +513,7 @@ static int bit_clock_set(Ssc *const ssc, u32_t bit_clk_freq) return 0; } -static struct i2s_config *i2s_sam_config_get(struct device *dev, +static struct i2s_config *i2s_sam_config_get(const struct device *dev, enum i2s_dir dir) { struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); @@ -528,7 +532,7 @@ static struct i2s_config *i2s_sam_config_get(struct device *dev, return &stream->cfg; } -static int i2s_sam_configure(struct device *dev, enum i2s_dir dir, +static int i2s_sam_configure(const struct device *dev, enum i2s_dir dir, struct i2s_config *i2s_cfg) { const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -616,7 +620,7 @@ static int i2s_sam_configure(struct device *dev, enum i2s_dir dir, } static int rx_stream_start(struct stream *stream, Ssc *const ssc, - struct device *dev_dma) + const struct device *dev_dma) { int ret; @@ -651,7 +655,7 @@ static int rx_stream_start(struct stream *stream, Ssc *const ssc, } static int tx_stream_start(struct stream *stream, Ssc *const ssc, - struct device *dev_dma) + const struct device *dev_dma) { size_t mem_block_size; int ret; @@ -692,7 +696,7 @@ static int tx_stream_start(struct stream *stream, Ssc *const ssc, } static void rx_stream_disable(struct stream *stream, Ssc *const ssc, - struct device *dev_dma) + const struct device *dev_dma) { ssc->SSC_CR = SSC_CR_RXDIS; ssc->SSC_IDR = SSC_IDR_OVRUN; @@ -704,7 +708,7 @@ static void rx_stream_disable(struct stream *stream, Ssc *const ssc, } static void tx_stream_disable(struct stream *stream, Ssc *const ssc, - struct device *dev_dma) + const struct device *dev_dma) { ssc->SSC_CR = SSC_CR_TXDIS; ssc->SSC_IDR = SSC_IDR_TXEMPTY; @@ -743,7 +747,7 @@ static void tx_queue_drop(struct stream *stream) } } -static int i2s_sam_trigger(struct device *dev, enum i2s_dir dir, +static int i2s_sam_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd) { const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); @@ -831,7 +835,8 @@ static int i2s_sam_trigger(struct device *dev, enum i2s_dir dir, return 0; } -static int i2s_sam_read(struct device *dev, void **mem_block, size_t *size) +static int i2s_sam_read(const struct device *dev, void **mem_block, + size_t *size) { struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); int ret; @@ -858,7 +863,8 @@ static int i2s_sam_read(struct device *dev, void **mem_block, size_t *size) return 0; } -static int i2s_sam_write(struct device *dev, void *mem_block, size_t size) +static int i2s_sam_write(const struct device *dev, void *mem_block, + size_t size) { struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); int ret; @@ -883,7 +889,7 @@ static int i2s_sam_write(struct device *dev, void *mem_block, size_t size) static void i2s_sam_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); Ssc *const ssc = dev_cfg->regs; @@ -908,7 +914,7 @@ static void i2s_sam_isr(void *arg) } } -static int i2s_sam_initialize(struct device *dev) +static int i2s_sam_initialize(const struct device *dev) { const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev); struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev); @@ -955,9 +961,9 @@ static const struct i2s_driver_api i2s_sam_driver_api = { /* I2S0 */ -static struct device DEVICE_NAME_GET(i2s0_sam); +DEVICE_DECLARE(i2s0_sam); -static struct device *get_dev_from_dma_channel(u32_t dma_channel) +static const struct device *get_dev_from_dma_channel(u32_t dma_channel) { return &DEVICE_NAME_GET(i2s0_sam); } diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c index 7c88abfdbaaf..4f36d75cfd23 100644 --- a/drivers/ieee802154/ieee802154_cc1200.c +++ b/drivers/ieee802154/ieee802154_cc1200.c @@ -134,7 +134,7 @@ bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, u8_t addr, return (spi_write(ctx->spi, &ctx->spi_cfg, &tx) == 0); } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -177,7 +177,7 @@ static u8_t get_status(struct cc1200_context *ctx) * GPIO functions * *****************/ -static inline void gpio0_int_handler(struct device *port, +static inline void gpio0_int_handler(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct cc1200_context *cc1200 = @@ -209,7 +209,7 @@ static void enable_gpio0_interrupt(struct cc1200_context *cc1200, bool enable) enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE); } -static void setup_gpio_callback(struct device *dev) +static void setup_gpio_callback(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -322,7 +322,7 @@ static u32_t rf_evaluate_freq_setting(struct cc1200_context *ctx, u32_t chan) } static bool -rf_install_settings(struct device *dev, +rf_install_settings(const struct device *dev, const struct cc1200_rf_registers_set *rf_settings) { struct cc1200_context *cc1200 = dev->driver_data; @@ -448,7 +448,7 @@ static inline bool verify_crc(struct cc1200_context *ctx, struct net_pkt *pkt) return true; } -static void cc1200_rx(struct device *dev) +static void cc1200_rx(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; struct net_pkt *pkt; @@ -518,12 +518,12 @@ static void cc1200_rx(struct device *dev) /******************** * Radio device API * *******************/ -static enum ieee802154_hw_caps cc1200_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps cc1200_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_SUB_GHZ; } -static int cc1200_cca(struct device *dev) +static int cc1200_cca(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -541,7 +541,7 @@ static int cc1200_cca(struct device *dev) return -EBUSY; } -static int cc1200_set_channel(struct device *dev, u16_t channel) +static int cc1200_set_channel(const struct device *dev, u16_t channel) { struct cc1200_context *cc1200 = dev->driver_data; @@ -566,7 +566,7 @@ static int cc1200_set_channel(struct device *dev, u16_t channel) return 0; } -static int cc1200_set_txpower(struct device *dev, s16_t dbm) +static int cc1200_set_txpower(const struct device *dev, s16_t dbm) { struct cc1200_context *cc1200 = dev->driver_data; u8_t pa_power_ramp; @@ -591,7 +591,7 @@ static int cc1200_set_txpower(struct device *dev, s16_t dbm) return 0; } -static int cc1200_tx(struct device *dev, +static int cc1200_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -665,7 +665,7 @@ static int cc1200_tx(struct device *dev, return status ? 0 : -EIO; } -static int cc1200_start(struct device *dev) +static int cc1200_start(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -684,7 +684,7 @@ static int cc1200_start(struct device *dev) return 0; } -static int cc1200_stop(struct device *dev) +static int cc1200_stop(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -698,7 +698,7 @@ static int cc1200_stop(struct device *dev) return 0; } -static u16_t cc1200_get_channel_count(struct device *dev) +static u16_t cc1200_get_channel_count(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -709,7 +709,7 @@ static u16_t cc1200_get_channel_count(struct device *dev) * Initialization * *****************/ -static int power_on_and_setup(struct device *dev) +static int power_on_and_setup(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -734,10 +734,10 @@ static int power_on_and_setup(struct device *dev) return rf_calibrate(cc1200); } -static struct cc1200_gpio_configuration *configure_gpios(struct device *dev) +static struct cc1200_gpio_configuration *configure_gpios(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; - struct device *gpio = device_get_binding(DT_INST_GPIO_LABEL(0, int_gpios)); + const struct device *gpio = device_get_binding(DT_INST_GPIO_LABEL(0, int_gpios)); if (!gpio) { return NULL; @@ -751,7 +751,7 @@ static struct cc1200_gpio_configuration *configure_gpios(struct device *dev) return cc1200->gpios; } -static int configure_spi(struct device *dev) +static int configure_spi(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -786,7 +786,7 @@ static int configure_spi(struct device *dev) return 0; } -static int cc1200_init(struct device *dev) +static int cc1200_init(const struct device *dev) { struct cc1200_context *cc1200 = dev->driver_data; @@ -826,7 +826,7 @@ static int cc1200_init(struct device *dev) static void cc1200_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct cc1200_context *cc1200 = dev->driver_data; u8_t *mac = get_mac(dev); diff --git a/drivers/ieee802154/ieee802154_cc1200.h b/drivers/ieee802154/ieee802154_cc1200.h index 70271f939695..fa6697e3731e 100644 --- a/drivers/ieee802154/ieee802154_cc1200.h +++ b/drivers/ieee802154/ieee802154_cc1200.h @@ -30,7 +30,7 @@ enum cc1200_gpio_index { }; struct cc1200_gpio_configuration { - struct device *dev; + const struct device *dev; u32_t pin; }; @@ -43,7 +43,7 @@ struct cc1200_context { /**************************/ struct cc1200_gpio_configuration gpios[CC1200_GPIO_IDX_MAX]; struct gpio_callback rx_tx_cb; - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; u8_t mac_addr[8]; /************RF************/ diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c index e346d72e19fd..4bfa6d2a8be6 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c @@ -42,20 +42,20 @@ static u32_t overrides[] = { }; static inline struct ieee802154_cc13xx_cc26xx_data * -get_dev_data(struct device *dev) +get_dev_data(const struct device *dev) { return dev->driver_data; } static enum ieee802154_hw_caps -ieee802154_cc13xx_cc26xx_get_capabilities(struct device *dev) +ieee802154_cc13xx_cc26xx_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ | IEEE802154_HW_FILTER | IEEE802154_HW_TX_RX_ACK | IEEE802154_HW_CSMA; } -static int ieee802154_cc13xx_cc26xx_cca(struct device *dev) +static int ieee802154_cc13xx_cc26xx_cca(const struct device *dev) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); u32_t status; @@ -78,7 +78,7 @@ static int ieee802154_cc13xx_cc26xx_cca(struct device *dev) } } -static int ieee802154_cc13xx_cc26xx_set_channel(struct device *dev, +static int ieee802154_cc13xx_cc26xx_set_channel(const struct device *dev, u16_t channel) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); @@ -112,7 +112,7 @@ static int ieee802154_cc13xx_cc26xx_set_channel(struct device *dev, } static int -ieee802154_cc13xx_cc26xx_filter(struct device *dev, bool set, +ieee802154_cc13xx_cc26xx_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) { @@ -137,7 +137,8 @@ ieee802154_cc13xx_cc26xx_filter(struct device *dev, bool set, return 0; } -static int ieee802154_cc13xx_cc26xx_set_txpower(struct device *dev, s16_t dbm) +static int ieee802154_cc13xx_cc26xx_set_txpower(const struct device *dev, + s16_t dbm) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); u32_t status; @@ -188,7 +189,7 @@ static int ieee802154_cc13xx_cc26xx_set_txpower(struct device *dev, s16_t dbm) } /* See IEEE 802.15.4 section 6.2.5.1 and TRM section 25.5.4.3 */ -static int ieee802154_cc13xx_cc26xx_tx(struct device *dev, +static int ieee802154_cc13xx_cc26xx_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -268,7 +269,7 @@ static inline u8_t ieee802154_cc13xx_cc26xx_convert_rssi(s8_t rssi) CC13XX_CC26XX_RSSI_DYNAMIC_RANGE; } -static void ieee802154_cc13xx_cc26xx_rx_done(struct device *dev) +static void ieee802154_cc13xx_cc26xx_rx_done(const struct device *dev) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); struct net_pkt *pkt; @@ -335,14 +336,14 @@ static void ieee802154_cc13xx_cc26xx_rx(void *arg1, void *arg2, void *arg3) } } -static int ieee802154_cc13xx_cc26xx_start(struct device *dev) +static int ieee802154_cc13xx_cc26xx_start(const struct device *dev) { ARG_UNUSED(dev); return 0; } -static int ieee802154_cc13xx_cc26xx_stop(struct device *dev) +static int ieee802154_cc13xx_cc26xx_stop(const struct device *dev) { ARG_UNUSED(dev); @@ -352,7 +353,7 @@ static int ieee802154_cc13xx_cc26xx_stop(struct device *dev) } static int -ieee802154_cc13xx_cc26xx_configure(struct device *dev, +ieee802154_cc13xx_cc26xx_configure(const struct device *dev, enum ieee802154_config_type type, const struct ieee802154_config *config) { @@ -393,7 +394,7 @@ static void ieee802154_cc13xx_cc26xx_cpe1_isr(void *arg) } } -static void ieee802154_cc13xx_cc26xx_data_init(struct device *dev) +static void ieee802154_cc13xx_cc26xx_data_init(const struct device *dev) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); u8_t *mac; @@ -437,7 +438,7 @@ static void ieee802154_cc13xx_cc26xx_data_init(struct device *dev) static void ieee802154_cc13xx_cc26xx_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); net_if_set_link_addr(iface, drv_data->mac, sizeof(drv_data->mac), @@ -462,7 +463,7 @@ static struct ieee802154_radio_api ieee802154_cc13xx_cc26xx_radio_api = { .configure = ieee802154_cc13xx_cc26xx_configure, }; -static int ieee802154_cc13xx_cc26xx_init(struct device *dev) +static int ieee802154_cc13xx_cc26xx_init(const struct device *dev) { struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev); bool set_osc_hf; diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index 449f536408aa..4c92a87ca7cd 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -67,7 +67,7 @@ static struct spi_cs_control cs_ctrl; * DEBUG * ********/ #if LOG_LEVEL == LOG_LEVEL_DBG -static inline void cc2520_print_gpio_config(struct device *dev) +static inline void cc2520_print_gpio_config(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -277,7 +277,7 @@ static bool verify_osc_stabilization(struct cc2520_context *cc2520) } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -302,7 +302,7 @@ static inline u8_t *get_mac(struct device *dev) return cc2520->mac_addr; } -static int cc2520_set_pan_id(struct device *dev, u16_t pan_id) +static int cc2520_set_pan_id(const struct device *dev, u16_t pan_id) { struct cc2520_context *cc2520 = dev->driver_data; @@ -318,7 +318,7 @@ static int cc2520_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int cc2520_set_short_addr(struct device *dev, u16_t short_addr) +static int cc2520_set_short_addr(const struct device *dev, u16_t short_addr) { struct cc2520_context *cc2520 = dev->driver_data; @@ -334,7 +334,8 @@ static int cc2520_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int cc2520_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int cc2520_set_ieee_addr(const struct device *dev, + const u8_t *ieee_addr) { struct cc2520_context *cc2520 = dev->driver_data; @@ -353,7 +354,7 @@ static int cc2520_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) /****************** * GPIO functions * *****************/ -static inline void set_reset(struct device *dev, u32_t value) +static inline void set_reset(const struct device *dev, u32_t value) { struct cc2520_context *cc2520 = dev->driver_data; @@ -361,7 +362,7 @@ static inline void set_reset(struct device *dev, u32_t value) cc2520->gpios[CC2520_GPIO_IDX_RESET].pin, value); } -static inline void set_vreg_en(struct device *dev, u32_t value) +static inline void set_vreg_en(const struct device *dev, u32_t value) { struct cc2520_context *cc2520 = dev->driver_data; @@ -399,7 +400,7 @@ static inline u32_t get_cca(struct cc2520_context *cc2520) return pin_value; } -static inline void sfd_int_handler(struct device *port, +static inline void sfd_int_handler(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct cc2520_context *cc2520 = @@ -411,7 +412,7 @@ static inline void sfd_int_handler(struct device *port, } } -static inline void fifop_int_handler(struct device *port, +static inline void fifop_int_handler(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct cc2520_context *cc2520 = @@ -447,7 +448,7 @@ static void enable_sfd_interrupt(struct cc2520_context *cc2520, enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE); } -static inline void setup_gpio_callbacks(struct device *dev) +static inline void setup_gpio_callbacks(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -607,7 +608,7 @@ static inline bool verify_rxfifo_validity(struct cc2520_context *ctx, static void cc2520_rx(int arg) { - struct device *dev = INT_TO_POINTER(arg); + const struct device *dev = INT_TO_POINTER(arg); struct cc2520_context *cc2520 = dev->driver_data; struct net_pkt *pkt; u8_t pkt_len; @@ -679,7 +680,7 @@ static void cc2520_rx(int arg) /******************** * Radio device API * *******************/ -static enum ieee802154_hw_caps cc2520_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps cc2520_get_capabilities(const struct device *dev) { /* ToDo: Add support for IEEE802154_HW_PROMISC */ return IEEE802154_HW_FCS | @@ -687,7 +688,7 @@ static enum ieee802154_hw_caps cc2520_get_capabilities(struct device *dev) IEEE802154_HW_FILTER; } -static int cc2520_cca(struct device *dev) +static int cc2520_cca(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -699,7 +700,7 @@ static int cc2520_cca(struct device *dev) return 0; } -static int cc2520_set_channel(struct device *dev, u16_t channel) +static int cc2520_set_channel(const struct device *dev, u16_t channel) { struct cc2520_context *cc2520 = dev->driver_data; @@ -720,7 +721,7 @@ static int cc2520_set_channel(struct device *dev, u16_t channel) return 0; } -static int cc2520_filter(struct device *dev, +static int cc2520_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) @@ -742,7 +743,7 @@ static int cc2520_filter(struct device *dev, return -ENOTSUP; } -static int cc2520_set_txpower(struct device *dev, s16_t dbm) +static int cc2520_set_txpower(const struct device *dev, s16_t dbm) { struct cc2520_context *cc2520 = dev->driver_data; u8_t pwr; @@ -792,7 +793,7 @@ static int cc2520_set_txpower(struct device *dev, s16_t dbm) return -EIO; } -static int cc2520_tx(struct device *dev, +static int cc2520_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -864,7 +865,7 @@ static int cc2520_tx(struct device *dev, return -EIO; } -static int cc2520_start(struct device *dev) +static int cc2520_start(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -883,7 +884,7 @@ static int cc2520_start(struct device *dev) return 0; } -static int cc2520_stop(struct device *dev) +static int cc2520_stop(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -904,7 +905,7 @@ static int cc2520_stop(struct device *dev) /****************** * Initialization * *****************/ -static int power_on_and_setup(struct device *dev) +static int power_on_and_setup(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -970,10 +971,10 @@ static int power_on_and_setup(struct device *dev) return 0; } -static struct cc2520_gpio_configuration *configure_gpios(struct device *dev) +static struct cc2520_gpio_configuration *configure_gpios(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; - struct device *gpio; + const struct device *gpio; /* VREG_EN */ gpio = device_get_binding(DT_INST_GPIO_LABEL(0, vreg_en_gpios)); @@ -1045,7 +1046,7 @@ static struct cc2520_gpio_configuration *configure_gpios(struct device *dev) } -static inline int configure_spi(struct device *dev) +static inline int configure_spi(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -1080,7 +1081,7 @@ static inline int configure_spi(struct device *dev) return 0; } -static int cc2520_init(struct device *dev) +static int cc2520_init(const struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; @@ -1121,7 +1122,7 @@ static int cc2520_init(struct device *dev) static void cc2520_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct cc2520_context *cc2520 = dev->driver_data; u8_t *mac = get_mac(dev); @@ -1424,12 +1425,12 @@ static int cc2520_crypto_uccm(struct cipher_ctx *ctx, return 0; } -static int cc2520_crypto_hw_caps(struct device *dev) +static int cc2520_crypto_hw_caps(const struct device *dev) { return CAP_RAW_KEY | CAP_INPLACE_OPS | CAP_SYNC_OPS; } -static int cc2520_crypto_begin_session(struct device *dev, +static int cc2520_crypto_begin_session(const struct device *dev, struct cipher_ctx *ctx, enum cipher_algo algo, enum cipher_mode mode, @@ -1458,7 +1459,7 @@ static int cc2520_crypto_begin_session(struct device *dev, return 0; } -static int cc2520_crypto_free_session(struct device *dev, +static int cc2520_crypto_free_session(const struct device *dev, struct cipher_ctx *ctx) { ARG_UNUSED(dev); @@ -1469,7 +1470,7 @@ static int cc2520_crypto_free_session(struct device *dev, return 0; } -static int cc2520_crypto_init(struct device *dev) +static int cc2520_crypto_init(const struct device *dev) { LOG_INF("CC2520 crypto part initialized"); diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h index dd3d3eaf2ff0..43058298f68c 100644 --- a/drivers/ieee802154/ieee802154_cc2520.h +++ b/drivers/ieee802154/ieee802154_cc2520.h @@ -25,7 +25,7 @@ enum cc2520_gpio_index { }; struct cc2520_gpio_configuration { - struct device *dev; + const struct device *dev; u32_t pin; }; @@ -38,7 +38,7 @@ struct cc2520_context { struct cc2520_gpio_configuration gpios[CC2520_GPIO_IDX_MAX]; struct gpio_callback sfd_cb; struct gpio_callback fifop_cb; - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; u8_t mac_addr[8]; /************TX************/ diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c index 019f19e7b479..0985e3a3c530 100644 --- a/drivers/ieee802154/ieee802154_dw1000.c +++ b/drivers/ieee802154/ieee802154_dw1000.c @@ -109,9 +109,9 @@ struct dwt_hi_cfg { struct dwt_context { struct net_if *iface; - struct device *irq_gpio; - struct device *rst_gpio; - struct device *spi; + const struct device *irq_gpio; + const struct device *rst_gpio; + const struct device *spi; struct spi_cs_control spi_cs; struct spi_config *spi_cfg; struct spi_config spi_cfg_slow; @@ -624,7 +624,7 @@ static void dwt_irq_work_handler(struct k_work *item) k_sem_give(&ctx->dev_lock); } -static void dwt_gpio_callback(struct device *dev, +static void dwt_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct dwt_context *ctx = CONTAINER_OF(cb, struct dwt_context, gpio_cb); @@ -633,7 +633,7 @@ static void dwt_gpio_callback(struct device *dev, k_work_submit(&ctx->irq_cb_work); } -static enum ieee802154_hw_caps dwt_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps dwt_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ | /* FIXME: add IEEE802154_HW_UWB_PHY */ @@ -648,7 +648,7 @@ static u32_t dwt_get_pkt_duration_ns(struct dwt_context *ctx, u8_t psdu_len) return (rf_cfg->t_shr + rf_cfg->t_phr + t_psdu); } -static int dwt_cca(struct device *dev) +static int dwt_cca(const struct device *dev) { struct dwt_context *ctx = dev->driver_data; u32_t cca_dur = (dwt_get_pkt_duration_ns(ctx, 127) + @@ -681,7 +681,7 @@ static int dwt_cca(struct device *dev) return ctx->cca_busy ? -EBUSY : 0; } -static int dwt_ed(struct device *dev, u16_t duration, +static int dwt_ed(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb) { /* TODO: see description Sub-Register 0x23:02 – AGC_CTRL1 */ @@ -689,7 +689,7 @@ static int dwt_ed(struct device *dev, u16_t duration, return -ENOTSUP; } -static int dwt_set_channel(struct device *dev, u16_t channel) +static int dwt_set_channel(const struct device *dev, u16_t channel) { struct dwt_context *ctx = dev->driver_data; struct dwt_phy_config *rf_cfg = &ctx->rf_cfg; @@ -711,7 +711,7 @@ static int dwt_set_channel(struct device *dev, u16_t channel) return 0; } -static int dwt_set_pan_id(struct device *dev, u16_t pan_id) +static int dwt_set_pan_id(const struct device *dev, u16_t pan_id) { struct dwt_context *ctx = dev->driver_data; @@ -724,7 +724,7 @@ static int dwt_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int dwt_set_short_addr(struct device *dev, u16_t short_addr) +static int dwt_set_short_addr(const struct device *dev, u16_t short_addr) { struct dwt_context *ctx = dev->driver_data; @@ -738,7 +738,7 @@ static int dwt_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int dwt_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int dwt_set_ieee_addr(const struct device *dev, const u8_t *ieee_addr) { struct dwt_context *ctx = dev->driver_data; @@ -754,7 +754,7 @@ static int dwt_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) return 0; } -static int dwt_filter(struct device *dev, +static int dwt_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) @@ -774,7 +774,7 @@ static int dwt_filter(struct device *dev, return -ENOTSUP; } -static int dwt_set_power(struct device *dev, s16_t dbm) +static int dwt_set_power(const struct device *dev, s16_t dbm) { struct dwt_context *ctx = dev->driver_data; @@ -783,7 +783,7 @@ static int dwt_set_power(struct device *dev, s16_t dbm) return 0; } -static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode, +static int dwt_tx(const struct device *dev, enum ieee802154_tx_mode tx_mode, struct net_pkt *pkt, struct net_buf *frag) { struct dwt_context *ctx = dev->driver_data; @@ -913,7 +913,8 @@ static void dwt_set_frame_filter(struct dwt_context *ctx, dwt_reg_write_u8(ctx, DWT_SYS_CFG_ID, 0, (u8_t)sys_cfg_ff); } -static int dwt_configure(struct device *dev, enum ieee802154_config_type type, +static int dwt_configure(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config) { struct dwt_context *ctx = dev->driver_data; @@ -951,7 +952,7 @@ static int dwt_configure(struct device *dev, enum ieee802154_config_type type, /* * Note, the DW_RESET pin should not be driven high externally. */ -static int dwt_hw_reset(struct device *dev) +static int dwt_hw_reset(const struct device *dev) { struct dwt_context *ctx = dev->driver_data; const struct dwt_hi_cfg *hi_cfg = dev->config_info; @@ -1016,7 +1017,7 @@ static void dwt_set_rx_mode(struct dwt_context *ctx) dwt_reg_write_u32(ctx, DWT_PMSC_ID, DWT_PMSC_CTRL0_OFFSET, pmsc_ctrl0); } -static int dwt_start(struct device *dev) +static int dwt_start(const struct device *dev) { struct dwt_context *ctx = dev->driver_data; u8_t cswakeup_buf[32] = {0}; @@ -1064,7 +1065,7 @@ static int dwt_start(struct device *dev) return 0; } -static int dwt_stop(struct device *dev) +static int dwt_stop(const struct device *dev) { struct dwt_context *ctx = dev->driver_data; @@ -1485,7 +1486,7 @@ static int dwt_configure_rf_phy(struct dwt_context *ctx) return 0; } -static int dw1000_init(struct device *dev) +static int dw1000_init(const struct device *dev) { struct dwt_context *ctx = dev->driver_data; const struct dwt_hi_cfg *hi_cfg = dev->config_info; @@ -1616,7 +1617,7 @@ static int dw1000_init(struct device *dev) return 0; } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct dwt_context *dw1000 = dev->driver_data; u32_t *ptr = (u32_t *)(dw1000->mac_addr); @@ -1632,7 +1633,7 @@ static inline u8_t *get_mac(struct device *dev) static void dwt_iface_api_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct dwt_context *dw1000 = dev->driver_data; u8_t *mac = get_mac(dev); diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c index 6e39fe337cc0..7e569c918fbc 100644 --- a/drivers/ieee802154/ieee802154_kw41z.c +++ b/drivers/ieee802154/ieee802154_kw41z.c @@ -356,7 +356,7 @@ static void kw41z_tmr3_disable(void) ZLL->IRQSTS = irqsts; } -static enum ieee802154_hw_caps kw41z_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps kw41z_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ | @@ -364,7 +364,7 @@ static enum ieee802154_hw_caps kw41z_get_capabilities(struct device *dev) IEEE802154_HW_TX_RX_ACK; } -static int kw41z_cca(struct device *dev) +static int kw41z_cca(const struct device *dev) { struct kw41z_context *kw41z = dev->driver_data; @@ -383,7 +383,7 @@ static int kw41z_cca(struct device *dev) return kw41z->seq_retval; } -static int kw41z_set_channel(struct device *dev, u16_t channel) +static int kw41z_set_channel(const struct device *dev, u16_t channel) { if (channel < 11 || channel > 26) { return -EINVAL; @@ -393,7 +393,7 @@ static int kw41z_set_channel(struct device *dev, u16_t channel) return 0; } -static int kw41z_set_pan_id(struct device *dev, u16_t pan_id) +static int kw41z_set_pan_id(const struct device *dev, u16_t pan_id) { ZLL->MACSHORTADDRS0 = (ZLL->MACSHORTADDRS0 & ~ZLL_MACSHORTADDRS0_MACPANID0_MASK) | @@ -401,7 +401,7 @@ static int kw41z_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int kw41z_set_short_addr(struct device *dev, u16_t short_addr) +static int kw41z_set_short_addr(const struct device *dev, u16_t short_addr) { ZLL->MACSHORTADDRS0 = (ZLL->MACSHORTADDRS0 & ~ZLL_MACSHORTADDRS0_MACSHORTADDRS0_MASK) | @@ -409,7 +409,8 @@ static int kw41z_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int kw41z_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int kw41z_set_ieee_addr(const struct device *dev, + const u8_t *ieee_addr) { u32_t val; @@ -422,7 +423,7 @@ static int kw41z_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) return 0; } -static int kw41z_filter(struct device *dev, +static int kw41z_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) @@ -444,7 +445,7 @@ static int kw41z_filter(struct device *dev, return -ENOTSUP; } -static int kw41z_set_txpower(struct device *dev, s16_t dbm) +static int kw41z_set_txpower(const struct device *dev, s16_t dbm) { if (dbm < KW41Z_OUTPUT_POWER_MIN) { LOG_INF("TX-power %d dBm below min of %d dBm, using %d dBm", @@ -465,7 +466,7 @@ static int kw41z_set_txpower(struct device *dev, s16_t dbm) return 0; } -static int kw41z_start(struct device *dev) +static int kw41z_start(const struct device *dev) { irq_enable(Radio_1_IRQn); @@ -475,7 +476,7 @@ static int kw41z_start(struct device *dev) return 0; } -static int kw41z_stop(struct device *dev) +static int kw41z_stop(const struct device *dev) { irq_disable(Radio_1_IRQn); @@ -612,7 +613,7 @@ static void handle_ack(struct kw41z_context *kw41z, u8_t seq_number) net_pkt_unref(ack_pkt); } -static int kw41z_tx(struct device *dev, enum ieee802154_tx_mode mode, +static int kw41z_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) { struct kw41z_context *kw41z = dev->driver_data; @@ -924,7 +925,7 @@ static void kw41z_isr(int unused) } } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct kw41z_context *kw41z = dev->driver_data; @@ -955,7 +956,7 @@ static inline u8_t *get_mac(struct device *dev) return kw41z->mac_addr; } -static int kw41z_init(struct device *dev) +static int kw41z_init(const struct device *dev) { struct kw41z_context *kw41z = dev->driver_data; xcvrStatus_t xcvrStatus; @@ -1062,7 +1063,7 @@ static int kw41z_init(struct device *dev) static void kw41z_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct kw41z_context *kw41z = dev->driver_data; u8_t *mac = get_mac(dev); @@ -1075,7 +1076,8 @@ static void kw41z_iface_init(struct net_if *iface) ieee802154_init(iface); } -static int kw41z_configure(struct device *dev, enum ieee802154_config_type type, +static int kw41z_configure(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config) { return 0; diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c index adc7a46ba5fa..c017898c9eef 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.c +++ b/drivers/ieee802154/ieee802154_mcr20a.c @@ -323,7 +323,7 @@ static int mcr20a_timer_set(struct mcr20a_context *mcr20a, return -EIO; } -static int mcr20a_timer_init(struct device *dev, u8_t tb) +static int mcr20a_timer_init(const struct device *dev, u8_t tb) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t buf[3] = {0, 0, 0}; @@ -499,7 +499,7 @@ static inline u32_t mcr20a_get_rssi(u32_t lqi) return (a - (b * lqi)) >> 16; } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; u32_t *ptr = (u32_t *)(mcr20a->mac_addr); @@ -712,7 +712,7 @@ static inline bool irqsts3_event(struct mcr20a_context *mcr20a, static void mcr20a_thread_main(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct mcr20a_context *mcr20a = dev->driver_data; u8_t dregs[MCR20A_PHY_CTRL4 + 1]; bool set_new_seq; @@ -785,7 +785,7 @@ static void mcr20a_thread_main(void *arg) } } -static inline void irqb_int_handler(struct device *port, +static inline void irqb_int_handler(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct mcr20a_context *mcr20a = CONTAINER_OF(cb, @@ -814,7 +814,7 @@ static inline void setup_gpio_callbacks(struct mcr20a_context *mcr20a) gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb); } -static int mcr20a_set_cca_mode(struct device *dev, u8_t mode) +static int mcr20a_set_cca_mode(const struct device *dev, u8_t mode) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t ctrl4; @@ -831,7 +831,7 @@ static int mcr20a_set_cca_mode(struct device *dev, u8_t mode) return 0; } -static enum ieee802154_hw_caps mcr20a_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps mcr20a_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ | @@ -840,7 +840,7 @@ static enum ieee802154_hw_caps mcr20a_get_capabilities(struct device *dev) } /* Note: CCA before TX is enabled by default */ -static int mcr20a_cca(struct device *dev) +static int mcr20a_cca(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; int retval; @@ -888,7 +888,7 @@ static int mcr20a_cca(struct device *dev) return -EIO; } -static int mcr20a_set_channel(struct device *dev, u16_t channel) +static int mcr20a_set_channel(const struct device *dev, u16_t channel) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t buf[3]; @@ -943,7 +943,7 @@ static int mcr20a_set_channel(struct device *dev, u16_t channel) return retval; } -static int mcr20a_set_pan_id(struct device *dev, u16_t pan_id) +static int mcr20a_set_pan_id(const struct device *dev, u16_t pan_id) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -962,7 +962,7 @@ static int mcr20a_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int mcr20a_set_short_addr(struct device *dev, u16_t short_addr) +static int mcr20a_set_short_addr(const struct device *dev, u16_t short_addr) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -981,7 +981,8 @@ static int mcr20a_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int mcr20a_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int mcr20a_set_ieee_addr(const struct device *dev, + const u8_t *ieee_addr) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -1001,7 +1002,7 @@ static int mcr20a_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) return 0; } -static int mcr20a_filter(struct device *dev, +static int mcr20a_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) @@ -1023,7 +1024,7 @@ static int mcr20a_filter(struct device *dev, return -ENOTSUP; } -static int mcr20a_set_txpower(struct device *dev, s16_t dbm) +static int mcr20a_set_txpower(const struct device *dev, s16_t dbm) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t pwr; @@ -1082,7 +1083,7 @@ static inline bool write_txfifo_content(struct mcr20a_context *dev, return (spi_write(dev->spi, &dev->spi_cfg, &tx) == 0); } -static int mcr20a_tx(struct device *dev, +static int mcr20a_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -1145,7 +1146,7 @@ static int mcr20a_tx(struct device *dev, return -EIO; } -static int mcr20a_start(struct device *dev) +static int mcr20a_start(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t timeout = 6U; @@ -1203,7 +1204,7 @@ static int mcr20a_start(struct device *dev) return -EIO; } -static int mcr20a_stop(struct device *dev) +static int mcr20a_stop(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t power_mode; @@ -1267,7 +1268,7 @@ static int mcr20a_update_overwrites(struct mcr20a_context *dev) return -EIO; } -static int power_on_and_setup(struct device *dev) +static int power_on_and_setup(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; u8_t timeout = 6U; @@ -1333,7 +1334,7 @@ static int power_on_and_setup(struct device *dev) } -static inline int configure_gpios(struct device *dev) +static inline int configure_gpios(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -1370,7 +1371,7 @@ static inline int configure_gpios(struct device *dev) return 0; } -static inline int configure_spi(struct device *dev) +static inline int configure_spi(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -1409,7 +1410,7 @@ static inline int configure_spi(struct device *dev) return 0; } -static int mcr20a_init(struct device *dev) +static int mcr20a_init(const struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; @@ -1446,7 +1447,7 @@ static int mcr20a_init(struct device *dev) static void mcr20a_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct mcr20a_context *mcr20a = dev->driver_data; u8_t *mac = get_mac(dev); diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h index 69e5b2ac82ee..44d738c38bfb 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.h +++ b/drivers/ieee802154/ieee802154_mcr20a.h @@ -20,10 +20,10 @@ struct mcr20a_context { struct net_if *iface; /**************************/ - struct device *irq_gpio; - struct device *reset_gpio; + const struct device *irq_gpio; + const struct device *reset_gpio; struct gpio_callback irqb_cb; - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control cs_ctrl; diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c index c2569b1a1f71..578ca716938c 100644 --- a/drivers/ieee802154/ieee802154_nrf5.c +++ b/drivers/ieee802154/ieee802154_nrf5.c @@ -43,7 +43,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include "nrf_802154.h" struct nrf5_802154_config { - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; static struct nrf5_802154_data nrf5_data; @@ -67,7 +67,7 @@ static void nrf5_get_eui64(u8_t *mac) static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev); struct net_pkt *pkt; struct nrf5_802154_rx_frame *rx_frame; @@ -155,14 +155,14 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3) /* Radio device API */ -static enum ieee802154_hw_caps nrf5_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps nrf5_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_FILTER | IEEE802154_HW_CSMA | IEEE802154_HW_2_4_GHZ | IEEE802154_HW_TX_RX_ACK | IEEE802154_HW_ENERGY_SCAN; } -static int nrf5_cca(struct device *dev) +static int nrf5_cca(const struct device *dev) { struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev); @@ -181,7 +181,7 @@ static int nrf5_cca(struct device *dev) return nrf5_radio->channel_free ? 0 : -EBUSY; } -static int nrf5_set_channel(struct device *dev, u16_t channel) +static int nrf5_set_channel(const struct device *dev, u16_t channel) { ARG_UNUSED(dev); @@ -196,7 +196,7 @@ static int nrf5_set_channel(struct device *dev, u16_t channel) return 0; } -static int nrf5_energy_scan_start(struct device *dev, +static int nrf5_energy_scan_start(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb) { @@ -218,7 +218,7 @@ static int nrf5_energy_scan_start(struct device *dev, return err; } -static int nrf5_set_pan_id(struct device *dev, u16_t pan_id) +static int nrf5_set_pan_id(const struct device *dev, u16_t pan_id) { u8_t pan_id_le[2]; @@ -232,7 +232,7 @@ static int nrf5_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int nrf5_set_short_addr(struct device *dev, u16_t short_addr) +static int nrf5_set_short_addr(const struct device *dev, u16_t short_addr) { u8_t short_addr_le[2]; @@ -246,7 +246,7 @@ static int nrf5_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int nrf5_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int nrf5_set_ieee_addr(const struct device *dev, const u8_t *ieee_addr) { ARG_UNUSED(dev); @@ -259,7 +259,7 @@ static int nrf5_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) return 0; } -static int nrf5_filter(struct device *dev, bool set, +static int nrf5_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) { @@ -280,7 +280,7 @@ static int nrf5_filter(struct device *dev, bool set, return -ENOTSUP; } -static int nrf5_set_txpower(struct device *dev, s16_t dbm) +static int nrf5_set_txpower(const struct device *dev, s16_t dbm) { ARG_UNUSED(dev); @@ -334,7 +334,7 @@ static int handle_ack(struct nrf5_802154_data *nrf5_radio) return err; } -static void nrf5_tx_started(struct device *dev, +static void nrf5_tx_started(const struct device *dev, struct net_pkt *pkt, struct net_buf *frag) { @@ -346,7 +346,7 @@ static void nrf5_tx_started(struct device *dev, } } -static int nrf5_tx(struct device *dev, +static int nrf5_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -409,7 +409,7 @@ static int nrf5_tx(struct device *dev, return -EIO; } -static int nrf5_start(struct device *dev) +static int nrf5_start(const struct device *dev) { ARG_UNUSED(dev); @@ -424,7 +424,7 @@ static int nrf5_start(struct device *dev) return 0; } -static int nrf5_stop(struct device *dev) +static int nrf5_stop(const struct device *dev) { ARG_UNUSED(dev); @@ -445,7 +445,7 @@ static void nrf5_radio_irq(void *arg) nrf_802154_radio_irq_handler(); } -static void nrf5_irq_config(struct device *dev) +static void nrf5_irq_config(const struct device *dev) { ARG_UNUSED(dev); @@ -454,7 +454,7 @@ static void nrf5_irq_config(struct device *dev) irq_enable(RADIO_IRQn); } -static int nrf5_init(struct device *dev) +static int nrf5_init(const struct device *dev) { const struct nrf5_802154_config *nrf5_radio_cfg = NRF5_802154_CFG(dev); struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev); @@ -481,7 +481,7 @@ static int nrf5_init(struct device *dev) static void nrf5_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev); nrf5_get_eui64(nrf5_radio->mac); @@ -493,7 +493,8 @@ static void nrf5_iface_init(struct net_if *iface) ieee802154_init(iface); } -static int nrf5_configure(struct device *dev, enum ieee802154_config_type type, +static int nrf5_configure(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config) { ARG_UNUSED(dev); diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c index ba51d8351a14..7e868e79c8a6 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.c +++ b/drivers/ieee802154/ieee802154_rf2xx.c @@ -68,7 +68,7 @@ static struct net_pkt rf2xx_ack_pkt = { #endif /* CONFIG_NET_L2_OPENTHREAD */ /* Radio Transceiver ISR */ -static inline void trx_isr_handler(struct device *port, +static inline void trx_isr_handler(const struct device *port, struct gpio_callback *cb, u32_t pins) { @@ -82,7 +82,7 @@ static inline void trx_isr_handler(struct device *port, k_sem_give(&ctx->trx_isr_lock); } -static void rf2xx_trx_set_state(struct device *dev, +static void rf2xx_trx_set_state(const struct device *dev, enum rf2xx_trx_state_cmd_t state) { do { @@ -99,7 +99,7 @@ static void rf2xx_trx_set_state(struct device *dev, RF2XX_TRX_PHY_STATUS_MASK)); } -static void rf2xx_trx_set_tx_state(struct device *dev) +static void rf2xx_trx_set_tx_state(const struct device *dev) { u8_t status; @@ -123,7 +123,7 @@ static void rf2xx_trx_set_tx_state(struct device *dev) rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TX_ARET_ON); } -static void rf2xx_trx_set_rx_state(struct device *dev) +static void rf2xx_trx_set_rx_state(const struct device *dev) { rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TRX_OFF); rf2xx_iface_reg_read(dev, RF2XX_IRQ_STATUS_REG); @@ -134,7 +134,7 @@ static void rf2xx_trx_set_rx_state(struct device *dev) rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_RX_AACK_ON); } -static void rf2xx_trx_rx(struct device *dev) +static void rf2xx_trx_rx(const struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; struct net_pkt *pkt = NULL; @@ -212,7 +212,7 @@ static void rf2xx_trx_rx(struct device *dev) } } -static void rf2xx_process_rx_frame(struct device *dev) +static void rf2xx_process_rx_frame(const struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; @@ -236,7 +236,7 @@ static void rf2xx_process_rx_frame(struct device *dev) } } -static void rf2xx_process_tx_frame(struct device *dev) +static void rf2xx_process_tx_frame(const struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; @@ -246,7 +246,7 @@ static void rf2xx_process_tx_frame(struct device *dev) rf2xx_trx_set_rx_state(dev); } -static void rf2xx_process_trx_end(struct device *dev) +static void rf2xx_process_trx_end(const struct device *dev) { u8_t trx_status = (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) & RF2XX_TRX_PHY_STATUS_MASK); @@ -260,7 +260,7 @@ static void rf2xx_process_trx_end(struct device *dev) static void rf2xx_thread_main(void *arg) { - struct device *dev = INT_TO_POINTER(arg); + const struct device *dev = INT_TO_POINTER(arg); struct rf2xx_context *ctx = dev->driver_data; u8_t isr_status; @@ -305,7 +305,7 @@ static void rf2xx_thread_main(void *arg) } } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; struct rf2xx_context *ctx = dev->driver_data; @@ -327,7 +327,7 @@ static inline u8_t *get_mac(struct device *dev) return ctx->mac_addr; } -static enum ieee802154_hw_caps rf2xx_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps rf2xx_get_capabilities(const struct device *dev) { ARG_UNUSED(dev); @@ -339,14 +339,14 @@ static enum ieee802154_hw_caps rf2xx_get_capabilities(struct device *dev) IEEE802154_HW_2_4_GHZ; } -static int rf2xx_cca(struct device *dev) +static int rf2xx_cca(const struct device *dev) { ARG_UNUSED(dev); return 0; } -static int rf2xx_set_channel(struct device *dev, u16_t channel) +static int rf2xx_set_channel(const struct device *dev, u16_t channel) { u8_t reg; @@ -361,7 +361,7 @@ static int rf2xx_set_channel(struct device *dev, u16_t channel) return 0; } -static int rf2xx_set_txpower(struct device *dev, s16_t dbm) +static int rf2xx_set_txpower(const struct device *dev, s16_t dbm) { u8_t reg; @@ -376,7 +376,7 @@ static int rf2xx_set_txpower(struct device *dev, s16_t dbm) return 0; } -static int rf2xx_set_ieee_addr(struct device *dev, bool set, +static int rf2xx_set_ieee_addr(const struct device *dev, bool set, const u8_t *ieee_addr) { const u8_t *ptr_to_reg = ieee_addr; @@ -399,7 +399,7 @@ static int rf2xx_set_ieee_addr(struct device *dev, bool set, return 0; } -static int rf2xx_set_short_addr(struct device *dev, bool set, +static int rf2xx_set_short_addr(const struct device *dev, bool set, u16_t short_addr) { u8_t short_addr_le[2] = { 0xFF, 0xFF }; @@ -418,7 +418,7 @@ static int rf2xx_set_short_addr(struct device *dev, bool set, return 0; } -static int rf2xx_set_pan_id(struct device *dev, bool set, u16_t pan_id) +static int rf2xx_set_pan_id(const struct device *dev, bool set, u16_t pan_id) { u8_t pan_id_le[2] = { 0xFF, 0xFF }; @@ -434,7 +434,7 @@ static int rf2xx_set_pan_id(struct device *dev, bool set, u16_t pan_id) return 0; } -static int rf2xx_filter(struct device *dev, +static int rf2xx_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) { @@ -475,7 +475,7 @@ static void rf2xx_handle_ack(struct rf2xx_context *ctx, struct net_buf *frag) #define rf2xx_handle_ack(...) #endif -static int rf2xx_tx(struct device *dev, +static int rf2xx_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -532,7 +532,7 @@ static int rf2xx_tx(struct device *dev, return response; } -static int rf2xx_start(struct device *dev) +static int rf2xx_start(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; struct rf2xx_context *ctx = dev->driver_data; @@ -546,7 +546,7 @@ static int rf2xx_start(struct device *dev) return 0; } -static int rf2xx_stop(struct device *dev) +static int rf2xx_stop(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; struct rf2xx_context *ctx = dev->driver_data; @@ -559,7 +559,8 @@ static int rf2xx_stop(struct device *dev) return 0; } -int rf2xx_configure(struct device *dev, enum ieee802154_config_type type, +int rf2xx_configure(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config) { ARG_UNUSED(dev); @@ -569,7 +570,7 @@ int rf2xx_configure(struct device *dev, enum ieee802154_config_type type, return 0; } -static int power_on_and_setup(struct device *dev) +static int power_on_and_setup(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; struct rf2xx_context *ctx = dev->driver_data; @@ -639,7 +640,7 @@ static int power_on_and_setup(struct device *dev) return 0; } -static inline int configure_gpios(struct device *dev) +static inline int configure_gpios(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; struct rf2xx_context *ctx = dev->driver_data; @@ -699,7 +700,7 @@ static inline int configure_gpios(struct device *dev) return 0; } -static inline int configure_spi(struct device *dev) +static inline int configure_spi(const struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; const struct rf2xx_config *conf = dev->config_info; @@ -741,7 +742,7 @@ static inline int configure_spi(struct device *dev) return 0; } -static int rf2xx_init(struct device *dev) +static int rf2xx_init(const struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; const struct rf2xx_config *conf = dev->config_info; @@ -784,7 +785,7 @@ static int rf2xx_init(struct device *dev) static void rf2xx_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct rf2xx_context *ctx = dev->driver_data; u8_t *mac = get_mac(dev); diff --git a/drivers/ieee802154/ieee802154_rf2xx.h b/drivers/ieee802154/ieee802154_rf2xx.h index 78d1f8534f11..1589e6487320 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.h +++ b/drivers/ieee802154/ieee802154_rf2xx.h @@ -103,13 +103,13 @@ struct rf2xx_config { struct rf2xx_context { struct net_if *iface; - struct device *irq_gpio; - struct device *reset_gpio; - struct device *slptr_gpio; - struct device *dig2_gpio; - struct device *clkm_gpio; + const struct device *irq_gpio; + const struct device *reset_gpio; + const struct device *slptr_gpio; + const struct device *dig2_gpio; + const struct device *clkm_gpio; - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; struct spi_cs_control spi_cs; diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.c b/drivers/ieee802154/ieee802154_rf2xx_iface.c index 4c9969f0ac32..de3c2245cac0 100644 --- a/drivers/ieee802154/ieee802154_rf2xx_iface.c +++ b/drivers/ieee802154/ieee802154_rf2xx_iface.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include "ieee802154_rf2xx_regs.h" #include "ieee802154_rf2xx_iface.h" -void rf2xx_iface_phy_rst(struct device *dev) +void rf2xx_iface_phy_rst(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; const struct rf2xx_context *ctx = dev->driver_data; @@ -39,7 +39,7 @@ void rf2xx_iface_phy_rst(struct device *dev) k_busy_wait(10); gpio_pin_set(ctx->reset_gpio, conf->reset.pin, 0); } -void rf2xx_iface_phy_tx_start(struct device *dev) +void rf2xx_iface_phy_tx_start(const struct device *dev) { const struct rf2xx_config *conf = dev->config_info; const struct rf2xx_context *ctx = dev->driver_data; @@ -52,7 +52,7 @@ void rf2xx_iface_phy_tx_start(struct device *dev) gpio_pin_set(ctx->slptr_gpio, conf->slptr.pin, 0); } -u8_t rf2xx_iface_reg_read(struct device *dev, +u8_t rf2xx_iface_reg_read(const struct device *dev, u8_t addr) { const struct rf2xx_context *ctx = dev->driver_data; @@ -95,7 +95,7 @@ u8_t rf2xx_iface_reg_read(struct device *dev, return regval; } -void rf2xx_iface_reg_write(struct device *dev, +void rf2xx_iface_reg_write(const struct device *dev, u8_t addr, u8_t data) { @@ -136,7 +136,7 @@ void rf2xx_iface_reg_write(struct device *dev, (addr & ~(RF2XX_RF_CMD_REG_W)), status, data); } -u8_t rf2xx_iface_bit_read(struct device *dev, +u8_t rf2xx_iface_bit_read(const struct device *dev, u8_t addr, u8_t mask, u8_t pos) @@ -150,7 +150,7 @@ u8_t rf2xx_iface_bit_read(struct device *dev, return ret; } -void rf2xx_iface_bit_write(struct device *dev, +void rf2xx_iface_bit_write(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t pos, @@ -166,7 +166,7 @@ void rf2xx_iface_bit_write(struct device *dev, rf2xx_iface_reg_write(dev, reg_addr, new_value); } -void rf2xx_iface_frame_read(struct device *dev, +void rf2xx_iface_frame_read(const struct device *dev, u8_t *data, u8_t length) { @@ -198,7 +198,7 @@ void rf2xx_iface_frame_read(struct device *dev, LOG_HEXDUMP_DBG(data + RX2XX_FRAME_HEADER_SIZE, length, "payload"); } -void rf2xx_iface_frame_write(struct device *dev, +void rf2xx_iface_frame_write(const struct device *dev, u8_t *data, u8_t length) { @@ -249,7 +249,7 @@ void rf2xx_iface_frame_write(struct device *dev, LOG_HEXDUMP_DBG(data, length, "payload"); } -void rf2xx_iface_sram_read(struct device *dev, +void rf2xx_iface_sram_read(const struct device *dev, u8_t address, u8_t *data, u8_t length) diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.h b/drivers/ieee802154/ieee802154_rf2xx_iface.h index 17e6a76062af..beb3a86eaa38 100644 --- a/drivers/ieee802154/ieee802154_rf2xx_iface.h +++ b/drivers/ieee802154/ieee802154_rf2xx_iface.h @@ -14,14 +14,14 @@ * * @param[in] dev Transceiver device instance */ -void rf2xx_iface_phy_rst(struct device *dev); +void rf2xx_iface_phy_rst(const struct device *dev); /** * @brief Start TX transmition * * @param[in] dev Transceiver device instance */ -void rf2xx_iface_phy_tx_start(struct device *dev); +void rf2xx_iface_phy_tx_start(const struct device *dev); /** * @brief Reads current value from a transceiver register @@ -34,7 +34,7 @@ void rf2xx_iface_phy_tx_start(struct device *dev); * * @return value of the register read */ -u8_t rf2xx_iface_reg_read(struct device *dev, +u8_t rf2xx_iface_reg_read(const struct device *dev, u8_t addr); /** @@ -47,7 +47,7 @@ u8_t rf2xx_iface_reg_read(struct device *dev, * @param[in] data Data to be written to trx register * */ -void rf2xx_iface_reg_write(struct device *dev, +void rf2xx_iface_reg_write(const struct device *dev, u8_t addr, u8_t data); @@ -61,7 +61,7 @@ void rf2xx_iface_reg_write(struct device *dev, * * @return value of the read bit(s) */ -u8_t rf2xx_iface_bit_read(struct device *dev, +u8_t rf2xx_iface_bit_read(const struct device *dev, u8_t addr, u8_t mask, u8_t pos); @@ -75,7 +75,7 @@ u8_t rf2xx_iface_bit_read(struct device *dev, * @param[in] pos Bit position of the subregister * @param[out] new_value Data, which is muxed into the register */ -void rf2xx_iface_bit_write(struct device *dev, +void rf2xx_iface_bit_write(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t pos, @@ -90,7 +90,7 @@ void rf2xx_iface_bit_write(struct device *dev, * @param[out] data Pointer to the location to store frame * @param[in] length Number of bytes to be read from the frame */ -void rf2xx_iface_frame_read(struct device *dev, +void rf2xx_iface_frame_read(const struct device *dev, u8_t *data, u8_t length); @@ -103,7 +103,7 @@ void rf2xx_iface_frame_read(struct device *dev, * @param[in] data Pointer to data to be written into frame buffer * @param[in] length Number of bytes to be written into frame buffer */ -void rf2xx_iface_frame_write(struct device *dev, +void rf2xx_iface_frame_write(const struct device *dev, u8_t *data, u8_t length); @@ -117,7 +117,7 @@ void rf2xx_iface_frame_write(struct device *dev, * @param[out] data Pointer to the location to store data * @param[in] length Number of bytes to be read from the sram space */ -void rf2xx_iface_sram_read(struct device *dev, +void rf2xx_iface_sram_read(const struct device *dev, u8_t address, u8_t *data, u8_t length); diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c index 14da9e13db8b..1a832634576e 100644 --- a/drivers/ieee802154/ieee802154_uart_pipe.c +++ b/drivers/ieee802154/ieee802154_uart_pipe.c @@ -46,7 +46,7 @@ static u8_t dev_short_addr[SHORT_ADDRESS_SIZE]; /* Device Short Address */ static u8_t dev_ext_addr[EXTENDED_ADDRESS_SIZE]; /* Device Extended Address */ /** Singleton device used in uart pipe callback */ -static struct device *upipe_dev; +static const struct device *upipe_dev; #if defined(CONFIG_IEEE802154_UPIPE_HW_FILTER) @@ -176,14 +176,14 @@ static u8_t *upipe_rx(u8_t *buf, size_t *off) return buf; } -static enum ieee802154_hw_caps upipe_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps upipe_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ | IEEE802154_HW_FILTER; } -static int upipe_cca(struct device *dev) +static int upipe_cca(const struct device *dev) { struct upipe_context *upipe = dev->driver_data; @@ -194,7 +194,7 @@ static int upipe_cca(struct device *dev) return 0; } -static int upipe_set_channel(struct device *dev, u16_t channel) +static int upipe_set_channel(const struct device *dev, u16_t channel) { ARG_UNUSED(dev); ARG_UNUSED(channel); @@ -202,7 +202,7 @@ static int upipe_set_channel(struct device *dev, u16_t channel) return 0; } -static int upipe_set_pan_id(struct device *dev, u16_t pan_id) +static int upipe_set_pan_id(const struct device *dev, u16_t pan_id) { u8_t pan_id_le[2]; @@ -214,7 +214,7 @@ static int upipe_set_pan_id(struct device *dev, u16_t pan_id) return 0; } -static int upipe_set_short_addr(struct device *dev, u16_t short_addr) +static int upipe_set_short_addr(const struct device *dev, u16_t short_addr) { u8_t short_addr_le[2]; @@ -226,7 +226,8 @@ static int upipe_set_short_addr(struct device *dev, u16_t short_addr) return 0; } -static int upipe_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) +static int upipe_set_ieee_addr(const struct device *dev, + const u8_t *ieee_addr) { ARG_UNUSED(dev); @@ -235,7 +236,7 @@ static int upipe_set_ieee_addr(struct device *dev, const u8_t *ieee_addr) return 0; } -static int upipe_filter(struct device *dev, +static int upipe_filter(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) @@ -257,7 +258,7 @@ static int upipe_filter(struct device *dev, return -ENOTSUP; } -static int upipe_set_txpower(struct device *dev, s16_t dbm) +static int upipe_set_txpower(const struct device *dev, s16_t dbm) { ARG_UNUSED(dev); ARG_UNUSED(dbm); @@ -265,7 +266,7 @@ static int upipe_set_txpower(struct device *dev, s16_t dbm) return 0; } -static int upipe_tx(struct device *dev, +static int upipe_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -299,7 +300,7 @@ static int upipe_tx(struct device *dev, return 0; } -static int upipe_start(struct device *dev) +static int upipe_start(const struct device *dev) { struct upipe_context *upipe = dev->driver_data; @@ -312,7 +313,7 @@ static int upipe_start(struct device *dev) return 0; } -static int upipe_stop(struct device *dev) +static int upipe_stop(const struct device *dev) { struct upipe_context *upipe = dev->driver_data; @@ -325,7 +326,7 @@ static int upipe_stop(struct device *dev) return 0; } -static int upipe_init(struct device *dev) +static int upipe_init(const struct device *dev) { struct upipe_context *upipe = dev->driver_data; @@ -338,7 +339,7 @@ static int upipe_init(struct device *dev) return 0; } -static inline u8_t *get_mac(struct device *dev) +static inline u8_t *get_mac(const struct device *dev) { struct upipe_context *upipe = dev->driver_data; @@ -362,7 +363,7 @@ static inline u8_t *get_mac(struct device *dev) static void upipe_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct upipe_context *upipe = dev->driver_data; u8_t *mac = get_mac(dev); diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c index 1086c4dda769..aa35da55b57a 100644 --- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c +++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c @@ -61,7 +61,7 @@ static struct arc_v2_irq_unit_ctx ctx; * * @return 0 for success */ -static int arc_v2_irq_unit_init(struct device *unused) +static int arc_v2_irq_unit_init(const struct device *unused) { ARG_UNUSED(unused); int irq; /* the interrupt index */ @@ -98,7 +98,7 @@ static int arc_v2_irq_unit_init(struct device *unused) * * @return 0 for success */ -static int arc_v2_irq_unit_suspend(struct device *dev) +static int arc_v2_irq_unit_suspend(const struct device *dev) { u8_t irq; @@ -134,7 +134,7 @@ static int arc_v2_irq_unit_suspend(struct device *dev) * * @return 0 for success */ -static int arc_v2_irq_unit_resume(struct device *dev) +static int arc_v2_irq_unit_resume(const struct device *dev) { u8_t irq; @@ -177,7 +177,7 @@ static int arc_v2_irq_unit_resume(struct device *dev) * * @return the power state of interrupt unit */ -static int arc_v2_irq_unit_get_state(struct device *dev) +static int arc_v2_irq_unit_get_state(const struct device *dev) { ARG_UNUSED(dev); @@ -192,8 +192,9 @@ static int arc_v2_irq_unit_get_state(struct device *dev) * * @return operation result */ -static int arc_v2_irq_unit_device_ctrl(struct device *device, - u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) +static int arc_v2_irq_unit_device_ctrl(const struct device *device, + u32_t ctrl_command, void *context, + device_pm_cb cb, void *arg) { int ret = 0; unsigned int key = arch_irq_lock(); diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c index e03d97baa2b9..68467a61c73e 100644 --- a/drivers/interrupt_controller/intc_cavs.c +++ b/drivers/interrupt_controller/intc_cavs.c @@ -50,7 +50,7 @@ static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(u32_t intr_status, static void cavs_ictl_isr(void *arg) { - struct device *port = (struct device *)arg; + const struct device *port = (const struct device *)arg; struct cavs_ictl_runtime *context = port->driver_data; const struct cavs_ictl_config *config = port->config_info; @@ -62,7 +62,8 @@ static void cavs_ictl_isr(void *arg) config->isr_table_offset); } -static inline void cavs_ictl_irq_enable(struct device *dev, unsigned int irq) +static inline void cavs_ictl_irq_enable(const struct device *dev, + unsigned int irq) { struct cavs_ictl_runtime *context = dev->driver_data; @@ -72,7 +73,8 @@ static inline void cavs_ictl_irq_enable(struct device *dev, unsigned int irq) regs->enable_il = (1 << irq); } -static inline void cavs_ictl_irq_disable(struct device *dev, unsigned int irq) +static inline void cavs_ictl_irq_disable(const struct device *dev, + unsigned int irq) { struct cavs_ictl_runtime *context = dev->driver_data; @@ -82,7 +84,7 @@ static inline void cavs_ictl_irq_disable(struct device *dev, unsigned int irq) regs->disable_il = (1 << irq); } -static inline unsigned int cavs_ictl_irq_get_state(struct device *dev) +static inline unsigned int cavs_ictl_irq_get_state(const struct device *dev) { struct cavs_ictl_runtime *context = dev->driver_data; @@ -100,7 +102,8 @@ static inline unsigned int cavs_ictl_irq_get_state(struct device *dev) return 1; } -static int cavs_ictl_irq_get_line_state(struct device *dev, unsigned int irq) +static int cavs_ictl_irq_get_line_state(const struct device *dev, + unsigned int irq) { struct cavs_ictl_runtime *context = dev->driver_data; @@ -122,12 +125,12 @@ static const struct irq_next_level_api cavs_apis = { }; #define CAVS_ICTL_INIT(n) \ - static int cavs_ictl_##n##_initialize(struct device *port) \ + static int cavs_ictl_##n##_initialize(const struct device *port) \ { \ return 0; \ } \ \ - static void cavs_config_##n##_irq(struct device *port); \ + static void cavs_config_##n##_irq(const struct device *port); \ \ static const struct cavs_ictl_config cavs_config_##n = { \ .irq_num = DT_INST_IRQN(n), \ @@ -145,7 +148,7 @@ static const struct irq_next_level_api cavs_apis = { PRE_KERNEL_1, \ CONFIG_CAVS_ICTL_INIT_PRIORITY, &cavs_apis);\ \ - static void cavs_config_##n##_irq(struct device *port) \ + static void cavs_config_##n##_irq(const struct device *port) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), \ cavs_ictl_isr, DEVICE_GET(cavs_ictl_##n), \ diff --git a/drivers/interrupt_controller/intc_cavs.h b/drivers/interrupt_controller/intc_cavs.h index f6916de9b332..73820aad6e76 100644 --- a/drivers/interrupt_controller/intc_cavs.h +++ b/drivers/interrupt_controller/intc_cavs.h @@ -13,7 +13,7 @@ extern "C" { #endif -typedef void (*cavs_ictl_config_irq_t)(struct device *port); +typedef void (*cavs_ictl_config_irq_t)(const struct device *port); struct cavs_ictl_config { u32_t irq_num; diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c index 240e06c03a45..155566071fbe 100644 --- a/drivers/interrupt_controller/intc_dw.c +++ b/drivers/interrupt_controller/intc_dw.c @@ -33,7 +33,7 @@ static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(u32_t intr_status, } } -static int dw_ictl_initialize(struct device *dev) +static int dw_ictl_initialize(const struct device *dev) { const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = @@ -48,7 +48,7 @@ static int dw_ictl_initialize(struct device *dev) static void dw_ictl_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -62,7 +62,8 @@ static void dw_ictl_isr(void *arg) } } -static inline void dw_ictl_intr_enable(struct device *dev, unsigned int irq) +static inline void dw_ictl_intr_enable(const struct device *dev, + unsigned int irq) { const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = @@ -75,7 +76,8 @@ static inline void dw_ictl_intr_enable(struct device *dev, unsigned int irq) } } -static inline void dw_ictl_intr_disable(struct device *dev, unsigned int irq) +static inline void dw_ictl_intr_disable(const struct device *dev, + unsigned int irq) { const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = @@ -88,7 +90,7 @@ static inline void dw_ictl_intr_disable(struct device *dev, unsigned int irq) } } -static inline unsigned int dw_ictl_intr_get_state(struct device *dev) +static inline unsigned int dw_ictl_intr_get_state(const struct device *dev) { const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = @@ -106,7 +108,8 @@ static inline unsigned int dw_ictl_intr_get_state(struct device *dev) return 0; } -static int dw_ictl_intr_get_line_state(struct device *dev, unsigned int irq) +static int dw_ictl_intr_get_line_state(const struct device *dev, + unsigned int irq) { const struct dw_ictl_config *config = dev->config_info; volatile struct dw_ictl_registers * const regs = @@ -125,7 +128,7 @@ static int dw_ictl_intr_get_line_state(struct device *dev, unsigned int irq) return 0; } -static void dw_ictl_config_irq(struct device *dev); +static void dw_ictl_config_irq(const struct device *dev); static const struct dw_ictl_config dw_config = { .base_addr = DT_INST_REG_ADDR(0), @@ -145,7 +148,7 @@ DEVICE_AND_API_INIT(dw_ictl, DT_INST_LABEL(0), dw_ictl_initialize, NULL, &dw_config, PRE_KERNEL_1, CONFIG_DW_ICTL_INIT_PRIORITY, &dw_ictl_apis); -static void dw_ictl_config_irq(struct device *port) +static void dw_ictl_config_irq(const struct device *port) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/interrupt_controller/intc_dw.h b/drivers/interrupt_controller/intc_dw.h index c21fe24bf0cd..abe1bc478547 100644 --- a/drivers/interrupt_controller/intc_dw.h +++ b/drivers/interrupt_controller/intc_dw.h @@ -13,7 +13,7 @@ extern "C" { #endif -typedef void (*dw_ictl_config_irq_t)(struct device *dev); +typedef void (*dw_ictl_config_irq_t)(const struct device *dev); struct dw_ictl_config { u32_t base_addr; diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c index 88f1b2430414..a2a8a63ab017 100644 --- a/drivers/interrupt_controller/intc_exti_stm32.c +++ b/drivers/interrupt_controller/intc_exti_stm32.c @@ -216,7 +216,7 @@ void stm32_exti_trigger(int line, int trigger) */ static void __stm32_exti_isr(int min, int max, void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct stm32_exti_data *data = dev->driver_data; int line; @@ -382,12 +382,12 @@ static inline void __stm32_exti_isr_23(void *arg) #endif #endif /* CONFIG_SOC_SERIES_STM32F0X */ -static void __stm32_exti_connect_irqs(struct device *dev); +static void __stm32_exti_connect_irqs(const struct device *dev); /** * @brief initialize EXTI device driver */ -static int stm32_exti_init(struct device *dev) +static int stm32_exti_init(const struct device *dev) { __stm32_exti_connect_irqs(dev); @@ -404,7 +404,7 @@ DEVICE_INIT(exti_stm32, STM32_EXTI_NAME, stm32_exti_init, */ int stm32_exti_set_callback(int line, stm32_exti_callback_t cb, void *arg) { - struct device *dev = DEVICE_GET(exti_stm32); + const struct device *dev = DEVICE_GET(exti_stm32); struct stm32_exti_data *data = dev->driver_data; if (data->cb[line].cb) { @@ -419,7 +419,7 @@ int stm32_exti_set_callback(int line, stm32_exti_callback_t cb, void *arg) void stm32_exti_unset_callback(int line) { - struct device *dev = DEVICE_GET(exti_stm32); + const struct device *dev = DEVICE_GET(exti_stm32); struct stm32_exti_data *data = dev->driver_data; data->cb[line].cb = NULL; @@ -429,7 +429,7 @@ void stm32_exti_unset_callback(int line) /** * @brief connect all interrupts */ -static void __stm32_exti_connect_irqs(struct device *dev) +static void __stm32_exti_connect_irqs(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c index 2e0e21389e1c..400ebd32fa7d 100644 --- a/drivers/interrupt_controller/intc_ioapic.c +++ b/drivers/interrupt_controller/intc_ioapic.c @@ -118,7 +118,7 @@ static void IoApicRedUpdateLo(unsigned int irq, u32_t value, * * @return N/A */ -int ioapic_init(struct device *unused) +int ioapic_init(const struct device *unused) { ARG_UNUSED(unused); #ifdef CONFIG_IOAPIC_MASK_RTE @@ -232,7 +232,7 @@ u32_t restore_flags(unsigned int irq) } -int ioapic_suspend(struct device *port) +int ioapic_suspend(const struct device *port) { int irq; u32_t rte_lo; @@ -254,7 +254,7 @@ int ioapic_suspend(struct device *port) return 0; } -int ioapic_resume_from_suspend(struct device *port) +int ioapic_resume_from_suspend(const struct device *port) { int irq; u32_t flags; @@ -288,7 +288,7 @@ int ioapic_resume_from_suspend(struct device *port) * Implements the driver control management functionality * the *context may include IN data or/and OUT data */ -static int ioapic_device_ctrl(struct device *device, u32_t ctrl_command, +static int ioapic_device_ctrl(const struct device *device, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c index 32c43d0aa248..e7f1ae01f004 100644 --- a/drivers/interrupt_controller/intc_loapic.c +++ b/drivers/interrupt_controller/intc_loapic.c @@ -173,7 +173,7 @@ void z_loapic_enable(unsigned char cpu_number) * kernel runs through its device initializations, so this is unneeded. */ -static int loapic_init(struct device *unused) +static int loapic_init(const struct device *unused) { ARG_UNUSED(unused); return 0; @@ -320,7 +320,7 @@ int z_irq_controller_isr_vector_get(void) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int loapic_suspend(struct device *port) +static int loapic_suspend(const struct device *port) { volatile u32_t lvt; /* local vector table entry value */ int loapic_irq; @@ -348,7 +348,7 @@ static int loapic_suspend(struct device *port) return 0; } -int loapic_resume(struct device *port) +int loapic_resume(const struct device *port) { int loapic_irq; @@ -381,7 +381,7 @@ int loapic_resume(struct device *port) * Implements the driver control management functionality * the *context may include IN data or/and OUT data */ -static int loapic_device_ctrl(struct device *port, u32_t ctrl_command, +static int loapic_device_ctrl(const struct device *port, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c index bf5f59abd668..e077ff263ca4 100644 --- a/drivers/interrupt_controller/intc_plic.c +++ b/drivers/interrupt_controller/intc_plic.c @@ -178,7 +178,7 @@ static void plic_irq_handler(void *arg) * @brief Initialize the Platform Level Interrupt Controller * @return N/A */ -static int plic_init(struct device *dev) +static int plic_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c index 23c0fcd8090a..de4c3317e756 100644 --- a/drivers/interrupt_controller/intc_rv32m1_intmux.c +++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c @@ -56,7 +56,7 @@ DEVICE_DECLARE(intmux); * API */ -static void rv32m1_intmux_irq_enable(struct device *dev, u32_t irq) +static void rv32m1_intmux_irq_enable(const struct device *dev, u32_t irq) { INTMUX_Type *regs = DEV_REGS(dev); u32_t channel = rv32m1_intmux_channel(irq); @@ -65,7 +65,7 @@ static void rv32m1_intmux_irq_enable(struct device *dev, u32_t irq) regs->CHANNEL[channel].CHn_IER_31_0 |= BIT(line); } -static void rv32m1_intmux_irq_disable(struct device *dev, u32_t irq) +static void rv32m1_intmux_irq_disable(const struct device *dev, u32_t irq) { INTMUX_Type *regs = DEV_REGS(dev); u32_t channel = rv32m1_intmux_channel(irq); @@ -74,7 +74,7 @@ static void rv32m1_intmux_irq_disable(struct device *dev, u32_t irq) regs->CHANNEL[channel].CHn_IER_31_0 &= ~BIT(line); } -static u32_t rv32m1_intmux_get_state(struct device *dev) +static u32_t rv32m1_intmux_get_state(const struct device *dev) { INTMUX_Type *regs = DEV_REGS(dev); size_t i; @@ -88,7 +88,8 @@ static u32_t rv32m1_intmux_get_state(struct device *dev) return 0; } -static int rv32m1_intmux_get_line_state(struct device *dev, unsigned int irq) +static int rv32m1_intmux_get_line_state(const struct device *dev, + unsigned int irq) { INTMUX_Type *regs = DEV_REGS(dev); u32_t channel = rv32m1_intmux_channel(irq); @@ -110,7 +111,7 @@ static int rv32m1_intmux_get_line_state(struct device *dev, unsigned int irq) static void rv32m1_intmux_isr(void *arg) { - struct device *dev = DEVICE_GET(intmux); + const struct device *dev = DEVICE_GET(intmux); INTMUX_Type *regs = DEV_REGS(dev); u32_t channel = POINTER_TO_UINT(arg); u32_t line = (regs->CHANNEL[channel].CHn_VEC >> 2); @@ -151,11 +152,11 @@ static const struct rv32m1_intmux_config rv32m1_intmux_cfg = { .isr_base = &_sw_isr_table[CONFIG_2ND_LVL_ISR_TBL_OFFSET], }; -static int rv32m1_intmux_init(struct device *dev) +static int rv32m1_intmux_init(const struct device *dev) { const struct rv32m1_intmux_config *config = DEV_CFG(dev); INTMUX_Type *regs = DEV_REGS(dev); - struct device *clock_dev = device_get_binding(config->clock_name); + const struct device *clock_dev = device_get_binding(config->clock_name); size_t i; if (!clock_dev) { diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c index 204441787ca6..3c963dce2226 100644 --- a/drivers/interrupt_controller/intc_sam0_eic.c +++ b/drivers/interrupt_controller/intc_sam0_eic.c @@ -55,7 +55,7 @@ static inline void set_eic_enable(bool on) static void sam0_eic_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct sam0_eic_data *const dev_data = DEV_DATA(dev); u16_t bits = EIC->INTFLAG.reg; u32_t line_index; @@ -102,7 +102,7 @@ static void sam0_eic_isr(void *arg) int sam0_eic_acquire(int port, int pin, enum sam0_eic_trigger trigger, bool filter, sam0_eic_callback_t cb, void *data) { - struct device *dev = DEVICE_GET(sam0_eic); + const struct device *dev = DEVICE_GET(sam0_eic); struct sam0_eic_data *dev_data = dev->driver_data; struct sam0_eic_port_data *port_data; struct sam0_eic_line_assignment *line_assignment; @@ -192,7 +192,7 @@ int sam0_eic_acquire(int port, int pin, enum sam0_eic_trigger trigger, static bool sam0_eic_check_ownership(int port, int pin, int line_index) { - struct device *dev = DEVICE_GET(sam0_eic); + const struct device *dev = DEVICE_GET(sam0_eic); struct sam0_eic_data *dev_data = dev->driver_data; struct sam0_eic_line_assignment *line_assignment = &dev_data->lines[line_index]; @@ -211,7 +211,7 @@ static bool sam0_eic_check_ownership(int port, int pin, int line_index) int sam0_eic_release(int port, int pin) { - struct device *dev = DEVICE_GET(sam0_eic); + const struct device *dev = DEVICE_GET(sam0_eic); struct sam0_eic_data *dev_data = dev->driver_data; u32_t mask; int line_index; @@ -302,7 +302,7 @@ int sam0_eic_disable_interrupt(int port, int pin) u32_t sam0_eic_interrupt_pending(int port) { - struct device *dev = DEVICE_GET(sam0_eic); + const struct device *dev = DEVICE_GET(sam0_eic); struct sam0_eic_data *dev_data = dev->driver_data; struct sam0_eic_line_assignment *line_assignment; u32_t set = EIC->INTFLAG.reg; @@ -338,7 +338,7 @@ u32_t sam0_eic_interrupt_pending(int port) irq_enable(DT_INST_IRQ_BY_IDX(0, n, irq)); \ } while (0) -static int sam0_eic_init(struct device *dev) +static int sam0_eic_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c index 87c1b99d6b8c..c3f0b9d0727e 100644 --- a/drivers/interrupt_controller/intc_shared_irq.c +++ b/drivers/interrupt_controller/intc_shared_irq.c @@ -24,8 +24,8 @@ * @param isr_func Pointer to the ISR function for the device. * @param isr_dev Pointer to the device that will service the interrupt. */ -static int isr_register(struct device *dev, isr_t isr_func, - struct device *isr_dev) +static int isr_register(const struct device *dev, isr_t isr_func, + const struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; const struct shared_irq_config *config = dev->config_info; @@ -46,7 +46,8 @@ static int isr_register(struct device *dev, isr_t isr_func, * @param dev Pointer to device structure for SHARED_IRQ driver instance. * @param isr_dev Pointer to the device that will service the interrupt. */ -static inline int enable(struct device *dev, struct device *isr_dev) +static inline int enable(const struct device *dev, + const struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; const struct shared_irq_config *config = dev->config_info; @@ -78,7 +79,8 @@ static int last_enabled_isr(struct shared_irq_runtime *clients, int count) * @param dev Pointer to device structure for SHARED_IRQ driver instance. * @param isr_dev Pointer to the device that will service the interrupt. */ -static inline int disable(struct device *dev, struct device *isr_dev) +static inline int disable(const struct device *dev, + const struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; const struct shared_irq_config *config = dev->config_info; @@ -96,7 +98,7 @@ static inline int disable(struct device *dev, struct device *isr_dev) return -EIO; } -void shared_irq_isr(struct device *dev) +void shared_irq_isr(const struct device *dev) { struct shared_irq_runtime *clients = dev->driver_data; const struct shared_irq_config *config = dev->config_info; @@ -116,7 +118,7 @@ static const struct shared_irq_driver_api api_funcs = { }; -int shared_irq_initialize(struct device *dev) +int shared_irq_initialize(const struct device *dev) { const struct shared_irq_config *config = dev->config_info; config->config(); diff --git a/drivers/interrupt_controller/intc_swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c index 60c3e5747e2e..dcf1018727de 100644 --- a/drivers/interrupt_controller/intc_swerv_pic.c +++ b/drivers/interrupt_controller/intc_swerv_pic.c @@ -141,7 +141,7 @@ static void swerv_pic_irq_handler(void *arg) swerv_pic_write(SWERV_PIC_meigwclr(irq), 0); } -static int swerv_pic_init(struct device *dev) +static int swerv_pic_init(const struct device *dev) { ARG_UNUSED(dev); int i; diff --git a/drivers/interrupt_controller/intc_vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c index 93b24ee799ae..554516820e70 100644 --- a/drivers/interrupt_controller/intc_vexriscv_litex.c +++ b/drivers/interrupt_controller/intc_vexriscv_litex.c @@ -100,7 +100,7 @@ int arch_irq_is_enabled(unsigned int irq) return vexriscv_litex_irq_getmask() & (1 << irq); } -static int vexriscv_litex_irq_init(struct device *dev) +static int vexriscv_litex_irq_init(const struct device *dev) { ARG_UNUSED(dev); __asm__ volatile ("csrrs x0, mie, %0" diff --git a/drivers/ipm/ipm_cavs_idc.c b/drivers/ipm/ipm_cavs_idc.c index ef86c135d2ed..449cbcf196b1 100644 --- a/drivers/ipm/ipm_cavs_idc.c +++ b/drivers/ipm/ipm_cavs_idc.c @@ -26,10 +26,10 @@ struct cavs_idc_data { void *ctx; }; -static struct device DEVICE_NAME_GET(cavs_idc); +DEVICE_DECLARE(cavs_idc); static struct cavs_idc_data cavs_idc_device_data; -static void cavs_idc_isr(struct device *dev) +static void cavs_idc_isr(const struct device *dev) { struct cavs_idc_data *drv_data = dev->driver_data; @@ -84,7 +84,7 @@ static void cavs_idc_isr(struct device *dev) #endif } -static int cavs_idc_send(struct device *dev, int wait, u32_t id, +static int cavs_idc_send(const struct device *dev, int wait, u32_t id, const void *data, int size) { u32_t curr_cpu_id = arch_curr_cpu()->id; @@ -134,7 +134,7 @@ static int cavs_idc_send(struct device *dev, int wait, u32_t id, return 0; } -static int cavs_idc_max_data_size_get(struct device *dev) +static int cavs_idc_max_data_size_get(const struct device *dev) { ARG_UNUSED(dev); @@ -149,14 +149,15 @@ static int cavs_idc_max_data_size_get(struct device *dev) return 0; } -static u32_t cavs_idc_max_id_val_get(struct device *dev) +static u32_t cavs_idc_max_id_val_get(const struct device *dev) { ARG_UNUSED(dev); return IPM_CAVS_IDC_ID_MASK; } -static void cavs_idc_register_callback(struct device *dev, ipm_callback_t cb, +static void cavs_idc_register_callback(const struct device *dev, + ipm_callback_t cb, void *context) { struct cavs_idc_data *drv_data = dev->driver_data; @@ -165,7 +166,7 @@ static void cavs_idc_register_callback(struct device *dev, ipm_callback_t cb, drv_data->ctx = context; } -static int cavs_idc_set_enabled(struct device *dev, int enable) +static int cavs_idc_set_enabled(const struct device *dev, int enable) { int i, j; u32_t mask; @@ -201,7 +202,7 @@ static int cavs_idc_set_enabled(struct device *dev, int enable) return 0; } -static int cavs_idc_init(struct device *dev) +static int cavs_idc_init(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), @@ -227,7 +228,7 @@ DEVICE_AND_API_INIT(IPM_CAVS_IDC_DEV_NAME, &cavs_idc_driver_api); #ifdef CONFIG_SCHED_IPI_SUPPORTED -static int cavs_idc_smp_init(struct device *dev) +static int cavs_idc_smp_init(const struct device *dev) { /* Enable IDC for scheduler IPI */ cavs_idc_set_enabled(dev, 1); diff --git a/drivers/ipm/ipm_handlers.c b/drivers/ipm/ipm_handlers.c index 3ce27ce079b9..62572d37677e 100644 --- a/drivers/ipm/ipm_handlers.c +++ b/drivers/ipm/ipm_handlers.c @@ -7,33 +7,34 @@ #include #include -static inline int z_vrfy_ipm_send(struct device *dev, int wait, u32_t id, - const void *data, int size) +static inline int z_vrfy_ipm_send(const struct device *dev, int wait, + u32_t id, + const void *data, int size) { Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, send)); Z_OOPS(Z_SYSCALL_MEMORY_READ(data, size)); - return z_impl_ipm_send((struct device *)dev, wait, id, - (const void *)data, size); + return z_impl_ipm_send((const struct device *)dev, wait, id, + (const void *)data, size); } #include -static inline int z_vrfy_ipm_max_data_size_get(struct device *dev) +static inline int z_vrfy_ipm_max_data_size_get(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, max_data_size_get)); - return z_impl_max_data_size_get((struct device *)dev); + return z_impl_max_data_size_get((const struct device *)dev); } #include -static inline u32_t z_vrfy_ipm_max_id_val_get(struct device *dev) +static inline u32_t z_vrfy_ipm_max_id_val_get(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, max_id_val_get)); - return z_impl_ipm_max_id_val_get((struct device *)dev); + return z_impl_ipm_max_id_val_get((const struct device *)dev); } #include -static inline int z_vrfy_ipm_set_enabled(struct device *dev, int enable) +static inline int z_vrfy_ipm_set_enabled(const struct device *dev, int enable) { Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, set_enabled)); - return z_impl_ipm_set_enabled((struct device *)dev, enable); + return z_impl_ipm_set_enabled((const struct device *)dev, enable); } #include diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c index ed50f552d09b..debe01fa5fa5 100644 --- a/drivers/ipm/ipm_imx.c +++ b/drivers/ipm/ipm_imx.c @@ -23,7 +23,7 @@ struct imx_mu_config { MU_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct imx_mu_data { @@ -33,7 +33,7 @@ struct imx_mu_data { static void imx_mu_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct imx_mu_config *config = dev->config_info; MU_Type *base = MU(config); struct imx_mu_data *data = dev->driver_data; @@ -87,7 +87,7 @@ static void imx_mu_isr(void *arg) #endif } -static int imx_mu_ipm_send(struct device *dev, int wait, u32_t id, +static int imx_mu_ipm_send(const struct device *dev, int wait, u32_t id, const void *data, int size) { const struct imx_mu_config *config = dev->config_info; @@ -124,21 +124,21 @@ static int imx_mu_ipm_send(struct device *dev, int wait, u32_t id, return 0; } -static int imx_mu_ipm_max_data_size_get(struct device *dev) +static int imx_mu_ipm_max_data_size_get(const struct device *dev) { ARG_UNUSED(dev); return CONFIG_IPM_IMX_MAX_DATA_SIZE; } -static u32_t imx_mu_ipm_max_id_val_get(struct device *dev) +static u32_t imx_mu_ipm_max_id_val_get(const struct device *dev) { ARG_UNUSED(dev); return CONFIG_IPM_IMX_MAX_ID_VAL; } -static void imx_mu_ipm_register_callback(struct device *dev, +static void imx_mu_ipm_register_callback(const struct device *dev, ipm_callback_t cb, void *context) { @@ -148,7 +148,7 @@ static void imx_mu_ipm_register_callback(struct device *dev, driver_data->callback_ctx = context; } -static int imx_mu_ipm_set_enabled(struct device *dev, int enable) +static int imx_mu_ipm_set_enabled(const struct device *dev, int enable) { const struct imx_mu_config *config = dev->config_info; MU_Type *base = MU(config); @@ -186,7 +186,7 @@ static int imx_mu_ipm_set_enabled(struct device *dev, int enable) return 0; } -static int imx_mu_init(struct device *dev) +static int imx_mu_init(const struct device *dev) { const struct imx_mu_config *config = dev->config_info; @@ -206,7 +206,7 @@ static const struct ipm_driver_api imx_mu_driver_api = { /* Config MU */ -static void imx_mu_config_func_b(struct device *dev); +static void imx_mu_config_func_b(const struct device *dev); static const struct imx_mu_config imx_mu_b_config = { .base = (MU_Type *)DT_INST_REG_ADDR(0), @@ -221,7 +221,7 @@ DEVICE_AND_API_INIT(mu_b, DT_INST_LABEL(0), PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &imx_mu_driver_api); -static void imx_mu_config_func_b(struct device *dev) +static void imx_mu_config_func_b(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c index a3e5d13b4d2a..178e7575e23e 100644 --- a/drivers/ipm/ipm_mcux.c +++ b/drivers/ipm/ipm_mcux.c @@ -26,7 +26,7 @@ struct mcux_mailbox_config { MAILBOX_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_mailbox_data { @@ -36,7 +36,7 @@ struct mcux_mailbox_data { static void mcux_mailbox_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct mcux_mailbox_data *data = dev->driver_data; const struct mcux_mailbox_config *config = dev->config_info; mailbox_cpu_id_t cpu_id; @@ -64,8 +64,8 @@ static void mcux_mailbox_isr(void *arg) } -static int mcux_mailbox_ipm_send(struct device *d, int wait, u32_t id, - const void *data, int size) +static int mcux_mailbox_ipm_send(const struct device *d, int wait, u32_t id, + const void *data, int size) { const struct mcux_mailbox_config *config = d->config_info; MAILBOX_Type *base = config->base; @@ -100,7 +100,7 @@ static int mcux_mailbox_ipm_send(struct device *d, int wait, u32_t id, } -static int mcux_mailbox_ipm_max_data_size_get(struct device *d) +static int mcux_mailbox_ipm_max_data_size_get(const struct device *d) { ARG_UNUSED(d); /* Only a single 32-bit register available */ @@ -108,14 +108,14 @@ static int mcux_mailbox_ipm_max_data_size_get(struct device *d) } -static u32_t mcux_mailbox_ipm_max_id_val_get(struct device *d) +static u32_t mcux_mailbox_ipm_max_id_val_get(const struct device *d) { ARG_UNUSED(d); /* Only a single instance of MAILBOX available for this platform */ return MCUX_IPM_MAX_ID_VAL; } -static void mcux_mailbox_ipm_register_callback(struct device *d, +static void mcux_mailbox_ipm_register_callback(const struct device *d, ipm_callback_t cb, void *context) { @@ -126,14 +126,14 @@ static void mcux_mailbox_ipm_register_callback(struct device *d, } -static int mcux_mailbox_ipm_set_enabled(struct device *d, int enable) +static int mcux_mailbox_ipm_set_enabled(const struct device *d, int enable) { /* For now: nothing to be done */ return 0; } -static int mcux_mailbox_init(struct device *dev) +static int mcux_mailbox_init(const struct device *dev) { const struct mcux_mailbox_config *config = dev->config_info; @@ -153,7 +153,7 @@ static const struct ipm_driver_api mcux_mailbox_driver_api = { /* Config MAILBOX 0 */ -static void mcux_mailbox_config_func_0(struct device *dev); +static void mcux_mailbox_config_func_0(const struct device *dev); static const struct mcux_mailbox_config mcux_mailbox_0_config = { .base = (MAILBOX_Type *)DT_INST_REG_ADDR(0), @@ -169,7 +169,7 @@ DEVICE_AND_API_INIT(mailbox_0, DT_INST_LABEL(0), &mcux_mailbox_driver_api); -static void mcux_mailbox_config_func_0(struct device *dev) +static void mcux_mailbox_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c index 31621a8e7f33..073fcae81a41 100644 --- a/drivers/ipm/ipm_mhu.c +++ b/drivers/ipm/ipm_mhu.c @@ -57,7 +57,7 @@ static u32_t ipm_mhu_get_status(const struct device *d, return IPM_MHU_ERR_NONE; } -static int ipm_mhu_send(struct device *d, int wait, u32_t cpu_id, +static int ipm_mhu_send(const struct device *d, int wait, u32_t cpu_id, const void *data, int size) { ARG_UNUSED(wait); @@ -108,14 +108,14 @@ static void ipm_mhu_clear_val(const struct device *d, } } -static u32_t ipm_mhu_max_id_val_get(struct device *d) +static u32_t ipm_mhu_max_id_val_get(const struct device *d) { ARG_UNUSED(d); return IPM_MHU_MAX_ID_VAL; } -static int ipm_mhu_init(struct device *d) +static int ipm_mhu_init(const struct device *d) { const struct ipm_mhu_device_config *config = DEV_CFG(d); @@ -126,7 +126,7 @@ static int ipm_mhu_init(struct device *d) static void ipm_mhu_isr(void *arg) { - struct device *d = arg; + const struct device *d = arg; struct ipm_mhu_data *driver_data = DEV_DATA(d); enum ipm_mhu_cpu_id_t cpu_id; u32_t ipm_mhu_status; @@ -142,21 +142,21 @@ static void ipm_mhu_isr(void *arg) } } -static int ipm_mhu_set_enabled(struct device *d, int enable) +static int ipm_mhu_set_enabled(const struct device *d, int enable) { ARG_UNUSED(d); ARG_UNUSED(enable); return 0; } -static int ipm_mhu_max_data_size_get(struct device *d) +static int ipm_mhu_max_data_size_get(const struct device *d) { ARG_UNUSED(d); return IPM_MHU_MAX_DATA_SIZE; } -static void ipm_mhu_register_cb(struct device *d, +static void ipm_mhu_register_cb(const struct device *d, ipm_callback_t cb, void *context) { @@ -174,7 +174,7 @@ static const struct ipm_driver_api ipm_mhu_driver_api = { .set_enabled = ipm_mhu_set_enabled, }; -static void ipm_mhu_irq_config_func_0(struct device *d); +static void ipm_mhu_irq_config_func_0(const struct device *d); static const struct ipm_mhu_device_config ipm_mhu_cfg_0 = { .base = (u8_t *)DT_INST_REG_ADDR(0), @@ -194,7 +194,7 @@ DEVICE_AND_API_INIT(mhu_0, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &ipm_mhu_driver_api); -static void ipm_mhu_irq_config_func_0(struct device *d) +static void ipm_mhu_irq_config_func_0(const struct device *d) { ARG_UNUSED(d); IRQ_CONNECT(DT_INST_IRQN(0), @@ -205,7 +205,7 @@ static void ipm_mhu_irq_config_func_0(struct device *d) irq_enable(DT_INST_IRQN(0)); } -static void ipm_mhu_irq_config_func_1(struct device *d); +static void ipm_mhu_irq_config_func_1(const struct device *d); static const struct ipm_mhu_device_config ipm_mhu_cfg_1 = { .base = (u8_t *)DT_INST_REG_ADDR(1), @@ -225,7 +225,7 @@ DEVICE_AND_API_INIT(mhu_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &ipm_mhu_driver_api); -static void ipm_mhu_irq_config_func_1(struct device *d) +static void ipm_mhu_irq_config_func_1(const struct device *d) { ARG_UNUSED(d); IRQ_CONNECT(DT_INST_IRQN(1), diff --git a/drivers/ipm/ipm_mhu.h b/drivers/ipm/ipm_mhu.h index d4d8c51b55f5..115d924a3d13 100644 --- a/drivers/ipm/ipm_mhu.h +++ b/drivers/ipm/ipm_mhu.h @@ -59,7 +59,7 @@ enum ipm_mhu_cpu_id_t { struct ipm_mhu_device_config { u8_t *base; - void (*irq_config_func)(struct device *d); + void (*irq_config_func)(const struct device *d); }; /* Device data structure */ diff --git a/drivers/ipm/ipm_nrfx_ipc.c b/drivers/ipm/ipm_nrfx_ipc.c index c896c9085fe1..93c3a603a5d0 100644 --- a/drivers/ipm/ipm_nrfx_ipc.c +++ b/drivers/ipm/ipm_nrfx_ipc.c @@ -43,7 +43,7 @@ static void nrfx_ipc_handler(u32_t event_mask, void *p_context) } } -static int ipm_nrf_send(struct device *dev, int wait, u32_t id, +static int ipm_nrf_send(const struct device *dev, int wait, u32_t id, const void *data, int size) { if (id > NRFX_IPC_ID_MAX_VALUE) { @@ -58,21 +58,21 @@ static int ipm_nrf_send(struct device *dev, int wait, u32_t id, return 0; } -static int ipm_nrf_max_data_size_get(struct device *dev) +static int ipm_nrf_max_data_size_get(const struct device *dev) { ARG_UNUSED(dev); return 0; } -static u32_t ipm_nrf_max_id_val_get(struct device *dev) +static u32_t ipm_nrf_max_id_val_get(const struct device *dev) { ARG_UNUSED(dev); return NRFX_IPC_ID_MAX_VALUE; } -static void ipm_nrf_register_callback(struct device *dev, +static void ipm_nrf_register_callback(const struct device *dev, ipm_callback_t cb, void *context) { @@ -80,7 +80,7 @@ static void ipm_nrf_register_callback(struct device *dev, nrfx_ipm_data.callback_ctx = context; } -static int ipm_nrf_set_enabled(struct device *dev, int enable) +static int ipm_nrf_set_enabled(const struct device *dev, int enable) { /* Enable configured channels */ if (enable) { @@ -93,7 +93,7 @@ static int ipm_nrf_set_enabled(struct device *dev, int enable) return 0; } -static int ipm_nrf_init(struct device *dev) +static int ipm_nrf_init(const struct device *dev) { gipm_init(); return 0; @@ -118,7 +118,7 @@ struct vipm_nrf_data { ipm_callback_t callback[NRFX_IPC_ID_MAX_VALUE]; void *callback_ctx[NRFX_IPC_ID_MAX_VALUE]; bool ipm_init; - struct device *ipm_device; + const struct device *ipm_device; }; static struct vipm_nrf_data nrfx_vipm_data; @@ -140,19 +140,19 @@ static void vipm_dispatcher(u32_t event_mask, void *p_context) } } -static int vipm_nrf_max_data_size_get(struct device *dev) +static int vipm_nrf_max_data_size_get(const struct device *dev) { return ipm_max_data_size_get(dev); } -static u32_t vipm_nrf_max_id_val_get(struct device *dev) +static u32_t vipm_nrf_max_id_val_get(const struct device *dev) { ARG_UNUSED(dev); return 0; } -static int vipm_nrf_init(struct device *dev) +static int vipm_nrf_init(const struct device *dev) { if (!nrfx_vipm_data.ipm_init) { gipm_init(); @@ -162,7 +162,7 @@ static int vipm_nrf_init(struct device *dev) } #define VIPM_DEVICE_1(_idx) \ -static int vipm_nrf_##_idx##_send(struct device *dev, int wait, \ +static int vipm_nrf_##_idx##_send(const struct device *dev, int wait, \ u32_t id, const void *data, int size) \ { \ if (!IS_ENABLED(CONFIG_IPM_MSG_CH_##_idx##_TX)) { \ @@ -188,7 +188,7 @@ static int vipm_nrf_##_idx##_send(struct device *dev, int wait, \ return 0; \ } \ \ -static void vipm_nrf_##_idx##_register_callback(struct device *dev, \ +static void vipm_nrf_##_idx##_register_callback(const struct device *dev, \ ipm_callback_t cb, \ void *context) \ { \ @@ -201,7 +201,7 @@ static void vipm_nrf_##_idx##_register_callback(struct device *dev, \ } \ } \ \ -static int vipm_nrf_##_idx##_set_enabled(struct device *dev, int enable)\ +static int vipm_nrf_##_idx##_set_enabled(const struct device *dev, int enable)\ { \ if (!IS_ENABLED(CONFIG_IPM_MSG_CH_##_idx##_RX)) { \ LOG_ERR("IPM_" #_idx " is TX message channel"); \ diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c index b931c9ee85c7..4e6e36d3d169 100644 --- a/drivers/ipm/ipm_stm32_ipcc.c +++ b/drivers/ipm/ipm_stm32_ipcc.c @@ -88,7 +88,7 @@ LOG_MODULE_REGISTER(ipm_stm32_ipcc, CONFIG_IPM_LOG_LEVEL); #endif struct stm32_ipcc_mailbox_config { - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); IPCC_TypeDef *ipcc; struct stm32_pclken pclken; }; @@ -103,7 +103,7 @@ static struct stm32_ipcc_mbx_data stm32_IPCC_data; static void stm32_ipcc_mailbox_rx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct stm32_ipcc_mbx_data *data = DEV_DATA(dev); const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev); unsigned int value = 0; @@ -132,7 +132,7 @@ static void stm32_ipcc_mailbox_rx_isr(void *arg) static void stm32_ipcc_mailbox_tx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct stm32_ipcc_mbx_data *data = DEV_DATA(dev); const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev); u32_t mask, i; @@ -152,7 +152,8 @@ static void stm32_ipcc_mailbox_tx_isr(void *arg) } } -static int stm32_ipcc_mailbox_ipm_send(struct device *dev, int wait, u32_t id, +static int stm32_ipcc_mailbox_ipm_send(const struct device *dev, int wait, + u32_t id, const void *buff, int size) { struct stm32_ipcc_mbx_data *data = dev->driver_data; @@ -186,7 +187,7 @@ static int stm32_ipcc_mailbox_ipm_send(struct device *dev, int wait, u32_t id, return 0; } -static int stm32_ipcc_mailbox_ipm_max_data_size_get(struct device *dev) +static int stm32_ipcc_mailbox_ipm_max_data_size_get(const struct device *dev) { ARG_UNUSED(dev); @@ -194,14 +195,14 @@ static int stm32_ipcc_mailbox_ipm_max_data_size_get(struct device *dev) return 0; } -static u32_t stm32_ipcc_mailbox_ipm_max_id_val_get(struct device *d) +static u32_t stm32_ipcc_mailbox_ipm_max_id_val_get(const struct device *d) { struct stm32_ipcc_mbx_data *data = DEV_DATA(d); return data->num_ch - 1; } -static void stm32_ipcc_mailbox_ipm_register_callback(struct device *d, +static void stm32_ipcc_mailbox_ipm_register_callback(const struct device *d, ipm_callback_t cb, void *context) { @@ -211,7 +212,8 @@ static void stm32_ipcc_mailbox_ipm_register_callback(struct device *d, data->callback_ctx = context; } -static int stm32_ipcc_mailbox_ipm_set_enabled(struct device *dev, int enable) +static int stm32_ipcc_mailbox_ipm_set_enabled(const struct device *dev, + int enable) { struct stm32_ipcc_mbx_data *data = DEV_DATA(dev); const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev); @@ -238,12 +240,12 @@ static int stm32_ipcc_mailbox_ipm_set_enabled(struct device *dev, int enable) return 0; } -static int stm32_ipcc_mailbox_init(struct device *dev) +static int stm32_ipcc_mailbox_init(const struct device *dev) { struct stm32_ipcc_mbx_data *data = DEV_DATA(dev); const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev); - struct device *clk; + const struct device *clk; u32_t i; clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); @@ -282,7 +284,7 @@ static const struct ipm_driver_api stm32_ipcc_mailbox_driver_api = { .set_enabled = stm32_ipcc_mailbox_ipm_set_enabled, }; -static void stm32_ipcc_mailbox_config_func(struct device *dev); +static void stm32_ipcc_mailbox_config_func(const struct device *dev); /* Config MAILBOX 0 */ static const struct stm32_ipcc_mailbox_config stm32_ipcc_mailbox_0_config = { @@ -300,7 +302,7 @@ DEVICE_AND_API_INIT(mailbox_0, DT_INST_LABEL(0), POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &stm32_ipcc_mailbox_driver_api); -static void stm32_ipcc_mailbox_config_func(struct device *dev) +static void stm32_ipcc_mailbox_config_func(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, rxo, irq), DT_INST_IRQ_BY_NAME(0, rxo, priority), diff --git a/drivers/kscan/kscan_ft5336.c b/drivers/kscan/kscan_ft5336.c index 4b9b2893f05e..ec25b8e27bd5 100644 --- a/drivers/kscan/kscan_ft5336.c +++ b/drivers/kscan/kscan_ft5336.c @@ -35,19 +35,19 @@ struct ft5336_config { }; struct ft5336_data { - struct device *i2c; + const struct device *i2c; kscan_callback_t callback; struct k_work work; #ifdef CONFIG_KSCAN_FT5336_INTERRUPT struct gpio_callback int_gpio_cb; - struct device *int_gpio_dev; + const struct device *int_gpio_dev; #else struct k_timer timer; #endif - struct device *dev; + const struct device *dev; }; -static int ft5336_read(struct device *dev) +static int ft5336_read(const struct device *dev) { const struct ft5336_config *config = dev->config_info; struct ft5336_data *data = dev->driver_data; @@ -99,8 +99,9 @@ static void ft5336_work_handler(struct k_work *work) } #ifdef CONFIG_KSCAN_FT5336_INTERRUPT -static void ft5336_isr_handler(struct device *dev, struct gpio_callback *cb, - u32_t pins) +static void ft5336_isr_handler(const struct device *dev, + struct gpio_callback *cb, + u32_t pins) { const struct ft5336_config *config = dev->config_info; struct ft5336_data *drv_data = @@ -113,7 +114,8 @@ static void ft5336_isr_handler(struct device *dev, struct gpio_callback *cb, } #endif -static int ft5336_configure(struct device *dev, kscan_callback_t callback) +static int ft5336_configure(const struct device *dev, + kscan_callback_t callback) { struct ft5336_data *data = dev->driver_data; @@ -126,7 +128,7 @@ static int ft5336_configure(struct device *dev, kscan_callback_t callback) return 0; } -static int ft5336_enable_callback(struct device *dev) +static int ft5336_enable_callback(const struct device *dev) { struct ft5336_data *data = dev->driver_data; @@ -140,7 +142,7 @@ static int ft5336_enable_callback(struct device *dev) return 0; } -static int ft5336_disable_callback(struct device *dev) +static int ft5336_disable_callback(const struct device *dev) { struct ft5336_data *data = dev->driver_data; @@ -153,7 +155,7 @@ static int ft5336_disable_callback(struct device *dev) return 0; } -static int ft5336_init(struct device *dev) +static int ft5336_init(const struct device *dev) { const struct ft5336_config *config = dev->config_info; struct ft5336_data *data = dev->driver_data; diff --git a/drivers/kscan/kscan_handlers.c b/drivers/kscan/kscan_handlers.c index 2ee6f1525a0d..955d8f7f3756 100644 --- a/drivers/kscan/kscan_handlers.c +++ b/drivers/kscan/kscan_handlers.c @@ -7,28 +7,28 @@ #include #include -static inline int z_vrfy_kscan_config(struct device *dev, +static inline int z_vrfy_kscan_config(const struct device *dev, kscan_callback_t callback_isr) { Z_OOPS(Z_SYSCALL_DRIVER_KSCAN(dev, config)); Z_OOPS(Z_SYSCALL_VERIFY_MSG(callback_isr == 0, "callback cannot be set from user mode")); - return z_impl_kscan_config((struct device *)dev, callback_isr); + return z_impl_kscan_config((const struct device *)dev, callback_isr); } #include -static inline int z_vrfy_kscan_disable_callback(struct device *dev) +static inline int z_vrfy_kscan_disable_callback(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_KSCAN(dev, disable_callback)); - return z_impl_kscan_disable_callback((struct device *)dev); + return z_impl_kscan_disable_callback((const struct device *)dev); } #include -static int z_vrfy_kscan_enable_callback(struct device *dev) +static int z_vrfy_kscan_enable_callback(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_KSCAN(dev, enable_callback)); - return z_impl_kscan_enable_callback((struct device *)dev); + return z_impl_kscan_enable_callback((const struct device *)dev); } #include diff --git a/drivers/kscan/kscan_mchp_xec.c b/drivers/kscan/kscan_mchp_xec.c index 68c9698bc53c..aaaeeb97d310 100644 --- a/drivers/kscan/kscan_mchp_xec.c +++ b/drivers/kscan/kscan_mchp_xec.c @@ -326,7 +326,7 @@ void polling_task(void *dev, void *dummy2, void *dummy3) } } -static int kscan_xec_configure(struct device *dev, +static int kscan_xec_configure(const struct device *dev, kscan_callback_t callback) { ARG_UNUSED(dev); @@ -342,7 +342,7 @@ static int kscan_xec_configure(struct device *dev, return 0; } -static int kscan_xec_inhibit_interface(struct device *dev) +static int kscan_xec_inhibit_interface(const struct device *dev) { ARG_UNUSED(dev); @@ -351,7 +351,7 @@ static int kscan_xec_inhibit_interface(struct device *dev) return 0; } -static int kscan_xec_enable_interface(struct device *dev) +static int kscan_xec_enable_interface(const struct device *dev) { ARG_UNUSED(dev); @@ -366,7 +366,7 @@ static const struct kscan_driver_api kscan_xec_driver_api = { .enable_callback = kscan_xec_enable_interface, }; -static int kscan_xec_init(struct device *dev); +static int kscan_xec_init(const struct device *dev); DEVICE_AND_API_INIT(kscan_xec, DT_INST_LABEL(0), &kscan_xec_init, @@ -375,7 +375,7 @@ DEVICE_AND_API_INIT(kscan_xec, DT_INST_LABEL(0), &kscan_xec_driver_api); -static int kscan_xec_init(struct device *dev) +static int kscan_xec_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/kscan/kscan_sdl.c b/drivers/kscan/kscan_sdl.c index fe87a48c4df1..4d668b745b25 100644 --- a/drivers/kscan/kscan_sdl.c +++ b/drivers/kscan/kscan_sdl.c @@ -18,7 +18,7 @@ struct sdl_data { static int sdl_filter(void *arg, SDL_Event *event) { - struct device *dev = arg; + const struct device *dev = arg; struct sdl_data *data = dev->driver_data; u32_t row = 0; u32_t column = 0; @@ -52,7 +52,7 @@ static int sdl_filter(void *arg, SDL_Event *event) return 1; } -static int sdl_configure(struct device *dev, kscan_callback_t callback) +static int sdl_configure(const struct device *dev, kscan_callback_t callback) { struct sdl_data *data = dev->driver_data; @@ -67,7 +67,7 @@ static int sdl_configure(struct device *dev, kscan_callback_t callback) return 0; } -static int sdl_enable_callback(struct device *dev) +static int sdl_enable_callback(const struct device *dev) { struct sdl_data *data = dev->driver_data; @@ -76,7 +76,7 @@ static int sdl_enable_callback(struct device *dev) return 0; } -static int sdl_disable_callback(struct device *dev) +static int sdl_disable_callback(const struct device *dev) { struct sdl_data *data = dev->driver_data; @@ -85,7 +85,7 @@ static int sdl_disable_callback(struct device *dev) return 0; } -static int sdl_init(struct device *dev) +static int sdl_init(const struct device *dev) { LOG_INF("Init '%s' device", dev->name); SDL_AddEventWatch(sdl_filter, dev); diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c index 12888533abe1..5e53d3717ea9 100644 --- a/drivers/led/ht16k33.c +++ b/drivers/led/ht16k33.c @@ -76,13 +76,13 @@ struct ht16k33_cfg { }; struct ht16k33_data { - struct device *i2c; + const struct device *i2c; struct led_data dev_data; /* Shadow buffer for the display data RAM */ u8_t buffer[HT16K33_DISP_DATA_SIZE]; #ifdef CONFIG_HT16K33_KEYSCAN struct k_mutex lock; - struct device *children[HT16K33_KEYSCAN_ROWS]; + const struct device *children[HT16K33_KEYSCAN_ROWS]; struct gpio_callback irq_cb; struct k_thread irq_thread; struct k_sem irq_sem; @@ -94,7 +94,7 @@ struct ht16k33_data { #endif /* CONFIG_HT16K33_KEYSCAN */ }; -static int ht16k33_led_blink(struct device *dev, u32_t led, +static int ht16k33_led_blink(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off) { /* The HT16K33 blinks all LEDs at the same frequency */ @@ -130,7 +130,7 @@ static int ht16k33_led_blink(struct device *dev, u32_t led, return 0; } -static int ht16k33_led_set_brightness(struct device *dev, u32_t led, +static int ht16k33_led_set_brightness(const struct device *dev, u32_t led, u8_t value) { ARG_UNUSED(led); @@ -157,7 +157,7 @@ static int ht16k33_led_set_brightness(struct device *dev, u32_t led, return 0; } -static int ht16k33_led_set_state(struct device *dev, u32_t led, bool on) +static int ht16k33_led_set_state(const struct device *dev, u32_t led, bool on) { const struct ht16k33_cfg *config = dev->config_info; struct ht16k33_data *data = dev->driver_data; @@ -193,18 +193,18 @@ static int ht16k33_led_set_state(struct device *dev, u32_t led, bool on) return 0; } -static int ht16k33_led_on(struct device *dev, u32_t led) +static int ht16k33_led_on(const struct device *dev, u32_t led) { return ht16k33_led_set_state(dev, led, true); } -static int ht16k33_led_off(struct device *dev, u32_t led) +static int ht16k33_led_off(const struct device *dev, u32_t led) { return ht16k33_led_set_state(dev, led, false); } #ifdef CONFIG_HT16K33_KEYSCAN -u32_t ht16k33_get_pending_int(struct device *dev) +u32_t ht16k33_get_pending_int(const struct device *dev) { const struct ht16k33_cfg *config = dev->config_info; struct ht16k33_data *data = dev->driver_data; @@ -223,7 +223,7 @@ u32_t ht16k33_get_pending_int(struct device *dev) return (flag ? 1 : 0); } -static bool ht16k33_process_keyscan_data(struct device *dev) +static bool ht16k33_process_keyscan_data(const struct device *dev) { const struct ht16k33_cfg *config = dev->config_info; struct ht16k33_data *data = dev->driver_data; @@ -261,7 +261,7 @@ static bool ht16k33_process_keyscan_data(struct device *dev) return pressed; } -static void ht16k33_irq_thread(struct device *dev) +static void ht16k33_irq_thread(const struct device *dev) { struct ht16k33_data *data = dev->driver_data; bool pressed; @@ -277,7 +277,7 @@ static void ht16k33_irq_thread(struct device *dev) } } -static void ht16k33_irq_callback(struct device *gpiob, +static void ht16k33_irq_callback(const struct device *gpiob, struct gpio_callback *cb, u32_t pins) { struct ht16k33_data *data; @@ -297,8 +297,8 @@ static void ht16k33_timer_callback(struct k_timer *timer) k_sem_give(&data->irq_sem); } -int ht16k33_register_keyscan_device(struct device *parent, - struct device *child, +int ht16k33_register_keyscan_device(const struct device *parent, + const struct device *child, u8_t keyscan_idx) { struct ht16k33_data *data = parent->driver_data; @@ -319,7 +319,7 @@ int ht16k33_register_keyscan_device(struct device *parent, } #endif /* CONFIG_HT16K33_KEYSCAN */ -static int ht16k33_init(struct device *dev) +static int ht16k33_init(const struct device *dev) { const struct ht16k33_cfg *config = dev->config_info; struct ht16k33_data *data = dev->driver_data; @@ -382,7 +382,7 @@ static int ht16k33_init(struct device *dev) /* Configure interrupt */ if (config->irq_enabled) { - struct device *irq_dev; + const struct device *irq_dev; u8_t keys[HT16K33_KEYSCAN_DATA_SIZE]; irq_dev = device_get_binding(config->irq_dev_name); diff --git a/drivers/led/led_handlers.c b/drivers/led/led_handlers.c index 0b98e5df1215..95ab8a837fd2 100644 --- a/drivers/led/led_handlers.c +++ b/drivers/led/led_handlers.c @@ -7,33 +7,35 @@ #include #include -static inline int z_vrfy_led_blink(struct device *dev, u32_t led, - u32_t delay_on, u32_t delay_off) +static inline int z_vrfy_led_blink(const struct device *dev, u32_t led, + u32_t delay_on, u32_t delay_off) { Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, blink)); - return z_impl_led_blink((struct device *)dev, led, delay_on, + return z_impl_led_blink((const struct device *)dev, led, delay_on, delay_off); } #include -static inline int z_vrfy_led_set_brightness(struct device *dev, u32_t led, - u8_t value) +static inline int z_vrfy_led_set_brightness(const struct device *dev, + u32_t led, + u8_t value) { Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, set_brightness)); - return z_impl_led_set_brightness((struct device *)dev, led, value); + return z_impl_led_set_brightness((const struct device *)dev, led, + value); } #include -static inline int z_vrfy_led_on(struct device *dev, u32_t led) +static inline int z_vrfy_led_on(const struct device *dev, u32_t led) { Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, on)); - return z_impl_led_on((struct device *)dev, led); + return z_impl_led_on((const struct device *)dev, led); } #include -static inline int z_vrfy_led_off(struct device *dev, u32_t led) +static inline int z_vrfy_led_off(const struct device *dev, u32_t led) { Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, off)); - return z_impl_led_off((struct device *)dev, led); + return z_impl_led_off((const struct device *)dev, led); } #include diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c index c7999a2cbdbd..fe18d4744261 100644 --- a/drivers/led/lp3943.c +++ b/drivers/led/lp3943.c @@ -52,7 +52,7 @@ enum lp3943_modes { }; struct lp3943_data { - struct device *i2c; + const struct device *i2c; struct led_data dev_data; }; @@ -120,7 +120,7 @@ static int lp3943_set_dim_states(struct lp3943_data *data, u32_t led, u8_t mode) return 0; } -static int lp3943_led_blink(struct device *dev, u32_t led, +static int lp3943_led_blink(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off) { struct lp3943_data *data = dev->driver_data; @@ -163,7 +163,7 @@ static int lp3943_led_blink(struct device *dev, u32_t led, return 0; } -static int lp3943_led_set_brightness(struct device *dev, u32_t led, +static int lp3943_led_set_brightness(const struct device *dev, u32_t led, u8_t value) { struct lp3943_data *data = dev->driver_data; @@ -204,7 +204,7 @@ static int lp3943_led_set_brightness(struct device *dev, u32_t led, return 0; } -static inline int lp3943_led_on(struct device *dev, u32_t led) +static inline int lp3943_led_on(const struct device *dev, u32_t led) { struct lp3943_data *data = dev->driver_data; int ret; @@ -228,7 +228,7 @@ static inline int lp3943_led_on(struct device *dev, u32_t led) return 0; } -static inline int lp3943_led_off(struct device *dev, u32_t led) +static inline int lp3943_led_off(const struct device *dev, u32_t led) { struct lp3943_data *data = dev->driver_data; int ret; @@ -250,7 +250,7 @@ static inline int lp3943_led_off(struct device *dev, u32_t led) return 0; } -static int lp3943_led_init(struct device *dev) +static int lp3943_led_init(const struct device *dev) { struct lp3943_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c index 32711188fc58..5f2f58033417 100644 --- a/drivers/led/lp5562.c +++ b/drivers/led/lp5562.c @@ -158,7 +158,7 @@ enum lp5562_engine_fade_dirs { }; struct lp5562_data { - struct device *i2c; + const struct device *i2c; struct led_data dev_data; }; @@ -303,7 +303,7 @@ static void lp5562_ms_to_prescale_and_step(struct led_data *data, u32_t ms, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_set_led_source(struct device *dev, +static int lp5562_set_led_source(const struct device *dev, enum lp5562_led_channels channel, enum lp5562_led_sources source) { @@ -330,7 +330,7 @@ static int lp5562_set_led_source(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_get_led_source(struct device *dev, +static int lp5562_get_led_source(const struct device *dev, enum lp5562_led_channels channel, enum lp5562_led_sources *source) { @@ -358,7 +358,7 @@ static int lp5562_get_led_source(struct device *dev, * @retval true If the engine is currently running. * @retval false If the engine is not running or an error occurred. */ -static bool lp5562_is_engine_executing(struct device *dev, +static bool lp5562_is_engine_executing(const struct device *dev, enum lp5562_led_sources engine) { struct lp5562_data *data = dev->driver_data; @@ -394,7 +394,7 @@ static bool lp5562_is_engine_executing(struct device *dev, * @retval 0 On success. * @retval -ENODEV If all engines are busy. */ -static int lp5562_get_available_engine(struct device *dev, +static int lp5562_get_available_engine(const struct device *dev, enum lp5562_led_sources *engine) { enum lp5562_led_sources src; @@ -423,7 +423,7 @@ static int lp5562_get_available_engine(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_set_engine_reg(struct device *dev, +static int lp5562_set_engine_reg(const struct device *dev, enum lp5562_led_sources engine, u8_t reg, u8_t val) { @@ -456,7 +456,7 @@ static int lp5562_set_engine_reg(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_set_engine_op_mode(struct device *dev, +static inline int lp5562_set_engine_op_mode(const struct device *dev, enum lp5562_led_sources engine, enum lp5562_engine_op_modes mode) { @@ -473,9 +473,9 @@ static inline int lp5562_set_engine_op_mode(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_set_engine_exec_state(struct device *dev, - enum lp5562_led_sources engine, - enum lp5562_engine_exec_states state) +static inline int lp5562_set_engine_exec_state(const struct device *dev, + enum lp5562_led_sources engine, + enum lp5562_engine_exec_states state) { int ret; @@ -499,7 +499,7 @@ static inline int lp5562_set_engine_exec_state(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_start_program_exec(struct device *dev, +static inline int lp5562_start_program_exec(const struct device *dev, enum lp5562_led_sources engine) { if (lp5562_set_engine_op_mode(dev, engine, LP5562_OP_MODE_RUN)) { @@ -519,7 +519,7 @@ static inline int lp5562_start_program_exec(struct device *dev, * @retval 0 On success. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_stop_program_exec(struct device *dev, +static inline int lp5562_stop_program_exec(const struct device *dev, enum lp5562_led_sources engine) { if (lp5562_set_engine_op_mode(dev, engine, LP5562_OP_MODE_DISABLED)) { @@ -544,7 +544,7 @@ static inline int lp5562_stop_program_exec(struct device *dev, * engine is passed. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_program_command(struct device *dev, +static int lp5562_program_command(const struct device *dev, enum lp5562_led_sources engine, u8_t command_index, u8_t command_msb, @@ -593,7 +593,7 @@ static int lp5562_program_command(struct device *dev, * @retval -EINVAL If the passed arguments are invalid or out of range. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_program_set_brightness(struct device *dev, +static int lp5562_program_set_brightness(const struct device *dev, enum lp5562_led_sources engine, u8_t command_index, u8_t brightness) @@ -630,7 +630,7 @@ static int lp5562_program_set_brightness(struct device *dev, * @retval -EINVAL If the passed arguments are invalid or out of range. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_program_ramp(struct device *dev, +static int lp5562_program_ramp(const struct device *dev, enum lp5562_led_sources engine, u8_t command_index, u32_t time_per_step, @@ -666,7 +666,7 @@ static int lp5562_program_ramp(struct device *dev, * @retval -EINVAL If the passed arguments are invalid or out of range. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_program_wait(struct device *dev, +static inline int lp5562_program_wait(const struct device *dev, enum lp5562_led_sources engine, u8_t command_index, u32_t time) @@ -693,7 +693,7 @@ static inline int lp5562_program_wait(struct device *dev, * engine is passed. * @retval -EIO If the underlying I2C call fails. */ -static inline int lp5562_program_go_to_start(struct device *dev, +static inline int lp5562_program_go_to_start(const struct device *dev, enum lp5562_led_sources engine, u8_t command_index) { @@ -723,7 +723,7 @@ static inline int lp5562_program_go_to_start(struct device *dev, * @retval -EINVAL If the engine ID or brightness is out of range. * @retval -EIO If the underlying I2C call fails. */ -static int lp5562_update_blinking_brightness(struct device *dev, +static int lp5562_update_blinking_brightness(const struct device *dev, enum lp5562_led_sources engine, u8_t brightness_on) { @@ -754,7 +754,7 @@ static int lp5562_update_blinking_brightness(struct device *dev, return 0; } -static int lp5562_led_blink(struct device *dev, u32_t led, +static int lp5562_led_blink(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off) { struct lp5562_data *data = dev->driver_data; @@ -815,7 +815,8 @@ static int lp5562_led_blink(struct device *dev, u32_t led, return 0; } -static int lp5562_led_set_brightness(struct device *dev, u32_t led, u8_t value) +static int lp5562_led_set_brightness(const struct device *dev, u32_t led, + u8_t value) { struct lp5562_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; @@ -865,7 +866,7 @@ static int lp5562_led_set_brightness(struct device *dev, u32_t led, u8_t value) return 0; } -static inline int lp5562_led_on(struct device *dev, u32_t led) +static inline int lp5562_led_on(const struct device *dev, u32_t led) { struct lp5562_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; @@ -873,7 +874,7 @@ static inline int lp5562_led_on(struct device *dev, u32_t led) return lp5562_led_set_brightness(dev, led, dev_data->max_brightness); } -static inline int lp5562_led_off(struct device *dev, u32_t led) +static inline int lp5562_led_off(const struct device *dev, u32_t led) { struct lp5562_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; @@ -896,7 +897,7 @@ static inline int lp5562_led_off(struct device *dev, u32_t led) return lp5562_led_set_brightness(dev, led, dev_data->min_brightness); } -static int lp5562_led_init(struct device *dev) +static int lp5562_led_init(const struct device *dev) { struct lp5562_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c index cebab142e229..d9c1f1e394f9 100644 --- a/drivers/led/pca9633.c +++ b/drivers/led/pca9633.c @@ -42,11 +42,11 @@ LOG_MODULE_REGISTER(pca9633); #define PCA9633_MASK 0x03 struct pca9633_data { - struct device *i2c; + const struct device *i2c; struct led_data dev_data; }; -static int pca9633_led_blink(struct device *dev, u32_t led, +static int pca9633_led_blink(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off) { struct pca9633_data *data = dev->driver_data; @@ -109,7 +109,7 @@ static int pca9633_led_blink(struct device *dev, u32_t led, return 0; } -static int pca9633_led_set_brightness(struct device *dev, u32_t led, +static int pca9633_led_set_brightness(const struct device *dev, u32_t led, u8_t value) { struct pca9633_data *data = dev->driver_data; @@ -142,7 +142,7 @@ static int pca9633_led_set_brightness(struct device *dev, u32_t led, return 0; } -static inline int pca9633_led_on(struct device *dev, u32_t led) +static inline int pca9633_led_on(const struct device *dev, u32_t led) { struct pca9633_data *data = dev->driver_data; @@ -158,7 +158,7 @@ static inline int pca9633_led_on(struct device *dev, u32_t led) return 0; } -static inline int pca9633_led_off(struct device *dev, u32_t led) +static inline int pca9633_led_off(const struct device *dev, u32_t led) { struct pca9633_data *data = dev->driver_data; @@ -174,7 +174,7 @@ static inline int pca9633_led_off(struct device *dev, u32_t led) return 0; } -static int pca9633_led_init(struct device *dev) +static int pca9633_led_init(const struct device *dev) { struct pca9633_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; diff --git a/drivers/led_strip/apa102.c b/drivers/led_strip/apa102.c index 54b91a8c71e3..c9e235050700 100644 --- a/drivers/led_strip/apa102.c +++ b/drivers/led_strip/apa102.c @@ -11,11 +11,11 @@ #include struct apa102_data { - struct device *spi; + const struct device *spi; struct spi_config cfg; }; -static int apa102_update(struct device *dev, void *buf, size_t size) +static int apa102_update(const struct device *dev, void *buf, size_t size) { struct apa102_data *data = dev->driver_data; static const u8_t zeros[] = {0, 0, 0, 0}; @@ -48,7 +48,7 @@ static int apa102_update(struct device *dev, void *buf, size_t size) return spi_write(data->spi, &data->cfg, &tx); } -static int apa102_update_rgb(struct device *dev, struct led_rgb *pixels, +static int apa102_update_rgb(const struct device *dev, struct led_rgb *pixels, size_t count) { u8_t *p = (u8_t *)pixels; @@ -72,14 +72,14 @@ static int apa102_update_rgb(struct device *dev, struct led_rgb *pixels, return apa102_update(dev, pixels, sizeof(struct led_rgb) * count); } -static int apa102_update_channels(struct device *dev, u8_t *channels, +static int apa102_update_channels(const struct device *dev, u8_t *channels, size_t num_channels) { /* Not implemented */ return -EINVAL; } -static int apa102_init(struct device *dev) +static int apa102_init(const struct device *dev) { struct apa102_data *data = dev->driver_data; diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c index dfe5d30c4d38..720cc44ca393 100644 --- a/drivers/led_strip/lpd880x.c +++ b/drivers/led_strip/lpd880x.c @@ -36,11 +36,11 @@ LOG_MODULE_REGISTER(lpd880x); SPI_LINES_SINGLE) struct lpd880x_data { - struct device *spi; + const struct device *spi; struct spi_config config; }; -static int lpd880x_update(struct device *dev, void *data, size_t size) +static int lpd880x_update(const struct device *dev, void *data, size_t size) { struct lpd880x_data *drv_data = dev->driver_data; /* @@ -85,7 +85,7 @@ static int lpd880x_update(struct device *dev, void *data, size_t size) return rc; } -static int lpd880x_strip_update_rgb(struct device *dev, +static int lpd880x_strip_update_rgb(const struct device *dev, struct led_rgb *pixels, size_t num_pixels) { @@ -114,7 +114,8 @@ static int lpd880x_strip_update_rgb(struct device *dev, return lpd880x_update(dev, pixels, 3 * num_pixels); } -static int lpd880x_strip_update_channels(struct device *dev, u8_t *channels, +static int lpd880x_strip_update_channels(const struct device *dev, + u8_t *channels, size_t num_channels) { size_t i; @@ -126,7 +127,7 @@ static int lpd880x_strip_update_channels(struct device *dev, u8_t *channels, return lpd880x_update(dev, channels, num_channels); } -static int lpd880x_strip_init(struct device *dev) +static int lpd880x_strip_init(const struct device *dev) { struct lpd880x_data *data = dev->driver_data; struct spi_config *config = &data->config; diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c index 059e2fd7d4ff..8b6af21cbc61 100644 --- a/drivers/led_strip/ws2812_gpio.c +++ b/drivers/led_strip/ws2812_gpio.c @@ -23,8 +23,8 @@ LOG_MODULE_REGISTER(ws2812_gpio); #include struct ws2812_gpio_data { - struct device *gpio; - struct device *clk; + const struct device *gpio; + const struct device *clk; }; struct ws2812_gpio_cfg { @@ -32,12 +32,12 @@ struct ws2812_gpio_cfg { bool has_white; }; -static struct ws2812_gpio_data *dev_data(struct device *dev) +static struct ws2812_gpio_data *dev_data(const struct device *dev) { return dev->driver_data; } -static const struct ws2812_gpio_cfg *dev_cfg(struct device *dev) +static const struct ws2812_gpio_cfg *dev_cfg(const struct device *dev) { return dev->config_info; } @@ -99,11 +99,11 @@ static const struct ws2812_gpio_cfg *dev_cfg(struct device *dev) [r] "l" (base), \ [p] "l" (pin)); } while (0) -static int send_buf(struct device *dev, u8_t *buf, size_t len) +static int send_buf(const struct device *dev, u8_t *buf, size_t len) { volatile u32_t *base = (u32_t *)&NRF_GPIO->OUTSET; const u32_t val = BIT(dev_cfg(dev)->pin); - struct device *clk = dev_data(dev)->clk; + const struct device *clk = dev_data(dev)->clk; unsigned int key; int rc; @@ -145,7 +145,8 @@ static int send_buf(struct device *dev, u8_t *buf, size_t len) return rc; } -static int ws2812_gpio_update_rgb(struct device *dev, struct led_rgb *pixels, +static int ws2812_gpio_update_rgb(const struct device *dev, + struct led_rgb *pixels, size_t num_pixels) { const struct ws2812_gpio_cfg *config = dev->config_info; @@ -170,7 +171,8 @@ static int ws2812_gpio_update_rgb(struct device *dev, struct led_rgb *pixels, return send_buf(dev, (u8_t *)pixels, num_pixels * (has_white ? 4 : 3)); } -static int ws2812_gpio_update_channels(struct device *dev, u8_t *channels, +static int ws2812_gpio_update_channels(const struct device *dev, + u8_t *channels, size_t num_channels) { LOG_ERR("update_channels not implemented"); @@ -202,7 +204,7 @@ static const struct led_strip_driver_api ws2812_gpio_api = { #define WS2812_GPIO_DEVICE(idx) \ \ - static int ws2812_gpio_##idx##_init(struct device *dev) \ + static int ws2812_gpio_##idx##_init(const struct device *dev) \ { \ struct ws2812_gpio_data *data = dev_data(dev); \ \ diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c index 99b698962164..047398196cc0 100644 --- a/drivers/led_strip/ws2812_spi.c +++ b/drivers/led_strip/ws2812_spi.c @@ -45,7 +45,7 @@ LOG_MODULE_REGISTER(ws2812_spi); #define BYTES_PER_PX(has_white) ((has_white) ? 32 : 24) struct ws2812_spi_data { - struct device *spi; + const struct device *spi; }; struct ws2812_spi_cfg { @@ -57,12 +57,12 @@ struct ws2812_spi_cfg { bool has_white; }; -static struct ws2812_spi_data *dev_data(struct device *dev) +static struct ws2812_spi_data *dev_data(const struct device *dev) { return dev->driver_data; } -static const struct ws2812_spi_cfg *dev_cfg(struct device *dev) +static const struct ws2812_spi_cfg *dev_cfg(const struct device *dev) { return dev->config_info; } @@ -109,7 +109,8 @@ static inline void ws2812_reset_delay(void) k_busy_wait(RESET_DELAY_USEC); } -static int ws2812_strip_update_rgb(struct device *dev, struct led_rgb *pixels, +static int ws2812_strip_update_rgb(const struct device *dev, + struct led_rgb *pixels, size_t num_pixels) { const struct ws2812_spi_cfg *cfg = dev_cfg(dev); @@ -156,7 +157,8 @@ static int ws2812_strip_update_rgb(struct device *dev, struct led_rgb *pixels, return rc; } -static int ws2812_strip_update_channels(struct device *dev, u8_t *channels, +static int ws2812_strip_update_channels(const struct device *dev, + u8_t *channels, size_t num_channels) { LOG_ERR("update_channels not implemented"); @@ -207,7 +209,7 @@ static const struct led_strip_driver_api ws2812_spi_api = { .has_white = WS2812_SPI_HAS_WHITE(idx), \ }; \ \ - static int ws2812_spi_##idx##_init(struct device *dev) \ + static int ws2812_spi_##idx##_init(const struct device *dev) \ { \ struct ws2812_spi_data *data = dev_data(dev); \ \ diff --git a/drivers/lora/shell.c b/drivers/lora/shell.c index 3c81712928f1..46a3a089a83f 100644 --- a/drivers/lora/shell.c +++ b/drivers/lora/shell.c @@ -89,9 +89,9 @@ static int parse_freq(u32_t *out, const struct shell *shell, const char *arg) return 0; } -static struct device *get_modem(const struct shell *shell) +static const struct device *get_modem(const struct shell *shell) { - struct device *dev; + const struct device *dev; dev = device_get_binding(DEFAULT_RADIO); if (!dev) { @@ -102,10 +102,10 @@ static struct device *get_modem(const struct shell *shell) return dev; } -static struct device *get_configured_modem(const struct shell *shell) +static const struct device *get_configured_modem(const struct shell *shell) { int ret; - struct device *dev; + const struct device *dev; dev = get_modem(shell); if (!dev) { @@ -232,7 +232,7 @@ static int cmd_lora_send(const struct shell *shell, size_t argc, char **argv) { int ret; - struct device *dev; + const struct device *dev; modem_config.tx = true; dev = get_configured_modem(shell); @@ -252,7 +252,7 @@ static int cmd_lora_send(const struct shell *shell, static int cmd_lora_recv(const struct shell *shell, size_t argc, char **argv) { static char buf[0xff]; - struct device *dev; + const struct device *dev; long timeout = 0; int ret; s16_t rssi; @@ -286,7 +286,7 @@ static int cmd_lora_recv(const struct shell *shell, size_t argc, char **argv) static int cmd_lora_test_cw(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; int ret; u32_t freq; long power, duration; diff --git a/drivers/lora/sx1276.c b/drivers/lora/sx1276.c index 134549564d3d..cb2d107884ed 100644 --- a/drivers/lora/sx1276.c +++ b/drivers/lora/sx1276.c @@ -52,10 +52,10 @@ static const struct sx1276_dio sx1276_dios[] = { SX1276_DIO_GPIO_INIT(0) }; #define SX1276_MAX_DIO ARRAY_SIZE(sx1276_dios) struct sx1276_data { - struct device *reset; - struct device *spi; + const struct device *reset; + const struct device *spi; struct spi_config spi_cfg; - struct device *dio_dev[SX1276_MAX_DIO]; + const struct device *dio_dev[SX1276_MAX_DIO]; struct k_work dio_work[SX1276_MAX_DIO]; struct k_sem data_sem; struct k_timer timer; @@ -176,7 +176,7 @@ static void sx1276_dio_work_handle(struct k_work *work) (*DioIrq[dio])(NULL); } -static void sx1276_irq_callback(struct device *dev, +static void sx1276_irq_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { unsigned int i, pin; @@ -362,7 +362,8 @@ void SX1276SetRfTxPower(int8_t power) } } -static int sx1276_lora_send(struct device *dev, u8_t *data, u32_t data_len) +static int sx1276_lora_send(const struct device *dev, u8_t *data, + u32_t data_len) { Radio.SetMaxPayloadLength(MODEM_LORA, data_len); @@ -388,7 +389,7 @@ static void sx1276_rx_done(u8_t *payload, u16_t size, int16_t rssi, int8_t snr) k_sem_give(&dev_data.data_sem); } -static int sx1276_lora_recv(struct device *dev, u8_t *data, u8_t size, +static int sx1276_lora_recv(const struct device *dev, u8_t *data, u8_t size, k_timeout_t timeout, s16_t *rssi, s8_t *snr) { int ret; @@ -424,7 +425,7 @@ static int sx1276_lora_recv(struct device *dev, u8_t *data, u8_t size, return dev_data.rx_len; } -static int sx1276_lora_config(struct device *dev, +static int sx1276_lora_config(const struct device *dev, struct lora_modem_config *config) { @@ -446,7 +447,7 @@ static int sx1276_lora_config(struct device *dev, return 0; } -static int sx1276_lora_test_cw(struct device *dev, u32_t frequency, +static int sx1276_lora_test_cw(const struct device *dev, u32_t frequency, s8_t tx_power, u16_t duration) { Radio.SetTxContinuousWave(frequency, tx_power, duration); @@ -478,7 +479,7 @@ const struct Radio_s Radio = { .SetTxContinuousWave = SX1276SetTxContinuousWave, }; -static int sx1276_lora_init(struct device *dev) +static int sx1276_lora_init(const struct device *dev) { static struct spi_cs_control spi_cs; int ret; diff --git a/drivers/modem/gsm_ppp.c b/drivers/modem/gsm_ppp.c index 8a79e3cc0ec4..ada27140cc65 100644 --- a/drivers/modem/gsm_ppp.c +++ b/drivers/modem/gsm_ppp.c @@ -57,9 +57,9 @@ static struct gsm_modem { size_t ppp_recv_buf_len; enum setup_state state; - struct device *ppp_dev; - struct device *at_dev; - struct device *control_dev; + const struct device *ppp_dev; + const struct device *at_dev; + const struct device *control_dev; bool mux_enabled : 1; bool mux_setup_done : 1; @@ -243,7 +243,7 @@ static int gsm_setup_mccmno(struct gsm_modem *gsm) static void set_ppp_carrier_on(struct gsm_modem *gsm) { - struct device *ppp_dev = device_get_binding(CONFIG_NET_PPP_DRV_NAME); + const struct device *ppp_dev = device_get_binding(CONFIG_NET_PPP_DRV_NAME); const struct ppp_api *api = (const struct ppp_api *)ppp_dev->driver_api; @@ -392,7 +392,7 @@ static void mux_setup_next(struct gsm_modem *gsm) (void)k_delayed_work_submit(&gsm->gsm_configure_work, K_MSEC(1)); } -static void mux_attach_cb(struct device *mux, int dlci_address, +static void mux_attach_cb(const struct device *mux, int dlci_address, bool connected, void *user_data) { LOG_DBG("DLCI %d to %s %s", dlci_address, mux->name, @@ -406,7 +406,7 @@ static void mux_attach_cb(struct device *mux, int dlci_address, mux_setup_next(user_data); } -static int mux_attach(struct device *mux, struct device *uart, +static int mux_attach(const struct device *mux, const struct device *uart, int dlci_address, void *user_data) { int ret = uart_mux_attach(mux, uart, dlci_address, mux_attach_cb, @@ -424,7 +424,7 @@ static void mux_setup(struct k_work *work) { struct gsm_modem *gsm = CONTAINER_OF(work, struct gsm_modem, gsm_configure_work); - struct device *uart = device_get_binding(CONFIG_MODEM_GSM_UART_NAME); + const struct device *uart = device_get_binding(CONFIG_MODEM_GSM_UART_NAME); int ret; switch (gsm->state) { @@ -559,7 +559,7 @@ static void gsm_configure(struct k_work *work) gsm_finalize_connection(gsm); } -static int gsm_init(struct device *device) +static int gsm_init(const struct device *device) { struct gsm_modem *gsm = device->driver_data; int r; diff --git a/drivers/modem/modem_context.c b/drivers/modem/modem_context.c index 7705ffbd14c7..c87d5a96a94a 100644 --- a/drivers/modem/modem_context.c +++ b/drivers/modem/modem_context.c @@ -63,7 +63,7 @@ int modem_context_get_addr_port(const struct sockaddr *addr, u16_t *port) * * @retval Modem context or NULL. */ -struct modem_context *modem_context_from_iface_dev(struct device *dev) +struct modem_context *modem_context_from_iface_dev(const struct device *dev) { int i; diff --git a/drivers/modem/modem_context.h b/drivers/modem/modem_context.h index 9fc845c0d193..2c8490f7a30a 100644 --- a/drivers/modem/modem_context.h +++ b/drivers/modem/modem_context.h @@ -31,7 +31,7 @@ extern "C" { } struct modem_iface { - struct device *dev; + const struct device *dev; int (*read)(struct modem_iface *iface, u8_t *buf, size_t size, size_t *bytes_read); @@ -50,7 +50,7 @@ struct modem_cmd_handler { }; struct modem_pin { - struct device *gpio_port_dev; + const struct device *gpio_port_dev; char *dev_name; gpio_pin_t pin; gpio_flags_t init_flags; @@ -113,7 +113,7 @@ struct modem_context *modem_context_from_id(int id); * * @retval Modem context or NULL. */ -struct modem_context *modem_context_from_iface_dev(struct device *dev); +struct modem_context *modem_context_from_iface_dev(const struct device *dev); /** * @brief Registers modem context. diff --git a/drivers/modem/modem_iface_uart.c b/drivers/modem/modem_iface_uart.c index 8b57cb3f30ca..2efa007725f3 100644 --- a/drivers/modem/modem_iface_uart.c +++ b/drivers/modem/modem_iface_uart.c @@ -47,7 +47,7 @@ static void modem_iface_uart_flush(struct modem_iface *iface) * * @retval None. */ -static void modem_iface_uart_isr(struct device *uart_dev) +static void modem_iface_uart_isr(const struct device *uart_dev) { struct modem_context *ctx; struct modem_iface_uart_data *data; diff --git a/drivers/modem/modem_receiver.c b/drivers/modem/modem_receiver.c index d77995661252..0945bbe1ca45 100644 --- a/drivers/modem/modem_receiver.c +++ b/drivers/modem/modem_receiver.c @@ -33,7 +33,7 @@ static struct mdm_receiver_context *contexts[MAX_MDM_CTX]; * * @retval Receiver context or NULL. */ -static struct mdm_receiver_context *context_from_dev(struct device *dev) +static struct mdm_receiver_context *context_from_dev(const struct device *dev) { int i; @@ -101,7 +101,7 @@ static void mdm_receiver_flush(struct mdm_receiver_context *ctx) * * @retval None. */ -static void mdm_receiver_isr(struct device *uart_dev) +static void mdm_receiver_isr(const struct device *uart_dev) { struct mdm_receiver_context *ctx; int rx, ret; diff --git a/drivers/modem/modem_receiver.h b/drivers/modem/modem_receiver.h index 2820b568a808..928423fb53f1 100644 --- a/drivers/modem/modem_receiver.h +++ b/drivers/modem/modem_receiver.h @@ -22,7 +22,7 @@ extern "C" { #endif struct mdm_receiver_context { - struct device *uart_dev; + const struct device *uart_dev; /* rx data */ struct ring_buf rx_rb; diff --git a/drivers/modem/modem_shell.c b/drivers/modem/modem_shell.c index e577d4895950..ff0bd5334d54 100644 --- a/drivers/modem/modem_shell.c +++ b/drivers/modem/modem_shell.c @@ -134,7 +134,7 @@ static int cmd_modem_send(const struct shell *shell, size_t argc, } #if defined(CONFIG_GSM_MUX) -static void uart_mux_cb(struct device *uart, struct device *dev, +static void uart_mux_cb(const struct device *uart, const struct device *dev, int dlci_address, void *user_data) { struct modem_shell_user_data *data = user_data; diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c index 3b8235473dfd..5f7a0fb21acc 100644 --- a/drivers/modem/ublox-sara-r4.c +++ b/drivers/modem/ublox-sara-r4.c @@ -1664,7 +1664,7 @@ static u32_t hash32(char *str, int len) return h; } -static inline u8_t *modem_get_mac(struct device *dev) +static inline u8_t *modem_get_mac(const struct device *dev) { struct modem_data *data = dev->driver_data; u32_t hash_value; @@ -1682,7 +1682,7 @@ static inline u8_t *modem_get_mac(struct device *dev) static void modem_net_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct modem_data *data = dev->driver_data; /* Direct socket offload used instead of net offload: */ @@ -1713,7 +1713,7 @@ static struct modem_cmd unsol_cmds[] = { MODEM_CMD("+CREG: ", on_cmd_socknotifycreg, 1U, ""), }; -static int modem_init(struct device *dev) +static int modem_init(const struct device *dev) { int ret = 0; diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c index 84130eab6d5e..cac5193ef7ca 100644 --- a/drivers/modem/wncm14a2a.c +++ b/drivers/modem/wncm14a2a.c @@ -182,7 +182,7 @@ struct wncm14a2a_iface_ctx { u8_t mac_addr[6]; /* GPIO PORT devices */ - struct device *gpio_port_dev[MAX_MDM_CONTROL_PINS]; + const struct device *gpio_port_dev[MAX_MDM_CONTROL_PINS]; /* RX specific attributes */ struct mdm_receiver_context mdm_ctx; @@ -1440,7 +1440,7 @@ static void wncm14a2a_modem_reset(void) return; } -static int wncm14a2a_init(struct device *dev) +static int wncm14a2a_init(const struct device *dev) { int i, ret = 0; @@ -1817,7 +1817,7 @@ static struct net_offload offload_funcs = { .put = offload_put, }; -static inline u8_t *wncm14a2a_get_mac(struct device *dev) +static inline u8_t *wncm14a2a_get_mac(const struct device *dev) { struct wncm14a2a_iface_ctx *ctx = dev->driver_data; @@ -1832,7 +1832,7 @@ static inline u8_t *wncm14a2a_get_mac(struct device *dev) static void offload_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct wncm14a2a_iface_ctx *ctx = dev->driver_data; iface->if_dev->offload = &offload_funcs; diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index ef1f94fbbace..e3946ebaaeb8 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include -int loopback_dev_init(struct device *dev) +int loopback_dev_init(const struct device *dev) { ARG_UNUSED(dev); @@ -38,7 +38,7 @@ static void loopback_init(struct net_if *iface) NET_LINK_DUMMY); } -static int loopback_send(struct device *dev, struct net_pkt *pkt) +static int loopback_send(const struct device *dev, struct net_pkt *pkt) { struct net_pkt *cloned; int res; diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c index 308d853833e8..c93a7b99f38b 100644 --- a/drivers/net/ppp.c +++ b/drivers/net/ppp.c @@ -49,7 +49,7 @@ enum ppp_driver_state { K_THREAD_STACK_DEFINE(ppp_workq, PPP_WORKQ_STACK_SIZE); struct ppp_driver_context { - struct device *dev; + const struct device *dev; struct net_if *iface; /* This net_pkt contains pkt that is being read */ @@ -535,7 +535,7 @@ static u16_t ppp_escape_byte(u8_t byte, int *offset) return byte; } -static int ppp_send(struct device *dev, struct net_pkt *pkt) +static int ppp_send(const struct device *dev, struct net_pkt *pkt) { struct ppp_driver_context *ppp = dev->driver_data; struct net_buf *buf = pkt->buffer; @@ -671,7 +671,7 @@ static void ppp_isr_cb_work(struct k_work *work) } #endif /* !CONFIG_NET_TEST */ -static int ppp_driver_init(struct device *dev) +static int ppp_driver_init(const struct device *dev) { struct ppp_driver_context *ppp = dev->driver_data; @@ -755,7 +755,7 @@ static void ppp_iface_init(struct net_if *iface) } #if defined(CONFIG_NET_STATISTICS_PPP) -static struct net_stats_ppp *ppp_get_stats(struct device *dev) +static struct net_stats_ppp *ppp_get_stats(const struct device *dev) { struct ppp_driver_context *context = dev->driver_data; @@ -764,7 +764,7 @@ static struct net_stats_ppp *ppp_get_stats(struct device *dev) #endif #if !defined(CONFIG_NET_TEST) -static void ppp_uart_flush(struct device *dev) +static void ppp_uart_flush(const struct device *dev) { u8_t c; @@ -776,7 +776,7 @@ static void ppp_uart_flush(struct device *dev) static void ppp_uart_isr(void *user_data) { struct ppp_driver_context *context = user_data; - struct device *uart = context->dev; + const struct device *uart = context->dev; int rx = 0, ret; /* get all of the data off UART as fast as we can */ @@ -799,7 +799,7 @@ static void ppp_uart_isr(void *user_data) } #endif /* !CONFIG_NET_TEST */ -static int ppp_start(struct device *dev) +static int ppp_start(const struct device *dev) { struct ppp_driver_context *context = dev->driver_data; @@ -817,7 +817,7 @@ static int ppp_start(struct device *dev) * then use our own config. */ #if IS_ENABLED(CONFIG_GSM_MUX) - struct device *mux; + const struct device *mux; mux = uart_mux_find(CONFIG_GSM_MUX_DLCI_PPP); if (mux == NULL) { @@ -859,7 +859,7 @@ static int ppp_start(struct device *dev) return 0; } -static int ppp_stop(struct device *dev) +static int ppp_stop(const struct device *dev) { struct ppp_driver_context *context = dev->driver_data; diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 81051b687623..7ec7fb5f6c93 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -105,7 +105,7 @@ static void slip_writeb_esc(unsigned char c) } } -static int slip_send(struct device *dev, struct net_pkt *pkt) +static int slip_send(const struct device *dev, struct net_pkt *pkt) { struct net_buf *buf; u8_t *ptr; @@ -362,7 +362,7 @@ static u8_t *recv_cb(u8_t *buf, size_t *off) return buf; } -static int slip_init(struct device *dev) +static int slip_init(const struct device *dev) { struct slip_context *slip = dev->driver_data; @@ -433,7 +433,7 @@ static void slip_iface_init(struct net_if *iface) static struct slip_context slip_context_data; #if defined(CONFIG_SLIP_TAP) -static enum ethernet_hw_caps eth_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_capabilities(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/neural_net/intel_gna.c b/drivers/neural_net/intel_gna.c index 6c0f8b6d121f..11c5063a8ae4 100644 --- a/drivers/neural_net/intel_gna.c +++ b/drivers/neural_net/intel_gna.c @@ -31,8 +31,8 @@ LOG_MODULE_REGISTER(neural_net); ((struct intel_gna_data *const)(dev)->driver_data) #if LOG_LEVEL >= LOG_LEVEL_DBG -static void intel_gna_regs_dump(struct device *dev); -static void intel_gna_config_desc_dump(struct device *dev); +static void intel_gna_regs_dump(const struct device *dev); +static void intel_gna_config_desc_dump(const struct device *dev); #define INTEL_GNA_REGS_DUMP(dev) intel_gna_regs_dump((dev)) #define INTEL_GNA_CONFIG_DESC_DUMP(dev) intel_gna_config_desc_dump((dev)) #else @@ -42,13 +42,13 @@ static void intel_gna_config_desc_dump(struct device *dev); #define GNA_MODEL_VIRT_BASE_DEFAULT 0 -static struct device DEVICE_NAME_GET(gna); +DEVICE_DECLARE(gna); static struct intel_gna_config_desc __aligned(GNA_PG_SIZE_IN_BYTES) gna_config_desc; static struct intel_gna_page_table __aligned(GNA_PG_SIZE_IN_BYTES) gna_page_table[GNA_NUM_PG_TABLES_NEEDED]; -static void intel_gna_interrupt_handler(struct device *dev) +static void intel_gna_interrupt_handler(const struct device *dev) { struct intel_gna_data *const gna = DEV_DATA(dev); @@ -165,7 +165,7 @@ static int intel_gna_setup_page_table(void *physical, size_t size, return 0; } -static int intel_gna_initialize(struct device *dev) +static int intel_gna_initialize(const struct device *dev) { struct intel_gna_data *const gna = DEV_DATA(dev); u32_t page_dir_entry; @@ -219,7 +219,8 @@ static int intel_gna_initialize(struct device *dev) return 0; } -static int intel_gna_configure(struct device *dev, struct gna_config *cfg) +static int intel_gna_configure(const struct device *dev, + struct gna_config *cfg) { const struct intel_gna_config *const dev_cfg = DEV_CFG(dev); struct intel_gna_data *const gna = DEV_DATA(dev); @@ -275,8 +276,9 @@ static int intel_gna_configure(struct device *dev, struct gna_config *cfg) return 0; } -static int intel_gna_register_model(struct device *dev, - struct gna_model_info *model, void **model_handle) +static int intel_gna_register_model(const struct device *dev, + struct gna_model_info *model, + void **model_handle) { struct intel_gna_data *const gna = DEV_DATA(dev); struct intel_gna_model *gna_model; @@ -380,7 +382,8 @@ static int intel_gna_register_model(struct device *dev, return 0; } -static int intel_gna_deregister_model(struct device *dev, void *model_handle) +static int intel_gna_deregister_model(const struct device *dev, + void *model_handle) { struct intel_gna_data *const gna = DEV_DATA(dev); struct intel_gna_model *gna_model; @@ -397,8 +400,9 @@ static int intel_gna_deregister_model(struct device *dev, void *model_handle) return 0; } -static int intel_gna_infer(struct device *dev, struct gna_inference_req *req, - gna_callback callback) +static int intel_gna_infer(const struct device *dev, + struct gna_inference_req *req, + gna_callback callback) { struct intel_gna_data *const gna = DEV_DATA(dev); volatile struct intel_gna_regs *regs = gna->regs; @@ -475,7 +479,7 @@ static int intel_gna_infer(struct device *dev, struct gna_inference_req *req, } #if LOG_LEVEL >= LOG_LEVEL_DBG -static void intel_gna_regs_dump(struct device *dev) +static void intel_gna_regs_dump(const struct device *dev) { struct intel_gna_data *const gna = DEV_DATA(dev); volatile struct intel_gna_regs *regs = gna->regs; @@ -496,7 +500,7 @@ static void intel_gna_regs_dump(struct device *dev) LOG_DBG("gnaversion :%08x", regs->gnaversion); } -static void intel_gna_config_desc_dump(struct device *dev) +static void intel_gna_config_desc_dump(const struct device *dev) { struct intel_gna_data *const gna = DEV_DATA(dev); volatile struct intel_gna_regs *regs = gna->regs; diff --git a/drivers/peci/peci_mchp_xec.c b/drivers/peci/peci_mchp_xec.c index e700dae12914..3780bf375cf5 100644 --- a/drivers/peci/peci_mchp_xec.c +++ b/drivers/peci/peci_mchp_xec.c @@ -66,7 +66,7 @@ static int check_bus_idle(PECI_Type *base) return 0; } -static int peci_xec_configure(struct device *dev, u32_t bitrate) +static int peci_xec_configure(const struct device *dev, u32_t bitrate) { ARG_UNUSED(dev); @@ -88,7 +88,7 @@ static int peci_xec_configure(struct device *dev, u32_t bitrate) return 0; } -static int peci_xec_disable(struct device *dev) +static int peci_xec_disable(const struct device *dev) { ARG_UNUSED(dev); int ret; @@ -109,7 +109,7 @@ static int peci_xec_disable(struct device *dev) return 0; } -static int peci_xec_enable(struct device *dev) +static int peci_xec_enable(const struct device *dev) { ARG_UNUSED(dev); PECI_Type *base = peci_xec_config.base; @@ -122,7 +122,7 @@ static int peci_xec_enable(struct device *dev) return 0; } -static int peci_xec_write(struct device *dev, struct peci_msg *msg) +static int peci_xec_write(const struct device *dev, struct peci_msg *msg) { ARG_UNUSED(dev); int i; @@ -189,7 +189,7 @@ static int peci_xec_write(struct device *dev, struct peci_msg *msg) return 0; } -static int peci_xec_read(struct device *dev, struct peci_msg *msg) +static int peci_xec_read(const struct device *dev, struct peci_msg *msg) { ARG_UNUSED(dev); int i; @@ -239,7 +239,7 @@ static int peci_xec_read(struct device *dev, struct peci_msg *msg) return 0; } -static int peci_xec_transfer(struct device *dev, struct peci_msg *msg) +static int peci_xec_transfer(const struct device *dev, struct peci_msg *msg) { ARG_UNUSED(dev); int ret; @@ -322,7 +322,7 @@ static const struct peci_driver_api peci_xec_driver_api = { .transfer = peci_xec_transfer, }; -static int peci_xec_init(struct device *dev) +static int peci_xec_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/pinmux/pinmux_cc13xx_cc26xx.c b/drivers/pinmux/pinmux_cc13xx_cc26xx.c index 6098c8495076..67a5953f0ac0 100644 --- a/drivers/pinmux/pinmux_cc13xx_cc26xx.c +++ b/drivers/pinmux/pinmux_cc13xx_cc26xx.c @@ -11,7 +11,8 @@ #include -static int pinmux_cc13xx_cc26xx_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_cc13xx_cc26xx_set(const struct device *dev, u32_t pin, + u32_t func) { ARG_UNUSED(dev); @@ -23,7 +24,8 @@ static int pinmux_cc13xx_cc26xx_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_cc13xx_cc26xx_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_cc13xx_cc26xx_get(const struct device *dev, u32_t pin, + u32_t *func) { ARG_UNUSED(dev); @@ -34,7 +36,8 @@ static int pinmux_cc13xx_cc26xx_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_cc13xx_cc26xx_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_cc13xx_cc26xx_pullup(const struct device *dev, u32_t pin, + u8_t func) { ARG_UNUSED(dev); @@ -52,7 +55,8 @@ static int pinmux_cc13xx_cc26xx_pullup(struct device *dev, u32_t pin, u8_t func) return -EINVAL; } -static int pinmux_cc13xx_cc26xx_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_cc13xx_cc26xx_input(const struct device *dev, u32_t pin, + u8_t func) { ARG_UNUSED(dev); @@ -70,7 +74,7 @@ static int pinmux_cc13xx_cc26xx_input(struct device *dev, u32_t pin, u8_t func) return -EINVAL; } -static int pinmux_cc13xx_cc26xx_init(struct device *dev) +static int pinmux_cc13xx_cc26xx_init(const struct device *dev) { ARG_UNUSED(dev); return 0; diff --git a/drivers/pinmux/pinmux_esp32.c b/drivers/pinmux/pinmux_esp32.c index 438759244588..c9dab9756c03 100644 --- a/drivers/pinmux/pinmux_esp32.c +++ b/drivers/pinmux/pinmux_esp32.c @@ -75,7 +75,7 @@ static int set_reg(u32_t pin, u32_t clr_mask, u32_t set_mask) return 0; } -static int pinmux_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_set(const struct device *dev, u32_t pin, u32_t func) { ARG_UNUSED(dev); @@ -91,7 +91,7 @@ static int pinmux_set(struct device *dev, u32_t pin, u32_t func) return set_reg(pin, MCU_SEL_M, func<= HSDK_PINMUX_FUNS || pin >= HSDK_PINMUX_SELS) @@ -30,7 +30,7 @@ static int pinmux_hsdk_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_hsdk_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_hsdk_get(const struct device *dev, u32_t pin, u32_t *func) { if (pin >= HSDK_PINMUX_SELS || func == NULL) @@ -41,17 +41,17 @@ static int pinmux_hsdk_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_hsdk_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_hsdk_pullup(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_hsdk_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_hsdk_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_hsdk_init(struct device *dev) +static int pinmux_hsdk_init(const struct device *dev) { ARG_UNUSED(dev); return 0; diff --git a/drivers/pinmux/pinmux_intel_s1000.c b/drivers/pinmux/pinmux_intel_s1000.c index c03dc73062ca..e0ef3ac5271c 100644 --- a/drivers/pinmux/pinmux_intel_s1000.c +++ b/drivers/pinmux/pinmux_intel_s1000.c @@ -14,7 +14,7 @@ static volatile u32_t *iomux_ctrl_regs = (volatile u32_t *)DT_INST_REG_ADDR(0); #define PINMUX_CTRL_REG_COUNT (DT_INST_REG_SIZE(0) / 4) -static int pinmux_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_set(const struct device *dev, u32_t pin, u32_t func) { u32_t lsb, msb; u32_t index; @@ -43,7 +43,7 @@ static int pinmux_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_get(const struct device *dev, u32_t pin, u32_t *func) { u32_t lsb, msb; u32_t index; @@ -71,12 +71,12 @@ static int pinmux_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_pullup(const struct device *dev, u32_t pin, u8_t func) { return -ENOSYS; } -static int pinmux_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOSYS; } @@ -88,7 +88,7 @@ static struct pinmux_driver_api apis = { .input = pinmux_input }; -static int pinmux_init(struct device *device) +static int pinmux_init(const struct device *device) { ARG_UNUSED(device); return 0; diff --git a/drivers/pinmux/pinmux_mchp_xec.c b/drivers/pinmux/pinmux_mchp_xec.c index 7b9fe7e690fd..429a09b8f884 100644 --- a/drivers/pinmux/pinmux_mchp_xec.c +++ b/drivers/pinmux/pinmux_mchp_xec.c @@ -23,7 +23,7 @@ struct pinmux_xec_config { u32_t port_num; }; -static int pinmux_xec_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_xec_set(const struct device *dev, u32_t pin, u32_t func) { const struct pinmux_xec_config *config = dev->config_info; __IO u32_t *current_pcr1; @@ -76,7 +76,7 @@ static int pinmux_xec_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_xec_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_xec_get(const struct device *dev, u32_t pin, u32_t *func) { const struct pinmux_xec_config *config = dev->config_info; __IO u32_t *current_pcr1; @@ -94,17 +94,17 @@ static int pinmux_xec_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_xec_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_xec_pullup(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_xec_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_xec_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_xec_init(struct device *dev) +static int pinmux_xec_init(const struct device *dev) { /* Nothing to do. The PCR clock is enabled at reset. */ return 0; diff --git a/drivers/pinmux/pinmux_mcux.c b/drivers/pinmux/pinmux_mcux.c index 2f539623907b..3a11b78fd81d 100644 --- a/drivers/pinmux/pinmux_mcux.c +++ b/drivers/pinmux/pinmux_mcux.c @@ -15,7 +15,7 @@ struct pinmux_mcux_config { PORT_Type *base; }; -static int pinmux_mcux_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_mcux_set(const struct device *dev, u32_t pin, u32_t func) { const struct pinmux_mcux_config *config = dev->config_info; PORT_Type *base = config->base; @@ -25,7 +25,7 @@ static int pinmux_mcux_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_mcux_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_mcux_get(const struct device *dev, u32_t pin, u32_t *func) { const struct pinmux_mcux_config *config = dev->config_info; PORT_Type *base = config->base; @@ -35,17 +35,17 @@ static int pinmux_mcux_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_mcux_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_mcux_pullup(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_mcux_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_mcux_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_mcux_init(struct device *dev) +static int pinmux_mcux_init(const struct device *dev) { const struct pinmux_mcux_config *config = dev->config_info; diff --git a/drivers/pinmux/pinmux_mcux_lpc.c b/drivers/pinmux/pinmux_mcux_lpc.c index ae5d451747b6..9171d42c3459 100644 --- a/drivers/pinmux/pinmux_mcux_lpc.c +++ b/drivers/pinmux/pinmux_mcux_lpc.c @@ -22,7 +22,8 @@ struct pinmux_mcux_lpc_config { u32_t port_no; }; -static int pinmux_mcux_lpc_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_mcux_lpc_set(const struct device *dev, u32_t pin, + u32_t func) { const struct pinmux_mcux_lpc_config *config = dev->config_info; IOCON_Type *base = config->base; @@ -33,7 +34,8 @@ static int pinmux_mcux_lpc_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_mcux_lpc_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_mcux_lpc_get(const struct device *dev, u32_t pin, + u32_t *func) { const struct pinmux_mcux_lpc_config *config = dev->config_info; IOCON_Type *base = config->base; @@ -44,17 +46,19 @@ static int pinmux_mcux_lpc_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_mcux_lpc_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_mcux_lpc_pullup(const struct device *dev, u32_t pin, + u8_t func) { return -ENOTSUP; } -static int pinmux_mcux_lpc_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_mcux_lpc_input(const struct device *dev, u32_t pin, + u8_t func) { return -ENOTSUP; } -static int pinmux_mcux_lpc_init(struct device *dev) +static int pinmux_mcux_lpc_init(const struct device *dev) { const struct pinmux_mcux_lpc_config *config = dev->config_info; diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c index 6215d5236763..00d2eba214a8 100644 --- a/drivers/pinmux/pinmux_rv32m1.c +++ b/drivers/pinmux/pinmux_rv32m1.c @@ -19,7 +19,7 @@ struct pinmux_rv32m1_config { PORT_Type *base; }; -static int pinmux_rv32m1_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_rv32m1_set(const struct device *dev, u32_t pin, u32_t func) { const struct pinmux_rv32m1_config *config = dev->config_info; PORT_Type *base = config->base; @@ -29,7 +29,7 @@ static int pinmux_rv32m1_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_rv32m1_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_rv32m1_get(const struct device *dev, u32_t pin, u32_t *func) { const struct pinmux_rv32m1_config *config = dev->config_info; PORT_Type *base = config->base; @@ -39,17 +39,18 @@ static int pinmux_rv32m1_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_rv32m1_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_rv32m1_pullup(const struct device *dev, u32_t pin, + u8_t func) { return -ENOTSUP; } -static int pinmux_rv32m1_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_rv32m1_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_rv32m1_init(struct device *dev) +static int pinmux_rv32m1_init(const struct device *dev) { const struct pinmux_rv32m1_config *config = dev->config_info; diff --git a/drivers/pinmux/pinmux_sam0.c b/drivers/pinmux/pinmux_sam0.c index 86a959eb32f7..1d1b0e5cc61e 100644 --- a/drivers/pinmux/pinmux_sam0.c +++ b/drivers/pinmux/pinmux_sam0.c @@ -11,7 +11,7 @@ struct pinmux_sam0_config { PortGroup *regs; }; -static int pinmux_sam0_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_sam0_set(const struct device *dev, u32_t pin, u32_t func) { const struct pinmux_sam0_config *cfg = dev->config_info; bool odd_pin = pin & 1; @@ -31,7 +31,7 @@ static int pinmux_sam0_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_sam0_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_sam0_get(const struct device *dev, u32_t pin, u32_t *func) { const struct pinmux_sam0_config *cfg = dev->config_info; bool odd_pin = pin & 1; @@ -46,17 +46,17 @@ static int pinmux_sam0_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_sam0_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_sam0_pullup(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_sam0_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_sam0_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_sam0_init(struct device *dev) +static int pinmux_sam0_init(const struct device *dev) { /* Nothing to do. The GPIO clock is enabled at reset. */ return 0; diff --git a/drivers/pinmux/pinmux_sifive.c b/drivers/pinmux/pinmux_sifive.c index 0db4e860ee5f..11c2f2306dc3 100644 --- a/drivers/pinmux/pinmux_sifive.c +++ b/drivers/pinmux/pinmux_sifive.c @@ -29,7 +29,7 @@ struct pinmux_sifive_regs_t { #define DEV_PINMUX(dev) \ ((struct pinmux_sifive_regs_t *)(DEV_CFG(dev))->base) -static int pinmux_sifive_set(struct device *dev, u32_t pin, u32_t func) +static int pinmux_sifive_set(const struct device *dev, u32_t pin, u32_t func) { volatile struct pinmux_sifive_regs_t *pinmux = DEV_PINMUX(dev); @@ -48,7 +48,7 @@ static int pinmux_sifive_set(struct device *dev, u32_t pin, u32_t func) return 0; } -static int pinmux_sifive_get(struct device *dev, u32_t pin, u32_t *func) +static int pinmux_sifive_get(const struct device *dev, u32_t pin, u32_t *func) { volatile struct pinmux_sifive_regs_t *pinmux = DEV_PINMUX(dev); @@ -62,17 +62,18 @@ static int pinmux_sifive_get(struct device *dev, u32_t pin, u32_t *func) return 0; } -static int pinmux_sifive_pullup(struct device *dev, u32_t pin, u8_t func) +static int pinmux_sifive_pullup(const struct device *dev, u32_t pin, + u8_t func) { return -ENOTSUP; } -static int pinmux_sifive_input(struct device *dev, u32_t pin, u8_t func) +static int pinmux_sifive_input(const struct device *dev, u32_t pin, u8_t func) { return -ENOTSUP; } -static int pinmux_sifive_init(struct device *dev) +static int pinmux_sifive_init(const struct device *dev) { volatile struct pinmux_sifive_regs_t *pinmux = DEV_PINMUX(dev); diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c index fbe63fd69746..55ce992b2015 100644 --- a/drivers/pinmux/stm32/pinmux_stm32.c +++ b/drivers/pinmux/stm32/pinmux_stm32.c @@ -84,7 +84,7 @@ static const u32_t ports_enable[STM32_PORTS_MAX] = { * * @return 0 on success, error otherwise */ -static int enable_port(u32_t port, struct device *clk) +static int enable_port(u32_t port, const struct device *clk) { /* enable port clock */ if (!clk) { @@ -126,7 +126,7 @@ static int stm32_pin_configure(int pin, int func, int altf) * @return 0 on success, error otherwise */ int z_pinmux_stm32_set(u32_t pin, u32_t func, - struct device *clk) + const struct device *clk) { /* make sure to enable port clock first */ if (enable_port(STM32_PORT(pin), clk)) { @@ -145,7 +145,7 @@ int z_pinmux_stm32_set(u32_t pin, u32_t func, void stm32_setup_pins(const struct pin_config *pinconf, size_t pins) { - struct device *clk; + const struct device *clk; int i; clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/stm32/pinmux_stm32.h index fd5c4da6dcfe..531d92e80bd5 100644 --- a/drivers/pinmux/stm32/pinmux_stm32.h +++ b/drivers/pinmux/stm32/pinmux_stm32.h @@ -78,7 +78,7 @@ clock_control_subsys_t stm32_get_port_clock(int port); * for the port */ int z_pinmux_stm32_set(u32_t pin, u32_t func, - struct device *clk); + const struct device *clk); /** * @brief helper for obtaining pin configuration for the board diff --git a/drivers/ps2/ps2_handlers.c b/drivers/ps2/ps2_handlers.c index b5218ea0ecdf..c1e93c0fe128 100644 --- a/drivers/ps2/ps2_handlers.c +++ b/drivers/ps2/ps2_handlers.c @@ -12,28 +12,28 @@ Z_SYSCALL_HANDLER(ps2_config, dev, callback_isr) Z_OOPS(Z_SYSCALL_DRIVER_PS2(dev, config)); Z_OOPS(Z_SYSCALL_VERIFY_MSG(callback_isr == 0, "callback not be set from user mode")); - return z_impl_ps2_config((struct device *)dev, callback_isr); + return z_impl_ps2_config((const struct device *)dev, callback_isr); } Z_SYSCALL_HANDLER(ps2_write, dev, value) { Z_OOPS(Z_SYSCALL_DRIVER_PS2(dev, write)); - return z_impl_ps2_write((struct device *)dev, value); + return z_impl_ps2_write((const struct device *)dev, value); } Z_SYSCALL_HANDLER(ps2_read, dev, value) { Z_OOPS(Z_SYSCALL_DRIVER_PS2(dev, read)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(value, sizeof(u8_t))); - return z_impl_ps2_read((struct device *)dev, (u32_t *)value); + return z_impl_ps2_read((const struct device *)dev, (u32_t *)value); } Z_SYSCALL_HANDLER(ps2_enable_callback) { - return z_impl_ps2_enable_callback((struct device *)dev); + return z_impl_ps2_enable_callback((const struct device *)dev); } Z_SYSCALL_HANDLER(ps2_disable_callback, dev) { - return z_impl_ps2_disable_callback((struct device *)dev); + return z_impl_ps2_disable_callback((const struct device *)dev); } diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c index d4f92fdf6a76..d2828ce3a949 100644 --- a/drivers/ps2/ps2_mchp_xec.c +++ b/drivers/ps2/ps2_mchp_xec.c @@ -30,7 +30,8 @@ struct ps2_xec_data { struct k_sem tx_lock; }; -static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr) +static int ps2_xec_configure(const struct device *dev, + ps2_callback_t callback_isr) { const struct ps2_xec_config *config = dev->config_info; struct ps2_xec_data *data = dev->driver_data; @@ -67,7 +68,7 @@ static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr) } -static int ps2_xec_write(struct device *dev, u8_t value) +static int ps2_xec_write(const struct device *dev, u8_t value) { const struct ps2_xec_config *config = dev->config_info; struct ps2_xec_data *data = dev->driver_data; @@ -116,7 +117,7 @@ static int ps2_xec_write(struct device *dev, u8_t value) return 0; } -static int ps2_xec_inhibit_interface(struct device *dev) +static int ps2_xec_inhibit_interface(const struct device *dev) { const struct ps2_xec_config *config = dev->config_info; struct ps2_xec_data *data = dev->driver_data; @@ -135,7 +136,7 @@ static int ps2_xec_inhibit_interface(struct device *dev) return 0; } -static int ps2_xec_enable_interface(struct device *dev) +static int ps2_xec_enable_interface(const struct device *dev) { const struct ps2_xec_config *config = dev->config_info; struct ps2_xec_data *data = dev->driver_data; @@ -150,7 +151,7 @@ static int ps2_xec_enable_interface(struct device *dev) } static void ps2_xec_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct ps2_xec_config *config = dev->config_info; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; @@ -188,7 +189,7 @@ static const struct ps2_driver_api ps2_xec_driver_api = { }; #ifdef CONFIG_PS2_XEC_0 -static int ps2_xec_init_0(struct device *dev); +static int ps2_xec_init_0(const struct device *dev); static const struct ps2_xec_config ps2_xec_config_0 = { .base = (PS2_Type *) DT_INST_REG_ADDR(0), @@ -206,7 +207,7 @@ DEVICE_AND_API_INIT(ps2_xec_0, DT_INST_LABEL(0), &ps2_xec_driver_api); -static int ps2_xec_init_0(struct device *dev) +static int ps2_xec_init_0(const struct device *dev) { ARG_UNUSED(dev); @@ -225,7 +226,7 @@ static int ps2_xec_init_0(struct device *dev) #endif /* CONFIG_PS2_XEC_0 */ #ifdef CONFIG_PS2_XEC_1 -static int ps2_xec_init_1(struct device *dev); +static int ps2_xec_init_1(const struct device *dev); static const struct ps2_xec_config ps2_xec_config_1 = { .base = (PS2_Type *) DT_INST_REG_ADDR(1), @@ -243,7 +244,7 @@ DEVICE_AND_API_INIT(ps2_xec_1, DT_INST_LABEL(1), POST_KERNEL, CONFIG_PS2_INIT_PRIORITY, &ps2_xec_driver_api); -static int ps2_xec_init_1(struct device *dev) +static int ps2_xec_init_1(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/ptp_clock/ptp_clock.c b/drivers/ptp_clock/ptp_clock.c index 5c81d56be257..48578d90b7f8 100644 --- a/drivers/ptp_clock/ptp_clock.c +++ b/drivers/ptp_clock/ptp_clock.c @@ -8,7 +8,7 @@ #include #ifdef CONFIG_USERSPACE -int z_vrfy_ptp_clock_get(struct device *dev, +int z_vrfy_ptp_clock_get(const struct device *dev, struct net_ptp_time *tm) { struct net_ptp_time ptp_time; @@ -17,7 +17,7 @@ int z_vrfy_ptp_clock_get(struct device *dev, Z_OOPS(Z_SYSCALL_DRIVER_PTP_CLOCK(dev, get)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(tm, sizeof(struct net_ptp_time))); - ret = z_impl_ptp_clock_get((struct device *)dev, &ptp_time); + ret = z_impl_ptp_clock_get((const struct device *)dev, &ptp_time); if (ret != 0) { return 0; } diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c index 901d878bb6a2..7b4072f1bdff 100644 --- a/drivers/pwm/pwm_dw.c +++ b/drivers/pwm/pwm_dw.c @@ -70,7 +70,8 @@ struct pwm_dw_config { * * @return The base address of that particular timer */ -static inline int pwm_dw_timer_base_addr(struct device *dev, u32_t timer) +static inline int pwm_dw_timer_base_addr(const struct device *dev, + u32_t timer) { const struct pwm_dw_config * const cfg = (const struct pwm_dw_config *)dev->config_info; @@ -86,7 +87,8 @@ static inline int pwm_dw_timer_base_addr(struct device *dev, u32_t timer) * * @return The load count 2 address of that particular timer */ -static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, u32_t timer) +static inline int pwm_dw_timer_ldcnt2_addr(const struct device *dev, + u32_t timer) { const struct pwm_dw_config * const cfg = (const struct pwm_dw_config *)dev->config_info; @@ -95,7 +97,7 @@ static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, u32_t timer) } -static int __set_one_port(struct device *dev, u32_t pwm, +static int __set_one_port(const struct device *dev, u32_t pwm, u32_t on, u32_t off) { u32_t reg_addr; @@ -139,7 +141,7 @@ static int __set_one_port(struct device *dev, u32_t pwm, * * @return 0 */ -static int pwm_dw_pin_set_cycles(struct device *dev, +static int pwm_dw_pin_set_cycles(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -183,7 +185,7 @@ static struct pwm_driver_api pwm_dw_drv_api_funcs = { * @param dev Device struct * @return 0 if successful, failed otherwise. */ -int pwm_dw_init(struct device *dev) +int pwm_dw_init(const struct device *dev) { return 0; } diff --git a/drivers/pwm/pwm_handlers.c b/drivers/pwm/pwm_handlers.c index 55498a65095a..b2a74a53df0c 100644 --- a/drivers/pwm/pwm_handlers.c +++ b/drivers/pwm/pwm_handlers.c @@ -7,22 +7,25 @@ #include #include -static inline int z_vrfy_pwm_pin_set_cycles(struct device *dev, u32_t pwm, +static inline int z_vrfy_pwm_pin_set_cycles(const struct device *dev, + u32_t pwm, u32_t period, u32_t pulse, pwm_flags_t flags) { Z_OOPS(Z_SYSCALL_DRIVER_PWM(dev, pin_set)); - return z_impl_pwm_pin_set_cycles((struct device *)dev, pwm, period, + return z_impl_pwm_pin_set_cycles((const struct device *)dev, pwm, + period, pulse, flags); } #include -static inline int z_vrfy_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, - u64_t *cycles) +static inline int z_vrfy_pwm_get_cycles_per_sec(const struct device *dev, + u32_t pwm, + u64_t *cycles) { Z_OOPS(Z_SYSCALL_DRIVER_PWM(dev, get_cycles_per_sec)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(cycles, sizeof(u64_t))); - return z_impl_pwm_get_cycles_per_sec((struct device *)dev, - pwm, (u64_t *)cycles); + return z_impl_pwm_get_cycles_per_sec((const struct device *)dev, + pwm, (u64_t *)cycles); } #include diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c index bdd4e07bc23f..79089fcb80ae 100644 --- a/drivers/pwm/pwm_imx.c +++ b/drivers/pwm/pwm_imx.c @@ -40,7 +40,7 @@ static bool imx_pwm_is_enabled(PWM_Type *base) return PWM_PWMCR_REG(base) & PWM_PWMCR_EN_MASK; } -static int imx_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int imx_pwm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { PWM_Type *base = DEV_BASE(dev); @@ -51,7 +51,7 @@ static int imx_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int imx_pwm_pin_set(struct device *dev, u32_t pwm, +static int imx_pwm_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -143,7 +143,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm, return 0; } -static int imx_pwm_init(struct device *dev) +static int imx_pwm_init(const struct device *dev) { struct imx_pwm_data *data = DEV_DATA(dev); PWM_Type *base = DEV_BASE(dev); diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c index 2070f256b5f9..10a32bc92aac 100644 --- a/drivers/pwm/pwm_led_esp32.c +++ b/drivers/pwm/pwm_led_esp32.c @@ -213,7 +213,7 @@ static int pwm_led_esp32_channel_set(int pin, bool speed_mode, int channel, const int pin_mode = GPIO_OUTPUT; const char *device_name; - struct device *gpio; + const struct device *gpio; int ret; u32_t sig_out_idx; @@ -311,7 +311,7 @@ static int pwm_led_esp32_timer_set(int speed_mode, int timer, } /* period_cycles is not used, set frequency on menuconfig instead. */ -static int pwm_led_esp32_pin_set_cycles(struct device *dev, +static int pwm_led_esp32_pin_set_cycles(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -365,7 +365,8 @@ static int pwm_led_esp32_pin_set_cycles(struct device *dev, return ret; } -static int pwm_led_esp32_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int pwm_led_esp32_get_cycles_per_sec(const struct device *dev, + u32_t pwm, u64_t *cycles) { const struct pwm_led_esp32_config *config; @@ -394,7 +395,7 @@ static const struct pwm_driver_api pwm_led_esp32_api = { .get_cycles_per_sec = pwm_led_esp32_get_cycles_per_sec, }; -int pwm_led_esp32_init(struct device *dev) +int pwm_led_esp32_init(const struct device *dev) { return 0; } diff --git a/drivers/pwm/pwm_litex.c b/drivers/pwm/pwm_litex.c index a6ab4c9cee19..cb21c2898ce9 100644 --- a/drivers/pwm/pwm_litex.c +++ b/drivers/pwm/pwm_litex.c @@ -40,7 +40,7 @@ static void litex_set_reg(volatile u32_t *reg, u32_t reg_size, u32_t val) } } -int pwm_litex_init(struct device *dev) +int pwm_litex_init(const struct device *dev) { const struct pwm_litex_cfg *cfg = GET_PWM_CFG(dev); @@ -48,7 +48,8 @@ int pwm_litex_init(struct device *dev) return 0; } -int pwm_litex_pin_set(struct device *dev, u32_t pwm, u32_t period_cycles, +int pwm_litex_pin_set(const struct device *dev, u32_t pwm, + u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { const struct pwm_litex_cfg *cfg = GET_PWM_CFG(dev); @@ -65,7 +66,8 @@ int pwm_litex_pin_set(struct device *dev, u32_t pwm, u32_t period_cycles, return 0; } -int pwm_litex_get_cycles_per_sec(struct device *dev, u32_t pwm, u64_t *cycles) +int pwm_litex_get_cycles_per_sec(const struct device *dev, u32_t pwm, + u64_t *cycles) { if (pwm >= NUMBER_OF_CHANNELS) { return -EINVAL; diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c index 2172c142479d..2e4e6640a87b 100644 --- a/drivers/pwm/pwm_mchp_xec.c +++ b/drivers/pwm/pwm_mchp_xec.c @@ -233,7 +233,7 @@ static struct xec_params *xec_compare_params(u32_t target_freq, return params; } -static void xec_compute_and_set_parameters(struct device *dev, +static void xec_compute_and_set_parameters(const struct device *dev, u32_t target_freq, u32_t on, u32_t off) { @@ -306,7 +306,7 @@ static void xec_compute_and_set_parameters(struct device *dev, pwm_regs->CONFIG = reg; } -static int pwm_xec_pin_set(struct device *dev, u32_t pwm, +static int pwm_xec_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -351,7 +351,7 @@ static int pwm_xec_pin_set(struct device *dev, u32_t pwm, return 0; } -static int pwm_xec_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int pwm_xec_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { ARG_UNUSED(dev); @@ -370,7 +370,7 @@ static int pwm_xec_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int pwm_xec_init(struct device *dev) +static int pwm_xec_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/pwm/pwm_mcux.c b/drivers/pwm/pwm_mcux.c index ea85892aa439..920b84886326 100644 --- a/drivers/pwm/pwm_mcux.c +++ b/drivers/pwm/pwm_mcux.c @@ -31,7 +31,7 @@ struct pwm_mcux_data { pwm_signal_param_t channel[CHANNEL_COUNT]; }; -static int mcux_pwm_pin_set(struct device *dev, u32_t pwm, +static int mcux_pwm_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -108,7 +108,7 @@ static int mcux_pwm_pin_set(struct device *dev, u32_t pwm, return 0; } -static int mcux_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int mcux_pwm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct pwm_mcux_config *config = dev->config_info; @@ -118,7 +118,7 @@ static int mcux_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int pwm_mcux_init(struct device *dev) +static int pwm_mcux_init(const struct device *dev) { const struct pwm_mcux_config *config = dev->config_info; struct pwm_mcux_data *data = dev->driver_data; diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c index d9e41bbf5975..78a7ac4ad62a 100644 --- a/drivers/pwm/pwm_mcux_ftm.c +++ b/drivers/pwm/pwm_mcux_ftm.c @@ -35,7 +35,7 @@ struct mcux_ftm_data { ftm_chnl_pwm_config_param_t channel[MAX_CHANNELS]; }; -static int mcux_ftm_pin_set(struct device *dev, u32_t pwm, +static int mcux_ftm_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -95,7 +95,7 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm, return 0; } -static int mcux_ftm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int mcux_ftm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct mcux_ftm_config *config = dev->config_info; @@ -106,12 +106,12 @@ static int mcux_ftm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int mcux_ftm_init(struct device *dev) +static int mcux_ftm_init(const struct device *dev) { const struct mcux_ftm_config *config = dev->config_info; struct mcux_ftm_data *data = dev->driver_data; ftm_chnl_pwm_config_param_t *channel = data->channel; - struct device *clock_dev; + const struct device *clock_dev; ftm_config_t ftm_config; int i; diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c index 99495bd5ea2a..a463d5e0a3ca 100644 --- a/drivers/pwm/pwm_mcux_tpm.c +++ b/drivers/pwm/pwm_mcux_tpm.c @@ -39,7 +39,7 @@ struct mcux_tpm_data { tpm_chnl_pwm_signal_param_t channel[MAX_CHANNELS]; }; -static int mcux_tpm_pin_set(struct device *dev, u32_t pwm, +static int mcux_tpm_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -116,7 +116,7 @@ static int mcux_tpm_pin_set(struct device *dev, u32_t pwm, return 0; } -static int mcux_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int mcux_tpm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct mcux_tpm_config *config = dev->config_info; @@ -127,12 +127,12 @@ static int mcux_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int mcux_tpm_init(struct device *dev) +static int mcux_tpm_init(const struct device *dev) { const struct mcux_tpm_config *config = dev->config_info; struct mcux_tpm_data *data = dev->driver_data; tpm_chnl_pwm_signal_param_t *channel = data->channel; - struct device *clock_dev; + const struct device *clock_dev; tpm_config_t tpm_config; int i; diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c index bc64e21a9c12..0747ae11b361 100644 --- a/drivers/pwm/pwm_nrf5_sw.c +++ b/drivers/pwm/pwm_nrf5_sw.c @@ -88,7 +88,7 @@ static u8_t pwm_channel_map(struct pwm_data *data, u8_t map_size, return i; } -static int pwm_nrf5_sw_pin_set(struct device *dev, u32_t pwm, +static int pwm_nrf5_sw_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -213,7 +213,7 @@ static int pwm_nrf5_sw_pin_set(struct device *dev, u32_t pwm, return 0; } -static int pwm_nrf5_sw_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int pwm_nrf5_sw_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct pwm_config *config; @@ -231,7 +231,7 @@ static const struct pwm_driver_api pwm_nrf5_sw_drv_api_funcs = { .get_cycles_per_sec = pwm_nrf5_sw_get_cycles_per_sec, }; -static int pwm_nrf5_sw_init(struct device *dev) +static int pwm_nrf5_sw_init(const struct device *dev) { const struct pwm_config *config; NRF_TIMER_Type *timer; diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index dc402b8de82c..77761f1c128c 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -122,7 +122,7 @@ static bool any_other_channel_is_active(u8_t channel, return false; } -static int pwm_nrfx_pin_set(struct device *dev, u32_t pwm, +static int pwm_nrfx_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -248,7 +248,7 @@ static int pwm_nrfx_pin_set(struct device *dev, u32_t pwm, return 0; } -static int pwm_nrfx_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int pwm_nrfx_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { /* TODO: Since this function might be removed, we will always return @@ -265,7 +265,7 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = { .get_cycles_per_sec = pwm_nrfx_get_cycles_per_sec, }; -static int pwm_nrfx_init(struct device *dev) +static int pwm_nrfx_init(const struct device *dev) { const struct pwm_nrfx_config *config = dev->config_info; @@ -283,7 +283,7 @@ static int pwm_nrfx_init(struct device *dev) #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static void pwm_nrfx_uninit(struct device *dev) +static void pwm_nrfx_uninit(const struct device *dev) { const struct pwm_nrfx_config *config = dev->config_info; @@ -292,7 +292,7 @@ static void pwm_nrfx_uninit(struct device *dev) static int pwm_nrfx_set_power_state(u32_t new_state, u32_t current_state, - struct device *dev) + const struct device *dev) { int err = 0; @@ -315,7 +315,7 @@ static int pwm_nrfx_set_power_state(u32_t new_state, return err; } -static int pwm_nrfx_pm_control(struct device *dev, +static int pwm_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, u32_t *current_state) @@ -342,7 +342,7 @@ static int pwm_nrfx_pm_control(struct device *dev, } #define PWM_NRFX_PM_CONTROL(idx) \ - static int pwm_##idx##_nrfx_pm_control(struct device *dev, \ + static int pwm_##idx##_nrfx_pm_control(const struct device *dev, \ u32_t ctrl_command, \ void *context, \ device_pm_cb cb, \ diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c index ac1ec89333ba..9b156533298e 100644 --- a/drivers/pwm/pwm_pca9685.c +++ b/drivers/pwm/pwm_pca9685.c @@ -43,11 +43,11 @@ * @param dev Device struct. * @return 1 if I2C master is identified, 0 if not. */ -static inline int has_i2c_master(struct device *dev) +static inline int has_i2c_master(const struct device *dev) { struct pwm_pca9685_drv_data * const drv_data = (struct pwm_pca9685_drv_data * const)dev->driver_data; - struct device * const i2c_master = drv_data->i2c_master; + const struct device * const i2c_master = drv_data->i2c_master; if (i2c_master) { return 1; @@ -60,7 +60,7 @@ static inline int has_i2c_master(struct device *dev) * period_count is always taken as 4095. To control the on period send * value to pulse_count */ -static int pwm_pca9685_pin_set_cycles(struct device *dev, u32_t pwm, +static int pwm_pca9685_pin_set_cycles(const struct device *dev, u32_t pwm, u32_t period_count, u32_t pulse_count, pwm_flags_t flags) { @@ -68,7 +68,7 @@ static int pwm_pca9685_pin_set_cycles(struct device *dev, u32_t pwm, dev->config_info; struct pwm_pca9685_drv_data * const drv_data = (struct pwm_pca9685_drv_data * const)dev->driver_data; - struct device * const i2c_master = drv_data->i2c_master; + const struct device * const i2c_master = drv_data->i2c_master; u16_t i2c_addr = config->i2c_slave_addr; u8_t buf[] = { 0, 0, 0, 0, 0}; @@ -125,13 +125,13 @@ static const struct pwm_driver_api pwm_pca9685_drv_api_funcs = { * @param dev Device struct * @return 0 if successful, failed otherwise. */ -int pwm_pca9685_init(struct device *dev) +int pwm_pca9685_init(const struct device *dev) { const struct pwm_pca9685_config * const config = dev->config_info; struct pwm_pca9685_drv_data * const drv_data = (struct pwm_pca9685_drv_data * const)dev->driver_data; - struct device *i2c_master; + const struct device *i2c_master; u8_t buf[] = {0, 0}; int ret; diff --git a/drivers/pwm/pwm_pca9685.h b/drivers/pwm/pwm_pca9685.h index d3eb15ec0b74..5797d7925859 100644 --- a/drivers/pwm/pwm_pca9685.h +++ b/drivers/pwm/pwm_pca9685.h @@ -24,7 +24,7 @@ extern "C" { * @param dev Device struct * @return 0 if successful, failed otherwise */ -extern int pwm_pca9685_init(struct device *dev); +extern int pwm_pca9685_init(const struct device *dev); /** Configuration data */ struct pwm_pca9685_config { @@ -39,7 +39,7 @@ struct pwm_pca9685_config { /** Runtime driver data */ struct pwm_pca9685_drv_data { /** Master I2C device */ - struct device *i2c_master; + const struct device *i2c_master; }; #ifdef __cplusplus diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c index 2cdf26a346f8..a33606b99f0a 100644 --- a/drivers/pwm/pwm_rv32m1_tpm.c +++ b/drivers/pwm/pwm_rv32m1_tpm.c @@ -38,7 +38,7 @@ struct rv32m1_tpm_data { tpm_chnl_pwm_signal_param_t channel[MAX_CHANNELS]; }; -static int rv32m1_tpm_pin_set(struct device *dev, u32_t pwm, +static int rv32m1_tpm_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -115,7 +115,7 @@ static int rv32m1_tpm_pin_set(struct device *dev, u32_t pwm, return 0; } -static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int rv32m1_tpm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct rv32m1_tpm_config *config = dev->config_info; @@ -126,12 +126,12 @@ static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int rv32m1_tpm_init(struct device *dev) +static int rv32m1_tpm_init(const struct device *dev) { const struct rv32m1_tpm_config *config = dev->config_info; struct rv32m1_tpm_data *data = dev->driver_data; tpm_chnl_pwm_signal_param_t *channel = data->channel; - struct device *clock_dev; + const struct device *clock_dev; tpm_config_t tpm_config; int i; diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c index 0ef7233a7432..c8c35244d4f6 100644 --- a/drivers/pwm/pwm_sam.c +++ b/drivers/pwm/pwm_sam.c @@ -25,7 +25,7 @@ struct sam_pwm_config { #define DEV_CFG(dev) \ ((const struct sam_pwm_config * const)(dev)->config_info) -static int sam_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int sam_pwm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { u8_t prescaler = DEV_CFG(dev)->prescaler; @@ -37,7 +37,7 @@ static int sam_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, return 0; } -static int sam_pwm_pin_set(struct device *dev, u32_t ch, +static int sam_pwm_pin_set(const struct device *dev, u32_t ch, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -75,7 +75,7 @@ static int sam_pwm_pin_set(struct device *dev, u32_t ch, return 0; } -static int sam_pwm_init(struct device *dev) +static int sam_pwm_init(const struct device *dev) { Pwm *const pwm = DEV_CFG(dev)->regs; u32_t id = DEV_CFG(dev)->id; diff --git a/drivers/pwm/pwm_shell.c b/drivers/pwm/pwm_shell.c index 6e6313cc180e..f751a59f3cdd 100644 --- a/drivers/pwm/pwm_shell.c +++ b/drivers/pwm/pwm_shell.c @@ -32,7 +32,7 @@ static const struct args_index args_indx = { static int cmd_cycles(const struct shell *shell, size_t argc, char **argv) { pwm_flags_t flags = 0; - struct device *dev; + const struct device *dev; u32_t period; u32_t pulse; u32_t pwm; @@ -65,7 +65,7 @@ static int cmd_cycles(const struct shell *shell, size_t argc, char **argv) static int cmd_usec(const struct shell *shell, size_t argc, char **argv) { pwm_flags_t flags = 0; - struct device *dev; + const struct device *dev; u32_t period; u32_t pulse; u32_t pwm; @@ -97,7 +97,7 @@ static int cmd_usec(const struct shell *shell, size_t argc, char **argv) static int cmd_nsec(const struct shell *shell, size_t argc, char **argv) { pwm_flags_t flags = 0; - struct device *dev; + const struct device *dev; u32_t period; u32_t pulse; u32_t pwm; diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c index 0139afd6e780..d6d4852c480e 100644 --- a/drivers/pwm/pwm_sifive.c +++ b/drivers/pwm/pwm_sifive.c @@ -68,7 +68,7 @@ static inline void sys_set_mask(mem_addr_t addr, u32_t mask, u32_t value) /* API Functions */ -static int pwm_sifive_init(struct device *dev) +static int pwm_sifive_init(const struct device *dev) { const struct pwm_sifive_cfg *config = dev->config_info; @@ -95,7 +95,7 @@ static int pwm_sifive_init(struct device *dev) return 0; } -static int pwm_sifive_pin_set(struct device *dev, +static int pwm_sifive_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, @@ -188,7 +188,7 @@ static int pwm_sifive_pin_set(struct device *dev, return 0; } -static int pwm_sifive_get_cycles_per_sec(struct device *dev, +static int pwm_sifive_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index c6f1ccc87d4c..b226f282d50c 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -107,7 +107,7 @@ static u32_t __get_tim_clk(u32_t bus_clk, * * return 0, or negative errno code */ -static int pwm_stm32_pin_set(struct device *dev, u32_t pwm, +static int pwm_stm32_pin_set(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags) { @@ -194,7 +194,7 @@ static int pwm_stm32_pin_set(struct device *dev, u32_t pwm, * * return 0, or negative errno code */ -static int pwm_stm32_get_cycles_per_sec(struct device *dev, u32_t pwm, +static int pwm_stm32_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles) { const struct pwm_stm32_config *cfg = DEV_CFG(dev); @@ -226,10 +226,10 @@ static const struct pwm_driver_api pwm_stm32_drv_api_funcs = { }; -static inline void __pwm_stm32_get_clock(struct device *dev) +static inline void __pwm_stm32_get_clock(const struct device *dev) { struct pwm_stm32_data *data = DEV_DATA(dev); - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); __ASSERT_NO_MSG(clk); @@ -237,7 +237,7 @@ static inline void __pwm_stm32_get_clock(struct device *dev) } -static int pwm_stm32_init(struct device *dev) +static int pwm_stm32_init(const struct device *dev) { const struct pwm_stm32_config *config = DEV_CFG(dev); struct pwm_stm32_data *data = DEV_DATA(dev); diff --git a/drivers/pwm/pwm_stm32.h b/drivers/pwm/pwm_stm32.h index 7d66685a80be..a21d789c7050 100644 --- a/drivers/pwm/pwm_stm32.h +++ b/drivers/pwm/pwm_stm32.h @@ -32,7 +32,7 @@ struct pwm_stm32_data { */ u32_t pwm_prescaler; /* clock device */ - struct device *clock; + const struct device *clock; }; #ifdef __cplusplus diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c index cd8644ef1272..d9dfe92c6bf0 100644 --- a/drivers/sensor/adt7420/adt7420.c +++ b/drivers/sensor/adt7420/adt7420.c @@ -19,7 +19,8 @@ #include LOG_MODULE_REGISTER(ADT7420, CONFIG_SENSOR_LOG_LEVEL); -static int adt7420_temp_reg_read(struct device *dev, u8_t reg, s16_t *val) +static int adt7420_temp_reg_read(const struct device *dev, u8_t reg, + s16_t *val) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; @@ -34,7 +35,8 @@ static int adt7420_temp_reg_read(struct device *dev, u8_t reg, s16_t *val) return 0; } -static int adt7420_temp_reg_write(struct device *dev, u8_t reg, s16_t val) +static int adt7420_temp_reg_write(const struct device *dev, u8_t reg, + s16_t val) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; @@ -43,10 +45,10 @@ static int adt7420_temp_reg_write(struct device *dev, u8_t reg, s16_t val) return i2c_write(drv_data->i2c, buf, sizeof(buf), cfg->i2c_addr); } -static int adt7420_attr_set(struct device *dev, - enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int adt7420_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; @@ -110,7 +112,8 @@ static int adt7420_attr_set(struct device *dev, return 0; } -static int adt7420_sample_fetch(struct device *dev, enum sensor_channel chan) +static int adt7420_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct adt7420_data *drv_data = dev->driver_data; s16_t value; @@ -127,9 +130,9 @@ static int adt7420_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int adt7420_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static int adt7420_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { struct adt7420_data *drv_data = dev->driver_data; s32_t value; @@ -154,7 +157,7 @@ static const struct sensor_driver_api adt7420_driver_api = { #endif }; -static int adt7420_probe(struct device *dev) +static int adt7420_probe(const struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; @@ -200,7 +203,7 @@ static int adt7420_probe(struct device *dev) return 0; } -static int adt7420_init(struct device *dev) +static int adt7420_init(const struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h index d0624abd6793..be8cac08090f 100644 --- a/drivers/sensor/adt7420/adt7420.h +++ b/drivers/sensor/adt7420/adt7420.h @@ -59,16 +59,16 @@ #define ADT7420_TEMP_SCALE 15625 struct adt7420_data { - struct device *i2c; + const struct device *i2c; s16_t sample; #ifdef CONFIG_ADT7420_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t th_handler; struct sensor_trigger th_trigger; - struct device *dev; + const struct device *dev; #if defined(CONFIG_ADT7420_TRIGGER_OWN_THREAD) K_THREAD_STACK_MEMBER(thread_stack, CONFIG_ADT7420_THREAD_STACK_SIZE); @@ -92,11 +92,11 @@ struct adt7420_dev_config { }; #ifdef CONFIG_ADT7420_TRIGGER -int adt7420_trigger_set(struct device *dev, +int adt7420_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int adt7420_init_interrupt(struct device *dev); +int adt7420_init_interrupt(const struct device *dev); #endif /* CONFIG_ADT7420_TRIGGER */ diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c index 0a769498f57c..1eb7cdf296cd 100644 --- a/drivers/sensor/adt7420/adt7420_trigger.c +++ b/drivers/sensor/adt7420/adt7420_trigger.c @@ -16,7 +16,7 @@ #include LOG_MODULE_DECLARE(ADT7420, CONFIG_SENSOR_LOG_LEVEL); -static void setup_int(struct device *dev, +static void setup_int(const struct device *dev, bool enable) { struct adt7420_data *drv_data = dev->driver_data; @@ -28,7 +28,7 @@ static void setup_int(struct device *dev, gpio_pin_interrupt_configure(drv_data->gpio, cfg->int_pin, flags); } -static void handle_int(struct device *dev) +static void handle_int(const struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; @@ -41,7 +41,7 @@ static void handle_int(struct device *dev) #endif } -static void process_int(struct device *dev) +static void process_int(const struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; @@ -67,7 +67,7 @@ static void process_int(struct device *dev) } } -static void adt7420_gpio_callback(struct device *dev, +static void adt7420_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct adt7420_data *drv_data = @@ -79,7 +79,7 @@ static void adt7420_gpio_callback(struct device *dev, #if defined(CONFIG_ADT7420_TRIGGER_OWN_THREAD) static void adt7420_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct adt7420_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -100,7 +100,7 @@ static void adt7420_work_cb(struct k_work *work) } #endif -int adt7420_trigger_set(struct device *dev, +int adt7420_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -131,7 +131,7 @@ int adt7420_trigger_set(struct device *dev, return 0; } -int adt7420_init_interrupt(struct device *dev) +int adt7420_init_interrupt(const struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; const struct adt7420_dev_config *cfg = dev->config_info; diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c index 0a660f80f910..879361e8b9f4 100644 --- a/drivers/sensor/adxl345/adxl345.c +++ b/drivers/sensor/adxl345/adxl345.c @@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(ADXL345, CONFIG_SENSOR_LOG_LEVEL); -static int adxl345_read_sample(struct device *dev, +static int adxl345_read_sample(const struct device *dev, struct adxl345_sample *sample) { struct adxl345_dev_data *data = dev->driver_data; @@ -56,7 +56,8 @@ static void adxl345_accel_convert(struct sensor_value *val, s16_t sample) val->val2 = 0; } -static int adxl345_sample_fetch(struct device *dev, enum sensor_channel chan) +static int adxl345_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct adxl345_dev_data *data = dev->driver_data; struct adxl345_sample sample; @@ -87,7 +88,7 @@ static int adxl345_sample_fetch(struct device *dev, enum sensor_channel chan) return samples_count; } -static int adxl345_channel_get(struct device *dev, +static int adxl345_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -128,7 +129,7 @@ static const struct sensor_driver_api adxl345_api_funcs = { .channel_get = adxl345_channel_get, }; -static int adxl345_init(struct device *dev) +static int adxl345_init(const struct device *dev) { int rc; struct adxl345_dev_data *data = dev->driver_data; diff --git a/drivers/sensor/adxl345/adxl345.h b/drivers/sensor/adxl345/adxl345.h index d0dda2316821..36f3ad62a431 100644 --- a/drivers/sensor/adxl345/adxl345.h +++ b/drivers/sensor/adxl345/adxl345.h @@ -37,7 +37,7 @@ struct adxl345_dev_data { unsigned int sample_number; - struct device *i2c_master; + const struct device *i2c_master; u8_t i2c_addr; s16_t bufx[ADXL345_MAX_FIFO_SIZE]; diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c index 6b52008e302c..db9d6934394e 100644 --- a/drivers/sensor/adxl362/adxl362.c +++ b/drivers/sensor/adxl362/adxl362.c @@ -58,7 +58,8 @@ static int adxl362_reg_access(struct adxl362_data *ctx, u8_t cmd, return spi_write(ctx->spi, &ctx->spi_cfg, &tx); } -static inline int adxl362_set_reg(struct device *dev, u16_t register_value, +static inline int adxl362_set_reg(const struct device *dev, + u16_t register_value, u8_t register_address, u8_t count) { struct adxl362_data *adxl362_data = dev->driver_data; @@ -70,7 +71,7 @@ static inline int adxl362_set_reg(struct device *dev, u16_t register_value, count); } -int adxl362_reg_write_mask(struct device *dev, u8_t register_address, +int adxl362_reg_write_mask(const struct device *dev, u8_t register_address, u8_t mask, u8_t data) { int ret; @@ -97,7 +98,7 @@ int adxl362_reg_write_mask(struct device *dev, u8_t register_address, 1); } -static inline int adxl362_get_reg(struct device *dev, u8_t *read_buf, +static inline int adxl362_get_reg(const struct device *dev, u8_t *read_buf, u8_t register_address, u8_t count) { struct adxl362_data *adxl362_data = dev->driver_data; @@ -109,9 +110,9 @@ static inline int adxl362_get_reg(struct device *dev, u8_t *read_buf, } #if defined(CONFIG_ADXL362_TRIGGER) -static int adxl362_interrupt_config(struct device *dev, - u8_t int1, - u8_t int2) +static int adxl362_interrupt_config(const struct device *dev, + u8_t int1, + u8_t int2) { int ret; struct adxl362_data *adxl362_data = dev->driver_data; @@ -133,12 +134,12 @@ static int adxl362_interrupt_config(struct device *dev, 1); } -int adxl362_get_status(struct device *dev, u8_t *status) +int adxl362_get_status(const struct device *dev, u8_t *status) { return adxl362_get_reg(dev, status, ADXL362_REG_STATUS, 1); } -int adxl362_clear_data_ready(struct device *dev) +int adxl362_clear_data_ready(const struct device *dev) { u8_t buf; /* Reading any data register clears the data ready interrupt */ @@ -146,13 +147,13 @@ int adxl362_clear_data_ready(struct device *dev) } #endif -static int adxl362_software_reset(struct device *dev) +static int adxl362_software_reset(const struct device *dev) { return adxl362_set_reg(dev, ADXL362_RESET_KEY, ADXL362_REG_SOFT_RESET, 1); } -static int adxl362_set_power_mode(struct device *dev, u8_t mode) +static int adxl362_set_power_mode(const struct device *dev, u8_t mode) { u8_t old_power_ctl; u8_t new_power_ctl; @@ -233,7 +234,7 @@ static s32_t adxl362_range_to_reg_val(u16_t range) return -EINVAL; } -static int adxl362_set_range(struct device *dev, u8_t range) +static int adxl362_set_range(const struct device *dev, u8_t range) { struct adxl362_data *adxl362_data = dev->driver_data; u8_t old_filter_ctl; @@ -256,7 +257,7 @@ static int adxl362_set_range(struct device *dev, u8_t range) return 0; } -static int adxl362_set_output_rate(struct device *dev, u8_t out_rate) +static int adxl362_set_output_rate(const struct device *dev, u8_t out_rate) { u8_t old_filter_ctl; u8_t new_filter_ctl; @@ -270,7 +271,8 @@ static int adxl362_set_output_rate(struct device *dev, u8_t out_rate) } -static int axl362_acc_config(struct device *dev, enum sensor_channel chan, +static int axl362_acc_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -314,9 +316,10 @@ static int axl362_acc_config(struct device *dev, enum sensor_channel chan, return 0; } -static int adxl362_attr_set_thresh(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int adxl362_attr_set_thresh(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { u8_t reg; u16_t threshold = val->val1; @@ -344,8 +347,10 @@ static int adxl362_attr_set_thresh(struct device *dev, enum sensor_channel chan, return ret; } -static int adxl362_attr_set(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, const struct sensor_value *val) +static int adxl362_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { case SENSOR_ATTR_UPPER_THRESH: @@ -370,7 +375,7 @@ static int adxl362_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int adxl362_fifo_setup(struct device *dev, u8_t mode, +static int adxl362_fifo_setup(const struct device *dev, u8_t mode, u16_t water_mark_lvl, u8_t en_temp_read) { u8_t write_val; @@ -392,7 +397,7 @@ static int adxl362_fifo_setup(struct device *dev, u8_t mode, return 0; } -static int adxl362_setup_activity_detection(struct device *dev, +static int adxl362_setup_activity_detection(const struct device *dev, u8_t ref_or_abs, u16_t threshold, u8_t time) @@ -450,7 +455,7 @@ static int adxl362_setup_activity_detection(struct device *dev, return 0; } -static int adxl362_setup_inactivity_detection(struct device *dev, +static int adxl362_setup_inactivity_detection(const struct device *dev, u8_t ref_or_abs, u16_t threshold, u16_t time) @@ -493,7 +498,7 @@ static int adxl362_setup_inactivity_detection(struct device *dev, return 0; } -int adxl362_set_interrupt_mode(struct device *dev, u8_t mode) +int adxl362_set_interrupt_mode(const struct device *dev, u8_t mode) { u8_t old_act_inact_reg; u8_t new_act_inact_reg; @@ -530,7 +535,8 @@ int adxl362_set_interrupt_mode(struct device *dev, u8_t mode) return 0; } -static int adxl362_sample_fetch(struct device *dev, enum sensor_channel chan) +static int adxl362_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct adxl362_data *data = dev->driver_data; s16_t buf[4]; @@ -588,7 +594,7 @@ static void adxl362_temp_convert(struct sensor_value *val, int temp) val->val2 = (milli_c % 1000) * 1000; } -static int adxl362_channel_get(struct device *dev, +static int adxl362_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -623,7 +629,7 @@ static const struct sensor_driver_api adxl362_api_funcs = { #endif }; -static int adxl362_chip_init(struct device *dev) +static int adxl362_chip_init(const struct device *dev) { int ret; @@ -719,7 +725,7 @@ static int adxl362_chip_init(struct device *dev) * -1 - an error occurred. * */ -static int adxl362_init(struct device *dev) +static int adxl362_init(const struct device *dev) { const struct adxl362_config *config = dev->config_info; struct adxl362_data *data = dev->driver_data; diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h index 06dd9a45148e..f394238077bd 100644 --- a/drivers/sensor/adxl362/adxl362.h +++ b/drivers/sensor/adxl362/adxl362.h @@ -188,7 +188,7 @@ struct adxl362_config { }; struct adxl362_data { - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) struct spi_cs_control adxl362_cs_ctrl; @@ -200,7 +200,7 @@ struct adxl362_data { u8_t selected_range; #if defined(CONFIG_ADXL362_TRIGGER) - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct k_mutex trigger_mutex; @@ -215,7 +215,7 @@ struct adxl362_data { struct k_thread thread; #elif defined(CONFIG_ADXL362_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_ADXL362_TRIGGER */ }; @@ -245,22 +245,22 @@ struct adxl362_data { #endif #ifdef CONFIG_ADXL362_TRIGGER -int adxl362_reg_write_mask(struct device *dev, +int adxl362_reg_write_mask(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t data); -int adxl362_get_status(struct device *dev, u8_t *status); +int adxl362_get_status(const struct device *dev, u8_t *status); -int adxl362_interrupt_activity_enable(struct device *dev); +int adxl362_interrupt_activity_enable(const struct device *dev); -int adxl362_trigger_set(struct device *dev, +int adxl362_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int adxl362_init_interrupt(struct device *dev); +int adxl362_init_interrupt(const struct device *dev); -int adxl362_set_interrupt_mode(struct device *dev, u8_t mode); +int adxl362_set_interrupt_mode(const struct device *dev, u8_t mode); -int adxl362_clear_data_ready(struct device *dev); +int adxl362_clear_data_ready(const struct device *dev); #endif /* CONFIG_ADT7420_TRIGGER */ #endif /* ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_ */ diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c index 0b920ac487ee..25d7e714017e 100644 --- a/drivers/sensor/adxl362/adxl362_trigger.c +++ b/drivers/sensor/adxl362/adxl362_trigger.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(ADXL362, CONFIG_SENSOR_LOG_LEVEL); static void adxl362_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct adxl362_data *drv_data = dev->driver_data; u8_t status_buf; @@ -44,7 +44,7 @@ static void adxl362_thread_cb(void *arg) k_mutex_unlock(&drv_data->trigger_mutex); } -static void adxl362_gpio_callback(struct device *dev, +static void adxl362_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct adxl362_data *drv_data = @@ -60,7 +60,7 @@ static void adxl362_gpio_callback(struct device *dev, #if defined(CONFIG_ADXL362_TRIGGER_OWN_THREAD) static void adxl362_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct adxl362_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -80,7 +80,7 @@ static void adxl362_work_cb(struct k_work *work) } #endif -int adxl362_trigger_set(struct device *dev, +int adxl362_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -120,7 +120,7 @@ int adxl362_trigger_set(struct device *dev, return adxl362_reg_write_mask(dev, ADXL362_REG_INTMAP1, int_mask, int_en); } -int adxl362_init_interrupt(struct device *dev) +int adxl362_init_interrupt(const struct device *dev) { struct adxl362_data *drv_data = dev->driver_data; const struct adxl362_config *cfg = dev->config_info; diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c index ce51075b28dd..39c9d82f6b21 100644 --- a/drivers/sensor/adxl372/adxl372.c +++ b/drivers/sensor/adxl372/adxl372.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(ADXL372, CONFIG_SENSOR_LOG_LEVEL); -static int adxl372_bus_access(struct device *dev, u8_t reg, +static int adxl372_bus_access(const struct device *dev, u8_t reg, void *data, size_t length) { struct adxl372_data *adxl372_data = dev->driver_data; @@ -84,7 +84,7 @@ static int adxl372_bus_access(struct device *dev, u8_t reg, * @param reg_data - The register data. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_reg_read(struct device *dev, +static int adxl372_reg_read(const struct device *dev, u8_t reg_addr, u8_t *reg_data) { @@ -100,7 +100,7 @@ static int adxl372_reg_read(struct device *dev, * @param count - Number of bytes to read. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_reg_read_multiple(struct device *dev, +static int adxl372_reg_read_multiple(const struct device *dev, u8_t reg_addr, u8_t *reg_data, u16_t count) @@ -116,7 +116,7 @@ static int adxl372_reg_read_multiple(struct device *dev, * @param reg_data - The register data. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_reg_write(struct device *dev, +static int adxl372_reg_write(const struct device *dev, u8_t reg_addr, u8_t reg_data) { @@ -134,7 +134,7 @@ static int adxl372_reg_write(struct device *dev, * @param data - The register data. * @return 0 in case of success, negative error code otherwise. */ -int adxl372_reg_write_mask(struct device *dev, +int adxl372_reg_write_mask(const struct device *dev, u8_t reg_addr, u32_t mask, u8_t data) @@ -160,8 +160,9 @@ int adxl372_reg_write_mask(struct device *dev, * @param act - The activity config structure. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_activity_threshold(struct device *dev, u8_t axis_reg_h, - const struct adxl372_activity_threshold *act) +static int adxl372_set_activity_threshold(const struct device *dev, + u8_t axis_reg_h, + const struct adxl372_activity_threshold *act) { int ret; u8_t val; @@ -191,9 +192,9 @@ static int adxl372_set_activity_threshold(struct device *dev, u8_t axis_reg_h, * @param act - The activity config structure. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_activity_threshold_xyz(struct device *dev, - u8_t axis_reg_h, - const struct adxl372_activity_threshold *act) +static int adxl372_set_activity_threshold_xyz(const struct device *dev, + u8_t axis_reg_h, + const struct adxl372_activity_threshold *act) { int i, ret; @@ -218,7 +219,8 @@ static int adxl372_set_activity_threshold_xyz(struct device *dev, * ADXL372_FULL_BW_MEASUREMENT * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_op_mode(struct device *dev, enum adxl372_op_mode op_mode) +static int adxl372_set_op_mode(const struct device *dev, + enum adxl372_op_mode op_mode) { return adxl372_reg_write_mask(dev, ADXL372_POWER_CTL, ADXL372_POWER_CTL_MODE_MSK, @@ -233,7 +235,7 @@ static int adxl372_set_op_mode(struct device *dev, enum adxl372_op_mode op_mode) * false * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_autosleep(struct device *dev, bool enable) +static int adxl372_set_autosleep(const struct device *dev, bool enable) { return adxl372_reg_write_mask(dev, ADXL372_MEASURE, ADXL372_MEASURE_AUTOSLEEP_MSK, @@ -252,7 +254,8 @@ static int adxl372_set_autosleep(struct device *dev, bool enable) * ADXL372_BW_LPF_DISABLED * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_bandwidth(struct device *dev, enum adxl372_bandwidth bw) +static int adxl372_set_bandwidth(const struct device *dev, + enum adxl372_bandwidth bw) { int ret; u8_t mask; @@ -285,7 +288,8 @@ static int adxl372_set_bandwidth(struct device *dev, enum adxl372_bandwidth bw) * ADXL372_HPF_DISABLED * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_hpf_corner(struct device *dev, enum adxl372_hpf_corner c) +static int adxl372_set_hpf_corner(const struct device *dev, + enum adxl372_hpf_corner c) { int ret; @@ -316,7 +320,7 @@ static int adxl372_set_hpf_corner(struct device *dev, enum adxl372_hpf_corner c) * ADXL372_LOOPED * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_act_proc_mode(struct device *dev, +static int adxl372_set_act_proc_mode(const struct device *dev, enum adxl372_act_proc_mode mode) { return adxl372_reg_write_mask(dev, ADXL372_MEASURE, @@ -335,7 +339,7 @@ static int adxl372_set_act_proc_mode(struct device *dev, * ADXL372_ODR_6400HZ * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_odr(struct device *dev, enum adxl372_odr odr) +static int adxl372_set_odr(const struct device *dev, enum adxl372_odr odr) { return adxl372_reg_write_mask(dev, ADXL372_TIMING, ADXL372_TIMING_ODR_MSK, @@ -350,8 +354,8 @@ static int adxl372_set_odr(struct device *dev, enum adxl372_odr odr) * ADXL372_INSTANT_ON_HIGH_TH * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_instant_on_th(struct device *dev, - enum adxl372_instant_on_th_mode mode) +static int adxl372_set_instant_on_th(const struct device *dev, + enum adxl372_instant_on_th_mode mode) { return adxl372_reg_write_mask(dev, ADXL372_POWER_CTL, ADXL372_POWER_CTL_INSTANT_ON_TH_MSK, @@ -372,8 +376,8 @@ static int adxl372_set_instant_on_th(struct device *dev, * ADXL372_WUR_24576ms * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_wakeup_rate(struct device *dev, - enum adxl372_wakeup_rate wur) +static int adxl372_set_wakeup_rate(const struct device *dev, + enum adxl372_wakeup_rate wur) { return adxl372_reg_write_mask(dev, ADXL372_TIMING, ADXL372_TIMING_WAKE_UP_RATE_MSK, @@ -386,7 +390,7 @@ static int adxl372_set_wakeup_rate(struct device *dev, * @param time - The value set in this register. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_activity_time(struct device *dev, u8_t time) +static int adxl372_set_activity_time(const struct device *dev, u8_t time) { return adxl372_reg_write(dev, ADXL372_TIME_ACT, time); } @@ -398,7 +402,7 @@ static int adxl372_set_activity_time(struct device *dev, u8_t time) * (eight LSBs) and the TIME_INACT_H register (eight MSBs). * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_inactivity_time(struct device *dev, u16_t time) +static int adxl372_set_inactivity_time(const struct device *dev, u16_t time) { int ret; @@ -418,8 +422,8 @@ static int adxl372_set_inactivity_time(struct device *dev, u16_t time) * ADXL372_FILTER_SETTLE_16 * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_set_filter_settle(struct device *dev, - enum adxl372_filter_settle mode) +static int adxl372_set_filter_settle(const struct device *dev, + enum adxl372_filter_settle mode) { return adxl372_reg_write_mask(dev, ADXL372_POWER_CTL, ADXL372_POWER_CTL_FIL_SETTLE_MSK, @@ -433,9 +437,9 @@ static int adxl372_set_filter_settle(struct device *dev, * @param int2 - INT2 interrupt pins. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_interrupt_config(struct device *dev, - u8_t int1, - u8_t int2) +static int adxl372_interrupt_config(const struct device *dev, + u8_t int1, + u8_t int2) { int ret; @@ -457,7 +461,7 @@ static int adxl372_interrupt_config(struct device *dev, * FIFO buffer (0 to 512) * @return 0 in case of success, negative error code otherwise. */ -int adxl372_get_status(struct device *dev, +int adxl372_get_status(const struct device *dev, u8_t *status1, u8_t *status2, u16_t *fifo_entries) @@ -493,7 +497,7 @@ int adxl372_get_status(struct device *dev, * @param dev - The device structure. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_reset(struct device *dev) +static int adxl372_reset(const struct device *dev) { int ret; @@ -531,10 +535,10 @@ static int adxl372_reset(struct device *dev) * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_configure_fifo(struct device *dev, - enum adxl372_fifo_mode mode, - enum adxl372_fifo_format format, - u16_t fifo_samples) +static int adxl372_configure_fifo(const struct device *dev, + enum adxl372_fifo_mode mode, + enum adxl372_fifo_format format, + u16_t fifo_samples) { struct adxl372_data *data = dev->driver_data; u8_t fifo_config; @@ -581,8 +585,8 @@ static int adxl372_configure_fifo(struct device *dev, * where (x, y, z) acceleration data will be stored. * @return 0 in case of success, negative error code otherwise. */ -static int adxl372_get_accel_data(struct device *dev, bool maxpeak, - struct adxl372_xyz_accel_data *accel_data) +static int adxl372_get_accel_data(const struct device *dev, bool maxpeak, + struct adxl372_xyz_accel_data *accel_data) { u8_t buf[6]; u8_t status1; @@ -604,9 +608,10 @@ static int adxl372_get_accel_data(struct device *dev, bool maxpeak, return ret; } -static int adxl372_attr_set_odr(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int adxl372_attr_set_odr(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { enum adxl372_odr odr; @@ -633,9 +638,10 @@ static int adxl372_attr_set_odr(struct device *dev, enum sensor_channel chan, return adxl372_set_odr(dev, odr); } -static int adxl372_attr_set_thresh(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int adxl372_attr_set_thresh(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { const struct adxl372_dev_config *cfg = dev->config_info; struct adxl372_activity_threshold threshold; @@ -674,7 +680,8 @@ static int adxl372_attr_set_thresh(struct device *dev, enum sensor_channel chan, } } -static int adxl372_attr_set(struct device *dev, enum sensor_channel chan, +static int adxl372_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -689,7 +696,8 @@ static int adxl372_attr_set(struct device *dev, enum sensor_channel chan, } } -static int adxl372_sample_fetch(struct device *dev, enum sensor_channel chan) +static int adxl372_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct adxl372_data *data = dev->driver_data; const struct adxl372_dev_config *cfg = dev->config_info; @@ -710,7 +718,7 @@ static void adxl372_accel_convert(struct sensor_value *val, s16_t value) val->val2 = micro_ms2 % 1000000; } -static int adxl372_channel_get(struct device *dev, +static int adxl372_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -748,7 +756,7 @@ static const struct sensor_driver_api adxl372_api_funcs = { }; -static int adxl372_probe(struct device *dev) +static int adxl372_probe(const struct device *dev) { const struct adxl372_dev_config *cfg = dev->config_info; u8_t dev_id, part_id; @@ -875,7 +883,7 @@ static int adxl372_probe(struct device *dev) return adxl372_set_act_proc_mode(dev, cfg->act_proc_mode); } -static int adxl372_init(struct device *dev) +static int adxl372_init(const struct device *dev) { struct adxl372_data *data = dev->driver_data; const struct adxl372_dev_config *cfg = dev->config_info; diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h index e99c368b27eb..0d0f9c30caf3 100644 --- a/drivers/sensor/adxl372/adxl372.h +++ b/drivers/sensor/adxl372/adxl372.h @@ -279,7 +279,7 @@ struct adxl372_xyz_accel_data { }; struct adxl372_data { - struct device *bus; + const struct device *bus; #ifdef CONFIG_ADXL372_SPI struct spi_config spi_cfg; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) @@ -290,7 +290,7 @@ struct adxl372_data { struct adxl372_fifo_config fifo_config; #ifdef CONFIG_ADXL372_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t th_handler; @@ -304,7 +304,7 @@ struct adxl372_data { struct k_thread thread; #elif defined(CONFIG_ADXL372_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_ADXL372_TRIGGER */ }; @@ -354,17 +354,17 @@ struct adxl372_dev_config { }; #ifdef CONFIG_ADXL372_TRIGGER -int adxl372_get_status(struct device *dev, +int adxl372_get_status(const struct device *dev, u8_t *status1, u8_t *status2, u16_t *fifo_entries); -int adxl372_reg_write_mask(struct device *dev, +int adxl372_reg_write_mask(const struct device *dev, u8_t reg_addr, u32_t mask, u8_t data); -int adxl372_trigger_set(struct device *dev, +int adxl372_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int adxl372_init_interrupt(struct device *dev); +int adxl372_init_interrupt(const struct device *dev); #endif /* CONFIG_ADT7420_TRIGGER */ #endif /* ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_ */ diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c index bba4f063a901..ed6d3b82f0da 100644 --- a/drivers/sensor/adxl372/adxl372_trigger.c +++ b/drivers/sensor/adxl372/adxl372_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(ADXL372, CONFIG_SENSOR_LOG_LEVEL); static void adxl372_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct adxl372_data *drv_data = dev->driver_data; const struct adxl372_dev_config *cfg = dev->config_info; u8_t status1, status2; @@ -51,7 +51,7 @@ static void adxl372_thread_cb(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void adxl372_gpio_callback(struct device *dev, +static void adxl372_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct adxl372_data *drv_data = @@ -71,7 +71,7 @@ static void adxl372_gpio_callback(struct device *dev, #if defined(CONFIG_ADXL372_TRIGGER_OWN_THREAD) static void adxl372_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct adxl372_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -92,7 +92,7 @@ static void adxl372_work_cb(struct k_work *work) } #endif -int adxl372_trigger_set(struct device *dev, +int adxl372_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -138,7 +138,7 @@ int adxl372_trigger_set(struct device *dev, return ret; } -int adxl372_init_interrupt(struct device *dev) +int adxl372_init_interrupt(const struct device *dev) { struct adxl372_data *drv_data = dev->driver_data; const struct adxl372_dev_config *cfg = dev->config_info; diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c index 59341c928442..b71e1839a742 100644 --- a/drivers/sensor/ak8975/ak8975.c +++ b/drivers/sensor/ak8975/ak8975.c @@ -19,7 +19,8 @@ LOG_MODULE_REGISTER(AK8975, CONFIG_SENSOR_LOG_LEVEL); -static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) +static int ak8975_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct ak8975_data *drv_data = dev->driver_data; u8_t buf[6]; @@ -60,7 +61,7 @@ static void ak8975_convert(struct sensor_value *val, s16_t sample, val->val2 = conv_val % 1000000; } -static int ak8975_channel_get(struct device *dev, +static int ak8975_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -116,7 +117,7 @@ static int ak8975_read_adjustment_data(struct ak8975_data *drv_data) return 0; } -int ak8975_init(struct device *dev) +int ak8975_init(const struct device *dev) { struct ak8975_data *drv_data = dev->driver_data; u8_t id; diff --git a/drivers/sensor/ak8975/ak8975.h b/drivers/sensor/ak8975/ak8975.h index 93f3c5e4d0fe..e562b8b534d2 100644 --- a/drivers/sensor/ak8975/ak8975.h +++ b/drivers/sensor/ak8975/ak8975.h @@ -40,7 +40,7 @@ struct ak8975_data { - struct device *i2c; + const struct device *i2c; s16_t x_sample; s16_t y_sample; diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c index 0a8d6b9a28c0..325cbe10844d 100644 --- a/drivers/sensor/amg88xx/amg88xx.c +++ b/drivers/sensor/amg88xx/amg88xx.c @@ -21,7 +21,8 @@ LOG_MODULE_REGISTER(AMG88XX, CONFIG_SENSOR_LOG_LEVEL); -static int amg88xx_sample_fetch(struct device *dev, enum sensor_channel chan) +static int amg88xx_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct amg88xx_data *drv_data = dev->driver_data; const struct amg88xx_config *config = dev->config_info; @@ -38,7 +39,7 @@ static int amg88xx_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int amg88xx_channel_get(struct device *dev, +static int amg88xx_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -63,7 +64,7 @@ static int amg88xx_channel_get(struct device *dev, return 0; } -static int amg88xx_init_device(struct device *dev) +static int amg88xx_init_device(const struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; const struct amg88xx_config *config = dev->config_info; @@ -103,7 +104,7 @@ static int amg88xx_init_device(struct device *dev) return 0; } -int amg88xx_init(struct device *dev) +int amg88xx_init(const struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; const struct amg88xx_config *config = dev->config_info; diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h index 6c5bf4a360f5..ba6d7d48a3cc 100644 --- a/drivers/sensor/amg88xx/amg88xx.h +++ b/drivers/sensor/amg88xx/amg88xx.h @@ -77,11 +77,11 @@ struct amg88xx_config { }; struct amg88xx_data { - struct device *i2c; + const struct device *i2c; s16_t sample[64]; #ifdef CONFIG_AMG88XX_TRIGGER - struct device *gpio; + const struct device *gpio; u8_t gpio_pin; struct gpio_callback gpio_cb; @@ -97,23 +97,23 @@ struct amg88xx_data { struct k_thread thread; #elif defined(CONFIG_AMG88XX_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_AMG88XX_TRIGGER */ }; #ifdef CONFIG_AMG88XX_TRIGGER -int amg88xx_attr_set(struct device *dev, +int amg88xx_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int amg88xx_trigger_set(struct device *dev, +int amg88xx_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int amg88xx_init_interrupt(struct device *dev); +int amg88xx_init_interrupt(const struct device *dev); #endif /* CONFIG_AMG88XX_TRIGGER */ #endif diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c index a477750ade44..b100ffd93ac9 100644 --- a/drivers/sensor/amg88xx/amg88xx_trigger.c +++ b/drivers/sensor/amg88xx/amg88xx_trigger.c @@ -30,7 +30,7 @@ static inline void amg88xx_setup_int(struct amg88xx_data *drv_data, flags); } -int amg88xx_attr_set(struct device *dev, +int amg88xx_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -73,7 +73,7 @@ int amg88xx_attr_set(struct device *dev, return 0; } -static void amg88xx_gpio_callback(struct device *dev, +static void amg88xx_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct amg88xx_data *drv_data = @@ -90,7 +90,7 @@ static void amg88xx_gpio_callback(struct device *dev, static void amg88xx_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct amg88xx_data *drv_data = dev->driver_data; const struct amg88xx_config *config = dev->config_info; u8_t status; @@ -114,7 +114,7 @@ static void amg88xx_thread_cb(void *arg) #ifdef CONFIG_AMG88XX_TRIGGER_OWN_THREAD static void amg88xx_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct amg88xx_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -131,11 +131,11 @@ static void amg88xx_work_cb(struct k_work *work) { struct amg88xx_data *drv_data = CONTAINER_OF(work, struct amg88xx_data, work); - amg88xx_thread_cb(drv_data->dev); + amg88xx_thread_cb((void *)drv_data->dev); } #endif -int amg88xx_trigger_set(struct device *dev, +int amg88xx_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -167,7 +167,7 @@ int amg88xx_trigger_set(struct device *dev, return 0; } -int amg88xx_init_interrupt(struct device *dev) +int amg88xx_init_interrupt(const struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; const struct amg88xx_config *config = dev->config_info; diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c index d6f1acbe6fd9..4cae2a377f4b 100644 --- a/drivers/sensor/ams_iAQcore/iAQcore.c +++ b/drivers/sensor/ams_iAQcore/iAQcore.c @@ -19,7 +19,8 @@ LOG_MODULE_REGISTER(IAQ_CORE, CONFIG_SENSOR_LOG_LEVEL); -static int iaqcore_sample_fetch(struct device *dev, enum sensor_channel chan) +static int iaqcore_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct iaq_core_data *drv_data = dev->driver_data; struct iaq_registers buf; @@ -66,7 +67,7 @@ static int iaqcore_sample_fetch(struct device *dev, enum sensor_channel chan) return -EIO; } -static int iaqcore_channel_get(struct device *dev, +static int iaqcore_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -97,7 +98,7 @@ static const struct sensor_driver_api iaq_core_driver_api = { .channel_get = iaqcore_channel_get, }; -static int iaq_core_init(struct device *dev) +static int iaq_core_init(const struct device *dev) { struct iaq_core_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/ams_iAQcore/iAQcore.h b/drivers/sensor/ams_iAQcore/iAQcore.h index ae6a6b9a685a..3ed4efc99fc4 100644 --- a/drivers/sensor/ams_iAQcore/iAQcore.h +++ b/drivers/sensor/ams_iAQcore/iAQcore.h @@ -18,7 +18,7 @@ struct iaq_registers { } __packed; struct iaq_core_data { - struct device *i2c; + const struct device *i2c; u16_t co2; u16_t voc; u8_t status; diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index 9dea11a998a3..bde94d49671d 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -36,8 +36,8 @@ static void apds9960_handle_cb(struct apds9960_data *drv_data) #endif } -static void apds9960_gpio_callback(struct device *dev, - struct gpio_callback *cb, u32_t pins) +static void apds9960_gpio_callback(const struct device *dev, + struct gpio_callback *cb, u32_t pins) { struct apds9960_data *drv_data = CONTAINER_OF(cb, struct apds9960_data, gpio_cb); @@ -45,7 +45,8 @@ static void apds9960_gpio_callback(struct device *dev, apds9960_handle_cb(drv_data); } -static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) +static int apds9960_sample_fetch(const struct device *dev, + enum sensor_channel chan) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; @@ -113,7 +114,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int apds9960_channel_get(struct device *dev, +static int apds9960_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -149,7 +150,7 @@ static int apds9960_channel_get(struct device *dev, return 0; } -static int apds9960_proxy_setup(struct device *dev) +static int apds9960_proxy_setup(const struct device *dev) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; @@ -221,7 +222,7 @@ static int apds9960_proxy_setup(struct device *dev) } #ifdef CONFIG_APDS9960_ENABLE_ALS -static int apds9960_ambient_setup(struct device *dev) +static int apds9960_ambient_setup(const struct device *dev) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; @@ -271,7 +272,7 @@ static int apds9960_ambient_setup(struct device *dev) } #endif -static int apds9960_sensor_setup(struct device *dev) +static int apds9960_sensor_setup(const struct device *dev) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; @@ -356,7 +357,7 @@ static int apds9960_sensor_setup(struct device *dev) return 0; } -static int apds9960_init_interrupt(struct device *dev) +static int apds9960_init_interrupt(const struct device *dev) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *drv_data = dev->driver_data; @@ -407,7 +408,7 @@ static int apds9960_init_interrupt(struct device *dev) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int apds9960_device_ctrl(struct device *dev, u32_t ctrl_command, +static int apds9960_device_ctrl(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { const struct apds9960_config *config = dev->config_info; @@ -451,7 +452,7 @@ static int apds9960_device_ctrl(struct device *dev, u32_t ctrl_command, } #endif -static int apds9960_init(struct device *dev) +static int apds9960_init(const struct device *dev) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h index cc920495d7c0..c319dc907a2d 100644 --- a/drivers/sensor/apds9960/apds9960.h +++ b/drivers/sensor/apds9960/apds9960.h @@ -225,11 +225,11 @@ struct apds9960_config { }; struct apds9960_data { - struct device *i2c; - struct device *gpio; + const struct device *i2c; + const struct device *gpio; struct gpio_callback gpio_cb; struct k_work work; - struct device *dev; + const struct device *dev; u16_t sample_crgb[4]; u8_t pdata; u8_t gpio_pin; @@ -257,12 +257,12 @@ static inline void apds9960_setup_int(struct apds9960_data *drv_data, #ifdef CONFIG_APDS9960_TRIGGER void apds9960_work_cb(struct k_work *work); -int apds9960_attr_set(struct device *dev, +int apds9960_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int apds9960_trigger_set(struct device *dev, +int apds9960_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif /* CONFIG_APDS9960_TRIGGER */ diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c index 00d6bc37a7bc..bbb5a55648dc 100644 --- a/drivers/sensor/apds9960/apds9960_trigger.c +++ b/drivers/sensor/apds9960/apds9960_trigger.c @@ -22,7 +22,7 @@ void apds9960_work_cb(struct k_work *work) struct apds9960_data *data = CONTAINER_OF(work, struct apds9960_data, work); - struct device *dev = data->dev; + const struct device *dev = data->dev; if (data->p_th_handler != NULL) { data->p_th_handler(dev, &data->p_th_trigger); @@ -31,7 +31,7 @@ void apds9960_work_cb(struct k_work *work) apds9960_setup_int(data, true); } -int apds9960_attr_set(struct device *dev, +int apds9960_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -65,9 +65,9 @@ int apds9960_attr_set(struct device *dev, return -ENOTSUP; } -int apds9960_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler) +int apds9960_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler) { const struct apds9960_config *config = dev->config_info; struct apds9960_data *data = dev->driver_data; diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c index 0122c1e4f3b5..75cff6693243 100644 --- a/drivers/sensor/bma280/bma280.c +++ b/drivers/sensor/bma280/bma280.c @@ -16,7 +16,8 @@ LOG_MODULE_REGISTER(BMA280, CONFIG_SENSOR_LOG_LEVEL); -static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bma280_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bma280_data *drv_data = dev->driver_data; u8_t buf[6]; @@ -72,7 +73,7 @@ static void bma280_channel_accel_convert(struct sensor_value *val, } } -static int bma280_channel_get(struct device *dev, +static int bma280_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -113,7 +114,7 @@ static const struct sensor_driver_api bma280_driver_api = { .channel_get = bma280_channel_get, }; -int bma280_init(struct device *dev) +int bma280_init(const struct device *dev) { struct bma280_data *drv_data = dev->driver_data; u8_t id = 0U; diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h index 7711b409c310..7b23d02f28ee 100644 --- a/drivers/sensor/bma280/bma280.h +++ b/drivers/sensor/bma280/bma280.h @@ -114,15 +114,15 @@ #define BMA280_THREAD_STACKSIZE_UNIT 1024 struct bma280_data { - struct device *i2c; + const struct device *i2c; s16_t x_sample; s16_t y_sample; s16_t z_sample; s8_t temp_sample; #ifdef CONFIG_BMA280_TRIGGER - struct device *dev; - struct device *gpio; + const struct device *dev; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -143,16 +143,16 @@ struct bma280_data { }; #ifdef CONFIG_BMA280_TRIGGER -int bma280_trigger_set(struct device *dev, +int bma280_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int bma280_attr_set(struct device *dev, +int bma280_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int bma280_init_interrupt(struct device *dev); +int bma280_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_ */ diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c index b114c2891ec8..358ef237d288 100644 --- a/drivers/sensor/bma280/bma280_trigger.c +++ b/drivers/sensor/bma280/bma280_trigger.c @@ -17,7 +17,7 @@ #include LOG_MODULE_DECLARE(BMA280, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_int1(struct device *dev, +static inline void setup_int1(const struct device *dev, bool enable) { struct bma280_data *data = dev->driver_data; @@ -29,7 +29,7 @@ static inline void setup_int1(struct device *dev, : GPIO_INT_DISABLE)); } -int bma280_attr_set(struct device *dev, +int bma280_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -67,7 +67,7 @@ int bma280_attr_set(struct device *dev, return 0; } -static void bma280_gpio_callback(struct device *dev, +static void bma280_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct bma280_data *drv_data = @@ -86,7 +86,7 @@ static void bma280_gpio_callback(struct device *dev, static void bma280_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct bma280_data *drv_data = dev->driver_data; u8_t status = 0U; int err = 0; @@ -128,7 +128,7 @@ static void bma280_thread_cb(void *arg) #ifdef CONFIG_BMA280_TRIGGER_OWN_THREAD static void bma280_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct bma280_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -150,7 +150,7 @@ static void bma280_work_cb(struct k_work *work) } #endif -int bma280_trigger_set(struct device *dev, +int bma280_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -209,7 +209,7 @@ int bma280_trigger_set(struct device *dev, return 0; } -int bma280_init_interrupt(struct device *dev) +int bma280_init_interrupt(const struct device *dev) { struct bma280_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index 372a71e98ab5..4bab593f378b 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -48,7 +48,7 @@ static const struct bmc150_magn_preset { [HIGH_ACCURACY_PRESET] = {47, 83, 20} }; -static int bmc150_magn_set_power_mode(struct device *dev, +static int bmc150_magn_set_power_mode(const struct device *dev, enum bmc150_magn_power_modes mode, int state) { @@ -88,7 +88,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, return -ENOTSUP; } -static int bmc150_magn_set_odr(struct device *dev, u8_t val) +static int bmc150_magn_set_odr(const struct device *dev, u8_t val) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -110,7 +110,7 @@ static int bmc150_magn_set_odr(struct device *dev, u8_t val) } #if defined(BMC150_MAGN_SET_ATTR) -static int bmc150_magn_read_rep_xy(struct device *dev) +static int bmc150_magn_read_rep_xy(const struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -126,7 +126,7 @@ static int bmc150_magn_read_rep_xy(struct device *dev) return 0; } -static int bmc150_magn_read_rep_z(struct device *dev) +static int bmc150_magn_read_rep_z(const struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -142,7 +142,7 @@ static int bmc150_magn_read_rep_z(struct device *dev) return 0; } -static int bmc150_magn_compute_max_odr(struct device *dev, int rep_xy, +static int bmc150_magn_compute_max_odr(const struct device *dev, int rep_xy, int rep_z, int *max_odr) { struct bmc150_magn_data *data = dev->driver_data; @@ -172,7 +172,7 @@ static int bmc150_magn_compute_max_odr(struct device *dev, int rep_xy, #endif #if defined(BMC150_MAGN_SET_ATTR_REP) -static int bmc150_magn_read_odr(struct device *dev) +static int bmc150_magn_read_odr(const struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -197,7 +197,7 @@ static int bmc150_magn_read_odr(struct device *dev) #endif #if defined(CONFIG_BMC150_MAGN_SAMPLING_REP_XY) -static int bmc150_magn_write_rep_xy(struct device *dev, int val) +static int bmc150_magn_write_rep_xy(const struct device *dev, int val) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -216,7 +216,7 @@ static int bmc150_magn_write_rep_xy(struct device *dev, int val) #endif #if defined(CONFIG_BMC150_MAGN_SAMPLING_REP_Z) -static int bmc150_magn_write_rep_z(struct device *dev, int val) +static int bmc150_magn_write_rep_z(const struct device *dev, int val) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -288,7 +288,7 @@ static s32_t bmc150_magn_compensate_z(struct bmc150_magn_trim_regs *tregs, return val; } -static int bmc150_magn_sample_fetch(struct device *dev, +static int bmc150_magn_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct bmc150_magn_data *data = dev->driver_data; @@ -332,7 +332,7 @@ static void bmc150_magn_convert(struct sensor_value *val, int raw_val) val->val2 = ((s32_t)raw_val * (1000000 / 1600)) % 1000000; } -static int bmc150_magn_channel_get(struct device *dev, +static int bmc150_magn_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -361,7 +361,7 @@ static int bmc150_magn_channel_get(struct device *dev, } #if defined(BMC150_MAGN_SET_ATTR_REP) -static inline int bmc150_magn_attr_set_rep(struct device *dev, +static inline int bmc150_magn_attr_set_rep(const struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { @@ -431,7 +431,7 @@ static inline int bmc150_magn_attr_set_rep(struct device *dev, #endif #if defined(BMC150_MAGN_SET_ATTR) -static int bmc150_magn_attr_set(struct device *dev, +static int bmc150_magn_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -482,7 +482,7 @@ static const struct sensor_driver_api bmc150_magn_api_funcs = { #endif }; -static int bmc150_magn_init_chip(struct device *dev) +static int bmc150_magn_init_chip(const struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -568,7 +568,7 @@ static int bmc150_magn_init_chip(struct device *dev) return -EIO; } -static int bmc150_magn_init(struct device *dev) +static int bmc150_magn_init(const struct device *dev) { const struct bmc150_magn_config * const config = dev->config_info; diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h index 49c5be019492..fe385d6ff8ac 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.h +++ b/drivers/sensor/bmc150_magn/bmc150_magn.h @@ -113,7 +113,7 @@ struct bmc150_magn_trim_regs { } __packed; struct bmc150_magn_data { - struct device *i2c_master; + const struct device *i2c_master; struct k_sem sem; #if defined(CONFIG_BMC150_MAGN_TRIGGER) @@ -123,8 +123,8 @@ struct bmc150_magn_data { #endif #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY) - struct device *gpio_drdy; - struct device *dev; + const struct device *gpio_drdy; + const struct device *dev; struct gpio_callback gpio_cb; struct sensor_trigger trigger_drdy; sensor_trigger_handler_t handler_drdy; @@ -168,11 +168,11 @@ enum bmc150_magn_axis { }; #if defined(CONFIG_BMC150_MAGN_TRIGGER) -int bmc150_magn_trigger_set(struct device *dev, +int bmc150_magn_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int bmc150_magn_init_interrupt(struct device *dev); +int bmc150_magn_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_ */ diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c index ed6014b4c234..6022f42dc795 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c @@ -15,7 +15,7 @@ #include LOG_MODULE_DECLARE(BMC150_MAGN, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_drdy(struct device *dev, +static inline void setup_drdy(const struct device *dev, bool enable) { struct bmc150_magn_data *data = dev->driver_data; @@ -30,7 +30,7 @@ static inline void setup_drdy(struct device *dev, } -int bmc150_magn_trigger_set(struct device *dev, +int bmc150_magn_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -68,7 +68,7 @@ int bmc150_magn_trigger_set(struct device *dev, return 0; } -static void bmc150_magn_gpio_drdy_callback(struct device *dev, +static void bmc150_magn_gpio_drdy_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -84,7 +84,7 @@ static void bmc150_magn_gpio_drdy_callback(struct device *dev, static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3) { - struct device *dev = (struct device *) arg1; + const struct device *dev = (const struct device *) arg1; struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; u8_t reg_val; @@ -107,7 +107,7 @@ static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3) } } -static int bmc150_magn_set_drdy_polarity(struct device *dev, int state) +static int bmc150_magn_set_drdy_polarity(const struct device *dev, int state) { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *config = dev->config_info; @@ -122,7 +122,7 @@ static int bmc150_magn_set_drdy_polarity(struct device *dev, int state) state << BMC150_MAGN_SHIFT_DRDY_DR_POLARITY); } -int bmc150_magn_init_interrupt(struct device *dev) +int bmc150_magn_init_interrupt(const struct device *dev) { const struct bmc150_magn_config * const config = dev->config_info; diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 6bcab39b16b0..d40500543f5d 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -42,7 +42,7 @@ LOG_MODULE_REGISTER(BME280, CONFIG_SENSOR_LOG_LEVEL); */ struct bme280_data { - struct device *bus; + const struct device *bus; #if BME280_BUS_SPI struct spi_cs_control spi_cs; #endif @@ -98,10 +98,10 @@ struct bme280_config { const union bme280_bus_config bus_config; }; -typedef int (*bme280_reg_read_fn)(struct device *bus, +typedef int (*bme280_reg_read_fn)(const struct device *bus, const union bme280_bus_config *bus_config, u8_t start, u8_t *buf, int size); -typedef int (*bme280_reg_write_fn)(struct device *bus, +typedef int (*bme280_reg_write_fn)(const struct device *bus, const union bme280_bus_config *bus_config, u8_t reg, u8_t val); @@ -110,22 +110,22 @@ struct bme280_reg_io { bme280_reg_write_fn write; }; -static inline struct bme280_data *to_data(struct device *dev) +static inline struct bme280_data *to_data(const struct device *dev) { return dev->driver_data; } -static inline const struct bme280_config *to_config(struct device *dev) +static inline const struct bme280_config *to_config(const struct device *dev) { return dev->config_info; } -static inline struct device *to_bus(struct device *dev) +static inline const struct device *to_bus(const struct device *dev) { return to_data(dev)->bus; } -static inline const union bme280_bus_config *to_bus_config(struct device *dev) +static inline const union bme280_bus_config *to_bus_config(const struct device *dev) { return &to_config(dev)->bus_config; } @@ -137,7 +137,7 @@ to_spi_config(const union bme280_bus_config *bus_config) return &bus_config->spi_cfg->spi_cfg; } -static int bme280_reg_read_spi(struct device *bus, +static int bme280_reg_read_spi(const struct device *bus, const union bme280_bus_config *bus_config, u8_t start, u8_t *buf, int size) { @@ -178,7 +178,7 @@ static int bme280_reg_read_spi(struct device *bus, return 0; } -static int bme280_reg_write_spi(struct device *bus, +static int bme280_reg_write_spi(const struct device *bus, const union bme280_bus_config *bus_config, u8_t reg, u8_t val) { @@ -208,7 +208,7 @@ static const struct bme280_reg_io bme280_reg_io_spi = { #endif /* BME280_BUS_SPI */ #if BME280_BUS_I2C -static int bme280_reg_read_i2c(struct device *bus, +static int bme280_reg_read_i2c(const struct device *bus, const union bme280_bus_config *bus_config, u8_t start, u8_t *buf, int size) { @@ -216,7 +216,7 @@ static int bme280_reg_read_i2c(struct device *bus, start, buf, size); } -static int bme280_reg_write_i2c(struct device *bus, +static int bme280_reg_write_i2c(const struct device *bus, const union bme280_bus_config *bus_config, u8_t reg, u8_t val) { @@ -230,14 +230,15 @@ static const struct bme280_reg_io bme280_reg_io_i2c = { }; #endif /* BME280_BUS_I2C */ -static inline int bme280_reg_read(struct device *dev, +static inline int bme280_reg_read(const struct device *dev, u8_t start, u8_t *buf, int size) { return to_config(dev)->reg_io->read(to_bus(dev), to_bus_config(dev), start, buf, size); } -static inline int bme280_reg_write(struct device *dev, u8_t reg, u8_t val) +static inline int bme280_reg_write(const struct device *dev, u8_t reg, + u8_t val) { return to_config(dev)->reg_io->write(to_bus(dev), to_bus_config(dev), reg, val); @@ -306,7 +307,8 @@ static void bme280_compensate_humidity(struct bme280_data *data, data->comp_humidity = (u32_t)(h >> 12); } -static int bme280_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bme280_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bme280_data *data = to_data(dev); u8_t buf[8]; @@ -353,7 +355,7 @@ static int bme280_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int bme280_channel_get(struct device *dev, +static int bme280_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -399,7 +401,7 @@ static const struct sensor_driver_api bme280_api_funcs = { .channel_get = bme280_channel_get, }; -static int bme280_read_compensation(struct device *dev) +static int bme280_read_compensation(const struct device *dev) { struct bme280_data *data = to_data(dev); u16_t buf[12]; @@ -452,7 +454,7 @@ static int bme280_read_compensation(struct device *dev) return 0; } -static int bme280_chip_init(struct device *dev) +static int bme280_chip_init(const struct device *dev) { struct bme280_data *data = to_data(dev); int err; @@ -505,12 +507,12 @@ static int bme280_chip_init(struct device *dev) } #if BME280_BUS_SPI -static inline int bme280_is_on_spi(struct device *dev) +static inline int bme280_is_on_spi(const struct device *dev) { return to_config(dev)->reg_io == &bme280_reg_io_spi; } -static inline int bme280_spi_init(struct device *dev) +static inline int bme280_spi_init(const struct device *dev) { struct bme280_data *data = to_data(dev); const struct bme280_spi_cfg *spi_cfg = to_bus_config(dev)->spi_cfg; @@ -530,18 +532,18 @@ static inline int bme280_spi_init(struct device *dev) return 0; } #else -static inline int bme280_is_on_spi(struct device *dev) +static inline int bme280_is_on_spi(const struct device *dev) { return 0; } -static inline int bme280_spi_init(struct device *dev) +static inline int bme280_spi_init(const struct device *dev) { return 0; } #endif -int bme280_init(struct device *dev) +int bme280_init(const struct device *dev) { const char *name = dev->name; struct bme280_data *data = to_data(dev); diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c index c52ec92fba4b..1924cf54a55c 100644 --- a/drivers/sensor/bme680/bme680.c +++ b/drivers/sensor/bme680/bme680.c @@ -188,7 +188,8 @@ static u8_t bme680_calc_gas_wait(u16_t dur) return durval; } -static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bme680_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bme680_data *data = dev->driver_data; u8_t buff[BME680_LEN_FIELD] = { 0 }; @@ -233,7 +234,8 @@ static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int bme680_channel_get(struct device *dev, enum sensor_channel chan, +static int bme680_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct bme680_data *data = dev->driver_data; @@ -339,7 +341,7 @@ static int bme680_read_compensation(struct bme680_data *data) return 0; } -static int bme680_chip_init(struct device *dev) +static int bme680_chip_init(const struct device *dev) { struct bme680_data *data = (struct bme680_data *)dev->driver_data; int err; @@ -398,7 +400,7 @@ static int bme680_chip_init(struct device *dev) return 0; } -static int bme680_init(struct device *dev) +static int bme680_init(const struct device *dev) { struct bme680_data *data = dev->driver_data; diff --git a/drivers/sensor/bme680/bme680.h b/drivers/sensor/bme680/bme680.h index 7292845f9a60..724253f96a53 100644 --- a/drivers/sensor/bme680/bme680.h +++ b/drivers/sensor/bme680/bme680.h @@ -120,7 +120,7 @@ #define BME680_CONCAT_BYTES(msb, lsb) (((u16_t)msb << 8) | (u16_t)lsb) struct bme680_data { - struct device *i2c_master; + const struct device *i2c_master; u16_t i2c_slave_addr; /* Compensation parameters. */ diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c index a085c96f0587..bc1713fb27d5 100644 --- a/drivers/sensor/bmg160/bmg160.c +++ b/drivers/sensor/bmg160/bmg160.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(BMG160, CONFIG_SENSOR_LOG_LEVEL); struct bmg160_device_data bmg160_data; -static inline int bmg160_bus_config(struct device *dev) +static inline int bmg160_bus_config(const struct device *dev) { const struct bmg160_device_config *dev_cfg = dev->config_info; struct bmg160_device_data *bmg160 = dev->driver_data; @@ -33,7 +33,7 @@ static inline int bmg160_bus_config(struct device *dev) return i2c_configure(bmg160->i2c, i2c_cfg); } -int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data, +int bmg160_read(const struct device *dev, u8_t reg_addr, u8_t *data, u8_t len) { const struct bmg160_device_config *dev_cfg = dev->config_info; @@ -54,12 +54,12 @@ int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data, return ret; } -int bmg160_read_byte(struct device *dev, u8_t reg_addr, u8_t *byte) +int bmg160_read_byte(const struct device *dev, u8_t reg_addr, u8_t *byte) { return bmg160_read(dev, reg_addr, byte, 1); } -static int bmg160_write(struct device *dev, u8_t reg_addr, u8_t *data, +static int bmg160_write(const struct device *dev, u8_t reg_addr, u8_t *data, u8_t len) { const struct bmg160_device_config *dev_cfg = dev->config_info; @@ -80,12 +80,12 @@ static int bmg160_write(struct device *dev, u8_t reg_addr, u8_t *data, return ret; } -int bmg160_write_byte(struct device *dev, u8_t reg_addr, u8_t byte) +int bmg160_write_byte(const struct device *dev, u8_t reg_addr, u8_t byte) { return bmg160_write(dev, reg_addr, &byte, 1); } -int bmg160_update_byte(struct device *dev, u8_t reg_addr, u8_t mask, +int bmg160_update_byte(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t value) { const struct bmg160_device_config *dev_cfg = dev->config_info; @@ -128,7 +128,7 @@ static int bmg160_is_val_valid(s16_t val, const s16_t *val_map, return -1; } -static int bmg160_attr_set(struct device *dev, enum sensor_channel chan, +static int bmg160_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -188,7 +188,8 @@ static int bmg160_attr_set(struct device *dev, enum sensor_channel chan, } } -static int bmg160_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bmg160_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bmg160_device_data *bmg160 = dev->driver_data; union { @@ -229,7 +230,8 @@ static void bmg160_to_fixed_point(struct bmg160_device_data *bmg160, } } -static int bmg160_channel_get(struct device *dev, enum sensor_channel chan, +static int bmg160_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct bmg160_device_data *bmg160 = dev->driver_data; @@ -271,7 +273,7 @@ static const struct sensor_driver_api bmg160_api = { .channel_get = bmg160_channel_get, }; -int bmg160_init(struct device *dev) +int bmg160_init(const struct device *dev) { const struct bmg160_device_config *cfg = dev->config_info; struct bmg160_device_data *bmg160 = dev->driver_data; diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h index 916c24646856..608865354203 100644 --- a/drivers/sensor/bmg160/bmg160.h +++ b/drivers/sensor/bmg160/bmg160.h @@ -189,9 +189,9 @@ struct bmg160_device_config { }; struct bmg160_device_data { - struct device *i2c; + const struct device *i2c; #ifdef CONFIG_BMG160_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; #endif #ifdef CONFIG_BMG160_TRIGGER_OWN_THREAD @@ -200,7 +200,7 @@ struct bmg160_device_data { struct k_sem sem; #ifdef CONFIG_BMG160_TRIGGER_GLOBAL_THREAD struct k_work work; - struct device *dev; + const struct device *dev; #endif #ifdef CONFIG_BMG160_TRIGGER sensor_trigger_handler_t anymotion_handler; @@ -213,17 +213,17 @@ struct bmg160_device_data { s8_t raw_temp; }; -int bmg160_trigger_init(struct device *dev); -int bmg160_trigger_set(struct device *dev, +int bmg160_trigger_init(const struct device *dev); +int bmg160_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data, +int bmg160_read(const struct device *dev, u8_t reg_addr, u8_t *data, u8_t len); -int bmg160_read_byte(struct device *dev, u8_t reg_addr, u8_t *byte); -int bmg160_update_byte(struct device *dev, u8_t reg_addr, u8_t mask, +int bmg160_read_byte(const struct device *dev, u8_t reg_addr, u8_t *byte); +int bmg160_update_byte(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t value); -int bmg160_write_byte(struct device *dev, u8_t reg_addr, u8_t data); -int bmg160_slope_config(struct device *dev, enum sensor_attribute attr, +int bmg160_write_byte(const struct device *dev, u8_t reg_addr, u8_t data); +int bmg160_slope_config(const struct device *dev, enum sensor_attribute attr, const struct sensor_value *val); #endif /* ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_ */ diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c index 5e0c9cd7126e..2615c788f07d 100644 --- a/drivers/sensor/bmg160/bmg160_trigger.c +++ b/drivers/sensor/bmg160/bmg160_trigger.c @@ -18,7 +18,7 @@ extern struct bmg160_device_data bmg160_data; #include LOG_MODULE_DECLARE(BMG160, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_int(struct device *dev, +static inline void setup_int(const struct device *dev, bool enable) { struct bmg160_device_data *data = dev->driver_data; @@ -32,7 +32,8 @@ static inline void setup_int(struct device *dev, : GPIO_INT_DISABLE); } -static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb, +static void bmg160_gpio_callback(const struct device *port, + struct gpio_callback *cb, u32_t pin) { struct bmg160_device_data *bmg160 = @@ -48,7 +49,7 @@ static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb, #endif } -static int bmg160_anymotion_set(struct device *dev, +static int bmg160_anymotion_set(const struct device *dev, sensor_trigger_handler_t handler) { struct bmg160_device_data *bmg160 = dev->driver_data; @@ -70,7 +71,8 @@ static int bmg160_anymotion_set(struct device *dev, return 0; } -static int bmg160_drdy_set(struct device *dev, sensor_trigger_handler_t handler) +static int bmg160_drdy_set(const struct device *dev, + sensor_trigger_handler_t handler) { struct bmg160_device_data *bmg160 = dev->driver_data; @@ -85,7 +87,7 @@ static int bmg160_drdy_set(struct device *dev, sensor_trigger_handler_t handler) return 0; } -int bmg160_slope_config(struct device *dev, enum sensor_attribute attr, +int bmg160_slope_config(const struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { struct bmg160_device_data *bmg160 = dev->driver_data; @@ -120,7 +122,7 @@ int bmg160_slope_config(struct device *dev, enum sensor_attribute attr, return -ENOTSUP; } -int bmg160_trigger_set(struct device *dev, +int bmg160_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -133,7 +135,7 @@ int bmg160_trigger_set(struct device *dev, return -ENOTSUP; } -static int bmg160_handle_anymotion_int(struct device *dev) +static int bmg160_handle_anymotion_int(const struct device *dev) { struct bmg160_device_data *bmg160 = dev->driver_data; struct sensor_trigger any_trig = { @@ -148,7 +150,7 @@ static int bmg160_handle_anymotion_int(struct device *dev) return 0; } -static int bmg160_handle_dataready_int(struct device *dev) +static int bmg160_handle_dataready_int(const struct device *dev) { struct bmg160_device_data *bmg160 = dev->driver_data; struct sensor_trigger drdy_trig = { @@ -165,7 +167,7 @@ static int bmg160_handle_dataready_int(struct device *dev) static void bmg160_handle_int(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; u8_t status_int[4]; if (bmg160_read(dev, BMG160_REG_INT_STATUS0, status_int, 4) < 0) { @@ -185,7 +187,7 @@ static struct k_thread bmg160_thread; static void bmg160_thread_main(void *arg1, void *arg2, void *arg3) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct bmg160_device_data *bmg160 = dev->driver_data; while (true) { @@ -206,7 +208,7 @@ static void bmg160_work_cb(struct k_work *work) } #endif -int bmg160_trigger_init(struct device *dev) +int bmg160_trigger_init(const struct device *dev) { const struct bmg160_device_config *cfg = dev->config_info; struct bmg160_device_data *bmg160 = dev->driver_data; diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c index 97df68b7fffa..1d48ad4214d1 100644 --- a/drivers/sensor/bmi160/bmi160.c +++ b/drivers/sensor/bmi160/bmi160.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(BMI160, CONFIG_SENSOR_LOG_LEVEL); struct bmi160_device_data bmi160_data; -static int bmi160_transceive(struct device *dev, u8_t reg, +static int bmi160_transceive(const struct device *dev, u8_t reg, bool write, void *data, size_t length) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -53,17 +53,18 @@ static int bmi160_transceive(struct device *dev, u8_t reg, return spi_write(bmi160->spi, &bmi160->spi_cfg, &tx); } -int bmi160_read(struct device *dev, u8_t reg_addr, u8_t *data, u8_t len) +int bmi160_read(const struct device *dev, u8_t reg_addr, u8_t *data, u8_t len) { return bmi160_transceive(dev, reg_addr | BIT(7), false, data, len); } -int bmi160_byte_read(struct device *dev, u8_t reg_addr, u8_t *byte) +int bmi160_byte_read(const struct device *dev, u8_t reg_addr, u8_t *byte) { return bmi160_transceive(dev, reg_addr | BIT(7), false, byte, 1); } -static int bmi160_word_read(struct device *dev, u8_t reg_addr, u16_t *word) +static int bmi160_word_read(const struct device *dev, u8_t reg_addr, + u16_t *word) { if (bmi160_transceive(dev, reg_addr | BIT(7), false, word, 2) != 0) { return -EIO; @@ -74,12 +75,12 @@ static int bmi160_word_read(struct device *dev, u8_t reg_addr, u16_t *word) return 0; } -int bmi160_byte_write(struct device *dev, u8_t reg_addr, u8_t byte) +int bmi160_byte_write(const struct device *dev, u8_t reg_addr, u8_t byte) { return bmi160_transceive(dev, reg_addr & 0x7F, true, &byte, 1); } -int bmi160_word_write(struct device *dev, u8_t reg_addr, u16_t word) +int bmi160_word_write(const struct device *dev, u8_t reg_addr, u16_t word) { u8_t tx_word[2] = { (u8_t)(word & 0xff), @@ -89,7 +90,7 @@ int bmi160_word_write(struct device *dev, u8_t reg_addr, u16_t word) return bmi160_transceive(dev, reg_addr & 0x7F, true, tx_word, 2); } -int bmi160_reg_field_update(struct device *dev, u8_t reg_addr, +int bmi160_reg_field_update(const struct device *dev, u8_t reg_addr, u8_t pos, u8_t mask, u8_t val) { u8_t old_val; @@ -102,7 +103,8 @@ int bmi160_reg_field_update(struct device *dev, u8_t reg_addr, (old_val & ~mask) | ((val << pos) & mask)); } -static int bmi160_pmu_set(struct device *dev, union bmi160_pmu_status *pmu_sts) +static int bmi160_pmu_set(const struct device *dev, + union bmi160_pmu_status *pmu_sts) { struct { u8_t cmd; @@ -194,7 +196,7 @@ static int bmi160_freq_to_odr_val(u16_t freq_int, u16_t freq_milli) #endif #if defined(CONFIG_BMI160_ACCEL_ODR_RUNTIME) -static int bmi160_acc_odr_set(struct device *dev, u16_t freq_int, +static int bmi160_acc_odr_set(const struct device *dev, u16_t freq_int, u16_t freq_milli) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -281,7 +283,7 @@ s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val) BMI160_GYR_RANGE_MAP_SIZE); } -static int bmi160_do_calibration(struct device *dev, u8_t foc_conf) +static int bmi160_do_calibration(const struct device *dev, u8_t foc_conf) { if (bmi160_byte_write(dev, BMI160_REG_FOC_CONF, foc_conf) < 0) { return -EIO; @@ -297,7 +299,7 @@ static int bmi160_do_calibration(struct device *dev, u8_t foc_conf) } #if defined(CONFIG_BMI160_ACCEL_RANGE_RUNTIME) -static int bmi160_acc_range_set(struct device *dev, s32_t range) +static int bmi160_acc_range_set(const struct device *dev, s32_t range) { struct bmi160_device_data *bmi160 = dev->driver_data; s32_t reg_val = bmi160_range_to_reg_val(range, @@ -324,7 +326,8 @@ static int bmi160_acc_range_set(struct device *dev, s32_t range) * 3.9 * 9.80665 * 1000 */ #define BMI160_ACC_OFS_LSB 38246 -static int bmi160_acc_ofs_set(struct device *dev, enum sensor_channel chan, +static int bmi160_acc_ofs_set(const struct device *dev, + enum sensor_channel chan, const struct sensor_value *ofs) { u8_t reg_addr[] = { @@ -357,7 +360,8 @@ static int bmi160_acc_ofs_set(struct device *dev, enum sensor_channel chan, BIT(BMI160_ACC_OFS_EN_POS), 1); } -static int bmi160_acc_calibrate(struct device *dev, enum sensor_channel chan, +static int bmi160_acc_calibrate(const struct device *dev, + enum sensor_channel chan, const struct sensor_value *xyz_calib_value) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -408,7 +412,8 @@ static int bmi160_acc_calibrate(struct device *dev, enum sensor_channel chan, BIT(BMI160_ACC_OFS_EN_POS), 1); } -static int bmi160_acc_config(struct device *dev, enum sensor_channel chan, +static int bmi160_acc_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -440,7 +445,7 @@ static int bmi160_acc_config(struct device *dev, enum sensor_channel chan, #endif /* !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND) */ #if defined(CONFIG_BMI160_GYRO_ODR_RUNTIME) -static int bmi160_gyr_odr_set(struct device *dev, u16_t freq_int, +static int bmi160_gyr_odr_set(const struct device *dev, u16_t freq_int, u16_t freq_milli) { int odr = bmi160_freq_to_odr_val(freq_int, freq_milli); @@ -461,7 +466,7 @@ static int bmi160_gyr_odr_set(struct device *dev, u16_t freq_int, #endif #if defined(CONFIG_BMI160_GYRO_RANGE_RUNTIME) -static int bmi160_gyr_range_set(struct device *dev, u16_t range) +static int bmi160_gyr_range_set(const struct device *dev, u16_t range) { struct bmi160_device_data *bmi160 = dev->driver_data; s32_t reg_val = bmi160_range_to_reg_val(range, @@ -488,7 +493,8 @@ static int bmi160_gyr_range_set(struct device *dev, u16_t range) * 0.061 * (pi / 180) * 1000000, where pi = 3.141592 */ #define BMI160_GYR_OFS_LSB 1065 -static int bmi160_gyr_ofs_set(struct device *dev, enum sensor_channel chan, +static int bmi160_gyr_ofs_set(const struct device *dev, + enum sensor_channel chan, const struct sensor_value *ofs) { struct { @@ -543,7 +549,8 @@ static int bmi160_gyr_ofs_set(struct device *dev, enum sensor_channel chan, BIT(BMI160_GYR_OFS_EN_POS), 1); } -static int bmi160_gyr_calibrate(struct device *dev, enum sensor_channel chan) +static int bmi160_gyr_calibrate(const struct device *dev, + enum sensor_channel chan) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -564,7 +571,8 @@ static int bmi160_gyr_calibrate(struct device *dev, enum sensor_channel chan) BIT(BMI160_GYR_OFS_EN_POS), 1); } -static int bmi160_gyr_config(struct device *dev, enum sensor_channel chan, +static int bmi160_gyr_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -592,8 +600,9 @@ static int bmi160_gyr_config(struct device *dev, enum sensor_channel chan, } #endif /* !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND) */ -static int bmi160_attr_set(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, const struct sensor_value *val) +static int bmi160_attr_set(const struct device *dev, enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (chan) { #if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND) @@ -625,7 +634,8 @@ static int bmi160_attr_set(struct device *dev, enum sensor_channel chan, # define BMI160_SAMPLE_BURST_READ_ADDR BMI160_REG_DATA_GYR_X # define BMI160_DATA_READY_BIT_MASK (1 << 6) #endif -static int bmi160_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bmi160_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bmi160_device_data *bmi160 = dev->driver_data; size_t i; @@ -705,7 +715,7 @@ static void bmi160_channel_convert(enum sensor_channel chan, } #if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND) -static inline void bmi160_gyr_channel_get(struct device *dev, +static inline void bmi160_gyr_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -717,7 +727,7 @@ static inline void bmi160_gyr_channel_get(struct device *dev, #endif #if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND) -static inline void bmi160_acc_channel_get(struct device *dev, +static inline void bmi160_acc_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -728,7 +738,8 @@ static inline void bmi160_acc_channel_get(struct device *dev, } #endif -static int bmi160_temp_channel_get(struct device *dev, struct sensor_value *val) +static int bmi160_temp_channel_get(const struct device *dev, + struct sensor_value *val) { u16_t temp_raw = 0U; s32_t temp_micro = 0; @@ -751,7 +762,7 @@ static int bmi160_temp_channel_get(struct device *dev, struct sensor_value *val) return 0; } -static int bmi160_channel_get(struct device *dev, +static int bmi160_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -791,7 +802,7 @@ static const struct sensor_driver_api bmi160_api = { .channel_get = bmi160_channel_get, }; -int bmi160_init(struct device *dev) +int bmi160_init(const struct device *dev) { struct bmi160_device_data *bmi160 = dev->driver_data; u8_t val = 0U; diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h index ac11e7bcff8e..0cc827c6697d 100644 --- a/drivers/sensor/bmi160/bmi160.h +++ b/drivers/sensor/bmi160/bmi160.h @@ -428,10 +428,10 @@ struct bmi160_scale { }; struct bmi160_device_data { - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; #if defined(CONFIG_BMI160_TRIGGER) - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; #endif union bmi160_pmu_status pmu_sts; @@ -444,7 +444,7 @@ struct bmi160_device_data { #ifdef CONFIG_BMI160_TRIGGER_GLOBAL_THREAD struct k_work work; - struct device *dev; + const struct device *dev; #endif #ifdef CONFIG_BMI160_TRIGGER @@ -458,23 +458,24 @@ struct bmi160_device_data { #endif /* CONFIG_BMI160_TRIGGER */ }; -int bmi160_read(struct device *dev, u8_t reg_addr, +int bmi160_read(const struct device *dev, u8_t reg_addr, u8_t *data, u8_t len); -int bmi160_byte_read(struct device *dev, u8_t reg_addr, u8_t *byte); -int bmi160_byte_write(struct device *dev, u8_t reg_addr, u8_t byte); -int bmi160_word_write(struct device *dev, u8_t reg_addr, u16_t word); -int bmi160_reg_field_update(struct device *dev, u8_t reg_addr, +int bmi160_byte_read(const struct device *dev, u8_t reg_addr, u8_t *byte); +int bmi160_byte_write(const struct device *dev, u8_t reg_addr, u8_t byte); +int bmi160_word_write(const struct device *dev, u8_t reg_addr, u16_t word); +int bmi160_reg_field_update(const struct device *dev, u8_t reg_addr, u8_t pos, u8_t mask, u8_t val); -static inline int bmi160_reg_update(struct device *dev, u8_t reg_addr, +static inline int bmi160_reg_update(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t val) { return bmi160_reg_field_update(dev, reg_addr, 0, mask, val); } -int bmi160_trigger_mode_init(struct device *dev); -int bmi160_trigger_set(struct device *dev, +int bmi160_trigger_mode_init(const struct device *dev); +int bmi160_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr, +int bmi160_acc_slope_config(const struct device *dev, + enum sensor_attribute attr, const struct sensor_value *val); s32_t bmi160_acc_reg_val_to_range(u8_t reg_val); s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val); diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index d7bb19c3d86d..f241336cbbdf 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -14,7 +14,7 @@ #include LOG_MODULE_DECLARE(BMI160, CONFIG_SENSOR_LOG_LEVEL); -static void bmi160_handle_anymotion(struct device *dev) +static void bmi160_handle_anymotion(const struct device *dev) { struct bmi160_device_data *bmi160 = dev->driver_data; struct sensor_trigger anym_trigger = { @@ -27,7 +27,7 @@ static void bmi160_handle_anymotion(struct device *dev) } } -static void bmi160_handle_drdy(struct device *dev, u8_t status) +static void bmi160_handle_drdy(const struct device *dev, u8_t status) { struct bmi160_device_data *bmi160 = dev->driver_data; struct sensor_trigger drdy_trigger = { @@ -51,7 +51,7 @@ static void bmi160_handle_drdy(struct device *dev, u8_t status) static void bmi160_handle_interrupts(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; union { u8_t raw[6]; @@ -87,7 +87,7 @@ static void bmi160_thread_main(void *arg1, void *unused1, void *unused2) { ARG_UNUSED(unused1); ARG_UNUSED(unused2); - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct bmi160_device_data *bmi160 = dev->driver_data; while (1) { @@ -109,7 +109,7 @@ static void bmi160_work_handler(struct k_work *work) extern struct bmi160_device_data bmi160_data; -static void bmi160_gpio_callback(struct device *port, +static void bmi160_gpio_callback(const struct device *port, struct gpio_callback *cb, u32_t pin) { struct bmi160_device_data *bmi160 = @@ -125,7 +125,7 @@ static void bmi160_gpio_callback(struct device *port, #endif } -static int bmi160_trigger_drdy_set(struct device *dev, +static int bmi160_trigger_drdy_set(const struct device *dev, enum sensor_channel chan, sensor_trigger_handler_t handler) { @@ -161,7 +161,7 @@ static int bmi160_trigger_drdy_set(struct device *dev, } #if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND) -static int bmi160_trigger_anym_set(struct device *dev, +static int bmi160_trigger_anym_set(const struct device *dev, sensor_trigger_handler_t handler) { struct bmi160_device_data *bmi160 = dev->driver_data; @@ -183,7 +183,7 @@ static int bmi160_trigger_anym_set(struct device *dev, return 0; } -static int bmi160_trigger_set_acc(struct device *dev, +static int bmi160_trigger_set_acc(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -196,7 +196,8 @@ static int bmi160_trigger_set_acc(struct device *dev, return -ENOTSUP; } -int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr, +int bmi160_acc_slope_config(const struct device *dev, + enum sensor_attribute attr, const struct sensor_value *val) { u8_t acc_range_g, reg_val; @@ -241,7 +242,7 @@ int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr, #endif #if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND) -static int bmi160_trigger_set_gyr(struct device *dev, +static int bmi160_trigger_set_gyr(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -253,7 +254,7 @@ static int bmi160_trigger_set_gyr(struct device *dev, } #endif -int bmi160_trigger_set(struct device *dev, +int bmi160_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -270,7 +271,7 @@ int bmi160_trigger_set(struct device *dev, return -ENOTSUP; } -int bmi160_trigger_mode_init(struct device *dev) +int bmi160_trigger_mode_init(const struct device *dev) { struct bmi160_device_data *bmi160 = dev->driver_data; diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c index 760573b98463..291232ea3af8 100644 --- a/drivers/sensor/bmm150/bmm150.c +++ b/drivers/sensor/bmm150/bmm150.c @@ -36,7 +36,7 @@ static const struct bmm150_preset { [BMM150_HIGH_ACCURACY_PRESET] = { 47, 83, 20 } }; -static int bmm150_set_power_mode(struct device *dev, +static int bmm150_set_power_mode(const struct device *dev, enum bmm150_power_modes mode, int state) { @@ -77,7 +77,7 @@ static int bmm150_set_power_mode(struct device *dev, } -static int bmm150_set_odr(struct device *dev, u8_t val) +static int bmm150_set_odr(const struct device *dev, u8_t val) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -98,7 +98,7 @@ static int bmm150_set_odr(struct device *dev, u8_t val) } #if defined(BMM150_SET_ATTR) -static int bmm150_read_rep_xy(struct device *dev) +static int bmm150_read_rep_xy(const struct device *dev) { struct bmm150_data *data = dev->driver->data; const struct bmm150_config *config = dev->config_info; @@ -114,7 +114,7 @@ static int bmm150_read_rep_xy(struct device *dev) return 0; } -static int bmm150_read_rep_z(struct device *dev) +static int bmm150_read_rep_z(const struct device *dev) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -130,7 +130,7 @@ static int bmm150_read_rep_z(struct device *dev) return 0; } -static int bmm150_compute_max_odr(struct device *dev, int rep_xy, +static int bmm150_compute_max_odr(const struct device *dev, int rep_xy, int rep_z, int *max_odr) { struct bmm150_data *data = dev->driver_data; @@ -161,7 +161,7 @@ static int bmm150_compute_max_odr(struct device *dev, int rep_xy, #endif #if defined(BMM150_SET_ATTR_REP) -static int bmm150_read_odr(struct device *dev) +static int bmm150_read_odr(const struct device *dev) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -186,7 +186,7 @@ static int bmm150_read_odr(struct device *dev) #endif #if defined(CONFIG_BMM150_SAMPLING_REP_XY) -static int bmm150_write_rep_xy(struct device *dev, int val) +static int bmm150_write_rep_xy(const struct device *dev, int val) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -205,7 +205,7 @@ static int bmm150_write_rep_xy(struct device *dev, int val) #endif #if defined(CONFIG_BMM150_SAMPLING_REP_Z) -static int bmm150_write_rep_z(struct device *dev, int val) +static int bmm150_write_rep_z(const struct device *dev, int val) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -288,7 +288,8 @@ static s32_t bmm150_compensate_z(struct bmm150_trim_regs *tregs, return val; } -static int bmm150_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bmm150_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bmm150_data *drv_data = dev->driver_data; @@ -338,7 +339,7 @@ static void bmm150_convert(struct sensor_value *val, int raw_val) val->val2 = ((s32_t)raw_val * (1000000 / 1600)) % 1000000; } -static int bmm150_channel_get(struct device *dev, +static int bmm150_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -367,7 +368,7 @@ static int bmm150_channel_get(struct device *dev, } #if defined(BMM150_SET_ATTR_REP) -static inline int bmm150_attr_set_rep(struct device *dev, +static inline int bmm150_attr_set_rep(const struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { @@ -438,7 +439,7 @@ static inline int bmm150_attr_set_rep(struct device *dev, #endif #if defined(BMM150_SET_ATTR) -static int bmm150_attr_set(struct device *dev, +static int bmm150_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -486,7 +487,7 @@ static const struct sensor_driver_api bmm150_api_funcs = { .channel_get = bmm150_channel_get, }; -static int bmm150_init_chip(struct device *dev) +static int bmm150_init_chip(const struct device *dev) { struct bmm150_data *data = dev->driver_data; const struct bmm150_config *config = dev->config_info; @@ -578,7 +579,7 @@ static int bmm150_init_chip(struct device *dev) return -EIO; } -static int bmm150_init(struct device *dev) +static int bmm150_init(const struct device *dev) { const struct bmm150_config *const config = dev->config_info; diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h index 9849696661d9..64294288ddb9 100644 --- a/drivers/sensor/bmm150/bmm150.h +++ b/drivers/sensor/bmm150/bmm150.h @@ -118,7 +118,7 @@ struct bmm150_trim_regs { } __packed; struct bmm150_data { - struct device *i2c; + const struct device *i2c; struct k_sem sem; struct bmm150_trim_regs tregs; int rep_xy, rep_z, odr, max_odr; diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c index 851f83683a1d..32b9c8a1aff0 100644 --- a/drivers/sensor/bq274xx/bq274xx.c +++ b/drivers/sensor/bq274xx/bq274xx.c @@ -132,7 +132,8 @@ static int bq274xx_get_device_type(struct bq274xx_data *bq274xx, u16_t *val) * * @return -ENOTSUP for unsupported channels */ -static int bq274xx_channel_get(struct device *dev, enum sensor_channel chan, +static int bq274xx_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct bq274xx_data *bq274xx = dev->driver_data; @@ -209,7 +210,8 @@ static int bq274xx_channel_get(struct device *dev, enum sensor_channel chan, return 0; } -static int bq274xx_sample_fetch(struct device *dev, enum sensor_channel chan) +static int bq274xx_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct bq274xx_data *bq274xx = dev->driver_data; int status = 0; @@ -348,7 +350,7 @@ static int bq274xx_sample_fetch(struct device *dev, enum sensor_channel chan) * * @return 0 for success */ -static int bq274xx_gauge_init(struct device *dev) +static int bq274xx_gauge_init(const struct device *dev) { struct bq274xx_data *bq274xx = dev->driver_data; const struct bq274xx_config *const config = dev->config_info; diff --git a/drivers/sensor/bq274xx/bq274xx.h b/drivers/sensor/bq274xx/bq274xx.h index 60b4cb2368d9..075693cf2d4c 100644 --- a/drivers/sensor/bq274xx/bq274xx.h +++ b/drivers/sensor/bq274xx/bq274xx.h @@ -79,7 +79,7 @@ LOG_MODULE_REGISTER(bq274xx, CONFIG_SENSOR_LOG_LEVEL); #define BQ274XX_DELAY 1000 struct bq274xx_data { - struct device *i2c; + const struct device *i2c; u16_t voltage; s16_t avg_current; s16_t stdby_current; diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c index 7ec0c5594e67..d6cacead9e5f 100644 --- a/drivers/sensor/ccs811/ccs811.c +++ b/drivers/sensor/ccs811/ccs811.c @@ -42,7 +42,7 @@ static void set_wake(struct ccs811_data *drv_data, bool enable) * in bits 8..15. These registers are available in both boot and * application mode. */ -static int fetch_status(struct device *i2c) +static int fetch_status(const struct device *i2c) { u8_t status; int rv; @@ -74,14 +74,14 @@ static inline u8_t error_from_status(int status) return status >> 8; } -const struct ccs811_result_type *ccs811_result(struct device *dev) +const struct ccs811_result_type *ccs811_result(const struct device *dev) { struct ccs811_data *drv_data = dev->driver_data; return &drv_data->result; } -int ccs811_configver_fetch(struct device *dev, +int ccs811_configver_fetch(const struct device *dev, struct ccs811_configver_type *ptr) { struct ccs811_data *drv_data = dev->driver_data; @@ -126,7 +126,7 @@ int ccs811_configver_fetch(struct device *dev, return rc; } -int ccs811_baseline_fetch(struct device *dev) +int ccs811_baseline_fetch(const struct device *dev) { const u8_t cmd = CCS811_REG_BASELINE; struct ccs811_data *drv_data = dev->driver_data; @@ -146,7 +146,7 @@ int ccs811_baseline_fetch(struct device *dev) return rc; } -int ccs811_baseline_update(struct device *dev, +int ccs811_baseline_update(const struct device *dev, u16_t baseline) { struct ccs811_data *drv_data = dev->driver_data; @@ -161,7 +161,7 @@ int ccs811_baseline_update(struct device *dev, return rc; } -int ccs811_envdata_update(struct device *dev, +int ccs811_envdata_update(const struct device *dev, const struct sensor_value *temperature, const struct sensor_value *humidity) { @@ -229,7 +229,8 @@ int ccs811_envdata_update(struct device *dev, return rc; } -static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) +static int ccs811_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct ccs811_data *drv_data = dev->driver_data; struct ccs811_result_type *rp = &drv_data->result; @@ -266,7 +267,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) return (status & CCS811_STATUS_DATA_READY) ? 0 : -EAGAIN; } -static int ccs811_channel_get(struct device *dev, +static int ccs811_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -322,7 +323,7 @@ static const struct sensor_driver_api ccs811_driver_api = { .channel_get = ccs811_channel_get, }; -static int switch_to_app_mode(struct device *i2c) +static int switch_to_app_mode(const struct device *i2c) { u8_t buf; int status; @@ -372,7 +373,7 @@ static int switch_to_app_mode(struct device *i2c) #ifdef CONFIG_CCS811_TRIGGER -int ccs811_mutate_meas_mode(struct device *dev, +int ccs811_mutate_meas_mode(const struct device *dev, u8_t set, u8_t clear) { @@ -409,7 +410,7 @@ int ccs811_mutate_meas_mode(struct device *dev, return rc; } -int ccs811_set_thresholds(struct device *dev) +int ccs811_set_thresholds(const struct device *dev) { struct ccs811_data *drv_data = dev->driver_data; const u8_t buf[5] = { @@ -429,7 +430,7 @@ int ccs811_set_thresholds(struct device *dev) #endif /* CONFIG_CCS811_TRIGGER */ -static int ccs811_init(struct device *dev) +static int ccs811_init(const struct device *dev) { struct ccs811_data *drv_data = dev->driver_data; int ret = 0; diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h index 8619a12eb99e..bc7cc42c8142 100644 --- a/drivers/sensor/ccs811/ccs811.h +++ b/drivers/sensor/ccs811/ccs811.h @@ -48,11 +48,11 @@ #define CCS811_CO2_MAX_PPM 32767 struct ccs811_data { - struct device *i2c; + const struct device *i2c; #if DT_INST_NODE_HAS_PROP(0, irq_gpios) - struct device *irq_gpio; + const struct device *irq_gpio; #ifdef CONFIG_CCS811_TRIGGER - struct device *dev; + const struct device *dev; /* * DATARDY is configured through SENSOR_CHAN_ALL. @@ -73,10 +73,10 @@ struct ccs811_data { #endif /* CONFIG_CCS811_TRIGGER */ #endif #if DT_INST_NODE_HAS_PROP(0, reset_gpios) - struct device *reset_gpio; + const struct device *reset_gpio; #endif #if DT_INST_NODE_HAS_PROP(0, wake_gpios) - struct device *wake_gpio; + const struct device *wake_gpio; #endif struct ccs811_result_type result; u8_t mode; @@ -85,22 +85,22 @@ struct ccs811_data { #ifdef CONFIG_CCS811_TRIGGER -int ccs811_mutate_meas_mode(struct device *dev, +int ccs811_mutate_meas_mode(const struct device *dev, u8_t set, u8_t clear); -int ccs811_set_thresholds(struct device *dev); +int ccs811_set_thresholds(const struct device *dev); -int ccs811_attr_set(struct device *dev, +int ccs811_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int ccs811_trigger_set(struct device *dev, +int ccs811_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int ccs811_init_interrupt(struct device *dev); +int ccs811_init_interrupt(const struct device *dev); #endif /* CONFIG_CCS811_TRIGGER */ diff --git a/drivers/sensor/ccs811/ccs811_trigger.c b/drivers/sensor/ccs811/ccs811_trigger.c index 8d0afddcb0da..375a2a62311e 100644 --- a/drivers/sensor/ccs811/ccs811_trigger.c +++ b/drivers/sensor/ccs811/ccs811_trigger.c @@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(CCS811); #define IRQ_PIN DT_INST_GPIO_PIN(0, irq_gpios) -int ccs811_attr_set(struct device *dev, +int ccs811_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *thr) @@ -45,7 +45,7 @@ int ccs811_attr_set(struct device *dev, return rc; } -static inline void setup_irq(struct device *dev, +static inline void setup_irq(const struct device *dev, bool enable) { struct ccs811_data *data = dev->driver_data; @@ -56,7 +56,7 @@ static inline void setup_irq(struct device *dev, gpio_pin_interrupt_configure(data->irq_gpio, IRQ_PIN, flags); } -static inline void handle_irq(struct device *dev) +static inline void handle_irq(const struct device *dev) { struct ccs811_data *data = dev->driver_data; @@ -69,7 +69,7 @@ static inline void handle_irq(struct device *dev) #endif } -static void process_irq(struct device *dev) +static void process_irq(const struct device *dev) { struct ccs811_data *data = dev->driver_data; @@ -82,7 +82,7 @@ static void process_irq(struct device *dev) } } -static void gpio_callback(struct device *dev, +static void gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -97,7 +97,7 @@ static void gpio_callback(struct device *dev, #ifdef CONFIG_CCS811_TRIGGER_OWN_THREAD static void irq_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct ccs811_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -118,7 +118,7 @@ static void work_cb(struct k_work *work) #error Unhandled trigger configuration #endif -int ccs811_trigger_set(struct device *dev, +int ccs811_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -168,7 +168,7 @@ int ccs811_trigger_set(struct device *dev, return rc; } -int ccs811_init_interrupt(struct device *dev) +int ccs811_init_interrupt(const struct device *dev) { struct ccs811_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c index f5e2fdcbecac..ddae19595ebb 100644 --- a/drivers/sensor/dht/dht.c +++ b/drivers/sensor/dht/dht.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(DHT, CONFIG_SENSOR_LOG_LEVEL); * @return duration in usec of signal being measured, * -1 if duration exceeds DHT_SIGNAL_MAX_WAIT_DURATION */ -static s8_t dht_measure_signal_duration(struct device *dev, +static s8_t dht_measure_signal_duration(const struct device *dev, bool active) { struct dht_data *drv_data = dev->driver_data; @@ -57,7 +57,8 @@ static s8_t dht_measure_signal_duration(struct device *dev, (u64_t)sys_clock_hw_cycles_per_sec(); } -static int dht_sample_fetch(struct device *dev, enum sensor_channel chan) +static int dht_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct dht_data *drv_data = dev->driver_data; const struct dht_config *cfg = dev->config_info; @@ -164,7 +165,7 @@ static int dht_sample_fetch(struct device *dev, enum sensor_channel chan) return ret; } -static int dht_channel_get(struct device *dev, +static int dht_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -221,7 +222,7 @@ static const struct sensor_driver_api dht_api = { .channel_get = &dht_channel_get, }; -static int dht_init(struct device *dev) +static int dht_init(const struct device *dev) { int rc = 0; struct dht_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/dht/dht.h b/drivers/sensor/dht/dht.h index 4d14dccfe496..49a04be4a081 100644 --- a/drivers/sensor/dht/dht.h +++ b/drivers/sensor/dht/dht.h @@ -14,7 +14,7 @@ #define DHT_DATA_BITS_NUM 40 struct dht_data { - struct device *gpio; + const struct device *gpio; u8_t sample[4]; }; diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c index 65c6d3a344ae..a3f58194cb7e 100644 --- a/drivers/sensor/dps310/dps310.c +++ b/drivers/sensor/dps310/dps310.c @@ -228,7 +228,7 @@ struct dps310_cal_coeff { }; struct dps310_data { - struct device *i2c_master; + const struct device *i2c_master; struct dps310_cal_coeff comp; /* Temperature Values */ s32_t tmp_val1; @@ -569,7 +569,7 @@ static bool dps310_measure_tmp(struct dps310_data *data, } /* Initialize the sensor and apply the configuration */ -static int dps310_init(struct device *dev) +static int dps310_init(const struct device *dev) { struct dps310_data *data = dev->driver_data; const struct dps310_cfg *config = dev->config_info; @@ -661,7 +661,8 @@ static int dps310_init(struct device *dev) } /* Do a measurement and fetch the data from the sensor */ -static int dps310_sample_fetch(struct device *dev, enum sensor_channel chan) +static int dps310_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct dps310_data *data = dev->driver_data; const struct dps310_cfg *config = dev->config_info; @@ -695,7 +696,8 @@ static int dps310_sample_fetch(struct device *dev, enum sensor_channel chan) } /* Get the measurement data */ -static int dps310_channel_get(struct device *dev, enum sensor_channel chan, +static int dps310_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct dps310_data *data = dev->driver_data; diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c index 0539bf8a3f1a..e12cc85c553d 100644 --- a/drivers/sensor/ens210/ens210.c +++ b/drivers/sensor/ens210/ens210.c @@ -40,7 +40,8 @@ static u32_t ens210_crc7(u32_t bitstream) #if defined(CONFIG_ENS210_TEMPERATURE_SINGLE) \ || defined(CONFIG_ENS210_HUMIDITY_SINGLE) -static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan) +static int ens210_measure(const struct device *i2c_dev, + enum sensor_channel chan) { u8_t buf; int ret; @@ -78,7 +79,8 @@ static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan) } #endif /* Single shot mode */ -static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan) +static int ens210_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct ens210_data *drv_data = dev->driver_data; struct ens210_value_data data[2]; @@ -157,7 +159,7 @@ static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan) return -EIO; } -static int ens210_channel_get(struct device *dev, +static int ens210_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -188,7 +190,7 @@ static int ens210_channel_get(struct device *dev, return 0; } -static int ens210_sys_reset(struct device *i2c_dev) +static int ens210_sys_reset(const struct device *i2c_dev) { const struct ens210_sys_ctrl sys_ctrl = { .low_power = 0, @@ -204,7 +206,7 @@ static int ens210_sys_reset(struct device *i2c_dev) return ret; } -static int ens210_sys_enable(struct device *i2c_dev, u8_t low_power) +static int ens210_sys_enable(const struct device *i2c_dev, u8_t low_power) { const struct ens210_sys_ctrl sys_ctrl = { .low_power = low_power, @@ -220,7 +222,7 @@ static int ens210_sys_enable(struct device *i2c_dev, u8_t low_power) return ret; } -static int ens210_wait_boot(struct device *i2c_dev) +static int ens210_wait_boot(const struct device *i2c_dev) { int cnt; int ret; @@ -263,7 +265,7 @@ static const struct sensor_driver_api en210_driver_api = { .channel_get = ens210_channel_get, }; -static int ens210_init(struct device *dev) +static int ens210_init(const struct device *dev) { struct ens210_data *drv_data = dev->driver_data; const struct ens210_sens_run sense_run = { diff --git a/drivers/sensor/ens210/ens210.h b/drivers/sensor/ens210/ens210.h index 188e5475c1ed..f4e49e840d49 100644 --- a/drivers/sensor/ens210/ens210.h +++ b/drivers/sensor/ens210/ens210.h @@ -101,7 +101,7 @@ struct ens210_sens_stat { } __packed; struct ens210_data { - struct device *i2c; + const struct device *i2c; struct ens210_value_data temp; struct ens210_value_data humidity; }; diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c index 2a555ec78911..89c7e7d521cd 100644 --- a/drivers/sensor/fxas21002/fxas21002.c +++ b/drivers/sensor/fxas21002/fxas21002.c @@ -18,7 +18,8 @@ static const u32_t sample_period[] = { 1250, 2500, 5000, 10000, 20000, 40000, 80000, 80000 }; -static int fxas21002_sample_fetch(struct device *dev, enum sensor_channel chan) +static int fxas21002_sample_fetch(const struct device *dev, + enum sensor_channel chan) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; @@ -70,7 +71,8 @@ static void fxas21002_convert(struct sensor_value *val, s16_t raw, val->val2 = micro_rad % 1000000; } -static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, +static int fxas21002_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { const struct fxas21002_config *config = dev->config_info; @@ -130,7 +132,7 @@ static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, return ret; } -int fxas21002_get_power(struct device *dev, enum fxas21002_power *power) +int fxas21002_get_power(const struct device *dev, enum fxas21002_power *power) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; @@ -148,7 +150,7 @@ int fxas21002_get_power(struct device *dev, enum fxas21002_power *power) return 0; } -int fxas21002_set_power(struct device *dev, enum fxas21002_power power) +int fxas21002_set_power(const struct device *dev, enum fxas21002_power power) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; @@ -184,7 +186,7 @@ u32_t fxas21002_get_transition_time(enum fxas21002_power start, return transition_time; } -static int fxas21002_init(struct device *dev) +static int fxas21002_init(const struct device *dev) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h index d0a3477d1047..b15625b715f7 100644 --- a/drivers/sensor/fxas21002/fxas21002.h +++ b/drivers/sensor/fxas21002/fxas21002.h @@ -70,10 +70,10 @@ struct fxas21002_config { }; struct fxas21002_data { - struct device *i2c; + const struct device *i2c; struct k_sem sem; #ifdef CONFIG_FXAS21002_TRIGGER - struct device *gpio; + const struct device *gpio; u8_t gpio_pin; struct gpio_callback gpio_cb; sensor_trigger_handler_t drdy_handler; @@ -85,21 +85,21 @@ struct fxas21002_data { #endif #ifdef CONFIG_FXAS21002_TRIGGER_GLOBAL_THREAD struct k_work work; - struct device *dev; + const struct device *dev; #endif s16_t raw[FXAS21002_MAX_NUM_CHANNELS]; }; -int fxas21002_get_power(struct device *dev, enum fxas21002_power *power); -int fxas21002_set_power(struct device *dev, enum fxas21002_power power); +int fxas21002_get_power(const struct device *dev, enum fxas21002_power *power); +int fxas21002_set_power(const struct device *dev, enum fxas21002_power power); u32_t fxas21002_get_transition_time(enum fxas21002_power start, enum fxas21002_power end, u8_t dr); #if CONFIG_FXAS21002_TRIGGER -int fxas21002_trigger_init(struct device *dev); -int fxas21002_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler); +int fxas21002_trigger_init(const struct device *dev); +int fxas21002_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler); #endif diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c index a6ac746e1fca..b4cbdab3adf9 100644 --- a/drivers/sensor/fxas21002/fxas21002_trigger.c +++ b/drivers/sensor/fxas21002/fxas21002_trigger.c @@ -10,9 +10,9 @@ LOG_MODULE_DECLARE(FXAS21002, CONFIG_SENSOR_LOG_LEVEL); -static void fxas21002_gpio_callback(struct device *dev, - struct gpio_callback *cb, - u32_t pin_mask) +static void fxas21002_gpio_callback(const struct device *dev, + struct gpio_callback *cb, + u32_t pin_mask) { struct fxas21002_data *data = CONTAINER_OF(cb, struct fxas21002_data, gpio_cb); @@ -31,7 +31,7 @@ static void fxas21002_gpio_callback(struct device *dev, #endif } -static int fxas21002_handle_drdy_int(struct device *dev) +static int fxas21002_handle_drdy_int(const struct device *dev) { struct fxas21002_data *data = dev->driver_data; @@ -49,7 +49,7 @@ static int fxas21002_handle_drdy_int(struct device *dev) static void fxas21002_handle_int(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; u8_t int_source; @@ -76,7 +76,7 @@ static void fxas21002_handle_int(void *arg) #ifdef CONFIG_FXAS21002_TRIGGER_OWN_THREAD static void fxas21002_thread_main(void *arg1, void *unused1, void *unused2) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct fxas21002_data *data = dev->driver_data; ARG_UNUSED(unused1); @@ -99,9 +99,9 @@ static void fxas21002_work_handler(struct k_work *work) } #endif -int fxas21002_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler) +int fxas21002_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; @@ -169,7 +169,7 @@ int fxas21002_trigger_set(struct device *dev, return ret; } -int fxas21002_trigger_init(struct device *dev) +int fxas21002_trigger_init(const struct device *dev) { const struct fxas21002_config *config = dev->config_info; struct fxas21002_data *data = dev->driver_data; diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index 7b1fff8f17b6..633b34ae7901 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(FXOS8700, CONFIG_SENSOR_LOG_LEVEL); -int fxos8700_set_odr(struct device *dev, const struct sensor_value *val) +int fxos8700_set_odr(const struct device *dev, const struct sensor_value *val) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -71,7 +71,7 @@ int fxos8700_set_odr(struct device *dev, const struct sensor_value *val) FXOS8700_CTRLREG1_DR_MASK, (u8_t)dr); } -static int fxos8700_set_mt_ths(struct device *dev, +static int fxos8700_set_mt_ths(const struct device *dev, const struct sensor_value *val) { #ifdef CONFIG_FXOS8700_MOTION @@ -95,7 +95,7 @@ static int fxos8700_set_mt_ths(struct device *dev, #endif } -static int fxos8700_attr_set(struct device *dev, +static int fxos8700_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -115,7 +115,8 @@ static int fxos8700_attr_set(struct device *dev, return 0; } -static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) +static int fxos8700_sample_fetch(const struct device *dev, + enum sensor_channel chan) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -231,7 +232,8 @@ static void fxos8700_temp_convert(struct sensor_value *val, s8_t raw) } #endif -static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, +static int fxos8700_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { const struct fxos8700_config *config = dev->config_info; @@ -339,7 +341,7 @@ static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, return ret; } -int fxos8700_get_power(struct device *dev, enum fxos8700_power *power) +int fxos8700_get_power(const struct device *dev, enum fxos8700_power *power) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -357,7 +359,7 @@ int fxos8700_get_power(struct device *dev, enum fxos8700_power *power) return 0; } -int fxos8700_set_power(struct device *dev, enum fxos8700_power power) +int fxos8700_set_power(const struct device *dev, enum fxos8700_power power) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -368,12 +370,12 @@ int fxos8700_set_power(struct device *dev, enum fxos8700_power power) power); } -static int fxos8700_init(struct device *dev) +static int fxos8700_init(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; struct sensor_value odr = {.val1 = 6, .val2 = 250000}; - struct device *rst; + const struct device *rst; /* Get the I2C device */ data->i2c = device_get_binding(config->i2c_name); diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h index 45a3734fc36d..d23b7b5ab2ff 100644 --- a/drivers/sensor/fxos8700/fxos8700.h +++ b/drivers/sensor/fxos8700/fxos8700.h @@ -146,10 +146,10 @@ struct fxos8700_config { }; struct fxos8700_data { - struct device *i2c; + const struct device *i2c; struct k_sem sem; #ifdef CONFIG_FXOS8700_TRIGGER - struct device *gpio; + const struct device *gpio; u8_t gpio_pin; struct gpio_callback gpio_cb; sensor_trigger_handler_t drdy_handler; @@ -168,7 +168,7 @@ struct fxos8700_data { #endif #ifdef CONFIG_FXOS8700_TRIGGER_GLOBAL_THREAD struct k_work work; - struct device *dev; + const struct device *dev; #endif s16_t raw[FXOS8700_MAX_NUM_CHANNELS]; #ifdef CONFIG_FXOS8700_TEMP @@ -177,12 +177,12 @@ struct fxos8700_data { u8_t whoami; }; -int fxos8700_get_power(struct device *dev, enum fxos8700_power *power); -int fxos8700_set_power(struct device *dev, enum fxos8700_power power); +int fxos8700_get_power(const struct device *dev, enum fxos8700_power *power); +int fxos8700_set_power(const struct device *dev, enum fxos8700_power power); #if CONFIG_FXOS8700_TRIGGER -int fxos8700_trigger_init(struct device *dev); -int fxos8700_trigger_set(struct device *dev, +int fxos8700_trigger_init(const struct device *dev); +int fxos8700_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif diff --git a/drivers/sensor/fxos8700/fxos8700_trigger.c b/drivers/sensor/fxos8700/fxos8700_trigger.c index faebf969bc5a..2925c94f385c 100644 --- a/drivers/sensor/fxos8700/fxos8700_trigger.c +++ b/drivers/sensor/fxos8700/fxos8700_trigger.c @@ -10,7 +10,7 @@ LOG_MODULE_DECLARE(FXOS8700, CONFIG_SENSOR_LOG_LEVEL); -static void fxos8700_gpio_callback(struct device *dev, +static void fxos8700_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pin_mask) { @@ -31,7 +31,7 @@ static void fxos8700_gpio_callback(struct device *dev, #endif } -static int fxos8700_handle_drdy_int(struct device *dev) +static int fxos8700_handle_drdy_int(const struct device *dev) { struct fxos8700_data *data = dev->driver_data; @@ -48,7 +48,7 @@ static int fxos8700_handle_drdy_int(struct device *dev) } #ifdef CONFIG_FXOS8700_PULSE -static int fxos8700_handle_pulse_int(struct device *dev) +static int fxos8700_handle_pulse_int(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -86,7 +86,7 @@ static int fxos8700_handle_pulse_int(struct device *dev) #endif #ifdef CONFIG_FXOS8700_MOTION -static int fxos8700_handle_motion_int(struct device *dev) +static int fxos8700_handle_motion_int(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -118,7 +118,7 @@ static int fxos8700_handle_motion_int(struct device *dev) static void fxos8700_handle_int(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; u8_t int_source; @@ -155,7 +155,7 @@ static void fxos8700_handle_int(void *arg) #ifdef CONFIG_FXOS8700_TRIGGER_OWN_THREAD static void fxos8700_thread_main(void *arg1, void *unused1, void *unused2) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; struct fxos8700_data *data = dev->driver_data; ARG_UNUSED(unused1); @@ -178,7 +178,7 @@ static void fxos8700_work_handler(struct k_work *work) } #endif -int fxos8700_trigger_set(struct device *dev, +int fxos8700_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -258,7 +258,7 @@ int fxos8700_trigger_set(struct device *dev, } #ifdef CONFIG_FXOS8700_PULSE -static int fxos8700_pulse_init(struct device *dev) +static int fxos8700_pulse_init(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -303,7 +303,7 @@ static int fxos8700_pulse_init(struct device *dev) #endif #ifdef CONFIG_FXOS8700_MOTION -static int fxos8700_motion_init(struct device *dev) +static int fxos8700_motion_init(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; @@ -331,7 +331,7 @@ static int fxos8700_motion_init(struct device *dev) #endif -int fxos8700_trigger_init(struct device *dev) +int fxos8700_trigger_init(const struct device *dev) { const struct fxos8700_config *config = dev->config_info; struct fxos8700_data *data = dev->driver_data; diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c index 62aa95b35872..73693d8aa79e 100644 --- a/drivers/sensor/grove/light_sensor.c +++ b/drivers/sensor/grove/light_sensor.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(grove_light, CONFIG_SENSOR_LOG_LEVEL); struct gls_data { - struct device *adc; + const struct device *adc; struct adc_channel_cfg ch_cfg; u16_t raw; }; @@ -47,14 +47,15 @@ static struct adc_sequence adc_table = { .options = &options, }; -static int gls_sample_fetch(struct device *dev, enum sensor_channel chan) +static int gls_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct gls_data *drv_data = dev->driver_data; return adc_read(drv_data->adc, &adc_table); } -static int gls_channel_get(struct device *dev, +static int gls_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -81,7 +82,7 @@ static const struct sensor_driver_api gls_api = { .channel_get = &gls_channel_get, }; -static int gls_init(struct device *dev) +static int gls_init(const struct device *dev) { struct gls_data *drv_data = dev->driver_data; const struct gls_config *cfg = dev->config_info; diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c index fd2d6ff91ef7..a3bd5593f817 100644 --- a/drivers/sensor/grove/temperature_sensor.c +++ b/drivers/sensor/grove/temperature_sensor.c @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(grove_temp, CONFIG_SENSOR_LOG_LEVEL); #endif struct gts_data { - struct device *adc; + const struct device *adc; struct adc_channel_cfg ch_cfg; u16_t raw; }; @@ -47,14 +47,15 @@ static struct adc_sequence adc_table = { .options = &options, }; -static int gts_sample_fetch(struct device *dev, enum sensor_channel chan) +static int gts_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct gts_data *drv_data = dev->driver_data; return adc_read(drv_data->adc, &adc_table); } -static int gts_channel_get(struct device *dev, +static int gts_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -84,7 +85,7 @@ static const struct sensor_driver_api gts_api = { .channel_get = >s_channel_get, }; -static int gts_init(struct device *dev) +static int gts_init(const struct device *dev) { struct gts_data *drv_data = dev->driver_data; const struct gts_config *cfg = dev->config_info; diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c index 286a8eb6bd36..be8faab796ae 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.c +++ b/drivers/sensor/hmc5883l/hmc5883l.c @@ -26,7 +26,7 @@ static void hmc5883l_convert(struct sensor_value *val, s16_t raw_val, val->val2 = (((s64_t)raw_val % divider) * 1000000L) / divider; } -static int hmc5883l_channel_get(struct device *dev, +static int hmc5883l_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -53,7 +53,8 @@ static int hmc5883l_channel_get(struct device *dev, return 0; } -static int hmc5883l_sample_fetch(struct device *dev, enum sensor_channel chan) +static int hmc5883l_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct hmc5883l_data *drv_data = dev->driver_data; s16_t buf[3]; @@ -83,7 +84,7 @@ static const struct sensor_driver_api hmc5883l_driver_api = { .channel_get = hmc5883l_channel_get, }; -int hmc5883l_init(struct device *dev) +int hmc5883l_init(const struct device *dev) { struct hmc5883l_data *drv_data = dev->driver_data; u8_t chip_cfg[3], id[3], idx; diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h index f1735cf7577b..5674b9ac35f5 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.h +++ b/drivers/sensor/hmc5883l/hmc5883l.h @@ -41,14 +41,14 @@ static const u16_t hmc5883l_gain[] = { }; struct hmc5883l_data { - struct device *i2c; + const struct device *i2c; s16_t x_sample; s16_t y_sample; s16_t z_sample; u8_t gain_idx; #ifdef CONFIG_HMC5883L_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -60,18 +60,18 @@ struct hmc5883l_data { struct k_sem gpio_sem; #elif defined(CONFIG_HMC5883L_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_HMC5883L_TRIGGER */ }; #ifdef CONFIG_HMC5883L_TRIGGER -int hmc5883l_trigger_set(struct device *dev, +int hmc5883l_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int hmc5883l_init_interrupt(struct device *dev); +int hmc5883l_init_interrupt(const struct device *dev); #endif #endif /* __SENSOR_HMC5883L__ */ diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c index 3a24db6ed598..b597a86ee285 100644 --- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c +++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c @@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(HMC5883L, CONFIG_SENSOR_LOG_LEVEL); -int hmc5883l_trigger_set(struct device *dev, +int hmc5883l_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -43,7 +43,7 @@ int hmc5883l_trigger_set(struct device *dev, return 0; } -static void hmc5883l_gpio_callback(struct device *dev, +static void hmc5883l_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct hmc5883l_data *drv_data = @@ -64,7 +64,7 @@ static void hmc5883l_gpio_callback(struct device *dev, static void hmc5883l_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct hmc5883l_data *drv_data = dev->driver_data; if (drv_data->data_ready_handler != NULL) { @@ -80,7 +80,7 @@ static void hmc5883l_thread_cb(void *arg) #ifdef CONFIG_HMC5883L_TRIGGER_OWN_THREAD static void hmc5883l_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct hmc5883l_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -102,7 +102,7 @@ static void hmc5883l_work_cb(struct k_work *work) } #endif -int hmc5883l_init_interrupt(struct device *dev) +int hmc5883l_init_interrupt(const struct device *dev) { struct hmc5883l_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c index 85cbe8670e0c..aa56d3ac9e7c 100644 --- a/drivers/sensor/hp206c/hp206c.c +++ b/drivers/sensor/hp206c/hp206c.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(HP206C, CONFIG_SENSOR_LOG_LEVEL); -static inline int hp206c_bus_config(struct device *dev) +static inline int hp206c_bus_config(const struct device *dev) { struct hp206c_device_data *hp206c = dev->driver_data; u32_t i2c_cfg; @@ -32,7 +32,7 @@ static inline int hp206c_bus_config(struct device *dev) return i2c_configure(hp206c->i2c, i2c_cfg); } -static int hp206c_read(struct device *dev, u8_t cmd, u8_t *data, +static int hp206c_read(const struct device *dev, u8_t cmd, u8_t *data, u8_t len) { struct hp206c_device_data *hp206c = dev->driver_data; @@ -47,7 +47,7 @@ static int hp206c_read(struct device *dev, u8_t cmd, u8_t *data, return 0; } -static int hp206c_read_reg(struct device *dev, u8_t reg_addr, +static int hp206c_read_reg(const struct device *dev, u8_t reg_addr, u8_t *reg_val) { u8_t cmd = HP206C_CMD_READ_REG | (reg_addr & HP206C_REG_ADDR_MASK); @@ -55,7 +55,7 @@ static int hp206c_read_reg(struct device *dev, u8_t reg_addr, return hp206c_read(dev, cmd, reg_val, 1); } -static int hp206c_write(struct device *dev, u8_t cmd, u8_t *data, +static int hp206c_write(const struct device *dev, u8_t cmd, u8_t *data, u8_t len) { struct hp206c_device_data *hp206c = dev->driver_data; @@ -70,7 +70,7 @@ static int hp206c_write(struct device *dev, u8_t cmd, u8_t *data, return 0; } -static int hp206c_write_reg(struct device *dev, u8_t reg_addr, +static int hp206c_write_reg(const struct device *dev, u8_t reg_addr, u8_t reg_val) { u8_t cmd = HP206C_CMD_WRITE_REG | (reg_addr & HP206C_REG_ADDR_MASK); @@ -78,7 +78,7 @@ static int hp206c_write_reg(struct device *dev, u8_t reg_addr, return hp206c_write(dev, cmd, ®_val, 1); } -static int hp206c_cmd_send(struct device *dev, u8_t cmd) +static int hp206c_cmd_send(const struct device *dev, u8_t cmd) { struct hp206c_device_data *hp206c = dev->driver_data; @@ -104,7 +104,7 @@ static u8_t hp206c_adc_time_ms[] = { 5, /* 128 */ }; -static int hp206c_osr_set(struct device *dev, u16_t osr) +static int hp206c_osr_set(const struct device *dev, u16_t osr) { struct hp206c_device_data *hp206c = dev->driver_data; u8_t i; @@ -122,7 +122,7 @@ static int hp206c_osr_set(struct device *dev, u16_t osr) return 0; } -static int hp206c_altitude_offs_set(struct device *dev, s16_t offs) +static int hp206c_altitude_offs_set(const struct device *dev, s16_t offs) { u8_t reg_val; @@ -141,7 +141,7 @@ static int hp206c_altitude_offs_set(struct device *dev, s16_t offs) return hp206c_write_reg(dev, HP206C_REG_PARA, HP206C_COMPENSATION_EN); } -static int hp206c_attr_set(struct device *dev, enum sensor_channel chan, +static int hp206c_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -163,7 +163,7 @@ static int hp206c_attr_set(struct device *dev, enum sensor_channel chan, return -ENOTSUP; } -static int hp206c_wait_dev_ready(struct device *dev, u32_t timeout_ms) +static int hp206c_wait_dev_ready(const struct device *dev, u32_t timeout_ms) { struct hp206c_device_data *hp206c = dev->driver_data; u8_t int_src; @@ -182,7 +182,8 @@ static int hp206c_wait_dev_ready(struct device *dev, u32_t timeout_ms) return -EBUSY; } -static int hp206c_adc_acquire(struct device *dev, enum sensor_channel chan) +static int hp206c_adc_acquire(const struct device *dev, + enum sensor_channel chan) { struct hp206c_device_data *hp206c = dev->driver_data; @@ -206,7 +207,7 @@ static s32_t hp206c_buf_convert(u8_t *buf, bool signed_val) return tmp; } -static int hp206c_val_get(struct device *dev, +static int hp206c_val_get(const struct device *dev, u8_t cmd, struct sensor_value *val) { u8_t buf[3]; @@ -237,25 +238,25 @@ static int hp206c_val_get(struct device *dev, return 0; } -static inline int hp206c_pressure_get(struct device *dev, +static inline int hp206c_pressure_get(const struct device *dev, struct sensor_value *val) { return hp206c_val_get(dev, HP206C_CMD_READ_P, val); } -static inline int hp206c_altitude_get(struct device *dev, +static inline int hp206c_altitude_get(const struct device *dev, struct sensor_value *val) { return hp206c_val_get(dev, HP206C_CMD_READ_A, val); } -static inline int hp206c_temperature_get(struct device *dev, +static inline int hp206c_temperature_get(const struct device *dev, struct sensor_value *val) { return hp206c_val_get(dev, HP206C_CMD_READ_T, val); } -static int hp206c_channel_get(struct device *dev, +static int hp206c_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -282,7 +283,7 @@ static const struct sensor_driver_api hp206c_api = { .channel_get = hp206c_channel_get, }; -static int hp206c_init(struct device *dev) +static int hp206c_init(const struct device *dev) { struct hp206c_device_data *hp206c = dev->driver_data; diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h index 76502bee0e0b..03b630b4578d 100644 --- a/drivers/sensor/hp206c/hp206c.h +++ b/drivers/sensor/hp206c/hp206c.h @@ -73,7 +73,7 @@ /* end of default settings */ struct hp206c_device_data { - struct device *i2c; + const struct device *i2c; #if CONFIG_SYS_CLOCK_TICKS_PER_SEC < 1000 #error "driver needs millisecond tick granularity" #endif diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c index 85cca41f0b21..f540be0815e6 100644 --- a/drivers/sensor/hts221/hts221.c +++ b/drivers/sensor/hts221/hts221.c @@ -22,7 +22,7 @@ static const char * const hts221_odr_strings[] = { "1", "7", "12.5" }; -static int hts221_channel_get(struct device *dev, +static int hts221_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -58,7 +58,8 @@ static int hts221_channel_get(struct device *dev, return 0; } -static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) +static int hts221_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct hts221_data *data = dev->driver_data; const struct hts221_config *cfg = dev->config_info; @@ -79,7 +80,7 @@ static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int hts221_read_conversion_data(struct device *dev) +static int hts221_read_conversion_data(const struct device *dev) { struct hts221_data *data = dev->driver_data; const struct hts221_config *cfg = dev->config_info; @@ -112,7 +113,7 @@ static const struct sensor_driver_api hts221_driver_api = { .channel_get = hts221_channel_get, }; -int hts221_init(struct device *dev) +int hts221_init(const struct device *dev) { const struct hts221_config *cfg = dev->config_info; struct hts221_data *data = dev->driver_data; diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h index 4537fefdd980..2988f1a02804 100644 --- a/drivers/sensor/hts221/hts221.h +++ b/drivers/sensor/hts221/hts221.h @@ -29,7 +29,7 @@ #define HTS221_REG_CONVERSION_START 0x30 struct hts221_data { - struct device *i2c; + const struct device *i2c; s16_t rh_sample; s16_t t_sample; @@ -43,8 +43,8 @@ struct hts221_data { s16_t t1_out; #ifdef CONFIG_HTS221_TRIGGER - struct device *dev; - struct device *drdy_dev; + const struct device *dev; + const struct device *drdy_dev; struct gpio_callback drdy_cb; struct sensor_trigger data_ready_trigger; @@ -72,11 +72,11 @@ struct hts221_config { }; #ifdef CONFIG_HTS221_TRIGGER -int hts221_trigger_set(struct device *dev, +int hts221_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int hts221_init_interrupt(struct device *dev); +int hts221_init_interrupt(const struct device *dev); #endif #endif /* __SENSOR_HTS221__ */ diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c index 1be25bb666ab..4f39e81a1440 100644 --- a/drivers/sensor/hts221/hts221_trigger.c +++ b/drivers/sensor/hts221/hts221_trigger.c @@ -15,7 +15,7 @@ LOG_MODULE_DECLARE(HTS221, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_drdy(struct device *dev, +static inline void setup_drdy(const struct device *dev, bool enable) { struct hts221_data *data = dev->driver_data; @@ -27,7 +27,7 @@ static inline void setup_drdy(struct device *dev, gpio_pin_interrupt_configure(data->drdy_dev, cfg->drdy_pin, flags); } -static inline void handle_drdy(struct device *dev) +static inline void handle_drdy(const struct device *dev) { struct hts221_data *data = dev->driver_data; @@ -40,7 +40,7 @@ static inline void handle_drdy(struct device *dev) #endif } -static void process_drdy(struct device *dev) +static void process_drdy(const struct device *dev) { struct hts221_data *data = dev->driver_data; @@ -53,7 +53,7 @@ static void process_drdy(struct device *dev) } } -int hts221_trigger_set(struct device *dev, +int hts221_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -83,7 +83,7 @@ int hts221_trigger_set(struct device *dev, return 0; } -static void hts221_drdy_callback(struct device *dev, +static void hts221_drdy_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct hts221_data *data = @@ -97,7 +97,7 @@ static void hts221_drdy_callback(struct device *dev, #ifdef CONFIG_HTS221_TRIGGER_OWN_THREAD static void hts221_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct hts221_data *data = dev->driver_data; ARG_UNUSED(unused); @@ -119,7 +119,7 @@ static void hts221_work_cb(struct k_work *work) } #endif -int hts221_init_interrupt(struct device *dev) +int hts221_init_interrupt(const struct device *dev) { struct hts221_data *data = dev->driver_data; const struct hts221_config *cfg = dev->config_info; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c index 04b96d8ae7ff..9856004ce2c9 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc.c @@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL); * @dev: Pointer to instance of struct device (I2C or SPI) * @range: Full scale range (2, 4, 8 and 16 G) */ -static int iis2dlpc_set_range(struct device *dev, u16_t range) +static int iis2dlpc_set_range(const struct device *dev, u16_t range) { int err; struct iis2dlpc_data *iis2dlpc = dev->driver_data; @@ -60,7 +60,7 @@ static int iis2dlpc_set_range(struct device *dev, u16_t range) * @dev: Pointer to instance of struct device (I2C or SPI) * @odr: Output data rate */ -static int iis2dlpc_set_odr(struct device *dev, u16_t odr) +static int iis2dlpc_set_odr(const struct device *dev, u16_t odr) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; u8_t val; @@ -92,7 +92,7 @@ static inline void iis2dlpc_convert(struct sensor_value *val, int raw_val, val->val2 = dval % 1000000LL; } -static inline void iis2dlpc_channel_get_acc(struct device *dev, +static inline void iis2dlpc_channel_get_acc(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -121,7 +121,7 @@ static inline void iis2dlpc_channel_get_acc(struct device *dev, } } -static int iis2dlpc_channel_get(struct device *dev, +static int iis2dlpc_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -140,7 +140,7 @@ static int iis2dlpc_channel_get(struct device *dev, return -ENOTSUP; } -static int iis2dlpc_config(struct device *dev, enum sensor_channel chan, +static int iis2dlpc_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -157,7 +157,8 @@ static int iis2dlpc_config(struct device *dev, enum sensor_channel chan, return -ENOTSUP; } -static int iis2dlpc_attr_set(struct device *dev, enum sensor_channel chan, +static int iis2dlpc_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -175,7 +176,8 @@ static int iis2dlpc_attr_set(struct device *dev, enum sensor_channel chan, return -ENOTSUP; } -static int iis2dlpc_sample_fetch(struct device *dev, enum sensor_channel chan) +static int iis2dlpc_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; const struct iis2dlpc_device_config *cfg = dev->config_info; @@ -211,7 +213,7 @@ static const struct sensor_driver_api iis2dlpc_driver_api = { .channel_get = iis2dlpc_channel_get, }; -static int iis2dlpc_init_interface(struct device *dev) +static int iis2dlpc_init_interface(const struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; const struct iis2dlpc_device_config *cfg = dev->config_info; @@ -253,7 +255,7 @@ static int iis2dlpc_set_power_mode(struct iis2dlpc_data *iis2dlpc, return iis2dlpc_write_reg(iis2dlpc->ctx, IIS2DLPC_CTRL1, ®val, 1); } -static int iis2dlpc_init(struct device *dev) +static int iis2dlpc_init(const struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; const struct iis2dlpc_device_config *cfg = dev->config_info; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.h b/drivers/sensor/iis2dlpc/iis2dlpc.h index 4809b2023f8c..2db6a16bdd51 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc.h +++ b/drivers/sensor/iis2dlpc/iis2dlpc.h @@ -106,7 +106,7 @@ struct iis2dlpc_device_config { /* sensor data */ struct iis2dlpc_data { - struct device *bus; + const struct device *bus; s16_t acc[3]; /* save sensitivity */ @@ -114,7 +114,7 @@ struct iis2dlpc_data { stmdev_ctx_t *ctx; #ifdef CONFIG_IIS2DLPC_TRIGGER - struct device *gpio; + const struct device *gpio; u8_t gpio_pin; struct gpio_callback gpio_cb; sensor_trigger_handler_t drdy_handler; @@ -128,7 +128,7 @@ struct iis2dlpc_data { struct k_sem gpio_sem; #elif defined(CONFIG_IIS2DLPC_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif /* CONFIG_IIS2DLPC_TRIGGER_GLOBAL_THREAD */ #endif /* CONFIG_IIS2DLPC_TRIGGER */ #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) @@ -136,12 +136,12 @@ struct iis2dlpc_data { #endif }; -int iis2dlpc_i2c_init(struct device *dev); -int iis2dlpc_spi_init(struct device *dev); +int iis2dlpc_i2c_init(const struct device *dev); +int iis2dlpc_spi_init(const struct device *dev); #ifdef CONFIG_IIS2DLPC_TRIGGER -int iis2dlpc_init_interrupt(struct device *dev); -int iis2dlpc_trigger_set(struct device *dev, +int iis2dlpc_init_interrupt(const struct device *dev); +int iis2dlpc_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif /* CONFIG_IIS2DLPC_TRIGGER */ diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c index be8fef659d4b..797c5c9623d7 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c @@ -41,7 +41,7 @@ stmdev_ctx_t iis2dlpc_i2c_ctx = { .write_reg = (stmdev_write_ptr) iis2dlpc_i2c_write, }; -int iis2dlpc_i2c_init(struct device *dev) +int iis2dlpc_i2c_init(const struct device *dev) { struct iis2dlpc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c index f6888eba6ff9..a4b7d563f5a3 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c @@ -97,7 +97,7 @@ stmdev_ctx_t iis2dlpc_spi_ctx = { .write_reg = (stmdev_write_ptr) iis2dlpc_spi_write, }; -int iis2dlpc_spi_init(struct device *dev) +int iis2dlpc_spi_init(const struct device *dev) { struct iis2dlpc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c index be8384d0cc36..7fa923591986 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL); /** * iis2dlpc_enable_int - enable selected int pin to generate interrupt */ -static int iis2dlpc_enable_int(struct device *dev, +static int iis2dlpc_enable_int(const struct device *dev, enum sensor_trigger_type type, int enable) { const struct iis2dlpc_device_config *cfg = dev->config_info; @@ -75,7 +75,7 @@ static int iis2dlpc_enable_int(struct device *dev, /** * iis2dlpc_trigger_set - link external trigger to event data ready */ -int iis2dlpc_trigger_set(struct device *dev, +int iis2dlpc_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -105,7 +105,7 @@ int iis2dlpc_trigger_set(struct device *dev, } } -static int iis2dlpc_handle_drdy_int(struct device *dev) +static int iis2dlpc_handle_drdy_int(const struct device *dev) { struct iis2dlpc_data *data = dev->driver_data; @@ -122,7 +122,7 @@ static int iis2dlpc_handle_drdy_int(struct device *dev) } #ifdef CONFIG_IIS2DLPC_PULSE -static int iis2dlpc_handle_single_tap_int(struct device *dev) +static int iis2dlpc_handle_single_tap_int(const struct device *dev) { struct iis2dlpc_data *data = dev->driver_data; sensor_trigger_handler_t handler = data->tap_handler; @@ -139,7 +139,7 @@ static int iis2dlpc_handle_single_tap_int(struct device *dev) return 0; } -static int iis2dlpc_handle_double_tap_int(struct device *dev) +static int iis2dlpc_handle_double_tap_int(const struct device *dev) { struct iis2dlpc_data *data = dev->driver_data; sensor_trigger_handler_t handler = data->double_tap_handler; @@ -163,7 +163,7 @@ static int iis2dlpc_handle_double_tap_int(struct device *dev) */ static void iis2dlpc_handle_interrupt(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct iis2dlpc_data *iis2dlpc = dev->driver_data; const struct iis2dlpc_device_config *cfg = dev->config_info; iis2dlpc_all_sources_t sources; @@ -186,7 +186,7 @@ static void iis2dlpc_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void iis2dlpc_gpio_callback(struct device *dev, +static void iis2dlpc_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct iis2dlpc_data *iis2dlpc = @@ -209,7 +209,7 @@ static void iis2dlpc_gpio_callback(struct device *dev, #ifdef CONFIG_IIS2DLPC_TRIGGER_OWN_THREAD static void iis2dlpc_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct iis2dlpc_data *iis2dlpc = dev->driver_data; ARG_UNUSED(unused); @@ -231,7 +231,7 @@ static void iis2dlpc_work_cb(struct k_work *work) } #endif /* CONFIG_IIS2DLPC_TRIGGER_GLOBAL_THREAD */ -int iis2dlpc_init_interrupt(struct device *dev) +int iis2dlpc_init_interrupt(const struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; const struct iis2dlpc_device_config *cfg = dev->config_info; diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c index b561518cd030..8487413005d3 100644 --- a/drivers/sensor/iis2mdc/iis2mdc.c +++ b/drivers/sensor/iis2mdc/iis2mdc.c @@ -23,7 +23,8 @@ struct iis2mdc_data iis2mdc_data; LOG_MODULE_REGISTER(IIS2MDC, CONFIG_SENSOR_LOG_LEVEL); #ifdef CONFIG_IIS2MDC_MAG_ODR_RUNTIME -static int iis2mdc_set_odr(struct device *dev, const struct sensor_value *val) +static int iis2mdc_set_odr(const struct device *dev, + const struct sensor_value *val) { struct iis2mdc_data *iis2mdc = dev->driver_data; iis2mdc_odr_t odr; @@ -53,7 +54,8 @@ static int iis2mdc_set_odr(struct device *dev, const struct sensor_value *val) } #endif /* CONFIG_IIS2MDC_MAG_ODR_RUNTIME */ -static int iis2mdc_set_hard_iron(struct device *dev, enum sensor_channel chan, +static int iis2mdc_set_hard_iron(const struct device *dev, + enum sensor_channel chan, const struct sensor_value *val) { struct iis2mdc_data *iis2mdc = dev->driver_data; @@ -68,7 +70,7 @@ static int iis2mdc_set_hard_iron(struct device *dev, enum sensor_channel chan, return iis2mdc_mag_user_offset_set(iis2mdc->ctx, offset.u8bit); } -static void iis2mdc_channel_get_mag(struct device *dev, +static void iis2mdc_channel_get_mag(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -102,7 +104,7 @@ static void iis2mdc_channel_get_mag(struct device *dev, } /* read internal temperature */ -static void iis2mdc_channel_get_temp(struct device *dev, +static void iis2mdc_channel_get_temp(const struct device *dev, struct sensor_value *val) { struct iis2mdc_data *drv_data = dev->driver_data; @@ -111,7 +113,8 @@ static void iis2mdc_channel_get_temp(struct device *dev, val->val2 = (drv_data->temp_sample % 100) * 10000; } -static int iis2mdc_channel_get(struct device *dev, enum sensor_channel chan, +static int iis2mdc_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { switch (chan) { @@ -132,7 +135,7 @@ static int iis2mdc_channel_get(struct device *dev, enum sensor_channel chan, return 0; } -static int iis2mdc_config(struct device *dev, enum sensor_channel chan, +static int iis2mdc_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -151,7 +154,7 @@ static int iis2mdc_config(struct device *dev, enum sensor_channel chan, return 0; } -static int iis2mdc_attr_set(struct device *dev, +static int iis2mdc_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -171,7 +174,7 @@ static int iis2mdc_attr_set(struct device *dev, return 0; } -static int iis2mdc_sample_fetch_mag(struct device *dev) +static int iis2mdc_sample_fetch_mag(const struct device *dev) { struct iis2mdc_data *iis2mdc = dev->driver_data; union axis3bit16_t raw_mag; @@ -189,7 +192,7 @@ static int iis2mdc_sample_fetch_mag(struct device *dev) return 0; } -static int iis2mdc_sample_fetch_temp(struct device *dev) +static int iis2mdc_sample_fetch_temp(const struct device *dev) { struct iis2mdc_data *iis2mdc = dev->driver_data; union axis1bit16_t raw_temp; @@ -208,7 +211,8 @@ static int iis2mdc_sample_fetch_temp(struct device *dev) return 0; } -static int iis2mdc_sample_fetch(struct device *dev, enum sensor_channel chan) +static int iis2mdc_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_MAGN_X: @@ -240,7 +244,7 @@ static const struct sensor_driver_api iis2mdc_driver_api = { .channel_get = iis2mdc_channel_get, }; -static int iis2mdc_init_interface(struct device *dev) +static int iis2mdc_init_interface(const struct device *dev) { const struct iis2mdc_config *const config = dev->config_info; @@ -286,7 +290,7 @@ static const struct iis2mdc_config iis2mdc_dev_config = { #endif }; -static int iis2mdc_init(struct device *dev) +static int iis2mdc_init(const struct device *dev) { struct iis2mdc_data *iis2mdc = dev->driver_data; u8_t wai; diff --git a/drivers/sensor/iis2mdc/iis2mdc.h b/drivers/sensor/iis2mdc/iis2mdc.h index 048a1281fbb8..67d21d4e0bf1 100644 --- a/drivers/sensor/iis2mdc/iis2mdc.h +++ b/drivers/sensor/iis2mdc/iis2mdc.h @@ -29,7 +29,7 @@ union axis1bit16_t { struct iis2mdc_config { char *master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_IIS2MDC_TRIGGER const char *drdy_port; gpio_pin_t drdy_pin; @@ -48,7 +48,7 @@ struct iis2mdc_config { /* Sensor data */ struct iis2mdc_data { - struct device *bus; + const struct device *bus; u16_t i2c_addr; s16_t mag[3]; s32_t temp_sample; @@ -62,7 +62,7 @@ struct iis2mdc_data { #endif #ifdef CONFIG_IIS2MDC_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t handler_drdy; @@ -73,7 +73,7 @@ struct iis2mdc_data { struct k_sem gpio_sem; #elif defined(CONFIG_IIS2MDC_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif /* CONFIG_IIS2MDC_TRIGGER_GLOBAL_THREAD */ #endif /* CONFIG_IIS2MDC_TRIGGER */ #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) @@ -81,12 +81,12 @@ struct iis2mdc_data { #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */ }; -int iis2mdc_spi_init(struct device *dev); -int iis2mdc_i2c_init(struct device *dev); +int iis2mdc_spi_init(const struct device *dev); +int iis2mdc_i2c_init(const struct device *dev); #ifdef CONFIG_IIS2MDC_TRIGGER -int iis2mdc_init_interrupt(struct device *dev); -int iis2mdc_trigger_set(struct device *dev, +int iis2mdc_init_interrupt(const struct device *dev); +int iis2mdc_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif /* CONFIG_IIS2MDC_TRIGGER */ diff --git a/drivers/sensor/iis2mdc/iis2mdc_i2c.c b/drivers/sensor/iis2mdc/iis2mdc_i2c.c index b922a861476e..8ccd8ce888cd 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_i2c.c +++ b/drivers/sensor/iis2mdc/iis2mdc_i2c.c @@ -21,7 +21,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(IIS2MDC); -static int iis2mdc_i2c_read(struct device *dev, u8_t reg_addr, +static int iis2mdc_i2c_read(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct iis2mdc_data *data = dev->driver_data; @@ -31,7 +31,7 @@ static int iis2mdc_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int iis2mdc_i2c_write(struct device *dev, u8_t reg_addr, +static int iis2mdc_i2c_write(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct iis2mdc_data *data = dev->driver_data; @@ -41,7 +41,7 @@ static int iis2mdc_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int iis2mdc_i2c_init(struct device *dev) +int iis2mdc_i2c_init(const struct device *dev) { struct iis2mdc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis2mdc/iis2mdc_spi.c b/drivers/sensor/iis2mdc/iis2mdc_spi.c index 25a08ba2fd5b..f550b1642d09 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_spi.c +++ b/drivers/sensor/iis2mdc/iis2mdc_spi.c @@ -21,7 +21,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(IIS2MDC); -static int iis2mdc_spi_read(struct device *dev, u8_t reg_addr, +static int iis2mdc_spi_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct iis2mdc_data *data = dev->driver_data; @@ -63,7 +63,7 @@ static int iis2mdc_spi_read(struct device *dev, u8_t reg_addr, return 0; } -static int iis2mdc_spi_write(struct device *dev, u8_t reg_addr, +static int iis2mdc_spi_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct iis2mdc_data *data = dev->driver_data; @@ -97,7 +97,7 @@ static int iis2mdc_spi_write(struct device *dev, u8_t reg_addr, return 0; } -int iis2mdc_spi_init(struct device *dev) +int iis2mdc_spi_init(const struct device *dev) { struct iis2mdc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis2mdc/iis2mdc_trigger.c b/drivers/sensor/iis2mdc/iis2mdc_trigger.c index 9281978be820..efe705519ad4 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_trigger.c +++ b/drivers/sensor/iis2mdc/iis2mdc_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(IIS2MDC, CONFIG_SENSOR_LOG_LEVEL); -static int iis2mdc_enable_int(struct device *dev, int enable) +static int iis2mdc_enable_int(const struct device *dev, int enable) { struct iis2mdc_data *iis2mdc = dev->driver_data; @@ -27,7 +27,7 @@ static int iis2mdc_enable_int(struct device *dev, int enable) } /* link external trigger to event data ready */ -int iis2mdc_trigger_set(struct device *dev, +int iis2mdc_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -52,7 +52,7 @@ int iis2mdc_trigger_set(struct device *dev, /* handle the drdy event: read data and call handler if registered any */ static void iis2mdc_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct iis2mdc_data *iis2mdc = dev->driver_data; const struct iis2mdc_config *const config = dev->config_info; @@ -68,7 +68,7 @@ static void iis2mdc_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void iis2mdc_gpio_callback(struct device *dev, +static void iis2mdc_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct iis2mdc_data *iis2mdc = @@ -89,7 +89,7 @@ static void iis2mdc_gpio_callback(struct device *dev, #ifdef CONFIG_IIS2MDC_TRIGGER_OWN_THREAD static void iis2mdc_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct iis2mdc_data *iis2mdc = dev->driver_data; ARG_UNUSED(unused); @@ -111,7 +111,7 @@ static void iis2mdc_work_cb(struct k_work *work) } #endif -int iis2mdc_init_interrupt(struct device *dev) +int iis2mdc_init_interrupt(const struct device *dev) { struct iis2mdc_data *iis2mdc = dev->driver_data; const struct iis2mdc_config *const config = dev->config_info; diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c index 62d77b47ff10..e33a493ae55e 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(IIS3DHHC, CONFIG_SENSOR_LOG_LEVEL); -static int iis3dhhc_sample_fetch(struct device *dev, +static int iis3dhhc_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct iis3dhhc_data *data = dev->driver_data; @@ -48,7 +48,7 @@ static inline void iis3dhhc_convert(struct sensor_value *val, val->val2 = micro_ms2 % 1000000LL; } -static inline void iis3dhhc_channel_get_acc(struct device *dev, +static inline void iis3dhhc_channel_get_acc(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -77,7 +77,7 @@ static inline void iis3dhhc_channel_get_acc(struct device *dev, } } -static int iis3dhhc_channel_get(struct device *dev, +static int iis3dhhc_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -96,8 +96,8 @@ static int iis3dhhc_channel_get(struct device *dev, return -ENOTSUP; } -static int iis3dhhc_odr_set(struct device *dev, - const struct sensor_value *val) +static int iis3dhhc_odr_set(const struct device *dev, + const struct sensor_value *val) { struct iis3dhhc_data *data = dev->driver_data; iis3dhhc_norm_mod_en_t en; @@ -121,9 +121,10 @@ static int iis3dhhc_odr_set(struct device *dev, return 0; } -static int iis3dhhc_attr_set(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int iis3dhhc_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { if (chan != SENSOR_CHAN_ALL) { LOG_WRN("attr_set() not supported on this channel."); @@ -150,7 +151,7 @@ static const struct sensor_driver_api iis3dhhc_api_funcs = { #endif }; -static int iis3dhhc_init_chip(struct device *dev) +static int iis3dhhc_init_chip(const struct device *dev) { struct iis3dhhc_data *data = dev->driver_data; u8_t chip_id, rst; @@ -189,7 +190,7 @@ static int iis3dhhc_init_chip(struct device *dev) return 0; } -static int iis3dhhc_init(struct device *dev) +static int iis3dhhc_init(const struct device *dev) { const struct iis3dhhc_config * const config = dev->config_info; struct iis3dhhc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.h b/drivers/sensor/iis3dhhc/iis3dhhc.h index baebf90fb203..7bc14176e975 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc.h +++ b/drivers/sensor/iis3dhhc/iis3dhhc.h @@ -26,7 +26,7 @@ union axis3bit16_t { struct iis3dhhc_config { char *master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_IIS3DHHC_TRIGGER const char *int_port; u8_t int_pin; @@ -42,7 +42,7 @@ struct iis3dhhc_config { }; struct iis3dhhc_data { - struct device *bus; + const struct device *bus; s16_t acc[3]; stmdev_ctx_t *ctx; @@ -52,7 +52,7 @@ struct iis3dhhc_data { #endif #ifdef CONFIG_IIS3DHHC_TRIGGER - struct device *gpio; + const struct device *gpio; u32_t pin; struct gpio_callback gpio_cb; @@ -64,7 +64,7 @@ struct iis3dhhc_data { struct k_sem gpio_sem; #elif defined(CONFIG_IIS3DHHC_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_IIS3DHHC_TRIGGER */ @@ -73,14 +73,14 @@ struct iis3dhhc_data { #endif }; -int iis3dhhc_spi_init(struct device *dev); +int iis3dhhc_spi_init(const struct device *dev); #ifdef CONFIG_IIS3DHHC_TRIGGER -int iis3dhhc_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler); +int iis3dhhc_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler); -int iis3dhhc_init_interrupt(struct device *dev); +int iis3dhhc_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_IIS3DHHC_IIS3DHHC_H_ */ diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c index 8a50a9445967..ad6a876eb016 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c @@ -96,7 +96,7 @@ stmdev_ctx_t iis3dhhc_spi_ctx = { .write_reg = (stmdev_write_ptr) iis3dhhc_spi_write, }; -int iis3dhhc_spi_init(struct device *dev) +int iis3dhhc_spi_init(const struct device *dev) { struct iis3dhhc_data *data = dev->driver_data; diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c index 2d556fed1e10..d99c8abeade0 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(IIS3DHHC, CONFIG_SENSOR_LOG_LEVEL); /** * iis3dhhc_enable_int - enable selected int pin to generate interrupt */ -static int iis3dhhc_enable_int(struct device *dev, int enable) +static int iis3dhhc_enable_int(const struct device *dev, int enable) { struct iis3dhhc_data *iis3dhhc = dev->driver_data; @@ -37,7 +37,7 @@ static int iis3dhhc_enable_int(struct device *dev, int enable) /** * iis3dhhc_trigger_set - link external trigger to event data ready */ -int iis3dhhc_trigger_set(struct device *dev, +int iis3dhhc_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -64,7 +64,7 @@ int iis3dhhc_trigger_set(struct device *dev, */ static void iis3dhhc_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct iis3dhhc_data *iis3dhhc = dev->driver_data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -79,7 +79,7 @@ static void iis3dhhc_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void iis3dhhc_gpio_callback(struct device *dev, +static void iis3dhhc_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct iis3dhhc_data *iis3dhhc = @@ -101,7 +101,7 @@ static void iis3dhhc_gpio_callback(struct device *dev, #ifdef CONFIG_IIS3DHHC_TRIGGER_OWN_THREAD static void iis3dhhc_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct iis3dhhc_data *iis3dhhc = dev->driver_data; ARG_UNUSED(unused); @@ -123,7 +123,7 @@ static void iis3dhhc_work_cb(struct k_work *work) } #endif /* CONFIG_IIS3DHHC_TRIGGER_GLOBAL_THREAD */ -int iis3dhhc_init_interrupt(struct device *dev) +int iis3dhhc_init_interrupt(const struct device *dev) { struct iis3dhhc_data *iis3dhhc = dev->driver_data; const struct iis3dhhc_config *cfg = dev->config_info; diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c index ce900928a7f1..5932466d754d 100644 --- a/drivers/sensor/isl29035/isl29035.c +++ b/drivers/sensor/isl29035/isl29035.c @@ -19,7 +19,8 @@ LOG_MODULE_REGISTER(ISL29035, CONFIG_SENSOR_LOG_LEVEL); -static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan) +static int isl29035_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct isl29035_driver_data *drv_data = dev->driver_data; u8_t msb, lsb; @@ -41,7 +42,7 @@ static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int isl29035_channel_get(struct device *dev, +static int isl29035_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -72,7 +73,7 @@ static const struct sensor_driver_api isl29035_api = { .channel_get = &isl29035_channel_get, }; -static int isl29035_init(struct device *dev) +static int isl29035_init(const struct device *dev) { struct isl29035_driver_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h index d66fb2c5e08d..12688a910760 100644 --- a/drivers/sensor/isl29035/isl29035.h +++ b/drivers/sensor/isl29035/isl29035.h @@ -111,11 +111,11 @@ (ISL29035_INT_PRST_IDX << ISL29035_INT_PRST_SHIFT) struct isl29035_driver_data { - struct device *i2c; + const struct device *i2c; u16_t data_sample; #if CONFIG_ISL29035_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger th_trigger; @@ -127,23 +127,23 @@ struct isl29035_driver_data { struct k_sem gpio_sem; #elif defined(CONFIG_ISL29035_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_ISL29035_TRIGGER */ }; #ifdef CONFIG_ISL29035_TRIGGER -int isl29035_attr_set(struct device *dev, +int isl29035_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int isl29035_trigger_set(struct device *dev, +int isl29035_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int isl29035_init_interrupt(struct device *dev); +int isl29035_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_ */ diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c index 2fd41f071c8c..3a94602f9a7f 100644 --- a/drivers/sensor/isl29035/isl29035_trigger.c +++ b/drivers/sensor/isl29035/isl29035_trigger.c @@ -52,7 +52,7 @@ static u16_t isl29035_lux_processed_to_raw(struct sensor_value const *val) return raw_val / ISL29035_LUX_RANGE; } -int isl29035_attr_set(struct device *dev, +int isl29035_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -84,7 +84,7 @@ int isl29035_attr_set(struct device *dev, return 0; } -static void isl29035_gpio_callback(struct device *dev, +static void isl29035_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct isl29035_driver_data *drv_data = @@ -95,7 +95,7 @@ static void isl29035_gpio_callback(struct device *dev, handle_int(drv_data); } -static void isl29035_thread_cb(struct device *dev) +static void isl29035_thread_cb(const struct device *dev) { struct isl29035_driver_data *drv_data = dev->driver_data; u8_t val; @@ -117,7 +117,7 @@ static void isl29035_thread_cb(struct device *dev) #ifdef CONFIG_ISL29035_TRIGGER_OWN_THREAD static void isl29035_thread(int ptr, int unused) { - struct device *dev = INT_TO_POINTER(ptr); + const struct device *dev = INT_TO_POINTER(ptr); struct isl29035_driver_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -139,7 +139,7 @@ static void isl29035_work_cb(struct k_work *work) } #endif -int isl29035_trigger_set(struct device *dev, +int isl29035_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -161,7 +161,7 @@ int isl29035_trigger_set(struct device *dev, return 0; } -int isl29035_init_interrupt(struct device *dev) +int isl29035_init_interrupt(const struct device *dev) { struct isl29035_driver_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c index 543551686b2e..1440a1f2337a 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx.c @@ -88,7 +88,7 @@ static int ism330dhcx_gyro_range_to_fs_val(s32_t range) } #endif -static inline int ism330dhcx_reboot(struct device *dev) +static inline int ism330dhcx_reboot(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; @@ -102,7 +102,7 @@ static inline int ism330dhcx_reboot(struct device *dev) return 0; } -static int ism330dhcx_accel_set_fs_raw(struct device *dev, u8_t fs) +static int ism330dhcx_accel_set_fs_raw(const struct device *dev, u8_t fs) { struct ism330dhcx_data *data = dev->driver_data; @@ -115,7 +115,7 @@ static int ism330dhcx_accel_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int ism330dhcx_accel_set_odr_raw(struct device *dev, u8_t odr) +static int ism330dhcx_accel_set_odr_raw(const struct device *dev, u8_t odr) { struct ism330dhcx_data *data = dev->driver_data; @@ -128,7 +128,7 @@ static int ism330dhcx_accel_set_odr_raw(struct device *dev, u8_t odr) return 0; } -static int ism330dhcx_gyro_set_fs_raw(struct device *dev, u8_t fs) +static int ism330dhcx_gyro_set_fs_raw(const struct device *dev, u8_t fs) { struct ism330dhcx_data *data = dev->driver_data; @@ -139,7 +139,7 @@ static int ism330dhcx_gyro_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int ism330dhcx_gyro_set_odr_raw(struct device *dev, u8_t odr) +static int ism330dhcx_gyro_set_odr_raw(const struct device *dev, u8_t odr) { struct ism330dhcx_data *data = dev->driver_data; @@ -151,7 +151,7 @@ static int ism330dhcx_gyro_set_odr_raw(struct device *dev, u8_t odr) } #ifdef ISM330DHCX_ACCEL_ODR_RUNTIME -static int ism330dhcx_accel_odr_set(struct device *dev, u16_t freq) +static int ism330dhcx_accel_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -170,7 +170,7 @@ static int ism330dhcx_accel_odr_set(struct device *dev, u16_t freq) #endif #ifdef ISM330DHCX_ACCEL_FS_RUNTIME -static int ism330dhcx_accel_range_set(struct device *dev, s32_t range) +static int ism330dhcx_accel_range_set(const struct device *dev, s32_t range) { int fs; struct ism330dhcx_data *data = dev->driver_data; @@ -190,7 +190,8 @@ static int ism330dhcx_accel_range_set(struct device *dev, s32_t range) } #endif -static int ism330dhcx_accel_config(struct device *dev, enum sensor_channel chan, +static int ism330dhcx_accel_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -212,7 +213,7 @@ static int ism330dhcx_accel_config(struct device *dev, enum sensor_channel chan, } #ifdef ISM330DHCX_GYRO_ODR_RUNTIME -static int ism330dhcx_gyro_odr_set(struct device *dev, u16_t freq) +static int ism330dhcx_gyro_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -231,7 +232,7 @@ static int ism330dhcx_gyro_odr_set(struct device *dev, u16_t freq) #endif #ifdef ISM330DHCX_GYRO_FS_RUNTIME -static int ism330dhcx_gyro_range_set(struct device *dev, s32_t range) +static int ism330dhcx_gyro_range_set(const struct device *dev, s32_t range) { int fs; struct ism330dhcx_data *data = dev->driver_data; @@ -251,7 +252,8 @@ static int ism330dhcx_gyro_range_set(struct device *dev, s32_t range) } #endif -static int ism330dhcx_gyro_config(struct device *dev, enum sensor_channel chan, +static int ism330dhcx_gyro_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -272,7 +274,8 @@ static int ism330dhcx_gyro_config(struct device *dev, enum sensor_channel chan, return 0; } -static int ism330dhcx_attr_set(struct device *dev, enum sensor_channel chan, +static int ism330dhcx_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -295,7 +298,7 @@ static int ism330dhcx_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int ism330dhcx_sample_fetch_accel(struct device *dev) +static int ism330dhcx_sample_fetch_accel(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; union axis3bit16_t buf; @@ -312,7 +315,7 @@ static int ism330dhcx_sample_fetch_accel(struct device *dev) return 0; } -static int ism330dhcx_sample_fetch_gyro(struct device *dev) +static int ism330dhcx_sample_fetch_gyro(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; union axis3bit16_t buf; @@ -330,7 +333,7 @@ static int ism330dhcx_sample_fetch_gyro(struct device *dev) } #if defined(CONFIG_ISM330DHCX_ENABLE_TEMP) -static int ism330dhcx_sample_fetch_temp(struct device *dev) +static int ism330dhcx_sample_fetch_temp(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; union axis1bit16_t buf; @@ -347,7 +350,7 @@ static int ism330dhcx_sample_fetch_temp(struct device *dev) #endif #if defined(CONFIG_ISM330DHCX_SENSORHUB) -static int ism330dhcx_sample_fetch_shub(struct device *dev) +static int ism330dhcx_sample_fetch_shub(const struct device *dev) { if (ism330dhcx_shub_fetch_external_devs(dev) < 0) { LOG_DBG("failed to read ext shub devices"); @@ -358,7 +361,8 @@ static int ism330dhcx_sample_fetch_shub(struct device *dev) } #endif /* CONFIG_ISM330DHCX_SENSORHUB */ -static int ism330dhcx_sample_fetch(struct device *dev, enum sensor_channel chan) +static int ism330dhcx_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -625,7 +629,7 @@ static inline void ism330dhcx_temp_convert(struct sensor_value *val, } #endif -static int ism330dhcx_channel_get(struct device *dev, +static int ism330dhcx_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -685,7 +689,7 @@ static const struct sensor_driver_api ism330dhcx_api_funcs = { .channel_get = ism330dhcx_channel_get, }; -static int ism330dhcx_init_chip(struct device *dev) +static int ism330dhcx_init_chip(const struct device *dev) { struct ism330dhcx_data *ism330dhcx = dev->driver_data; u8_t chip_id; @@ -802,7 +806,7 @@ static const struct ism330dhcx_config ism330dhcx_config = { #endif /* CONFIG_ISM330DHCX_TRIGGER */ }; -static int ism330dhcx_init(struct device *dev) +static int ism330dhcx_init(const struct device *dev) { const struct ism330dhcx_config * const config = dev->config_info; struct ism330dhcx_data *data = dev->driver_data; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.h b/drivers/sensor/ism330dhcx/ism330dhcx.h index eccccd604436..4ea0e5c97e72 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx.h +++ b/drivers/sensor/ism330dhcx/ism330dhcx.h @@ -93,7 +93,7 @@ union axis1bit16_t { struct ism330dhcx_config { char *bus_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_ISM330DHCX_TRIGGER const char *int_gpio_port; u8_t int_gpio_pin; @@ -137,7 +137,7 @@ struct ism330dhcx_tf { #define ISM330DHCX_SHUB_MAX_NUM_SLVS 2 struct ism330dhcx_data { - struct device *bus; + const struct device *bus; s16_t acc[3]; u32_t acc_gain; s16_t gyro[3]; @@ -171,7 +171,7 @@ struct ism330dhcx_data { u8_t gyro_fs; #ifdef CONFIG_ISM330DHCX_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t handler_drdy_acc; sensor_trigger_handler_t handler_drdy_gyr; @@ -183,7 +183,7 @@ struct ism330dhcx_data { struct k_sem gpio_sem; #elif defined(CONFIG_ISM330DHCX_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_ISM330DHCX_TRIGGER */ @@ -192,23 +192,23 @@ struct ism330dhcx_data { #endif }; -int ism330dhcx_spi_init(struct device *dev); -int ism330dhcx_i2c_init(struct device *dev); +int ism330dhcx_spi_init(const struct device *dev); +int ism330dhcx_i2c_init(const struct device *dev); #if defined(CONFIG_ISM330DHCX_SENSORHUB) -int ism330dhcx_shub_init(struct device *dev); -int ism330dhcx_shub_fetch_external_devs(struct device *dev); +int ism330dhcx_shub_init(const struct device *dev); +int ism330dhcx_shub_fetch_external_devs(const struct device *dev); int ism330dhcx_shub_get_idx(enum sensor_channel type); -int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val); +int ism330dhcx_shub_config(const struct device *dev, enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val); #endif /* CONFIG_ISM330DHCX_SENSORHUB */ #ifdef CONFIG_ISM330DHCX_TRIGGER -int ism330dhcx_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler); +int ism330dhcx_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler); -int ism330dhcx_init_interrupt(struct device *dev); +int ism330dhcx_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_ISM330DHCX_ISM330DHCX_H_ */ diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c index 513c45c2f4e0..90e6781c63d2 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c @@ -20,8 +20,8 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); -static int ism330dhcx_i2c_read(struct device *dev, u8_t reg_addr, - u8_t *value, u8_t len) +static int ism330dhcx_i2c_read(const struct device *dev, u8_t reg_addr, + u8_t *value, u8_t len) { struct ism330dhcx_data *data = dev->driver_data; const struct ism330dhcx_config *cfg = dev->config_info; @@ -30,8 +30,8 @@ static int ism330dhcx_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int ism330dhcx_i2c_write(struct device *dev, u8_t reg_addr, - u8_t *value, u8_t len) +static int ism330dhcx_i2c_write(const struct device *dev, u8_t reg_addr, + u8_t *value, u8_t len) { struct ism330dhcx_data *data = dev->driver_data; const struct ism330dhcx_config *cfg = dev->config_info; @@ -40,7 +40,7 @@ static int ism330dhcx_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int ism330dhcx_i2c_init(struct device *dev) +int ism330dhcx_i2c_init(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c index a35e15ddc3d6..24585b9fe56c 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c @@ -680,7 +680,7 @@ int ism330dhcx_shub_get_idx(enum sensor_channel type) return -ENOTSUP; } -int ism330dhcx_shub_fetch_external_devs(struct device *dev) +int ism330dhcx_shub_fetch_external_devs(const struct device *dev) { u8_t n; struct ism330dhcx_data *data = dev->driver_data; @@ -705,9 +705,9 @@ int ism330dhcx_shub_fetch_external_devs(struct device *dev) return 0; } -int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +int ism330dhcx_shub_config(const struct device *dev, enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { struct ism330dhcx_data *data = dev->driver_data; struct ism330dhcx_shub_slist *sp = NULL; @@ -733,7 +733,7 @@ int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan, return sp->dev_conf(data, sp->ext_i2c_addr, chan, attr, val); } -int ism330dhcx_shub_init(struct device *dev) +int ism330dhcx_shub_init(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; u8_t i, n = 0, regn; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c index adb0be6bfb2d..599eb1ed491a 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c @@ -20,8 +20,8 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); -static int ism330dhcx_spi_read(struct device *dev, u8_t reg_addr, - u8_t *value, u8_t len) +static int ism330dhcx_spi_read(const struct device *dev, u8_t reg_addr, + u8_t *value, u8_t len) { struct ism330dhcx_data *data = dev->driver_data; const struct ism330dhcx_config *cfg = dev->config_info; @@ -62,8 +62,8 @@ static int ism330dhcx_spi_read(struct device *dev, u8_t reg_addr, return 0; } -static int ism330dhcx_spi_write(struct device *dev, u8_t reg_addr, - u8_t *value, u8_t len) +static int ism330dhcx_spi_write(const struct device *dev, u8_t reg_addr, + u8_t *value, u8_t len) { struct ism330dhcx_data *data = dev->driver_data; const struct ism330dhcx_config *cfg = dev->config_info; @@ -96,7 +96,7 @@ static int ism330dhcx_spi_write(struct device *dev, u8_t reg_addr, return 0; } -int ism330dhcx_spi_init(struct device *dev) +int ism330dhcx_spi_init(const struct device *dev) { struct ism330dhcx_data *data = dev->driver_data; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c index eef266d201eb..41eb2ff15982 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); /** * ism330dhcx_enable_t_int - TEMP enable selected int pin to generate interrupt */ -static int ism330dhcx_enable_t_int(struct device *dev, int enable) +static int ism330dhcx_enable_t_int(const struct device *dev, int enable) { const struct ism330dhcx_config *cfg = dev->config_info; struct ism330dhcx_data *ism330dhcx = dev->driver_data; @@ -51,7 +51,7 @@ static int ism330dhcx_enable_t_int(struct device *dev, int enable) /** * ism330dhcx_enable_xl_int - XL enable selected int pin to generate interrupt */ -static int ism330dhcx_enable_xl_int(struct device *dev, int enable) +static int ism330dhcx_enable_xl_int(const struct device *dev, int enable) { const struct ism330dhcx_config *cfg = dev->config_info; struct ism330dhcx_data *ism330dhcx = dev->driver_data; @@ -87,7 +87,7 @@ static int ism330dhcx_enable_xl_int(struct device *dev, int enable) /** * ism330dhcx_enable_g_int - Gyro enable selected int pin to generate interrupt */ -static int ism330dhcx_enable_g_int(struct device *dev, int enable) +static int ism330dhcx_enable_g_int(const struct device *dev, int enable) { const struct ism330dhcx_config *cfg = dev->config_info; struct ism330dhcx_data *ism330dhcx = dev->driver_data; @@ -122,9 +122,9 @@ static int ism330dhcx_enable_g_int(struct device *dev, int enable) /** * ism330dhcx_trigger_set - link external trigger to event data ready */ -int ism330dhcx_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler) +int ism330dhcx_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler) { struct ism330dhcx_data *ism330dhcx = dev->driver_data; @@ -163,7 +163,7 @@ int ism330dhcx_trigger_set(struct device *dev, */ static void ism330dhcx_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct ism330dhcx_data *ism330dhcx = dev->driver_data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -204,8 +204,8 @@ static void ism330dhcx_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void ism330dhcx_gpio_callback(struct device *dev, - struct gpio_callback *cb, u32_t pins) +static void ism330dhcx_gpio_callback(const struct device *dev, + struct gpio_callback *cb, u32_t pins) { struct ism330dhcx_data *ism330dhcx = CONTAINER_OF(cb, struct ism330dhcx_data, gpio_cb); @@ -226,7 +226,7 @@ static void ism330dhcx_gpio_callback(struct device *dev, #ifdef CONFIG_ISM330DHCX_TRIGGER_OWN_THREAD static void ism330dhcx_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct ism330dhcx_data *ism330dhcx = dev->driver_data; ARG_UNUSED(unused); @@ -248,7 +248,7 @@ static void ism330dhcx_work_cb(struct k_work *work) } #endif /* CONFIG_ISM330DHCX_TRIGGER_GLOBAL_THREAD */ -int ism330dhcx_init_interrupt(struct device *dev) +int ism330dhcx_init_interrupt(const struct device *dev) { struct ism330dhcx_data *ism330dhcx = dev->driver_data; const struct ism330dhcx_config *cfg = dev->config_info; diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c index 2215c7461b9d..4d03188aee8d 100644 --- a/drivers/sensor/lis2dh/lis2dh.c +++ b/drivers/sensor/lis2dh/lis2dh.c @@ -52,7 +52,7 @@ static void lis2dh_convert(s16_t raw_val, u32_t scale, val->val2 = converted_val % 1000000; } -static int lis2dh_channel_get(struct device *dev, +static int lis2dh_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -85,7 +85,8 @@ static int lis2dh_channel_get(struct device *dev, return 0; } -static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lis2dh_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct lis2dh_data *lis2dh = dev->driver_data; size_t i; @@ -143,7 +144,7 @@ static int lis2dh_freq_to_odr_val(u16_t freq) return -EINVAL; } -static int lis2dh_acc_odr_set(struct device *dev, u16_t freq) +static int lis2dh_acc_odr_set(const struct device *dev, u16_t freq) { int odr; int status; @@ -195,7 +196,7 @@ static int lis2dh_range_to_reg_val(u16_t range) return -EINVAL; } -static int lis2dh_acc_range_set(struct device *dev, s32_t range) +static int lis2dh_acc_range_set(const struct device *dev, s32_t range) { struct lis2dh_data *lis2dh = dev->driver_data; int fs; @@ -213,9 +214,10 @@ static int lis2dh_acc_range_set(struct device *dev, s32_t range) } #endif -static int lis2dh_acc_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lis2dh_acc_config(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { #ifdef CONFIG_LIS2DH_ACCEL_RANGE_RUNTIME @@ -239,7 +241,7 @@ static int lis2dh_acc_config(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2dh_attr_set(struct device *dev, enum sensor_channel chan, +static int lis2dh_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -266,7 +268,7 @@ static const struct sensor_driver_api lis2dh_driver_api = { .channel_get = lis2dh_channel_get, }; -int lis2dh_init(struct device *dev) +int lis2dh_init(const struct device *dev) { struct lis2dh_data *lis2dh = dev->driver_data; const struct lis2dh_config *cfg = dev->config_info; diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h index 79498d16fb9d..c8889cb00c0c 100644 --- a/drivers/sensor/lis2dh/lis2dh.h +++ b/drivers/sensor/lis2dh/lis2dh.h @@ -199,7 +199,7 @@ union lis2dh_sample { struct lis2dh_config { char *bus_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) u16_t i2c_slv_addr; #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) @@ -213,20 +213,20 @@ struct lis2dh_config { }; struct lis2dh_transfer_function { - int (*read_data)(struct device *dev, u8_t reg_addr, + int (*read_data)(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len); - int (*write_data)(struct device *dev, u8_t reg_addr, + int (*write_data)(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len); - int (*read_reg)(struct device *dev, u8_t reg_addr, + int (*read_reg)(const struct device *dev, u8_t reg_addr, u8_t *value); - int (*write_reg)(struct device *dev, u8_t reg_addr, - u8_t value); - int (*update_reg)(struct device *dev, u8_t reg_addr, + int (*write_reg)(const struct device *dev, u8_t reg_addr, + u8_t value); + int (*update_reg)(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t value); }; struct lis2dh_data { - struct device *bus; + const struct device *bus; const struct lis2dh_transfer_function *hw_tf; union lis2dh_sample sample; @@ -234,8 +234,8 @@ struct lis2dh_data { u32_t scale; #ifdef CONFIG_LIS2DH_TRIGGER - struct device *gpio_int1; - struct device *gpio_int2; + const struct device *gpio_int1; + const struct device *gpio_int2; struct gpio_callback gpio_int1_cb; struct gpio_callback gpio_int2_cb; @@ -250,7 +250,7 @@ struct lis2dh_data { struct k_sem gpio_sem; #elif defined(CONFIG_LIS2DH_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LIS2DH_TRIGGER */ @@ -265,18 +265,19 @@ int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd, #endif #ifdef CONFIG_LIS2DH_TRIGGER -int lis2dh_trigger_set(struct device *dev, +int lis2dh_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lis2dh_init_interrupt(struct device *dev); +int lis2dh_init_interrupt(const struct device *dev); -int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, +int lis2dh_acc_slope_config(const struct device *dev, + enum sensor_attribute attr, const struct sensor_value *val); #endif -int lis2dh_spi_init(struct device *dev); -int lis2dh_i2c_init(struct device *dev); +int lis2dh_spi_init(const struct device *dev); +int lis2dh_i2c_init(const struct device *dev); #endif /* __SENSOR_LIS2DH__ */ diff --git a/drivers/sensor/lis2dh/lis2dh_i2c.c b/drivers/sensor/lis2dh/lis2dh_i2c.c index b544e5d66037..7624a1e43cf3 100644 --- a/drivers/sensor/lis2dh/lis2dh_i2c.c +++ b/drivers/sensor/lis2dh/lis2dh_i2c.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); -static int lis2dh_i2c_read_data(struct device *dev, u8_t reg_addr, +static int lis2dh_i2c_read_data(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2dh_data *data = dev->driver_data; @@ -31,7 +31,7 @@ static int lis2dh_i2c_read_data(struct device *dev, u8_t reg_addr, value, len); } -static int lis2dh_i2c_write_data(struct device *dev, u8_t reg_addr, +static int lis2dh_i2c_write_data(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2dh_data *data = dev->driver_data; @@ -42,7 +42,7 @@ static int lis2dh_i2c_write_data(struct device *dev, u8_t reg_addr, value, len); } -static int lis2dh_i2c_read_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_i2c_read_reg(const struct device *dev, u8_t reg_addr, u8_t *value) { struct lis2dh_data *data = dev->driver_data; @@ -53,7 +53,7 @@ static int lis2dh_i2c_read_reg(struct device *dev, u8_t reg_addr, reg_addr, value); } -static int lis2dh_i2c_write_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_i2c_write_reg(const struct device *dev, u8_t reg_addr, u8_t value) { struct lis2dh_data *data = dev->driver_data; @@ -64,7 +64,7 @@ static int lis2dh_i2c_write_reg(struct device *dev, u8_t reg_addr, reg_addr, value); } -static int lis2dh_i2c_update_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_i2c_update_reg(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t value) { struct lis2dh_data *data = dev->driver_data; @@ -83,7 +83,7 @@ static const struct lis2dh_transfer_function lis2dh_i2c_transfer_fn = { .update_reg = lis2dh_i2c_update_reg, }; -int lis2dh_i2c_init(struct device *dev) +int lis2dh_i2c_init(const struct device *dev) { struct lis2dh_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2dh/lis2dh_spi.c b/drivers/sensor/lis2dh/lis2dh_spi.c index 52bc906e66ab..d62f38da6cfc 100644 --- a/drivers/sensor/lis2dh/lis2dh_spi.c +++ b/drivers/sensor/lis2dh/lis2dh_spi.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); -static int lis2dh_raw_read(struct device *dev, u8_t reg_addr, +static int lis2dh_raw_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2dh_data *data = dev->driver_data; @@ -64,7 +64,7 @@ static int lis2dh_raw_read(struct device *dev, u8_t reg_addr, return 0; } -static int lis2dh_raw_write(struct device *dev, u8_t reg_addr, +static int lis2dh_raw_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2dh_data *data = dev->driver_data; @@ -102,25 +102,25 @@ static int lis2dh_raw_write(struct device *dev, u8_t reg_addr, return 0; } -static int lis2dh_spi_read_data(struct device *dev, u8_t reg_addr, +static int lis2dh_spi_read_data(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { return lis2dh_raw_read(dev, reg_addr, value, len); } -static int lis2dh_spi_write_data(struct device *dev, u8_t reg_addr, +static int lis2dh_spi_write_data(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { return lis2dh_raw_write(dev, reg_addr, value, len); } -static int lis2dh_spi_read_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_spi_read_reg(const struct device *dev, u8_t reg_addr, u8_t *value) { return lis2dh_raw_read(dev, reg_addr, value, 1); } -static int lis2dh_spi_write_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_spi_write_reg(const struct device *dev, u8_t reg_addr, u8_t value) { u8_t tmp_val = value; @@ -128,7 +128,7 @@ static int lis2dh_spi_write_reg(struct device *dev, u8_t reg_addr, return lis2dh_raw_write(dev, reg_addr, &tmp_val, 1); } -static int lis2dh_spi_update_reg(struct device *dev, u8_t reg_addr, +static int lis2dh_spi_update_reg(const struct device *dev, u8_t reg_addr, u8_t mask, u8_t value) { u8_t tmp_val; @@ -147,7 +147,7 @@ static const struct lis2dh_transfer_function lis2dh_spi_transfer_fn = { .update_reg = lis2dh_spi_update_reg, }; -int lis2dh_spi_init(struct device *dev) +int lis2dh_spi_init(const struct device *dev) { struct lis2dh_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c index b18a7c359f1b..e42ad62e0bf1 100644 --- a/drivers/sensor/lis2dh/lis2dh_trigger.c +++ b/drivers/sensor/lis2dh/lis2dh_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); #include "lis2dh.h" -static inline void setup_int1(struct device *dev, +static inline void setup_int1(const struct device *dev, bool enable) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -30,7 +30,8 @@ static inline void setup_int1(struct device *dev, : GPIO_INT_DISABLE); } -static int lis2dh_trigger_drdy_set(struct device *dev, enum sensor_channel chan, +static int lis2dh_trigger_drdy_set(const struct device *dev, + enum sensor_channel chan, sensor_trigger_handler_t handler) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -64,7 +65,7 @@ static int lis2dh_trigger_drdy_set(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2dh_start_trigger_int1(struct device *dev) +static int lis2dh_start_trigger_int1(const struct device *dev) { int status; u8_t raw[LIS2DH_BUF_SZ]; @@ -109,7 +110,7 @@ static int lis2dh_start_trigger_int1(struct device *dev) #define LIS2DH_ANYM_CFG (LIS2DH_INT_CFG_ZHIE_ZUPE | LIS2DH_INT_CFG_YHIE_YUPE |\ LIS2DH_INT_CFG_XHIE_XUPE) -static inline void setup_int2(struct device *dev, +static inline void setup_int2(const struct device *dev, bool enable) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -121,7 +122,7 @@ static inline void setup_int2(struct device *dev, : GPIO_INT_DISABLE); } -static int lis2dh_trigger_anym_set(struct device *dev, +static int lis2dh_trigger_anym_set(const struct device *dev, sensor_trigger_handler_t handler) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -156,7 +157,7 @@ static int lis2dh_trigger_anym_set(struct device *dev, return 0; } -static int lis2dh_start_trigger_int2(struct device *dev) +static int lis2dh_start_trigger_int2(const struct device *dev) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -167,7 +168,7 @@ static int lis2dh_start_trigger_int2(struct device *dev) } #endif /* DT_INST_PROP_HAS_IDX(0, irq_gpios, 1) */ -int lis2dh_trigger_set(struct device *dev, +int lis2dh_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -183,7 +184,8 @@ int lis2dh_trigger_set(struct device *dev, return -ENOTSUP; } -int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, +int lis2dh_acc_slope_config(const struct device *dev, + enum sensor_attribute attr, const struct sensor_value *val) { struct lis2dh_data *lis2dh = dev->driver_data; @@ -236,7 +238,7 @@ int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, return status; } -static void lis2dh_gpio_int1_callback(struct device *dev, +static void lis2dh_gpio_int1_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lis2dh_data *lis2dh = @@ -254,7 +256,7 @@ static void lis2dh_gpio_int1_callback(struct device *dev, } #if DT_INST_PROP_HAS_IDX(0, irq_gpios, 1) -static void lis2dh_gpio_int2_callback(struct device *dev, +static void lis2dh_gpio_int2_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lis2dh_data *lis2dh = @@ -274,7 +276,7 @@ static void lis2dh_gpio_int2_callback(struct device *dev, static void lis2dh_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lis2dh_data *lis2dh = dev->driver_data; int status; @@ -346,7 +348,7 @@ static void lis2dh_thread_cb(void *arg) #ifdef CONFIG_LIS2DH_TRIGGER_OWN_THREAD static void lis2dh_thread(void *arg1, void *unused2, void *unused3) { - struct device *dev = arg1; + const struct device *dev = arg1; struct lis2dh_data *lis2dh = dev->driver_data; ARG_UNUSED(unused2); @@ -369,7 +371,7 @@ static void lis2dh_work_cb(struct k_work *work) } #endif -int lis2dh_init_interrupt(struct device *dev) +int lis2dh_init_interrupt(const struct device *dev) { struct lis2dh_data *lis2dh = dev->driver_data; int status; diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c index 0255c454df5c..8db95c8a485d 100644 --- a/drivers/sensor/lis2ds12/lis2ds12.c +++ b/drivers/sensor/lis2ds12/lis2ds12.c @@ -57,7 +57,7 @@ static int lis2ds12_freq_to_odr_val(u16_t freq) return -EINVAL; } -static int lis2ds12_accel_odr_set(struct device *dev, u16_t freq) +static int lis2ds12_accel_odr_set(const struct device *dev, u16_t freq) { struct lis2ds12_data *data = dev->driver_data; int odr; @@ -96,7 +96,7 @@ static int lis2ds12_accel_range_to_fs_val(s32_t range) return -EINVAL; } -static int lis2ds12_accel_range_set(struct device *dev, s32_t range) +static int lis2ds12_accel_range_set(const struct device *dev, s32_t range) { int fs; struct lis2ds12_data *data = dev->driver_data; @@ -119,7 +119,8 @@ static int lis2ds12_accel_range_set(struct device *dev, s32_t range) } #endif -static int lis2ds12_accel_config(struct device *dev, enum sensor_channel chan, +static int lis2ds12_accel_config(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -140,7 +141,8 @@ static int lis2ds12_accel_config(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2ds12_attr_set(struct device *dev, enum sensor_channel chan, +static int lis2ds12_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -155,7 +157,7 @@ static int lis2ds12_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2ds12_sample_fetch_accel(struct device *dev) +static int lis2ds12_sample_fetch_accel(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; u8_t buf[6]; @@ -173,7 +175,8 @@ static int lis2ds12_sample_fetch_accel(struct device *dev) return 0; } -static int lis2ds12_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lis2ds12_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -236,7 +239,7 @@ static inline int lis2ds12_get_channel(enum sensor_channel chan, return 0; } -static int lis2ds12_channel_get(struct device *dev, +static int lis2ds12_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -254,7 +257,7 @@ static const struct sensor_driver_api lis2ds12_api_funcs = { .channel_get = lis2ds12_channel_get, }; -static int lis2ds12_init(struct device *dev) +static int lis2ds12_init(const struct device *dev) { const struct lis2ds12_config * const config = dev->config_info; struct lis2ds12_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2ds12/lis2ds12.h b/drivers/sensor/lis2ds12/lis2ds12.h index 8b5de66e2e5d..780e3acd2489 100644 --- a/drivers/sensor/lis2ds12/lis2ds12.h +++ b/drivers/sensor/lis2ds12/lis2ds12.h @@ -83,7 +83,7 @@ struct lis2ds12_config { char *comm_master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_LIS2DS12_TRIGGER const char *irq_port; gpio_pin_t irq_pin; @@ -107,7 +107,7 @@ struct lis2ds12_transfer_function { }; struct lis2ds12_data { - struct device *comm_master; + const struct device *comm_master; int sample_x; int sample_y; int sample_z; @@ -115,7 +115,7 @@ struct lis2ds12_data { const struct lis2ds12_transfer_function *hw_tf; #ifdef CONFIG_LIS2DS12_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -127,21 +127,21 @@ struct lis2ds12_data { struct k_sem trig_sem; #elif defined(CONFIG_LIS2DS12_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LIS2DS12_TRIGGER */ }; -int lis2ds12_spi_init(struct device *dev); -int lis2ds12_i2c_init(struct device *dev); +int lis2ds12_spi_init(const struct device *dev); +int lis2ds12_i2c_init(const struct device *dev); #ifdef CONFIG_LIS2DS12_TRIGGER -int lis2ds12_trigger_set(struct device *dev, +int lis2ds12_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lis2ds12_trigger_init(struct device *dev); +int lis2ds12_trigger_init(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_LIS2DS12_LIS2DS12_H_ */ diff --git a/drivers/sensor/lis2ds12/lis2ds12_i2c.c b/drivers/sensor/lis2ds12/lis2ds12_i2c.c index 8da349c36655..4e2b1f9b689f 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_i2c.c +++ b/drivers/sensor/lis2ds12/lis2ds12_i2c.c @@ -65,7 +65,7 @@ static const struct lis2ds12_transfer_function lis2ds12_i2c_transfer_fn = { .update_reg = lis2ds12_i2c_update_reg, }; -int lis2ds12_i2c_init(struct device *dev) +int lis2ds12_i2c_init(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2ds12/lis2ds12_spi.c b/drivers/sensor/lis2ds12/lis2ds12_spi.c index 48d162752b00..61a0476296c3 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_spi.c +++ b/drivers/sensor/lis2ds12/lis2ds12_spi.c @@ -151,7 +151,7 @@ static const struct lis2ds12_transfer_function lis2ds12_spi_transfer_fn = { .update_reg = lis2ds12_spi_update_reg, }; -int lis2ds12_spi_init(struct device *dev) +int lis2ds12_spi_init(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c index 622e19fadcb5..c1cea5fc2b00 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c +++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c @@ -19,8 +19,8 @@ LOG_MODULE_DECLARE(LIS2DS12, CONFIG_SENSOR_LOG_LEVEL); -static void lis2ds12_gpio_callback(struct device *dev, - struct gpio_callback *cb, u32_t pins) +static void lis2ds12_gpio_callback(const struct device *dev, + struct gpio_callback *cb, u32_t pins) { struct lis2ds12_data *data = CONTAINER_OF(cb, struct lis2ds12_data, gpio_cb); @@ -38,7 +38,7 @@ static void lis2ds12_gpio_callback(struct device *dev, #endif } -static void lis2ds12_handle_drdy_int(struct device *dev) +static void lis2ds12_handle_drdy_int(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; @@ -49,7 +49,7 @@ static void lis2ds12_handle_drdy_int(struct device *dev) static void lis2ds12_handle_int(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lis2ds12_data *data = dev->driver_data; const struct lis2ds12_config *cfg = dev->config_info; u8_t status; @@ -70,7 +70,7 @@ static void lis2ds12_handle_int(void *arg) #ifdef CONFIG_LIS2DS12_TRIGGER_OWN_THREAD static void lis2ds12_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lis2ds12_data *data = dev->driver_data; ARG_UNUSED(unused); @@ -92,7 +92,7 @@ static void lis2ds12_work_cb(struct k_work *work) } #endif -static int lis2ds12_init_interrupt(struct device *dev) +static int lis2ds12_init_interrupt(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; @@ -117,7 +117,7 @@ static int lis2ds12_init_interrupt(struct device *dev) return 0; } -int lis2ds12_trigger_init(struct device *dev) +int lis2ds12_trigger_init(const struct device *dev) { struct lis2ds12_data *data = dev->driver_data; const struct lis2ds12_config *cfg = dev->config_info; @@ -160,9 +160,9 @@ int lis2ds12_trigger_init(struct device *dev) return 0; } -int lis2ds12_trigger_set(struct device *dev, - const struct sensor_trigger *trig, - sensor_trigger_handler_t handler) +int lis2ds12_trigger_set(const struct device *dev, + const struct sensor_trigger *trig, + sensor_trigger_handler_t handler) { struct lis2ds12_data *data = dev->driver_data; const struct lis2ds12_config *cfg = dev->config_info; diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c index 75c71207e516..c52ad7d779fc 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.c +++ b/drivers/sensor/lis2dw12/lis2dw12.c @@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL); * @dev: Pointer to instance of struct device (I2C or SPI) * @range: Full scale range (2, 4, 8 and 16 G) */ -static int lis2dw12_set_range(struct device *dev, u16_t range) +static int lis2dw12_set_range(const struct device *dev, u16_t range) { int err; struct lis2dw12_data *lis2dw12 = dev->driver_data; @@ -60,7 +60,7 @@ static int lis2dw12_set_range(struct device *dev, u16_t range) * @dev: Pointer to instance of struct device (I2C or SPI) * @odr: Output data rate */ -static int lis2dw12_set_odr(struct device *dev, u16_t odr) +static int lis2dw12_set_odr(const struct device *dev, u16_t odr) { struct lis2dw12_data *lis2dw12 = dev->driver_data; u8_t val; @@ -92,7 +92,7 @@ static inline void lis2dw12_convert(struct sensor_value *val, int raw_val, val->val2 = dval % 1000000LL; } -static inline void lis2dw12_channel_get_acc(struct device *dev, +static inline void lis2dw12_channel_get_acc(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -121,7 +121,7 @@ static inline void lis2dw12_channel_get_acc(struct device *dev, } } -static int lis2dw12_channel_get(struct device *dev, +static int lis2dw12_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -140,7 +140,7 @@ static int lis2dw12_channel_get(struct device *dev, return -ENOTSUP; } -static int lis2dw12_config(struct device *dev, enum sensor_channel chan, +static int lis2dw12_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -157,7 +157,8 @@ static int lis2dw12_config(struct device *dev, enum sensor_channel chan, return -ENOTSUP; } -static int lis2dw12_attr_set(struct device *dev, enum sensor_channel chan, +static int lis2dw12_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -175,7 +176,8 @@ static int lis2dw12_attr_set(struct device *dev, enum sensor_channel chan, return -ENOTSUP; } -static int lis2dw12_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lis2dw12_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct lis2dw12_data *lis2dw12 = dev->driver_data; const struct lis2dw12_device_config *cfg = dev->config_info; @@ -211,7 +213,7 @@ static const struct sensor_driver_api lis2dw12_driver_api = { .channel_get = lis2dw12_channel_get, }; -static int lis2dw12_init_interface(struct device *dev) +static int lis2dw12_init_interface(const struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; const struct lis2dw12_device_config *cfg = dev->config_info; @@ -253,7 +255,7 @@ static int lis2dw12_set_power_mode(struct lis2dw12_data *lis2dw12, return lis2dw12_write_reg(lis2dw12->ctx, LIS2DW12_CTRL1, ®val, 1); } -static int lis2dw12_init(struct device *dev) +static int lis2dw12_init(const struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; const struct lis2dw12_device_config *cfg = dev->config_info; diff --git a/drivers/sensor/lis2dw12/lis2dw12.h b/drivers/sensor/lis2dw12/lis2dw12.h index b4f4c16eee6b..8daf0c94d738 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.h +++ b/drivers/sensor/lis2dw12/lis2dw12.h @@ -109,7 +109,7 @@ struct lis2dw12_data; /* sensor data */ struct lis2dw12_data { - struct device *bus; + const struct device *bus; s16_t acc[3]; /* save sensitivity */ @@ -117,7 +117,7 @@ struct lis2dw12_data { stmdev_ctx_t *ctx; #ifdef CONFIG_LIS2DW12_TRIGGER - struct device *gpio; + const struct device *gpio; u8_t gpio_pin; struct gpio_callback gpio_cb; sensor_trigger_handler_t drdy_handler; @@ -131,7 +131,7 @@ struct lis2dw12_data { struct k_sem gpio_sem; #elif defined(CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif /* CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD */ #endif /* CONFIG_LIS2DW12_TRIGGER */ #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) @@ -139,12 +139,12 @@ struct lis2dw12_data { #endif }; -int lis2dw12_i2c_init(struct device *dev); -int lis2dw12_spi_init(struct device *dev); +int lis2dw12_i2c_init(const struct device *dev); +int lis2dw12_spi_init(const struct device *dev); #ifdef CONFIG_LIS2DW12_TRIGGER -int lis2dw12_init_interrupt(struct device *dev); -int lis2dw12_trigger_set(struct device *dev, +int lis2dw12_init_interrupt(const struct device *dev); +int lis2dw12_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif /* CONFIG_LIS2DW12_TRIGGER */ diff --git a/drivers/sensor/lis2dw12/lis2dw12_i2c.c b/drivers/sensor/lis2dw12/lis2dw12_i2c.c index d7e9c297a4a4..1f1cf3655a34 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_i2c.c +++ b/drivers/sensor/lis2dw12/lis2dw12_i2c.c @@ -41,7 +41,7 @@ stmdev_ctx_t lis2dw12_i2c_ctx = { .write_reg = (stmdev_write_ptr) lis2dw12_i2c_write, }; -int lis2dw12_i2c_init(struct device *dev) +int lis2dw12_i2c_init(const struct device *dev) { struct lis2dw12_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2dw12/lis2dw12_spi.c b/drivers/sensor/lis2dw12/lis2dw12_spi.c index 69881a1f09cb..83b803f8d445 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_spi.c +++ b/drivers/sensor/lis2dw12/lis2dw12_spi.c @@ -97,7 +97,7 @@ stmdev_ctx_t lis2dw12_spi_ctx = { .write_reg = (stmdev_write_ptr) lis2dw12_spi_write, }; -int lis2dw12_spi_init(struct device *dev) +int lis2dw12_spi_init(const struct device *dev) { struct lis2dw12_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c index 46817f2ebb21..4b4d1e750639 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c +++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL); /** * lis2dw12_enable_int - enable selected int pin to generate interrupt */ -static int lis2dw12_enable_int(struct device *dev, +static int lis2dw12_enable_int(const struct device *dev, enum sensor_trigger_type type, int enable) { const struct lis2dw12_device_config *cfg = dev->config_info; @@ -75,7 +75,7 @@ static int lis2dw12_enable_int(struct device *dev, /** * lis2dw12_trigger_set - link external trigger to event data ready */ -int lis2dw12_trigger_set(struct device *dev, +int lis2dw12_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -108,7 +108,7 @@ int lis2dw12_trigger_set(struct device *dev, } } -static int lis2dw12_handle_drdy_int(struct device *dev) +static int lis2dw12_handle_drdy_int(const struct device *dev) { struct lis2dw12_data *data = dev->driver_data; @@ -125,7 +125,7 @@ static int lis2dw12_handle_drdy_int(struct device *dev) } #ifdef CONFIG_LIS2DW12_PULSE -static int lis2dw12_handle_single_tap_int(struct device *dev) +static int lis2dw12_handle_single_tap_int(const struct device *dev) { struct lis2dw12_data *data = dev->driver_data; sensor_trigger_handler_t handler = data->tap_handler;; @@ -142,7 +142,7 @@ static int lis2dw12_handle_single_tap_int(struct device *dev) return 0; } -static int lis2dw12_handle_double_tap_int(struct device *dev) +static int lis2dw12_handle_double_tap_int(const struct device *dev) { struct lis2dw12_data *data = dev->driver_data; sensor_trigger_handler_t handler = data->double_tap_handler;; @@ -166,7 +166,7 @@ static int lis2dw12_handle_double_tap_int(struct device *dev) */ static void lis2dw12_handle_interrupt(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct lis2dw12_data *lis2dw12 = dev->driver_data; const struct lis2dw12_device_config *cfg = dev->config_info; lis2dw12_all_sources_t sources; @@ -189,7 +189,7 @@ static void lis2dw12_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void lis2dw12_gpio_callback(struct device *dev, +static void lis2dw12_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lis2dw12_data *lis2dw12 = @@ -212,7 +212,7 @@ static void lis2dw12_gpio_callback(struct device *dev, #ifdef CONFIG_LIS2DW12_TRIGGER_OWN_THREAD static void lis2dw12_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lis2dw12_data *lis2dw12 = dev->driver_data; ARG_UNUSED(unused); @@ -234,7 +234,7 @@ static void lis2dw12_work_cb(struct k_work *work) } #endif /* CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD */ -int lis2dw12_init_interrupt(struct device *dev) +int lis2dw12_init_interrupt(const struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; const struct lis2dw12_device_config *cfg = dev->config_info; diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 5d9fe5ed5dbd..7e2f9f46d5ca 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -23,7 +23,8 @@ struct lis2mdl_data lis2mdl_data; LOG_MODULE_REGISTER(LIS2MDL, CONFIG_SENSOR_LOG_LEVEL); #ifdef CONFIG_LIS2MDL_MAG_ODR_RUNTIME -static int lis2mdl_set_odr(struct device *dev, const struct sensor_value *val) +static int lis2mdl_set_odr(const struct device *dev, + const struct sensor_value *val) { struct lis2mdl_data *lis2mdl = dev->driver_data; lis2mdl_odr_t odr; @@ -53,7 +54,8 @@ static int lis2mdl_set_odr(struct device *dev, const struct sensor_value *val) } #endif /* CONFIG_LIS2MDL_MAG_ODR_RUNTIME */ -static int lis2mdl_set_hard_iron(struct device *dev, enum sensor_channel chan, +static int lis2mdl_set_hard_iron(const struct device *dev, + enum sensor_channel chan, const struct sensor_value *val) { struct lis2mdl_data *lis2mdl = dev->driver_data; @@ -68,7 +70,7 @@ static int lis2mdl_set_hard_iron(struct device *dev, enum sensor_channel chan, return lis2mdl_mag_user_offset_set(lis2mdl->ctx, offset.u8bit); } -static void lis2mdl_channel_get_mag(struct device *dev, +static void lis2mdl_channel_get_mag(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -102,7 +104,7 @@ static void lis2mdl_channel_get_mag(struct device *dev, } /* read internal temperature */ -static void lis2mdl_channel_get_temp(struct device *dev, +static void lis2mdl_channel_get_temp(const struct device *dev, struct sensor_value *val) { struct lis2mdl_data *drv_data = dev->driver_data; @@ -111,7 +113,8 @@ static void lis2mdl_channel_get_temp(struct device *dev, val->val2 = (drv_data->temp_sample % 100) * 10000; } -static int lis2mdl_channel_get(struct device *dev, enum sensor_channel chan, +static int lis2mdl_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { switch (chan) { @@ -132,7 +135,7 @@ static int lis2mdl_channel_get(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2mdl_config(struct device *dev, enum sensor_channel chan, +static int lis2mdl_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -151,7 +154,7 @@ static int lis2mdl_config(struct device *dev, enum sensor_channel chan, return 0; } -static int lis2mdl_attr_set(struct device *dev, +static int lis2mdl_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -171,7 +174,7 @@ static int lis2mdl_attr_set(struct device *dev, return 0; } -static int lis2mdl_sample_fetch_mag(struct device *dev) +static int lis2mdl_sample_fetch_mag(const struct device *dev) { struct lis2mdl_data *lis2mdl = dev->driver_data; union axis3bit16_t raw_mag; @@ -189,7 +192,7 @@ static int lis2mdl_sample_fetch_mag(struct device *dev) return 0; } -static int lis2mdl_sample_fetch_temp(struct device *dev) +static int lis2mdl_sample_fetch_temp(const struct device *dev) { struct lis2mdl_data *lis2mdl = dev->driver_data; union axis1bit16_t raw_temp; @@ -208,7 +211,8 @@ static int lis2mdl_sample_fetch_temp(struct device *dev) return 0; } -static int lis2mdl_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lis2mdl_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_MAGN_X: @@ -240,7 +244,7 @@ static const struct sensor_driver_api lis2mdl_driver_api = { .channel_get = lis2mdl_channel_get, }; -static int lis2mdl_init_interface(struct device *dev) +static int lis2mdl_init_interface(const struct device *dev) { const struct lis2mdl_config *const config = dev->config_info; @@ -286,7 +290,7 @@ static const struct lis2mdl_config lis2mdl_dev_config = { #endif }; -static int lis2mdl_init(struct device *dev) +static int lis2mdl_init(const struct device *dev) { struct lis2mdl_data *lis2mdl = dev->driver_data; u8_t wai; diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h index 66d11fed2e20..03d906abe2be 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.h +++ b/drivers/sensor/lis2mdl/lis2mdl.h @@ -29,7 +29,7 @@ union axis1bit16_t { struct lis2mdl_config { char *master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_LIS2MDL_TRIGGER char *gpio_name; u32_t gpio_pin; @@ -48,7 +48,7 @@ struct lis2mdl_config { /* Sensor data */ struct lis2mdl_data { - struct device *bus; + const struct device *bus; u16_t i2c_addr; s16_t mag[3]; s32_t temp_sample; @@ -62,7 +62,7 @@ struct lis2mdl_data { #endif #ifdef CONFIG_LIS2MDL_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t handler_drdy; @@ -73,7 +73,7 @@ struct lis2mdl_data { struct k_sem gpio_sem; #elif defined(CONFIG_LIS2MDL_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif /* CONFIG_LIS2MDL_TRIGGER_GLOBAL_THREAD */ #endif /* CONFIG_LIS2MDL_TRIGGER */ #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) @@ -81,12 +81,12 @@ struct lis2mdl_data { #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */ }; -int lis2mdl_spi_init(struct device *dev); -int lis2mdl_i2c_init(struct device *dev); +int lis2mdl_spi_init(const struct device *dev); +int lis2mdl_i2c_init(const struct device *dev); #ifdef CONFIG_LIS2MDL_TRIGGER -int lis2mdl_init_interrupt(struct device *dev); -int lis2mdl_trigger_set(struct device *dev, +int lis2mdl_init_interrupt(const struct device *dev); +int lis2mdl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #endif /* CONFIG_LIS2MDL_TRIGGER */ diff --git a/drivers/sensor/lis2mdl/lis2mdl_i2c.c b/drivers/sensor/lis2mdl/lis2mdl_i2c.c index fd5495405379..0a297d0f32d1 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_i2c.c +++ b/drivers/sensor/lis2mdl/lis2mdl_i2c.c @@ -21,7 +21,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LIS2MDL); -static int lis2mdl_i2c_read(struct device *dev, u8_t reg_addr, +static int lis2mdl_i2c_read(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct lis2mdl_data *data = dev->driver_data; @@ -31,7 +31,7 @@ static int lis2mdl_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int lis2mdl_i2c_write(struct device *dev, u8_t reg_addr, +static int lis2mdl_i2c_write(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct lis2mdl_data *data = dev->driver_data; @@ -41,7 +41,7 @@ static int lis2mdl_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int lis2mdl_i2c_init(struct device *dev) +int lis2mdl_i2c_init(const struct device *dev) { struct lis2mdl_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2mdl/lis2mdl_spi.c b/drivers/sensor/lis2mdl/lis2mdl_spi.c index 8fc4268a7d9e..4df02bf9c2ac 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_spi.c +++ b/drivers/sensor/lis2mdl/lis2mdl_spi.c @@ -21,7 +21,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LIS2MDL); -static int lis2mdl_spi_read(struct device *dev, u8_t reg_addr, +static int lis2mdl_spi_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2mdl_data *data = dev->driver_data; @@ -63,7 +63,7 @@ static int lis2mdl_spi_read(struct device *dev, u8_t reg_addr, return 0; } -static int lis2mdl_spi_write(struct device *dev, u8_t reg_addr, +static int lis2mdl_spi_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lis2mdl_data *data = dev->driver_data; @@ -97,7 +97,7 @@ static int lis2mdl_spi_write(struct device *dev, u8_t reg_addr, return 0; } -int lis2mdl_spi_init(struct device *dev) +int lis2mdl_spi_init(const struct device *dev) { struct lis2mdl_data *data = dev->driver_data; diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c index a2c8187fa2cc..df8cbc134a91 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c +++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(LIS2MDL, CONFIG_SENSOR_LOG_LEVEL); -static int lis2mdl_enable_int(struct device *dev, int enable) +static int lis2mdl_enable_int(const struct device *dev, int enable) { struct lis2mdl_data *lis2mdl = dev->driver_data; @@ -27,7 +27,7 @@ static int lis2mdl_enable_int(struct device *dev, int enable) } /* link external trigger to event data ready */ -int lis2mdl_trigger_set(struct device *dev, +int lis2mdl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -52,7 +52,7 @@ int lis2mdl_trigger_set(struct device *dev, /* handle the drdy event: read data and call handler if registered any */ static void lis2mdl_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lis2mdl_data *lis2mdl = dev->driver_data; const struct lis2mdl_config *const config = dev->config_info; @@ -68,7 +68,7 @@ static void lis2mdl_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void lis2mdl_gpio_callback(struct device *dev, +static void lis2mdl_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lis2mdl_data *lis2mdl = @@ -89,7 +89,7 @@ static void lis2mdl_gpio_callback(struct device *dev, #ifdef CONFIG_LIS2MDL_TRIGGER_OWN_THREAD static void lis2mdl_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lis2mdl_data *lis2mdl = dev->driver_data; ARG_UNUSED(unused); @@ -111,7 +111,7 @@ static void lis2mdl_work_cb(struct k_work *work) } #endif -int lis2mdl_init_interrupt(struct device *dev) +int lis2mdl_init_interrupt(const struct device *dev) { struct lis2mdl_data *lis2mdl = dev->driver_data; const struct lis2mdl_config *const config = dev->config_info; diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c index 3b28859b08e2..a696f0cd267a 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.c +++ b/drivers/sensor/lis3mdl/lis3mdl.c @@ -26,7 +26,7 @@ static void lis3mdl_convert(struct sensor_value *val, s16_t raw_val, val->val2 = (((s64_t)raw_val % divider) * 1000000L) / divider; } -static int lis3mdl_channel_get(struct device *dev, +static int lis3mdl_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -58,7 +58,7 @@ static int lis3mdl_channel_get(struct device *dev, return 0; } -int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) +int lis3mdl_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct lis3mdl_data *drv_data = dev->driver_data; s16_t buf[4]; @@ -100,7 +100,7 @@ static const struct sensor_driver_api lis3mdl_driver_api = { .channel_get = lis3mdl_channel_get, }; -int lis3mdl_init(struct device *dev) +int lis3mdl_init(const struct device *dev) { struct lis3mdl_data *drv_data = dev->driver_data; u8_t chip_cfg[6]; diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h index d3818fc3069a..56c3265fc81e 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.h +++ b/drivers/sensor/lis3mdl/lis3mdl.h @@ -111,14 +111,14 @@ static const u16_t lis3mdl_magn_gain[] = { }; struct lis3mdl_data { - struct device *i2c; + const struct device *i2c; s16_t x_sample; s16_t y_sample; s16_t z_sample; s16_t temp_sample; #ifdef CONFIG_LIS3MDL_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -130,20 +130,20 @@ struct lis3mdl_data { struct k_thread thread; #elif defined(CONFIG_LIS3MDL_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LIS3MDL_TRIGGER */ }; #ifdef CONFIG_LIS3MDL_TRIGGER -int lis3mdl_trigger_set(struct device *dev, +int lis3mdl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan); +int lis3mdl_sample_fetch(const struct device *dev, enum sensor_channel chan); -int lis3mdl_init_interrupt(struct device *dev); +int lis3mdl_init_interrupt(const struct device *dev); #endif #endif /* __SENSOR_LIS3MDL__ */ diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c index ba53b30f1932..3eb55370165d 100644 --- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c +++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c @@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(LIS3MDL, CONFIG_SENSOR_LOG_LEVEL); -int lis3mdl_trigger_set(struct device *dev, +int lis3mdl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -52,7 +52,7 @@ int lis3mdl_trigger_set(struct device *dev, return 0; } -static void lis3mdl_gpio_callback(struct device *dev, +static void lis3mdl_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lis3mdl_data *drv_data = @@ -73,7 +73,7 @@ static void lis3mdl_gpio_callback(struct device *dev, static void lis3mdl_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lis3mdl_data *drv_data = dev->driver_data; if (drv_data->data_ready_handler != NULL) { @@ -89,7 +89,7 @@ static void lis3mdl_thread_cb(void *arg) #ifdef CONFIG_LIS3MDL_TRIGGER_OWN_THREAD static void lis3mdl_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lis3mdl_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -111,7 +111,7 @@ static void lis3mdl_work_cb(struct k_work *work) } #endif -int lis3mdl_init_interrupt(struct device *dev) +int lis3mdl_init_interrupt(const struct device *dev) { struct lis3mdl_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c index 09c88bdf563a..e16ca29924d9 100644 --- a/drivers/sensor/lps22hb/lps22hb.c +++ b/drivers/sensor/lps22hb/lps22hb.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LPS22HB, CONFIG_SENSOR_LOG_LEVEL); -static inline int lps22hb_set_odr_raw(struct device *dev, u8_t odr) +static inline int lps22hb_set_odr_raw(const struct device *dev, u8_t odr) { struct lps22hb_data *data = dev->driver_data; const struct lps22hb_config *config = dev->config_info; @@ -31,7 +31,7 @@ static inline int lps22hb_set_odr_raw(struct device *dev, u8_t odr) odr << LPS22HB_SHIFT_CTRL_REG1_ODR); } -static int lps22hb_sample_fetch(struct device *dev, +static int lps22hb_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct lps22hb_data *data = dev->driver_data; @@ -73,7 +73,7 @@ static inline void lps22hb_temp_convert(struct sensor_value *val, val->val2 = ((s32_t)raw_val % 100) * 10000; } -static int lps22hb_channel_get(struct device *dev, +static int lps22hb_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -95,7 +95,7 @@ static const struct sensor_driver_api lps22hb_api_funcs = { .channel_get = lps22hb_channel_get, }; -static int lps22hb_init_chip(struct device *dev) +static int lps22hb_init_chip(const struct device *dev) { struct lps22hb_data *data = dev->driver_data; const struct lps22hb_config *config = dev->config_info; @@ -131,7 +131,7 @@ static int lps22hb_init_chip(struct device *dev) return -EIO; } -static int lps22hb_init(struct device *dev) +static int lps22hb_init(const struct device *dev) { const struct lps22hb_config * const config = dev->config_info; struct lps22hb_data *data = dev->driver_data; diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h index 8b8e52a0c560..37c6882c0850 100644 --- a/drivers/sensor/lps22hb/lps22hb.h +++ b/drivers/sensor/lps22hb/lps22hb.h @@ -159,7 +159,7 @@ struct lps22hb_config { }; struct lps22hb_data { - struct device *i2c_master; + const struct device *i2c_master; s32_t sample_press; s16_t sample_temp; }; diff --git a/drivers/sensor/lps22hh/lps22hh.c b/drivers/sensor/lps22hh/lps22hh.c index 6c0484f407aa..d376d9244730 100644 --- a/drivers/sensor/lps22hh/lps22hh.c +++ b/drivers/sensor/lps22hh/lps22hh.c @@ -22,14 +22,14 @@ LOG_MODULE_REGISTER(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); -static inline int lps22hh_set_odr_raw(struct device *dev, u8_t odr) +static inline int lps22hh_set_odr_raw(const struct device *dev, u8_t odr) { struct lps22hh_data *data = dev->driver_data; return lps22hh_data_rate_set(data->ctx, odr); } -static int lps22hh_sample_fetch(struct device *dev, +static int lps22hh_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct lps22hh_data *data = dev->driver_data; @@ -71,7 +71,7 @@ static inline void lps22hh_temp_convert(struct sensor_value *val, val->val2 = ((s32_t)raw_val % 100) * 10000; } -static int lps22hh_channel_get(struct device *dev, +static int lps22hh_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -90,7 +90,7 @@ static int lps22hh_channel_get(struct device *dev, static const u16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200}; -static int lps22hh_odr_set(struct device *dev, u16_t freq) +static int lps22hh_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -113,7 +113,8 @@ static int lps22hh_odr_set(struct device *dev, u16_t freq) return 0; } -static int lps22hh_attr_set(struct device *dev, enum sensor_channel chan, +static int lps22hh_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -142,7 +143,7 @@ static const struct sensor_driver_api lps22hh_api_funcs = { #endif }; -static int lps22hh_init_chip(struct device *dev) +static int lps22hh_init_chip(const struct device *dev) { struct lps22hh_data *data = dev->driver_data; u8_t chip_id; @@ -170,7 +171,7 @@ static int lps22hh_init_chip(struct device *dev) return 0; } -static int lps22hh_init(struct device *dev) +static int lps22hh_init(const struct device *dev) { const struct lps22hh_config * const config = dev->config_info; struct lps22hh_data *data = dev->driver_data; diff --git a/drivers/sensor/lps22hh/lps22hh.h b/drivers/sensor/lps22hh/lps22hh.h index 89817a57b426..beeb016a75cb 100644 --- a/drivers/sensor/lps22hh/lps22hh.h +++ b/drivers/sensor/lps22hh/lps22hh.h @@ -32,7 +32,7 @@ union axis1bit16_t { struct lps22hh_config { char *master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_LPS22HH_TRIGGER const char *drdy_port; u8_t drdy_pin; @@ -50,7 +50,7 @@ struct lps22hh_config { }; struct lps22hh_data { - struct device *bus; + const struct device *bus; s32_t sample_press; s16_t sample_temp; @@ -63,7 +63,7 @@ struct lps22hh_data { #endif #ifdef CONFIG_LPS22HH_TRIGGER - struct device *gpio; + const struct device *gpio; u32_t pin; struct gpio_callback gpio_cb; @@ -76,7 +76,7 @@ struct lps22hh_data { struct k_sem gpio_sem; #elif defined(CONFIG_LPS22HH_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LPS22HH_TRIGGER */ @@ -85,15 +85,15 @@ struct lps22hh_data { #endif }; -int lps22hh_i2c_init(struct device *dev); -int lps22hh_spi_init(struct device *dev); +int lps22hh_i2c_init(const struct device *dev); +int lps22hh_spi_init(const struct device *dev); #ifdef CONFIG_LPS22HH_TRIGGER -int lps22hh_trigger_set(struct device *dev, +int lps22hh_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lps22hh_init_interrupt(struct device *dev); +int lps22hh_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_LPS22HH_LPS22HH_H_ */ diff --git a/drivers/sensor/lps22hh/lps22hh_i2c.c b/drivers/sensor/lps22hh/lps22hh_i2c.c index 893a08026b8a..e56e9dbf6200 100644 --- a/drivers/sensor/lps22hh/lps22hh_i2c.c +++ b/drivers/sensor/lps22hh/lps22hh_i2c.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); -static int lps22hh_i2c_read(struct device *dev, u8_t reg_addr, +static int lps22hh_i2c_read(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct lps22hh_data *data = dev->driver_data; @@ -30,7 +30,7 @@ static int lps22hh_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int lps22hh_i2c_write(struct device *dev, u8_t reg_addr, +static int lps22hh_i2c_write(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct lps22hh_data *data = dev->driver_data; @@ -40,7 +40,7 @@ static int lps22hh_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int lps22hh_i2c_init(struct device *dev) +int lps22hh_i2c_init(const struct device *dev) { struct lps22hh_data *data = dev->driver_data; diff --git a/drivers/sensor/lps22hh/lps22hh_spi.c b/drivers/sensor/lps22hh/lps22hh_spi.c index 5b60173a92c4..11ba8a007226 100644 --- a/drivers/sensor/lps22hh/lps22hh_spi.c +++ b/drivers/sensor/lps22hh/lps22hh_spi.c @@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); -static int lps22hh_spi_read(struct device *dev, u8_t reg_addr, +static int lps22hh_spi_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lps22hh_data *data = dev->driver_data; @@ -63,7 +63,7 @@ static int lps22hh_spi_read(struct device *dev, u8_t reg_addr, return 0; } -static int lps22hh_spi_write(struct device *dev, u8_t reg_addr, +static int lps22hh_spi_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lps22hh_data *data = dev->driver_data; @@ -97,7 +97,7 @@ static int lps22hh_spi_write(struct device *dev, u8_t reg_addr, return 0; } -int lps22hh_spi_init(struct device *dev) +int lps22hh_spi_init(const struct device *dev) { struct lps22hh_data *data = dev->driver_data; diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c index 9cc845ccff2c..68756f6ffd4b 100644 --- a/drivers/sensor/lps22hh/lps22hh_trigger.c +++ b/drivers/sensor/lps22hh/lps22hh_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); /** * lps22hh_enable_int - enable selected int pin to generate interrupt */ -static int lps22hh_enable_int(struct device *dev, int enable) +static int lps22hh_enable_int(const struct device *dev, int enable) { struct lps22hh_data *lps22hh = dev->driver_data; lps22hh_reg_t int_route; @@ -38,7 +38,7 @@ static int lps22hh_enable_int(struct device *dev, int enable) /** * lps22hh_trigger_set - link external trigger to event data ready */ -int lps22hh_trigger_set(struct device *dev, +int lps22hh_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -69,7 +69,7 @@ int lps22hh_trigger_set(struct device *dev, */ static void lps22hh_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lps22hh_data *lps22hh = dev->driver_data; const struct lps22hh_config *cfg = dev->config_info; struct sensor_trigger drdy_trigger = { @@ -84,7 +84,7 @@ static void lps22hh_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void lps22hh_gpio_callback(struct device *dev, +static void lps22hh_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { const struct lps22hh_config *cfg = dev->config_info; @@ -106,7 +106,7 @@ static void lps22hh_gpio_callback(struct device *dev, #ifdef CONFIG_LPS22HH_TRIGGER_OWN_THREAD static void lps22hh_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lps22hh_data *lps22hh = dev->driver_data; ARG_UNUSED(unused); @@ -128,7 +128,7 @@ static void lps22hh_work_cb(struct k_work *work) } #endif /* CONFIG_LPS22HH_TRIGGER_GLOBAL_THREAD */ -int lps22hh_init_interrupt(struct device *dev) +int lps22hh_init_interrupt(const struct device *dev) { struct lps22hh_data *lps22hh = dev->driver_data; const struct lps22hh_config *cfg = dev->config_info; diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index 64bafbc69be1..e6e3f4bf9b46 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LPS25HB, CONFIG_SENSOR_LOG_LEVEL); -static inline int lps25hb_power_ctrl(struct device *dev, u8_t value) +static inline int lps25hb_power_ctrl(const struct device *dev, u8_t value) { struct lps25hb_data *data = dev->driver_data; const struct lps25hb_config *config = dev->config_info; @@ -31,7 +31,7 @@ static inline int lps25hb_power_ctrl(struct device *dev, u8_t value) value << LPS25HB_SHIFT_CTRL_REG1_PD); } -static inline int lps25hb_set_odr_raw(struct device *dev, u8_t odr) +static inline int lps25hb_set_odr_raw(const struct device *dev, u8_t odr) { struct lps25hb_data *data = dev->driver_data; const struct lps25hb_config *config = dev->config_info; @@ -42,7 +42,7 @@ static inline int lps25hb_set_odr_raw(struct device *dev, u8_t odr) odr << LPS25HB_SHIFT_CTRL_REG1_ODR); } -static int lps25hb_sample_fetch(struct device *dev, +static int lps25hb_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct lps25hb_data *data = dev->driver_data; @@ -89,7 +89,7 @@ static inline void lps25hb_temp_convert(struct sensor_value *val, val->val2 = uval % 1000000; } -static int lps25hb_channel_get(struct device *dev, +static int lps25hb_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -111,7 +111,7 @@ static const struct sensor_driver_api lps25hb_api_funcs = { .channel_get = lps25hb_channel_get, }; -static int lps25hb_init_chip(struct device *dev) +static int lps25hb_init_chip(const struct device *dev) { struct lps25hb_data *data = dev->driver_data; const struct lps25hb_config *config = dev->config_info; @@ -160,7 +160,7 @@ static int lps25hb_init_chip(struct device *dev) return -EIO; } -static int lps25hb_init(struct device *dev) +static int lps25hb_init(const struct device *dev) { const struct lps25hb_config * const config = dev->config_info; struct lps25hb_data *data = dev->driver_data; diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h index ec91a110d0b9..89eeeb15638d 100644 --- a/drivers/sensor/lps25hb/lps25hb.h +++ b/drivers/sensor/lps25hb/lps25hb.h @@ -152,7 +152,7 @@ struct lps25hb_config { }; struct lps25hb_data { - struct device *i2c_master; + const struct device *i2c_master; s32_t sample_press; s16_t sample_temp; diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c index 0d84089e677e..7e2b9fcc5422 100644 --- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c +++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c @@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(lsm303dlhc_magn, CONFIG_SENSOR_LOG_LEVEL); #include "lsm303dlhc_magn.h" -static int lsm303dlhc_sample_fetch(struct device *dev, +static int lsm303dlhc_sample_fetch(const struct device *dev, enum sensor_channel chan) { const struct lsm303dlhc_magn_config *config = dev->config_info; @@ -59,7 +59,7 @@ static void lsm303dlhc_convert(struct sensor_value *val, val->val2 = (1000000 * raw_val / LSM303DLHC_MAGN_LSB_GAUSS) % 1000000; } -static int lsm303dlhc_channel_get(struct device *dev, +static int lsm303dlhc_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -91,7 +91,7 @@ static const struct sensor_driver_api lsm303dlhc_magn_driver_api = { .channel_get = lsm303dlhc_channel_get, }; -static int lsm303dlhc_magn_init(struct device *dev) +static int lsm303dlhc_magn_init(const struct device *dev) { const struct lsm303dlhc_magn_config *config = dev->config_info; struct lsm303dlhc_magn_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h index 2686fb0971a1..7687987660bf 100644 --- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h +++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h @@ -65,7 +65,7 @@ #define LSM303DLHC_SR_REG_M 0x09 struct lsm303dlhc_magn_data { - struct device *i2c; + const struct device *i2c; s16_t magn_x; s16_t magn_y; diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index 7d18b87fafb5..662ce5c397a5 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(LSM6DS0, CONFIG_SENSOR_LOG_LEVEL); -static inline int lsm6ds0_reboot(struct device *dev) +static inline int lsm6ds0_reboot(const struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -39,7 +39,7 @@ static inline int lsm6ds0_reboot(struct device *dev) return 0; } -static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en, +static inline int lsm6ds0_accel_axis_ctrl(const struct device *dev, int x_en, int y_en, int z_en) { struct lsm6ds0_data *data = dev->driver_data; @@ -56,7 +56,7 @@ static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en, state); } -static int lsm6ds0_accel_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6ds0_accel_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -71,7 +71,7 @@ static int lsm6ds0_accel_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6ds0_accel_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6ds0_accel_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -86,7 +86,8 @@ static int lsm6ds0_accel_set_odr_raw(struct device *dev, u8_t odr) return 0; } -static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en, +static inline int lsm6ds0_gyro_axis_ctrl(const struct device *dev, int x_en, + int y_en, int z_en) { struct lsm6ds0_data *data = dev->driver_data; @@ -103,7 +104,7 @@ static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en, state); } -static int lsm6ds0_gyro_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6ds0_gyro_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -118,7 +119,7 @@ static int lsm6ds0_gyro_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6ds0_gyro_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6ds0_gyro_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -133,7 +134,7 @@ static int lsm6ds0_gyro_set_odr_raw(struct device *dev, u8_t odr) return 0; } -static int lsm6ds0_sample_fetch_accel(struct device *dev) +static int lsm6ds0_sample_fetch_accel(const struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -161,7 +162,7 @@ static int lsm6ds0_sample_fetch_accel(struct device *dev) return 0; } -static int lsm6ds0_sample_fetch_gyro(struct device *dev) +static int lsm6ds0_sample_fetch_gyro(const struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -190,7 +191,7 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev) } #if defined(CONFIG_LSM6DS0_ENABLE_TEMP) -static int lsm6ds0_sample_fetch_temp(struct device *dev) +static int lsm6ds0_sample_fetch_temp(const struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -209,7 +210,8 @@ static int lsm6ds0_sample_fetch_temp(struct device *dev) } #endif -static int lsm6ds0_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lsm6ds0_sample_fetch(const struct device *dev, + enum sensor_channel chan) { __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_ACCEL_XYZ || @@ -368,7 +370,7 @@ static void lsm6ds0_gyro_channel_get_temp(struct sensor_value *val, } #endif -static int lsm6ds0_channel_get(struct device *dev, +static int lsm6ds0_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -404,7 +406,7 @@ static const struct sensor_driver_api lsm6ds0_api_funcs = { .channel_get = lsm6ds0_channel_get, }; -static int lsm6ds0_init_chip(struct device *dev) +static int lsm6ds0_init_chip(const struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; const struct lsm6ds0_config *config = dev->config_info; @@ -480,7 +482,7 @@ static int lsm6ds0_init_chip(struct device *dev) return 0; } -static int lsm6ds0_init(struct device *dev) +static int lsm6ds0_init(const struct device *dev) { const struct lsm6ds0_config * const config = dev->config_info; struct lsm6ds0_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h index 6d451300da8a..aaf13eaed409 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.h +++ b/drivers/sensor/lsm6ds0/lsm6ds0.h @@ -465,7 +465,7 @@ struct lsm6ds0_config { }; struct lsm6ds0_data { - struct device *i2c_master; + const struct device *i2c_master; #if defined(CONFIG_LSM6DS0_ACCEL_ENABLE_X_AXIS) int accel_sample_x; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index cc112a7e8a1d..062fa2d19dca 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -88,7 +88,7 @@ static int lsm6dsl_gyro_range_to_fs_val(s32_t range) } #endif -static inline int lsm6dsl_reboot(struct device *dev) +static inline int lsm6dsl_reboot(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; @@ -104,7 +104,7 @@ static inline int lsm6dsl_reboot(struct device *dev) return 0; } -static int lsm6dsl_accel_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6dsl_accel_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6dsl_data *data = dev->driver_data; @@ -120,7 +120,7 @@ static int lsm6dsl_accel_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6dsl_accel_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6dsl_accel_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6dsl_data *data = dev->driver_data; @@ -136,7 +136,7 @@ static int lsm6dsl_accel_set_odr_raw(struct device *dev, u8_t odr) return 0; } -static int lsm6dsl_gyro_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6dsl_gyro_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6dsl_data *data = dev->driver_data; @@ -159,7 +159,7 @@ static int lsm6dsl_gyro_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6dsl_gyro_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6dsl_gyro_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6dsl_data *data = dev->driver_data; @@ -174,7 +174,7 @@ static int lsm6dsl_gyro_set_odr_raw(struct device *dev, u8_t odr) } #ifdef LSM6DSL_ACCEL_ODR_RUNTIME -static int lsm6dsl_accel_odr_set(struct device *dev, u16_t freq) +static int lsm6dsl_accel_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -193,7 +193,7 @@ static int lsm6dsl_accel_odr_set(struct device *dev, u16_t freq) #endif #ifdef LSM6DSL_ACCEL_FS_RUNTIME -static int lsm6dsl_accel_range_set(struct device *dev, s32_t range) +static int lsm6dsl_accel_range_set(const struct device *dev, s32_t range) { int fs; struct lsm6dsl_data *data = dev->driver_data; @@ -214,9 +214,10 @@ static int lsm6dsl_accel_range_set(struct device *dev, s32_t range) } #endif -static int lsm6dsl_accel_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dsl_accel_config(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { #ifdef LSM6DSL_ACCEL_FS_RUNTIME @@ -236,7 +237,7 @@ static int lsm6dsl_accel_config(struct device *dev, enum sensor_channel chan, } #ifdef LSM6DSL_GYRO_ODR_RUNTIME -static int lsm6dsl_gyro_odr_set(struct device *dev, u16_t freq) +static int lsm6dsl_gyro_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -255,7 +256,7 @@ static int lsm6dsl_gyro_odr_set(struct device *dev, u16_t freq) #endif #ifdef LSM6DSL_GYRO_FS_RUNTIME -static int lsm6dsl_gyro_range_set(struct device *dev, s32_t range) +static int lsm6dsl_gyro_range_set(const struct device *dev, s32_t range) { int fs; struct lsm6dsl_data *data = dev->driver_data; @@ -276,9 +277,10 @@ static int lsm6dsl_gyro_range_set(struct device *dev, s32_t range) } #endif -static int lsm6dsl_gyro_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dsl_gyro_config(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { #ifdef LSM6DSL_GYRO_FS_RUNTIME @@ -297,9 +299,10 @@ static int lsm6dsl_gyro_config(struct device *dev, enum sensor_channel chan, return 0; } -static int lsm6dsl_attr_set(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dsl_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -314,7 +317,7 @@ static int lsm6dsl_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int lsm6dsl_sample_fetch_accel(struct device *dev) +static int lsm6dsl_sample_fetch_accel(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t buf[6]; @@ -335,7 +338,7 @@ static int lsm6dsl_sample_fetch_accel(struct device *dev) return 0; } -static int lsm6dsl_sample_fetch_gyro(struct device *dev) +static int lsm6dsl_sample_fetch_gyro(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t buf[6]; @@ -357,7 +360,7 @@ static int lsm6dsl_sample_fetch_gyro(struct device *dev) } #if defined(CONFIG_LSM6DSL_ENABLE_TEMP) -static int lsm6dsl_sample_fetch_temp(struct device *dev) +static int lsm6dsl_sample_fetch_temp(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t buf[2]; @@ -376,7 +379,7 @@ static int lsm6dsl_sample_fetch_temp(struct device *dev) #endif #if defined(CONFIG_LSM6DSL_EXT0_LIS2MDL) -static int lsm6dsl_sample_fetch_magn(struct device *dev) +static int lsm6dsl_sample_fetch_magn(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t buf[6]; @@ -397,7 +400,7 @@ static int lsm6dsl_sample_fetch_magn(struct device *dev) } #endif #if defined(CONFIG_LSM6DSL_EXT0_LPS22HB) -static int lsm6dsl_sample_fetch_press(struct device *dev) +static int lsm6dsl_sample_fetch_press(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t buf[5]; @@ -417,7 +420,8 @@ static int lsm6dsl_sample_fetch_press(struct device *dev) } #endif -static int lsm6dsl_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lsm6dsl_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -647,7 +651,7 @@ static inline void lps22hb_temp_convert(struct sensor_value *val, } #endif -static int lsm6dsl_channel_get(struct device *dev, +static int lsm6dsl_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -704,7 +708,7 @@ static const struct sensor_driver_api lsm6dsl_api_funcs = { .channel_get = lsm6dsl_channel_get, }; -static int lsm6dsl_init_chip(struct device *dev) +static int lsm6dsl_init_chip(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t chip_id; @@ -777,7 +781,7 @@ static struct lsm6dsl_config lsm6dsl_config = { .comm_master_dev_name = DT_INST_BUS_LABEL(0), }; -static int lsm6dsl_init(struct device *dev) +static int lsm6dsl_init(const struct device *dev) { const struct lsm6dsl_config * const config = dev->config_info; struct lsm6dsl_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h index a40d1764e06c..acdfc49a6cb9 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.h +++ b/drivers/sensor/lsm6dsl/lsm6dsl.h @@ -621,7 +621,7 @@ struct lsm6dsl_transfer_function { }; struct lsm6dsl_data { - struct device *comm_master; + const struct device *comm_master; int accel_sample_x; int accel_sample_y; int accel_sample_z; @@ -650,7 +650,7 @@ struct lsm6dsl_data { u8_t gyro_fs; #ifdef CONFIG_LSM6DSL_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -662,25 +662,26 @@ struct lsm6dsl_data { struct k_sem gpio_sem; #elif defined(CONFIG_LSM6DSL_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LSM6DSL_TRIGGER */ }; -int lsm6dsl_spi_init(struct device *dev); -int lsm6dsl_i2c_init(struct device *dev); +int lsm6dsl_spi_init(const struct device *dev); +int lsm6dsl_i2c_init(const struct device *dev); #if defined(CONFIG_LSM6DSL_SENSORHUB) -int lsm6dsl_shub_init_external_chip(struct device *dev); -int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len); +int lsm6dsl_shub_init_external_chip(const struct device *dev); +int lsm6dsl_shub_read_external_chip(const struct device *dev, u8_t *buf, + u8_t len); #endif #ifdef CONFIG_LSM6DSL_TRIGGER -int lsm6dsl_trigger_set(struct device *dev, +int lsm6dsl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lsm6dsl_init_interrupt(struct device *dev); +int lsm6dsl_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_ */ diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c index a3e049c84823..528970aabad7 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c @@ -56,7 +56,7 @@ static const struct lsm6dsl_transfer_function lsm6dsl_i2c_transfer_fn = { .update_reg = lsm6dsl_i2c_update_reg, }; -int lsm6dsl_i2c_init(struct device *dev) +int lsm6dsl_i2c_init(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c index a753c65eabf9..6d58dd373e5e 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c @@ -361,7 +361,8 @@ static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data) return 0; } -int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len) +int lsm6dsl_shub_read_external_chip(const struct device *dev, u8_t *buf, + u8_t len) { struct lsm6dsl_data *data = dev->driver_data; @@ -370,7 +371,7 @@ int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len) return 0; } -int lsm6dsl_shub_init_external_chip(struct device *dev) +int lsm6dsl_shub_init_external_chip(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; u8_t i; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c index de19f8474e15..77261ac53ea7 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c @@ -142,7 +142,7 @@ static const struct lsm6dsl_transfer_function lsm6dsl_spi_transfer_fn = { .update_reg = lsm6dsl_spi_update_reg, }; -int lsm6dsl_spi_init(struct device *dev) +int lsm6dsl_spi_init(const struct device *dev) { struct lsm6dsl_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c index 70c46eaa1dc5..ecf807983bae 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c @@ -40,7 +40,7 @@ static inline void handle_irq(struct lsm6dsl_data *drv_data) #endif } -int lsm6dsl_trigger_set(struct device *dev, +int lsm6dsl_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -65,7 +65,7 @@ int lsm6dsl_trigger_set(struct device *dev, return 0; } -static void lsm6dsl_gpio_callback(struct device *dev, +static void lsm6dsl_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lsm6dsl_data *drv_data = @@ -78,7 +78,7 @@ static void lsm6dsl_gpio_callback(struct device *dev, static void lsm6dsl_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lsm6dsl_data *drv_data = dev->driver_data; if (drv_data->data_ready_handler != NULL) { @@ -92,7 +92,7 @@ static void lsm6dsl_thread_cb(void *arg) #ifdef CONFIG_LSM6DSL_TRIGGER_OWN_THREAD static void lsm6dsl_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lsm6dsl_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -114,7 +114,7 @@ static void lsm6dsl_work_cb(struct k_work *work) } #endif -int lsm6dsl_init_interrupt(struct device *dev) +int lsm6dsl_init_interrupt(const struct device *dev) { struct lsm6dsl_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c index 7d2d4dc76cc4..7942f8e6016d 100644 --- a/drivers/sensor/lsm6dso/lsm6dso.c +++ b/drivers/sensor/lsm6dso/lsm6dso.c @@ -88,7 +88,7 @@ static int lsm6dso_gyro_range_to_fs_val(s32_t range) } #endif -static inline int lsm6dso_reboot(struct device *dev) +static inline int lsm6dso_reboot(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; @@ -102,7 +102,7 @@ static inline int lsm6dso_reboot(struct device *dev) return 0; } -static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6dso_accel_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6dso_data *data = dev->driver_data; @@ -115,7 +115,7 @@ static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6dso_accel_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6dso_data *data = dev->driver_data; @@ -128,7 +128,7 @@ static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr) return 0; } -static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs) +static int lsm6dso_gyro_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm6dso_data *data = dev->driver_data; @@ -139,7 +139,7 @@ static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs) return 0; } -static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr) +static int lsm6dso_gyro_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm6dso_data *data = dev->driver_data; @@ -151,7 +151,7 @@ static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr) } #ifdef LSM6DSO_ACCEL_ODR_RUNTIME -static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq) +static int lsm6dso_accel_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -170,7 +170,7 @@ static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq) #endif #ifdef LSM6DSO_ACCEL_FS_RUNTIME -static int lsm6dso_accel_range_set(struct device *dev, s32_t range) +static int lsm6dso_accel_range_set(const struct device *dev, s32_t range) { int fs; struct lsm6dso_data *data = dev->driver_data; @@ -190,9 +190,10 @@ static int lsm6dso_accel_range_set(struct device *dev, s32_t range) } #endif -static int lsm6dso_accel_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dso_accel_config(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { #ifdef LSM6DSO_ACCEL_FS_RUNTIME @@ -212,7 +213,7 @@ static int lsm6dso_accel_config(struct device *dev, enum sensor_channel chan, } #ifdef LSM6DSO_GYRO_ODR_RUNTIME -static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq) +static int lsm6dso_gyro_odr_set(const struct device *dev, u16_t freq) { int odr; @@ -231,7 +232,7 @@ static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq) #endif #ifdef LSM6DSO_GYRO_FS_RUNTIME -static int lsm6dso_gyro_range_set(struct device *dev, s32_t range) +static int lsm6dso_gyro_range_set(const struct device *dev, s32_t range) { int fs; struct lsm6dso_data *data = dev->driver_data; @@ -251,9 +252,10 @@ static int lsm6dso_gyro_range_set(struct device *dev, s32_t range) } #endif -static int lsm6dso_gyro_config(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dso_gyro_config(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (attr) { #ifdef LSM6DSO_GYRO_FS_RUNTIME @@ -272,9 +274,10 @@ static int lsm6dso_gyro_config(struct device *dev, enum sensor_channel chan, return 0; } -static int lsm6dso_attr_set(struct device *dev, enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static int lsm6dso_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -295,7 +298,7 @@ static int lsm6dso_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int lsm6dso_sample_fetch_accel(struct device *dev) +static int lsm6dso_sample_fetch_accel(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; union axis3bit16_t buf; @@ -312,7 +315,7 @@ static int lsm6dso_sample_fetch_accel(struct device *dev) return 0; } -static int lsm6dso_sample_fetch_gyro(struct device *dev) +static int lsm6dso_sample_fetch_gyro(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; union axis3bit16_t buf; @@ -330,7 +333,7 @@ static int lsm6dso_sample_fetch_gyro(struct device *dev) } #if defined(CONFIG_LSM6DSO_ENABLE_TEMP) -static int lsm6dso_sample_fetch_temp(struct device *dev) +static int lsm6dso_sample_fetch_temp(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; union axis1bit16_t buf; @@ -347,7 +350,7 @@ static int lsm6dso_sample_fetch_temp(struct device *dev) #endif #if defined(CONFIG_LSM6DSO_SENSORHUB) -static int lsm6dso_sample_fetch_shub(struct device *dev) +static int lsm6dso_sample_fetch_shub(const struct device *dev) { if (lsm6dso_shub_fetch_external_devs(dev) < 0) { LOG_DBG("failed to read ext shub devices"); @@ -358,7 +361,8 @@ static int lsm6dso_sample_fetch_shub(struct device *dev) } #endif /* CONFIG_LSM6DSO_SENSORHUB */ -static int lsm6dso_sample_fetch(struct device *dev, enum sensor_channel chan) +static int lsm6dso_sample_fetch(const struct device *dev, + enum sensor_channel chan) { switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -625,7 +629,7 @@ static inline void lsm6dso_temp_convert(struct sensor_value *val, } #endif -static int lsm6dso_channel_get(struct device *dev, +static int lsm6dso_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -685,7 +689,7 @@ static const struct sensor_driver_api lsm6dso_api_funcs = { .channel_get = lsm6dso_channel_get, }; -static int lsm6dso_init_chip(struct device *dev) +static int lsm6dso_init_chip(const struct device *dev) { struct lsm6dso_data *lsm6dso = dev->driver_data; u8_t chip_id; @@ -786,7 +790,7 @@ static const struct lsm6dso_config lsm6dso_config = { #endif /* CONFIG_LSM6DSO_TRIGGER */ }; -static int lsm6dso_init(struct device *dev) +static int lsm6dso_init(const struct device *dev) { const struct lsm6dso_config * const config = dev->config_info; struct lsm6dso_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dso/lsm6dso.h b/drivers/sensor/lsm6dso/lsm6dso.h index ab85399c6cea..5ae12075a451 100644 --- a/drivers/sensor/lsm6dso/lsm6dso.h +++ b/drivers/sensor/lsm6dso/lsm6dso.h @@ -93,7 +93,7 @@ union axis1bit16_t { struct lsm6dso_config { char *bus_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_LSM6DSO_TRIGGER const char *int_gpio_port; u8_t int_gpio_pin; @@ -137,7 +137,7 @@ struct lsm6dso_tf { #define LSM6DSO_SHUB_MAX_NUM_SLVS 2 struct lsm6dso_data { - struct device *bus; + const struct device *bus; s16_t acc[3]; u32_t acc_gain; s16_t gyro[3]; @@ -171,7 +171,7 @@ struct lsm6dso_data { u8_t gyro_fs; #ifdef CONFIG_LSM6DSO_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; sensor_trigger_handler_t handler_drdy_acc; sensor_trigger_handler_t handler_drdy_gyr; @@ -183,7 +183,7 @@ struct lsm6dso_data { struct k_sem gpio_sem; #elif defined(CONFIG_LSM6DSO_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_LSM6DSO_TRIGGER */ @@ -192,23 +192,23 @@ struct lsm6dso_data { #endif }; -int lsm6dso_spi_init(struct device *dev); -int lsm6dso_i2c_init(struct device *dev); +int lsm6dso_spi_init(const struct device *dev); +int lsm6dso_i2c_init(const struct device *dev); #if defined(CONFIG_LSM6DSO_SENSORHUB) -int lsm6dso_shub_init(struct device *dev); -int lsm6dso_shub_fetch_external_devs(struct device *dev); +int lsm6dso_shub_init(const struct device *dev); +int lsm6dso_shub_fetch_external_devs(const struct device *dev); int lsm6dso_shub_get_idx(enum sensor_channel type); -int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan, +int lsm6dso_shub_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); #endif /* CONFIG_LSM6DSO_SENSORHUB */ #ifdef CONFIG_LSM6DSO_TRIGGER -int lsm6dso_trigger_set(struct device *dev, +int lsm6dso_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lsm6dso_init_interrupt(struct device *dev); +int lsm6dso_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DSO_LSM6DSO_H_ */ diff --git a/drivers/sensor/lsm6dso/lsm6dso_i2c.c b/drivers/sensor/lsm6dso/lsm6dso_i2c.c index 82a6ba33f5e8..a270348ba100 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_i2c.c +++ b/drivers/sensor/lsm6dso/lsm6dso_i2c.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); -static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr, +static int lsm6dso_i2c_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lsm6dso_data *data = dev->driver_data; @@ -30,7 +30,7 @@ static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int lsm6dso_i2c_write(struct device *dev, u8_t reg_addr, +static int lsm6dso_i2c_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lsm6dso_data *data = dev->driver_data; @@ -40,7 +40,7 @@ static int lsm6dso_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int lsm6dso_i2c_init(struct device *dev) +int lsm6dso_i2c_init(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dso/lsm6dso_shub.c b/drivers/sensor/lsm6dso/lsm6dso_shub.c index 744d2b33ab3d..a00eee120962 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_shub.c +++ b/drivers/sensor/lsm6dso/lsm6dso_shub.c @@ -677,7 +677,7 @@ int lsm6dso_shub_get_idx(enum sensor_channel type) return -ENOTSUP; } -int lsm6dso_shub_fetch_external_devs(struct device *dev) +int lsm6dso_shub_fetch_external_devs(const struct device *dev) { u8_t n; struct lsm6dso_data *data = dev->driver_data; @@ -701,7 +701,7 @@ int lsm6dso_shub_fetch_external_devs(struct device *dev) return 0; } -int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan, +int lsm6dso_shub_config(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -729,7 +729,7 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan, return sp->dev_conf(data, sp->ext_i2c_addr, chan, attr, val); } -int lsm6dso_shub_init(struct device *dev) +int lsm6dso_shub_init(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; u8_t i, n = 0, regn; diff --git a/drivers/sensor/lsm6dso/lsm6dso_spi.c b/drivers/sensor/lsm6dso/lsm6dso_spi.c index 4eb09f1fa446..abf2caa6463b 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_spi.c +++ b/drivers/sensor/lsm6dso/lsm6dso_spi.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); -static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr, +static int lsm6dso_spi_read(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lsm6dso_data *data = dev->driver_data; @@ -62,7 +62,7 @@ static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr, return 0; } -static int lsm6dso_spi_write(struct device *dev, u8_t reg_addr, +static int lsm6dso_spi_write(const struct device *dev, u8_t reg_addr, u8_t *value, u8_t len) { struct lsm6dso_data *data = dev->driver_data; @@ -96,7 +96,7 @@ static int lsm6dso_spi_write(struct device *dev, u8_t reg_addr, return 0; } -int lsm6dso_spi_init(struct device *dev) +int lsm6dso_spi_init(const struct device *dev) { struct lsm6dso_data *data = dev->driver_data; diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c index 32d7ddb4dd18..b36962832835 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c +++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); /** * lsm6dso_enable_t_int - TEMP enable selected int pin to generate interrupt */ -static int lsm6dso_enable_t_int(struct device *dev, int enable) +static int lsm6dso_enable_t_int(const struct device *dev, int enable) { const struct lsm6dso_config *cfg = dev->config_info; struct lsm6dso_data *lsm6dso = dev->driver_data; @@ -51,7 +51,7 @@ static int lsm6dso_enable_t_int(struct device *dev, int enable) /** * lsm6dso_enable_xl_int - XL enable selected int pin to generate interrupt */ -static int lsm6dso_enable_xl_int(struct device *dev, int enable) +static int lsm6dso_enable_xl_int(const struct device *dev, int enable) { const struct lsm6dso_config *cfg = dev->config_info; struct lsm6dso_data *lsm6dso = dev->driver_data; @@ -87,7 +87,7 @@ static int lsm6dso_enable_xl_int(struct device *dev, int enable) /** * lsm6dso_enable_g_int - Gyro enable selected int pin to generate interrupt */ -static int lsm6dso_enable_g_int(struct device *dev, int enable) +static int lsm6dso_enable_g_int(const struct device *dev, int enable) { const struct lsm6dso_config *cfg = dev->config_info; struct lsm6dso_data *lsm6dso = dev->driver_data; @@ -122,7 +122,7 @@ static int lsm6dso_enable_g_int(struct device *dev, int enable) /** * lsm6dso_trigger_set - link external trigger to event data ready */ -int lsm6dso_trigger_set(struct device *dev, +int lsm6dso_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -163,7 +163,7 @@ int lsm6dso_trigger_set(struct device *dev, */ static void lsm6dso_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct lsm6dso_data *lsm6dso = dev->driver_data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -204,7 +204,7 @@ static void lsm6dso_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void lsm6dso_gpio_callback(struct device *dev, +static void lsm6dso_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lsm6dso_data *lsm6dso = @@ -226,7 +226,7 @@ static void lsm6dso_gpio_callback(struct device *dev, #ifdef CONFIG_LSM6DSO_TRIGGER_OWN_THREAD static void lsm6dso_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct lsm6dso_data *lsm6dso = dev->driver_data; ARG_UNUSED(unused); @@ -248,7 +248,7 @@ static void lsm6dso_work_cb(struct k_work *work) } #endif /* CONFIG_LSM6DSO_TRIGGER_GLOBAL_THREAD */ -int lsm6dso_init_interrupt(struct device *dev) +int lsm6dso_init_interrupt(const struct device *dev) { struct lsm6dso_data *lsm6dso = dev->driver_data; const struct lsm6dso_config *cfg = dev->config_info; diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c index 28beb6a90a19..bfa0ed5c0cb0 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(LSM9DS0_GYRO, CONFIG_SENSOR_LOG_LEVEL); -static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power, +static inline int lsm9ds0_gyro_power_ctrl(const struct device *dev, int power, int x_en, int y_en, int z_en) { struct lsm9ds0_gyro_data *data = dev->driver_data; @@ -41,7 +41,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power, state); } -static int lsm9ds0_gyro_set_fs_raw(struct device *dev, u8_t fs) +static int lsm9ds0_gyro_set_fs_raw(const struct device *dev, u8_t fs) { struct lsm9ds0_gyro_data *data = dev->driver_data; const struct lsm9ds0_gyro_config *config = dev->config_info; @@ -68,7 +68,7 @@ static const struct { {500, 1}, {2000, 2} }; -static int lsm9ds0_gyro_set_fs(struct device *dev, int fs) +static int lsm9ds0_gyro_set_fs(const struct device *dev, int fs) { int i; @@ -82,7 +82,7 @@ static int lsm9ds0_gyro_set_fs(struct device *dev, int fs) } #endif -static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, u8_t odr) +static inline int lsm9ds0_gyro_set_odr_raw(const struct device *dev, u8_t odr) { struct lsm9ds0_gyro_data *data = dev->driver_data; const struct lsm9ds0_gyro_config *config = dev->config_info; @@ -102,7 +102,7 @@ static const struct { {380, 2}, {760, 3} }; -static int lsm9ds0_gyro_set_odr(struct device *dev, int odr) +static int lsm9ds0_gyro_set_odr(const struct device *dev, int odr) { int i; @@ -118,7 +118,7 @@ static int lsm9ds0_gyro_set_odr(struct device *dev, int odr) } #endif -static int lsm9ds0_gyro_sample_fetch(struct device *dev, +static int lsm9ds0_gyro_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct lsm9ds0_gyro_data *data = dev->driver_data; @@ -192,7 +192,7 @@ static inline int lsm9ds0_gyro_get_channel(enum sensor_channel chan, return 0; } -static int lsm9ds0_gyro_channel_get(struct device *dev, +static int lsm9ds0_gyro_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -218,7 +218,7 @@ static int lsm9ds0_gyro_channel_get(struct device *dev, } #if defined(LSM9DS0_GYRO_SET_ATTR) -static int lsm9ds0_gyro_attr_set(struct device *dev, +static int lsm9ds0_gyro_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -259,7 +259,7 @@ static const struct sensor_driver_api lsm9ds0_gyro_api_funcs = { #endif }; -static int lsm9ds0_gyro_init_chip(struct device *dev) +static int lsm9ds0_gyro_init_chip(const struct device *dev) { struct lsm9ds0_gyro_data *data = dev->driver_data; const struct lsm9ds0_gyro_config *config = dev->config_info; @@ -315,7 +315,7 @@ static int lsm9ds0_gyro_init_chip(struct device *dev) return -EIO; } -static int lsm9ds0_gyro_init(struct device *dev) +static int lsm9ds0_gyro_init(const struct device *dev) { const struct lsm9ds0_gyro_config * const config = dev->config_info; diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h index 0f6452cdd543..f622d045ffc0 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h @@ -221,7 +221,7 @@ struct lsm9ds0_gyro_config { }; struct lsm9ds0_gyro_data { - struct device *i2c_master; + const struct device *i2c_master; #if defined(CONFIG_LSM9DS0_GYRO_TRIGGERS) struct k_sem sem; @@ -231,9 +231,9 @@ struct lsm9ds0_gyro_data { K_THREAD_STACK_MEMBER(thread_stack, CONFIG_LSM9DS0_GYRO_THREAD_STACK_SIZE); struct k_thread thread; - struct device *dev; + const struct device *dev; - struct device *gpio_drdy; + const struct device *gpio_drdy; struct gpio_callback gpio_cb; struct sensor_trigger trigger_drdy; sensor_trigger_handler_t handler_drdy; @@ -247,11 +247,11 @@ struct lsm9ds0_gyro_data { }; #if defined(CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY) -int lsm9ds0_gyro_trigger_set(struct device *dev, +int lsm9ds0_gyro_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int lsm9ds0_gyro_init_interrupt(struct device *dev); +int lsm9ds0_gyro_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_ */ diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c index 4a8409a5a44f..a7148019ab1c 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c @@ -20,7 +20,7 @@ extern struct lsm9ds0_gyro_data lsm9ds0_gyro_data; LOG_MODULE_DECLARE(LSM9DS0_GYRO, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_drdy(struct device *dev, +static inline void setup_drdy(const struct device *dev, bool enable) { struct lsm9ds0_gyro_data *data = dev->driver_data; @@ -33,7 +33,7 @@ static inline void setup_drdy(struct device *dev, : GPIO_INT_DISABLE); } -int lsm9ds0_gyro_trigger_set(struct device *dev, +int lsm9ds0_gyro_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -70,7 +70,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev, return -ENOTSUP; } -static void lsm9ds0_gyro_gpio_drdy_callback(struct device *dev, +static void lsm9ds0_gyro_gpio_drdy_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct lsm9ds0_gyro_data *data = @@ -83,7 +83,7 @@ static void lsm9ds0_gyro_gpio_drdy_callback(struct device *dev, static void lsm9ds0_gyro_thread_main(void *arg1, void *arg2, void *arg3) { - struct device *dev = (struct device *) arg1; + const struct device *dev = (const struct device *) arg1; struct lsm9ds0_gyro_data *data = dev->driver_data; while (1) { @@ -97,7 +97,7 @@ static void lsm9ds0_gyro_thread_main(void *arg1, void *arg2, void *arg3) } } -int lsm9ds0_gyro_init_interrupt(struct device *dev) +int lsm9ds0_gyro_init_interrupt(const struct device *dev) { const struct lsm9ds0_gyro_config * const config = dev->config_info; diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index 088d5b2e859f..ab3a24a1c453 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LSM9DS0_MFD, CONFIG_SENSOR_LOG_LEVEL); -static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) +static inline int lsm9ds0_mfd_reboot_memory(const struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -42,7 +42,8 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) } #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) -static inline int lsm9ds0_mfd_accel_set_odr_raw(struct device *dev, u8_t odr) +static inline int lsm9ds0_mfd_accel_set_odr_raw(const struct device *dev, + u8_t odr) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -69,7 +70,7 @@ static const struct { {800, 0}, {1600, 0} }; -static int lsm9ds0_mfd_accel_set_odr(struct device *dev, +static int lsm9ds0_mfd_accel_set_odr(const struct device *dev, const struct sensor_value *val) { u8_t i; @@ -86,7 +87,8 @@ static int lsm9ds0_mfd_accel_set_odr(struct device *dev, } #endif -static inline int lsm9ds0_mfd_accel_set_fs_raw(struct device *dev, u8_t fs) +static inline int lsm9ds0_mfd_accel_set_fs_raw(const struct device *dev, + u8_t fs) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -115,7 +117,7 @@ static const struct { {8}, {16} }; -static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val) +static int lsm9ds0_mfd_accel_set_fs(const struct device *dev, int val) { u8_t i; @@ -131,7 +133,8 @@ static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val) #endif #if !defined(LSM9DS0_MFD_MAGN_DISABLED) -static inline int lsm9ds0_mfd_magn_set_odr_raw(struct device *dev, u8_t odr) +static inline int lsm9ds0_mfd_magn_set_odr_raw(const struct device *dev, + u8_t odr) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -154,7 +157,7 @@ static const struct { {50, 0}, {100, 0} }; -static int lsm9ds0_mfd_magn_set_odr(struct device *dev, +static int lsm9ds0_mfd_magn_set_odr(const struct device *dev, const struct sensor_value *val) { u8_t i; @@ -171,7 +174,8 @@ static int lsm9ds0_mfd_magn_set_odr(struct device *dev, } #endif -static inline int lsm9ds0_mfd_magn_set_fs_raw(struct device *dev, u8_t fs) +static inline int lsm9ds0_mfd_magn_set_fs_raw(const struct device *dev, + u8_t fs) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -199,7 +203,7 @@ static const struct { {8}, {12} }; -static int lsm9ds0_mfd_magn_set_fs(struct device *dev, +static int lsm9ds0_mfd_magn_set_fs(const struct device *dev, const struct sensor_value *val) { u8_t i; @@ -216,7 +220,7 @@ static int lsm9ds0_mfd_magn_set_fs(struct device *dev, #endif #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) -static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) +static inline int lsm9ds0_mfd_sample_fetch_accel(const struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -270,7 +274,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) #endif #if !defined(LSM9DS0_MFD_MAGN_DISABLED) -static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) +static inline int lsm9ds0_mfd_sample_fetch_magn(const struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -318,7 +322,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) #endif #if !defined(LSM9DS0_MFD_TEMP_DISABLED) -static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev) +static inline int lsm9ds0_mfd_sample_fetch_temp(const struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -339,7 +343,7 @@ static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev) } #endif -static inline int lsm9ds0_mfd_sample_fetch_all(struct device *dev) +static inline int lsm9ds0_mfd_sample_fetch_all(const struct device *dev) { #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) if (lsm9ds0_mfd_sample_fetch_accel(dev) < 0) { @@ -362,7 +366,7 @@ static inline int lsm9ds0_mfd_sample_fetch_all(struct device *dev) return 0; } -static int lsm9ds0_mfd_sample_fetch(struct device *dev, +static int lsm9ds0_mfd_sample_fetch(const struct device *dev, enum sensor_channel chan) { switch (chan) { @@ -426,7 +430,7 @@ static inline int lsm9ds0_mfd_get_accel_channel(enum sensor_channel chan, return 0; } -static inline int lsm9ds0_mfd_get_accel(struct device *dev, +static inline int lsm9ds0_mfd_get_accel(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -512,7 +516,7 @@ static inline int lsm9ds0_mfd_get_magn_channel(enum sensor_channel chan, return 0; } -static inline int lsm9ds0_mfd_get_magn(struct device *dev, +static inline int lsm9ds0_mfd_get_magn(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -549,7 +553,7 @@ static inline int lsm9ds0_mfd_get_magn(struct device *dev, } #endif -static int lsm9ds0_mfd_channel_get(struct device *dev, +static int lsm9ds0_mfd_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -584,7 +588,7 @@ static int lsm9ds0_mfd_channel_get(struct device *dev, } #if defined(LSM9DS0_MFD_ATTR_SET_ACCEL) -static inline int lsm9ds0_mfd_attr_set_accel(struct device *dev, +static inline int lsm9ds0_mfd_attr_set_accel(const struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { @@ -606,7 +610,7 @@ static inline int lsm9ds0_mfd_attr_set_accel(struct device *dev, #endif #if defined(LSM9DS0_MFD_ATTR_SET_MAGN) -static inline int lsm9ds0_mfd_attr_set_magn(struct device *dev, +static inline int lsm9ds0_mfd_attr_set_magn(const struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { @@ -628,7 +632,7 @@ static inline int lsm9ds0_mfd_attr_set_magn(struct device *dev, #endif #if defined(LSM9DS0_MFD_ATTR_SET) -static int lsm9ds0_mfd_attr_set(struct device *dev, +static int lsm9ds0_mfd_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -665,7 +669,7 @@ static const struct sensor_driver_api lsm9ds0_mfd_api_funcs = { #endif }; -static int lsm9ds0_mfd_init_chip(struct device *dev) +static int lsm9ds0_mfd_init_chip(const struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; const struct lsm9ds0_mfd_config *config = dev->config_info; @@ -767,7 +771,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) return 0; } -int lsm9ds0_mfd_init(struct device *dev) +int lsm9ds0_mfd_init(const struct device *dev) { const struct lsm9ds0_mfd_config * const config = dev->config_info; diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h index 9155bf956df2..36827d7b1b2a 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h @@ -528,7 +528,7 @@ struct lsm9ds0_mfd_config { }; struct lsm9ds0_mfd_data { - struct device *i2c_master; + const struct device *i2c_master; #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) int sample_accel_x, sample_accel_y, sample_accel_z; diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c index 138a551fb821..fd6104a2e705 100644 --- a/drivers/sensor/max30101/max30101.c +++ b/drivers/sensor/max30101/max30101.c @@ -12,7 +12,8 @@ LOG_MODULE_REGISTER(MAX30101, CONFIG_SENSOR_LOG_LEVEL); -static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) +static int max30101_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct max30101_data *data = dev->driver_data; const struct max30101_config *config = dev->config_info; @@ -44,7 +45,8 @@ static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int max30101_channel_get(struct device *dev, enum sensor_channel chan, +static int max30101_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct max30101_data *data = dev->driver_data; @@ -91,7 +93,7 @@ static const struct sensor_driver_api max30101_driver_api = { .channel_get = max30101_channel_get, }; -static int max30101_init(struct device *dev) +static int max30101_init(const struct device *dev) { const struct max30101_config *config = dev->config_info; struct max30101_data *data = dev->driver_data; diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h index 641f8fc6b01b..36d4475eeccb 100644 --- a/drivers/sensor/max30101/max30101.h +++ b/drivers/sensor/max30101/max30101.h @@ -96,7 +96,7 @@ struct max30101_config { }; struct max30101_data { - struct device *i2c; + const struct device *i2c; u32_t raw[MAX30101_MAX_NUM_CHANNELS]; u8_t map[MAX30101_MAX_NUM_CHANNELS]; u8_t num_channels; diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c index 7e48065f5c59..31dd2c1e4506 100644 --- a/drivers/sensor/max44009/max44009.c +++ b/drivers/sensor/max44009/max44009.c @@ -69,7 +69,8 @@ static int max44009_reg_update(struct max44009_data *drv_data, u8_t reg, return max44009_reg_write(drv_data, reg, new_val); } -static int max44009_attr_set(struct device *dev, enum sensor_channel chan, +static int max44009_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -111,7 +112,8 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan, return 0; } -static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan) +static int max44009_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct max44009_data *drv_data = dev->driver_data; u8_t val_h, val_l; @@ -136,7 +138,8 @@ static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int max44009_channel_get(struct device *dev, enum sensor_channel chan, +static int max44009_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct max44009_data *drv_data = dev->driver_data; @@ -169,7 +172,7 @@ static const struct sensor_driver_api max44009_driver_api = { .channel_get = max44009_channel_get, }; -int max44009_init(struct device *dev) +int max44009_init(const struct device *dev) { struct max44009_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/max44009/max44009.h b/drivers/sensor/max44009/max44009.h index ab5ae6701f42..fd231515a006 100644 --- a/drivers/sensor/max44009/max44009.h +++ b/drivers/sensor/max44009/max44009.h @@ -22,7 +22,7 @@ #define MAX44009_REG_LUX_LOW_BYTE 0x04 struct max44009_data { - struct device *i2c; + const struct device *i2c; u16_t sample; }; diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c index d8b23bce4d85..c9feeb58edb6 100644 --- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c +++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c @@ -42,7 +42,7 @@ struct tach_xec_data { ((struct tach_xec_data *)dev->driver_data) -int tach_xec_sample_fetch(struct device *dev, enum sensor_channel chan) +int tach_xec_sample_fetch(const struct device *dev, enum sensor_channel chan) { ARG_UNUSED(chan); @@ -76,7 +76,7 @@ int tach_xec_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int tach_xec_channel_get(struct device *dev, +static int tach_xec_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -99,7 +99,7 @@ static int tach_xec_channel_get(struct device *dev, return 0; } -static int tach_xec_init(struct device *dev) +static int tach_xec_init(const struct device *dev) { TACH_Type *tach = TACH_XEC_REG_BASE(dev); diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c index 132739242f48..3be1355781f8 100644 --- a/drivers/sensor/mcp9808/mcp9808.c +++ b/drivers/sensor/mcp9808/mcp9808.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(MCP9808, CONFIG_SENSOR_LOG_LEVEL); -int mcp9808_reg_read(struct device *dev, u8_t reg, u16_t *val) +int mcp9808_reg_read(const struct device *dev, u8_t reg, u16_t *val) { const struct mcp9808_data *data = dev->driver_data; const struct mcp9808_config *cfg = dev->config_info; @@ -35,7 +35,8 @@ int mcp9808_reg_read(struct device *dev, u8_t reg, u16_t *val) return rc; } -static int mcp9808_sample_fetch(struct device *dev, enum sensor_channel chan) +static int mcp9808_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct mcp9808_data *data = dev->driver_data; @@ -44,7 +45,7 @@ static int mcp9808_sample_fetch(struct device *dev, enum sensor_channel chan) return mcp9808_reg_read(dev, MCP9808_REG_TEMP_AMB, &data->reg_val); } -static int mcp9808_channel_get(struct device *dev, +static int mcp9808_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -69,7 +70,7 @@ static const struct sensor_driver_api mcp9808_api_funcs = { #endif /* CONFIG_MCP9808_TRIGGER */ }; -int mcp9808_init(struct device *dev) +int mcp9808_init(const struct device *dev) { struct mcp9808_data *data = dev->driver_data; const struct mcp9808_config *cfg = dev->config_info; diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h index 5ee2791400aa..9f83cb1dd16b 100644 --- a/drivers/sensor/mcp9808/mcp9808.h +++ b/drivers/sensor/mcp9808/mcp9808.h @@ -56,15 +56,15 @@ #define MCP9808_TEMP_CRT_BIT BIT(15) struct mcp9808_data { - struct device *i2c_master; + const struct device *i2c_master; u16_t reg_val; #ifdef CONFIG_MCP9808_TRIGGER - struct device *alert_gpio; + const struct device *alert_gpio; struct gpio_callback alert_cb; - struct device *dev; + const struct device *dev; struct sensor_trigger trig; sensor_trigger_handler_t trigger_handler; @@ -89,16 +89,16 @@ struct mcp9808_config { #endif /* CONFIG_MCP9808_TRIGGER */ }; -int mcp9808_reg_read(struct device *dev, u8_t reg, u16_t *val); +int mcp9808_reg_read(const struct device *dev, u8_t reg, u16_t *val); #ifdef CONFIG_MCP9808_TRIGGER -int mcp9808_attr_set(struct device *dev, enum sensor_channel chan, +int mcp9808_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int mcp9808_trigger_set(struct device *dev, +int mcp9808_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int mcp9808_setup_interrupt(struct device *dev); +int mcp9808_setup_interrupt(const struct device *dev); #endif /* CONFIG_MCP9808_TRIGGER */ /* Encode a signed temperature in scaled Celsius to the format used in diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c index 2c9d8fa0cb4a..d3c1a0a0079e 100644 --- a/drivers/sensor/mcp9808/mcp9808_trigger.c +++ b/drivers/sensor/mcp9808/mcp9808_trigger.c @@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(MCP9808, CONFIG_SENSOR_LOG_LEVEL); -static int mcp9808_reg_write(struct device *dev, u8_t reg, u16_t val) +static int mcp9808_reg_write(const struct device *dev, u8_t reg, u16_t val) { const struct mcp9808_data *data = dev->driver_data; const struct mcp9808_config *cfg = dev->config_info; @@ -27,7 +27,7 @@ static int mcp9808_reg_write(struct device *dev, u8_t reg, u16_t val) return i2c_write(data->i2c_master, buf, sizeof(buf), cfg->i2c_addr); } -int mcp9808_attr_set(struct device *dev, enum sensor_channel chan, +int mcp9808_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -57,7 +57,7 @@ int mcp9808_attr_set(struct device *dev, enum sensor_channel chan, mcp9808_temp_reg_from_signed(temp)); } -static inline void setup_int(struct device *dev, +static inline void setup_int(const struct device *dev, bool enable) { const struct mcp9808_data *data = dev->driver_data; @@ -69,7 +69,7 @@ static inline void setup_int(struct device *dev, gpio_pin_interrupt_configure(data->alert_gpio, cfg->alert_pin, flags); } -static void handle_int(struct device *dev) +static void handle_int(const struct device *dev) { struct mcp9808_data *data = dev->driver_data; @@ -82,7 +82,7 @@ static void handle_int(struct device *dev) #endif } -static void process_int(struct device *dev) +static void process_int(const struct device *dev) { struct mcp9808_data *data = dev->driver_data; @@ -95,7 +95,7 @@ static void process_int(struct device *dev) } } -int mcp9808_trigger_set(struct device *dev, +int mcp9808_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -121,7 +121,8 @@ int mcp9808_trigger_set(struct device *dev, return rv; } -static void alert_cb(struct device *dev, struct gpio_callback *cb, u32_t pins) +static void alert_cb(const struct device *dev, struct gpio_callback *cb, + u32_t pins) { struct mcp9808_data *data = CONTAINER_OF(cb, struct mcp9808_data, alert_cb); @@ -135,7 +136,7 @@ static void alert_cb(struct device *dev, struct gpio_callback *cb, u32_t pins) static void mcp9808_thread_main(int arg1, int arg2) { - struct device *dev = INT_TO_POINTER(arg1); + const struct device *dev = INT_TO_POINTER(arg1); struct mcp9808_data *data = dev->driver_data; ARG_UNUSED(arg2); @@ -160,11 +161,11 @@ static void mcp9808_gpio_thread_cb(struct k_work *work) #endif /* CONFIG_MCP9808_TRIGGER_GLOBAL_THREAD */ -int mcp9808_setup_interrupt(struct device *dev) +int mcp9808_setup_interrupt(const struct device *dev) { struct mcp9808_data *data = dev->driver_data; const struct mcp9808_config *cfg = dev->config_info; - struct device *gpio; + const struct device *gpio; int rc = mcp9808_reg_write(dev, MCP9808_REG_CRITICAL, MCP9808_TEMP_ABS_MASK); if (rc == 0) { diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c index 19db0bd10af5..712ce73c273f 100644 --- a/drivers/sensor/mpr/mpr.c +++ b/drivers/sensor/mpr/mpr.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(MPR, CONFIG_SENSOR_LOG_LEVEL); -static int mpr_init(struct device *dev) +static int mpr_init(const struct device *dev) { struct mpr_data *data = dev->driver_data; const struct mpr_config *cfg = dev->config_info; @@ -34,7 +34,7 @@ static int mpr_init(struct device *dev) return 0; } -static int mpr_read_reg(struct device *dev) +static int mpr_read_reg(const struct device *dev) { struct mpr_data *data = dev->driver_data; const struct mpr_config *cfg = dev->config_info; @@ -96,14 +96,15 @@ static inline void mpr_convert_reg(const u32_t *reg, s64_t *value) *value += MPR_P_MIN; } -static int mpr_sample_fetch(struct device *dev, enum sensor_channel chan) +static int mpr_sample_fetch(const struct device *dev, + enum sensor_channel chan) { __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_PRESS); return mpr_read_reg(dev); } -static int mpr_channel_get(struct device *dev, +static int mpr_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { diff --git a/drivers/sensor/mpr/mpr.h b/drivers/sensor/mpr/mpr.h index 2567b0dcdb1a..8d248567a087 100644 --- a/drivers/sensor/mpr/mpr.h +++ b/drivers/sensor/mpr/mpr.h @@ -28,7 +28,7 @@ #endif struct mpr_data { - struct device *i2c_master; + const struct device *i2c_master; u32_t reg_val; }; @@ -38,6 +38,6 @@ struct mpr_config { u16_t i2c_addr; }; -int mpr_reg_read(struct device *dev, u8_t reg, u16_t *val); +int mpr_reg_read(const struct device *dev, u8_t reg, u16_t *val); #endif /* ZEPHYR_DRIVERS_SENSOR_MPR_H_ */ diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c index 96e187524943..0648a43145a3 100644 --- a/drivers/sensor/mpu6050/mpu6050.c +++ b/drivers/sensor/mpu6050/mpu6050.c @@ -55,7 +55,7 @@ static inline void mpu6050_convert_temp(struct sensor_value *val, } } -static int mpu6050_channel_get(struct device *dev, +static int mpu6050_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -109,7 +109,8 @@ static int mpu6050_channel_get(struct device *dev, return 0; } -static int mpu6050_sample_fetch(struct device *dev, enum sensor_channel chan) +static int mpu6050_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct mpu6050_data *drv_data = dev->driver_data; const struct mpu6050_config *cfg = dev->config_info; @@ -140,7 +141,7 @@ static const struct sensor_driver_api mpu6050_driver_api = { .channel_get = mpu6050_channel_get, }; -int mpu6050_init(struct device *dev) +int mpu6050_init(const struct device *dev) { struct mpu6050_data *drv_data = dev->driver_data; const struct mpu6050_config *cfg = dev->config_info; diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h index baa343cf5737..79631a1b6826 100644 --- a/drivers/sensor/mpu6050/mpu6050.h +++ b/drivers/sensor/mpu6050/mpu6050.h @@ -35,7 +35,7 @@ static const u16_t mpu6050_gyro_sensitivity_x10[] = { }; struct mpu6050_data { - struct device *i2c; + const struct device *i2c; s16_t accel_x; s16_t accel_y; @@ -50,8 +50,8 @@ struct mpu6050_data { u16_t gyro_sensitivity_x10; #ifdef CONFIG_MPU6050_TRIGGER - struct device *dev; - struct device *gpio; + const struct device *dev; + const struct device *gpio; struct gpio_callback gpio_cb; struct sensor_trigger data_ready_trigger; @@ -79,11 +79,11 @@ struct mpu6050_config { }; #ifdef CONFIG_MPU6050_TRIGGER -int mpu6050_trigger_set(struct device *dev, +int mpu6050_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int mpu6050_init_interrupt(struct device *dev); +int mpu6050_init_interrupt(const struct device *dev); #endif #endif /* __SENSOR_MPU6050__ */ diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c index 13a70581ca22..b8e6fb64dfac 100644 --- a/drivers/sensor/mpu6050/mpu6050_trigger.c +++ b/drivers/sensor/mpu6050/mpu6050_trigger.c @@ -14,7 +14,7 @@ LOG_MODULE_DECLARE(MPU6050, CONFIG_SENSOR_LOG_LEVEL); -int mpu6050_trigger_set(struct device *dev, +int mpu6050_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -41,7 +41,7 @@ int mpu6050_trigger_set(struct device *dev, return 0; } -static void mpu6050_gpio_callback(struct device *dev, +static void mpu6050_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mpu6050_data *drv_data = @@ -62,7 +62,7 @@ static void mpu6050_gpio_callback(struct device *dev, static void mpu6050_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct mpu6050_data *drv_data = dev->driver_data; const struct mpu6050_config *cfg = dev->config_info; @@ -79,7 +79,7 @@ static void mpu6050_thread_cb(void *arg) #ifdef CONFIG_MPU6050_TRIGGER_OWN_THREAD static void mpu6050_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct mpu6050_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -101,7 +101,7 @@ static void mpu6050_work_cb(struct k_work *work) } #endif -int mpu6050_init_interrupt(struct device *dev) +int mpu6050_init_interrupt(const struct device *dev) { struct mpu6050_data *drv_data = dev->driver_data; const struct mpu6050_config *cfg = dev->config_info; diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c index 3b5f91919603..2e7e15181a3c 100644 --- a/drivers/sensor/ms5607/ms5607.c +++ b/drivers/sensor/ms5607/ms5607.c @@ -109,7 +109,8 @@ static int ms5607_get_measurement(const struct ms5607_data *data, return 0; } -static int ms5607_sample_fetch(struct device *dev, enum sensor_channel channel) +static int ms5607_sample_fetch(const struct device *dev, + enum sensor_channel channel) { struct ms5607_data *data = dev->driver_data; int err; @@ -137,7 +138,8 @@ static int ms5607_sample_fetch(struct device *dev, enum sensor_channel channel) return 0; } -static int ms5607_channel_get(struct device *dev, enum sensor_channel chan, +static int ms5607_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { const struct ms5607_data *data = dev->driver_data; @@ -158,7 +160,7 @@ static int ms5607_channel_get(struct device *dev, enum sensor_channel chan, return 0; } -static int ms5607_attr_set(struct device *dev, enum sensor_channel chan, +static int ms5607_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -226,7 +228,7 @@ static const struct ms5607_config ms5607_config = { .ms5607_device_name = DT_INST_BUS_LABEL(0), }; -static int ms5607_init(struct device *dev) +static int ms5607_init(const struct device *dev) { const struct ms5607_config *const config = dev->config_info; struct ms5607_data *data = dev->driver_data; diff --git a/drivers/sensor/ms5607/ms5607.h b/drivers/sensor/ms5607/ms5607.h index df829496c577..650d30f7a20a 100644 --- a/drivers/sensor/ms5607/ms5607.h +++ b/drivers/sensor/ms5607/ms5607.h @@ -62,7 +62,7 @@ #endif #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) -int ms5607_spi_init(struct device *dev); +int ms5607_spi_init(const struct device *dev); #else /* I2c Interface not implemented yet */ BUILD_ASSERT(1, "I2c interface not implemented yet"); @@ -73,7 +73,7 @@ struct ms5607_config { }; struct ms5607_data { - struct device *ms5607_device; + const struct device *ms5607_device; const struct ms5607_transfer_function *tf; /* Calibration values */ u16_t sens_t1; diff --git a/drivers/sensor/ms5607/ms5607_spi.c b/drivers/sensor/ms5607/ms5607_spi.c index 54588715b1cd..3f4d5ee1b9f4 100644 --- a/drivers/sensor/ms5607/ms5607_spi.c +++ b/drivers/sensor/ms5607/ms5607_spi.c @@ -166,7 +166,7 @@ static const struct ms5607_transfer_function ms5607_spi_transfer_function = { .read_adc = ms5607_spi_read_adc, }; -int ms5607_spi_init(struct device *dev) +int ms5607_spi_init(const struct device *dev) { struct ms5607_data *data = dev->driver_data; diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c index 54b66848238d..5465e651f425 100644 --- a/drivers/sensor/ms5837/ms5837.c +++ b/drivers/sensor/ms5837/ms5837.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(MS5837, CONFIG_SENSOR_LOG_LEVEL); -static int ms5837_get_measurement(struct device *i2c_master, +static int ms5837_get_measurement(const struct device *i2c_master, const u8_t i2c_address, u32_t *val, u8_t cmd, const u8_t delay) { @@ -97,7 +97,8 @@ static void ms5837_compensate(struct ms5837_data *data, (((SENS * adc_pressure) / (1ll << 21)) - OFF) / (1ll << 13); } -static int ms5837_sample_fetch(struct device *dev, enum sensor_channel channel) +static int ms5837_sample_fetch(const struct device *dev, + enum sensor_channel channel) { struct ms5837_data *data = dev->driver_data; const struct ms5837_config *cfg = dev->config_info; @@ -128,7 +129,8 @@ static int ms5837_sample_fetch(struct device *dev, enum sensor_channel channel) return 0; } -static int ms5837_channel_get(struct device *dev, enum sensor_channel chan, +static int ms5837_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct ms5837_data *data = dev->driver_data; @@ -149,7 +151,7 @@ static int ms5837_channel_get(struct device *dev, enum sensor_channel chan, return 0; } -static int ms5837_attr_set(struct device *dev, enum sensor_channel chan, +static int ms5837_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -228,8 +230,9 @@ static const struct sensor_driver_api ms5837_api_funcs = { .channel_get = ms5837_channel_get, }; -static int ms5837_read_prom(struct device *i2c_master, const u8_t i2c_address, - const u8_t cmd, u16_t *val) +static int ms5837_read_prom(const struct device *i2c_master, + const u8_t i2c_address, + const u8_t cmd, u16_t *val) { int err; @@ -243,7 +246,7 @@ static int ms5837_read_prom(struct device *i2c_master, const u8_t i2c_address, return 0; } -static int ms5837_init(struct device *dev) +static int ms5837_init(const struct device *dev) { struct ms5837_data *data = dev->driver_data; const struct ms5837_config *cfg = dev->config_info; diff --git a/drivers/sensor/ms5837/ms5837.h b/drivers/sensor/ms5837/ms5837.h index b42881cfefe9..f66df1caf5dc 100644 --- a/drivers/sensor/ms5837/ms5837.h +++ b/drivers/sensor/ms5837/ms5837.h @@ -46,7 +46,7 @@ struct ms5837_data { - struct device *i2c_master; + const struct device *i2c_master; /* Calibration values */ u16_t sens_t1; diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c index b7adbc03b5e2..00e0bde98cea 100644 --- a/drivers/sensor/nrf5/temp_nrf5.c +++ b/drivers/sensor/nrf5/temp_nrf5.c @@ -25,16 +25,18 @@ LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL); struct temp_nrf5_data { struct k_sem device_sync_sem; s32_t sample; - struct device *clk_dev; + const struct device *clk_dev; }; -static void hfclk_on_callback(struct device *dev, clock_control_subsys_t subsys, +static void hfclk_on_callback(const struct device *dev, + clock_control_subsys_t subsys, void *user_data) { nrf_temp_task_trigger(NRF_TEMP, NRF_TEMP_TASK_START); } -static int temp_nrf5_sample_fetch(struct device *dev, enum sensor_channel chan) +static int temp_nrf5_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct temp_nrf5_data *data = dev->driver_data; struct clock_control_async_data clk_data = { @@ -68,9 +70,9 @@ static int temp_nrf5_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int temp_nrf5_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static int temp_nrf5_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { struct temp_nrf5_data *data = dev->driver_data; s32_t uval; @@ -91,7 +93,7 @@ static int temp_nrf5_channel_get(struct device *dev, static void temp_nrf5_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct temp_nrf5_data *data = dev->driver_data; nrf_temp_event_clear(NRF_TEMP, NRF_TEMP_EVENT_DATARDY); @@ -105,7 +107,7 @@ static const struct sensor_driver_api temp_nrf5_driver_api = { DEVICE_DECLARE(temp_nrf5); -static int temp_nrf5_init(struct device *dev) +static int temp_nrf5_init(const struct device *dev) { struct temp_nrf5_data *data = dev->driver_data; diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c index 01f0710b09e8..8783e7328795 100644 --- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c +++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c @@ -36,11 +36,11 @@ struct temp_kinetis_config { }; struct temp_kinetis_data { - struct device *adc; + const struct device *adc; u16_t buffer[TEMP_KINETIS_ADC_SAMPLES]; }; -static int temp_kinetis_sample_fetch(struct device *dev, +static int temp_kinetis_sample_fetch(const struct device *dev, enum sensor_channel chan) { const struct temp_kinetis_config *config = dev->config_info; @@ -84,7 +84,7 @@ static int temp_kinetis_sample_fetch(struct device *dev, return 0; } -static int temp_kinetis_channel_get(struct device *dev, +static int temp_kinetis_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -137,7 +137,7 @@ static const struct sensor_driver_api temp_kinetis_driver_api = { .channel_get = temp_kinetis_channel_get, }; -static int temp_kinetis_init(struct device *dev) +static int temp_kinetis_init(const struct device *dev) { const struct temp_kinetis_config *config = dev->config_info; struct temp_kinetis_data *data = dev->driver_data; diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c index c5d929ee54a6..6bac8a53009f 100644 --- a/drivers/sensor/opt3001/opt3001.c +++ b/drivers/sensor/opt3001/opt3001.c @@ -61,7 +61,8 @@ static int opt3001_reg_update(struct opt3001_data *drv_data, u8_t reg, return opt3001_reg_write(drv_data, reg, new_val); } -static int opt3001_sample_fetch(struct device *dev, enum sensor_channel chan) +static int opt3001_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct opt3001_data *drv_data = dev->driver_data; u16_t value; @@ -79,7 +80,8 @@ static int opt3001_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int opt3001_channel_get(struct device *dev, enum sensor_channel chan, +static int opt3001_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct opt3001_data *drv_data = dev->driver_data; @@ -110,7 +112,7 @@ static const struct sensor_driver_api opt3001_driver_api = { .channel_get = opt3001_channel_get, }; -static int opt3001_chip_init(struct device *dev) +static int opt3001_chip_init(const struct device *dev) { struct opt3001_data *drv_data = dev->driver_data; u16_t value; @@ -152,7 +154,7 @@ static int opt3001_chip_init(struct device *dev) return 0; } -int opt3001_init(struct device *dev) +int opt3001_init(const struct device *dev) { if (opt3001_chip_init(dev) < 0) { return -EINVAL; diff --git a/drivers/sensor/opt3001/opt3001.h b/drivers/sensor/opt3001/opt3001.h index 69d67ca8ba69..fbf2900f618b 100644 --- a/drivers/sensor/opt3001/opt3001.h +++ b/drivers/sensor/opt3001/opt3001.h @@ -24,7 +24,7 @@ #define OPT3001_MANTISSA_MASK 0xfff struct opt3001_data { - struct device *i2c; + const struct device *i2c; u16_t sample; }; diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c index db5ab63aad0b..af9f439ab80f 100644 --- a/drivers/sensor/pms7003/pms7003.c +++ b/drivers/sensor/pms7003/pms7003.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(PMS7003, CONFIG_SENSOR_LOG_LEVEL); #define CFG_PMS7003_SERIAL_TIMEOUT 1000 struct pms7003_data { - struct device *uart_dev; + const struct device *uart_dev; u16_t pm_1_0; u16_t pm_2_5; u16_t pm_10; @@ -43,7 +43,8 @@ struct pms7003_data { * @param timeout the timeout in milliseconds * @return 0 if success; -ETIME if timeout */ -static int uart_wait_for(struct device *dev, u8_t *data, int len, int timeout) +static int uart_wait_for(const struct device *dev, u8_t *data, int len, + int timeout) { int matched_size = 0; s64_t timeout_time = k_uptime_get() + K_MSEC(timeout); @@ -80,7 +81,8 @@ static int uart_wait_for(struct device *dev, u8_t *data, int len, int timeout) * @param timeout the timeout in milliseconds * @return 0 if success; -ETIME if timeout */ -static int uart_read_bytes(struct device *dev, u8_t *data, int len, int timeout) +static int uart_read_bytes(const struct device *dev, u8_t *data, int len, + int timeout) { int read_size = 0; s64_t timeout_time = k_uptime_get() + K_MSEC(timeout); @@ -102,7 +104,8 @@ static int uart_read_bytes(struct device *dev, u8_t *data, int len, int timeout) return 0; } -static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) +static int pms7003_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct pms7003_data *drv_data = dev->driver_data; @@ -139,7 +142,8 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int pms7003_channel_get(struct device *dev, enum sensor_channel chan, +static int pms7003_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct pms7003_data *drv_data = dev->driver_data; @@ -164,7 +168,7 @@ static const struct sensor_driver_api pms7003_api = { .channel_get = &pms7003_channel_get, }; -static int pms7003_init(struct device *dev) +static int pms7003_init(const struct device *dev) { struct pms7003_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c index 1449cbe24203..e7d07f59fab5 100644 --- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c +++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c @@ -49,7 +49,8 @@ static void accumulate(struct qdec_nrfx_data *data, int16_t acc) irq_unlock(key); } -static int qdec_nrfx_sample_fetch(struct device *dev, enum sensor_channel chan) +static int qdec_nrfx_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct qdec_nrfx_data *data = &qdec_nrfx_data; @@ -71,7 +72,7 @@ static int qdec_nrfx_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int qdec_nrfx_channel_get(struct device *dev, +static int qdec_nrfx_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -105,7 +106,7 @@ static int qdec_nrfx_channel_get(struct device *dev, return 0; } -static int qdec_nrfx_trigger_set(struct device *dev, +static int qdec_nrfx_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -170,7 +171,7 @@ static void qdec_nrfx_gpio_ctrl(bool enable) #endif } -static int qdec_nrfx_init(struct device *dev) +static int qdec_nrfx_init(const struct device *dev) { static const nrfx_qdec_config_t config = { .reportper = NRF_QDEC_REPORTPER_40, @@ -268,7 +269,7 @@ static int qdec_nrfx_pm_set_state(struct qdec_nrfx_data *data, return 0; } -static int qdec_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int qdec_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { struct qdec_nrfx_data *data = &qdec_nrfx_data; diff --git a/drivers/sensor/sensor_handlers.c b/drivers/sensor/sensor_handlers.c index fd9a276df7e2..597bacab77ea 100644 --- a/drivers/sensor/sensor_handlers.c +++ b/drivers/sensor/sensor_handlers.c @@ -7,40 +7,41 @@ #include #include -static inline int z_vrfy_sensor_attr_set(struct device *dev, - enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static inline int z_vrfy_sensor_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { Z_OOPS(Z_SYSCALL_DRIVER_SENSOR(dev, attr_set)); Z_OOPS(Z_SYSCALL_MEMORY_READ(val, sizeof(struct sensor_value))); - return z_impl_sensor_attr_set((struct device *)dev, chan, attr, - (const struct sensor_value *)val); + return z_impl_sensor_attr_set((const struct device *)dev, chan, attr, + (const struct sensor_value *)val); } #include -static inline int z_vrfy_sensor_sample_fetch(struct device *dev) +static inline int z_vrfy_sensor_sample_fetch(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_SENSOR(dev, sample_fetch)); - return z_impl_sensor_sample_fetch((struct device *)dev); + return z_impl_sensor_sample_fetch((const struct device *)dev); } #include -static inline int z_vrfy_sensor_sample_fetch_chan(struct device *dev, - enum sensor_channel type) +static inline int z_vrfy_sensor_sample_fetch_chan(const struct device *dev, + enum sensor_channel type) { Z_OOPS(Z_SYSCALL_DRIVER_SENSOR(dev, sample_fetch)); - return z_impl_sensor_sample_fetch_chan((struct device *)dev, type); + return z_impl_sensor_sample_fetch_chan((const struct device *)dev, + type); } #include -static inline int z_vrfy_sensor_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static inline int z_vrfy_sensor_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { Z_OOPS(Z_SYSCALL_DRIVER_SENSOR(dev, channel_get)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(val, sizeof(struct sensor_value))); - return z_impl_sensor_channel_get((struct device *)dev, chan, - (struct sensor_value *)val); + return z_impl_sensor_channel_get((const struct device *)dev, chan, + (struct sensor_value *)val); } #include diff --git a/drivers/sensor/sensor_shell.c b/drivers/sensor/sensor_shell.c index 6bb29150a02b..1b5efa624c8a 100644 --- a/drivers/sensor/sensor_shell.c +++ b/drivers/sensor/sensor_shell.c @@ -54,7 +54,8 @@ const char *sensor_channel_name[SENSOR_CHAN_ALL] = { [SENSOR_CHAN_ROTATION] = "rotation", }; -static int handle_channel_by_name(const struct shell *shell, struct device *dev, +static int handle_channel_by_name(const struct shell *shell, + const struct device *dev, const char *channel_name) { int i; @@ -97,7 +98,7 @@ static int handle_channel_by_name(const struct shell *shell, struct device *dev, } static int cmd_get_sensor(const struct shell *shell, size_t argc, char *argv[]) { - struct device *dev; + const struct device *dev; int err; dev = device_get_binding(argv[1]); @@ -163,7 +164,7 @@ SHELL_DYNAMIC_CMD_CREATE(dsub_device_name, device_name_get); static void device_name_get(size_t idx, struct shell_static_entry *entry) { int device_idx = 0; - struct device *dev; + const struct device *dev; entry->syntax = NULL; entry->handler = NULL; diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index 1bf7d5233b27..1c7db40bfffa 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -61,7 +61,7 @@ static u8_t sht3xd_compute_crc(u16_t value) return crc; } -int sht3xd_write_command(struct device *dev, u16_t cmd) +int sht3xd_write_command(const struct device *dev, u16_t cmd) { u8_t tx_buf[2] = { cmd >> 8, cmd & 0xFF }; @@ -69,7 +69,7 @@ int sht3xd_write_command(struct device *dev, u16_t cmd) sht3xd_i2c_address(dev)); } -int sht3xd_write_reg(struct device *dev, u16_t cmd, u16_t val) +int sht3xd_write_reg(const struct device *dev, u16_t cmd, u16_t val) { u8_t tx_buf[5]; @@ -83,10 +83,11 @@ int sht3xd_write_reg(struct device *dev, u16_t cmd, u16_t val) sht3xd_i2c_address(dev)); } -static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan) +static int sht3xd_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct sht3xd_data *data = dev->driver_data; - struct device *i2c = sht3xd_i2c_device(dev); + const struct device *i2c = sht3xd_i2c_device(dev); u8_t address = sht3xd_i2c_address(dev); u8_t rx_buf[6]; u16_t t_sample, rh_sample; @@ -139,7 +140,7 @@ static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int sht3xd_channel_get(struct device *dev, +static int sht3xd_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -177,11 +178,11 @@ static const struct sensor_driver_api sht3xd_driver_api = { .channel_get = sht3xd_channel_get, }; -static int sht3xd_init(struct device *dev) +static int sht3xd_init(const struct device *dev) { struct sht3xd_data *data = dev->driver_data; const struct sht3xd_config *cfg = dev->config_info; - struct device *i2c = device_get_binding(cfg->bus_name); + const struct device *i2c = device_get_binding(cfg->bus_name); if (i2c == NULL) { LOG_DBG("Failed to get pointer to %s device!", diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h index 15860fbf7f56..fcd61629f7e6 100644 --- a/drivers/sensor/sht3xd/sht3xd.h +++ b/drivers/sensor/sht3xd/sht3xd.h @@ -57,14 +57,14 @@ struct sht3xd_config { }; struct sht3xd_data { - struct device *dev; - struct device *bus; + const struct device *dev; + const struct device *bus; u16_t t_sample; u16_t rh_sample; #ifdef CONFIG_SHT3XD_TRIGGER - struct device *alert_gpio; + const struct device *alert_gpio; struct gpio_callback alert_cb; u16_t t_low; @@ -86,14 +86,14 @@ struct sht3xd_data { #endif /* CONFIG_SHT3XD_TRIGGER */ }; -static inline u8_t sht3xd_i2c_address(struct device *dev) +static inline u8_t sht3xd_i2c_address(const struct device *dev) { const struct sht3xd_config *dcp = dev->config_info; return dcp->base_address; } -static inline struct device *sht3xd_i2c_device(struct device *dev) +static inline const struct device *sht3xd_i2c_device(const struct device *dev) { const struct sht3xd_data *ddp = dev->driver_data; @@ -101,20 +101,20 @@ static inline struct device *sht3xd_i2c_device(struct device *dev) } #ifdef CONFIG_SHT3XD_TRIGGER -int sht3xd_write_command(struct device *dev, u16_t cmd); +int sht3xd_write_command(const struct device *dev, u16_t cmd); -int sht3xd_write_reg(struct device *dev, u16_t cmd, u16_t val); +int sht3xd_write_reg(const struct device *dev, u16_t cmd, u16_t val); -int sht3xd_attr_set(struct device *dev, +int sht3xd_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int sht3xd_trigger_set(struct device *dev, +int sht3xd_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int sht3xd_init_interrupt(struct device *dev); +int sht3xd_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_ */ diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c index 8b3f63008b7d..055397502f32 100644 --- a/drivers/sensor/sht3xd/sht3xd_trigger.c +++ b/drivers/sensor/sht3xd/sht3xd_trigger.c @@ -32,7 +32,7 @@ static int sht3xd_rh_processed_to_raw(const struct sensor_value *val) return ((uval * 0xFFFF) / 100) / 1000000; } -int sht3xd_attr_set(struct device *dev, +int sht3xd_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -81,7 +81,7 @@ int sht3xd_attr_set(struct device *dev, return 0; } -static inline void setup_alert(struct device *dev, +static inline void setup_alert(const struct device *dev, bool enable) { struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; @@ -94,7 +94,7 @@ static inline void setup_alert(struct device *dev, gpio_pin_interrupt_configure(data->alert_gpio, cfg->alert_pin, flags); } -static inline void handle_alert(struct device *dev) +static inline void handle_alert(const struct device *dev) { setup_alert(dev, false); @@ -109,7 +109,7 @@ static inline void handle_alert(struct device *dev) #endif } -int sht3xd_trigger_set(struct device *dev, +int sht3xd_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -142,7 +142,7 @@ int sht3xd_trigger_set(struct device *dev, return 0; } -static void sht3xd_gpio_callback(struct device *dev, +static void sht3xd_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct sht3xd_data *data = @@ -153,7 +153,7 @@ static void sht3xd_gpio_callback(struct device *dev, static void sht3xd_thread_cb(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; if (data->handler != NULL) { @@ -166,7 +166,7 @@ static void sht3xd_thread_cb(void *arg) #ifdef CONFIG_SHT3XD_TRIGGER_OWN_THREAD static void sht3xd_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct sht3xd_data *data = dev->driver_data; ARG_UNUSED(unused); @@ -188,11 +188,11 @@ static void sht3xd_work_cb(struct k_work *work) } #endif -int sht3xd_init_interrupt(struct device *dev) +int sht3xd_init_interrupt(const struct device *dev) { struct sht3xd_data *data = dev->driver_data; const struct sht3xd_config *cfg = dev->config_info; - struct device *gpio = device_get_binding(cfg->alert_gpio_name); + const struct device *gpio = device_get_binding(cfg->alert_gpio_name); int rc; /* setup gpio interrupt */ diff --git a/drivers/sensor/si7006/si7006.c b/drivers/sensor/si7006/si7006.c index f1bfbcad58d3..8e21d9a3f582 100644 --- a/drivers/sensor/si7006/si7006.c +++ b/drivers/sensor/si7006/si7006.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(si7006, CONFIG_SENSOR_LOG_LEVEL); struct si7006_data { - struct device *i2c_dev; + const struct device *i2c_dev; u16_t temperature; u16_t humidity; }; @@ -33,7 +33,7 @@ struct si7006_data { * * @return int 0 on success */ -static int si7006_get_humidity(struct device *i2c_dev, +static int si7006_get_humidity(const struct device *i2c_dev, struct si7006_data *si_data) { int retval; @@ -60,7 +60,7 @@ static int si7006_get_humidity(struct device *i2c_dev, * @return int 0 on success */ -static int si7006_get_old_temperature(struct device *i2c_dev, +static int si7006_get_old_temperature(const struct device *i2c_dev, struct si7006_data *si_data) { u8_t temp[2]; @@ -83,7 +83,8 @@ static int si7006_get_old_temperature(struct device *i2c_dev, * * @return 0 */ -static int si7006_sample_fetch(struct device *dev, enum sensor_channel chan) +static int si7006_sample_fetch(const struct device *dev, + enum sensor_channel chan) { int retval; struct si7006_data *si_data = dev->driver_data; @@ -101,7 +102,8 @@ static int si7006_sample_fetch(struct device *dev, enum sensor_channel chan) * * @return -ENOTSUP for unsupported channels */ -static int si7006_channel_get(struct device *dev, enum sensor_channel chan, +static int si7006_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct si7006_data *si_data = dev->driver_data; @@ -144,7 +146,7 @@ static const struct sensor_driver_api si7006_api = { * @return 0 for success */ -static int si7006_init(struct device *dev) +static int si7006_init(const struct device *dev) { struct si7006_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/si7060/si7060.c b/drivers/sensor/si7060/si7060.c index 582cd2670b52..263973e559f7 100644 --- a/drivers/sensor/si7060/si7060.c +++ b/drivers/sensor/si7060/si7060.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(si7060, CONFIG_SENSOR_LOG_LEVEL); struct si7060_data { - struct device *i2c_dev; + const struct device *i2c_dev; u16_t temperature; }; @@ -40,7 +40,8 @@ static int si7060_reg_write(struct si7060_data *drv_data, u8_t reg, DT_INST_REG_ADDR(0), reg, val); } -static int si7060_sample_fetch(struct device *dev, enum sensor_channel chan) +static int si7060_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct si7060_data *drv_data = dev->driver_data; @@ -70,7 +71,8 @@ static int si7060_sample_fetch(struct device *dev, enum sensor_channel chan) return retval; } -static int si7060_channel_get(struct device *dev, enum sensor_channel chan, +static int si7060_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct si7060_data *drv_data = dev->driver_data; @@ -94,7 +96,7 @@ static const struct sensor_driver_api si7060_api = { .channel_get = &si7060_channel_get, }; -static int si7060_chip_init(struct device *dev) +static int si7060_chip_init(const struct device *dev) { struct si7060_data *drv_data = dev->driver_data; u8_t value; @@ -121,7 +123,7 @@ static int si7060_chip_init(struct device *dev) return 0; } -static int si7060_init(struct device *dev) +static int si7060_init(const struct device *dev) { if (si7060_chip_init(dev) < 0) { return -EINVAL; diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c index 19d34bf7235b..ec83aed821f5 100644 --- a/drivers/sensor/stts751/stts751.c +++ b/drivers/sensor/stts751/stts751.c @@ -22,14 +22,14 @@ LOG_MODULE_REGISTER(STTS751, CONFIG_SENSOR_LOG_LEVEL); -static inline int stts751_set_odr_raw(struct device *dev, u8_t odr) +static inline int stts751_set_odr_raw(const struct device *dev, u8_t odr) { struct stts751_data *data = dev->driver_data; return stts751_temp_data_rate_set(data->ctx, odr); } -static int stts751_sample_fetch(struct device *dev, +static int stts751_sample_fetch(const struct device *dev, enum sensor_channel chan) { struct stts751_data *data = dev->driver_data; @@ -54,7 +54,7 @@ static inline void stts751_temp_convert(struct sensor_value *val, val->val2 = ((s32_t)raw_val % 256) * 10000; } -static int stts751_channel_get(struct device *dev, +static int stts751_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -85,7 +85,7 @@ static const struct { {32, 0}, }; -static int stts751_odr_set(struct device *dev, +static int stts751_odr_set(const struct device *dev, const struct sensor_value *val) { int odr; @@ -110,7 +110,8 @@ static int stts751_odr_set(struct device *dev, return 0; } -static int stts751_attr_set(struct device *dev, enum sensor_channel chan, +static int stts751_attr_set(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { @@ -139,7 +140,7 @@ static const struct sensor_driver_api stts751_api_funcs = { #endif }; -static int stts751_init_chip(struct device *dev) +static int stts751_init_chip(const struct device *dev) { struct stts751_data *data = dev->driver_data; stts751_id_t chip_id; @@ -167,7 +168,7 @@ static int stts751_init_chip(struct device *dev) return 0; } -static int stts751_init(struct device *dev) +static int stts751_init(const struct device *dev) { const struct stts751_config * const config = dev->config_info; struct stts751_data *data = dev->driver_data; diff --git a/drivers/sensor/stts751/stts751.h b/drivers/sensor/stts751/stts751.h index 0fae3c423c5c..bbb741890d92 100644 --- a/drivers/sensor/stts751/stts751.h +++ b/drivers/sensor/stts751/stts751.h @@ -26,7 +26,7 @@ union axis1bit16_t { struct stts751_config { char *master_dev_name; - int (*bus_init)(struct device *dev); + int (*bus_init)(const struct device *dev); #ifdef CONFIG_STTS751_TRIGGER const char *event_port; u8_t event_pin; @@ -38,7 +38,7 @@ struct stts751_config { }; struct stts751_data { - struct device *bus; + const struct device *bus; s16_t sample_temp; stmdev_ctx_t *ctx; @@ -48,7 +48,7 @@ struct stts751_data { #endif #ifdef CONFIG_STTS751_TRIGGER - struct device *gpio; + const struct device *gpio; u32_t pin; struct gpio_callback gpio_cb; @@ -61,20 +61,20 @@ struct stts751_data { struct k_sem gpio_sem; #elif defined(CONFIG_STTS751_TRIGGER_GLOBAL_THREAD) struct k_work work; - struct device *dev; + const struct device *dev; #endif #endif /* CONFIG_STTS751_TRIGGER */ }; -int stts751_i2c_init(struct device *dev); +int stts751_i2c_init(const struct device *dev); #ifdef CONFIG_STTS751_TRIGGER -int stts751_trigger_set(struct device *dev, +int stts751_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int stts751_init_interrupt(struct device *dev); +int stts751_init_interrupt(const struct device *dev); #endif #endif /* ZEPHYR_DRIVERS_SENSOR_STTS751_STTS751_H_ */ diff --git a/drivers/sensor/stts751/stts751_i2c.c b/drivers/sensor/stts751/stts751_i2c.c index c072426b0d1c..4c52881d24de 100644 --- a/drivers/sensor/stts751/stts751_i2c.c +++ b/drivers/sensor/stts751/stts751_i2c.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL); -static int stts751_i2c_read(struct device *dev, u8_t reg_addr, +static int stts751_i2c_read(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct stts751_data *data = dev->driver_data; @@ -30,7 +30,7 @@ static int stts751_i2c_read(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -static int stts751_i2c_write(struct device *dev, u8_t reg_addr, +static int stts751_i2c_write(const struct device *dev, u8_t reg_addr, u8_t *value, u16_t len) { struct stts751_data *data = dev->driver_data; @@ -40,7 +40,7 @@ static int stts751_i2c_write(struct device *dev, u8_t reg_addr, reg_addr, value, len); } -int stts751_i2c_init(struct device *dev) +int stts751_i2c_init(const struct device *dev) { struct stts751_data *data = dev->driver_data; diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c index 64181ce1afd2..680a47e45fa9 100644 --- a/drivers/sensor/stts751/stts751_trigger.c +++ b/drivers/sensor/stts751/stts751_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL); /** * stts751_enable_int - enable selected int pin to generate interrupt */ -static int stts751_enable_int(struct device *dev, int enable) +static int stts751_enable_int(const struct device *dev, int enable) { struct stts751_data *stts751 = dev->driver_data; u8_t en = (enable) ? 0 : 1; @@ -33,7 +33,7 @@ static int stts751_enable_int(struct device *dev, int enable) /** * stts751_trigger_set - link external trigger to event data ready */ -int stts751_trigger_set(struct device *dev, +int stts751_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -57,7 +57,7 @@ int stts751_trigger_set(struct device *dev, */ static void stts751_handle_interrupt(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct stts751_data *stts751 = dev->driver_data; const struct stts751_config *cfg = dev->config_info; struct sensor_trigger thsld_trigger = { @@ -76,7 +76,7 @@ static void stts751_handle_interrupt(void *arg) GPIO_INT_EDGE_TO_ACTIVE); } -static void stts751_gpio_callback(struct device *dev, +static void stts751_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { const struct stts751_config *cfg = dev->config_info; @@ -97,7 +97,7 @@ static void stts751_gpio_callback(struct device *dev, #ifdef CONFIG_STTS751_TRIGGER_OWN_THREAD static void stts751_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct stts751_data *stts751 = dev->driver_data; ARG_UNUSED(unused); @@ -119,7 +119,7 @@ static void stts751_work_cb(struct k_work *work) } #endif /* CONFIG_STTS751_TRIGGER_GLOBAL_THREAD */ -int stts751_init_interrupt(struct device *dev) +int stts751_init_interrupt(const struct device *dev) { struct stts751_data *stts751 = dev->driver_data; const struct stts751_config *cfg = dev->config_info; diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c index ed2f941ee27a..6968ce819abc 100644 --- a/drivers/sensor/sx9500/sx9500.c +++ b/drivers/sensor/sx9500/sx9500.c @@ -45,7 +45,8 @@ static u8_t sx9500_reg_defaults[] = { 0x00, /* No stuck timeout, no periodic compensation. */ }; -static int sx9500_sample_fetch(struct device *dev, enum sensor_channel chan) +static int sx9500_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct sx9500_data *data = (struct sx9500_data *) dev->driver_data; @@ -55,7 +56,7 @@ static int sx9500_sample_fetch(struct device *dev, enum sensor_channel chan) SX9500_REG_STAT, &data->prox_stat); } -static int sx9500_channel_get(struct device *dev, +static int sx9500_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -78,7 +79,7 @@ static const struct sensor_driver_api sx9500_api_funcs = { #endif }; -static int sx9500_init_chip(struct device *dev) +static int sx9500_init_chip(const struct device *dev) { struct sx9500_data *data = (struct sx9500_data *) dev->driver_data; u8_t val; @@ -108,7 +109,7 @@ static int sx9500_init_chip(struct device *dev) 1 << CONFIG_SX9500_PROX_CHANNEL); } -int sx9500_init(struct device *dev) +int sx9500_init(const struct device *dev) { struct sx9500_data *data = dev->driver_data; diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h index 9cf30a6e8042..50fdd1662db9 100644 --- a/drivers/sensor/sx9500/sx9500.h +++ b/drivers/sensor/sx9500/sx9500.h @@ -25,7 +25,7 @@ #define SX9500_NEAR_FAR_IRQ ((1 << 5) | (1 << 6)) struct sx9500_data { - struct device *i2c_master; + const struct device *i2c_master; u16_t i2c_slave_addr; u8_t prox_stat; @@ -37,7 +37,7 @@ struct sx9500_data { #ifdef CONFIG_SX9500_TRIGGER_GLOBAL_THREAD struct k_work work; - struct device *dev; + const struct device *dev; #endif #ifdef CONFIG_SX9500_TRIGGER @@ -50,12 +50,12 @@ struct sx9500_data { }; #ifdef CONFIG_SX9500_TRIGGER -int sx9500_setup_interrupt(struct device *dev); -int sx9500_trigger_set(struct device *dev, +int sx9500_setup_interrupt(const struct device *dev); +int sx9500_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); #else -static inline int sx9500_setup_interrupt(struct device *dev) +static inline int sx9500_setup_interrupt(const struct device *dev) { return 0; } diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c index af1207d3c46d..fe0fe483b8f7 100644 --- a/drivers/sensor/sx9500/sx9500_trigger.c +++ b/drivers/sensor/sx9500/sx9500_trigger.c @@ -24,7 +24,7 @@ static K_THREAD_STACK_DEFINE(sx9500_thread_stack, CONFIG_SX9500_THREAD_STACK_SIZ static struct k_thread sx9500_thread; #endif -int sx9500_trigger_set(struct device *dev, +int sx9500_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -64,7 +64,7 @@ int sx9500_trigger_set(struct device *dev, #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD -static void sx9500_gpio_cb(struct device *port, +static void sx9500_gpio_cb(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct sx9500_data *data = @@ -77,7 +77,7 @@ static void sx9500_gpio_cb(struct device *port, static void sx9500_thread_main(int arg1, int unused) { - struct device *dev = INT_TO_POINTER(arg1); + const struct device *dev = INT_TO_POINTER(arg1); struct sx9500_data *data = dev->driver_data; u8_t reg_val; @@ -104,7 +104,7 @@ static void sx9500_thread_main(int arg1, int unused) #else /* CONFIG_SX9500_TRIGGER_GLOBAL_THREAD */ -static void sx9500_gpio_cb(struct device *port, +static void sx9500_gpio_cb(const struct device *port, struct gpio_callback *cb, u32_t pins) { struct sx9500_data *data = @@ -117,7 +117,7 @@ static void sx9500_gpio_cb(struct device *port, static void sx9500_gpio_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct sx9500_data *data = dev->driver_data; u8_t reg_val; @@ -147,10 +147,10 @@ static void sx9500_work_cb(struct k_work *work) } #endif -int sx9500_setup_interrupt(struct device *dev) +int sx9500_setup_interrupt(const struct device *dev) { struct sx9500_data *data = dev->driver_data; - struct device *gpio; + const struct device *gpio; #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD k_sem_init(&data->sem, 0, UINT_MAX); diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c index 3cdbe8e8b5a8..0a95146e5258 100644 --- a/drivers/sensor/th02/th02.c +++ b/drivers/sensor/th02/th02.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(TH02, CONFIG_SENSOR_LOG_LEVEL); -static u8_t read8(struct device *dev, u8_t d) +static u8_t read8(const struct device *dev, u8_t d) { u8_t buf; @@ -29,7 +29,7 @@ static u8_t read8(struct device *dev, u8_t d) return buf; } -static int is_ready(struct device *dev) +static int is_ready(const struct device *dev) { u8_t status; @@ -46,7 +46,7 @@ static int is_ready(struct device *dev) } } -static u16_t get_humi(struct device *dev) +static u16_t get_humi(const struct device *dev) { u16_t humidity = 0U; @@ -65,7 +65,7 @@ static u16_t get_humi(struct device *dev) return humidity; } -u16_t get_temp(struct device *dev) +u16_t get_temp(const struct device *dev) { u16_t temperature = 0U; @@ -84,7 +84,8 @@ u16_t get_temp(struct device *dev) return temperature; } -static int th02_sample_fetch(struct device *dev, enum sensor_channel chan) +static int th02_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct th02_data *drv_data = dev->driver_data; @@ -98,7 +99,8 @@ static int th02_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int th02_channel_get(struct device *dev, enum sensor_channel chan, +static int th02_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct th02_data *drv_data = dev->driver_data; @@ -124,7 +126,7 @@ static const struct sensor_driver_api th02_driver_api = { .channel_get = th02_channel_get, }; -static int th02_init(struct device *dev) +static int th02_init(const struct device *dev) { struct th02_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/th02/th02.h b/drivers/sensor/th02/th02.h index 0825c38c0ad2..608968fbfed8 100644 --- a/drivers/sensor/th02/th02.h +++ b/drivers/sensor/th02/th02.h @@ -26,7 +26,7 @@ #define TH02_RD_REG_MODE 0x80 struct th02_data { - struct device *i2c; + const struct device *i2c; u16_t t_sample; u16_t rh_sample; }; diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c index 93f05c64d071..520e5068fc81 100644 --- a/drivers/sensor/ti_hdc/ti_hdc.c +++ b/drivers/sensor/ti_hdc/ti_hdc.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(TI_HDC, CONFIG_SENSOR_LOG_LEVEL); #if DT_INST_NODE_HAS_PROP(0, drdy_gpios) -static void ti_hdc_gpio_callback(struct device *dev, +static void ti_hdc_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct ti_hdc_data *drv_data = @@ -35,7 +35,8 @@ static void ti_hdc_gpio_callback(struct device *dev, } #endif -static int ti_hdc_sample_fetch(struct device *dev, enum sensor_channel chan) +static int ti_hdc_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct ti_hdc_data *drv_data = dev->driver_data; u8_t buf[4]; @@ -74,7 +75,7 @@ static int ti_hdc_sample_fetch(struct device *dev, enum sensor_channel chan) } -static int ti_hdc_channel_get(struct device *dev, +static int ti_hdc_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -109,7 +110,7 @@ static const struct sensor_driver_api ti_hdc_driver_api = { .channel_get = ti_hdc_channel_get, }; -static u16_t read16(struct device *dev, u8_t a, u8_t d) +static u16_t read16(const struct device *dev, u8_t a, u8_t d) { u8_t buf[2]; if (i2c_burst_read(dev, a, d, (u8_t *)buf, 2) < 0) { @@ -118,7 +119,7 @@ static u16_t read16(struct device *dev, u8_t a, u8_t d) return (buf[0] << 8 | buf[1]); } -static int ti_hdc_init(struct device *dev) +static int ti_hdc_init(const struct device *dev) { struct ti_hdc_data *drv_data = dev->driver_data; u16_t tmp; diff --git a/drivers/sensor/ti_hdc/ti_hdc.h b/drivers/sensor/ti_hdc/ti_hdc.h index dd1435bafa4a..23dd114239af 100644 --- a/drivers/sensor/ti_hdc/ti_hdc.h +++ b/drivers/sensor/ti_hdc/ti_hdc.h @@ -22,12 +22,12 @@ #define HDC_CONVERSION_TIME 13 struct ti_hdc_data { - struct device *i2c; + const struct device *i2c; u16_t t_sample; u16_t rh_sample; #if DT_INST_NODE_HAS_PROP(0, drdy_gpios) - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; struct k_sem data_sem; #endif /* DT_INST_NODE_HAS_PROP(0, drdy_gpios) */ diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c index c7c7c9a74377..0aac43729f0f 100644 --- a/drivers/sensor/tmp007/tmp007.c +++ b/drivers/sensor/tmp007/tmp007.c @@ -58,7 +58,8 @@ int tmp007_reg_update(struct tmp007_data *drv_data, u8_t reg, return tmp007_reg_write(drv_data, reg, new_val); } -static int tmp007_sample_fetch(struct device *dev, enum sensor_channel chan) +static int tmp007_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct tmp007_data *drv_data = dev->driver_data; u16_t val; @@ -78,7 +79,7 @@ static int tmp007_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int tmp007_channel_get(struct device *dev, +static int tmp007_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -105,7 +106,7 @@ static const struct sensor_driver_api tmp007_driver_api = { .channel_get = tmp007_channel_get, }; -int tmp007_init(struct device *dev) +int tmp007_init(const struct device *dev) { struct tmp007_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h index 82a3b4e96a9a..b49876c78917 100644 --- a/drivers/sensor/tmp007/tmp007.h +++ b/drivers/sensor/tmp007/tmp007.h @@ -34,13 +34,13 @@ #define TMP007_TEMP_TH_SCALE 500000 struct tmp007_data { - struct device *i2c; + const struct device *i2c; s16_t sample; #ifdef CONFIG_TMP007_TRIGGER - struct device *gpio; + const struct device *gpio; struct gpio_callback gpio_cb; - struct device *dev; + const struct device *dev; sensor_trigger_handler_t drdy_handler; struct sensor_trigger drdy_trigger; @@ -67,16 +67,16 @@ int tmp007_reg_write(struct tmp007_data *drv_data, u8_t reg, u16_t val); int tmp007_reg_update(struct tmp007_data *drv_data, u8_t reg, u16_t mask, u16_t val); -int tmp007_attr_set(struct device *dev, +int tmp007_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -int tmp007_trigger_set(struct device *dev, +int tmp007_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); -int tmp007_init_interrupt(struct device *dev); +int tmp007_init_interrupt(const struct device *dev); #endif #endif /* _SENSOR_TMP007_ */ diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c index d59c53395018..13061c9158b1 100644 --- a/drivers/sensor/tmp007/tmp007_trigger.c +++ b/drivers/sensor/tmp007/tmp007_trigger.c @@ -19,7 +19,7 @@ extern struct tmp007_data tmp007_driver; #include LOG_MODULE_DECLARE(TMP007, CONFIG_SENSOR_LOG_LEVEL); -static inline void setup_int(struct device *dev, +static inline void setup_int(const struct device *dev, bool enable) { struct tmp007_data *data = dev->driver_data; @@ -31,7 +31,7 @@ static inline void setup_int(struct device *dev, : GPIO_INT_DISABLE); } -int tmp007_attr_set(struct device *dev, +int tmp007_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -63,7 +63,7 @@ int tmp007_attr_set(struct device *dev, return 0; } -static void tmp007_gpio_callback(struct device *dev, +static void tmp007_gpio_callback(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct tmp007_data *drv_data = @@ -80,7 +80,7 @@ static void tmp007_gpio_callback(struct device *dev, static void tmp007_thread_cb(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct tmp007_data *drv_data = dev->driver_data; u16_t status; @@ -104,7 +104,7 @@ static void tmp007_thread_cb(void *arg) #ifdef CONFIG_TMP007_TRIGGER_OWN_THREAD static void tmp007_thread(int dev_ptr, int unused) { - struct device *dev = INT_TO_POINTER(dev_ptr); + const struct device *dev = INT_TO_POINTER(dev_ptr); struct tmp007_data *drv_data = dev->driver_data; ARG_UNUSED(unused); @@ -126,7 +126,7 @@ static void tmp007_work_cb(struct k_work *work) } #endif -int tmp007_trigger_set(struct device *dev, +int tmp007_trigger_set(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -147,7 +147,7 @@ int tmp007_trigger_set(struct device *dev, return 0; } -int tmp007_init_interrupt(struct device *dev) +int tmp007_init_interrupt(const struct device *dev) { struct tmp007_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c index 5f36634cc376..41a8f79ab448 100644 --- a/drivers/sensor/tmp112/tmp112.c +++ b/drivers/sensor/tmp112/tmp112.c @@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(TMP112, CONFIG_SENSOR_LOG_LEVEL); #define TMP112_TEMP_SCALE 62500 struct tmp112_data { - struct device *i2c; + const struct device *i2c; s16_t sample; }; @@ -73,7 +73,7 @@ static int tmp112_reg_update(struct tmp112_data *drv_data, u8_t reg, return tmp112_reg_write(drv_data, reg, new_val); } -static int tmp112_attr_set(struct device *dev, +static int tmp112_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) @@ -149,7 +149,8 @@ static int tmp112_attr_set(struct device *dev, return 0; } -static int tmp112_sample_fetch(struct device *dev, enum sensor_channel chan) +static int tmp112_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct tmp112_data *drv_data = dev->driver_data; u16_t val; @@ -169,9 +170,9 @@ static int tmp112_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int tmp112_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static int tmp112_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { struct tmp112_data *drv_data = dev->driver_data; s32_t uval; @@ -193,7 +194,7 @@ static const struct sensor_driver_api tmp112_driver_api = { .channel_get = tmp112_channel_get, }; -int tmp112_init(struct device *dev) +int tmp112_init(const struct device *dev) { struct tmp112_data *drv_data = dev->driver_data; diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c index a6849fcafeb4..dee0bde61445 100644 --- a/drivers/sensor/tmp116/tmp116.c +++ b/drivers/sensor/tmp116/tmp116.c @@ -20,7 +20,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_REGISTER(TMP116); -static int tmp116_reg_read(struct device *dev, u8_t reg, u16_t *val) +static int tmp116_reg_read(const struct device *dev, u8_t reg, u16_t *val) { struct tmp116_data *drv_data = dev->driver_data; const struct tmp116_dev_config *cfg = dev->config_info; @@ -43,7 +43,7 @@ static int tmp116_reg_read(struct device *dev, u8_t reg, u16_t *val) * @retval 0 On success * @retval -EIO Otherwise */ -static inline int tmp116_device_id_check(struct device *dev) +static inline int tmp116_device_id_check(const struct device *dev) { u16_t value; @@ -62,7 +62,8 @@ static inline int tmp116_device_id_check(struct device *dev) return 0; } -static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan) +static int tmp116_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct tmp116_data *drv_data = dev->driver_data; u16_t value; @@ -88,7 +89,8 @@ static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan) return 0; } -static int tmp116_channel_get(struct device *dev, enum sensor_channel chan, +static int tmp116_channel_get(const struct device *dev, + enum sensor_channel chan, struct sensor_value *val) { struct tmp116_data *drv_data = dev->driver_data; @@ -114,7 +116,7 @@ static const struct sensor_driver_api tmp116_driver_api = { .channel_get = tmp116_channel_get }; -static int tmp116_init(struct device *dev) +static int tmp116_init(const struct device *dev) { struct tmp116_data *drv_data = dev->driver_data; int rc; diff --git a/drivers/sensor/tmp116/tmp116.h b/drivers/sensor/tmp116/tmp116.h index da6acdc10e7f..a20cb6896192 100644 --- a/drivers/sensor/tmp116/tmp116.h +++ b/drivers/sensor/tmp116/tmp116.h @@ -25,7 +25,7 @@ #define TMP117_DEVICE_ID 0x0117 struct tmp116_data { - struct device *i2c; + const struct device *i2c; u16_t sample; }; diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c index 50c9e39fea52..249cbbe16a12 100644 --- a/drivers/sensor/vl53l0x/vl53l0x.c +++ b/drivers/sensor/vl53l0x/vl53l0x.c @@ -40,12 +40,13 @@ LOG_MODULE_REGISTER(VL53L0X, CONFIG_SENSOR_LOG_LEVEL); #define VL53L0X_SETUP_FINAL_RANGE_VCSEL_PERIOD 14 struct vl53l0x_data { - struct device *i2c; + const struct device *i2c; VL53L0X_Dev_t vl53l0x; VL53L0X_RangingMeasurementData_t RangingMeasurementData; }; -static int vl53l0x_sample_fetch(struct device *dev, enum sensor_channel chan) +static int vl53l0x_sample_fetch(const struct device *dev, + enum sensor_channel chan) { struct vl53l0x_data *drv_data = dev->driver_data; VL53L0X_Error ret; @@ -65,7 +66,7 @@ static int vl53l0x_sample_fetch(struct device *dev, enum sensor_channel chan) } -static int vl53l0x_channel_get(struct device *dev, +static int vl53l0x_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val) { @@ -95,7 +96,7 @@ static const struct sensor_driver_api vl53l0x_api_funcs = { .channel_get = vl53l0x_channel_get, }; -static int vl53l0x_setup_single_shot(struct device *dev) +static int vl53l0x_setup_single_shot(const struct device *dev) { struct vl53l0x_data *drv_data = dev->driver_data; int ret; @@ -195,7 +196,7 @@ static int vl53l0x_setup_single_shot(struct device *dev) } -static int vl53l0x_init(struct device *dev) +static int vl53l0x_init(const struct device *dev) { struct vl53l0x_data *drv_data = dev->driver_data; VL53L0X_Error ret; @@ -205,7 +206,7 @@ static int vl53l0x_init(struct device *dev) LOG_DBG("enter in %s", __func__); #if DT_INST_NODE_HAS_PROP(0, xshut_gpios) - struct device *gpio; + const struct device *gpio; /* configure and set VL53L0X_XSHUT_Pin */ gpio = device_get_binding(DT_INST_GPIO_LABEL(0, xshut_gpios)); diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.h b/drivers/sensor/vl53l0x/vl53l0x_platform.h index 50f46436d335..84e9c6c47f27 100644 --- a/drivers/sensor/vl53l0x/vl53l0x_platform.h +++ b/drivers/sensor/vl53l0x/vl53l0x_platform.h @@ -30,7 +30,7 @@ typedef struct { uint8_t I2cDevAddr; /* i2c device address user specific field */ uint8_t comms_type; /* VL53L0X_COMMS_I2C or VL53L0X_COMMS_SPI */ uint16_t comms_speed_khz; /* Comms speed [kHz] */ - struct device *i2c; + const struct device *i2c; } VL53L0X_Dev_t; diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c index 931e73c13504..968ecd60a1e7 100644 --- a/drivers/serial/leuart_gecko.c +++ b/drivers/serial/leuart_gecko.c @@ -30,7 +30,7 @@ struct leuart_gecko_config { CMU_Clock_TypeDef clock; u32_t baud_rate; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif struct soc_gpio_pin pin_rx; struct soc_gpio_pin pin_tx; @@ -49,7 +49,7 @@ struct leuart_gecko_data { #endif }; -static int leuart_gecko_poll_in(struct device *dev, unsigned char *c) +static int leuart_gecko_poll_in(const struct device *dev, unsigned char *c) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t flags = LEUART_StatusGet(base); @@ -62,7 +62,7 @@ static int leuart_gecko_poll_in(struct device *dev, unsigned char *c) return -1; } -static void leuart_gecko_poll_out(struct device *dev, unsigned char c) +static void leuart_gecko_poll_out(const struct device *dev, unsigned char c) { LEUART_TypeDef *base = DEV_BASE(dev); @@ -72,7 +72,7 @@ static void leuart_gecko_poll_out(struct device *dev, unsigned char c) LEUART_Tx(base, c); } -static int leuart_gecko_err_check(struct device *dev) +static int leuart_gecko_err_check(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t flags = LEUART_IntGet(base); @@ -98,8 +98,9 @@ static int leuart_gecko_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int leuart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data, - int len) +static int leuart_gecko_fifo_fill(const struct device *dev, + const u8_t *tx_data, + int len) { LEUART_TypeDef *base = DEV_BASE(dev); u8_t num_tx = 0U; @@ -113,8 +114,8 @@ static int leuart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int leuart_gecko_fifo_read(struct device *dev, u8_t *rx_data, - const int len) +static int leuart_gecko_fifo_read(const struct device *dev, u8_t *rx_data, + const int len) { LEUART_TypeDef *base = DEV_BASE(dev); u8_t num_rx = 0U; @@ -128,7 +129,7 @@ static int leuart_gecko_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void leuart_gecko_irq_tx_enable(struct device *dev) +static void leuart_gecko_irq_tx_enable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC; @@ -136,7 +137,7 @@ static void leuart_gecko_irq_tx_enable(struct device *dev) LEUART_IntEnable(base, mask); } -static void leuart_gecko_irq_tx_disable(struct device *dev) +static void leuart_gecko_irq_tx_disable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC; @@ -144,7 +145,7 @@ static void leuart_gecko_irq_tx_disable(struct device *dev) LEUART_IntDisable(base, mask); } -static int leuart_gecko_irq_tx_complete(struct device *dev) +static int leuart_gecko_irq_tx_complete(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t flags = LEUART_IntGet(base); @@ -152,7 +153,7 @@ static int leuart_gecko_irq_tx_complete(struct device *dev) return (flags & LEUART_IF_TXC) != 0U; } -static int leuart_gecko_irq_tx_ready(struct device *dev) +static int leuart_gecko_irq_tx_ready(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t flags = LEUART_IntGet(base); @@ -160,7 +161,7 @@ static int leuart_gecko_irq_tx_ready(struct device *dev) return (flags & LEUART_IF_TXBL) != 0U; } -static void leuart_gecko_irq_rx_enable(struct device *dev) +static void leuart_gecko_irq_rx_enable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t mask = LEUART_IEN_RXDATAV; @@ -168,7 +169,7 @@ static void leuart_gecko_irq_rx_enable(struct device *dev) LEUART_IntEnable(base, mask); } -static void leuart_gecko_irq_rx_disable(struct device *dev) +static void leuart_gecko_irq_rx_disable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t mask = LEUART_IEN_RXDATAV; @@ -176,7 +177,7 @@ static void leuart_gecko_irq_rx_disable(struct device *dev) LEUART_IntDisable(base, mask); } -static int leuart_gecko_irq_rx_full(struct device *dev) +static int leuart_gecko_irq_rx_full(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t flags = LEUART_IntGet(base); @@ -184,7 +185,7 @@ static int leuart_gecko_irq_rx_full(struct device *dev) return (flags & LEUART_IF_RXDATAV) != 0U; } -static int leuart_gecko_irq_rx_ready(struct device *dev) +static int leuart_gecko_irq_rx_ready(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); u32_t mask = LEUART_IEN_RXDATAV; @@ -193,7 +194,7 @@ static int leuart_gecko_irq_rx_ready(struct device *dev) && leuart_gecko_irq_rx_full(dev); } -static void leuart_gecko_irq_err_enable(struct device *dev) +static void leuart_gecko_irq_err_enable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); @@ -202,7 +203,7 @@ static void leuart_gecko_irq_err_enable(struct device *dev) LEUART_IF_FERR); } -static void leuart_gecko_irq_err_disable(struct device *dev) +static void leuart_gecko_irq_err_disable(const struct device *dev) { LEUART_TypeDef *base = DEV_BASE(dev); @@ -211,17 +212,17 @@ static void leuart_gecko_irq_err_disable(struct device *dev) LEUART_IF_FERR); } -static int leuart_gecko_irq_is_pending(struct device *dev) +static int leuart_gecko_irq_is_pending(const struct device *dev) { return leuart_gecko_irq_tx_ready(dev) || leuart_gecko_irq_rx_ready(dev); } -static int leuart_gecko_irq_update(struct device *dev) +static int leuart_gecko_irq_update(const struct device *dev) { return 1; } -static void leuart_gecko_irq_callback_set(struct device *dev, +static void leuart_gecko_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -233,7 +234,7 @@ static void leuart_gecko_irq_callback_set(struct device *dev, static void leuart_gecko_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct leuart_gecko_data *data = dev->driver_data; if (data->callback) { @@ -242,7 +243,7 @@ static void leuart_gecko_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static void leuart_gecko_init_pins(struct device *dev) +static void leuart_gecko_init_pins(const struct device *dev) { const struct leuart_gecko_config *config = DEV_CFG(dev); LEUART_TypeDef *base = DEV_BASE(dev); @@ -261,7 +262,7 @@ static void leuart_gecko_init_pins(struct device *dev) #endif } -static int leuart_gecko_init(struct device *dev) +static int leuart_gecko_init(const struct device *dev) { const struct leuart_gecko_config *config = DEV_CFG(dev); LEUART_TypeDef *base = DEV_BASE(dev); @@ -325,7 +326,7 @@ static const struct uart_driver_api leuart_gecko_driver_api = { DT_INST_PROP_BY_IDX(0, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void leuart_gecko_config_func_0(struct device *dev); +static void leuart_gecko_config_func_0(const struct device *dev); #endif static const struct leuart_gecko_config leuart_gecko_0_config = { @@ -358,7 +359,7 @@ DEVICE_AND_API_INIT(leuart_0, DT_INST_LABEL(0), &leuart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void leuart_gecko_config_func_0(struct device *dev) +static void leuart_gecko_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), @@ -378,7 +379,7 @@ static void leuart_gecko_config_func_0(struct device *dev) DT_INST_PROP_BY_IDX(1, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void leuart_gecko_config_func_1(struct device *dev); +static void leuart_gecko_config_func_1(const struct device *dev); #endif static const struct leuart_gecko_config leuart_gecko_1_config = { @@ -411,7 +412,7 @@ DEVICE_AND_API_INIT(leuart_1, DT_INST_LABEL(1), &leuart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void leuart_gecko_config_func_1(struct device *dev) +static void leuart_gecko_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(1), DT_INST_IRQ(1, priority), diff --git a/drivers/serial/uart_altera_jtag_hal.c b/drivers/serial/uart_altera_jtag_hal.c index b4bfee8d2b51..a1eebd81b819 100644 --- a/drivers/serial/uart_altera_jtag_hal.c +++ b/drivers/serial/uart_altera_jtag_hal.c @@ -24,7 +24,7 @@ extern int altera_avalon_jtag_uart_read(altera_avalon_jtag_uart_state *sp, extern int altera_avalon_jtag_uart_write(altera_avalon_jtag_uart_state *sp, const char *ptr, int count, int flags); -static void uart_altera_jtag_poll_out(struct device *dev, +static void uart_altera_jtag_poll_out(const struct device *dev, unsigned char c) { const struct uart_device_config *config; @@ -36,7 +36,7 @@ static void uart_altera_jtag_poll_out(struct device *dev, altera_avalon_jtag_uart_write(&ustate, &c, 1, 0); } -static int uart_altera_jtag_init(struct device *dev) +static int uart_altera_jtag_init(const struct device *dev) { /* * Work around to clear interrupt enable bits diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index 235782539f1c..5c8899ebac61 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -40,17 +40,18 @@ struct uart_cc13xx_cc26xx_data { #endif }; -static inline struct uart_cc13xx_cc26xx_data *get_dev_data(struct device *dev) +static inline struct uart_cc13xx_cc26xx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct uart_device_config *get_dev_conf(struct device *dev) +static inline const struct uart_device_config *get_dev_conf(const struct device *dev) { return dev->config_info; } -static int uart_cc13xx_cc26xx_poll_in(struct device *dev, unsigned char *c) +static int uart_cc13xx_cc26xx_poll_in(const struct device *dev, + unsigned char *c) { if (!UARTCharsAvail(get_dev_conf(dev)->regs)) { return -1; @@ -61,7 +62,8 @@ static int uart_cc13xx_cc26xx_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_cc13xx_cc26xx_poll_out(struct device *dev, unsigned char c) +static void uart_cc13xx_cc26xx_poll_out(const struct device *dev, + unsigned char c) { UARTCharPut(get_dev_conf(dev)->regs, c); /* @@ -72,7 +74,7 @@ static void uart_cc13xx_cc26xx_poll_out(struct device *dev, unsigned char c) } } -static int uart_cc13xx_cc26xx_err_check(struct device *dev) +static int uart_cc13xx_cc26xx_err_check(const struct device *dev) { u32_t flags = UARTRxErrorGet(get_dev_conf(dev)->regs); @@ -86,7 +88,7 @@ static int uart_cc13xx_cc26xx_err_check(struct device *dev) return error; } -static int uart_cc13xx_cc26xx_configure(struct device *dev, +static int uart_cc13xx_cc26xx_configure(const struct device *dev, const struct uart_config *cfg) { u32_t line_ctrl = 0; @@ -184,7 +186,7 @@ static int uart_cc13xx_cc26xx_configure(struct device *dev, return 0; } -static int uart_cc13xx_cc26xx_config_get(struct device *dev, +static int uart_cc13xx_cc26xx_config_get(const struct device *dev, struct uart_config *cfg) { *cfg = get_dev_data(dev)->uart_config; @@ -193,7 +195,8 @@ static int uart_cc13xx_cc26xx_config_get(struct device *dev, #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_cc13xx_cc26xx_fifo_fill(struct device *dev, const u8_t *buf, +static int uart_cc13xx_cc26xx_fifo_fill(const struct device *dev, + const u8_t *buf, int len) { int n = 0; @@ -208,7 +211,7 @@ static int uart_cc13xx_cc26xx_fifo_fill(struct device *dev, const u8_t *buf, return n; } -static int uart_cc13xx_cc26xx_fifo_read(struct device *dev, u8_t *buf, +static int uart_cc13xx_cc26xx_fifo_read(const struct device *dev, u8_t *buf, const int len) { int c, n; @@ -225,7 +228,7 @@ static int uart_cc13xx_cc26xx_fifo_read(struct device *dev, u8_t *buf, return n; } -static void uart_cc13xx_cc26xx_irq_tx_enable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_tx_enable(const struct device *dev) { #if defined(CONFIG_SYS_POWER_MANAGEMENT) && \ defined(CONFIG_SYS_POWER_SLEEP_STATES) @@ -248,7 +251,7 @@ static void uart_cc13xx_cc26xx_irq_tx_enable(struct device *dev) UARTIntEnable(get_dev_conf(dev)->regs, UART_INT_TX); } -static void uart_cc13xx_cc26xx_irq_tx_disable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_tx_disable(const struct device *dev) { UARTIntDisable(get_dev_conf(dev)->regs, UART_INT_TX); @@ -261,12 +264,12 @@ static void uart_cc13xx_cc26xx_irq_tx_disable(struct device *dev) #endif } -static int uart_cc13xx_cc26xx_irq_tx_ready(struct device *dev) +static int uart_cc13xx_cc26xx_irq_tx_ready(const struct device *dev) { return UARTSpaceAvail(get_dev_conf(dev)->regs) ? 1 : 0; } -static void uart_cc13xx_cc26xx_irq_rx_enable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_rx_enable(const struct device *dev) { #if defined(CONFIG_SYS_POWER_MANAGEMENT) && \ defined(CONFIG_SYS_POWER_SLEEP_STATES) @@ -284,7 +287,7 @@ static void uart_cc13xx_cc26xx_irq_rx_enable(struct device *dev) UARTIntEnable(get_dev_conf(dev)->regs, UART_INT_RX); } -static void uart_cc13xx_cc26xx_irq_rx_disable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_rx_disable(const struct device *dev) { #if defined(CONFIG_SYS_POWER_MANAGEMENT) && \ defined(CONFIG_SYS_POWER_SLEEP_STATES) @@ -297,45 +300,46 @@ static void uart_cc13xx_cc26xx_irq_rx_disable(struct device *dev) UARTIntDisable(get_dev_conf(dev)->regs, UART_INT_RX); } -static int uart_cc13xx_cc26xx_irq_tx_complete(struct device *dev) +static int uart_cc13xx_cc26xx_irq_tx_complete(const struct device *dev) { return UARTBusy(get_dev_conf(dev)->regs) ? 0 : 1; } -static int uart_cc13xx_cc26xx_irq_rx_ready(struct device *dev) +static int uart_cc13xx_cc26xx_irq_rx_ready(const struct device *dev) { return UARTCharsAvail(get_dev_conf(dev)->regs) ? 1 : 0; } -static void uart_cc13xx_cc26xx_irq_err_enable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_err_enable(const struct device *dev) { return UARTIntEnable(get_dev_conf(dev)->regs, UART_INT_OE | UART_INT_BE | UART_INT_PE | UART_INT_FE); } -static void uart_cc13xx_cc26xx_irq_err_disable(struct device *dev) +static void uart_cc13xx_cc26xx_irq_err_disable(const struct device *dev) { return UARTIntDisable(get_dev_conf(dev)->regs, UART_INT_OE | UART_INT_BE | UART_INT_PE | UART_INT_FE); } -static int uart_cc13xx_cc26xx_irq_is_pending(struct device *dev) +static int uart_cc13xx_cc26xx_irq_is_pending(const struct device *dev) { u32_t status = UARTIntStatus(get_dev_conf(dev)->regs, true); return status & (UART_INT_TX | UART_INT_RX) ? 1 : 0; } -static int uart_cc13xx_cc26xx_irq_update(struct device *dev) +static int uart_cc13xx_cc26xx_irq_update(const struct device *dev) { ARG_UNUSED(dev); return 1; } static void uart_cc13xx_cc26xx_irq_callback_set( - struct device *dev, uart_irq_callback_user_data_t cb, void *user_data) + const struct device *dev, uart_irq_callback_user_data_t cb, + void *user_data) { struct uart_cc13xx_cc26xx_data *data = get_dev_data(dev); @@ -366,7 +370,7 @@ static void uart_cc13xx_cc26xx_isr(void *arg) static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg, uintptr_t clientArg) { - struct device *dev = (struct device *)clientArg; + const struct device *dev = (const struct device *)clientArg; int ret = Power_NOTIFYDONE; s16_t res_id; @@ -396,8 +400,8 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg, #endif #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int uart_cc13xx_cc26xx_set_power_state(struct device *dev, - u32_t new_state) +static int uart_cc13xx_cc26xx_set_power_state(const struct device *dev, + u32_t new_state) { int ret = 0; @@ -441,8 +445,10 @@ static int uart_cc13xx_cc26xx_set_power_state(struct device *dev, return ret; } -static int uart_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) +static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, + u32_t ctrl_command, + void *context, device_pm_cb cb, + void *arg) { int ret = 0; @@ -606,7 +612,7 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = { #endif #define UART_CC13XX_CC26XX_INIT_FUNC(n) \ - static int uart_cc13xx_cc26xx_init_##n(struct device *dev) \ + static int uart_cc13xx_cc26xx_init_##n(const struct device *dev) \ { \ int ret; \ \ diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 4fca76840403..d5d88f99d9f9 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -32,7 +32,7 @@ struct uart_cc32xx_dev_data_t { #define PRIME_CHAR '\r' /* Forward decls: */ -static struct device DEVICE_NAME_GET(uart_cc32xx_0); +DEVICE_DECLARE(uart_cc32xx_0); #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_cc32xx_isr(void *arg); @@ -56,7 +56,7 @@ static struct uart_cc32xx_dev_data_t uart_cc32xx_dev_data_0 = { * Keeping with this assumption, this driver leaves the FIFOs disabled, * and at depth 1. */ -static int uart_cc32xx_init(struct device *dev) +static int uart_cc32xx_init(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -92,7 +92,7 @@ static int uart_cc32xx_init(struct device *dev) return 0; } -static int uart_cc32xx_poll_in(struct device *dev, unsigned char *c) +static int uart_cc32xx_poll_in(const struct device *dev, unsigned char *c) { const struct uart_device_config *config = DEV_CFG(dev); @@ -104,14 +104,14 @@ static int uart_cc32xx_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_cc32xx_poll_out(struct device *dev, unsigned char c) +static void uart_cc32xx_poll_out(const struct device *dev, unsigned char c) { const struct uart_device_config *config = DEV_CFG(dev); MAP_UARTCharPut((unsigned long)config->base, c); } -static int uart_cc32xx_err_check(struct device *dev) +static int uart_cc32xx_err_check(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned long cc32xx_errs = 0L; @@ -133,7 +133,8 @@ static int uart_cc32xx_err_check(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_cc32xx_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_cc32xx_fifo_fill(const struct device *dev, + const u8_t *tx_data, int size) { const struct uart_device_config *config = DEV_CFG(dev); @@ -152,7 +153,7 @@ static int uart_cc32xx_fifo_fill(struct device *dev, const u8_t *tx_data, return (int)num_tx; } -static int uart_cc32xx_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_cc32xx_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { const struct uart_device_config *config = DEV_CFG(dev); @@ -169,21 +170,21 @@ static int uart_cc32xx_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_cc32xx_irq_tx_enable(struct device *dev) +static void uart_cc32xx_irq_tx_enable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); MAP_UARTIntEnable((unsigned long)config->base, UART_INT_TX); } -static void uart_cc32xx_irq_tx_disable(struct device *dev) +static void uart_cc32xx_irq_tx_disable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); MAP_UARTIntDisable((unsigned long)config->base, UART_INT_TX); } -static int uart_cc32xx_irq_tx_ready(struct device *dev) +static int uart_cc32xx_irq_tx_ready(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -193,7 +194,7 @@ static int uart_cc32xx_irq_tx_ready(struct device *dev) return (int_status & UART_INT_TX); } -static void uart_cc32xx_irq_rx_enable(struct device *dev) +static void uart_cc32xx_irq_rx_enable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -201,21 +202,21 @@ static void uart_cc32xx_irq_rx_enable(struct device *dev) MAP_UARTIntEnable((unsigned long)config->base, UART_INT_RX); } -static void uart_cc32xx_irq_rx_disable(struct device *dev) +static void uart_cc32xx_irq_rx_disable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); MAP_UARTIntDisable((unsigned long)config->base, UART_INT_RX); } -static int uart_cc32xx_irq_tx_complete(struct device *dev) +static int uart_cc32xx_irq_tx_complete(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); return (!MAP_UARTBusy((unsigned long)config->base)); } -static int uart_cc32xx_irq_rx_ready(struct device *dev) +static int uart_cc32xx_irq_rx_ready(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -225,17 +226,17 @@ static int uart_cc32xx_irq_rx_ready(struct device *dev) return (int_status & UART_INT_RX); } -static void uart_cc32xx_irq_err_enable(struct device *dev) +static void uart_cc32xx_irq_err_enable(const struct device *dev) { /* Not yet used in zephyr */ } -static void uart_cc32xx_irq_err_disable(struct device *dev) +static void uart_cc32xx_irq_err_disable(const struct device *dev) { /* Not yet used in zephyr */ } -static int uart_cc32xx_irq_is_pending(struct device *dev) +static int uart_cc32xx_irq_is_pending(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -245,12 +246,12 @@ static int uart_cc32xx_irq_is_pending(struct device *dev) return (int_status & (UART_INT_TX | UART_INT_RX)); } -static int uart_cc32xx_irq_update(struct device *dev) +static int uart_cc32xx_irq_update(const struct device *dev) { return 1; } -static void uart_cc32xx_irq_callback_set(struct device *dev, +static void uart_cc32xx_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -274,7 +275,7 @@ static void uart_cc32xx_irq_callback_set(struct device *dev, */ static void uart_cc32xx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct uart_device_config *config = DEV_CFG(dev); struct uart_cc32xx_dev_data_t * const dev_data = DEV_DATA(dev); diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c index dc297ffa7c08..3ebb6d5b82ca 100644 --- a/drivers/serial/uart_cmsdk_apb.c +++ b/drivers/serial/uart_cmsdk_apb.c @@ -95,7 +95,7 @@ static void uart_cmsdk_apb_isr(void *arg); * * @return N/A */ -static void baudrate_set(struct device *dev) +static void baudrate_set(const struct device *dev) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); const struct uart_device_config * const dev_cfg = DEV_CFG(dev); @@ -121,7 +121,7 @@ static void baudrate_set(struct device *dev) * * @return 0 */ -static int uart_cmsdk_apb_init(struct device *dev) +static int uart_cmsdk_apb_init(const struct device *dev) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); #ifdef CONFIG_UART_INTERRUPT_DRIVEN @@ -130,7 +130,7 @@ static int uart_cmsdk_apb_init(struct device *dev) #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ - struct device *clk = + const struct device *clk = device_get_binding(CONFIG_ARM_CLOCK_CONTROL_DEV_NAME); struct uart_cmsdk_apb_dev_data * const data = DEV_DATA(dev); @@ -164,7 +164,7 @@ static int uart_cmsdk_apb_init(struct device *dev) * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_cmsdk_apb_poll_in(struct device *dev, unsigned char *c) +static int uart_cmsdk_apb_poll_in(const struct device *dev, unsigned char *c) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); @@ -188,7 +188,7 @@ static int uart_cmsdk_apb_poll_in(struct device *dev, unsigned char *c) * @param dev UART device struct * @param c Character to send */ -static void uart_cmsdk_apb_poll_out(struct device *dev, +static void uart_cmsdk_apb_poll_out(const struct device *dev, unsigned char c) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); @@ -212,7 +212,7 @@ static void uart_cmsdk_apb_poll_out(struct device *dev, * * @return the number of characters that have been read */ -static int uart_cmsdk_apb_fifo_fill(struct device *dev, +static int uart_cmsdk_apb_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); @@ -235,7 +235,7 @@ static int uart_cmsdk_apb_fifo_fill(struct device *dev, * * @return the number of characters that have been read */ -static int uart_cmsdk_apb_fifo_read(struct device *dev, +static int uart_cmsdk_apb_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); @@ -256,7 +256,7 @@ static int uart_cmsdk_apb_fifo_read(struct device *dev, * * @return N/A */ -static void uart_cmsdk_apb_irq_tx_enable(struct device *dev) +static void uart_cmsdk_apb_irq_tx_enable(const struct device *dev) { unsigned int key; @@ -268,7 +268,7 @@ static void uart_cmsdk_apb_irq_tx_enable(struct device *dev) * processing going. */ key = irq_lock(); - uart_cmsdk_apb_isr(dev); + uart_cmsdk_apb_isr((void *)dev); irq_unlock(key); } @@ -279,7 +279,7 @@ static void uart_cmsdk_apb_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_tx_disable(struct device *dev) +static void uart_cmsdk_apb_irq_tx_disable(const struct device *dev) { UART_STRUCT(dev)->ctrl &= ~UART_TX_IN_EN; } @@ -291,7 +291,7 @@ static void uart_cmsdk_apb_irq_tx_disable(struct device *dev) * * @return 1 if an interrupt is ready, 0 otherwise */ -static int uart_cmsdk_apb_irq_tx_ready(struct device *dev) +static int uart_cmsdk_apb_irq_tx_ready(const struct device *dev) { return !(UART_STRUCT(dev)->state & UART_TX_BF); } @@ -303,7 +303,7 @@ static int uart_cmsdk_apb_irq_tx_ready(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_rx_enable(struct device *dev) +static void uart_cmsdk_apb_irq_rx_enable(const struct device *dev) { UART_STRUCT(dev)->ctrl |= UART_RX_IN_EN; } @@ -315,7 +315,7 @@ static void uart_cmsdk_apb_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_rx_disable(struct device *dev) +static void uart_cmsdk_apb_irq_rx_disable(const struct device *dev) { UART_STRUCT(dev)->ctrl &= ~UART_RX_IN_EN; } @@ -327,7 +327,7 @@ static void uart_cmsdk_apb_irq_rx_disable(struct device *dev) * * @return 1 if an interrupt is ready, 0 otherwise */ -static int uart_cmsdk_apb_irq_tx_complete(struct device *dev) +static int uart_cmsdk_apb_irq_tx_complete(const struct device *dev) { return uart_cmsdk_apb_irq_tx_ready(dev); } @@ -339,7 +339,7 @@ static int uart_cmsdk_apb_irq_tx_complete(struct device *dev) * * @return 1 if an interrupt is ready, 0 otherwise */ -static int uart_cmsdk_apb_irq_rx_ready(struct device *dev) +static int uart_cmsdk_apb_irq_rx_ready(const struct device *dev) { return UART_STRUCT(dev)->state & UART_RX_BF; } @@ -351,7 +351,7 @@ static int uart_cmsdk_apb_irq_rx_ready(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_err_enable(struct device *dev) +static void uart_cmsdk_apb_irq_err_enable(const struct device *dev) { ARG_UNUSED(dev); } @@ -363,7 +363,7 @@ static void uart_cmsdk_apb_irq_err_enable(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_err_disable(struct device *dev) +static void uart_cmsdk_apb_irq_err_disable(const struct device *dev) { ARG_UNUSED(dev); } @@ -375,7 +375,7 @@ static void uart_cmsdk_apb_irq_err_disable(struct device *dev) * * @return 1 if Tx or Rx interrupt is pending, 0 otherwise */ -static int uart_cmsdk_apb_irq_is_pending(struct device *dev) +static int uart_cmsdk_apb_irq_is_pending(const struct device *dev) { /* Return true if rx buffer full or tx buffer empty */ return (UART_STRUCT(dev)->state & (UART_RX_BF | UART_TX_BF)) @@ -389,7 +389,7 @@ static int uart_cmsdk_apb_irq_is_pending(struct device *dev) * * @return always 1 */ -static int uart_cmsdk_apb_irq_update(struct device *dev) +static int uart_cmsdk_apb_irq_update(const struct device *dev) { return 1; } @@ -402,7 +402,7 @@ static int uart_cmsdk_apb_irq_update(struct device *dev) * * @return N/A */ -static void uart_cmsdk_apb_irq_callback_set(struct device *dev, +static void uart_cmsdk_apb_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -421,7 +421,7 @@ static void uart_cmsdk_apb_irq_callback_set(struct device *dev, */ void uart_cmsdk_apb_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev); struct uart_cmsdk_apb_dev_data *data = DEV_DATA(dev); @@ -461,7 +461,7 @@ static const struct uart_driver_api uart_cmsdk_apb_driver_api = { #if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_cmsdk_apb_irq_config_func_0(struct device *dev); +static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_0 = { @@ -492,7 +492,7 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_0, #ifdef CONFIG_UART_INTERRUPT_DRIVEN #if DT_INST_IRQ_HAS_CELL(0, irq) -static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), @@ -502,7 +502,7 @@ static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) irq_enable(DT_INST_IRQN(0)); } #else -static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, tx, irq), DT_INST_IRQ_BY_NAME(0, tx, priority), @@ -526,7 +526,7 @@ static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) #if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_cmsdk_apb_irq_config_func_1(struct device *dev); +static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_1 = { @@ -557,7 +557,7 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_1, #ifdef CONFIG_UART_INTERRUPT_DRIVEN #if DT_INST_IRQ_HAS_CELL(1, irq) -static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(1), DT_INST_IRQ(1, priority), @@ -567,7 +567,7 @@ static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) irq_enable(DT_INST_IRQN(1)); } #else -static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(1, tx, irq), DT_INST_IRQ_BY_NAME(1, tx, priority), @@ -591,7 +591,7 @@ static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) #if DT_NODE_HAS_STATUS(DT_DRV_INST(2), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_cmsdk_apb_irq_config_func_2(struct device *dev); +static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_2 = { @@ -622,7 +622,7 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_2, #ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CMSDK_APB_UART_2_IRQ -static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev) { IRQ_CONNECT(CMSDK_APB_UART_2_IRQ, DT_INST_IRQ_BY_NAME(2, priority, irq), @@ -632,7 +632,7 @@ static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) irq_enable(CMSDK_APB_UART_2_IRQ); } #else -static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_2(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(2, tx, irq), DT_INST_IRQ_BY_NAME(2, tx, priority), @@ -656,7 +656,7 @@ static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) #if DT_NODE_HAS_STATUS(DT_DRV_INST(3), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_cmsdk_apb_irq_config_func_3(struct device *dev); +static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_3 = { @@ -687,7 +687,7 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_3, #ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CMSDK_APB_UART_3_IRQ -static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev) { IRQ_CONNECT(CMSDK_APB_UART_3_IRQ, DT_INST_IRQ_BY_NAME(3, priority, irq), @@ -697,7 +697,7 @@ static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) irq_enable(CMSDK_APB_UART_3_IRQ); } #else -static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_3(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(3, tx, irq), DT_INST_IRQ_BY_NAME(3, tx, priority), @@ -721,7 +721,7 @@ static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) #if DT_NODE_HAS_STATUS(DT_DRV_INST(4), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_cmsdk_apb_irq_config_func_4(struct device *dev); +static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_4 = { @@ -752,7 +752,7 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_4, #ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CMSDK_APB_UART_4_IRQ -static void uart_cmsdk_apb_irq_config_func_4(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev) { IRQ_CONNECT(CMSDK_APB_UART_4_IRQ, DT_INST_IRQ_BY_NAME(4, priority, irq), @@ -762,7 +762,7 @@ static void uart_cmsdk_apb_irq_config_func_4(struct device *dev) irq_enable(CMSDK_APB_UART_4_IRQ); } #else -static void uart_cmsdk_apb_irq_config_func_4(struct device *dev) +static void uart_cmsdk_apb_irq_config_func_4(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(4, tx, irq), DT_INST_IRQ_BY_NAME(4, tx, priority), diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c index 08822b0d3148..1f48daf26d01 100644 --- a/drivers/serial/uart_esp32.c +++ b/drivers/serial/uart_esp32.c @@ -127,7 +127,7 @@ struct uart_esp32_data { #define DPORT_UART0_CLK_EN DPORT_UART_CLK_EN #define DPORT_UART0_RST DPORT_UART_RST -static int uart_esp32_poll_in(struct device *dev, unsigned char *p_char) +static int uart_esp32_poll_in(const struct device *dev, unsigned char *p_char) { if (UART_RXFIFO_COUNT(DEV_BASE(dev)->status) == 0) { @@ -138,7 +138,7 @@ static int uart_esp32_poll_in(struct device *dev, unsigned char *p_char) return 0; } -static void uart_esp32_poll_out(struct device *dev, +static void uart_esp32_poll_out(const struct device *dev, unsigned char c) { /* Wait for space in FIFO */ @@ -150,7 +150,7 @@ static void uart_esp32_poll_out(struct device *dev, DEV_BASE(dev)->fifo = (u32_t)c; } -static int uart_esp32_err_check(struct device *dev) +static int uart_esp32_err_check(const struct device *dev) { u32_t err = UART_GET_PARITY_ERR(DEV_BASE(dev)->int_st) | UART_GET_FRAME_ERR(DEV_BASE(dev)->int_st); @@ -158,7 +158,8 @@ static int uart_esp32_err_check(struct device *dev) return err; } -static int uart_esp32_config_get(struct device *dev, struct uart_config *cfg) +static int uart_esp32_config_get(const struct device *dev, + struct uart_config *cfg) { struct uart_esp32_data *data = DEV_DATA(dev); @@ -183,7 +184,7 @@ static int uart_esp32_config_get(struct device *dev, struct uart_config *cfg) return 0; } -static int uart_esp32_set_baudrate(struct device *dev, int baudrate) +static int uart_esp32_set_baudrate(const struct device *dev, int baudrate) { u32_t sys_clk_freq = DEV_CFG(dev)->dev_conf.sys_clk_freq; u32_t clk_div = (((sys_clk_freq) << 4) / baudrate); @@ -200,7 +201,7 @@ static int uart_esp32_set_baudrate(struct device *dev, int baudrate) return 1; } -static int uart_esp32_configure_pins(struct device *dev) +static int uart_esp32_configure_pins(const struct device *dev) { const struct uart_esp32_config *const cfg = DEV_CFG(dev); @@ -229,7 +230,7 @@ static int uart_esp32_configure_pins(struct device *dev) return 0; } -static int uart_esp32_configure(struct device *dev, +static int uart_esp32_configure(const struct device *dev, const struct uart_config *cfg) { u32_t conf0 = UART_TICK_REF_ALWAYS_ON; @@ -303,7 +304,7 @@ static int uart_esp32_configure(struct device *dev, return 0; } -static int uart_esp32_init(struct device *dev) +static int uart_esp32_init(const struct device *dev) { uart_esp32_configure(dev, &DEV_DATA(dev)->uart_config); @@ -316,7 +317,7 @@ static int uart_esp32_init(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_esp32_fifo_fill(struct device *dev, +static int uart_esp32_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { u8_t num_tx = 0U; @@ -329,7 +330,7 @@ static int uart_esp32_fifo_fill(struct device *dev, return num_tx; } -static int uart_esp32_fifo_read(struct device *dev, +static int uart_esp32_fifo_read(const struct device *dev, u8_t *rx_data, const int len) { u8_t num_rx = 0U; @@ -342,63 +343,63 @@ static int uart_esp32_fifo_read(struct device *dev, return num_rx; } -static void uart_esp32_irq_tx_enable(struct device *dev) +static void uart_esp32_irq_tx_enable(const struct device *dev) { DEV_BASE(dev)->int_clr |= UART_TXFIFO_EMPTY_INT_ENA; DEV_BASE(dev)->int_ena |= UART_TXFIFO_EMPTY_INT_ENA; } -static void uart_esp32_irq_tx_disable(struct device *dev) +static void uart_esp32_irq_tx_disable(const struct device *dev) { DEV_BASE(dev)->int_ena &= ~(UART_TXFIFO_EMPTY_INT_ENA); } -static int uart_esp32_irq_tx_ready(struct device *dev) +static int uart_esp32_irq_tx_ready(const struct device *dev) { return (UART_TXFIFO_COUNT(DEV_BASE(dev)->status) < UART_FIFO_LIMIT); } -static void uart_esp32_irq_rx_enable(struct device *dev) +static void uart_esp32_irq_rx_enable(const struct device *dev) { DEV_BASE(dev)->int_clr |= UART_RXFIFO_FULL_INT_ENA; DEV_BASE(dev)->int_ena |= UART_RXFIFO_FULL_INT_ENA; } -static void uart_esp32_irq_rx_disable(struct device *dev) +static void uart_esp32_irq_rx_disable(const struct device *dev) { DEV_BASE(dev)->int_ena &= ~(UART_RXFIFO_FULL_INT_ENA); } -static int uart_esp32_irq_tx_complete(struct device *dev) +static int uart_esp32_irq_tx_complete(const struct device *dev) { /* check if TX FIFO is empty */ return (UART_TXFIFO_COUNT(DEV_BASE(dev)->status) == 0 ? 1 : 0); } -static int uart_esp32_irq_rx_ready(struct device *dev) +static int uart_esp32_irq_rx_ready(const struct device *dev) { return (UART_RXFIFO_COUNT(DEV_BASE(dev)->status) > 0); } -static void uart_esp32_irq_err_enable(struct device *dev) +static void uart_esp32_irq_err_enable(const struct device *dev) { /* enable framing, parity */ DEV_BASE(dev)->int_ena |= UART_FRM_ERR_INT_ENA | UART_PARITY_ERR_INT_ENA; } -static void uart_esp32_irq_err_disable(struct device *dev) +static void uart_esp32_irq_err_disable(const struct device *dev) { DEV_BASE(dev)->int_ena &= ~(UART_FRM_ERR_INT_ENA); DEV_BASE(dev)->int_ena &= ~(UART_PARITY_ERR_INT_ENA); } -static int uart_esp32_irq_is_pending(struct device *dev) +static int uart_esp32_irq_is_pending(const struct device *dev) { return uart_esp32_irq_rx_ready(dev) || uart_esp32_irq_tx_ready(dev); } -static int uart_esp32_irq_update(struct device *dev) +static int uart_esp32_irq_update(const struct device *dev) { DEV_BASE(dev)->int_clr |= UART_RXFIFO_FULL_INT_ENA; DEV_BASE(dev)->int_clr |= UART_TXFIFO_EMPTY_INT_ENA; @@ -406,7 +407,7 @@ static int uart_esp32_irq_update(struct device *dev) return 1; } -static void uart_esp32_irq_callback_set(struct device *dev, +static void uart_esp32_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -416,7 +417,7 @@ static void uart_esp32_irq_callback_set(struct device *dev, void uart_esp32_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_esp32_data *data = DEV_DATA(dev); /* Verify if the callback has been registered */ @@ -454,13 +455,13 @@ static const struct uart_driver_api uart_esp32_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define ESP32_UART_IRQ_HANDLER_DECL(idx) \ - static void uart_esp32_irq_config_func_##idx(struct device *dev) + static void uart_esp32_irq_config_func_##idx(const struct device *dev) #define ESP32_UART_IRQ_HANDLER_FUNC(idx) \ .irq_config_func = uart_esp32_irq_config_func_##idx, #define ESP32_UART_IRQ_HANDLER(idx) \ - static void uart_esp32_irq_config_func_##idx(struct device *dev) \ + static void uart_esp32_irq_config_func_##idx(const struct device *dev) \ { \ esp32_rom_intr_matrix_set(0, ETS_UART##idx##_INTR_SOURCE, \ INST_##idx##_ESPRESSIF_ESP32_UART_IRQ_0); \ diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c index 1dd8e8949bb7..1b790cf60028 100644 --- a/drivers/serial/uart_gecko.c +++ b/drivers/serial/uart_gecko.c @@ -23,7 +23,7 @@ struct uart_gecko_config { CMU_Clock_TypeDef clock; u32_t baud_rate; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif struct soc_gpio_pin pin_rx; struct soc_gpio_pin pin_tx; @@ -42,7 +42,7 @@ struct uart_gecko_data { #endif }; -static int uart_gecko_poll_in(struct device *dev, unsigned char *c) +static int uart_gecko_poll_in(const struct device *dev, unsigned char *c) { const struct uart_gecko_config *config = dev->config_info; u32_t flags = USART_StatusGet(config->base); @@ -55,14 +55,14 @@ static int uart_gecko_poll_in(struct device *dev, unsigned char *c) return -1; } -static void uart_gecko_poll_out(struct device *dev, unsigned char c) +static void uart_gecko_poll_out(const struct device *dev, unsigned char c) { const struct uart_gecko_config *config = dev->config_info; USART_Tx(config->base, c); } -static int uart_gecko_err_check(struct device *dev) +static int uart_gecko_err_check(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t flags = USART_IntGet(config->base); @@ -88,8 +88,8 @@ static int uart_gecko_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data, - int len) +static int uart_gecko_fifo_fill(const struct device *dev, const u8_t *tx_data, + int len) { const struct uart_gecko_config *config = dev->config_info; u8_t num_tx = 0U; @@ -103,8 +103,8 @@ static int uart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int uart_gecko_fifo_read(struct device *dev, u8_t *rx_data, - const int len) +static int uart_gecko_fifo_read(const struct device *dev, u8_t *rx_data, + const int len) { const struct uart_gecko_config *config = dev->config_info; u8_t num_rx = 0U; @@ -118,7 +118,7 @@ static int uart_gecko_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_gecko_irq_tx_enable(struct device *dev) +static void uart_gecko_irq_tx_enable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t mask = USART_IEN_TXBL | USART_IEN_TXC; @@ -126,7 +126,7 @@ static void uart_gecko_irq_tx_enable(struct device *dev) USART_IntEnable(config->base, mask); } -static void uart_gecko_irq_tx_disable(struct device *dev) +static void uart_gecko_irq_tx_disable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t mask = USART_IEN_TXBL | USART_IEN_TXC; @@ -134,7 +134,7 @@ static void uart_gecko_irq_tx_disable(struct device *dev) USART_IntDisable(config->base, mask); } -static int uart_gecko_irq_tx_complete(struct device *dev) +static int uart_gecko_irq_tx_complete(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t flags = USART_IntGet(config->base); @@ -144,7 +144,7 @@ static int uart_gecko_irq_tx_complete(struct device *dev) return (flags & USART_IF_TXC) != 0U; } -static int uart_gecko_irq_tx_ready(struct device *dev) +static int uart_gecko_irq_tx_ready(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t flags = USART_IntGet(config->base); @@ -152,7 +152,7 @@ static int uart_gecko_irq_tx_ready(struct device *dev) return (flags & USART_IF_TXBL) != 0U; } -static void uart_gecko_irq_rx_enable(struct device *dev) +static void uart_gecko_irq_rx_enable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t mask = USART_IEN_RXDATAV; @@ -160,7 +160,7 @@ static void uart_gecko_irq_rx_enable(struct device *dev) USART_IntEnable(config->base, mask); } -static void uart_gecko_irq_rx_disable(struct device *dev) +static void uart_gecko_irq_rx_disable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t mask = USART_IEN_RXDATAV; @@ -168,7 +168,7 @@ static void uart_gecko_irq_rx_disable(struct device *dev) USART_IntDisable(config->base, mask); } -static int uart_gecko_irq_rx_full(struct device *dev) +static int uart_gecko_irq_rx_full(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t flags = USART_IntGet(config->base); @@ -176,7 +176,7 @@ static int uart_gecko_irq_rx_full(struct device *dev) return (flags & USART_IF_RXDATAV) != 0U; } -static int uart_gecko_irq_rx_ready(struct device *dev) +static int uart_gecko_irq_rx_ready(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; u32_t mask = USART_IEN_RXDATAV; @@ -185,7 +185,7 @@ static int uart_gecko_irq_rx_ready(struct device *dev) && uart_gecko_irq_rx_full(dev); } -static void uart_gecko_irq_err_enable(struct device *dev) +static void uart_gecko_irq_err_enable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; @@ -194,7 +194,7 @@ static void uart_gecko_irq_err_enable(struct device *dev) USART_IF_FERR); } -static void uart_gecko_irq_err_disable(struct device *dev) +static void uart_gecko_irq_err_disable(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; @@ -203,19 +203,19 @@ static void uart_gecko_irq_err_disable(struct device *dev) USART_IF_FERR); } -static int uart_gecko_irq_is_pending(struct device *dev) +static int uart_gecko_irq_is_pending(const struct device *dev) { return uart_gecko_irq_tx_ready(dev) || uart_gecko_irq_rx_ready(dev); } -static int uart_gecko_irq_update(struct device *dev) +static int uart_gecko_irq_update(const struct device *dev) { return 1; } -static void uart_gecko_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void uart_gecko_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct uart_gecko_data *data = dev->driver_data; @@ -225,7 +225,7 @@ static void uart_gecko_irq_callback_set(struct device *dev, static void uart_gecko_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_gecko_data *data = dev->driver_data; if (data->callback) { @@ -234,7 +234,7 @@ static void uart_gecko_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static void uart_gecko_init_pins(struct device *dev) +static void uart_gecko_init_pins(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; @@ -252,7 +252,7 @@ static void uart_gecko_init_pins(struct device *dev) #endif } -static int uart_gecko_init(struct device *dev) +static int uart_gecko_init(const struct device *dev) { const struct uart_gecko_config *config = dev->config_info; USART_InitAsync_TypeDef usartInit = USART_INITASYNC_DEFAULT; @@ -311,7 +311,7 @@ static const struct uart_driver_api uart_gecko_driver_api = { DT_INST_PROP_BY_IDX(0, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_gecko_config_func_0(struct device *dev); +static void uart_gecko_config_func_0(const struct device *dev); #endif static const struct uart_gecko_config uart_gecko_0_config = { @@ -342,7 +342,7 @@ DEVICE_AND_API_INIT(uart_0, DT_INST_LABEL(0), &uart_gecko_init, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_gecko_config_func_0(struct device *dev) +static void uart_gecko_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, rx, irq), DT_INST_IRQ_BY_NAME(0, rx, priority), uart_gecko_isr, @@ -366,7 +366,7 @@ static void uart_gecko_config_func_0(struct device *dev) DT_INST_PROP_BY_IDX(1, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_gecko_config_func_1(struct device *dev); +static void uart_gecko_config_func_1(const struct device *dev); #endif static const struct uart_gecko_config uart_gecko_1_config = { @@ -397,7 +397,7 @@ DEVICE_AND_API_INIT(uart_1, DT_INST_LABEL(1), &uart_gecko_init, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_gecko_config_func_1(struct device *dev) +static void uart_gecko_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(1, rx, irq), DT_INST_IRQ_BY_NAME(1, rx, priority), uart_gecko_isr, @@ -424,7 +424,7 @@ static void uart_gecko_config_func_1(struct device *dev) DT_INST_PROP_BY_IDX(0, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_0(struct device *dev); +static void usart_gecko_config_func_0(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_0_config = { @@ -456,7 +456,7 @@ DEVICE_AND_API_INIT(usart_0, DT_INST_LABEL(0), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_0(struct device *dev) +static void usart_gecko_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(0, rx, irq), DT_INST_IRQ_BY_NAME(0, rx, priority), @@ -480,7 +480,7 @@ static void usart_gecko_config_func_0(struct device *dev) DT_INST_PROP_BY_IDX(1, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_1(struct device *dev); +static void usart_gecko_config_func_1(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_1_config = { @@ -512,7 +512,7 @@ DEVICE_AND_API_INIT(usart_1, DT_INST_LABEL(1), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_1(struct device *dev) +static void usart_gecko_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(1, rx, irq), DT_INST_IRQ_BY_NAME(1, rx, priority), @@ -536,7 +536,7 @@ static void usart_gecko_config_func_1(struct device *dev) DT_INST_PROP_BY_IDX(2, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_2(struct device *dev); +static void usart_gecko_config_func_2(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_2_config = { @@ -568,7 +568,7 @@ DEVICE_AND_API_INIT(usart_2, DT_INST_LABEL(2), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_2(struct device *dev) +static void usart_gecko_config_func_2(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(2, rx, irq), DT_INST_IRQ_BY_NAME(2, rx, priority), @@ -592,7 +592,7 @@ static void usart_gecko_config_func_2(struct device *dev) DT_INST_PROP_BY_IDX(3, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_3(struct device *dev); +static void usart_gecko_config_func_3(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_3_config = { @@ -624,7 +624,7 @@ DEVICE_AND_API_INIT(usart_3, DT_INST_LABEL(3), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_3(struct device *dev) +static void usart_gecko_config_func_3(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(3, rx, irq), DT_INST_IRQ_BY_NAME(3, rx, priority), @@ -648,7 +648,7 @@ static void usart_gecko_config_func_3(struct device *dev) DT_INST_PROP_BY_IDX(4, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_4(struct device *dev); +static void usart_gecko_config_func_4(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_4_config = { @@ -680,7 +680,7 @@ DEVICE_AND_API_INIT(usart_4, DT_INST_LABEL(4), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_4(struct device *dev) +static void usart_gecko_config_func_4(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(4, rx, irq), DT_INST_IRQ_BY_NAME(4, rx, priority), @@ -704,7 +704,7 @@ static void usart_gecko_config_func_4(struct device *dev) DT_INST_PROP_BY_IDX(5, location_tx, 2), gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_5(struct device *dev); +static void usart_gecko_config_func_5(const struct device *dev); #endif static const struct uart_gecko_config usart_gecko_5_config = { @@ -736,7 +736,7 @@ DEVICE_AND_API_INIT(usart_5, DT_INST_LABEL(5), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void usart_gecko_config_func_5(struct device *dev) +static void usart_gecko_config_func_5(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQ_BY_NAME(5, rx, irq), DT_INST_IRQ_BY_NAME(5, rx, priority), diff --git a/drivers/serial/uart_handlers.c b/drivers/serial/uart_handlers.c index 6c100dd4a7ce..7137b735a59a 100644 --- a/drivers/serial/uart_handlers.c +++ b/drivers/serial/uart_handlers.c @@ -8,14 +8,14 @@ #include #define UART_SIMPLE(op_) \ - static inline int z_vrfy_uart_##op_(struct device *dev) \ + static inline int z_vrfy_uart_##op_(const struct device *dev) \ { \ Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, op_)); \ return z_impl_uart_ ## op_(dev); \ } #define UART_SIMPLE_VOID(op_) \ - static inline void z_vrfy_uart_##op_(struct device *dev) \ + static inline void z_vrfy_uart_##op_(const struct device *dev) \ { \ Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, op_)); \ z_impl_uart_ ## op_(dev); \ @@ -24,7 +24,7 @@ UART_SIMPLE(err_check) #include -static inline int z_vrfy_uart_poll_in(struct device *dev, +static inline int z_vrfy_uart_poll_in(const struct device *dev, unsigned char *p_char) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, poll_in)); @@ -33,16 +33,16 @@ static inline int z_vrfy_uart_poll_in(struct device *dev, } #include -static inline void z_vrfy_uart_poll_out(struct device *dev, +static inline void z_vrfy_uart_poll_out(const struct device *dev, unsigned char out_char) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, poll_out)); - z_impl_uart_poll_out((struct device *)dev, out_char); + z_impl_uart_poll_out((const struct device *)dev, out_char); } #include -static inline int z_vrfy_uart_config_get(struct device *dev, - struct uart_config *cfg) +static inline int z_vrfy_uart_config_get(const struct device *dev, + struct uart_config *cfg) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, config_get)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(cfg, sizeof(struct uart_config))); @@ -51,8 +51,8 @@ static inline int z_vrfy_uart_config_get(struct device *dev, } #include -static inline int z_vrfy_uart_configure(struct device *dev, - const struct uart_config *cfg) +static inline int z_vrfy_uart_configure(const struct device *dev, + const struct uart_config *cfg) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, config_get)); Z_OOPS(Z_SYSCALL_MEMORY_READ(cfg, sizeof(struct uart_config))); @@ -68,7 +68,7 @@ static inline int z_vrfy_uart_configure(struct device *dev, * rx_buf_rsp() excluded as it's designed to be called from ISR callbacks */ -static inline int z_vrfy_uart_tx(struct device *dev, const u8_t *buf, +static inline int z_vrfy_uart_tx(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, tx)); @@ -80,7 +80,7 @@ static inline int z_vrfy_uart_tx(struct device *dev, const u8_t *buf, UART_SIMPLE(tx_abort); #include -static inline int z_vrfy_uart_rx_enable(struct device *dev, u8_t *buf, +static inline int z_vrfy_uart_rx_enable(const struct device *dev, u8_t *buf, size_t len, s32_t timeout) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, rx_enable)); @@ -113,30 +113,32 @@ UART_SIMPLE(irq_update) #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ #ifdef CONFIG_UART_LINE_CTRL -static inline int z_vrfy_uart_line_ctrl_set(struct device *dev, +static inline int z_vrfy_uart_line_ctrl_set(const struct device *dev, u32_t ctrl, u32_t val) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, line_ctrl_set)); - return z_impl_uart_line_ctrl_set((struct device *)dev, ctrl, val); + return z_impl_uart_line_ctrl_set((const struct device *)dev, ctrl, + val); } #include -static inline int z_vrfy_uart_line_ctrl_get(struct device *dev, +static inline int z_vrfy_uart_line_ctrl_get(const struct device *dev, u32_t ctrl, u32_t *val) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, line_ctrl_get)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(val, sizeof(u32_t))); - return z_impl_uart_line_ctrl_get((struct device *)dev, ctrl, - (u32_t *)val); + return z_impl_uart_line_ctrl_get((const struct device *)dev, ctrl, + (u32_t *)val); } #include #endif /* CONFIG_UART_LINE_CTRL */ #ifdef CONFIG_UART_DRV_CMD -static inline int z_vrfy_uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p) +static inline int z_vrfy_uart_drv_cmd(const struct device *dev, u32_t cmd, + u32_t p) { Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, drv_cmd)); - return z_impl_uart_drv_cmd((struct device *)dev, cmd, p); + return z_impl_uart_drv_cmd((const struct device *)dev, cmd, p); } #include #endif /* CONFIG_UART_DRV_CMD */ diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c index 7263565b2182..70fca318633e 100644 --- a/drivers/serial/uart_imx.c +++ b/drivers/serial/uart_imx.c @@ -31,7 +31,7 @@ struct imx_uart_config { u32_t baud_rate; u8_t modem_mode; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -52,7 +52,7 @@ struct imx_uart_data { * * @return 0 */ -static int uart_imx_init(struct device *dev) +static int uart_imx_init(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); const struct imx_uart_config *config = dev->config_info; @@ -95,7 +95,7 @@ static int uart_imx_init(struct device *dev) return 0; } -static void uart_imx_poll_out(struct device *dev, unsigned char c) +static void uart_imx_poll_out(const struct device *dev, unsigned char c) { UART_Type *uart = UART_STRUCT(dev); @@ -104,7 +104,7 @@ static void uart_imx_poll_out(struct device *dev, unsigned char c) UART_Putchar(uart, c); } -static int uart_imx_poll_in(struct device *dev, unsigned char *c) +static int uart_imx_poll_in(const struct device *dev, unsigned char *c) { UART_Type *uart = UART_STRUCT(dev); @@ -121,7 +121,7 @@ static int uart_imx_poll_in(struct device *dev, unsigned char *c) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_imx_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_imx_fifo_fill(const struct device *dev, const u8_t *tx_data, int size) { UART_Type *uart = UART_STRUCT(dev); @@ -137,7 +137,7 @@ static int uart_imx_fifo_fill(struct device *dev, const u8_t *tx_data, return (int)num_tx; } -static int uart_imx_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_imx_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { UART_Type *uart = UART_STRUCT(dev); @@ -156,49 +156,49 @@ static int uart_imx_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_imx_irq_tx_enable(struct device *dev) +static void uart_imx_irq_tx_enable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); UART_SetIntCmd(uart, uartIntTxReady, true); } -static void uart_imx_irq_tx_disable(struct device *dev) +static void uart_imx_irq_tx_disable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); UART_SetIntCmd(uart, uartIntTxReady, false); } -static int uart_imx_irq_tx_ready(struct device *dev) +static int uart_imx_irq_tx_ready(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); return UART_GetStatusFlag(uart, uartStatusTxReady); } -static void uart_imx_irq_rx_enable(struct device *dev) +static void uart_imx_irq_rx_enable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); UART_SetIntCmd(uart, uartIntRxReady, true); } -static void uart_imx_irq_rx_disable(struct device *dev) +static void uart_imx_irq_rx_disable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); UART_SetIntCmd(uart, uartIntRxReady, false); } -static int uart_imx_irq_rx_ready(struct device *dev) +static int uart_imx_irq_rx_ready(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); return UART_GetStatusFlag(uart, uartStatusRxReady); } -static void uart_imx_irq_err_enable(struct device *dev) +static void uart_imx_irq_err_enable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); @@ -206,7 +206,7 @@ static void uart_imx_irq_err_enable(struct device *dev) UART_SetIntCmd(uart, uartIntFrameError, true); } -static void uart_imx_irq_err_disable(struct device *dev) +static void uart_imx_irq_err_disable(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); @@ -214,7 +214,7 @@ static void uart_imx_irq_err_disable(struct device *dev) UART_SetIntCmd(uart, uartIntFrameError, false); } -static int uart_imx_irq_is_pending(struct device *dev) +static int uart_imx_irq_is_pending(const struct device *dev) { UART_Type *uart = UART_STRUCT(dev); @@ -222,14 +222,14 @@ static int uart_imx_irq_is_pending(struct device *dev) UART_GetStatusFlag(uart, uartStatusTxReady); } -static int uart_imx_irq_update(struct device *dev) +static int uart_imx_irq_update(const struct device *dev) { return 1; } -static void uart_imx_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void uart_imx_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct imx_uart_data *data = dev->driver_data; @@ -251,7 +251,7 @@ static void uart_imx_irq_callback_set(struct device *dev, */ void uart_imx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct imx_uart_data *data = dev->driver_data; if (data->callback) { @@ -292,7 +292,7 @@ static const struct uart_driver_api uart_imx_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define UART_IMX_CONFIG_FUNC(n) \ - static void irq_config_func_##n(struct device *dev) \ + static void irq_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/serial/uart_liteuart.c b/drivers/serial/uart_liteuart.c index d20d8ea33f67..d4f33c4f44dc 100644 --- a/drivers/serial/uart_liteuart.c +++ b/drivers/serial/uart_liteuart.c @@ -53,7 +53,7 @@ struct uart_liteuart_data { * @param dev UART device struct * @param c Character to send */ -static void uart_liteuart_poll_out(struct device *dev, unsigned char c) +static void uart_liteuart_poll_out(const struct device *dev, unsigned char c) { /* wait for space */ while (sys_read8(UART_TXFULL)) { @@ -70,7 +70,7 @@ static void uart_liteuart_poll_out(struct device *dev, unsigned char c) * * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_liteuart_poll_in(struct device *dev, unsigned char *c) +static int uart_liteuart_poll_in(const struct device *dev, unsigned char *c) { if (!sys_read8(UART_RXEMPTY)) { *c = sys_read8(UART_RXTX); @@ -93,7 +93,7 @@ static int uart_liteuart_poll_in(struct device *dev, unsigned char *c) * * @return N/A */ -static void uart_liteuart_irq_tx_enable(struct device *dev) +static void uart_liteuart_irq_tx_enable(const struct device *dev) { u8_t enable = sys_read8(UART_EV_ENABLE); @@ -107,7 +107,7 @@ static void uart_liteuart_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_liteuart_irq_tx_disable(struct device *dev) +static void uart_liteuart_irq_tx_disable(const struct device *dev) { u8_t enable = sys_read8(UART_EV_ENABLE); @@ -121,7 +121,7 @@ static void uart_liteuart_irq_tx_disable(struct device *dev) * * @return N/A */ -static void uart_liteuart_irq_rx_enable(struct device *dev) +static void uart_liteuart_irq_rx_enable(const struct device *dev) { u8_t enable = sys_read8(UART_EV_ENABLE); @@ -135,7 +135,7 @@ static void uart_liteuart_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_liteuart_irq_rx_disable(struct device *dev) +static void uart_liteuart_irq_rx_disable(const struct device *dev) { u8_t enable = sys_read8(UART_EV_ENABLE); @@ -149,7 +149,7 @@ static void uart_liteuart_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ has been raised, 0 otherwise */ -static int uart_liteuart_irq_tx_ready(struct device *dev) +static int uart_liteuart_irq_tx_ready(const struct device *dev) { u8_t val = sys_read8(UART_TXFULL); @@ -163,7 +163,7 @@ static int uart_liteuart_irq_tx_ready(struct device *dev) * * @return 1 if an IRQ has been raised, 0 otherwise */ -static int uart_liteuart_irq_rx_ready(struct device *dev) +static int uart_liteuart_irq_rx_ready(const struct device *dev) { u8_t pending; @@ -185,8 +185,8 @@ static int uart_liteuart_irq_rx_ready(struct device *dev) * * @return Number of bytes sent */ -static int uart_liteuart_fifo_fill(struct device *dev, - const u8_t *tx_data, int size) +static int uart_liteuart_fifo_fill(const struct device *dev, + const u8_t *tx_data, int size) { int i; @@ -206,8 +206,8 @@ static int uart_liteuart_fifo_fill(struct device *dev, * * @return Number of bytes read */ -static int uart_liteuart_fifo_read(struct device *dev, - u8_t *rx_data, const int size) +static int uart_liteuart_fifo_read(const struct device *dev, + u8_t *rx_data, const int size) { int i; @@ -223,7 +223,7 @@ static int uart_liteuart_fifo_read(struct device *dev, return i; } -static void uart_liteuart_irq_err(struct device *dev) +static void uart_liteuart_irq_err(const struct device *dev) { ARG_UNUSED(dev); } @@ -235,7 +235,7 @@ static void uart_liteuart_irq_err(struct device *dev) * * @return 1 if an IRQ is pending, 0 otherwise */ -static int uart_liteuart_irq_is_pending(struct device *dev) +static int uart_liteuart_irq_is_pending(const struct device *dev) { u8_t pending; @@ -248,7 +248,7 @@ static int uart_liteuart_irq_is_pending(struct device *dev) } } -static int uart_liteuart_irq_update(struct device *dev) +static int uart_liteuart_irq_update(const struct device *dev) { return 1; } @@ -261,9 +261,9 @@ static int uart_liteuart_irq_update(struct device *dev) * * @return N/A */ -static void uart_liteuart_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void uart_liteuart_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct uart_liteuart_data *data; @@ -274,7 +274,7 @@ static void uart_liteuart_irq_callback_set(struct device *dev, static void liteuart_uart_irq_handler(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct uart_liteuart_data *data = DEV_DATA(dev); int key = irq_lock(); @@ -311,7 +311,7 @@ static const struct uart_driver_api uart_liteuart_driver_api = { }; static struct uart_liteuart_data uart_liteuart_data_0; -static int uart_liteuart_init(struct device *dev); +static int uart_liteuart_init(const struct device *dev); static const struct uart_liteuart_device_config uart_liteuart_dev_cfg_0 = { .port = UART_BASE_ADDR, @@ -324,7 +324,7 @@ DEVICE_AND_API_INIT(uart_liteuart_0, DT_INST_LABEL(0), PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, (void *)&uart_liteuart_driver_api); -static int uart_liteuart_init(struct device *dev) +static int uart_liteuart_init(const struct device *dev) { sys_write8(UART_EV_TX | UART_EV_RX, UART_EV_PENDING); diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c index a02258538b81..465c12ef6ca4 100644 --- a/drivers/serial/uart_mcux.c +++ b/drivers/serial/uart_mcux.c @@ -20,7 +20,7 @@ struct uart_mcux_config { u32_t baud_rate; u8_t hw_flow_control; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -31,7 +31,7 @@ struct uart_mcux_data { #endif }; -static int uart_mcux_poll_in(struct device *dev, unsigned char *c) +static int uart_mcux_poll_in(const struct device *dev, unsigned char *c) { const struct uart_mcux_config *config = dev->config_info; u32_t flags = UART_GetStatusFlags(config->base); @@ -45,7 +45,7 @@ static int uart_mcux_poll_in(struct device *dev, unsigned char *c) return ret; } -static void uart_mcux_poll_out(struct device *dev, unsigned char c) +static void uart_mcux_poll_out(const struct device *dev, unsigned char c) { const struct uart_mcux_config *config = dev->config_info; @@ -55,7 +55,7 @@ static void uart_mcux_poll_out(struct device *dev, unsigned char c) UART_WriteByte(config->base, c); } -static int uart_mcux_err_check(struct device *dev) +static int uart_mcux_err_check(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t flags = UART_GetStatusFlags(config->base); @@ -81,7 +81,7 @@ static int uart_mcux_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_mcux_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_mcux_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { const struct uart_mcux_config *config = dev->config_info; @@ -96,7 +96,7 @@ static int uart_mcux_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int uart_mcux_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_mcux_fifo_read(const struct device *dev, u8_t *rx_data, const int len) { const struct uart_mcux_config *config = dev->config_info; @@ -111,7 +111,7 @@ static int uart_mcux_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_mcux_irq_tx_enable(struct device *dev) +static void uart_mcux_irq_tx_enable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_TxDataRegEmptyInterruptEnable; @@ -119,7 +119,7 @@ static void uart_mcux_irq_tx_enable(struct device *dev) UART_EnableInterrupts(config->base, mask); } -static void uart_mcux_irq_tx_disable(struct device *dev) +static void uart_mcux_irq_tx_disable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_TxDataRegEmptyInterruptEnable; @@ -127,7 +127,7 @@ static void uart_mcux_irq_tx_disable(struct device *dev) UART_DisableInterrupts(config->base, mask); } -static int uart_mcux_irq_tx_complete(struct device *dev) +static int uart_mcux_irq_tx_complete(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t flags = UART_GetStatusFlags(config->base); @@ -135,7 +135,7 @@ static int uart_mcux_irq_tx_complete(struct device *dev) return (flags & kUART_TxDataRegEmptyFlag) != 0U; } -static int uart_mcux_irq_tx_ready(struct device *dev) +static int uart_mcux_irq_tx_ready(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_TxDataRegEmptyInterruptEnable; @@ -144,7 +144,7 @@ static int uart_mcux_irq_tx_ready(struct device *dev) && uart_mcux_irq_tx_complete(dev); } -static void uart_mcux_irq_rx_enable(struct device *dev) +static void uart_mcux_irq_rx_enable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_RxDataRegFullInterruptEnable; @@ -152,7 +152,7 @@ static void uart_mcux_irq_rx_enable(struct device *dev) UART_EnableInterrupts(config->base, mask); } -static void uart_mcux_irq_rx_disable(struct device *dev) +static void uart_mcux_irq_rx_disable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_RxDataRegFullInterruptEnable; @@ -160,7 +160,7 @@ static void uart_mcux_irq_rx_disable(struct device *dev) UART_DisableInterrupts(config->base, mask); } -static int uart_mcux_irq_rx_full(struct device *dev) +static int uart_mcux_irq_rx_full(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t flags = UART_GetStatusFlags(config->base); @@ -168,7 +168,7 @@ static int uart_mcux_irq_rx_full(struct device *dev) return (flags & kUART_RxDataRegFullFlag) != 0U; } -static int uart_mcux_irq_rx_ready(struct device *dev) +static int uart_mcux_irq_rx_ready(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_RxDataRegFullInterruptEnable; @@ -177,7 +177,7 @@ static int uart_mcux_irq_rx_ready(struct device *dev) && uart_mcux_irq_rx_full(dev); } -static void uart_mcux_irq_err_enable(struct device *dev) +static void uart_mcux_irq_err_enable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_NoiseErrorInterruptEnable | @@ -187,7 +187,7 @@ static void uart_mcux_irq_err_enable(struct device *dev) UART_EnableInterrupts(config->base, mask); } -static void uart_mcux_irq_err_disable(struct device *dev) +static void uart_mcux_irq_err_disable(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; u32_t mask = kUART_NoiseErrorInterruptEnable | @@ -197,17 +197,17 @@ static void uart_mcux_irq_err_disable(struct device *dev) UART_DisableInterrupts(config->base, mask); } -static int uart_mcux_irq_is_pending(struct device *dev) +static int uart_mcux_irq_is_pending(const struct device *dev) { return uart_mcux_irq_tx_ready(dev) || uart_mcux_irq_rx_ready(dev); } -static int uart_mcux_irq_update(struct device *dev) +static int uart_mcux_irq_update(const struct device *dev) { return 1; } -static void uart_mcux_irq_callback_set(struct device *dev, +static void uart_mcux_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -219,7 +219,7 @@ static void uart_mcux_irq_callback_set(struct device *dev, static void uart_mcux_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_mcux_data *data = dev->driver_data; if (data->callback) { @@ -228,11 +228,11 @@ static void uart_mcux_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int uart_mcux_init(struct device *dev) +static int uart_mcux_init(const struct device *dev) { const struct uart_mcux_config *config = dev->config_info; uart_config_t uart_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; clock_dev = device_get_binding(config->clock_name); @@ -297,7 +297,7 @@ static const struct uart_mcux_config uart_mcux_##n##_config = { \ #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define UART_MCUX_CONFIG_FUNC(n) \ - static void uart_mcux_config_func_##n(struct device *dev) \ + static void uart_mcux_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, status, irq), \ DT_INST_IRQ_BY_NAME(n, status, priority), \ diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c index d625786e715f..2ed26d0d6c10 100644 --- a/drivers/serial/uart_mcux_flexcomm.c +++ b/drivers/serial/uart_mcux_flexcomm.c @@ -27,7 +27,7 @@ struct mcux_flexcomm_config { u32_t clock_source; u32_t baud_rate; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -38,7 +38,7 @@ struct mcux_flexcomm_data { #endif }; -static int mcux_flexcomm_poll_in(struct device *dev, unsigned char *c) +static int mcux_flexcomm_poll_in(const struct device *dev, unsigned char *c) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t flags = USART_GetStatusFlags(config->base); @@ -52,7 +52,7 @@ static int mcux_flexcomm_poll_in(struct device *dev, unsigned char *c) return ret; } -static void mcux_flexcomm_poll_out(struct device *dev, +static void mcux_flexcomm_poll_out(const struct device *dev, unsigned char c) { const struct mcux_flexcomm_config *config = dev->config_info; @@ -64,7 +64,7 @@ static void mcux_flexcomm_poll_out(struct device *dev, USART_WriteByte(config->base, c); } -static int mcux_flexcomm_err_check(struct device *dev) +static int mcux_flexcomm_err_check(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t flags = USART_GetStatusFlags(config->base); @@ -91,8 +91,9 @@ static int mcux_flexcomm_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int mcux_flexcomm_fifo_fill(struct device *dev, const u8_t *tx_data, - int len) +static int mcux_flexcomm_fifo_fill(const struct device *dev, + const u8_t *tx_data, + int len) { const struct mcux_flexcomm_config *config = dev->config_info; u8_t num_tx = 0U; @@ -107,8 +108,8 @@ static int mcux_flexcomm_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int mcux_flexcomm_fifo_read(struct device *dev, u8_t *rx_data, - const int len) +static int mcux_flexcomm_fifo_read(const struct device *dev, u8_t *rx_data, + const int len) { const struct mcux_flexcomm_config *config = dev->config_info; u8_t num_rx = 0U; @@ -123,7 +124,7 @@ static int mcux_flexcomm_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void mcux_flexcomm_irq_tx_enable(struct device *dev) +static void mcux_flexcomm_irq_tx_enable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_TxLevelInterruptEnable; @@ -131,7 +132,7 @@ static void mcux_flexcomm_irq_tx_enable(struct device *dev) USART_EnableInterrupts(config->base, mask); } -static void mcux_flexcomm_irq_tx_disable(struct device *dev) +static void mcux_flexcomm_irq_tx_disable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_TxLevelInterruptEnable; @@ -139,7 +140,7 @@ static void mcux_flexcomm_irq_tx_disable(struct device *dev) USART_DisableInterrupts(config->base, mask); } -static int mcux_flexcomm_irq_tx_complete(struct device *dev) +static int mcux_flexcomm_irq_tx_complete(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t flags = USART_GetStatusFlags(config->base); @@ -147,7 +148,7 @@ static int mcux_flexcomm_irq_tx_complete(struct device *dev) return (flags & kUSART_TxFifoEmptyFlag) != 0U; } -static int mcux_flexcomm_irq_tx_ready(struct device *dev) +static int mcux_flexcomm_irq_tx_ready(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_TxLevelInterruptEnable; @@ -156,7 +157,7 @@ static int mcux_flexcomm_irq_tx_ready(struct device *dev) && mcux_flexcomm_irq_tx_complete(dev); } -static void mcux_flexcomm_irq_rx_enable(struct device *dev) +static void mcux_flexcomm_irq_rx_enable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_RxLevelInterruptEnable; @@ -164,7 +165,7 @@ static void mcux_flexcomm_irq_rx_enable(struct device *dev) USART_EnableInterrupts(config->base, mask); } -static void mcux_flexcomm_irq_rx_disable(struct device *dev) +static void mcux_flexcomm_irq_rx_disable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_RxLevelInterruptEnable; @@ -172,7 +173,7 @@ static void mcux_flexcomm_irq_rx_disable(struct device *dev) USART_DisableInterrupts(config->base, mask); } -static int mcux_flexcomm_irq_rx_full(struct device *dev) +static int mcux_flexcomm_irq_rx_full(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t flags = USART_GetStatusFlags(config->base); @@ -180,7 +181,7 @@ static int mcux_flexcomm_irq_rx_full(struct device *dev) return (flags & kUSART_RxFifoNotEmptyFlag) != 0U; } -static int mcux_flexcomm_irq_rx_ready(struct device *dev) +static int mcux_flexcomm_irq_rx_ready(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kUSART_RxLevelInterruptEnable; @@ -189,7 +190,7 @@ static int mcux_flexcomm_irq_rx_ready(struct device *dev) && mcux_flexcomm_irq_rx_full(dev); } -static void mcux_flexcomm_irq_err_enable(struct device *dev) +static void mcux_flexcomm_irq_err_enable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kStatus_USART_NoiseError | @@ -199,7 +200,7 @@ static void mcux_flexcomm_irq_err_enable(struct device *dev) USART_EnableInterrupts(config->base, mask); } -static void mcux_flexcomm_irq_err_disable(struct device *dev) +static void mcux_flexcomm_irq_err_disable(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; u32_t mask = kStatus_USART_NoiseError | @@ -209,20 +210,20 @@ static void mcux_flexcomm_irq_err_disable(struct device *dev) USART_DisableInterrupts(config->base, mask); } -static int mcux_flexcomm_irq_is_pending(struct device *dev) +static int mcux_flexcomm_irq_is_pending(const struct device *dev) { return (mcux_flexcomm_irq_tx_ready(dev) || mcux_flexcomm_irq_rx_ready(dev)); } -static int mcux_flexcomm_irq_update(struct device *dev) +static int mcux_flexcomm_irq_update(const struct device *dev) { return 1; } -static void mcux_flexcomm_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void mcux_flexcomm_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct mcux_flexcomm_data *data = dev->driver_data; @@ -232,7 +233,7 @@ static void mcux_flexcomm_irq_callback_set(struct device *dev, static void mcux_flexcomm_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct mcux_flexcomm_data *data = dev->driver_data; if (data->callback) { @@ -242,7 +243,7 @@ static void mcux_flexcomm_isr(void *arg) #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int mcux_flexcomm_init(struct device *dev) +static int mcux_flexcomm_init(const struct device *dev) { const struct mcux_flexcomm_config *config = dev->config_info; usart_config_t usart_config; @@ -289,7 +290,7 @@ static const struct uart_driver_api mcux_flexcomm_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define UART_MCUX_FLEXCOMM_CONFIG_FUNC(n) \ - static void mcux_flexcomm_config_func_##n(struct device *dev) \ + static void mcux_flexcomm_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c index ca73e8c583e6..3bf2f2ca49a3 100644 --- a/drivers/serial/uart_mcux_lpsci.c +++ b/drivers/serial/uart_mcux_lpsci.c @@ -19,7 +19,7 @@ struct mcux_lpsci_config { clock_control_subsys_t clock_subsys; u32_t baud_rate; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -30,7 +30,7 @@ struct mcux_lpsci_data { #endif }; -static int mcux_lpsci_poll_in(struct device *dev, unsigned char *c) +static int mcux_lpsci_poll_in(const struct device *dev, unsigned char *c) { const struct mcux_lpsci_config *config = dev->config_info; u32_t flags = LPSCI_GetStatusFlags(config->base); @@ -44,7 +44,7 @@ static int mcux_lpsci_poll_in(struct device *dev, unsigned char *c) return ret; } -static void mcux_lpsci_poll_out(struct device *dev, unsigned char c) +static void mcux_lpsci_poll_out(const struct device *dev, unsigned char c) { const struct mcux_lpsci_config *config = dev->config_info; @@ -55,7 +55,7 @@ static void mcux_lpsci_poll_out(struct device *dev, unsigned char c) LPSCI_WriteByte(config->base, c); } -static int mcux_lpsci_err_check(struct device *dev) +static int mcux_lpsci_err_check(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t flags = LPSCI_GetStatusFlags(config->base); @@ -81,7 +81,7 @@ static int mcux_lpsci_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int mcux_lpsci_fifo_fill(struct device *dev, const u8_t *tx_data, +static int mcux_lpsci_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { const struct mcux_lpsci_config *config = dev->config_info; @@ -97,7 +97,7 @@ static int mcux_lpsci_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int mcux_lpsci_fifo_read(struct device *dev, u8_t *rx_data, +static int mcux_lpsci_fifo_read(const struct device *dev, u8_t *rx_data, const int len) { const struct mcux_lpsci_config *config = dev->config_info; @@ -113,7 +113,7 @@ static int mcux_lpsci_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void mcux_lpsci_irq_tx_enable(struct device *dev) +static void mcux_lpsci_irq_tx_enable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; @@ -121,7 +121,7 @@ static void mcux_lpsci_irq_tx_enable(struct device *dev) LPSCI_EnableInterrupts(config->base, mask); } -static void mcux_lpsci_irq_tx_disable(struct device *dev) +static void mcux_lpsci_irq_tx_disable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; @@ -129,7 +129,7 @@ static void mcux_lpsci_irq_tx_disable(struct device *dev) LPSCI_DisableInterrupts(config->base, mask); } -static int mcux_lpsci_irq_tx_complete(struct device *dev) +static int mcux_lpsci_irq_tx_complete(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t flags = LPSCI_GetStatusFlags(config->base); @@ -137,7 +137,7 @@ static int mcux_lpsci_irq_tx_complete(struct device *dev) return (flags & kLPSCI_TxDataRegEmptyFlag) != 0U; } -static int mcux_lpsci_irq_tx_ready(struct device *dev) +static int mcux_lpsci_irq_tx_ready(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; @@ -146,7 +146,7 @@ static int mcux_lpsci_irq_tx_ready(struct device *dev) && mcux_lpsci_irq_tx_complete(dev); } -static void mcux_lpsci_irq_rx_enable(struct device *dev) +static void mcux_lpsci_irq_rx_enable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_RxDataRegFullInterruptEnable; @@ -154,7 +154,7 @@ static void mcux_lpsci_irq_rx_enable(struct device *dev) LPSCI_EnableInterrupts(config->base, mask); } -static void mcux_lpsci_irq_rx_disable(struct device *dev) +static void mcux_lpsci_irq_rx_disable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_RxDataRegFullInterruptEnable; @@ -162,7 +162,7 @@ static void mcux_lpsci_irq_rx_disable(struct device *dev) LPSCI_DisableInterrupts(config->base, mask); } -static int mcux_lpsci_irq_rx_full(struct device *dev) +static int mcux_lpsci_irq_rx_full(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t flags = LPSCI_GetStatusFlags(config->base); @@ -170,7 +170,7 @@ static int mcux_lpsci_irq_rx_full(struct device *dev) return (flags & kLPSCI_RxDataRegFullFlag) != 0U; } -static int mcux_lpsci_irq_rx_ready(struct device *dev) +static int mcux_lpsci_irq_rx_ready(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_RxDataRegFullInterruptEnable; @@ -179,7 +179,7 @@ static int mcux_lpsci_irq_rx_ready(struct device *dev) && mcux_lpsci_irq_rx_full(dev); } -static void mcux_lpsci_irq_err_enable(struct device *dev) +static void mcux_lpsci_irq_err_enable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_NoiseErrorInterruptEnable | @@ -189,7 +189,7 @@ static void mcux_lpsci_irq_err_enable(struct device *dev) LPSCI_EnableInterrupts(config->base, mask); } -static void mcux_lpsci_irq_err_disable(struct device *dev) +static void mcux_lpsci_irq_err_disable(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; u32_t mask = kLPSCI_NoiseErrorInterruptEnable | @@ -199,20 +199,20 @@ static void mcux_lpsci_irq_err_disable(struct device *dev) LPSCI_DisableInterrupts(config->base, mask); } -static int mcux_lpsci_irq_is_pending(struct device *dev) +static int mcux_lpsci_irq_is_pending(const struct device *dev) { return (mcux_lpsci_irq_tx_ready(dev) || mcux_lpsci_irq_rx_ready(dev)); } -static int mcux_lpsci_irq_update(struct device *dev) +static int mcux_lpsci_irq_update(const struct device *dev) { return 1; } -static void mcux_lpsci_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void mcux_lpsci_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct mcux_lpsci_data *data = dev->driver_data; @@ -222,7 +222,7 @@ static void mcux_lpsci_irq_callback_set(struct device *dev, static void mcux_lpsci_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct mcux_lpsci_data *data = dev->driver_data; if (data->callback) { @@ -231,11 +231,11 @@ static void mcux_lpsci_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int mcux_lpsci_init(struct device *dev) +static int mcux_lpsci_init(const struct device *dev) { const struct mcux_lpsci_config *config = dev->config_info; lpsci_config_t uart_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; clock_dev = device_get_binding(config->clock_name); @@ -286,7 +286,7 @@ static const struct uart_driver_api mcux_lpsci_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define MCUX_LPSCI_CONFIG_FUNC(n) \ - static void mcux_lpsci_config_func_##n(struct device *dev) \ + static void mcux_lpsci_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c index ecebaaadf0e9..9bb0e4eabc16 100644 --- a/drivers/serial/uart_mcux_lpuart.c +++ b/drivers/serial/uart_mcux_lpuart.c @@ -19,7 +19,7 @@ struct mcux_lpuart_config { clock_control_subsys_t clock_subsys; u32_t baud_rate; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -30,7 +30,7 @@ struct mcux_lpuart_data { #endif }; -static int mcux_lpuart_poll_in(struct device *dev, unsigned char *c) +static int mcux_lpuart_poll_in(const struct device *dev, unsigned char *c) { const struct mcux_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -44,7 +44,7 @@ static int mcux_lpuart_poll_in(struct device *dev, unsigned char *c) return ret; } -static void mcux_lpuart_poll_out(struct device *dev, unsigned char c) +static void mcux_lpuart_poll_out(const struct device *dev, unsigned char c) { const struct mcux_lpuart_config *config = dev->config_info; @@ -55,7 +55,7 @@ static void mcux_lpuart_poll_out(struct device *dev, unsigned char c) LPUART_WriteByte(config->base, c); } -static int mcux_lpuart_err_check(struct device *dev) +static int mcux_lpuart_err_check(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -81,8 +81,9 @@ static int mcux_lpuart_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int mcux_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data, - int len) +static int mcux_lpuart_fifo_fill(const struct device *dev, + const u8_t *tx_data, + int len) { const struct mcux_lpuart_config *config = dev->config_info; u8_t num_tx = 0U; @@ -97,8 +98,8 @@ static int mcux_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int mcux_lpuart_fifo_read(struct device *dev, u8_t *rx_data, - const int len) +static int mcux_lpuart_fifo_read(const struct device *dev, u8_t *rx_data, + const int len) { const struct mcux_lpuart_config *config = dev->config_info; u8_t num_rx = 0U; @@ -113,7 +114,7 @@ static int mcux_lpuart_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void mcux_lpuart_irq_tx_enable(struct device *dev) +static void mcux_lpuart_irq_tx_enable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -121,7 +122,7 @@ static void mcux_lpuart_irq_tx_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void mcux_lpuart_irq_tx_disable(struct device *dev) +static void mcux_lpuart_irq_tx_disable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -129,7 +130,7 @@ static void mcux_lpuart_irq_tx_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int mcux_lpuart_irq_tx_complete(struct device *dev) +static int mcux_lpuart_irq_tx_complete(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -137,7 +138,7 @@ static int mcux_lpuart_irq_tx_complete(struct device *dev) return (flags & kLPUART_TxDataRegEmptyFlag) != 0U; } -static int mcux_lpuart_irq_tx_ready(struct device *dev) +static int mcux_lpuart_irq_tx_ready(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -146,7 +147,7 @@ static int mcux_lpuart_irq_tx_ready(struct device *dev) && mcux_lpuart_irq_tx_complete(dev); } -static void mcux_lpuart_irq_rx_enable(struct device *dev) +static void mcux_lpuart_irq_rx_enable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -154,7 +155,7 @@ static void mcux_lpuart_irq_rx_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void mcux_lpuart_irq_rx_disable(struct device *dev) +static void mcux_lpuart_irq_rx_disable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -162,7 +163,7 @@ static void mcux_lpuart_irq_rx_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int mcux_lpuart_irq_rx_full(struct device *dev) +static int mcux_lpuart_irq_rx_full(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -170,7 +171,7 @@ static int mcux_lpuart_irq_rx_full(struct device *dev) return (flags & kLPUART_RxDataRegFullFlag) != 0U; } -static int mcux_lpuart_irq_rx_ready(struct device *dev) +static int mcux_lpuart_irq_rx_ready(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -179,7 +180,7 @@ static int mcux_lpuart_irq_rx_ready(struct device *dev) && mcux_lpuart_irq_rx_full(dev); } -static void mcux_lpuart_irq_err_enable(struct device *dev) +static void mcux_lpuart_irq_err_enable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_NoiseErrorInterruptEnable | @@ -189,7 +190,7 @@ static void mcux_lpuart_irq_err_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void mcux_lpuart_irq_err_disable(struct device *dev) +static void mcux_lpuart_irq_err_disable(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_NoiseErrorInterruptEnable | @@ -199,20 +200,20 @@ static void mcux_lpuart_irq_err_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int mcux_lpuart_irq_is_pending(struct device *dev) +static int mcux_lpuart_irq_is_pending(const struct device *dev) { return (mcux_lpuart_irq_tx_ready(dev) || mcux_lpuart_irq_rx_ready(dev)); } -static int mcux_lpuart_irq_update(struct device *dev) +static int mcux_lpuart_irq_update(const struct device *dev) { return 1; } -static void mcux_lpuart_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void mcux_lpuart_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct mcux_lpuart_data *data = dev->driver_data; @@ -222,7 +223,7 @@ static void mcux_lpuart_irq_callback_set(struct device *dev, static void mcux_lpuart_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct mcux_lpuart_data *data = dev->driver_data; if (data->callback) { @@ -231,11 +232,11 @@ static void mcux_lpuart_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int mcux_lpuart_init(struct device *dev) +static int mcux_lpuart_init(const struct device *dev) { const struct mcux_lpuart_config *config = dev->config_info; lpuart_config_t uart_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; clock_dev = device_get_binding(config->clock_name); @@ -295,7 +296,7 @@ static const struct uart_driver_api mcux_lpuart_driver_api = { irq_enable(DT_INST_IRQ_BY_IDX(n, i, irq)); \ } while (0) #define LPUART_MCUX_CONFIG_FUNC(n) \ - static void mcux_lpuart_config_func_##n(struct device *dev) \ + static void mcux_lpuart_config_func_##n(const struct device *dev) \ { \ MCUX_LPUART_IRQ_INIT(n, 0); \ \ diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c index 75bf12527156..5f099c8f072b 100644 --- a/drivers/serial/uart_miv.c +++ b/drivers/serial/uart_miv.c @@ -124,7 +124,7 @@ struct uart_miv_regs_t { }; #ifdef CONFIG_UART_INTERRUPT_DRIVEN -typedef void (*irq_cfg_func_t)(struct device *dev); +typedef void (*irq_cfg_func_t)(const struct device *dev); #endif struct uart_miv_device_config { @@ -152,7 +152,7 @@ struct uart_miv_data { #define DEV_DATA(dev) \ ((struct uart_miv_data * const)(dev)->driver_data) -static void uart_miv_poll_out(struct device *dev, +static void uart_miv_poll_out(const struct device *dev, unsigned char c) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); @@ -163,7 +163,7 @@ static void uart_miv_poll_out(struct device *dev, uart->tx = c; } -static int uart_miv_poll_in(struct device *dev, unsigned char *c) +static int uart_miv_poll_in(const struct device *dev, unsigned char *c) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); @@ -175,7 +175,7 @@ static int uart_miv_poll_in(struct device *dev, unsigned char *c) return -1; } -static int uart_miv_err_check(struct device *dev) +static int uart_miv_err_check(const struct device *dev) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); u32_t flags = uart->status; @@ -199,7 +199,7 @@ static int uart_miv_err_check(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_miv_fifo_fill(struct device *dev, +static int uart_miv_fifo_fill(const struct device *dev, const u8_t *tx_data, int size) { @@ -213,7 +213,7 @@ static int uart_miv_fifo_fill(struct device *dev, return i; } -static int uart_miv_fifo_read(struct device *dev, +static int uart_miv_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { @@ -231,72 +231,72 @@ static int uart_miv_fifo_read(struct device *dev, return i; } -static void uart_miv_irq_tx_enable(struct device *dev) +static void uart_miv_irq_tx_enable(const struct device *dev) { ARG_UNUSED(dev); } -static void uart_miv_irq_tx_disable(struct device *dev) +static void uart_miv_irq_tx_disable(const struct device *dev) { ARG_UNUSED(dev); } -static int uart_miv_irq_tx_ready(struct device *dev) +static int uart_miv_irq_tx_ready(const struct device *dev) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); return !(uart->status & STATUS_TXRDY_MASK); } -static int uart_miv_irq_tx_complete(struct device *dev) +static int uart_miv_irq_tx_complete(const struct device *dev) { ARG_UNUSED(dev); return 1; } -static void uart_miv_irq_rx_enable(struct device *dev) +static void uart_miv_irq_rx_enable(const struct device *dev) { ARG_UNUSED(dev); } -static void uart_miv_irq_rx_disable(struct device *dev) +static void uart_miv_irq_rx_disable(const struct device *dev) { ARG_UNUSED(dev); } -static int uart_miv_irq_rx_ready(struct device *dev) +static int uart_miv_irq_rx_ready(const struct device *dev) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); return !!(uart->status & STATUS_RXFULL_MASK); } -static void uart_miv_irq_err_enable(struct device *dev) +static void uart_miv_irq_err_enable(const struct device *dev) { ARG_UNUSED(dev); } -static void uart_miv_irq_err_disable(struct device *dev) +static void uart_miv_irq_err_disable(const struct device *dev) { ARG_UNUSED(dev); } -static int uart_miv_irq_is_pending(struct device *dev) +static int uart_miv_irq_is_pending(const struct device *dev) { volatile struct uart_miv_regs_t *uart = DEV_UART(dev); return !!(uart->status & STATUS_RXFULL_MASK); } -static int uart_miv_irq_update(struct device *dev) +static int uart_miv_irq_update(const struct device *dev) { return 1; } static void uart_miv_irq_handler(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct uart_miv_data *data = DEV_DATA(dev); if (data->callback) { @@ -312,7 +312,7 @@ static void uart_miv_irq_handler(void *arg) */ void uart_miv_rx_thread(void *arg1, void *arg2, void *arg3) { - struct device *dev = (struct device *)arg1; + const struct device *dev = (const struct device *)arg1; volatile struct uart_miv_regs_t *uart = DEV_UART(dev); const struct uart_miv_device_config *const cfg = DEV_CFG(dev); /* Make it go to sleep for a period no longer than @@ -328,7 +328,7 @@ void uart_miv_rx_thread(void *arg1, void *arg2, void *arg3) } } -static void uart_miv_irq_callback_set(struct device *dev, +static void uart_miv_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -340,7 +340,7 @@ static void uart_miv_irq_callback_set(struct device *dev, #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int uart_miv_init(struct device *dev) +static int uart_miv_init(const struct device *dev) { const struct uart_miv_device_config *const cfg = DEV_CFG(dev); volatile struct uart_miv_regs_t *uart = DEV_UART(dev); @@ -390,7 +390,7 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1, static struct uart_miv_data uart_miv_data_0; #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_miv_irq_cfg_func_0(struct device *dev); +static void uart_miv_irq_cfg_func_0(const struct device *dev); #endif static const struct uart_miv_device_config uart_miv_dev_cfg_0 = { @@ -409,7 +409,7 @@ DEVICE_AND_API_INIT(uart_miv_0, DT_INST_LABEL(0), (void *)&uart_miv_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void uart_miv_irq_cfg_func_0(struct device *dev) +static void uart_miv_irq_cfg_func_0(const struct device *dev) { /* Create a thread which will poll for data - replacement for IRQ */ k_thread_create(&rx_thread, rx_stack, 500, diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c index 3ba424172ef2..ea68048f05bd 100644 --- a/drivers/serial/uart_msp432p4xx.c +++ b/drivers/serial/uart_msp432p4xx.c @@ -33,7 +33,7 @@ struct uart_msp432p4xx_dev_data_t { #define DEV_DATA(dev) \ ((struct uart_msp432p4xx_dev_data_t * const)(dev)->driver_data) -static struct device DEVICE_NAME_GET(uart_msp432p4xx_0); +DEVICE_DECLARE(uart_msp432p4xx_0); #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_msp432p4xx_isr(void *arg); @@ -117,7 +117,7 @@ static int baudrate_set(eUSCI_UART_Config *config, uint32_t baudrate) return 0; } -static int uart_msp432p4xx_init(struct device *dev) +static int uart_msp432p4xx_init(const struct device *dev) { int err; const struct uart_device_config *config = DEV_CFG(dev); @@ -156,7 +156,7 @@ static int uart_msp432p4xx_init(struct device *dev) return 0; } -static int uart_msp432p4xx_poll_in(struct device *dev, unsigned char *c) +static int uart_msp432p4xx_poll_in(const struct device *dev, unsigned char *c) { const struct uart_device_config *config = DEV_CFG(dev); @@ -165,7 +165,7 @@ static int uart_msp432p4xx_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_msp432p4xx_poll_out(struct device *dev, +static void uart_msp432p4xx_poll_out(const struct device *dev, unsigned char c) { const struct uart_device_config *config = DEV_CFG(dev); @@ -174,7 +174,7 @@ static void uart_msp432p4xx_poll_out(struct device *dev, } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_msp432p4xx_fifo_fill(struct device *dev, +static int uart_msp432p4xx_fifo_fill(const struct device *dev, const u8_t *tx_data, int size) { const struct uart_device_config *config = DEV_CFG(dev); @@ -194,7 +194,7 @@ static int uart_msp432p4xx_fifo_fill(struct device *dev, return (int)num_tx; } -static int uart_msp432p4xx_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_msp432p4xx_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { const struct uart_device_config *config = DEV_CFG(dev); @@ -211,7 +211,7 @@ static int uart_msp432p4xx_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_msp432p4xx_irq_tx_enable(struct device *dev) +static void uart_msp432p4xx_irq_tx_enable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -219,7 +219,7 @@ static void uart_msp432p4xx_irq_tx_enable(struct device *dev) EUSCI_A_UART_TRANSMIT_INTERRUPT); } -static void uart_msp432p4xx_irq_tx_disable(struct device *dev) +static void uart_msp432p4xx_irq_tx_disable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -227,7 +227,7 @@ static void uart_msp432p4xx_irq_tx_disable(struct device *dev) EUSCI_A_UART_TRANSMIT_INTERRUPT); } -static int uart_msp432p4xx_irq_tx_ready(struct device *dev) +static int uart_msp432p4xx_irq_tx_ready(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -238,7 +238,7 @@ static int uart_msp432p4xx_irq_tx_ready(struct device *dev) return (int_status & EUSCI_A_IE_TXIE); } -static void uart_msp432p4xx_irq_rx_enable(struct device *dev) +static void uart_msp432p4xx_irq_rx_enable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -246,7 +246,7 @@ static void uart_msp432p4xx_irq_rx_enable(struct device *dev) EUSCI_A_UART_RECEIVE_INTERRUPT); } -static void uart_msp432p4xx_irq_rx_disable(struct device *dev) +static void uart_msp432p4xx_irq_rx_disable(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -254,7 +254,7 @@ static void uart_msp432p4xx_irq_rx_disable(struct device *dev) EUSCI_A_UART_RECEIVE_INTERRUPT); } -static int uart_msp432p4xx_irq_tx_complete(struct device *dev) +static int uart_msp432p4xx_irq_tx_complete(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); @@ -262,7 +262,7 @@ static int uart_msp432p4xx_irq_tx_complete(struct device *dev) EUSCI_A_UART_TRANSMIT_COMPLETE_INTERRUPT_FLAG); } -static int uart_msp432p4xx_irq_rx_ready(struct device *dev) +static int uart_msp432p4xx_irq_rx_ready(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -273,17 +273,17 @@ static int uart_msp432p4xx_irq_rx_ready(struct device *dev) return (int_status & EUSCI_A_IE_RXIE); } -static void uart_msp432p4xx_irq_err_enable(struct device *dev) +static void uart_msp432p4xx_irq_err_enable(const struct device *dev) { /* Not yet used in zephyr */ } -static void uart_msp432p4xx_irq_err_disable(struct device *dev) +static void uart_msp432p4xx_irq_err_disable(const struct device *dev) { /* Not yet used in zephyr */ } -static int uart_msp432p4xx_irq_is_pending(struct device *dev) +static int uart_msp432p4xx_irq_is_pending(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); unsigned int int_status; @@ -294,14 +294,14 @@ static int uart_msp432p4xx_irq_is_pending(struct device *dev) return (int_status & (EUSCI_A_IE_TXIE | EUSCI_A_IE_RXIE)); } -static int uart_msp432p4xx_irq_update(struct device *dev) +static int uart_msp432p4xx_irq_update(const struct device *dev) { return 1; } -static void uart_msp432p4xx_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void uart_msp432p4xx_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct uart_msp432p4xx_dev_data_t * const dev_data = DEV_DATA(dev); @@ -320,7 +320,7 @@ static void uart_msp432p4xx_irq_callback_set(struct device *dev, */ static void uart_msp432p4xx_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct uart_device_config *config = DEV_CFG(dev); struct uart_msp432p4xx_dev_data_t * const dev_data = DEV_DATA(dev); unsigned int int_status; diff --git a/drivers/serial/uart_native_posix.c b/drivers/serial/uart_native_posix.c index 4aaa217b5d71..4a28669218d9 100644 --- a/drivers/serial/uart_native_posix.c +++ b/drivers/serial/uart_native_posix.c @@ -38,9 +38,11 @@ * emulator to it, if set so from command line. */ -static int np_uart_stdin_poll_in(struct device *dev, unsigned char *p_char); -static int np_uart_tty_poll_in(struct device *dev, unsigned char *p_char); -static void np_uart_poll_out(struct device *dev, +static int np_uart_stdin_poll_in(const struct device *dev, + unsigned char *p_char); +static int np_uart_tty_poll_in(const struct device *dev, + unsigned char *p_char); +static void np_uart_poll_out(const struct device *dev, unsigned char out_char); static bool auto_attach; @@ -196,7 +198,7 @@ static int open_tty(struct native_uart_status *driver_data, * * @return 0 (if it fails catastrophically, the execution is terminated) */ -static int np_uart_0_init(struct device *dev) +static int np_uart_0_init(const struct device *dev) { struct native_uart_status *d; @@ -233,7 +235,7 @@ static int np_uart_0_init(struct device *dev) * Initialize the 2nd UART port. * This port will be always attached to its own new pseudoterminal. */ -static int np_uart_1_init(struct device *dev) +static int np_uart_1_init(const struct device *dev) { struct native_uart_status *d; int tty_fn; @@ -255,7 +257,7 @@ static int np_uart_1_init(struct device *dev) * @param dev UART device struct * @param out_char Character to send. */ -static void np_uart_poll_out(struct device *dev, +static void np_uart_poll_out(const struct device *dev, unsigned char out_char) { int ret; @@ -278,7 +280,8 @@ static void np_uart_poll_out(struct device *dev, * @retval 0 If a character arrived and was stored in p_char * @retval -1 If no character was available to read */ -static int np_uart_stdin_poll_in(struct device *dev, unsigned char *p_char) +static int np_uart_stdin_poll_in(const struct device *dev, + unsigned char *p_char) { static bool disconnected; @@ -326,7 +329,8 @@ static int np_uart_stdin_poll_in(struct device *dev, unsigned char *p_char) * @retval 0 If a character arrived and was stored in p_char * @retval -1 If no character was available to read */ -static int np_uart_tty_poll_in(struct device *dev, unsigned char *p_char) +static int np_uart_tty_poll_in(const struct device *dev, + unsigned char *p_char) { int n = -1; int in_f = ((struct native_uart_status *)dev->driver_data)->in_fd; diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c index 4024e6c6a80f..328ff748dc70 100644 --- a/drivers/serial/uart_nrfx_uart.c +++ b/drivers/serial/uart_nrfx_uart.c @@ -56,12 +56,12 @@ struct uart_nrfx_config { bool rts_cts_pins_set; }; -static inline struct uart_nrfx_data *get_dev_data(struct device *dev) +static inline struct uart_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct uart_nrfx_config *get_dev_config(struct device *dev) +static inline const struct uart_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } @@ -136,7 +136,7 @@ static void event_txdrdy_clear(void) * @return N/A */ -static int baudrate_set(struct device *dev, u32_t baudrate) +static int baudrate_set(const struct device *dev, u32_t baudrate) { nrf_uart_baudrate_t nrf_baudrate; /* calculated baudrate divisor */ @@ -221,7 +221,7 @@ static int baudrate_set(struct device *dev, u32_t baudrate) * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_nrfx_poll_in(struct device *dev, unsigned char *c) +static int uart_nrfx_poll_in(const struct device *dev, unsigned char *c) { if (!nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_RXDRDY)) { return -1; @@ -246,7 +246,7 @@ static void uart_nrfx_isr(void *arg); * @param dev UART device struct * @param c Character to send */ -static void uart_nrfx_poll_out(struct device *dev, unsigned char c) +static void uart_nrfx_poll_out(const struct device *dev, unsigned char c) { atomic_t *lock; #ifdef CONFIG_UART_0_ASYNC @@ -310,13 +310,13 @@ static void uart_nrfx_poll_out(struct device *dev, unsigned char c) } /** Console I/O function */ -static int uart_nrfx_err_check(struct device *dev) +static int uart_nrfx_err_check(const struct device *dev) { /* register bitfields maps to the defines in uart.h */ return nrf_uart_errorsrc_get_and_clear(uart0_addr); } -static int uart_nrfx_configure(struct device *dev, +static int uart_nrfx_configure(const struct device *dev, const struct uart_config *cfg) { nrf_uart_config_t uart_cfg; @@ -388,7 +388,8 @@ static int uart_nrfx_configure(struct device *dev, return 0; } -static int uart_nrfx_config_get(struct device *dev, struct uart_config *cfg) +static int uart_nrfx_config_get(const struct device *dev, + struct uart_config *cfg) { *cfg = get_dev_data(dev)->uart_config; return 0; @@ -404,7 +405,8 @@ static void user_callback(struct uart_event *event) } } -static int uart_nrfx_callback_set(struct device *dev, uart_callback_t callback, +static int uart_nrfx_callback_set(const struct device *dev, + uart_callback_t callback, void *user_data) { uart0_cb.callback = callback; @@ -413,7 +415,7 @@ static int uart_nrfx_callback_set(struct device *dev, uart_callback_t callback, return 0; } -static int uart_nrfx_tx(struct device *dev, const u8_t *buf, size_t len, +static int uart_nrfx_tx(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout) { if (atomic_cas((atomic_t *) &uart0_cb.tx_buffer_length, @@ -437,7 +439,7 @@ static int uart_nrfx_tx(struct device *dev, const u8_t *buf, size_t len, return 0; } -static int uart_nrfx_tx_abort(struct device *dev) +static int uart_nrfx_tx_abort(const struct device *dev) { if (uart0_cb.tx_buffer_length == 0) { return -EINVAL; @@ -463,7 +465,8 @@ static int uart_nrfx_tx_abort(struct device *dev) return 0; } -static int uart_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len, +static int uart_nrfx_rx_enable(const struct device *dev, u8_t *buf, + size_t len, s32_t timeout) { if (!RX_PIN_USED) { @@ -493,7 +496,8 @@ static int uart_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len, return 0; } -static int uart_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) +static int uart_nrfx_rx_buf_rsp(const struct device *dev, u8_t *buf, + size_t len) { if (!uart0_cb.rx_enabled) { return -EACCES; @@ -507,7 +511,7 @@ static int uart_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) return 0; } -static int uart_nrfx_rx_disable(struct device *dev) +static int uart_nrfx_rx_disable(const struct device *dev) { if (uart0_cb.rx_buffer_length == 0) { return -EFAULT; @@ -567,7 +571,7 @@ static void rx_reset_state(void) uart0_cb.rx_secondary_buffer_length = 0; } -static void rx_isr(struct device *dev) +static void rx_isr(const struct device *dev) { struct uart_event event; @@ -662,7 +666,7 @@ static void tx_isr(void) : mask & NRF_UART_ERROR_BREAK_MASK ? UART_BREAK \ : 0) -static void error_isr(struct device *dev) +static void error_isr(const struct device *dev) { if (uart0_cb.rx_timeout != SYS_FOREVER_MS) { k_delayed_work_cancel(&uart0_cb.rx_timeout_work); @@ -709,15 +713,15 @@ static void rxto_isr(void) void uart_nrfx_isr(void *arg) { - struct device *uart = (struct device *) arg; + const struct device *uart = (const struct device *) arg; if (nrf_uart_int_enable_check(uart0_addr, NRF_UART_INT_MASK_ERROR) && nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_ERROR)) { - error_isr(uart); + error_isr((void *) uart); } else if (nrf_uart_int_enable_check(uart0_addr, NRF_UART_INT_MASK_RXDRDY) && nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_RXDRDY)) { - rx_isr(uart); + rx_isr((void *) uart); } if (nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_TXDRDY) @@ -761,7 +765,7 @@ static void tx_timeout(struct k_work *work) #ifdef CONFIG_UART_0_INTERRUPT_DRIVEN /** Interrupt driven FIFO fill function */ -static int uart_nrfx_fifo_fill(struct device *dev, +static int uart_nrfx_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { @@ -781,7 +785,7 @@ static int uart_nrfx_fifo_fill(struct device *dev, } /** Interrupt driven FIFO read function */ -static int uart_nrfx_fifo_read(struct device *dev, +static int uart_nrfx_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { @@ -800,7 +804,7 @@ static int uart_nrfx_fifo_read(struct device *dev, } /** Interrupt driven transfer enabling function */ -static void uart_nrfx_irq_tx_enable(struct device *dev) +static void uart_nrfx_irq_tx_enable(const struct device *dev) { u32_t key; @@ -829,7 +833,7 @@ static void uart_nrfx_irq_tx_enable(struct device *dev) } /** Interrupt driven transfer disabling function */ -static void uart_nrfx_irq_tx_disable(struct device *dev) +static void uart_nrfx_irq_tx_disable(const struct device *dev) { nrf_uart_int_disable(uart0_addr, NRF_UART_INT_MASK_TXDRDY); @@ -845,43 +849,43 @@ static void uart_nrfx_irq_tx_disable(struct device *dev) } /** Interrupt driven receiver enabling function */ -static void uart_nrfx_irq_rx_enable(struct device *dev) +static void uart_nrfx_irq_rx_enable(const struct device *dev) { nrf_uart_int_enable(uart0_addr, NRF_UART_INT_MASK_RXDRDY); } /** Interrupt driven receiver disabling function */ -static void uart_nrfx_irq_rx_disable(struct device *dev) +static void uart_nrfx_irq_rx_disable(const struct device *dev) { nrf_uart_int_disable(uart0_addr, NRF_UART_INT_MASK_RXDRDY); } /** Interrupt driven transfer empty function */ -static int uart_nrfx_irq_tx_ready_complete(struct device *dev) +static int uart_nrfx_irq_tx_ready_complete(const struct device *dev) { return event_txdrdy_check(); } /** Interrupt driven receiver ready function */ -static int uart_nrfx_irq_rx_ready(struct device *dev) +static int uart_nrfx_irq_rx_ready(const struct device *dev) { return nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_RXDRDY); } /** Interrupt driven error enabling function */ -static void uart_nrfx_irq_err_enable(struct device *dev) +static void uart_nrfx_irq_err_enable(const struct device *dev) { nrf_uart_int_enable(uart0_addr, NRF_UART_INT_MASK_ERROR); } /** Interrupt driven error disabling function */ -static void uart_nrfx_irq_err_disable(struct device *dev) +static void uart_nrfx_irq_err_disable(const struct device *dev) { nrf_uart_int_disable(uart0_addr, NRF_UART_INT_MASK_ERROR); } /** Interrupt driven pending status function */ -static int uart_nrfx_irq_is_pending(struct device *dev) +static int uart_nrfx_irq_is_pending(const struct device *dev) { return ((nrf_uart_int_enable_check(uart0_addr, NRF_UART_INT_MASK_TXDRDY) && @@ -893,13 +897,13 @@ static int uart_nrfx_irq_is_pending(struct device *dev) } /** Interrupt driven interrupt update function */ -static int uart_nrfx_irq_update(struct device *dev) +static int uart_nrfx_irq_update(const struct device *dev) { return 1; } /** Set the callback function */ -static void uart_nrfx_irq_callback_set(struct device *dev, +static void uart_nrfx_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -943,7 +947,7 @@ DEVICE_DECLARE(uart_nrfx_uart0); * * @return 0 on success */ -static int uart_nrfx_init(struct device *dev) +static int uart_nrfx_init(const struct device *dev) { int err; @@ -1051,7 +1055,7 @@ static const struct uart_driver_api uart_nrfx_uart_driver_api = { #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static void uart_nrfx_pins_enable(struct device *dev, bool enable) +static void uart_nrfx_pins_enable(const struct device *dev, bool enable) { if (!IS_ENABLED(CONFIG_UART_0_GPIO_MANAGEMENT)) { return; @@ -1087,7 +1091,8 @@ static void uart_nrfx_pins_enable(struct device *dev, bool enable) } } -static void uart_nrfx_set_power_state(struct device *dev, u32_t new_state) +static void uart_nrfx_set_power_state(const struct device *dev, + u32_t new_state) { if (new_state == DEVICE_PM_ACTIVE_STATE) { uart_nrfx_pins_enable(dev, true); @@ -1105,7 +1110,7 @@ static void uart_nrfx_set_power_state(struct device *dev, u32_t new_state) } } -static int uart_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int uart_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { static u32_t current_state = DEVICE_PM_ACTIVE_STATE; diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index 79ede11a6fc1..94f1f7d4492b 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -133,17 +133,17 @@ struct uarte_init_config { u32_t pselrts; /* PSEL.RTS register value */ }; -static inline struct uarte_nrfx_data *get_dev_data(struct device *dev) +static inline struct uarte_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct uarte_nrfx_config *get_dev_config(struct device *dev) +static inline const struct uarte_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static inline NRF_UARTE_Type *get_uarte_instance(struct device *dev) +static inline NRF_UARTE_Type *get_uarte_instance(const struct device *dev) { const struct uarte_nrfx_config *config = get_dev_config(dev); @@ -162,7 +162,7 @@ static inline NRF_UARTE_Type *get_uarte_instance(struct device *dev) */ static void uarte_nrfx_isr_int(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -200,7 +200,7 @@ static void uarte_nrfx_isr_int(void *arg) * * @return 0 on success or error code */ -static int baudrate_set(struct device *dev, u32_t baudrate) +static int baudrate_set(const struct device *dev, u32_t baudrate) { nrf_uarte_baudrate_t nrf_baudrate; /* calculated baudrate divisor */ NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -277,7 +277,7 @@ static int baudrate_set(struct device *dev, u32_t baudrate) return 0; } -static int uarte_nrfx_configure(struct device *dev, +static int uarte_nrfx_configure(const struct device *dev, const struct uart_config *cfg) { nrf_uarte_config_t uarte_cfg; @@ -349,14 +349,15 @@ static int uarte_nrfx_configure(struct device *dev, return 0; } -static int uarte_nrfx_config_get(struct device *dev, struct uart_config *cfg) +static int uarte_nrfx_config_get(const struct device *dev, + struct uart_config *cfg) { *cfg = get_dev_data(dev)->uart_config; return 0; } -static int uarte_nrfx_err_check(struct device *dev) +static int uarte_nrfx_err_check(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); /* register bitfields maps to the defines in uart.h */ @@ -378,7 +379,7 @@ static void timer_handler(nrf_timer_event_t event_type, void *p_context) { } static void rx_timeout(struct k_timer *timer); static void tx_timeout(struct k_timer *timer); -static int uarte_nrfx_rx_counting_init(struct device *dev) +static int uarte_nrfx_rx_counting_init(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); const struct uarte_nrfx_config *cfg = get_dev_config(dev); @@ -445,7 +446,7 @@ static int uarte_nrfx_rx_counting_init(struct device *dev) return 0; } -static int uarte_nrfx_init(struct device *dev) +static int uarte_nrfx_init(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -470,7 +471,8 @@ static int uarte_nrfx_init(struct device *dev) return 0; } -static int uarte_nrfx_tx(struct device *dev, const u8_t *buf, size_t len, +static int uarte_nrfx_tx(const struct device *dev, const u8_t *buf, + size_t len, s32_t timeout) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -503,7 +505,7 @@ static int uarte_nrfx_tx(struct device *dev, const u8_t *buf, size_t len, return 0; } -static int uarte_nrfx_tx_abort(struct device *dev) +static int uarte_nrfx_tx_abort(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -517,7 +519,8 @@ static int uarte_nrfx_tx_abort(struct device *dev) return 0; } -static int uarte_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len, +static int uarte_nrfx_rx_enable(const struct device *dev, u8_t *buf, + size_t len, s32_t timeout) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -557,7 +560,8 @@ static int uarte_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len, return 0; } -static int uarte_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) +static int uarte_nrfx_rx_buf_rsp(const struct device *dev, u8_t *buf, + size_t len) { struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -573,8 +577,9 @@ static int uarte_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) return 0; } -static int uarte_nrfx_callback_set(struct device *dev, uart_callback_t callback, - void *user_data) +static int uarte_nrfx_callback_set(const struct device *dev, + uart_callback_t callback, + void *user_data) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -584,7 +589,7 @@ static int uarte_nrfx_callback_set(struct device *dev, uart_callback_t callback, return 0; } -static int uarte_nrfx_rx_disable(struct device *dev) +static int uarte_nrfx_rx_disable(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -606,11 +611,11 @@ static int uarte_nrfx_rx_disable(struct device *dev) static void tx_timeout(struct k_timer *timer) { - struct device *dev = k_timer_user_data_get(timer); + const struct device *dev = k_timer_user_data_get(timer); (void) uarte_nrfx_tx_abort(dev); } -static void user_callback(struct device *dev, struct uart_event *evt) +static void user_callback(const struct device *dev, struct uart_event *evt) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -629,7 +634,7 @@ static void user_callback(struct device *dev, struct uart_event *evt) */ static void rx_timeout(struct k_timer *timer) { - struct device *dev = k_timer_user_data_get(timer); + const struct device *dev = k_timer_user_data_get(timer); struct uarte_nrfx_data *data = get_dev_data(dev); const struct uarte_nrfx_config *cfg = get_dev_config(dev); u32_t read; @@ -714,7 +719,7 @@ static void rx_timeout(struct k_timer *timer) : (mask) & NRF_UARTE_ERROR_BREAK_MASK ? UART_BREAK \ : 0) -static void error_isr(struct device *dev) +static void error_isr(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); u32_t err = nrf_uarte_errorsrc_get_and_clear(uarte); @@ -726,7 +731,7 @@ static void error_isr(struct device *dev) (void) uarte_nrfx_rx_disable(dev); } -static void rxstarted_isr(struct device *dev) +static void rxstarted_isr(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); struct uart_event evt = { @@ -741,7 +746,7 @@ static void rxstarted_isr(struct device *dev) } } -static void endrx_isr(struct device *dev) +static void endrx_isr(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -841,7 +846,7 @@ static void endrx_isr(struct device *dev) * the events UART_RX_BUF_RELEASED and UART_RX_DISABLED are reported * from endrx_isr. */ -static void rxto_isr(struct device *dev) +static void rxto_isr(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); struct uart_event evt = { @@ -868,7 +873,7 @@ static void rxto_isr(struct device *dev) nrf_uarte_task_trigger(get_uarte_instance(dev), NRF_UARTE_TASK_FLUSHRX); } -static void txstopped_isr(struct device *dev) +static void txstopped_isr(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -895,7 +900,7 @@ static void txstopped_isr(struct device *dev) user_callback(dev, &evt); } -static void endtx_isr(struct device *dev) +static void endtx_isr(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -906,7 +911,7 @@ static void endtx_isr(struct device *dev) k_timer_stop(&data->async->tx_timeout_timer); } -static void uarte_nrfx_isr_async(struct device *dev) +static void uarte_nrfx_isr_async(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -920,35 +925,35 @@ static void uarte_nrfx_isr_async(struct device *dev) if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ERROR)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ERROR); - error_isr(dev); + error_isr((void *) dev); } if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDRX)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX); - endrx_isr(dev); + endrx_isr((void *) dev); } if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXSTARTED)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXSTARTED); - rxstarted_isr(dev); + rxstarted_isr((void *) dev); } if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_RXTO)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_RXTO); - rxto_isr(dev); + rxto_isr((void *) dev); } if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_ENDTX) && nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDTX_MASK)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX); - endtx_isr(dev); + endtx_isr((void *) dev); } if (nrf_uarte_event_check(uarte, NRF_UARTE_EVENT_TXSTOPPED) && nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_TXSTOPPED_MASK)) { nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED); - txstopped_isr(dev); + txstopped_isr((void *) dev); } } @@ -962,7 +967,7 @@ static void uarte_nrfx_isr_async(struct device *dev) * * @return 0 if a character arrived, -1 if the input buffer is empty. */ -static int uarte_nrfx_poll_in(struct device *dev, unsigned char *c) +static int uarte_nrfx_poll_in(const struct device *dev, unsigned char *c) { const struct uarte_nrfx_data *data = get_dev_data(dev); @@ -993,7 +998,7 @@ static int uarte_nrfx_poll_in(struct device *dev, unsigned char *c) * @param dev UARTE device struct * @param c Character to send */ -static void uarte_nrfx_poll_out(struct device *dev, unsigned char c) +static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -1060,7 +1065,7 @@ static void uarte_nrfx_poll_out(struct device *dev, unsigned char c) } #ifdef UARTE_INTERRUPT_DRIVEN /** Interrupt driven FIFO fill function */ -static int uarte_nrfx_fifo_fill(struct device *dev, +static int uarte_nrfx_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { @@ -1090,7 +1095,7 @@ static int uarte_nrfx_fifo_fill(struct device *dev, } /** Interrupt driven FIFO read function */ -static int uarte_nrfx_fifo_read(struct device *dev, +static int uarte_nrfx_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { @@ -1112,7 +1117,7 @@ static int uarte_nrfx_fifo_read(struct device *dev, } /** Interrupt driven transfer enabling function */ -static void uarte_nrfx_irq_tx_enable(struct device *dev) +static void uarte_nrfx_irq_tx_enable(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -1122,7 +1127,7 @@ static void uarte_nrfx_irq_tx_enable(struct device *dev) } /** Interrupt driven transfer disabling function */ -static void uarte_nrfx_irq_tx_disable(struct device *dev) +static void uarte_nrfx_irq_tx_disable(const struct device *dev) { struct uarte_nrfx_data *data = get_dev_data(dev); /* TX IRQ will be disabled after current transmission is finished */ @@ -1130,7 +1135,7 @@ static void uarte_nrfx_irq_tx_disable(struct device *dev) } /** Interrupt driven transfer ready function */ -static int uarte_nrfx_irq_tx_ready_complete(struct device *dev) +static int uarte_nrfx_irq_tx_ready_complete(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -1145,7 +1150,7 @@ static int uarte_nrfx_irq_tx_ready_complete(struct device *dev) nrf_uarte_int_enable_check(uarte, NRF_UARTE_INT_ENDTX_MASK); } -static int uarte_nrfx_irq_rx_ready(struct device *dev) +static int uarte_nrfx_irq_rx_ready(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1153,7 +1158,7 @@ static int uarte_nrfx_irq_rx_ready(struct device *dev) } /** Interrupt driven receiver enabling function */ -static void uarte_nrfx_irq_rx_enable(struct device *dev) +static void uarte_nrfx_irq_rx_enable(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1161,7 +1166,7 @@ static void uarte_nrfx_irq_rx_enable(struct device *dev) } /** Interrupt driven receiver disabling function */ -static void uarte_nrfx_irq_rx_disable(struct device *dev) +static void uarte_nrfx_irq_rx_disable(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1169,7 +1174,7 @@ static void uarte_nrfx_irq_rx_disable(struct device *dev) } /** Interrupt driven error enabling function */ -static void uarte_nrfx_irq_err_enable(struct device *dev) +static void uarte_nrfx_irq_err_enable(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1177,7 +1182,7 @@ static void uarte_nrfx_irq_err_enable(struct device *dev) } /** Interrupt driven error disabling function */ -static void uarte_nrfx_irq_err_disable(struct device *dev) +static void uarte_nrfx_irq_err_disable(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1185,7 +1190,7 @@ static void uarte_nrfx_irq_err_disable(struct device *dev) } /** Interrupt driven pending status function */ -static int uarte_nrfx_irq_is_pending(struct device *dev) +static int uarte_nrfx_irq_is_pending(const struct device *dev) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); @@ -1199,13 +1204,13 @@ static int uarte_nrfx_irq_is_pending(struct device *dev) } /** Interrupt driven interrupt update function */ -static int uarte_nrfx_irq_update(struct device *dev) +static int uarte_nrfx_irq_update(const struct device *dev) { return 1; } /** Set the callback function */ -static void uarte_nrfx_irq_callback_set(struct device *dev, +static void uarte_nrfx_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -1248,7 +1253,7 @@ static const struct uart_driver_api uart_nrfx_uarte_driver_api = { #endif /* UARTE_INTERRUPT_DRIVEN */ }; -static int uarte_instance_init(struct device *dev, +static int uarte_instance_init(const struct device *dev, const struct uarte_init_config *config, u8_t interrupts_active) { @@ -1321,7 +1326,7 @@ static int uarte_instance_init(struct device *dev, #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static void uarte_nrfx_pins_enable(struct device *dev, bool enable) +static void uarte_nrfx_pins_enable(const struct device *dev, bool enable) { if (!get_dev_config(dev)->gpio_mgmt) { return; @@ -1358,7 +1363,8 @@ static void uarte_nrfx_pins_enable(struct device *dev, bool enable) } } -static void uarte_nrfx_set_power_state(struct device *dev, u32_t new_state) +static void uarte_nrfx_set_power_state(const struct device *dev, + u32_t new_state) { NRF_UARTE_Type *uarte = get_uarte_instance(dev); struct uarte_nrfx_data *data = get_dev_data(dev); @@ -1417,7 +1423,7 @@ static void uarte_nrfx_set_power_state(struct device *dev, u32_t new_state) } } -static int uarte_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int uarte_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { struct uarte_nrfx_data *data = get_dev_data(dev); @@ -1480,7 +1486,7 @@ static int uarte_nrfx_pm_control(struct device *dev, u32_t ctrl_command, (.timer = NRFX_TIMER_INSTANCE( \ CONFIG_UART_##idx##_NRF_HW_ASYNC_TIMER),)) \ }; \ - static int uarte_##idx##_init(struct device *dev) \ + static int uarte_##idx##_init(const struct device *dev) \ { \ const struct uarte_init_config init_config = { \ .pseltxd = UARTE_PROP(idx, tx_pin), /* must be set */ \ diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index ecf143b80bec..d5654e7c8240 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -284,7 +284,7 @@ struct uart_ns16550_dev_data_t { static const struct uart_driver_api uart_ns16550_driver_api; -static void set_baud_rate(struct device *dev, u32_t baud_rate) +static void set_baud_rate(const struct device *dev, u32_t baud_rate) { const struct uart_ns16550_device_config * const dev_cfg = DEV_CFG(dev); struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev); @@ -312,8 +312,8 @@ static void set_baud_rate(struct device *dev, u32_t baud_rate) } } -static int uart_ns16550_configure(struct device *dev, - const struct uart_config *cfg) +static int uart_ns16550_configure(const struct device *dev, + const struct uart_config *cfg) { struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev); struct uart_ns16550_device_config * const dev_cfg = DEV_CFG(dev); @@ -437,7 +437,8 @@ static int uart_ns16550_configure(struct device *dev, return 0; }; -static int uart_ns16550_config_get(struct device *dev, struct uart_config *cfg) +static int uart_ns16550_config_get(const struct device *dev, + struct uart_config *cfg) { struct uart_ns16550_dev_data_t *data = DEV_DATA(dev); @@ -459,7 +460,7 @@ static int uart_ns16550_config_get(struct device *dev, struct uart_config *cfg) * * @return 0 if successful, failed otherwise */ -static int uart_ns16550_init(struct device *dev) +static int uart_ns16550_init(const struct device *dev) { uart_ns16550_configure(dev, &DEV_DATA(dev)->uart_config); @@ -478,7 +479,7 @@ static int uart_ns16550_init(struct device *dev) * * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_ns16550_poll_in(struct device *dev, unsigned char *c) +static int uart_ns16550_poll_in(const struct device *dev, unsigned char *c) { if ((INBYTE(LSR(dev)) & LSR_RXRDY) == 0x00) { return (-1); @@ -502,7 +503,7 @@ static int uart_ns16550_poll_in(struct device *dev, unsigned char *c) * @param dev UART device struct * @param c Character to send */ -static void uart_ns16550_poll_out(struct device *dev, +static void uart_ns16550_poll_out(const struct device *dev, unsigned char c) { /* wait for transmitter to ready to accept a character */ @@ -520,7 +521,7 @@ static void uart_ns16550_poll_out(struct device *dev, * @return one of UART_ERROR_OVERRUN, UART_ERROR_PARITY, UART_ERROR_FRAMING, * UART_BREAK if an error was detected, 0 otherwise. */ -static int uart_ns16550_err_check(struct device *dev) +static int uart_ns16550_err_check(const struct device *dev) { return (INBYTE(LSR(dev)) & LSR_EOB_MASK) >> 1; } @@ -536,7 +537,8 @@ static int uart_ns16550_err_check(struct device *dev) * * @return Number of bytes sent */ -static int uart_ns16550_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_ns16550_fifo_fill(const struct device *dev, + const u8_t *tx_data, int size) { int i; @@ -556,7 +558,7 @@ static int uart_ns16550_fifo_fill(struct device *dev, const u8_t *tx_data, * * @return Number of bytes read */ -static int uart_ns16550_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_ns16550_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { int i; @@ -575,7 +577,7 @@ static int uart_ns16550_fifo_read(struct device *dev, u8_t *rx_data, * * @return N/A */ -static void uart_ns16550_irq_tx_enable(struct device *dev) +static void uart_ns16550_irq_tx_enable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) | IER_TBE); } @@ -587,7 +589,7 @@ static void uart_ns16550_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_ns16550_irq_tx_disable(struct device *dev) +static void uart_ns16550_irq_tx_disable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) & (~IER_TBE)); } @@ -599,7 +601,7 @@ static void uart_ns16550_irq_tx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_ns16550_irq_tx_ready(struct device *dev) +static int uart_ns16550_irq_tx_ready(const struct device *dev) { return ((IIRC(dev) & IIR_ID) == IIR_THRE); } @@ -611,7 +613,7 @@ static int uart_ns16550_irq_tx_ready(struct device *dev) * * @return 1 if nothing remains to be transmitted, 0 otherwise */ -static int uart_ns16550_irq_tx_complete(struct device *dev) +static int uart_ns16550_irq_tx_complete(const struct device *dev) { return (INBYTE(LSR(dev)) & (LSR_TEMT | LSR_THRE)) == (LSR_TEMT | LSR_THRE); } @@ -623,7 +625,7 @@ static int uart_ns16550_irq_tx_complete(struct device *dev) * * @return N/A */ -static void uart_ns16550_irq_rx_enable(struct device *dev) +static void uart_ns16550_irq_rx_enable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) | IER_RXRDY); } @@ -635,7 +637,7 @@ static void uart_ns16550_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_ns16550_irq_rx_disable(struct device *dev) +static void uart_ns16550_irq_rx_disable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) & (~IER_RXRDY)); } @@ -647,7 +649,7 @@ static void uart_ns16550_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_ns16550_irq_rx_ready(struct device *dev) +static int uart_ns16550_irq_rx_ready(const struct device *dev) { return ((IIRC(dev) & IIR_ID) == IIR_RBRF); } @@ -659,7 +661,7 @@ static int uart_ns16550_irq_rx_ready(struct device *dev) * * @return N/A */ -static void uart_ns16550_irq_err_enable(struct device *dev) +static void uart_ns16550_irq_err_enable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) | IER_LSR); } @@ -671,7 +673,7 @@ static void uart_ns16550_irq_err_enable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static void uart_ns16550_irq_err_disable(struct device *dev) +static void uart_ns16550_irq_err_disable(const struct device *dev) { OUTBYTE(IER(dev), INBYTE(IER(dev)) & (~IER_LSR)); } @@ -683,7 +685,7 @@ static void uart_ns16550_irq_err_disable(struct device *dev) * * @return 1 if an IRQ is pending, 0 otherwise */ -static int uart_ns16550_irq_is_pending(struct device *dev) +static int uart_ns16550_irq_is_pending(const struct device *dev) { return (!(IIRC(dev) & IIR_NIP)); } @@ -695,7 +697,7 @@ static int uart_ns16550_irq_is_pending(struct device *dev) * * @return Always 1 */ -static int uart_ns16550_irq_update(struct device *dev) +static int uart_ns16550_irq_update(const struct device *dev) { IIRC(dev) = INBYTE(IIR(dev)); @@ -710,7 +712,7 @@ static int uart_ns16550_irq_update(struct device *dev) * * @return N/A */ -static void uart_ns16550_irq_callback_set(struct device *dev, +static void uart_ns16550_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -731,7 +733,7 @@ static void uart_ns16550_irq_callback_set(struct device *dev, */ static void uart_ns16550_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev); if (dev_data->cb) { @@ -752,7 +754,7 @@ static void uart_ns16550_isr(void *arg) * * @return 0 if successful, failed otherwise */ -static int uart_ns16550_line_ctrl_set(struct device *dev, +static int uart_ns16550_line_ctrl_set(const struct device *dev, u32_t ctrl, u32_t val) { u32_t mdc, chg; @@ -797,7 +799,7 @@ static int uart_ns16550_line_ctrl_set(struct device *dev, * * @return 0 if successful, failed otherwise */ -static int uart_ns16550_drv_cmd(struct device *dev, u32_t cmd, u32_t p) +static int uart_ns16550_drv_cmd(const struct device *dev, u32_t cmd, u32_t p) { #ifdef UART_NS16550_DLF_ENABLED if (cmd == CMD_SET_DLF) { diff --git a/drivers/serial/uart_ns16550_port_x.h b/drivers/serial/uart_ns16550_port_x.h index ee679393fe92..dfced29a878c 100644 --- a/drivers/serial/uart_ns16550_port_x.h +++ b/drivers/serial/uart_ns16550_port_x.h @@ -10,7 +10,7 @@ #if DT_NODE_HAS_STATUS(DT_DRV_INST(@NUM@), okay) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_@NUM@(struct device *port); +static void irq_config_func_@NUM@(const struct device *port); #endif static const struct uart_ns16550_device_config uart_ns16550_dev_cfg_@NUM@ = { @@ -62,7 +62,7 @@ DEVICE_AND_API_INIT(uart_ns16550_@NUM@, DT_INST_LABEL(@NUM@), #endif #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_@NUM@(struct device *dev) +static void irq_config_func_@NUM@(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c index 5d559d6500b8..41d7ed0badac 100644 --- a/drivers/serial/uart_nsim.c +++ b/drivers/serial/uart_nsim.c @@ -74,7 +74,7 @@ static const struct uart_driver_api uart_nsim_driver_api; * * @return 0 */ -static int uart_nsim_init(struct device *dev) +static int uart_nsim_init(const struct device *dev) { ARG_UNUSED(dev); @@ -87,7 +87,7 @@ static int uart_nsim_init(struct device *dev) * @param dev UART device struct * @param c character to output */ -static void uart_nsim_poll_out(struct device *dev, unsigned char c) +static void uart_nsim_poll_out(const struct device *dev, unsigned char c) { u32_t regs = DEV_CFG(dev)->regs; /* wait for transmitter to ready to accept a character */ @@ -98,7 +98,7 @@ static void uart_nsim_poll_out(struct device *dev, unsigned char c) UART_SET_DATA(regs, c); } -static int uart_nsim_poll_in(struct device *dev, unsigned char *c) +static int uart_nsim_poll_in(const struct device *dev, unsigned char *c) { return -ENOTSUP; diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c index 8fdb9bbb8363..977d8282d5ef 100644 --- a/drivers/serial/uart_pl011.c +++ b/drivers/serial/uart_pl011.c @@ -147,27 +147,27 @@ struct pl011_data { #define PL011_REGS(dev) \ ((volatile struct pl011_regs *)(DEV_CFG(dev))->base) -static void pl011_enable(struct device *dev) +static void pl011_enable(const struct device *dev) { PL011_REGS(dev)->cr |= PL011_CR_UARTEN; } -static void pl011_disable(struct device *dev) +static void pl011_disable(const struct device *dev) { PL011_REGS(dev)->cr &= ~PL011_CR_UARTEN; } -static void pl011_enable_fifo(struct device *dev) +static void pl011_enable_fifo(const struct device *dev) { PL011_REGS(dev)->lcr_h |= PL011_LCRH_FEN; } -static void pl011_disable_fifo(struct device *dev) +static void pl011_disable_fifo(const struct device *dev) { PL011_REGS(dev)->lcr_h &= ~PL011_LCRH_FEN; } -static int pl011_set_baudrate(struct device *dev, +static int pl011_set_baudrate(const struct device *dev, u32_t clk, u32_t baudrate) { /* Avoiding float calculations, bauddiv is left shifted by 6 */ @@ -197,7 +197,7 @@ static int pl011_set_baudrate(struct device *dev, return 0; } -static bool pl011_is_readable(struct device *dev) +static bool pl011_is_readable(const struct device *dev) { if ((PL011_REGS(dev)->cr & PL011_CR_UARTEN) && (PL011_REGS(dev)->cr & PL011_CR_RXE) && @@ -208,7 +208,7 @@ static bool pl011_is_readable(struct device *dev) return false; } -static int pl011_poll_in(struct device *dev, unsigned char *c) +static int pl011_poll_in(const struct device *dev, unsigned char *c) { if (!pl011_is_readable(dev)) { return -1; @@ -220,7 +220,7 @@ static int pl011_poll_in(struct device *dev, unsigned char *c) return PL011_REGS(dev)->rsr & PL011_RSR_ERROR_MASK; } -static void pl011_poll_out(struct device *dev, +static void pl011_poll_out(const struct device *dev, unsigned char c) { /* Wait for space in FIFO */ @@ -233,7 +233,7 @@ static void pl011_poll_out(struct device *dev, } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int pl011_fifo_fill(struct device *dev, +static int pl011_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { u8_t num_tx = 0U; @@ -245,7 +245,7 @@ static int pl011_fifo_fill(struct device *dev, return num_tx; } -static int pl011_fifo_read(struct device *dev, +static int pl011_fifo_read(const struct device *dev, u8_t *rx_data, const int len) { u8_t num_rx = 0U; @@ -258,70 +258,70 @@ static int pl011_fifo_read(struct device *dev, return num_rx; } -static void pl011_irq_tx_enable(struct device *dev) +static void pl011_irq_tx_enable(const struct device *dev) { PL011_REGS(dev)->imsc |= PL011_IMSC_TXIM; } -static void pl011_irq_tx_disable(struct device *dev) +static void pl011_irq_tx_disable(const struct device *dev) { PL011_REGS(dev)->imsc &= ~PL011_IMSC_TXIM; } -static int pl011_irq_tx_complete(struct device *dev) +static int pl011_irq_tx_complete(const struct device *dev) { /* check for TX FIFO empty */ return PL011_REGS(dev)->fr & PL011_FR_TXFE; } -static int pl011_irq_tx_ready(struct device *dev) +static int pl011_irq_tx_ready(const struct device *dev) { return ((PL011_REGS(dev)->cr & PL011_CR_TXE) && (PL011_REGS(dev)->imsc & PL011_IMSC_TXIM) && pl011_irq_tx_complete(dev)); } -static void pl011_irq_rx_enable(struct device *dev) +static void pl011_irq_rx_enable(const struct device *dev) { PL011_REGS(dev)->imsc |= PL011_IMSC_RXIM | PL011_IMSC_RTIM; } -static void pl011_irq_rx_disable(struct device *dev) +static void pl011_irq_rx_disable(const struct device *dev) { PL011_REGS(dev)->imsc &= ~(PL011_IMSC_RXIM | PL011_IMSC_RTIM); } -static int pl011_irq_rx_ready(struct device *dev) +static int pl011_irq_rx_ready(const struct device *dev) { return ((PL011_REGS(dev)->cr & PL011_CR_RXE) && (PL011_REGS(dev)->imsc & PL011_IMSC_RXIM) && (!(PL011_REGS(dev)->fr & PL011_FR_RXFE))); } -static void pl011_irq_err_enable(struct device *dev) +static void pl011_irq_err_enable(const struct device *dev) { /* enable framing, parity, break, and overrun */ PL011_REGS(dev)->imsc |= PL011_IMSC_ERROR_MASK; } -static void pl011_irq_err_disable(struct device *dev) +static void pl011_irq_err_disable(const struct device *dev) { PL011_REGS(dev)->imsc &= ~PL011_IMSC_ERROR_MASK; } -static int pl011_irq_is_pending(struct device *dev) +static int pl011_irq_is_pending(const struct device *dev) { return pl011_irq_rx_ready(dev) || pl011_irq_tx_ready(dev); } -static int pl011_irq_update(struct device *dev) +static int pl011_irq_update(const struct device *dev) { return 1; } -static void pl011_irq_callback_set(struct device *dev, +static void pl011_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -351,7 +351,7 @@ static const struct uart_driver_api pl011_driver_api = { #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ }; -static int pl011_init(struct device *dev) +static int pl011_init(const struct device *dev) { int ret; u32_t lcrh; @@ -397,7 +397,7 @@ static int pl011_init(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN void pl011_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct pl011_data *data = DEV_DATA(dev); /* Verify if the callback has been registered */ @@ -411,7 +411,7 @@ void pl011_isr(void *arg) #ifdef CONFIG_UART_PL011_PORT0 #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void pl011_irq_config_func_0(struct device *dev); +static void pl011_irq_config_func_0(const struct device *dev); #endif static struct uart_device_config pl011_cfg_port_0 = { @@ -435,7 +435,7 @@ DEVICE_AND_API_INIT(pl011_port_0, &pl011_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void pl011_irq_config_func_0(struct device *dev) +static void pl011_irq_config_func_0(const struct device *dev) { #if DT_NUM_IRQS(DT_INST(0, arm_pl011)) == 1 IRQ_CONNECT(DT_INST_IRQN(0), @@ -474,7 +474,7 @@ static void pl011_irq_config_func_0(struct device *dev) #ifdef CONFIG_UART_PL011_PORT1 #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void pl011_irq_config_func_1(struct device *dev); +static void pl011_irq_config_func_1(const struct device *dev); #endif static struct uart_device_config pl011_cfg_port_1 = { @@ -498,7 +498,7 @@ DEVICE_AND_API_INIT(pl011_port_1, &pl011_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void pl011_irq_config_func_1(struct device *dev) +static void pl011_irq_config_func_1(const struct device *dev) { #if DT_NUM_IRQS(DT_INST(1, arm_pl011)) == 1 IRQ_CONNECT(DT_INST_IRQN(1), diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c index ddbe0e7ce9e3..1a84b2652a13 100644 --- a/drivers/serial/uart_psoc6.c +++ b/drivers/serial/uart_psoc6.c @@ -92,7 +92,7 @@ static const cy_stc_scb_uart_config_t uartConfig = { * Peforms hardware initialization: debug UART. * */ -static int uart_psoc6_init(struct device *dev) +static int uart_psoc6_init(const struct device *dev) { const struct cypress_psoc6_config *config = dev->config_info; @@ -123,7 +123,7 @@ static int uart_psoc6_init(struct device *dev) return 0; } -static int uart_psoc6_poll_in(struct device *dev, unsigned char *c) +static int uart_psoc6_poll_in(const struct device *dev, unsigned char *c) { const struct cypress_psoc6_config *config = dev->config_info; u32_t rec; @@ -134,7 +134,7 @@ static int uart_psoc6_poll_in(struct device *dev, unsigned char *c) return ((rec == CY_SCB_UART_RX_NO_DATA) ? -1 : 0); } -static void uart_psoc6_poll_out(struct device *dev, unsigned char c) +static void uart_psoc6_poll_out(const struct device *dev, unsigned char c) { const struct cypress_psoc6_config *config = dev->config_info; diff --git a/drivers/serial/uart_rtt.c b/drivers/serial/uart_rtt.c index 5e319adaf364..e09318d89409 100644 --- a/drivers/serial/uart_rtt.c +++ b/drivers/serial/uart_rtt.c @@ -15,12 +15,12 @@ struct uart_rtt_config { u8_t channel; }; -static inline const struct uart_rtt_config *get_dev_config(struct device *dev) +static inline const struct uart_rtt_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static int uart_rtt_init(struct device *dev) +static int uart_rtt_init(const struct device *dev) { /* * Channel 0 is initialized at compile-time, Kconfig ensures that @@ -49,7 +49,7 @@ static int uart_rtt_init(struct device *dev) * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_rtt_poll_in(struct device *dev, unsigned char *c) +static int uart_rtt_poll_in(const struct device *dev, unsigned char *c) { unsigned int ch = get_dev_config(dev) ? get_dev_config(dev)->channel : 0; @@ -64,7 +64,7 @@ static int uart_rtt_poll_in(struct device *dev, unsigned char *c) * @param dev UART device struct * @param c Character to send */ -static void uart_rtt_poll_out(struct device *dev, unsigned char c) +static void uart_rtt_poll_out(const struct device *dev, unsigned char c) { unsigned int ch = get_dev_config(dev) ? get_dev_config(dev)->channel : 0; diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c index e69497af4f35..090a71d8c9c2 100644 --- a/drivers/serial/uart_rv32m1_lpuart.c +++ b/drivers/serial/uart_rv32m1_lpuart.c @@ -23,7 +23,7 @@ struct rv32m1_lpuart_config { u32_t baud_rate; u8_t hw_flow_control; #ifdef CONFIG_UART_INTERRUPT_DRIVEN - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif }; @@ -34,7 +34,7 @@ struct rv32m1_lpuart_data { #endif }; -static int rv32m1_lpuart_poll_in(struct device *dev, unsigned char *c) +static int rv32m1_lpuart_poll_in(const struct device *dev, unsigned char *c) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -48,7 +48,7 @@ static int rv32m1_lpuart_poll_in(struct device *dev, unsigned char *c) return ret; } -static void rv32m1_lpuart_poll_out(struct device *dev, unsigned char c) +static void rv32m1_lpuart_poll_out(const struct device *dev, unsigned char c) { const struct rv32m1_lpuart_config *config = dev->config_info; @@ -59,7 +59,7 @@ static void rv32m1_lpuart_poll_out(struct device *dev, unsigned char c) LPUART_WriteByte(config->base, c); } -static int rv32m1_lpuart_err_check(struct device *dev) +static int rv32m1_lpuart_err_check(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -85,8 +85,9 @@ static int rv32m1_lpuart_err_check(struct device *dev) } #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int rv32m1_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data, - int len) +static int rv32m1_lpuart_fifo_fill(const struct device *dev, + const u8_t *tx_data, + int len) { const struct rv32m1_lpuart_config *config = dev->config_info; u8_t num_tx = 0U; @@ -101,8 +102,8 @@ static int rv32m1_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int rv32m1_lpuart_fifo_read(struct device *dev, u8_t *rx_data, - const int len) +static int rv32m1_lpuart_fifo_read(const struct device *dev, u8_t *rx_data, + const int len) { const struct rv32m1_lpuart_config *config = dev->config_info; u8_t num_rx = 0U; @@ -117,7 +118,7 @@ static int rv32m1_lpuart_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void rv32m1_lpuart_irq_tx_enable(struct device *dev) +static void rv32m1_lpuart_irq_tx_enable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -125,7 +126,7 @@ static void rv32m1_lpuart_irq_tx_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void rv32m1_lpuart_irq_tx_disable(struct device *dev) +static void rv32m1_lpuart_irq_tx_disable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -133,7 +134,7 @@ static void rv32m1_lpuart_irq_tx_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int rv32m1_lpuart_irq_tx_complete(struct device *dev) +static int rv32m1_lpuart_irq_tx_complete(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -141,7 +142,7 @@ static int rv32m1_lpuart_irq_tx_complete(struct device *dev) return (flags & kLPUART_TxDataRegEmptyFlag) != 0U; } -static int rv32m1_lpuart_irq_tx_ready(struct device *dev) +static int rv32m1_lpuart_irq_tx_ready(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; @@ -150,7 +151,7 @@ static int rv32m1_lpuart_irq_tx_ready(struct device *dev) && rv32m1_lpuart_irq_tx_complete(dev); } -static void rv32m1_lpuart_irq_rx_enable(struct device *dev) +static void rv32m1_lpuart_irq_rx_enable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -158,7 +159,7 @@ static void rv32m1_lpuart_irq_rx_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void rv32m1_lpuart_irq_rx_disable(struct device *dev) +static void rv32m1_lpuart_irq_rx_disable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -166,7 +167,7 @@ static void rv32m1_lpuart_irq_rx_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int rv32m1_lpuart_irq_rx_full(struct device *dev) +static int rv32m1_lpuart_irq_rx_full(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t flags = LPUART_GetStatusFlags(config->base); @@ -174,7 +175,7 @@ static int rv32m1_lpuart_irq_rx_full(struct device *dev) return (flags & kLPUART_RxDataRegFullFlag) != 0U; } -static int rv32m1_lpuart_irq_rx_ready(struct device *dev) +static int rv32m1_lpuart_irq_rx_ready(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_RxDataRegFullInterruptEnable; @@ -183,7 +184,7 @@ static int rv32m1_lpuart_irq_rx_ready(struct device *dev) && rv32m1_lpuart_irq_rx_full(dev); } -static void rv32m1_lpuart_irq_err_enable(struct device *dev) +static void rv32m1_lpuart_irq_err_enable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_NoiseErrorInterruptEnable | @@ -193,7 +194,7 @@ static void rv32m1_lpuart_irq_err_enable(struct device *dev) LPUART_EnableInterrupts(config->base, mask); } -static void rv32m1_lpuart_irq_err_disable(struct device *dev) +static void rv32m1_lpuart_irq_err_disable(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; u32_t mask = kLPUART_NoiseErrorInterruptEnable | @@ -203,20 +204,20 @@ static void rv32m1_lpuart_irq_err_disable(struct device *dev) LPUART_DisableInterrupts(config->base, mask); } -static int rv32m1_lpuart_irq_is_pending(struct device *dev) +static int rv32m1_lpuart_irq_is_pending(const struct device *dev) { return (rv32m1_lpuart_irq_tx_ready(dev) || rv32m1_lpuart_irq_rx_ready(dev)); } -static int rv32m1_lpuart_irq_update(struct device *dev) +static int rv32m1_lpuart_irq_update(const struct device *dev) { return 1; } -static void rv32m1_lpuart_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void rv32m1_lpuart_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct rv32m1_lpuart_data *data = dev->driver_data; @@ -226,7 +227,7 @@ static void rv32m1_lpuart_irq_callback_set(struct device *dev, static void rv32m1_lpuart_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct rv32m1_lpuart_data *data = dev->driver_data; if (data->callback) { @@ -235,11 +236,11 @@ static void rv32m1_lpuart_isr(void *arg) } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int rv32m1_lpuart_init(struct device *dev) +static int rv32m1_lpuart_init(const struct device *dev) { const struct rv32m1_lpuart_config *config = dev->config_info; lpuart_config_t uart_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; /* set clock source */ @@ -311,7 +312,7 @@ static const struct uart_driver_api rv32m1_lpuart_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define RV32M1_LPUART_CONFIG_FUNC(n) \ - static void rv32m1_lpuart_config_func_##n(struct device *dev) \ + static void rv32m1_lpuart_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), 0, rv32m1_lpuart_isr, \ DEVICE_GET(uart_0), 0); \ diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c index 937041e66731..b6e2a7c5995b 100644 --- a/drivers/serial/uart_sam.c +++ b/drivers/serial/uart_sam.c @@ -53,7 +53,7 @@ static int baudrate_set(Uart *const uart, u32_t baudrate, u32_t mck_freq_hz); -static int uart_sam_init(struct device *dev) +static int uart_sam_init(const struct device *dev) { int retval; const struct uart_sam_dev_cfg *const cfg = DEV_CFG(dev); @@ -97,7 +97,7 @@ static int uart_sam_init(struct device *dev) return 0; } -static int uart_sam_poll_in(struct device *dev, unsigned char *c) +static int uart_sam_poll_in(const struct device *dev, unsigned char *c) { Uart *const uart = DEV_CFG(dev)->regs; @@ -111,7 +111,7 @@ static int uart_sam_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_sam_poll_out(struct device *dev, unsigned char c) +static void uart_sam_poll_out(const struct device *dev, unsigned char c) { Uart *const uart = DEV_CFG(dev)->regs; @@ -123,7 +123,7 @@ static void uart_sam_poll_out(struct device *dev, unsigned char c) uart->UART_THR = (u32_t)c; } -static int uart_sam_err_check(struct device *dev) +static int uart_sam_err_check(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; int errors = 0; @@ -166,7 +166,8 @@ static int baudrate_set(Uart *const uart, u32_t baudrate, #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_sam_fifo_fill(struct device *dev, const uint8_t *tx_data, +static int uart_sam_fifo_fill(const struct device *dev, + const uint8_t *tx_data, int size) { volatile Uart * const uart = DEV_CFG(dev)->regs; @@ -180,7 +181,7 @@ static int uart_sam_fifo_fill(struct device *dev, const uint8_t *tx_data, return 1; } -static int uart_sam_fifo_read(struct device *dev, uint8_t *rx_data, +static int uart_sam_fifo_read(const struct device *dev, uint8_t *rx_data, const int size) { volatile Uart * const uart = DEV_CFG(dev)->regs; @@ -200,70 +201,70 @@ static int uart_sam_fifo_read(struct device *dev, uint8_t *rx_data, return bytes_read; } -static void uart_sam_irq_tx_enable(struct device *dev) +static void uart_sam_irq_tx_enable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IER = UART_IER_TXRDY; } -static void uart_sam_irq_tx_disable(struct device *dev) +static void uart_sam_irq_tx_disable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IDR = UART_IDR_TXRDY; } -static int uart_sam_irq_tx_ready(struct device *dev) +static int uart_sam_irq_tx_ready(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; return (uart->UART_SR & UART_SR_TXRDY); } -static void uart_sam_irq_rx_enable(struct device *dev) +static void uart_sam_irq_rx_enable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IER = UART_IER_RXRDY; } -static void uart_sam_irq_rx_disable(struct device *dev) +static void uart_sam_irq_rx_disable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IDR = UART_IDR_RXRDY; } -static int uart_sam_irq_tx_complete(struct device *dev) +static int uart_sam_irq_tx_complete(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; return !(uart->UART_SR & UART_SR_TXRDY); } -static int uart_sam_irq_rx_ready(struct device *dev) +static int uart_sam_irq_rx_ready(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; return (uart->UART_SR & UART_SR_RXRDY); } -static void uart_sam_irq_err_enable(struct device *dev) +static void uart_sam_irq_err_enable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IER = UART_IER_OVRE | UART_IER_FRAME | UART_IER_PARE; } -static void uart_sam_irq_err_disable(struct device *dev) +static void uart_sam_irq_err_disable(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; uart->UART_IDR = UART_IDR_OVRE | UART_IDR_FRAME | UART_IDR_PARE; } -static int uart_sam_irq_is_pending(struct device *dev) +static int uart_sam_irq_is_pending(const struct device *dev) { volatile Uart * const uart = DEV_CFG(dev)->regs; @@ -271,14 +272,14 @@ static int uart_sam_irq_is_pending(struct device *dev) (uart->UART_SR & (UART_SR_TXRDY | UART_SR_RXRDY)); } -static int uart_sam_irq_update(struct device *dev) +static int uart_sam_irq_update(const struct device *dev) { ARG_UNUSED(dev); return 1; } -static void uart_sam_irq_callback_set(struct device *dev, +static void uart_sam_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -290,7 +291,7 @@ static void uart_sam_irq_callback_set(struct device *dev, static void uart_sam_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_sam_dev_data *const dev_data = DEV_DATA(dev); if (dev_data->irq_cb) { @@ -335,7 +336,7 @@ static const struct uart_driver_api uart_sam_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define UART_SAM_CONFIG_FUNC(n) \ - static void uart##n##_sam_irq_config_func(struct device *port) \ + static void uart##n##_sam_irq_config_func(const struct device *port) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c index d1aaf6bfc365..09fac90daad7 100644 --- a/drivers/serial/uart_sam0.c +++ b/drivers/serial/uart_sam0.c @@ -33,7 +33,7 @@ struct uart_sam0_dev_cfg { u16_t gclk_clkctrl_id; #endif #if CONFIG_UART_INTERRUPT_DRIVEN || CONFIG_UART_ASYNC_API - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); #endif #if CONFIG_UART_ASYNC_API char *dma_dev; @@ -53,7 +53,7 @@ struct uart_sam0_dev_data { #endif #if CONFIG_UART_ASYNC_API const struct uart_sam0_dev_cfg *cfg; - struct device *dma; + const struct device *dma; uart_callback_t async_cb; void *async_cb_data; @@ -124,7 +124,7 @@ static void uart_sam0_dma_tx_done(void *arg, u32_t id, int error_code) ARG_UNUSED(id); ARG_UNUSED(error_code); - struct device *dev = arg; + const struct device *dev = arg; struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); k_delayed_work_cancel(&dev_data->tx_timeout_work); @@ -224,7 +224,7 @@ static void uart_sam0_dma_rx_done(void *arg, u32_t id, int error_code) ARG_UNUSED(id); ARG_UNUSED(error_code); - struct device *dev = arg; + const struct device *dev = arg; struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); const struct uart_sam0_dev_cfg *const cfg = dev_data->cfg; SercomUsart * const regs = cfg->regs; @@ -384,7 +384,7 @@ static void uart_sam0_rx_timeout(struct k_work *work) #endif -static int uart_sam0_configure(struct device *dev, +static int uart_sam0_configure(const struct device *dev, const struct uart_config *new_cfg) { int retval; @@ -483,7 +483,7 @@ static int uart_sam0_configure(struct device *dev, return 0; } -static int uart_sam0_config_get(struct device *dev, +static int uart_sam0_config_get(const struct device *dev, struct uart_config *out_cfg) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); @@ -493,7 +493,7 @@ static int uart_sam0_config_get(struct device *dev, return 0; } -static int uart_sam0_init(struct device *dev) +static int uart_sam0_init(const struct device *dev) { int retval; const struct uart_sam0_dev_cfg *const cfg = DEV_CFG(dev); @@ -626,7 +626,7 @@ static int uart_sam0_init(struct device *dev) return 0; } -static int uart_sam0_poll_in(struct device *dev, unsigned char *c) +static int uart_sam0_poll_in(const struct device *dev, unsigned char *c) { SercomUsart *const usart = DEV_CFG(dev)->regs; @@ -638,7 +638,7 @@ static int uart_sam0_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_sam0_poll_out(struct device *dev, unsigned char c) +static void uart_sam0_poll_out(const struct device *dev, unsigned char c) { SercomUsart *const usart = DEV_CFG(dev)->regs; @@ -653,7 +653,7 @@ static void uart_sam0_poll_out(struct device *dev, unsigned char c) static void uart_sam0_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); #if CONFIG_UART_INTERRUPT_DRIVEN @@ -701,7 +701,8 @@ static void uart_sam0_isr(void *arg) #if CONFIG_UART_INTERRUPT_DRIVEN -static int uart_sam0_fifo_fill(struct device *dev, const u8_t *tx_data, int len) +static int uart_sam0_fifo_fill(const struct device *dev, const u8_t *tx_data, + int len) { SercomUsart *regs = DEV_CFG(dev)->regs; @@ -713,49 +714,49 @@ static int uart_sam0_fifo_fill(struct device *dev, const u8_t *tx_data, int len) } } -static void uart_sam0_irq_tx_enable(struct device *dev) +static void uart_sam0_irq_tx_enable(const struct device *dev) { SercomUsart *regs = DEV_CFG(dev)->regs; regs->INTENSET.reg = SERCOM_USART_INTENCLR_DRE; } -static void uart_sam0_irq_tx_disable(struct device *dev) +static void uart_sam0_irq_tx_disable(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; regs->INTENCLR.reg = SERCOM_USART_INTENCLR_DRE; } -static int uart_sam0_irq_tx_ready(struct device *dev) +static int uart_sam0_irq_tx_ready(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; return regs->INTFLAG.bit.DRE != 0; } -static void uart_sam0_irq_rx_enable(struct device *dev) +static void uart_sam0_irq_rx_enable(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; regs->INTENSET.reg = SERCOM_USART_INTENSET_RXC; } -static void uart_sam0_irq_rx_disable(struct device *dev) +static void uart_sam0_irq_rx_disable(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; regs->INTENCLR.reg = SERCOM_USART_INTENCLR_RXC; } -static int uart_sam0_irq_rx_ready(struct device *dev) +static int uart_sam0_irq_rx_ready(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; return regs->INTFLAG.bit.RXC != 0; } -static int uart_sam0_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_sam0_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { SercomUsart *const regs = DEV_CFG(dev)->regs; @@ -773,16 +774,16 @@ static int uart_sam0_fifo_read(struct device *dev, u8_t *rx_data, return 0; } -static int uart_sam0_irq_is_pending(struct device *dev) +static int uart_sam0_irq_is_pending(const struct device *dev) { SercomUsart *const regs = DEV_CFG(dev)->regs; return (regs->INTENSET.reg & regs->INTFLAG.reg) != 0; } -static int uart_sam0_irq_update(struct device *dev) { return 1; } +static int uart_sam0_irq_update(const struct device *dev) { return 1; } -static void uart_sam0_irq_callback_set(struct device *dev, +static void uart_sam0_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -795,7 +796,8 @@ static void uart_sam0_irq_callback_set(struct device *dev, #ifdef CONFIG_UART_ASYNC_API -static int uart_sam0_callback_set(struct device *dev, uart_callback_t callback, +static int uart_sam0_callback_set(const struct device *dev, + uart_callback_t callback, void *user_data) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); @@ -806,7 +808,7 @@ static int uart_sam0_callback_set(struct device *dev, uart_callback_t callback, return 0; } -static int uart_sam0_tx(struct device *dev, const u8_t *buf, size_t len, +static int uart_sam0_tx(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); @@ -851,7 +853,7 @@ static int uart_sam0_tx(struct device *dev, const u8_t *buf, size_t len, return retval; } -static int uart_sam0_tx_abort(struct device *dev) +static int uart_sam0_tx_abort(const struct device *dev) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); const struct uart_sam0_dev_cfg *const cfg = DEV_CFG(dev); @@ -865,7 +867,8 @@ static int uart_sam0_tx_abort(struct device *dev) return uart_sam0_tx_halt(dev_data); } -static int uart_sam0_rx_enable(struct device *dev, u8_t *buf, size_t len, +static int uart_sam0_rx_enable(const struct device *dev, u8_t *buf, + size_t len, s32_t timeout) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); @@ -920,7 +923,8 @@ static int uart_sam0_rx_enable(struct device *dev, u8_t *buf, size_t len, return retval; } -static int uart_sam0_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) +static int uart_sam0_rx_buf_rsp(const struct device *dev, u8_t *buf, + size_t len) { if (len > 0xFFFFU) { return -EINVAL; @@ -951,7 +955,7 @@ static int uart_sam0_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) return retval; } -static int uart_sam0_rx_disable(struct device *dev) +static int uart_sam0_rx_disable(const struct device *dev) { struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev); const struct uart_sam0_dev_cfg *const cfg = DEV_CFG(dev); @@ -1059,13 +1063,13 @@ static const struct uart_driver_api uart_sam0_driver_api = { } while (0) #define UART_SAM0_IRQ_HANDLER_DECL(n) \ - static void uart_sam0_irq_config_##n(struct device *dev) + static void uart_sam0_irq_config_##n(const struct device *dev) #define UART_SAM0_IRQ_HANDLER_FUNC(n) \ .irq_config_func = uart_sam0_irq_config_##n, #if DT_INST_IRQ_HAS_IDX(0, 3) #define UART_SAM0_IRQ_HANDLER(n) \ -static void uart_sam0_irq_config_##n(struct device *dev) \ +static void uart_sam0_irq_config_##n(const struct device *dev) \ { \ SAM0_UART_IRQ_CONNECT(n, 0); \ SAM0_UART_IRQ_CONNECT(n, 1); \ @@ -1074,7 +1078,7 @@ static void uart_sam0_irq_config_##n(struct device *dev) \ } #else #define UART_SAM0_IRQ_HANDLER(n) \ -static void uart_sam0_irq_config_##n(struct device *dev) \ +static void uart_sam0_irq_config_##n(const struct device *dev) \ { \ SAM0_UART_IRQ_CONNECT(n, 0); \ } diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c index ab95f4f34f5c..d9baa2289760 100644 --- a/drivers/serial/uart_sifive.c +++ b/drivers/serial/uart_sifive.c @@ -80,7 +80,7 @@ struct uart_sifive_data { * @param dev UART device struct * @param c Character to send */ -static void uart_sifive_poll_out(struct device *dev, +static void uart_sifive_poll_out(const struct device *dev, unsigned char c) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -100,7 +100,7 @@ static void uart_sifive_poll_out(struct device *dev, * * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_sifive_poll_in(struct device *dev, unsigned char *c) +static int uart_sifive_poll_in(const struct device *dev, unsigned char *c) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); u32_t val = uart->rx; @@ -125,9 +125,9 @@ static int uart_sifive_poll_in(struct device *dev, unsigned char *c) * * @return Number of bytes sent */ -static int uart_sifive_fifo_fill(struct device *dev, - const u8_t *tx_data, - int size) +static int uart_sifive_fifo_fill(const struct device *dev, + const u8_t *tx_data, + int size) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); int i; @@ -147,9 +147,9 @@ static int uart_sifive_fifo_fill(struct device *dev, * * @return Number of bytes read */ -static int uart_sifive_fifo_read(struct device *dev, - u8_t *rx_data, - const int size) +static int uart_sifive_fifo_read(const struct device *dev, + u8_t *rx_data, + const int size) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); int i; @@ -174,7 +174,7 @@ static int uart_sifive_fifo_read(struct device *dev, * * @return N/A */ -static void uart_sifive_irq_tx_enable(struct device *dev) +static void uart_sifive_irq_tx_enable(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -188,7 +188,7 @@ static void uart_sifive_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_sifive_irq_tx_disable(struct device *dev) +static void uart_sifive_irq_tx_disable(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -202,7 +202,7 @@ static void uart_sifive_irq_tx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_sifive_irq_tx_ready(struct device *dev) +static int uart_sifive_irq_tx_ready(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -216,7 +216,7 @@ static int uart_sifive_irq_tx_ready(struct device *dev) * * @return 1 if nothing remains to be transmitted, 0 otherwise */ -static int uart_sifive_irq_tx_complete(struct device *dev) +static int uart_sifive_irq_tx_complete(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -234,7 +234,7 @@ static int uart_sifive_irq_tx_complete(struct device *dev) * * @return N/A */ -static void uart_sifive_irq_rx_enable(struct device *dev) +static void uart_sifive_irq_rx_enable(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -248,7 +248,7 @@ static void uart_sifive_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_sifive_irq_rx_disable(struct device *dev) +static void uart_sifive_irq_rx_disable(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -262,7 +262,7 @@ static void uart_sifive_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_sifive_irq_rx_ready(struct device *dev) +static int uart_sifive_irq_rx_ready(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); @@ -270,12 +270,12 @@ static int uart_sifive_irq_rx_ready(struct device *dev) } /* No error interrupt for this controller */ -static void uart_sifive_irq_err_enable(struct device *dev) +static void uart_sifive_irq_err_enable(const struct device *dev) { ARG_UNUSED(dev); } -static void uart_sifive_irq_err_disable(struct device *dev) +static void uart_sifive_irq_err_disable(const struct device *dev) { ARG_UNUSED(dev); } @@ -287,14 +287,14 @@ static void uart_sifive_irq_err_disable(struct device *dev) * * @return 1 if an IRQ is pending, 0 otherwise */ -static int uart_sifive_irq_is_pending(struct device *dev) +static int uart_sifive_irq_is_pending(const struct device *dev) { volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); return !!(uart->ip & (IE_RXWM | IE_TXWM)); } -static int uart_sifive_irq_update(struct device *dev) +static int uart_sifive_irq_update(const struct device *dev) { return 1; } @@ -307,9 +307,9 @@ static int uart_sifive_irq_update(struct device *dev) * * @return N/A */ -static void uart_sifive_irq_callback_set(struct device *dev, - uart_irq_callback_user_data_t cb, - void *cb_data) +static void uart_sifive_irq_callback_set(const struct device *dev, + uart_irq_callback_user_data_t cb, + void *cb_data) { struct uart_sifive_data *data = DEV_DATA(dev); @@ -319,7 +319,7 @@ static void uart_sifive_irq_callback_set(struct device *dev, static void uart_sifive_irq_handler(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; struct uart_sifive_data *data = DEV_DATA(dev); if (data->callback) @@ -329,7 +329,7 @@ static void uart_sifive_irq_handler(void *arg) #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -static int uart_sifive_init(struct device *dev) +static int uart_sifive_init(const struct device *dev) { const struct uart_sifive_device_config * const cfg = DEV_CFG(dev); volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c index 5918144ffeab..5a33dbc869c6 100644 --- a/drivers/serial/uart_stellaris.c +++ b/drivers/serial/uart_stellaris.c @@ -159,7 +159,7 @@ static const struct uart_driver_api uart_stellaris_driver_api; * * @return N/A */ -static void baudrate_set(struct device *dev, +static void baudrate_set(const struct device *dev, u32_t baudrate, u32_t sys_clk_freq_hz) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -196,7 +196,7 @@ static void baudrate_set(struct device *dev, * * @return N/A */ -static inline void enable(struct device *dev) +static inline void enable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -212,7 +212,7 @@ static inline void enable(struct device *dev) * * @return N/A */ -static inline void disable(struct device *dev) +static inline void disable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -245,7 +245,7 @@ static inline void disable(struct device *dev) * * @return N/A */ -static inline void line_control_defaults_set(struct device *dev) +static inline void line_control_defaults_set(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -262,7 +262,7 @@ static inline void line_control_defaults_set(struct device *dev) * * @return 0 */ -static int uart_stellaris_init(struct device *dev) +static int uart_stellaris_init(const struct device *dev) { disable(dev); baudrate_set(dev, DEV_DATA(dev)->baud_rate, @@ -286,7 +286,7 @@ static int uart_stellaris_init(struct device *dev) * * @return 0 if ready to transmit, 1 otherwise */ -static int poll_tx_ready(struct device *dev) +static int poll_tx_ready(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -302,7 +302,7 @@ static int poll_tx_ready(struct device *dev) * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_stellaris_poll_in(struct device *dev, unsigned char *c) +static int uart_stellaris_poll_in(const struct device *dev, unsigned char *c) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -325,7 +325,7 @@ static int uart_stellaris_poll_in(struct device *dev, unsigned char *c) * @param dev UART device struct * @param c Character to send */ -static void uart_stellaris_poll_out(struct device *dev, +static void uart_stellaris_poll_out(const struct device *dev, unsigned char c) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -348,7 +348,8 @@ static void uart_stellaris_poll_out(struct device *dev, * * @return Number of bytes sent */ -static int uart_stellaris_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_stellaris_fifo_fill(const struct device *dev, + const u8_t *tx_data, int len) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -370,7 +371,7 @@ static int uart_stellaris_fifo_fill(struct device *dev, const u8_t *tx_data, * * @return Number of bytes read */ -static int uart_stellaris_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_stellaris_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -390,7 +391,7 @@ static int uart_stellaris_fifo_read(struct device *dev, u8_t *rx_data, * * @return N/A */ -static void uart_stellaris_irq_tx_enable(struct device *dev) +static void uart_stellaris_irq_tx_enable(const struct device *dev) { static u8_t first_time = 1U; /* used to allow the first transmission */ @@ -444,7 +445,7 @@ static void uart_stellaris_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_tx_disable(struct device *dev) +static void uart_stellaris_irq_tx_disable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -458,7 +459,7 @@ static void uart_stellaris_irq_tx_disable(struct device *dev) * * @return 1 if a Tx IRQ is pending, 0 otherwise */ -static int uart_stellaris_irq_tx_ready(struct device *dev) +static int uart_stellaris_irq_tx_ready(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -472,7 +473,7 @@ static int uart_stellaris_irq_tx_ready(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_rx_enable(struct device *dev) +static void uart_stellaris_irq_rx_enable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -486,7 +487,7 @@ static void uart_stellaris_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_rx_disable(struct device *dev) +static void uart_stellaris_irq_rx_disable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -500,7 +501,7 @@ static void uart_stellaris_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_stellaris_irq_rx_ready(struct device *dev) +static int uart_stellaris_irq_rx_ready(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -514,7 +515,7 @@ static int uart_stellaris_irq_rx_ready(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_err_enable(struct device *dev) +static void uart_stellaris_irq_err_enable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -529,7 +530,7 @@ static void uart_stellaris_irq_err_enable(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_err_disable(struct device *dev) +static void uart_stellaris_irq_err_disable(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -544,7 +545,7 @@ static void uart_stellaris_irq_err_disable(struct device *dev) * * @return 1 if a Tx or Rx IRQ is pending, 0 otherwise */ -static int uart_stellaris_irq_is_pending(struct device *dev) +static int uart_stellaris_irq_is_pending(const struct device *dev) { volatile struct _uart *uart = UART_STRUCT(dev); @@ -559,7 +560,7 @@ static int uart_stellaris_irq_is_pending(struct device *dev) * * @return Always 1 */ -static int uart_stellaris_irq_update(struct device *dev) +static int uart_stellaris_irq_update(const struct device *dev) { return 1; } @@ -572,7 +573,7 @@ static int uart_stellaris_irq_update(struct device *dev) * * @return N/A */ -static void uart_stellaris_irq_callback_set(struct device *dev, +static void uart_stellaris_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -593,7 +594,7 @@ static void uart_stellaris_irq_callback_set(struct device *dev, */ static void uart_stellaris_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_stellaris_dev_data_t * const dev_data = DEV_DATA(dev); if (dev_data->cb) { @@ -631,7 +632,7 @@ static const struct uart_driver_api uart_stellaris_driver_api = { #ifdef CONFIG_UART_STELLARIS_PORT_0 #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_0(struct device *port); +static void irq_config_func_0(const struct device *port); #endif static const struct uart_device_config uart_stellaris_dev_cfg_0 = { @@ -654,7 +655,7 @@ DEVICE_AND_API_INIT(uart_stellaris0, DT_INST_LABEL(0), &uart_stellaris_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_0(struct device *dev) +static void irq_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), @@ -669,7 +670,7 @@ static void irq_config_func_0(struct device *dev) #ifdef CONFIG_UART_STELLARIS_PORT_1 #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_1(struct device *port); +static void irq_config_func_1(const struct device *port); #endif static struct uart_device_config uart_stellaris_dev_cfg_1 = { @@ -692,7 +693,7 @@ DEVICE_AND_API_INIT(uart_stellaris1, DT_INST_LABEL(1), &uart_stellaris_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_1(struct device *dev) +static void irq_config_func_1(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(1), DT_INST_IRQ(1, priority), @@ -707,7 +708,7 @@ static void irq_config_func_1(struct device *dev) #ifdef CONFIG_UART_STELLARIS_PORT_2 #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_2(struct device *port); +static void irq_config_func_2(const struct device *port); #endif static const struct uart_device_config uart_stellaris_dev_cfg_2 = { @@ -730,7 +731,7 @@ DEVICE_AND_API_INIT(uart_stellaris2, DT_INST_LABEL(2), &uart_stellaris_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static void irq_config_func_2(struct device *dev) +static void irq_config_func_2(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(2), DT_INST_IRQ(2, priority), diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index 8e8dd28b9ec7..976b3fa0d840 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -42,7 +42,8 @@ LOG_MODULE_REGISTER(uart_stm32); #define TIMEOUT 1000 -static inline void uart_stm32_set_baudrate(struct device *dev, u32_t baud_rate) +static inline void uart_stm32_set_baudrate(const struct device *dev, + u32_t baud_rate) { const struct uart_stm32_config *config = DEV_CFG(dev); struct uart_stm32_data *data = DEV_DATA(dev); @@ -85,56 +86,60 @@ static inline void uart_stm32_set_baudrate(struct device *dev, u32_t baud_rate) #endif /* HAS_LPUART_1 */ } -static inline void uart_stm32_set_parity(struct device *dev, u32_t parity) +static inline void uart_stm32_set_parity(const struct device *dev, + u32_t parity) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_SetParity(UartInstance, parity); } -static inline u32_t uart_stm32_get_parity(struct device *dev) +static inline u32_t uart_stm32_get_parity(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_GetParity(UartInstance); } -static inline void uart_stm32_set_stopbits(struct device *dev, u32_t stopbits) +static inline void uart_stm32_set_stopbits(const struct device *dev, + u32_t stopbits) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_SetStopBitsLength(UartInstance, stopbits); } -static inline u32_t uart_stm32_get_stopbits(struct device *dev) +static inline u32_t uart_stm32_get_stopbits(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_GetStopBitsLength(UartInstance); } -static inline void uart_stm32_set_databits(struct device *dev, u32_t databits) +static inline void uart_stm32_set_databits(const struct device *dev, + u32_t databits) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_SetDataWidth(UartInstance, databits); } -static inline u32_t uart_stm32_get_databits(struct device *dev) +static inline u32_t uart_stm32_get_databits(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_GetDataWidth(UartInstance); } -static inline void uart_stm32_set_hwctrl(struct device *dev, u32_t hwctrl) +static inline void uart_stm32_set_hwctrl(const struct device *dev, + u32_t hwctrl) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_SetHWFlowCtrl(UartInstance, hwctrl); } -static inline u32_t uart_stm32_get_hwctrl(struct device *dev) +static inline u32_t uart_stm32_get_hwctrl(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -277,7 +282,7 @@ static inline enum uart_config_flow_control uart_stm32_ll2cfg_hwctrl(u32_t fc) return UART_CFG_FLOW_CTRL_NONE; } -static int uart_stm32_configure(struct device *dev, +static int uart_stm32_configure(const struct device *dev, const struct uart_config *cfg) { struct uart_stm32_data *data = DEV_DATA(dev); @@ -363,7 +368,8 @@ static int uart_stm32_configure(struct device *dev, return 0; }; -static int uart_stm32_config_get(struct device *dev, struct uart_config *cfg) +static int uart_stm32_config_get(const struct device *dev, + struct uart_config *cfg) { struct uart_stm32_data *data = DEV_DATA(dev); @@ -378,7 +384,7 @@ static int uart_stm32_config_get(struct device *dev, struct uart_config *cfg) return 0; } -static int uart_stm32_poll_in(struct device *dev, unsigned char *c) +static int uart_stm32_poll_in(const struct device *dev, unsigned char *c) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -396,7 +402,7 @@ static int uart_stm32_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_stm32_poll_out(struct device *dev, +static void uart_stm32_poll_out(const struct device *dev, unsigned char c) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -410,7 +416,7 @@ static void uart_stm32_poll_out(struct device *dev, LL_USART_TransmitData8(UartInstance, (u8_t)c); } -static int uart_stm32_err_check(struct device *dev) +static int uart_stm32_err_check(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); u32_t err = 0U; @@ -451,10 +457,10 @@ static int uart_stm32_err_check(struct device *dev) return err; } -static inline void __uart_stm32_get_clock(struct device *dev) +static inline void __uart_stm32_get_clock(const struct device *dev) { struct uart_stm32_data *data = DEV_DATA(dev); - struct device *clk = + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); __ASSERT_NO_MSG(clk); @@ -464,7 +470,7 @@ static inline void __uart_stm32_get_clock(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN -static int uart_stm32_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_stm32_fifo_fill(const struct device *dev, const u8_t *tx_data, int size) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -481,7 +487,7 @@ static int uart_stm32_fifo_fill(struct device *dev, const u8_t *tx_data, return num_tx; } -static int uart_stm32_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_stm32_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -503,56 +509,56 @@ static int uart_stm32_fifo_read(struct device *dev, u8_t *rx_data, return num_rx; } -static void uart_stm32_irq_tx_enable(struct device *dev) +static void uart_stm32_irq_tx_enable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_EnableIT_TC(UartInstance); } -static void uart_stm32_irq_tx_disable(struct device *dev) +static void uart_stm32_irq_tx_disable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_DisableIT_TC(UartInstance); } -static int uart_stm32_irq_tx_ready(struct device *dev) +static int uart_stm32_irq_tx_ready(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_IsActiveFlag_TXE(UartInstance); } -static int uart_stm32_irq_tx_complete(struct device *dev) +static int uart_stm32_irq_tx_complete(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_IsActiveFlag_TC(UartInstance); } -static void uart_stm32_irq_rx_enable(struct device *dev) +static void uart_stm32_irq_rx_enable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_EnableIT_RXNE(UartInstance); } -static void uart_stm32_irq_rx_disable(struct device *dev) +static void uart_stm32_irq_rx_disable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); LL_USART_DisableIT_RXNE(UartInstance); } -static int uart_stm32_irq_rx_ready(struct device *dev) +static int uart_stm32_irq_rx_ready(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); return LL_USART_IsActiveFlag_RXNE(UartInstance); } -static void uart_stm32_irq_err_enable(struct device *dev) +static void uart_stm32_irq_err_enable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -568,7 +574,7 @@ static void uart_stm32_irq_err_enable(struct device *dev) LL_USART_EnableIT_PE(UartInstance); } -static void uart_stm32_irq_err_disable(struct device *dev) +static void uart_stm32_irq_err_disable(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -584,7 +590,7 @@ static void uart_stm32_irq_err_disable(struct device *dev) LL_USART_DisableIT_PE(UartInstance); } -static int uart_stm32_irq_is_pending(struct device *dev) +static int uart_stm32_irq_is_pending(const struct device *dev) { USART_TypeDef *UartInstance = UART_STRUCT(dev); @@ -594,12 +600,12 @@ static int uart_stm32_irq_is_pending(struct device *dev) LL_USART_IsEnabledIT_TC(UartInstance))); } -static int uart_stm32_irq_update(struct device *dev) +static int uart_stm32_irq_update(const struct device *dev) { return 1; } -static void uart_stm32_irq_callback_set(struct device *dev, +static void uart_stm32_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -611,7 +617,7 @@ static void uart_stm32_irq_callback_set(struct device *dev, static void uart_stm32_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct uart_stm32_data *data = DEV_DATA(dev); if (data->user_cb) { @@ -655,7 +661,7 @@ static const struct uart_driver_api uart_stm32_driver_api = { * * @return 0 */ -static int uart_stm32_init(struct device *dev) +static int uart_stm32_init(const struct device *dev) { const struct uart_stm32_config *config = DEV_CFG(dev); struct uart_stm32_data *data = DEV_DATA(dev); @@ -733,11 +739,11 @@ static int uart_stm32_init(struct device *dev) #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define STM32_UART_IRQ_HANDLER_DECL(index) \ - static void uart_stm32_irq_config_func_##index(struct device *dev) + static void uart_stm32_irq_config_func_##index(const struct device *dev) #define STM32_UART_IRQ_HANDLER_FUNC(index) \ .irq_config_func = uart_stm32_irq_config_func_##index, #define STM32_UART_IRQ_HANDLER(index) \ -static void uart_stm32_irq_config_func_##index(struct device *dev) \ +static void uart_stm32_irq_config_func_##index(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(index), \ DT_INST_IRQ(index, priority), \ diff --git a/drivers/serial/uart_stm32.h b/drivers/serial/uart_stm32.h index f0d35125cd0f..8bfbfaf54485 100644 --- a/drivers/serial/uart_stm32.h +++ b/drivers/serial/uart_stm32.h @@ -28,7 +28,7 @@ struct uart_stm32_data { /* Baud rate */ u32_t baud_rate; /* clock device */ - struct device *clock; + const struct device *clock; #ifdef CONFIG_UART_INTERRUPT_DRIVEN uart_irq_callback_user_data_t user_cb; void *user_data; diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c index 5ff1e693e605..f08e090ad569 100644 --- a/drivers/serial/uart_xlnx_ps.c +++ b/drivers/serial/uart_xlnx_ps.c @@ -222,7 +222,7 @@ static void xlnx_ps_enable_uart(u32_t reg_base) * @param dev UART device struct * @param baud_rate The desired baud rate as a decimal value */ -static void set_baudrate(struct device *dev, u32_t baud_rate) +static void set_baudrate(const struct device *dev, u32_t baud_rate) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t divisor, generator; @@ -281,7 +281,7 @@ static void set_baudrate(struct device *dev, u32_t baud_rate) * * @return 0 if successful, failed otherwise */ -static int uart_xlnx_ps_init(struct device *dev) +static int uart_xlnx_ps_init(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_val; @@ -335,7 +335,7 @@ static int uart_xlnx_ps_init(struct device *dev) * * @return 0 if a character arrived, -1 if the input buffer if empty. */ -static int uart_xlnx_ps_poll_in(struct device *dev, unsigned char *c) +static int uart_xlnx_ps_poll_in(const struct device *dev, unsigned char *c) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_val; @@ -366,7 +366,7 @@ static int uart_xlnx_ps_poll_in(struct device *dev, unsigned char *c) * * @return Sent character */ -static void uart_xlnx_ps_poll_out(struct device *dev, unsigned char c) +static void uart_xlnx_ps_poll_out(const struct device *dev, unsigned char c) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_val; @@ -595,8 +595,8 @@ static inline bool uart_xlnx_ps_cfg2ll_hwctrl( * @return 0 if the configuration completed successfully, ENOTSUP * error if an unsupported configuration parameter is detected. */ -static int uart_xlnx_ps_configure(struct device *dev, - const struct uart_config *cfg) +static int uart_xlnx_ps_configure(const struct device *dev, + const struct uart_config *cfg) { struct uart_xlnx_ps_dev_config *dev_cfg = (struct uart_xlnx_ps_dev_config *)DEV_CFG(dev); @@ -800,8 +800,8 @@ static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl( * * @return always 0. */ -static int uart_xlnx_ps_config_get(struct device *dev, - struct uart_config *cfg) +static int uart_xlnx_ps_config_get(const struct device *dev, + struct uart_config *cfg) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); @@ -836,7 +836,8 @@ static int uart_xlnx_ps_config_get(struct device *dev, * * @return Number of bytes sent */ -static int uart_xlnx_ps_fifo_fill(struct device *dev, const u8_t *tx_data, +static int uart_xlnx_ps_fifo_fill(const struct device *dev, + const u8_t *tx_data, int size) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); @@ -865,7 +866,7 @@ static int uart_xlnx_ps_fifo_fill(struct device *dev, const u8_t *tx_data, * * @return Number of bytes read */ -static int uart_xlnx_ps_fifo_read(struct device *dev, u8_t *rx_data, +static int uart_xlnx_ps_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); @@ -893,7 +894,7 @@ static int uart_xlnx_ps_fifo_read(struct device *dev, u8_t *rx_data, * * @return N/A */ -static void uart_xlnx_ps_irq_tx_enable(struct device *dev) +static void uart_xlnx_ps_irq_tx_enable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -911,7 +912,7 @@ static void uart_xlnx_ps_irq_tx_enable(struct device *dev) * * @return N/A */ -static void uart_xlnx_ps_irq_tx_disable(struct device *dev) +static void uart_xlnx_ps_irq_tx_disable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -929,7 +930,7 @@ static void uart_xlnx_ps_irq_tx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_xlnx_ps_irq_tx_ready(struct device *dev) +static int uart_xlnx_ps_irq_tx_ready(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -954,7 +955,7 @@ static int uart_xlnx_ps_irq_tx_ready(struct device *dev) * * @return 1 if nothing remains to be transmitted, 0 otherwise */ -static int uart_xlnx_ps_irq_tx_complete(struct device *dev) +static int uart_xlnx_ps_irq_tx_complete(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -976,7 +977,7 @@ static int uart_xlnx_ps_irq_tx_complete(struct device *dev) * * @return N/A */ -static void uart_xlnx_ps_irq_rx_enable(struct device *dev) +static void uart_xlnx_ps_irq_rx_enable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -992,7 +993,7 @@ static void uart_xlnx_ps_irq_rx_enable(struct device *dev) * * @return N/A */ -static void uart_xlnx_ps_irq_rx_disable(struct device *dev) +static void uart_xlnx_ps_irq_rx_disable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -1008,7 +1009,7 @@ static void uart_xlnx_ps_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static int uart_xlnx_ps_irq_rx_ready(struct device *dev) +static int uart_xlnx_ps_irq_rx_ready(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -1031,7 +1032,7 @@ static int uart_xlnx_ps_irq_rx_ready(struct device *dev) * * @return N/A */ -static void uart_xlnx_ps_irq_err_enable(struct device *dev) +static void uart_xlnx_ps_irq_err_enable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -1053,7 +1054,7 @@ static void uart_xlnx_ps_irq_err_enable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise */ -static void uart_xlnx_ps_irq_err_disable(struct device *dev) +static void uart_xlnx_ps_irq_err_disable(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -1075,7 +1076,7 @@ static void uart_xlnx_ps_irq_err_disable(struct device *dev) * * @return 1 if an IRQ is pending, 0 otherwise */ -static int uart_xlnx_ps_irq_is_pending(struct device *dev) +static int uart_xlnx_ps_irq_is_pending(const struct device *dev) { const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev); u32_t reg_base; @@ -1100,7 +1101,7 @@ static int uart_xlnx_ps_irq_is_pending(struct device *dev) * * @return Always 1 */ -static int uart_xlnx_ps_irq_update(struct device *dev) +static int uart_xlnx_ps_irq_update(const struct device *dev) { (void)dev; return 1; @@ -1114,7 +1115,7 @@ static int uart_xlnx_ps_irq_update(struct device *dev) * * @return N/A */ -static void uart_xlnx_ps_irq_callback_set(struct device *dev, +static void uart_xlnx_ps_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -1135,7 +1136,7 @@ static void uart_xlnx_ps_irq_callback_set(struct device *dev, */ static void uart_xlnx_ps_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; const struct uart_xlnx_ps_dev_data_t *data = DEV_DATA(dev); if (data->user_cb) { @@ -1175,7 +1176,7 @@ static const struct uart_driver_api uart_xlnx_ps_driver_api = { #define UART_XLNX_PS_IRQ_CONF_FUNC(port) \ DEVICE_DECLARE(uart_xlnx_ps_##port); \ \ -static void uart_xlnx_ps_irq_config_##port(struct device *dev) \ +static void uart_xlnx_ps_irq_config_##port(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(port), \ DT_INST_IRQ(port, priority), \ diff --git a/drivers/serial/uart_xmc4xxx.c b/drivers/serial/uart_xmc4xxx.c index d1a8dac623d9..f2cbd50ff1ba 100644 --- a/drivers/serial/uart_xmc4xxx.c +++ b/drivers/serial/uart_xmc4xxx.c @@ -20,7 +20,7 @@ struct uart_xmc4xxx_data { #define DEV_DATA(dev) \ ((struct uart_xmc4xxx_data * const)(dev)->driver_data) -static int uart_xmc4xxx_poll_in(struct device *dev, unsigned char *c) +static int uart_xmc4xxx_poll_in(const struct device *dev, unsigned char *c) { const struct uart_device_config *config = DEV_CFG(dev); @@ -30,14 +30,14 @@ static int uart_xmc4xxx_poll_in(struct device *dev, unsigned char *c) return 0; } -static void uart_xmc4xxx_poll_out(struct device *dev, unsigned char c) +static void uart_xmc4xxx_poll_out(const struct device *dev, unsigned char c) { const struct uart_device_config *config = DEV_CFG(dev); XMC_UART_CH_Transmit((XMC_USIC_CH_t *)config->base, (uint16_t)c); } -static int uart_xmc4xxx_init(struct device *dev) +static int uart_xmc4xxx_init(const struct device *dev) { const struct uart_device_config *config = DEV_CFG(dev); struct uart_xmc4xxx_data *data = DEV_DATA(dev); diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c index ff66803c8cf6..3642edb6fbda 100644 --- a/drivers/serial/usart_sam.c +++ b/drivers/serial/usart_sam.c @@ -53,7 +53,7 @@ static int baudrate_set(Usart *const usart, u32_t baudrate, u32_t mck_freq_hz); -static int usart_sam_init(struct device *dev) +static int usart_sam_init(const struct device *dev) { int retval; const struct usart_sam_dev_cfg *const cfg = DEV_CFG(dev); @@ -98,7 +98,7 @@ static int usart_sam_init(struct device *dev) return 0; } -static int usart_sam_poll_in(struct device *dev, unsigned char *c) +static int usart_sam_poll_in(const struct device *dev, unsigned char *c) { Usart *const usart = DEV_CFG(dev)->regs; @@ -112,7 +112,7 @@ static int usart_sam_poll_in(struct device *dev, unsigned char *c) return 0; } -static void usart_sam_poll_out(struct device *dev, unsigned char c) +static void usart_sam_poll_out(const struct device *dev, unsigned char c) { Usart *const usart = DEV_CFG(dev)->regs; @@ -124,7 +124,7 @@ static void usart_sam_poll_out(struct device *dev, unsigned char c) usart->US_THR = (u32_t)c; } -static int usart_sam_err_check(struct device *dev) +static int usart_sam_err_check(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; int errors = 0; @@ -167,7 +167,8 @@ static int baudrate_set(Usart *const usart, u32_t baudrate, #if CONFIG_UART_INTERRUPT_DRIVEN -static int usart_sam_fifo_fill(struct device *dev, const uint8_t *tx_data, +static int usart_sam_fifo_fill(const struct device *dev, + const uint8_t *tx_data, int size) { volatile Usart * const usart = DEV_CFG(dev)->regs; @@ -181,7 +182,7 @@ static int usart_sam_fifo_fill(struct device *dev, const uint8_t *tx_data, return 1; } -static int usart_sam_fifo_read(struct device *dev, uint8_t *rx_data, +static int usart_sam_fifo_read(const struct device *dev, uint8_t *rx_data, const int size) { volatile Usart * const usart = DEV_CFG(dev)->regs; @@ -201,70 +202,70 @@ static int usart_sam_fifo_read(struct device *dev, uint8_t *rx_data, return bytes_read; } -static void usart_sam_irq_tx_enable(struct device *dev) +static void usart_sam_irq_tx_enable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IER = US_IER_TXRDY; } -static void usart_sam_irq_tx_disable(struct device *dev) +static void usart_sam_irq_tx_disable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IDR = US_IDR_TXRDY; } -static int usart_sam_irq_tx_ready(struct device *dev) +static int usart_sam_irq_tx_ready(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; return (usart->US_CSR & US_CSR_TXRDY); } -static void usart_sam_irq_rx_enable(struct device *dev) +static void usart_sam_irq_rx_enable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IER = US_IER_RXRDY; } -static void usart_sam_irq_rx_disable(struct device *dev) +static void usart_sam_irq_rx_disable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IDR = US_IDR_RXRDY; } -static int usart_sam_irq_tx_complete(struct device *dev) +static int usart_sam_irq_tx_complete(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; return !(usart->US_CSR & US_CSR_TXRDY); } -static int usart_sam_irq_rx_ready(struct device *dev) +static int usart_sam_irq_rx_ready(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; return (usart->US_CSR & US_CSR_RXRDY); } -static void usart_sam_irq_err_enable(struct device *dev) +static void usart_sam_irq_err_enable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IER = US_IER_OVRE | US_IER_FRAME | US_IER_PARE; } -static void usart_sam_irq_err_disable(struct device *dev) +static void usart_sam_irq_err_disable(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; usart->US_IDR = US_IDR_OVRE | US_IDR_FRAME | US_IDR_PARE; } -static int usart_sam_irq_is_pending(struct device *dev) +static int usart_sam_irq_is_pending(const struct device *dev) { volatile Usart * const usart = DEV_CFG(dev)->regs; @@ -272,14 +273,14 @@ static int usart_sam_irq_is_pending(struct device *dev) (usart->US_CSR & (US_CSR_TXRDY | US_CSR_RXRDY)); } -static int usart_sam_irq_update(struct device *dev) +static int usart_sam_irq_update(const struct device *dev) { ARG_UNUSED(dev); return 1; } -static void usart_sam_irq_callback_set(struct device *dev, +static void usart_sam_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -291,7 +292,7 @@ static void usart_sam_irq_callback_set(struct device *dev, static void usart_sam_isr(void *arg) { - struct device *dev = arg; + const struct device *dev = arg; struct usart_sam_dev_data *const dev_data = DEV_DATA(dev); if (dev_data->irq_cb) { @@ -336,7 +337,7 @@ static const struct uart_driver_api usart_sam_driver_api = { #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define USART_SAM_CONFIG_FUNC(n) \ - static void usart##n##_sam_irq_config_func(struct device *port) \ + static void usart##n##_sam_irq_config_func(const struct device *port) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ DT_INST_IRQ(n, priority), \ diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index 859ad9749349..b3218b7b2fb2 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -39,18 +39,18 @@ struct spi_cc13xx_cc26xx_data { #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency) -static inline struct spi_cc13xx_cc26xx_data *get_dev_data(struct device *dev) +static inline struct spi_cc13xx_cc26xx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } static inline const struct spi_cc13xx_cc26xx_config * -get_dev_config(struct device *dev) +get_dev_config(const struct device *dev) { return dev->config_info; } -static int spi_cc13xx_cc26xx_configure(struct device *dev, +static int spi_cc13xx_cc26xx_configure(const struct device *dev, const struct spi_config *config) { const struct spi_cc13xx_cc26xx_config *cfg = get_dev_config(dev); @@ -136,7 +136,7 @@ static int spi_cc13xx_cc26xx_configure(struct device *dev, return 0; } -static int spi_cc13xx_cc26xx_transceive(struct device *dev, +static int spi_cc13xx_cc26xx_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -193,7 +193,7 @@ static int spi_cc13xx_cc26xx_transceive(struct device *dev, return err; } -static int spi_cc13xx_cc26xx_release(struct device *dev, +static int spi_cc13xx_cc26xx_release(const struct device *dev, const struct spi_config *config) { struct spi_context *ctx = &get_dev_data(dev)->ctx; @@ -212,8 +212,8 @@ static int spi_cc13xx_cc26xx_release(struct device *dev, } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int spi_cc13xx_cc26xx_set_power_state(struct device *dev, - u32_t new_state) +static int spi_cc13xx_cc26xx_set_power_state(const struct device *dev, + u32_t new_state) { int ret = 0; @@ -251,8 +251,10 @@ static int spi_cc13xx_cc26xx_set_power_state(struct device *dev, return ret; } -static int spi_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) +static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, + u32_t ctrl_command, + void *context, device_pm_cb cb, + void *arg) { int ret = 0; @@ -340,7 +342,7 @@ static const struct spi_driver_api spi_cc13xx_cc26xx_driver_api = { #endif #define SPI_CC13XX_CC26XX_INIT_FUNC(n) \ - static int spi_cc13xx_cc26xx_init_##n(struct device *dev) \ + static int spi_cc13xx_cc26xx_init_##n(const struct device *dev) \ { \ SPI_CC13XX_CC26XX_INIT_PM_STATE; \ \ diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index 1b42b6c9c75b..bc378fc0aab7 100644 --- a/drivers/spi/spi_dw.c +++ b/drivers/spi/spi_dw.c @@ -53,7 +53,7 @@ static inline bool spi_dw_is_slave(struct spi_dw_data *spi) spi_context_is_slave(&spi->ctx)); } -static void completed(struct device *dev, int error) +static void completed(const struct device *dev, int error) { const struct spi_dw_config *info = dev->config_info; struct spi_dw_data *spi = dev->driver_data; @@ -85,7 +85,7 @@ static void completed(struct device *dev, int error) spi_context_complete(&spi->ctx, error); } -static void push_data(struct device *dev) +static void push_data(const struct device *dev) { const struct spi_dw_config *info = dev->config_info; struct spi_dw_data *spi = dev->driver_data; @@ -154,7 +154,7 @@ static void push_data(struct device *dev) LOG_DBG("Pushed: %d", DBG_COUNTER_RESULT()); } -static void pull_data(struct device *dev) +static void pull_data(const struct device *dev) { const struct spi_dw_config *info = dev->config_info; struct spi_dw_data *spi = dev->driver_data; @@ -329,7 +329,7 @@ static void spi_dw_update_txftlr(const struct spi_dw_config *info, write_txftlr(reg_data, info->regs); } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -440,8 +440,8 @@ static int transceive(struct device *dev, return ret; } -static int spi_dw_transceive(struct device *dev, - const struct spi_config *config, +static int spi_dw_transceive(const struct device *dev, + const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { @@ -451,7 +451,7 @@ static int spi_dw_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_dw_transceive_async(struct device *dev, +static int spi_dw_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -463,7 +463,8 @@ static int spi_dw_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_dw_release(struct device *dev, const struct spi_config *config) +static int spi_dw_release(const struct device *dev, + const struct spi_config *config) { struct spi_dw_data *spi = dev->driver_data; @@ -476,7 +477,7 @@ static int spi_dw_release(struct device *dev, const struct spi_config *config) return 0; } -void spi_dw_isr(struct device *dev) +void spi_dw_isr(const struct device *dev) { const struct spi_dw_config *info = dev->config_info; u32_t int_status; @@ -515,7 +516,7 @@ static const struct spi_driver_api dw_spi_api = { .release = spi_dw_release, }; -int spi_dw_init(struct device *dev) +int spi_dw_init(const struct device *dev) { const struct spi_dw_config *info = dev->config_info; struct spi_dw_data *spi = dev->driver_data; diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h index 58244614fd8d..a6af3db81d61 100644 --- a/drivers/spi/spi_dw.h +++ b/drivers/spi/spi_dw.h @@ -34,7 +34,7 @@ struct spi_dw_config { struct spi_dw_data { #ifdef CONFIG_CLOCK_CONTROL - struct device *clock; + const struct device *clock; #endif /* CONFIG_CLOCK_CONTROL */ struct spi_context ctx; u8_t dfs; /* dfs in bytes: 1,2 or 4 */ @@ -229,7 +229,7 @@ DEFINE_TEST_BIT_OP(sr_busy, DW_SPI_REG_SR, DW_SPI_SR_BUSY_BIT) #ifdef CONFIG_CLOCK_CONTROL -static inline int clock_config(struct device *dev) +static inline int clock_config(const struct device *dev) { const struct spi_dw_config *info = dev->config_info; struct spi_dw_data *spi = dev->driver_data; @@ -247,7 +247,7 @@ static inline int clock_config(struct device *dev) return 0; } -static inline void clock_on(struct device *dev) +static inline void clock_on(const struct device *dev) { struct spi_dw_data *spi = dev->driver_data; @@ -260,7 +260,7 @@ static inline void clock_on(struct device *dev) extra_clock_on(dev); } -static inline void clock_off(struct device *dev) +static inline void clock_off(const struct device *dev) { struct spi_dw_data *spi = dev->driver_data; diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c index 80b301a88158..4890d2d70a68 100644 --- a/drivers/spi/spi_gecko.c +++ b/drivers/spi/spi_gecko.c @@ -50,7 +50,8 @@ struct spi_gecko_config { /* Helper Functions */ -static int spi_config(struct device *dev, const struct spi_config *config, +static int spi_config(const struct device *dev, + const struct spi_config *config, u16_t *control) { const struct spi_gecko_config *gecko_config = dev->config_info; @@ -163,8 +164,8 @@ static int spi_gecko_shift_frames(USART_TypeDef *usart, } -static void spi_gecko_xfer(struct device *dev, - const struct spi_config *config) +static void spi_gecko_xfer(const struct device *dev, + const struct spi_config *config) { int ret; struct spi_context *ctx = &DEV_DATA(dev)->ctx; @@ -181,7 +182,7 @@ static void spi_gecko_xfer(struct device *dev, spi_context_complete(ctx, 0); } -static void spi_gecko_init_pins(struct device *dev) +static void spi_gecko_init_pins(const struct device *dev) { const struct spi_gecko_config *config = dev->config_info; @@ -206,7 +207,7 @@ static void spi_gecko_init_pins(struct device *dev) /* API Functions */ -static int spi_gecko_init(struct device *dev) +static int spi_gecko_init(const struct device *dev) { const struct spi_gecko_config *config = dev->config_info; USART_InitSync_TypeDef usartInit = USART_INITSYNC_DEFAULT; @@ -242,10 +243,10 @@ static int spi_gecko_init(struct device *dev) return 0; } -static int spi_gecko_transceive(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs) +static int spi_gecko_transceive(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs) { u16_t control = 0; @@ -256,17 +257,17 @@ static int spi_gecko_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_gecko_transceive_async(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs, - struct k_poll_signal *async) +static int spi_gecko_transceive_async(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs, + struct k_poll_signal *async) { return -ENOTSUP; } #endif /* CONFIG_SPI_ASYNC */ -static int spi_gecko_release(struct device *dev, +static int spi_gecko_release(const struct device *dev, const struct spi_config *config) { const struct spi_gecko_config *gecko_config = dev->config_info; diff --git a/drivers/spi/spi_handlers.c b/drivers/spi/spi_handlers.c index b64d429ee634..1f02f2c16c87 100644 --- a/drivers/spi/spi_handlers.c +++ b/drivers/spi/spi_handlers.c @@ -52,7 +52,7 @@ static struct spi_buf_set *copy_and_check(struct spi_buf_set *bufs, * count member has been verified and is a value that won't lead to stack * overflow. */ -static u32_t copy_bufs_and_transceive(struct device *dev, +static u32_t copy_bufs_and_transceive(const struct device *dev, const struct spi_config *config, struct spi_buf_set *tx_bufs, struct spi_buf_set *rx_bufs) @@ -63,14 +63,14 @@ static u32_t copy_bufs_and_transceive(struct device *dev, tx_bufs = copy_and_check(tx_bufs, tx_buf_copy, 0); rx_bufs = copy_and_check(rx_bufs, rx_buf_copy, 1); - return z_impl_spi_transceive((struct device *)dev, config, - tx_bufs, rx_bufs); + return z_impl_spi_transceive((const struct device *)dev, config, + tx_bufs, rx_bufs); } -static inline int z_vrfy_spi_transceive(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs) +static inline int z_vrfy_spi_transceive(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs) { struct spi_buf_set tx_bufs_copy; struct spi_buf_set rx_bufs_copy; @@ -113,18 +113,18 @@ static inline int z_vrfy_spi_transceive(struct device *dev, } } - return copy_bufs_and_transceive((struct device *)dev, + return copy_bufs_and_transceive((const struct device *)dev, &config_copy, &tx_bufs_copy, &rx_bufs_copy); } #include -static inline int z_vrfy_spi_release(struct device *dev, - const struct spi_config *config) +static inline int z_vrfy_spi_release(const struct device *dev, + const struct spi_config *config) { Z_OOPS(Z_SYSCALL_MEMORY_READ(config, sizeof(*config))); Z_OOPS(Z_SYSCALL_DRIVER_SPI(dev, release)); - return z_impl_spi_release((struct device *)dev, config); + return z_impl_spi_release((const struct device *)dev, config); } #include diff --git a/drivers/spi/spi_litespi.c b/drivers/spi/spi_litespi.c index b412be77e8b0..4e8f7f124d01 100644 --- a/drivers/spi/spi_litespi.c +++ b/drivers/spi/spi_litespi.c @@ -74,7 +74,8 @@ static int spi_config(const struct spi_config *config, u16_t *control) return 0; } -static void spi_litespi_send(struct device *dev, u8_t frame, u16_t control) +static void spi_litespi_send(const struct device *dev, u8_t frame, + u16_t control) { /* Write frame to register */ litex_write8(frame, SPI_MOSI_DATA_REG); @@ -91,8 +92,8 @@ static u8_t spi_litespi_recv(void) return litex_read8(SPI_MISO_DATA_REG); } -static void spi_litespi_xfer(struct device *dev, - const struct spi_config *config, u16_t control) +static void spi_litespi_xfer(const struct device *dev, + const struct spi_config *config, u16_t control) { struct spi_context *ctx = &SPI_DATA(dev)->ctx; u32_t send_len = spi_context_longest_current_buf(ctx); @@ -118,15 +119,15 @@ static void spi_litespi_xfer(struct device *dev, /* API Functions */ -static int spi_litespi_init(struct device *dev) +static int spi_litespi_init(const struct device *dev) { return 0; } -static int spi_litespi_transceive(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs) +static int spi_litespi_transceive(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs) { u16_t control = 0; @@ -137,18 +138,18 @@ static int spi_litespi_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_litespi_transceive_async(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs, - struct k_poll_signal *async) +static int spi_litespi_transceive_async(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs, + struct k_poll_signal *async) { return -ENOTSUP; } #endif /* CONFIG_SPI_ASYNC */ -static int spi_litespi_release(struct device *dev, - const struct spi_config *config) +static int spi_litespi_release(const struct device *dev, + const struct spi_config *config) { if (!(litex_read8(SPI_STATUS_REG))) { return -EBUSY; diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c index f86fbe49be6a..c130a2b626d3 100644 --- a/drivers/spi/spi_ll_stm32.c +++ b/drivers/spi/spi_ll_stm32.c @@ -84,7 +84,7 @@ static void dma_callback(void *arg, u32_t channel, int status) } } -static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf, +static int spi_stm32_dma_tx_load(const struct device *dev, const u8_t *buf, size_t len) { const struct spi_stm32_config *cfg = DEV_CFG(dev); @@ -144,7 +144,8 @@ static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf, return dma_start(data->dev_dma_tx, data->dma_tx.channel); } -static int spi_stm32_dma_rx_load(struct device *dev, u8_t *buf, size_t len) +static int spi_stm32_dma_rx_load(const struct device *dev, u8_t *buf, + size_t len) { const struct spi_stm32_config *cfg = DEV_CFG(dev); struct spi_stm32_data *data = DEV_DATA(dev); @@ -195,7 +196,7 @@ static int spi_stm32_dma_rx_load(struct device *dev, u8_t *buf, size_t len) return dma_start(data->dev_dma_rx, data->dma_rx.channel); } -static int spi_dma_move_buffers(struct device *dev) +static int spi_dma_move_buffers(const struct device *dev) { struct spi_stm32_data *data = DEV_DATA(dev); int ret; @@ -409,7 +410,7 @@ static void spi_stm32_complete(struct spi_stm32_data *data, SPI_TypeDef *spi, #ifdef CONFIG_SPI_STM32_INTERRUPT static void spi_stm32_isr(void *arg) { - struct device * const dev = (struct device *) arg; + const struct device * const dev = (const struct device *) arg; const struct spi_stm32_config *cfg = dev->config_info; struct spi_stm32_data *data = dev->driver_data; SPI_TypeDef *spi = cfg->spi; @@ -431,7 +432,7 @@ static void spi_stm32_isr(void *arg) } #endif -static int spi_stm32_configure(struct device *dev, +static int spi_stm32_configure(const struct device *dev, const struct spi_config *config) { const struct spi_stm32_config *cfg = DEV_CFG(dev); @@ -563,7 +564,7 @@ static int spi_stm32_configure(struct device *dev, return 0; } -static int spi_stm32_release(struct device *dev, +static int spi_stm32_release(const struct device *dev, const struct spi_config *config) { struct spi_stm32_data *data = DEV_DATA(dev); @@ -573,7 +574,7 @@ static int spi_stm32_release(struct device *dev, return 0; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -647,11 +648,11 @@ static int transceive(struct device *dev, } #ifdef CONFIG_SPI_STM32_DMA -static int transceive_dma(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs, - bool asynchronous, struct k_poll_signal *signal) +static int transceive_dma(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs, + bool asynchronous, struct k_poll_signal *signal) { const struct spi_stm32_config *cfg = DEV_CFG(dev); struct spi_stm32_data *data = DEV_DATA(dev); @@ -752,7 +753,7 @@ static int transceive_dma(struct device *dev, } #endif /* CONFIG_SPI_STM32_DMA */ -static int spi_stm32_transceive(struct device *dev, +static int spi_stm32_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -770,7 +771,7 @@ static int spi_stm32_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_stm32_transceive_async(struct device *dev, +static int spi_stm32_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -788,7 +789,7 @@ static const struct spi_driver_api api_funcs = { .release = spi_stm32_release, }; -static int spi_stm32_init(struct device *dev) +static int spi_stm32_init(const struct device *dev) { struct spi_stm32_data *data __attribute__((unused)) = dev->driver_data; const struct spi_stm32_config *cfg = dev->config_info; @@ -830,11 +831,11 @@ static int spi_stm32_init(struct device *dev) #ifdef CONFIG_SPI_STM32_INTERRUPT #define STM32_SPI_IRQ_HANDLER_DECL(id) \ - static void spi_stm32_irq_config_func_##id(struct device *dev) + static void spi_stm32_irq_config_func_##id(const struct device *dev) #define STM32_SPI_IRQ_HANDLER_FUNC(id) \ .irq_config = spi_stm32_irq_config_func_##id, #define STM32_SPI_IRQ_HANDLER(id) \ -static void spi_stm32_irq_config_func_##id(struct device *dev) \ +static void spi_stm32_irq_config_func_##id(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(id), \ DT_INST_IRQ(id, priority), \ diff --git a/drivers/spi/spi_ll_stm32.h b/drivers/spi/spi_ll_stm32.h index 7806673d9cd6..7bad88d66e5a 100644 --- a/drivers/spi/spi_ll_stm32.h +++ b/drivers/spi/spi_ll_stm32.h @@ -9,7 +9,7 @@ #include "spi_context.h" -typedef void (*irq_config_func_t)(struct device *port); +typedef void (*irq_config_func_t)(const struct device *port); struct spi_stm32_config { struct stm32_pclken pclken; @@ -35,8 +35,8 @@ struct stream { struct spi_stm32_data { struct spi_context ctx; #ifdef CONFIG_SPI_STM32_DMA - struct device *dev_dma_tx; - struct device *dev_dma_rx; + const struct device *dev_dma_tx; + const struct device *dev_dma_rx; struct stream dma_rx; struct stream dma_tx; size_t dma_segment_len; diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c index eb1ee14a84a4..23b1408f62a3 100644 --- a/drivers/spi/spi_mcux_dspi.c +++ b/drivers/spi/spi_mcux_dspi.c @@ -22,7 +22,7 @@ struct spi_mcux_config { SPI_Type *base; char *clock_name; clock_control_subsys_t clock_subsys; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct spi_mcux_data { @@ -31,7 +31,7 @@ struct spi_mcux_data { size_t transfer_len; }; -static int spi_mcux_transfer_next_packet(struct device *dev) +static int spi_mcux_transfer_next_packet(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -102,7 +102,7 @@ static int spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; @@ -113,7 +113,7 @@ static void spi_mcux_isr(void *arg) static void spi_mcux_master_transfer_callback(SPI_Type *base, dspi_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct spi_mcux_data *data = dev->driver_data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); @@ -122,14 +122,14 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, spi_mcux_transfer_next_packet(dev); } -static int spi_mcux_configure(struct device *dev, +static int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; dspi_master_config_t master_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; u32_t word_size; @@ -185,7 +185,8 @@ static int spi_mcux_configure(struct device *dev, DSPI_MasterInit(base, &master_config, clock_freq); DSPI_MasterTransferCreateHandle(base, &data->handle, - spi_mcux_master_transfer_callback, dev); + spi_mcux_master_transfer_callback, + (void *)dev); DSPI_SetDummyData(base, 0); @@ -195,7 +196,7 @@ static int spi_mcux_configure(struct device *dev, return 0; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -228,7 +229,7 @@ static int transceive(struct device *dev, return ret; } -static int spi_mcux_transceive(struct device *dev, +static int spi_mcux_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -237,7 +238,7 @@ static int spi_mcux_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_mcux_transceive_async(struct device *dev, +static int spi_mcux_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -247,8 +248,8 @@ static int spi_mcux_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_mcux_release(struct device *dev, - const struct spi_config *spi_cfg) +static int spi_mcux_release(const struct device *dev, + const struct spi_config *spi_cfg) { struct spi_mcux_data *data = dev->driver_data; @@ -257,7 +258,7 @@ static int spi_mcux_release(struct device *dev, return 0; } -static int spi_mcux_init(struct device *dev) +static int spi_mcux_init(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -278,7 +279,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { }; #define SPI_MCUX_DSPI_DEVICE(id) \ - static void spi_mcux_config_func_##id(struct device *dev); \ + static void spi_mcux_config_func_##id(const struct device *dev); \ static const struct spi_mcux_config spi_mcux_config_##id = { \ .base = (SPI_Type *)DT_INST_REG_ADDR(id), \ .clock_name = DT_INST_CLOCKS_LABEL(id), \ @@ -298,7 +299,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &spi_mcux_driver_api); \ - static void spi_mcux_config_func_##id(struct device *dev) \ + static void spi_mcux_config_func_##id(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(id), \ DT_INST_IRQ(id, priority), \ diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c index 923e26d50cb2..10e0a59f4bf7 100644 --- a/drivers/spi/spi_mcux_flexcomm.c +++ b/drivers/spi/spi_mcux_flexcomm.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(spi_mcux_flexcomm, CONFIG_SPI_LOG_LEVEL); struct spi_mcux_config { SPI_Type *base; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct spi_mcux_data { @@ -30,7 +30,7 @@ struct spi_mcux_data { size_t transfer_len; }; -static void spi_mcux_transfer_next_packet(struct device *dev) +static void spi_mcux_transfer_next_packet(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -98,7 +98,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; @@ -109,7 +109,7 @@ static void spi_mcux_isr(void *arg) static void spi_mcux_master_transfer_callback(SPI_Type *base, spi_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct spi_mcux_data *data = dev->driver_data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); @@ -118,7 +118,7 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, spi_mcux_transfer_next_packet(dev); } -static int spi_mcux_configure(struct device *dev, +static int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config_info; @@ -188,7 +188,7 @@ static int spi_mcux_configure(struct device *dev, return 0; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -218,7 +218,7 @@ static int transceive(struct device *dev, return ret; } -static int spi_mcux_transceive(struct device *dev, +static int spi_mcux_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -227,7 +227,7 @@ static int spi_mcux_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_mcux_transceive_async(struct device *dev, +static int spi_mcux_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -237,8 +237,8 @@ static int spi_mcux_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_mcux_release(struct device *dev, - const struct spi_config *spi_cfg) +static int spi_mcux_release(const struct device *dev, + const struct spi_config *spi_cfg) { struct spi_mcux_data *data = dev->driver_data; @@ -247,7 +247,7 @@ static int spi_mcux_release(struct device *dev, return 0; } -static int spi_mcux_init(struct device *dev) +static int spi_mcux_init(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -268,7 +268,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { }; #define SPI_MCUX_FLEXCOMM_DEVICE(id) \ - static void spi_mcux_config_func_##id(struct device *dev); \ + static void spi_mcux_config_func_##id(const struct device *dev); \ static const struct spi_mcux_config spi_mcux_config_##id = { \ .base = \ (SPI_Type *)DT_INST_REG_ADDR(id), \ @@ -286,7 +286,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &spi_mcux_driver_api); \ - static void spi_mcux_config_func_##id(struct device *dev) \ + static void spi_mcux_config_func_##id(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(id), \ DT_INST_IRQ(id, priority), \ diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c index e9f00c2fd544..9216fc6c6b00 100644 --- a/drivers/spi/spi_mcux_lpspi.c +++ b/drivers/spi/spi_mcux_lpspi.c @@ -24,7 +24,7 @@ struct spi_mcux_config { LPSPI_Type *base; char *clock_name; clock_control_subsys_t clock_subsys; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct spi_mcux_data { @@ -33,7 +33,7 @@ struct spi_mcux_data { size_t transfer_len; }; -static void spi_mcux_transfer_next_packet(struct device *dev) +static void spi_mcux_transfer_next_packet(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -102,7 +102,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; @@ -113,7 +113,7 @@ static void spi_mcux_isr(void *arg) static void spi_mcux_master_transfer_callback(LPSPI_Type *base, lpspi_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct spi_mcux_data *data = dev->driver_data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); @@ -122,14 +122,14 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, spi_mcux_transfer_next_packet(dev); } -static int spi_mcux_configure(struct device *dev, +static int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; u32_t word_size; @@ -196,7 +196,7 @@ static int spi_mcux_configure(struct device *dev, return 0; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -226,7 +226,7 @@ static int transceive(struct device *dev, return ret; } -static int spi_mcux_transceive(struct device *dev, +static int spi_mcux_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -235,7 +235,7 @@ static int spi_mcux_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_mcux_transceive_async(struct device *dev, +static int spi_mcux_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -245,8 +245,8 @@ static int spi_mcux_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_mcux_release(struct device *dev, - const struct spi_config *spi_cfg) +static int spi_mcux_release(const struct device *dev, + const struct spi_config *spi_cfg) { struct spi_mcux_data *data = dev->driver_data; @@ -255,7 +255,7 @@ static int spi_mcux_release(struct device *dev, return 0; } -static int spi_mcux_init(struct device *dev) +static int spi_mcux_init(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -276,7 +276,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { }; #define SPI_MCUX_LPSPI_INIT(n) \ - static void spi_mcux_config_func_##n(struct device *dev); \ + static void spi_mcux_config_func_##n(const struct device *dev); \ \ static const struct spi_mcux_config spi_mcux_config_##n = { \ .base = (LPSPI_Type *) DT_INST_REG_ADDR(n), \ @@ -297,7 +297,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &spi_mcux_driver_api); \ \ - static void spi_mcux_config_func_##n(struct device *dev) \ + static void spi_mcux_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), DT_INST_IRQ(n, priority), \ spi_mcux_isr, DEVICE_GET(spi_mcux_##n), 0); \ diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index dce2a94b7d59..3252813eaf59 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -28,12 +28,12 @@ struct spi_nrfx_config { nrfx_spi_config_t config; }; -static inline struct spi_nrfx_data *get_dev_data(struct device *dev) +static inline struct spi_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) +static inline const struct spi_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } @@ -85,7 +85,7 @@ static inline nrf_spi_bit_order_t get_nrf_spi_bit_order(u16_t operation) } } -static int configure(struct device *dev, +static int configure(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_context *ctx = &get_dev_data(dev)->ctx; @@ -135,7 +135,7 @@ static int configure(struct device *dev, return 0; } -static void transfer_next_chunk(struct device *dev) +static void transfer_next_chunk(const struct device *dev) { struct spi_nrfx_data *dev_data = get_dev_data(dev); struct spi_context *ctx = &dev_data->ctx; @@ -169,7 +169,7 @@ static void transfer_next_chunk(struct device *dev) dev_data->busy = false; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -198,7 +198,7 @@ static int transceive(struct device *dev, return error; } -static int spi_nrfx_transceive(struct device *dev, +static int spi_nrfx_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -207,7 +207,7 @@ static int spi_nrfx_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_nrfx_transceive_async(struct device *dev, +static int spi_nrfx_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -217,7 +217,7 @@ static int spi_nrfx_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_nrfx_release(struct device *dev, +static int spi_nrfx_release(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_nrfx_data *dev_data = get_dev_data(dev); @@ -246,7 +246,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = { static void event_handler(const nrfx_spi_evt_t *p_event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; struct spi_nrfx_data *dev_data = get_dev_data(dev); if (p_event->type == NRFX_SPI_EVENT_DONE) { @@ -257,7 +257,7 @@ static void event_handler(const nrfx_spi_evt_t *p_event, void *p_context) } } -static int init_spi(struct device *dev) +static int init_spi(const struct device *dev) { /* This sets only default values of frequency, mode and bit order. * The proper ones are set in configure() when a transfer is started. @@ -265,7 +265,7 @@ static int init_spi(struct device *dev) nrfx_err_t result = nrfx_spi_init(&get_dev_config(dev)->spi, &get_dev_config(dev)->config, event_handler, - dev); + (void *)dev); if (result != NRFX_SUCCESS) { LOG_ERR("Failed to initialize device: %s", dev->name); @@ -281,7 +281,7 @@ static int init_spi(struct device *dev) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int spi_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int spi_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -352,7 +352,7 @@ static int spi_nrfx_pm_control(struct device *dev, u32_t ctrl_command, !SPI_PROP(idx, miso_pull_up) || !SPI_PROP(idx, miso_pull_down),\ "SPI"#idx \ ": cannot enable both pull-up and pull-down on MISO line"); \ - static int spi_##idx##_init(struct device *dev) \ + static int spi_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(SPI(idx)), DT_IRQ(SPI(idx), priority), \ nrfx_isr, nrfx_spi_##idx##_irq_handler, 0); \ diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index 5823153057d5..074c82b7490c 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -33,12 +33,12 @@ struct spi_nrfx_config { nrfx_spim_config_t config; }; -static inline struct spi_nrfx_data *get_dev_data(struct device *dev) +static inline struct spi_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) +static inline const struct spi_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } @@ -99,7 +99,7 @@ static inline nrf_spim_bit_order_t get_nrf_spim_bit_order(u16_t operation) } } -static int configure(struct device *dev, +static int configure(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_context *ctx = &get_dev_data(dev)->ctx; @@ -149,7 +149,7 @@ static int configure(struct device *dev, return 0; } -static void transfer_next_chunk(struct device *dev) +static void transfer_next_chunk(const struct device *dev) { struct spi_nrfx_data *dev_data = get_dev_data(dev); const struct spi_nrfx_config *dev_config = get_dev_config(dev); @@ -208,7 +208,7 @@ static void transfer_next_chunk(struct device *dev) dev_data->busy = false; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -237,7 +237,7 @@ static int transceive(struct device *dev, return error; } -static int spi_nrfx_transceive(struct device *dev, +static int spi_nrfx_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -246,7 +246,7 @@ static int spi_nrfx_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_nrfx_transceive_async(struct device *dev, +static int spi_nrfx_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -256,7 +256,7 @@ static int spi_nrfx_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_nrfx_release(struct device *dev, +static int spi_nrfx_release(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_nrfx_data *dev_data = get_dev_data(dev); @@ -285,7 +285,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = { static void event_handler(const nrfx_spim_evt_t *p_event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; struct spi_nrfx_data *dev_data = get_dev_data(dev); if (p_event->type == NRFX_SPIM_EVENT_DONE) { @@ -296,7 +296,7 @@ static void event_handler(const nrfx_spim_evt_t *p_event, void *p_context) } } -static int init_spim(struct device *dev) +static int init_spim(const struct device *dev) { /* This sets only default values of frequency, mode and bit order. * The proper ones are set in configure() when a transfer is started. @@ -304,7 +304,7 @@ static int init_spim(struct device *dev) nrfx_err_t result = nrfx_spim_init(&get_dev_config(dev)->spim, &get_dev_config(dev)->config, event_handler, - dev); + (void *)dev); if (result != NRFX_SUCCESS) { LOG_ERR("Failed to initialize device: %s", dev->name); @@ -320,7 +320,7 @@ static int init_spim(struct device *dev) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int spim_nrfx_pm_control(struct device *dev, u32_t ctrl_command, +static int spim_nrfx_pm_control(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -399,7 +399,7 @@ static int spim_nrfx_pm_control(struct device *dev, u32_t ctrl_command, !SPIM_NRFX_MISO_PULL_UP(idx) || !SPIM_NRFX_MISO_PULL_DOWN(idx),\ "SPIM"#idx \ ": cannot enable both pull-up and pull-down on MISO line"); \ - static int spi_##idx##_init(struct device *dev) \ + static int spi_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(NRFX_IRQ_NUMBER_GET(NRF_SPIM##idx), \ DT_IRQ(SPIM(idx), priority), \ diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c index 78ed66f793a2..43bc14cdc5f7 100644 --- a/drivers/spi/spi_nrfx_spis.c +++ b/drivers/spi/spi_nrfx_spis.c @@ -23,12 +23,12 @@ struct spi_nrfx_config { size_t max_buf_len; }; -static inline struct spi_nrfx_data *get_dev_data(struct device *dev) +static inline struct spi_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) +static inline const struct spi_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } @@ -59,7 +59,7 @@ static inline nrf_spis_bit_order_t get_nrf_spis_bit_order(u16_t operation) } } -static int configure(struct device *dev, +static int configure(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_context *ctx = &get_dev_data(dev)->ctx; @@ -105,7 +105,7 @@ static int configure(struct device *dev, return 0; } -static void prepare_for_transfer(struct device *dev) +static void prepare_for_transfer(const struct device *dev) { struct spi_nrfx_data *dev_data = get_dev_data(dev); const struct spi_nrfx_config *dev_config = get_dev_config(dev); @@ -141,7 +141,7 @@ static void prepare_for_transfer(struct device *dev) spi_context_complete(ctx, status); } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -177,7 +177,7 @@ static int transceive(struct device *dev, return error; } -static int spi_nrfx_transceive(struct device *dev, +static int spi_nrfx_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -186,7 +186,7 @@ static int spi_nrfx_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_nrfx_transceive_async(struct device *dev, +static int spi_nrfx_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -196,7 +196,7 @@ static int spi_nrfx_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_nrfx_release(struct device *dev, +static int spi_nrfx_release(const struct device *dev, const struct spi_config *spi_cfg) { struct spi_nrfx_data *dev_data = get_dev_data(dev); @@ -221,7 +221,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = { static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context) { - struct device *dev = p_context; + const struct device *dev = p_context; struct spi_nrfx_data *dev_data = get_dev_data(dev); if (p_event->evt_type == NRFX_SPIS_XFER_DONE) { @@ -229,7 +229,8 @@ static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context) } } -static int init_spis(struct device *dev, const nrfx_spis_config_t *config) +static int init_spis(const struct device *dev, + const nrfx_spis_config_t *config) { /* This sets only default values of frequency, mode and bit order. * The proper ones are set in configure() when a transfer is started. @@ -261,7 +262,7 @@ static int init_spis(struct device *dev, const nrfx_spis_config_t *config) #define SPIS_PROP(idx, prop) DT_PROP(SPIS(idx), prop) #define SPI_NRFX_SPIS_DEVICE(idx) \ - static int spi_##idx##_init(struct device *dev) \ + static int spi_##idx##_init(const struct device *dev) \ { \ IRQ_CONNECT(DT_IRQN(SPIS(idx)), DT_IRQ(SPIS(idx), priority), \ nrfx_isr, nrfx_spis_##idx##_irq_handler, 0); \ diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c index 6a95f72025e3..b24b6a3400f1 100644 --- a/drivers/spi/spi_oc_simple.c +++ b/drivers/spi/spi_oc_simple.c @@ -85,10 +85,10 @@ static int spi_oc_simple_configure(const struct spi_oc_simple_cfg *info, return 0; } -int spi_oc_simple_transceive(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs) +int spi_oc_simple_transceive(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs) { const struct spi_oc_simple_cfg *info = dev->config_info; struct spi_oc_simple_data *spi = SPI_OC_SIMPLE_DATA(dev); @@ -158,17 +158,18 @@ int spi_oc_simple_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_oc_simple_transceive_async(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs, - struct k_poll_signal *async) +static int spi_oc_simple_transceive_async(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs, + struct k_poll_signal *async) { return -ENOTSUP; } #endif /* CONFIG_SPI_ASYNC */ -int spi_oc_simple_release(struct device *dev, const struct spi_config *config) +int spi_oc_simple_release(const struct device *dev, + const struct spi_config *config) { spi_context_unlock_unconditionally(&SPI_OC_SIMPLE_DATA(dev)->ctx); return 0; @@ -182,7 +183,7 @@ static struct spi_driver_api spi_oc_simple_api = { #endif /* CONFIG_SPI_ASYNC */ }; -int spi_oc_simple_init(struct device *dev) +int spi_oc_simple_init(const struct device *dev) { const struct spi_oc_simple_cfg *info = dev->config_info; diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c index 91fa86b32308..6b909e1f686a 100644 --- a/drivers/spi/spi_rv32m1_lpspi.c +++ b/drivers/spi/spi_rv32m1_lpspi.c @@ -28,7 +28,7 @@ struct spi_mcux_config { clock_control_subsys_t clock_subsys; clock_ip_name_t clock_ip_name; u32_t clock_ip_src; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct spi_mcux_data { @@ -37,7 +37,7 @@ struct spi_mcux_data { size_t transfer_len; }; -static void spi_mcux_transfer_next_packet(struct device *dev) +static void spi_mcux_transfer_next_packet(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -105,7 +105,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; @@ -116,7 +116,7 @@ static void spi_mcux_isr(void *arg) static void spi_mcux_master_transfer_callback(LPSPI_Type *base, lpspi_master_handle_t *handle, status_t status, void *userData) { - struct device *dev = userData; + const struct device *dev = userData; struct spi_mcux_data *data = dev->driver_data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); @@ -125,14 +125,14 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, spi_mcux_transfer_next_packet(dev); } -static int spi_mcux_configure(struct device *dev, +static int spi_mcux_configure(const struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; u32_t word_size; @@ -197,7 +197,7 @@ static int spi_mcux_configure(struct device *dev, return 0; } -static int transceive(struct device *dev, +static int transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -227,7 +227,7 @@ static int transceive(struct device *dev, return ret; } -static int spi_mcux_transceive(struct device *dev, +static int spi_mcux_transceive(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -236,7 +236,7 @@ static int spi_mcux_transceive(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_mcux_transceive_async(struct device *dev, +static int spi_mcux_transceive_async(const struct device *dev, const struct spi_config *spi_cfg, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -246,8 +246,8 @@ static int spi_mcux_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_mcux_release(struct device *dev, - const struct spi_config *spi_cfg) +static int spi_mcux_release(const struct device *dev, + const struct spi_config *spi_cfg) { struct spi_mcux_data *data = dev->driver_data; @@ -256,7 +256,7 @@ static int spi_mcux_release(struct device *dev, return 0; } -static int spi_mcux_init(struct device *dev) +static int spi_mcux_init(const struct device *dev) { const struct spi_mcux_config *config = dev->config_info; struct spi_mcux_data *data = dev->driver_data; @@ -279,7 +279,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { }; #define SPI_RV32M1_INIT(n) \ - static void spi_mcux_config_func_##n(struct device *dev); \ + static void spi_mcux_config_func_##n(const struct device *dev); \ \ static const struct spi_mcux_config spi_mcux_config_##n = { \ .base = (LPSPI_Type *) DT_INST_REG_ADDR(n), \ @@ -303,7 +303,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &spi_mcux_driver_api); \ \ - static void spi_mcux_config_func_##n(struct device *dev) \ + static void spi_mcux_config_func_##n(const struct device *dev) \ { \ IRQ_CONNECT(DT_INST_IRQN(n), \ 0, \ diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c index a5d43378cdb4..8879d36e20a4 100644 --- a/drivers/spi/spi_sam.c +++ b/drivers/spi/spi_sam.c @@ -48,7 +48,7 @@ static int spi_slave_to_mr_pcs(int slave) return pcs[slave]; } -static int spi_sam_configure(struct device *dev, +static int spi_sam_configure(const struct device *dev, const struct spi_config *config) { const struct spi_sam_config *cfg = dev->config_info; @@ -267,7 +267,7 @@ static void spi_sam_fast_txrx(Spi *regs, } /* Fast path where every overlapping tx and rx buffer is the same length */ -static void spi_sam_fast_transceive(struct device *dev, +static void spi_sam_fast_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -356,7 +356,7 @@ static bool spi_sam_is_regular(const struct spi_buf_set *tx_bufs, return true; } -static int spi_sam_transceive(struct device *dev, +static int spi_sam_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -397,7 +397,7 @@ static int spi_sam_transceive(struct device *dev, return err; } -static int spi_sam_transceive_sync(struct device *dev, +static int spi_sam_transceive_sync(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -406,7 +406,7 @@ static int spi_sam_transceive_sync(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int spi_sam_transceive_async(struct device *dev, +static int spi_sam_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -417,7 +417,7 @@ static int spi_sam_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_sam_release(struct device *dev, +static int spi_sam_release(const struct device *dev, const struct spi_config *config) { struct spi_sam_data *data = dev->driver_data; @@ -427,7 +427,7 @@ static int spi_sam_release(struct device *dev, return 0; } -static int spi_sam_init(struct device *dev) +static int spi_sam_init(const struct device *dev) { const struct spi_sam_config *cfg = dev->config_info; struct spi_sam_data *data = dev->driver_data; diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c index a851ace4c892..96e245ea643a 100644 --- a/drivers/spi/spi_sam0.c +++ b/drivers/spi/spi_sam0.c @@ -45,7 +45,7 @@ struct spi_sam0_config { struct spi_sam0_data { struct spi_context ctx; #ifdef CONFIG_SPI_ASYNC - struct device *dma; + const struct device *dma; u32_t dma_segment_len; #endif }; @@ -65,7 +65,7 @@ static void wait_synchronization(SercomSpi *regs) #endif } -static int spi_sam0_configure(struct device *dev, +static int spi_sam0_configure(const struct device *dev, const struct spi_config *config) { const struct spi_sam0_config *cfg = dev->config_info; @@ -291,7 +291,7 @@ static void spi_sam0_fast_txrx(SercomSpi *regs, } /* Fast path where every overlapping tx and rx buffer is the same length */ -static void spi_sam0_fast_transceive(struct device *dev, +static void spi_sam0_fast_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -382,7 +382,7 @@ static bool spi_sam0_is_regular(const struct spi_buf_set *tx_bufs, return true; } -static int spi_sam0_transceive(struct device *dev, +static int spi_sam0_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -423,7 +423,7 @@ static int spi_sam0_transceive(struct device *dev, return err; } -static int spi_sam0_transceive_sync(struct device *dev, +static int spi_sam0_transceive_sync(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -435,7 +435,7 @@ static int spi_sam0_transceive_sync(struct device *dev, static void spi_sam0_dma_rx_done(void *arg, u32_t id, int error_code); -static int spi_sam0_dma_rx_load(struct device *dev, u8_t *buf, +static int spi_sam0_dma_rx_load(const struct device *dev, u8_t *buf, size_t len) { const struct spi_sam0_config *cfg = dev->config_info; @@ -477,7 +477,7 @@ static int spi_sam0_dma_rx_load(struct device *dev, u8_t *buf, return dma_start(data->dma, cfg->rx_dma_channel); } -static int spi_sam0_dma_tx_load(struct device *dev, const u8_t *buf, +static int spi_sam0_dma_tx_load(const struct device *dev, const u8_t *buf, size_t len) { const struct spi_sam0_config *cfg = dev->config_info; @@ -518,7 +518,7 @@ static int spi_sam0_dma_tx_load(struct device *dev, const u8_t *buf, return dma_start(data->dma, cfg->tx_dma_channel); } -static bool spi_sam0_dma_advance_segment(struct device *dev) +static bool spi_sam0_dma_advance_segment(const struct device *dev) { struct spi_sam0_data *data = dev->driver_data; u32_t segment_len; @@ -543,7 +543,7 @@ static bool spi_sam0_dma_advance_segment(struct device *dev) return true; } -static int spi_sam0_dma_advance_buffers(struct device *dev) +static int spi_sam0_dma_advance_buffers(const struct device *dev) { struct spi_sam0_data *data = dev->driver_data; int retval; @@ -581,7 +581,7 @@ static int spi_sam0_dma_advance_buffers(struct device *dev) static void spi_sam0_dma_rx_done(void *arg, u32_t id, int error_code) { - struct device *dev = arg; + const struct device *dev = arg; const struct spi_sam0_config *cfg = dev->config_info; struct spi_sam0_data *data = dev->driver_data; int retval; @@ -610,7 +610,7 @@ static void spi_sam0_dma_rx_done(void *arg, u32_t id, int error_code) } -static int spi_sam0_transceive_async(struct device *dev, +static int spi_sam0_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -663,7 +663,7 @@ static int spi_sam0_transceive_async(struct device *dev, } #endif /* CONFIG_SPI_ASYNC */ -static int spi_sam0_release(struct device *dev, +static int spi_sam0_release(const struct device *dev, const struct spi_config *config) { struct spi_sam0_data *data = dev->driver_data; @@ -673,7 +673,7 @@ static int spi_sam0_release(struct device *dev, return 0; } -static int spi_sam0_init(struct device *dev) +static int spi_sam0_init(const struct device *dev) { const struct spi_sam0_config *cfg = dev->config_info; struct spi_sam0_data *data = dev->driver_data; diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c index 82372e79ad60..49c5108170bc 100644 --- a/drivers/spi/spi_sifive.c +++ b/drivers/spi/spi_sifive.c @@ -26,7 +26,7 @@ static inline void sys_set_mask(mem_addr_t addr, u32_t mask, u32_t value) sys_write32(temp, addr); } -int spi_config(struct device *dev, u32_t frequency, u16_t operation) +int spi_config(const struct device *dev, u32_t frequency, u16_t operation) { u32_t div; u32_t fmt_len; @@ -93,7 +93,7 @@ int spi_config(struct device *dev, u32_t frequency, u16_t operation) return 0; } -void spi_sifive_send(struct device *dev, u16_t frame) +void spi_sifive_send(const struct device *dev, u16_t frame) { while (sys_read32(SPI_REG(dev, REG_TXDATA)) & SF_TXDATA_FULL) { } @@ -101,7 +101,7 @@ void spi_sifive_send(struct device *dev, u16_t frame) sys_write32((u32_t) frame, SPI_REG(dev, REG_TXDATA)); } -u16_t spi_sifive_recv(struct device *dev) +u16_t spi_sifive_recv(const struct device *dev) { u32_t val; @@ -111,7 +111,7 @@ u16_t spi_sifive_recv(struct device *dev) return (u16_t) val; } -void spi_sifive_xfer(struct device *dev, const bool hw_cs_control) +void spi_sifive_xfer(const struct device *dev, const bool hw_cs_control) { struct spi_context *ctx = &SPI_DATA(dev)->ctx; @@ -148,7 +148,7 @@ void spi_sifive_xfer(struct device *dev, const bool hw_cs_control) /* API Functions */ -int spi_sifive_init(struct device *dev) +int spi_sifive_init(const struct device *dev) { /* Disable SPI Flash mode */ sys_clear_bit(SPI_REG(dev, REG_FCTRL), SF_FCTRL_EN); @@ -158,7 +158,7 @@ int spi_sifive_init(struct device *dev) return 0; } -int spi_sifive_transceive(struct device *dev, +int spi_sifive_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -224,7 +224,8 @@ int spi_sifive_transceive(struct device *dev, return rc; } -int spi_sifive_release(struct device *dev, const struct spi_config *config) +int spi_sifive_release(const struct device *dev, + const struct spi_config *config) { spi_context_unlock_unconditionally(&SPI_DATA(dev)->ctx); return 0; diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c index a0f221373614..c69ba15bd865 100644 --- a/drivers/spi/spi_xec_qmspi.c +++ b/drivers/spi/spi_xec_qmspi.c @@ -165,7 +165,7 @@ static u32_t qmspi_config_get_lines(const struct spi_config *config) * Configure QMSPI. * NOTE: QMSPI can control two chip selects. At this time we use CS0# only. */ -static int qmspi_configure(struct device *dev, +static int qmspi_configure(const struct device *dev, const struct spi_config *config) { const struct spi_qmspi_config *cfg = dev->config_info; @@ -503,7 +503,7 @@ static int qmspi_rx(QMSPI_Type *regs, const struct spi_buf *rx_buf, return 0; } -static int qmspi_transceive(struct device *dev, +static int qmspi_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -570,7 +570,7 @@ static int qmspi_transceive(struct device *dev, return err; } -static int qmspi_transceive_sync(struct device *dev, +static int qmspi_transceive_sync(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) @@ -579,7 +579,7 @@ static int qmspi_transceive_sync(struct device *dev, } #ifdef CONFIG_SPI_ASYNC -static int qmspi_transceive_async(struct device *dev, +static int qmspi_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -589,7 +589,7 @@ static int qmspi_transceive_async(struct device *dev, } #endif -static int qmspi_release(struct device *dev, +static int qmspi_release(const struct device *dev, const struct spi_config *config) { struct spi_qmspi_data *data = dev->driver_data; @@ -614,7 +614,7 @@ static int qmspi_release(struct device *dev, * Initialize SPI context. * QMSPI will be configured and enabled when the transceive API is called. */ -static int qmspi_init(struct device *dev) +static int qmspi_init(const struct device *dev) { const struct spi_qmspi_config *cfg = dev->config_info; struct spi_qmspi_data *data = dev->driver_data; diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c index d8cd8a99bf5f..b421b66a09b4 100644 --- a/drivers/timer/altera_avalon_timer_hal.c +++ b/drivers/timer/altera_avalon_timer_hal.c @@ -41,7 +41,7 @@ static void timer_irq_handler(void *unused) #endif } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/apic_timer.c b/drivers/timer/apic_timer.c index f1866e05ec73..aad7a94c8868 100644 --- a/drivers/timer/apic_timer.c +++ b/drivers/timer/apic_timer.c @@ -213,7 +213,7 @@ u32_t z_timer_cycle_get_32(void) #endif -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { u32_t val; diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c index 3ca3a22ea642..a7a6ceaf350e 100644 --- a/drivers/timer/arcv2_timer0.c +++ b/drivers/timer/arcv2_timer0.c @@ -254,7 +254,7 @@ static void timer_int_handler(void *unused) * * @return 0 */ -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c index 3dab3b216fa9..d81df204e08b 100644 --- a/drivers/timer/arm_arch_timer.c +++ b/drivers/timer/arm_arch_timer.c @@ -44,7 +44,7 @@ static void arm_arch_timer_compare_isr(void *arg) z_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? delta_ticks : 1); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c index 1119ecf4d04d..4e1318888565 100644 --- a/drivers/timer/cavs_timer.c +++ b/drivers/timer/cavs_timer.c @@ -104,7 +104,7 @@ static void compare_isr(void *arg) z_clock_announce(dticks); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { u64_t curr = count(); diff --git a/drivers/timer/cc13x2_cc26x2_rtc_timer.c b/drivers/timer/cc13x2_cc26x2_rtc_timer.c index e542a05253c1..27c26d4a0b2b 100644 --- a/drivers/timer/cc13x2_cc26x2_rtc_timer.c +++ b/drivers/timer/cc13x2_cc26x2_rtc_timer.c @@ -183,7 +183,7 @@ static void startDevice(void) irq_unlock(key); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c index c52467ada49e..e5310e0a5566 100644 --- a/drivers/timer/cortex_m_systick.c +++ b/drivers/timer/cortex_m_systick.c @@ -149,7 +149,7 @@ void z_clock_isr(void *arg) z_arm_int_exit(); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { NVIC_SetPriority(SysTick_IRQn, _IRQ_PRIO_OFFSET); last_load = CYC_PER_TICK - 1; diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c index 0d85011c91de..ecea1eba1f3e 100644 --- a/drivers/timer/hpet.c +++ b/drivers/timer/hpet.c @@ -80,7 +80,7 @@ static void set_timer0_irq(unsigned int irq) TIMER0_CONF_REG = val; } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { extern int z_clock_hw_cycles_per_sec; u32_t hz; diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c index 66711ce4ab05..a99229a63d0e 100644 --- a/drivers/timer/litex_timer.c +++ b/drivers/timer/litex_timer.c @@ -49,7 +49,7 @@ u32_t z_clock_elapsed(void) return 0; } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); IRQ_CONNECT(TIMER_IRQ, DT_INST_IRQ(0, priority), diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c index bd3a11dde615..f9f43103e29b 100644 --- a/drivers/timer/loapic_timer.c +++ b/drivers/timer/loapic_timer.c @@ -553,7 +553,7 @@ void z_clock_idle_exit(void) * * @return 0 */ -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); @@ -586,7 +586,7 @@ int z_clock_driver_init(struct device *device) } #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -static int sys_clock_suspend(struct device *dev) +static int sys_clock_suspend(const struct device *dev) { ARG_UNUSED(dev); @@ -597,7 +597,7 @@ static int sys_clock_suspend(struct device *dev) return 0; } -static int sys_clock_resume(struct device *dev) +static int sys_clock_resume(const struct device *dev) { ARG_UNUSED(dev); @@ -637,7 +637,7 @@ static int sys_clock_resume(struct device *dev) * Implements the driver control management functionality * the *context may include IN data or/and OUT data */ -int z_clock_device_ctrl(struct device *port, u32_t ctrl_command, +int z_clock_device_ctrl(const struct device *port, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c index 216550c64067..0661fa9c69d8 100644 --- a/drivers/timer/mchp_xec_rtos_timer.c +++ b/drivers/timer/mchp_xec_rtos_timer.c @@ -324,7 +324,7 @@ void sys_clock_disable(void) TIMER_REGS->CTRL = 0U; } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c index 7a966968eabc..d51a62046c64 100644 --- a/drivers/timer/native_posix_timer.c +++ b/drivers/timer/native_posix_timer.c @@ -52,7 +52,7 @@ static void np_timer_isr(void *arg) * * Enable the hw timer, setting its tick period, and setup its interrupt */ -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c index a84c3ae32390..0e348b8d8e6e 100644 --- a/drivers/timer/nrf_rtc_timer.c +++ b/drivers/timer/nrf_rtc_timer.c @@ -180,9 +180,9 @@ void rtc1_nrf_isr(void *arg) z_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { - struct device *clock; + const struct device *clock; ARG_UNUSED(device); diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c index e263bee6d448..210cc3e469fb 100644 --- a/drivers/timer/riscv_machine_timer.c +++ b/drivers/timer/riscv_machine_timer.c @@ -79,7 +79,7 @@ static void timer_isr(void *arg) z_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { IRQ_CONNECT(RISCV_MACHINE_TIMER_IRQ, 0, timer_isr, NULL, 0); last_count = mtime(); diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c index 6d6a36b0be09..5a33cccbbe66 100644 --- a/drivers/timer/rv32m1_lptmr_timer.c +++ b/drivers/timer/rv32m1_lptmr_timer.c @@ -44,7 +44,7 @@ struct device; /* forward declaration; type is not used. */ static volatile u32_t cycle_count; -static void lptmr_irq_handler(struct device *unused) +static void lptmr_irq_handler(const struct device *unused) { ARG_UNUSED(unused); @@ -53,7 +53,7 @@ static void lptmr_irq_handler(struct device *unused) z_clock_announce(1); /* Poke the scheduler. */ } -int z_clock_driver_init(struct device *unused) +int z_clock_driver_init(const struct device *unused) { u32_t csr, psr, sircdiv; /* LPTMR registers */ diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c index fa3280701b03..86894f7100d4 100644 --- a/drivers/timer/sam0_rtc_timer.c +++ b/drivers/timer/sam0_rtc_timer.c @@ -175,7 +175,7 @@ static void rtc_isr(void *arg) #endif /* CONFIG_TICKLESS_KERNEL */ } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/stm32_lptim_timer.c b/drivers/timer/stm32_lptim_timer.c index ed405580739e..54eeb8bd6a9a 100644 --- a/drivers/timer/stm32_lptim_timer.c +++ b/drivers/timer/stm32_lptim_timer.c @@ -37,7 +37,7 @@ static u32_t accumulated_lptim_cnt; static struct k_spinlock lock; -static void lptim_irq_handler(struct device *unused) +static void lptim_irq_handler(const struct device *unused) { ARG_UNUSED(unused); @@ -81,7 +81,7 @@ static void lptim_irq_handler(struct device *unused) } } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { ARG_UNUSED(device); diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c index 86ed718eb66e..7633ebe206c2 100644 --- a/drivers/timer/sys_clock_init.c +++ b/drivers/timer/sys_clock_init.c @@ -23,12 +23,13 @@ void __weak z_clock_isr(void *arg) __ASSERT_NO_MSG(false); } -int __weak z_clock_driver_init(struct device *device) +int __weak z_clock_driver_init(const struct device *device) { return 0; } -int __weak z_clock_device_ctrl(struct device *device, u32_t ctrl_command, +int __weak z_clock_device_ctrl(const struct device *device, + u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { return 0; diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c index ebb2e95cb492..bc9f64247956 100644 --- a/drivers/timer/xlnx_psttc_timer.c +++ b/drivers/timer/xlnx_psttc_timer.c @@ -96,7 +96,7 @@ static void ttc_isr(void *arg) z_clock_announce(ticks); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { u32_t reg_val; diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c index c4e33c5367fc..abfb8215a8ba 100644 --- a/drivers/timer/xtensa_sys_timer.c +++ b/drivers/timer/xtensa_sys_timer.c @@ -57,7 +57,7 @@ static void ccompare_isr(void *arg) z_clock_announce(IS_ENABLED(CONFIG_TICKLESS_KERNEL) ? dticks : 1); } -int z_clock_driver_init(struct device *device) +int z_clock_driver_init(const struct device *device) { IRQ_CONNECT(TIMER_IRQ, 0, ccompare_isr, 0, 0); set_ccompare(ccount() + CYC_PER_TICK); diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c index cb1fefee187d..8c42e2a904cb 100644 --- a/drivers/usb/device/usb_dc_nrfx.c +++ b/drivers/usb/device/usb_dc_nrfx.c @@ -536,7 +536,7 @@ void usb_dc_nrfx_power_event_callback(nrf_power_event_t event) static int hf_clock_enable(bool on, bool blocking) { int ret = -ENODEV; - struct device *clock; + const struct device *clock; static bool clock_requested; clock = device_get_binding(DT_LABEL(DT_INST(0, nordic_nrf_clock))); diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index 6dbc09d52c1a..d05b14d0949a 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -222,7 +222,7 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd) static int usb_dc_stm32_clock_enable(void) { - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); struct stm32_pclken pclken = { .bus = USB_CLOCK_BUS, .enr = USB_CLOCK_BITS, @@ -1047,7 +1047,7 @@ void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, u8_t epnum) #if defined(USB) && defined(CONFIG_USB_DC_STM32_DISCONN_ENABLE) void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) { - struct device *usb_disconnect; + const struct device *usb_disconnect; usb_disconnect = device_get_binding( DT_GPIO_LABEL(DT_INST(0, st_stm32_usb), disconnect_gpios)); diff --git a/drivers/video/mt9m114.c b/drivers/video/mt9m114.c index 6dde84cf1eb3..681b6e1a5d5e 100644 --- a/drivers/video/mt9m114.c +++ b/drivers/video/mt9m114.c @@ -49,7 +49,7 @@ LOG_MODULE_REGISTER(mt9m114); #define MT9M114_SYS_STATE_LEAVE_STANDBY 0x54 struct mt9m114_data { - struct device *i2c; + const struct device *i2c; struct video_format fmt; u8_t i2c_addr; }; @@ -101,7 +101,7 @@ static struct mt9m114_reg mt9m114_vga_24mhz_pll[] = { { /* NULL terminated */ } }; -static inline int i2c_burst_read16(struct device *dev, u16_t dev_addr, +static inline int i2c_burst_read16(const struct device *dev, u16_t dev_addr, u16_t start_addr, u8_t *buf, u32_t num_bytes) { u8_t addr_buffer[2]; @@ -112,7 +112,7 @@ static inline int i2c_burst_read16(struct device *dev, u16_t dev_addr, buf, num_bytes); } -static inline int i2c_burst_write16(struct device *dev, u16_t dev_addr, +static inline int i2c_burst_write16(const struct device *dev, u16_t dev_addr, u16_t start_addr, const u8_t *buf, u32_t num_bytes) { @@ -132,7 +132,8 @@ static inline int i2c_burst_write16(struct device *dev, u16_t dev_addr, return i2c_transfer(dev, msg, 2, dev_addr); } -static int mt9m114_write_reg(struct device *dev, u16_t reg_addr, u8_t reg_size, +static int mt9m114_write_reg(const struct device *dev, u16_t reg_addr, + u8_t reg_size, void *value) { struct mt9m114_data *drv_data = dev->driver_data; @@ -154,7 +155,8 @@ static int mt9m114_write_reg(struct device *dev, u16_t reg_addr, u8_t reg_size, value, reg_size); } -static int mt9m114_read_reg(struct device *dev, u16_t reg_addr, u8_t reg_size, +static int mt9m114_read_reg(const struct device *dev, u16_t reg_addr, + u8_t reg_size, void *value) { struct mt9m114_data *drv_data = dev->driver_data; @@ -186,7 +188,8 @@ static int mt9m114_read_reg(struct device *dev, u16_t reg_addr, u8_t reg_size, return 0; } -static int mt9m114_write_all(struct device *dev, struct mt9m114_reg *reg) +static int mt9m114_write_all(const struct device *dev, + struct mt9m114_reg *reg) { int i = 0; @@ -205,7 +208,7 @@ static int mt9m114_write_all(struct device *dev, struct mt9m114_reg *reg) return 0; } -static int mt9m114_set_state(struct device *dev, u8_t state) +static int mt9m114_set_state(const struct device *dev, u8_t state) { u16_t val; int err; @@ -254,7 +257,8 @@ static int mt9m114_set_state(struct device *dev, u8_t state) return 0; } -static int mt9m114_set_fmt(struct device *dev, enum video_endpoint_id ep, +static int mt9m114_set_fmt(const struct device *dev, + enum video_endpoint_id ep, struct video_format *fmt) { struct mt9m114_data *drv_data = dev->driver_data; @@ -296,7 +300,8 @@ static int mt9m114_set_fmt(struct device *dev, enum video_endpoint_id ep, return 0; } -static int mt9m114_get_fmt(struct device *dev, enum video_endpoint_id ep, +static int mt9m114_get_fmt(const struct device *dev, + enum video_endpoint_id ep, struct video_format *fmt) { struct mt9m114_data *drv_data = dev->driver_data; @@ -306,12 +311,12 @@ static int mt9m114_get_fmt(struct device *dev, enum video_endpoint_id ep, return 0; } -static int mt9m114_stream_start(struct device *dev) +static int mt9m114_stream_start(const struct device *dev) { return mt9m114_set_state(dev, MT9M114_SYS_STATE_START_STREAMING); } -static int mt9m114_stream_stop(struct device *dev) +static int mt9m114_stream_stop(const struct device *dev) { return mt9m114_set_state(dev, MT9M114_SYS_STATE_ENTER_SUSPEND); } @@ -329,7 +334,8 @@ static const struct video_format_cap fmts[] = { { 0 } }; -static int mt9m114_get_caps(struct device *dev, enum video_endpoint_id ep, +static int mt9m114_get_caps(const struct device *dev, + enum video_endpoint_id ep, struct video_caps *caps) { caps->format_caps = fmts; @@ -344,7 +350,7 @@ static const struct video_driver_api mt9m114_driver_api = { .stream_stop = mt9m114_stream_stop, }; -static int mt9m114_init(struct device *dev) +static int mt9m114_init(const struct device *dev) { struct video_format fmt; u16_t val; @@ -386,7 +392,7 @@ static int mt9m114_init(struct device *dev) static struct mt9m114_data mt9m114_data_0; -static int mt9m114_init_0(struct device *dev) +static int mt9m114_init_0(const struct device *dev) { struct mt9m114_data *drv_data = dev->driver_data; diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c index e41a938ec1a1..260d928c5b41 100644 --- a/drivers/video/video_mcux_csi.c +++ b/drivers/video/video_mcux_csi.c @@ -22,7 +22,7 @@ struct video_mcux_csi_config { }; struct video_mcux_csi_data { - struct device *sensor_dev; + const struct device *sensor_dev; csi_config_t csi_config; csi_handle_t csi_handle; struct k_fifo fifo_in; @@ -49,7 +49,7 @@ static inline unsigned int video_pix_fmt_bpp(u32_t pixelformat) static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, status_t status, void *user_data) { - struct device *dev = user_data; + const struct device *dev = user_data; const struct video_mcux_csi_config *config = dev->config_info; struct video_mcux_csi_data *data = dev->driver_data; enum video_signal_result result = VIDEO_BUF_DONE; @@ -112,7 +112,8 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, return; } -static int video_mcux_csi_set_fmt(struct device *dev, enum video_endpoint_id ep, +static int video_mcux_csi_set_fmt(const struct device *dev, + enum video_endpoint_id ep, struct video_format *fmt) { const struct video_mcux_csi_config *config = dev->config_info; @@ -152,7 +153,8 @@ static int video_mcux_csi_set_fmt(struct device *dev, enum video_endpoint_id ep, return 0; } -static int video_mcux_csi_get_fmt(struct device *dev, enum video_endpoint_id ep, +static int video_mcux_csi_get_fmt(const struct device *dev, + enum video_endpoint_id ep, struct video_format *fmt) { struct video_mcux_csi_data *data = dev->driver_data; @@ -174,7 +176,7 @@ static int video_mcux_csi_get_fmt(struct device *dev, enum video_endpoint_id ep, return 0; } -static int video_mcux_csi_stream_start(struct device *dev) +static int video_mcux_csi_stream_start(const struct device *dev) { const struct video_mcux_csi_config *config = dev->config_info; struct video_mcux_csi_data *data = dev->driver_data; @@ -192,7 +194,7 @@ static int video_mcux_csi_stream_start(struct device *dev) return 0; } -static int video_mcux_csi_stream_stop(struct device *dev) +static int video_mcux_csi_stream_stop(const struct device *dev) { const struct video_mcux_csi_config *config = dev->config_info; struct video_mcux_csi_data *data = dev->driver_data; @@ -211,7 +213,8 @@ static int video_mcux_csi_stream_stop(struct device *dev) } -static int video_mcux_csi_flush(struct device *dev, enum video_endpoint_id ep, +static int video_mcux_csi_flush(const struct device *dev, + enum video_endpoint_id ep, bool cancel) { const struct video_mcux_csi_config *config = dev->config_info; @@ -245,7 +248,8 @@ static int video_mcux_csi_flush(struct device *dev, enum video_endpoint_id ep, return 0; } -static int video_mcux_csi_enqueue(struct device *dev, enum video_endpoint_id ep, +static int video_mcux_csi_enqueue(const struct device *dev, + enum video_endpoint_id ep, struct video_buffer *vbuf) { const struct video_mcux_csi_config *config = dev->config_info; @@ -271,7 +275,8 @@ static int video_mcux_csi_enqueue(struct device *dev, enum video_endpoint_id ep, return 0; } -static int video_mcux_csi_dequeue(struct device *dev, enum video_endpoint_id ep, +static int video_mcux_csi_dequeue(const struct device *dev, + enum video_endpoint_id ep, struct video_buffer **vbuf, k_timeout_t timeout) { @@ -289,7 +294,8 @@ static int video_mcux_csi_dequeue(struct device *dev, enum video_endpoint_id ep, return 0; } -static inline int video_mcux_csi_set_ctrl(struct device *dev, unsigned int cid, +static inline int video_mcux_csi_set_ctrl(const struct device *dev, + unsigned int cid, void *value) { struct video_mcux_csi_data *data = dev->driver_data; @@ -303,7 +309,8 @@ static inline int video_mcux_csi_set_ctrl(struct device *dev, unsigned int cid, return ret; } -static inline int video_mcux_csi_get_ctrl(struct device *dev, unsigned int cid, +static inline int video_mcux_csi_get_ctrl(const struct device *dev, + unsigned int cid, void *value) { struct video_mcux_csi_data *data = dev->driver_data; @@ -317,7 +324,7 @@ static inline int video_mcux_csi_get_ctrl(struct device *dev, unsigned int cid, return ret; } -static int video_mcux_csi_get_caps(struct device *dev, +static int video_mcux_csi_get_caps(const struct device *dev, enum video_endpoint_id ep, struct video_caps *caps) { @@ -347,7 +354,7 @@ static void video_mcux_csi_isr(void *p) CSI_DriverIRQHandler(); } -static int video_mcux_csi_init(struct device *dev) +static int video_mcux_csi_init(const struct device *dev) { const struct video_mcux_csi_config *config = dev->config_info; struct video_mcux_csi_data *data = dev->driver_data; @@ -369,7 +376,7 @@ static int video_mcux_csi_init(struct device *dev) } #ifdef CONFIG_POLL -static int video_mcux_csi_set_signal(struct device *dev, +static int video_mcux_csi_set_signal(const struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal) { @@ -409,7 +416,7 @@ static const struct video_mcux_csi_config video_mcux_csi_config_0 = { static struct video_mcux_csi_data video_mcux_csi_data_0; -static int video_mcux_csi_init_0(struct device *dev) +static int video_mcux_csi_init_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), video_mcux_csi_isr, NULL, 0); diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c index 5fbd3fa139ef..71520dbc9f14 100644 --- a/drivers/video/video_sw_generator.c +++ b/drivers/video/video_sw_generator.c @@ -11,7 +11,7 @@ #define VIDEO_PATTERN_FPS 30 struct video_sw_generator_data { - struct device *dev; + const struct device *dev; struct video_format fmt; struct k_fifo fifo_in; struct k_fifo fifo_out; @@ -22,7 +22,7 @@ struct video_sw_generator_data { struct k_poll_signal *signal; }; -static int video_sw_generator_set_fmt(struct device *dev, +static int video_sw_generator_set_fmt(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { @@ -37,7 +37,7 @@ static int video_sw_generator_set_fmt(struct device *dev, return 0; } -static int video_sw_generator_get_fmt(struct device *dev, +static int video_sw_generator_get_fmt(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { @@ -52,14 +52,14 @@ static int video_sw_generator_get_fmt(struct device *dev, return 0; } -static int video_sw_generator_stream_start(struct device *dev) +static int video_sw_generator_stream_start(const struct device *dev) { struct video_sw_generator_data *data = dev->driver_data; return k_delayed_work_submit(&data->buf_work, K_MSEC(33)); } -static int video_sw_generator_stream_stop(struct device *dev) +static int video_sw_generator_stream_stop(const struct device *dev) { struct video_sw_generator_data *data = dev->driver_data; @@ -123,7 +123,7 @@ static void __buffer_work(struct k_work *work) k_yield(); } -static int video_sw_generator_enqueue(struct device *dev, +static int video_sw_generator_enqueue(const struct device *dev, enum video_endpoint_id ep, struct video_buffer *vbuf) { @@ -138,7 +138,7 @@ static int video_sw_generator_enqueue(struct device *dev, return 0; } -static int video_sw_generator_dequeue(struct device *dev, +static int video_sw_generator_dequeue(const struct device *dev, enum video_endpoint_id ep, struct video_buffer **vbuf, k_timeout_t timeout) @@ -157,7 +157,7 @@ static int video_sw_generator_dequeue(struct device *dev, return 0; } -static int video_sw_generator_flush(struct device *dev, +static int video_sw_generator_flush(const struct device *dev, enum video_endpoint_id ep, bool cancel) { @@ -195,7 +195,7 @@ static const struct video_format_cap fmts[] = { { 0 } }; -static int video_sw_generator_get_caps(struct device *dev, +static int video_sw_generator_get_caps(const struct device *dev, enum video_endpoint_id ep, struct video_caps *caps) { @@ -206,7 +206,7 @@ static int video_sw_generator_get_caps(struct device *dev, } #ifdef CONFIG_POLL -static int video_sw_generator_set_signal(struct device *dev, +static int video_sw_generator_set_signal(const struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal) { @@ -222,7 +222,7 @@ static int video_sw_generator_set_signal(struct device *dev, } #endif -static inline int video_sw_generator_set_ctrl(struct device *dev, +static inline int video_sw_generator_set_ctrl(const struct device *dev, unsigned int cid, void *value) { @@ -261,7 +261,7 @@ static struct video_sw_generator_data video_sw_generator_data_0 = { .fmt.pixelformat = VIDEO_PIX_FMT_RGB565, }; -static int video_sw_generator_init(struct device *dev) +static int video_sw_generator_init(const struct device *dev) { struct video_sw_generator_data *data = dev->driver_data; diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c index 0bbfd2ff8907..5c87969ca298 100644 --- a/drivers/watchdog/wdt_cmsdk_apb.c +++ b/drivers/watchdog/wdt_cmsdk_apb.c @@ -62,15 +62,15 @@ struct wdog_cmsdk_apb { ((volatile struct wdog_cmsdk_apb *)(DT_INST_REG_ADDR(0))) /* Keep reference of the device to pass it to the callback */ -struct device *wdog_r; +const struct device *wdog_r; /* watchdog reload value in sec */ static unsigned int reload_s = CMSDK_APB_WDOG_RELOAD; static u8_t flags; -static void (*user_cb)(struct device *dev, int channel_id); +static void (*user_cb)(const struct device *dev, int channel_id); -static void wdog_cmsdk_apb_unlock(struct device *dev) +static void wdog_cmsdk_apb_unlock(const struct device *dev) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; @@ -79,7 +79,7 @@ static void wdog_cmsdk_apb_unlock(struct device *dev) wdog->lock = CMSDK_APB_WDOG_UNLOCK_VALUE; } -static int wdog_cmsdk_apb_setup(struct device *dev, u8_t options) +static int wdog_cmsdk_apb_setup(const struct device *dev, u8_t options) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; @@ -92,7 +92,7 @@ static int wdog_cmsdk_apb_setup(struct device *dev, u8_t options) return 0; } -static int wdog_cmsdk_apb_disable(struct device *dev) +static int wdog_cmsdk_apb_disable(const struct device *dev) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; @@ -104,7 +104,7 @@ static int wdog_cmsdk_apb_disable(struct device *dev) return 0; } -static int wdog_cmsdk_apb_install_timeout(struct device *dev, +static int wdog_cmsdk_apb_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *config) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; @@ -124,7 +124,7 @@ static int wdog_cmsdk_apb_install_timeout(struct device *dev, return 0; } -static int wdog_cmsdk_apb_feed(struct device *dev, int channel_id) +static int wdog_cmsdk_apb_feed(const struct device *dev, int channel_id) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; @@ -175,7 +175,7 @@ static void wdog_cmsdk_apb_isr(void) } #endif /* CONFIG_RUNTIME_NMI */ -static int wdog_cmsdk_apb_init(struct device *dev) +static int wdog_cmsdk_apb_init(const struct device *dev) { volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT; diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c index fc67b8f99ab8..0accb2525f0d 100644 --- a/drivers/watchdog/wdt_esp32.c +++ b/drivers/watchdog/wdt_esp32.c @@ -68,18 +68,18 @@ struct wdt_esp32_config { * magic value of TIMG_WDT_WKEY_VALUE. The datasheet recommends unsealing, * making modifications, and sealing for every watchdog modification. */ -static inline void wdt_esp32_seal(struct device *dev) +static inline void wdt_esp32_seal(const struct device *dev) { DEV_BASE(dev)->wprotect = 0U; } -static inline void wdt_esp32_unseal(struct device *dev) +static inline void wdt_esp32_unseal(const struct device *dev) { DEV_BASE(dev)->wprotect = TIMG_WDT_WKEY_VALUE; } -static void wdt_esp32_enable(struct device *dev) +static void wdt_esp32_enable(const struct device *dev) { wdt_esp32_unseal(dev); DEV_BASE(dev)->config0 |= BIT(TIMG_WDT_EN_S); @@ -87,7 +87,7 @@ static void wdt_esp32_enable(struct device *dev) } -static int wdt_esp32_disable(struct device *dev) +static int wdt_esp32_disable(const struct device *dev) { wdt_esp32_unseal(dev); DEV_BASE(dev)->config0 &= ~BIT(TIMG_WDT_EN_S); @@ -96,7 +96,7 @@ static int wdt_esp32_disable(struct device *dev) return 0; } -static void adjust_timeout(struct device *dev, u32_t timeout) +static void adjust_timeout(const struct device *dev, u32_t timeout) { /* MWDT ticks every 12.5ns. Set the prescaler to 40000, so the * counter for each watchdog stage is decremented every 0.5ms. @@ -106,9 +106,9 @@ static void adjust_timeout(struct device *dev, u32_t timeout) DEV_BASE(dev)->config3 = timeout; } -static void wdt_esp32_isr(struct device *dev); +static void wdt_esp32_isr(const struct device *dev); -static int wdt_esp32_feed(struct device *dev, int channel_id) +static int wdt_esp32_feed(const struct device *dev, int channel_id) { wdt_esp32_unseal(dev); DEV_BASE(dev)->feed = 0xABAD1DEA; /* Writing any value to WDTFEED will reload it. */ @@ -117,7 +117,7 @@ static int wdt_esp32_feed(struct device *dev, int channel_id) return 0; } -static void set_interrupt_enabled(struct device *dev, bool setting) +static void set_interrupt_enabled(const struct device *dev, bool setting) { *DEV_CFG(dev)->irq_regs.timer_int_clr |= TIMG_WDT_INT_CLR; @@ -130,7 +130,7 @@ static void set_interrupt_enabled(struct device *dev, bool setting) } } -static int wdt_esp32_set_config(struct device *dev, u8_t options) +static int wdt_esp32_set_config(const struct device *dev, u8_t options) { struct wdt_esp32_data *data = DEV_DATA(dev); u32_t v = DEV_BASE(dev)->config0; @@ -177,7 +177,7 @@ static int wdt_esp32_set_config(struct device *dev, u8_t options) return 0; } -static int wdt_esp32_install_timeout(struct device *dev, +static int wdt_esp32_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { struct wdt_esp32_data *data = DEV_DATA(dev); @@ -200,7 +200,7 @@ static int wdt_esp32_install_timeout(struct device *dev, return 0; } -static int wdt_esp32_init(struct device *dev) +static int wdt_esp32_init(const struct device *dev) { #ifdef CONFIG_WDT_DISABLE_AT_BOOT wdt_esp32_disable(dev); @@ -258,7 +258,7 @@ static const struct wdt_driver_api wdt_api = { PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &wdt_api) -static void wdt_esp32_isr(struct device *dev) +static void wdt_esp32_isr(const struct device *dev) { struct wdt_esp32_data *data = DEV_DATA(dev); diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c index 3266d6e6fe36..244fd7dfe97e 100644 --- a/drivers/watchdog/wdt_gecko.c +++ b/drivers/watchdog/wdt_gecko.c @@ -83,7 +83,7 @@ static int wdt_gecko_convert_window(u32_t window, u32_t period) return idx; } -static int wdt_gecko_setup(struct device *dev, u8_t options) +static int wdt_gecko_setup(const struct device *dev, u8_t options) { const struct wdt_gecko_cfg *config = DEV_CFG(dev); struct wdt_gecko_data *data = DEV_DATA(dev); @@ -120,7 +120,7 @@ static int wdt_gecko_setup(struct device *dev, u8_t options) return 0; } -static int wdt_gecko_disable(struct device *dev) +static int wdt_gecko_disable(const struct device *dev) { const struct wdt_gecko_cfg *config = DEV_CFG(dev); struct wdt_gecko_data *data = DEV_DATA(dev); @@ -133,7 +133,7 @@ static int wdt_gecko_disable(struct device *dev) return 0; } -static int wdt_gecko_install_timeout(struct device *dev, +static int wdt_gecko_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { struct wdt_gecko_data *data = DEV_DATA(dev); @@ -206,7 +206,7 @@ static int wdt_gecko_install_timeout(struct device *dev, return 0; } -static int wdt_gecko_feed(struct device *dev, int channel_id) +static int wdt_gecko_feed(const struct device *dev, int channel_id) { const struct wdt_gecko_cfg *config = DEV_CFG(dev); WDOG_TypeDef *wdog = config->base; @@ -224,7 +224,7 @@ static int wdt_gecko_feed(struct device *dev, int channel_id) static void wdt_gecko_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct wdt_gecko_cfg *config = DEV_CFG(dev); struct wdt_gecko_data *data = DEV_DATA(dev); WDOG_TypeDef *wdog = config->base; @@ -239,7 +239,7 @@ static void wdt_gecko_isr(void *arg) } } -static int wdt_gecko_init(struct device *dev) +static int wdt_gecko_init(const struct device *dev) { const struct wdt_gecko_cfg *config = DEV_CFG(dev); diff --git a/drivers/watchdog/wdt_handlers.c b/drivers/watchdog/wdt_handlers.c index d6a9a78e16a5..b8939d9adf79 100644 --- a/drivers/watchdog/wdt_handlers.c +++ b/drivers/watchdog/wdt_handlers.c @@ -7,7 +7,7 @@ #include #include -static inline int z_vrfy_wdt_setup(struct device *dev, u8_t options) +static inline int z_vrfy_wdt_setup(const struct device *dev, u8_t options) { Z_OOPS(Z_SYSCALL_DRIVER_WDT(dev, setup)); return z_impl_wdt_setup(dev, options); @@ -15,7 +15,7 @@ static inline int z_vrfy_wdt_setup(struct device *dev, u8_t options) #include -static inline int z_vrfy_wdt_disable(struct device *dev) +static inline int z_vrfy_wdt_disable(const struct device *dev) { Z_OOPS(Z_SYSCALL_DRIVER_WDT(dev, disable)); return z_impl_wdt_disable(dev); @@ -23,7 +23,7 @@ static inline int z_vrfy_wdt_disable(struct device *dev) #include -static inline int z_vrfy_wdt_feed(struct device *dev, int channel_id) +static inline int z_vrfy_wdt_feed(const struct device *dev, int channel_id) { Z_OOPS(Z_SYSCALL_DRIVER_WDT(dev, feed)); return z_impl_wdt_feed(dev, channel_id); diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c index fc91e53d4deb..457f4e9dcbef 100644 --- a/drivers/watchdog/wdt_iwdg_stm32.c +++ b/drivers/watchdog/wdt_iwdg_stm32.c @@ -63,7 +63,7 @@ static void iwdg_stm32_convert_timeout(u32_t timeout, *reload = (u32_t)(m_timeout / divider) - 1; } -static int iwdg_stm32_setup(struct device *dev, u8_t options) +static int iwdg_stm32_setup(const struct device *dev, u8_t options) { IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev); @@ -85,7 +85,7 @@ static int iwdg_stm32_setup(struct device *dev, u8_t options) return 0; } -static int iwdg_stm32_disable(struct device *dev) +static int iwdg_stm32_disable(const struct device *dev) { /* watchdog cannot be stopped once started */ ARG_UNUSED(dev); @@ -93,7 +93,7 @@ static int iwdg_stm32_disable(struct device *dev) return -EPERM; } -static int iwdg_stm32_install_timeout(struct device *dev, +static int iwdg_stm32_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *config) { IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev); @@ -134,7 +134,7 @@ static int iwdg_stm32_install_timeout(struct device *dev, return 0; } -static int iwdg_stm32_feed(struct device *dev, int channel_id) +static int iwdg_stm32_feed(const struct device *dev, int channel_id) { IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev); @@ -151,7 +151,7 @@ static const struct wdt_driver_api iwdg_stm32_api = { .feed = iwdg_stm32_feed, }; -static int iwdg_stm32_init(struct device *dev) +static int iwdg_stm32_init(const struct device *dev) { #ifndef CONFIG_WDT_DISABLE_AT_BOOT IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev); diff --git a/drivers/watchdog/wdt_mchp_xec.c b/drivers/watchdog/wdt_mchp_xec.c index b0ad027ab500..05a24f4af1e6 100644 --- a/drivers/watchdog/wdt_mchp_xec.c +++ b/drivers/watchdog/wdt_mchp_xec.c @@ -28,7 +28,7 @@ struct wdt_xec_data { DEVICE_DECLARE(wdt_xec); -static int wdt_xec_setup(struct device *dev, u8_t options) +static int wdt_xec_setup(const struct device *dev, u8_t options) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; struct wdt_xec_data *data = dev->driver_data; @@ -60,7 +60,7 @@ static int wdt_xec_setup(struct device *dev, u8_t options) return 0; } -static int wdt_xec_disable(struct device *dev) +static int wdt_xec_disable(const struct device *dev) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; struct wdt_xec_data *data = dev->driver_data; @@ -77,7 +77,7 @@ static int wdt_xec_disable(struct device *dev) return 0; } -static int wdt_xec_install_timeout(struct device *dev, +static int wdt_xec_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *config) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; @@ -121,7 +121,7 @@ static int wdt_xec_install_timeout(struct device *dev, return 0; } -static int wdt_xec_feed(struct device *dev, int channel_id) +static int wdt_xec_feed(const struct device *dev, int channel_id) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; @@ -139,7 +139,7 @@ static int wdt_xec_feed(struct device *dev, int channel_id) return 0; } -static void wdt_xec_isr(struct device *dev) +static void wdt_xec_isr(const struct device *dev) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; struct wdt_xec_data *data = dev->driver_data; @@ -161,7 +161,7 @@ static const struct wdt_driver_api wdt_xec_api = { .feed = wdt_xec_feed, }; -static int wdt_xec_init(struct device *dev) +static int wdt_xec_init(const struct device *dev) { if (IS_ENABLED(CONFIG_WDT_DISABLE_AT_BOOT)) { wdt_xec_disable(dev); diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c index 259122b91400..fa65af6b4881 100644 --- a/drivers/watchdog/wdt_mcux_wdog.c +++ b/drivers/watchdog/wdt_mcux_wdog.c @@ -21,7 +21,7 @@ struct mcux_wdog_config { WDOG_Type *base; char *clock_name; clock_control_subsys_t clock_subsys; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_wdog_data { @@ -30,7 +30,7 @@ struct mcux_wdog_data { bool timeout_valid; }; -static int mcux_wdog_setup(struct device *dev, u8_t options) +static int mcux_wdog_setup(const struct device *dev, u8_t options) { const struct mcux_wdog_config *config = dev->config_info; struct mcux_wdog_data *data = dev->driver_data; @@ -53,7 +53,7 @@ static int mcux_wdog_setup(struct device *dev, u8_t options) return 0; } -static int mcux_wdog_disable(struct device *dev) +static int mcux_wdog_disable(const struct device *dev) { const struct mcux_wdog_config *config = dev->config_info; struct mcux_wdog_data *data = dev->driver_data; @@ -66,12 +66,12 @@ static int mcux_wdog_disable(struct device *dev) return 0; } -static int mcux_wdog_install_timeout(struct device *dev, +static int mcux_wdog_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct mcux_wdog_config *config = dev->config_info; struct mcux_wdog_data *data = dev->driver_data; - struct device *clock_dev; + const struct device *clock_dev; u32_t clock_freq; if (data->timeout_valid) { @@ -116,7 +116,7 @@ static int mcux_wdog_install_timeout(struct device *dev, return 0; } -static int mcux_wdog_feed(struct device *dev, int channel_id) +static int mcux_wdog_feed(const struct device *dev, int channel_id) { const struct mcux_wdog_config *config = dev->config_info; WDOG_Type *base = config->base; @@ -134,7 +134,7 @@ static int mcux_wdog_feed(struct device *dev, int channel_id) static void mcux_wdog_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_wdog_config *config = dev->config_info; struct mcux_wdog_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -148,7 +148,7 @@ static void mcux_wdog_isr(void *arg) } } -static int mcux_wdog_init(struct device *dev) +static int mcux_wdog_init(const struct device *dev) { const struct mcux_wdog_config *config = dev->config_info; @@ -164,7 +164,7 @@ static const struct wdt_driver_api mcux_wdog_api = { .feed = mcux_wdog_feed, }; -static void mcux_wdog_config_func_0(struct device *dev); +static void mcux_wdog_config_func_0(const struct device *dev); static const struct mcux_wdog_config mcux_wdog_config_0 = { .base = (WDOG_Type *) DT_INST_REG_ADDR(0), @@ -182,7 +182,7 @@ DEVICE_AND_API_INIT(mcux_wdog_0, DT_INST_LABEL(0), POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wdog_api); -static void mcux_wdog_config_func_0(struct device *dev) +static void mcux_wdog_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c index 8a757fe3b596..68868dab87bd 100644 --- a/drivers/watchdog/wdt_mcux_wdog32.c +++ b/drivers/watchdog/wdt_mcux_wdog32.c @@ -29,7 +29,7 @@ struct mcux_wdog32_config { #endif /* !DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, clocks), clock_frequency) */ wdog32_clock_source_t clk_source; wdog32_clock_prescaler_t clk_divider; - void (*irq_config_func)(struct device *dev); + void (*irq_config_func)(const struct device *dev); }; struct mcux_wdog32_data { @@ -38,7 +38,7 @@ struct mcux_wdog32_data { bool timeout_valid; }; -static int mcux_wdog32_setup(struct device *dev, u8_t options) +static int mcux_wdog32_setup(const struct device *dev, u8_t options) { const struct mcux_wdog32_config *config = dev->config_info; struct mcux_wdog32_data *data = dev->driver_data; @@ -61,7 +61,7 @@ static int mcux_wdog32_setup(struct device *dev, u8_t options) return 0; } -static int mcux_wdog32_disable(struct device *dev) +static int mcux_wdog32_disable(const struct device *dev) { const struct mcux_wdog32_config *config = dev->config_info; struct mcux_wdog32_data *data = dev->driver_data; @@ -77,7 +77,7 @@ static int mcux_wdog32_disable(struct device *dev) #define MSEC_TO_WDOG32_TICKS(clock_freq, divider, msec) \ ((u32_t)(clock_freq * msec / 1000U / divider)) -static int mcux_wdog32_install_timeout(struct device *dev, +static int mcux_wdog32_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct mcux_wdog32_config *config = dev->config_info; @@ -93,7 +93,7 @@ static int mcux_wdog32_install_timeout(struct device *dev, #if DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, clocks), clock_frequency) clock_freq = config->clock_frequency; #else /* !DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, clocks), clock_frequency) */ - struct device *clock_dev = device_get_binding(config->clock_name); + const struct device *clock_dev = device_get_binding(config->clock_name); if (clock_dev == NULL) { return -EINVAL; } @@ -137,7 +137,7 @@ static int mcux_wdog32_install_timeout(struct device *dev, return 0; } -static int mcux_wdog32_feed(struct device *dev, int channel_id) +static int mcux_wdog32_feed(const struct device *dev, int channel_id) { const struct mcux_wdog32_config *config = dev->config_info; WDOG_Type *base = config->base; @@ -155,7 +155,7 @@ static int mcux_wdog32_feed(struct device *dev, int channel_id) static void mcux_wdog32_isr(void *arg) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; const struct mcux_wdog32_config *config = dev->config_info; struct mcux_wdog32_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -169,7 +169,7 @@ static void mcux_wdog32_isr(void *arg) } } -static int mcux_wdog32_init(struct device *dev) +static int mcux_wdog32_init(const struct device *dev) { const struct mcux_wdog32_config *config = dev->config_info; @@ -188,7 +188,7 @@ static const struct wdt_driver_api mcux_wdog32_api = { #define TO_WDOG32_CLK_SRC(val) _DO_CONCAT(kWDOG32_ClockSource, val) #define TO_WDOG32_CLK_DIV(val) _DO_CONCAT(kWDOG32_ClockPrescalerDivide, val) -static void mcux_wdog32_config_func_0(struct device *dev); +static void mcux_wdog32_config_func_0(const struct device *dev); static const struct mcux_wdog32_config mcux_wdog32_config_0 = { .base = (WDOG_Type *) DT_INST_REG_ADDR(0), @@ -214,7 +214,7 @@ DEVICE_AND_API_INIT(mcux_wdog32_0, DT_INST_LABEL(0), CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &mcux_wdog32_api); -static void mcux_wdog32_config_func_0(struct device *dev) +static void mcux_wdog32_config_func_0(const struct device *dev) { IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c index ec102138aae6..f1f54eb8530f 100644 --- a/drivers/watchdog/wdt_nrfx.c +++ b/drivers/watchdog/wdt_nrfx.c @@ -22,18 +22,18 @@ struct wdt_nrfx_config { nrfx_wdt_config_t config; }; -static inline struct wdt_nrfx_data *get_dev_data(struct device *dev) +static inline struct wdt_nrfx_data *get_dev_data(const struct device *dev) { return dev->driver_data; } -static inline const struct wdt_nrfx_config *get_dev_config(struct device *dev) +static inline const struct wdt_nrfx_config *get_dev_config(const struct device *dev) { return dev->config_info; } -static int wdt_nrf_setup(struct device *dev, u8_t options) +static int wdt_nrf_setup(const struct device *dev, u8_t options) { nrf_wdt_behaviour_t behaviour; @@ -64,14 +64,14 @@ static int wdt_nrf_setup(struct device *dev, u8_t options) return 0; } -static int wdt_nrf_disable(struct device *dev) +static int wdt_nrf_disable(const struct device *dev) { /* Started watchdog cannot be stopped on nRF devices. */ ARG_UNUSED(dev); return -EPERM; } -static int wdt_nrf_install_timeout(struct device *dev, +static int wdt_nrf_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { nrfx_err_t err_code; @@ -117,7 +117,7 @@ static int wdt_nrf_install_timeout(struct device *dev, return channel_id; } -static int wdt_nrf_feed(struct device *dev, int channel_id) +static int wdt_nrf_feed(const struct device *dev, int channel_id) { if (channel_id > get_dev_data(dev)->m_allocated_channels) { return -EINVAL; @@ -136,7 +136,7 @@ static const struct wdt_driver_api wdt_nrfx_driver_api = { .feed = wdt_nrf_feed, }; -static void wdt_event_handler(struct device *dev) +static void wdt_event_handler(const struct device *dev) { int i; @@ -158,7 +158,7 @@ static void wdt_event_handler(struct device *dev) { \ wdt_event_handler(DEVICE_GET(wdt_##idx)); \ } \ - static int wdt_##idx##_init(struct device *dev) \ + static int wdt_##idx##_init(const struct device *dev) \ { \ nrfx_err_t err_code; \ IRQ_CONNECT(DT_IRQN(WDT(idx)), DT_IRQ(WDT(idx), priority), \ diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c index 446b6145cca3..794e7ba61b95 100644 --- a/drivers/watchdog/wdt_sam.c +++ b/drivers/watchdog/wdt_sam.c @@ -34,7 +34,7 @@ struct wdt_sam_dev_cfg { Wdt *regs; }; -static struct device DEVICE_NAME_GET(wdt_sam); +DEVICE_DECLARE(wdt_sam); struct wdt_sam_dev_data { wdt_callback_t cb; @@ -48,7 +48,7 @@ static struct wdt_sam_dev_data wdt_sam_data = { 0 }; #define DEV_CFG(dev) \ ((const struct wdt_sam_dev_cfg *const)(dev)->config_info) -static void wdt_sam_isr(struct device *dev) +static void wdt_sam_isr(const struct device *dev) { u32_t wdt_sr; Wdt *const wdt = DEV_CFG(dev)->regs; @@ -83,7 +83,7 @@ int wdt_sam_convert_timeout(u32_t timeout, u32_t sclk) return WDT_MR_WDV(timeout / min); } -static int wdt_sam_disable(struct device *dev) +static int wdt_sam_disable(const struct device *dev) { Wdt *const wdt = DEV_CFG(dev)->regs; struct wdt_sam_dev_data *data = dev->driver_data; @@ -106,7 +106,7 @@ static int wdt_sam_disable(struct device *dev) return 0; } -static int wdt_sam_setup(struct device *dev, u8_t options) +static int wdt_sam_setup(const struct device *dev, u8_t options) { Wdt *const wdt = DEV_CFG(dev)->regs; @@ -139,7 +139,7 @@ static int wdt_sam_setup(struct device *dev, u8_t options) return 0; } -static int wdt_sam_install_timeout(struct device *dev, +static int wdt_sam_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { u32_t wdt_mode = 0U; @@ -208,7 +208,7 @@ static int wdt_sam_install_timeout(struct device *dev, return 0; } -static int wdt_sam_feed(struct device *dev, int channel_id) +static int wdt_sam_feed(const struct device *dev, int channel_id) { /* * On watchdog restart the Watchdog counter is immediately @@ -241,7 +241,7 @@ static void wdt_sam_irq_config(void) irq_enable(DT_INST_IRQN(0)); } -static int wdt_sam_init(struct device *dev) +static int wdt_sam_init(const struct device *dev) { #ifdef CONFIG_WDT_DISABLE_AT_BOOT wdt_sam_disable(dev); diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c index 94d7eb44ab0c..0fb1f536bd7f 100644 --- a/drivers/watchdog/wdt_sam0.c +++ b/drivers/watchdog/wdt_sam0.c @@ -31,7 +31,7 @@ struct wdt_sam0_dev_data { bool timeout_valid; }; -static struct device DEVICE_NAME_GET(wdt_sam0); +DEVICE_DECLARE(wdt_sam0); static struct wdt_sam0_dev_data wdt_sam0_data = { 0 }; @@ -82,7 +82,7 @@ static u32_t wdt_sam0_timeout_to_wdt_period(u32_t timeout_ms) return find_msb_set(next_pow2 >> 4); } -static void wdt_sam0_isr(struct device *dev) +static void wdt_sam0_isr(const struct device *dev) { struct wdt_sam0_dev_data *data = dev->driver_data; @@ -93,7 +93,7 @@ static void wdt_sam0_isr(struct device *dev) } } -static int wdt_sam0_setup(struct device *dev, u8_t options) +static int wdt_sam0_setup(const struct device *dev, u8_t options) { struct wdt_sam0_dev_data *data = dev->driver_data; @@ -124,7 +124,7 @@ static int wdt_sam0_setup(struct device *dev, u8_t options) return 0; } -static int wdt_sam0_disable(struct device *dev) +static int wdt_sam0_disable(const struct device *dev) { if (!wdt_sam0_is_enabled()) { return -EFAULT; @@ -136,8 +136,8 @@ static int wdt_sam0_disable(struct device *dev) return 0; } -static int wdt_sam0_install_timeout(struct device *dev, - const struct wdt_timeout_cfg *cfg) +static int wdt_sam0_install_timeout(const struct device *dev, + const struct wdt_timeout_cfg *cfg) { struct wdt_sam0_dev_data *data = dev->driver_data; u32_t window, per; @@ -222,7 +222,7 @@ static int wdt_sam0_install_timeout(struct device *dev, return -EINVAL; } -static int wdt_sam0_feed(struct device *dev, int channel_id) +static int wdt_sam0_feed(const struct device *dev, int channel_id) { struct wdt_sam0_dev_data *data = dev->driver_data; @@ -243,7 +243,7 @@ static const struct wdt_driver_api wdt_sam0_api = { .feed = wdt_sam0_feed, }; -static int wdt_sam0_init(struct device *dev) +static int wdt_sam0_init(const struct device *dev) { #ifdef CONFIG_WDT_DISABLE_AT_BOOT /* Ignore any errors */ diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c index e64a2a201ce7..25b833b897f3 100644 --- a/drivers/watchdog/wdt_wwdg_stm32.c +++ b/drivers/watchdog/wdt_wwdg_stm32.c @@ -61,11 +61,11 @@ LOG_MODULE_REGISTER(wdt_wwdg_stm32); (ABS_DIFF_UINT(__TIMEOUT_GOLDEN__, __TIMEOUT__) < \ WWDG_TIMEOUT_ERROR_MARGIN) -static void wwdg_stm32_irq_config(struct device *dev); +static void wwdg_stm32_irq_config(const struct device *dev); -static u32_t wwdg_stm32_get_pclk(struct device *dev) +static u32_t wwdg_stm32_get_pclk(const struct device *dev) { - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); const struct wwdg_stm32_config *cfg = WWDG_STM32_CFG(dev); u32_t pclk_rate; @@ -88,7 +88,7 @@ static u32_t wwdg_stm32_get_pclk(struct device *dev) * @param counter The counter value. * @return The timeout calculated in microseconds. */ -static u32_t wwdg_stm32_get_timeout(struct device *dev, u32_t prescaler, +static u32_t wwdg_stm32_get_timeout(const struct device *dev, u32_t prescaler, u32_t counter) { u32_t divider = WWDG_INTERNAL_DIVIDER * (1 << (prescaler >> 7)); @@ -105,7 +105,8 @@ static u32_t wwdg_stm32_get_timeout(struct device *dev, u32_t prescaler, * @param prescaler Pointer to prescaler value. * @param counter Pointer to counter value. */ -static void wwdg_stm32_convert_timeout(struct device *dev, u32_t timeout, +static void wwdg_stm32_convert_timeout(const struct device *dev, + u32_t timeout, u32_t *prescaler, u32_t *counter) { @@ -135,7 +136,7 @@ static void wwdg_stm32_convert_timeout(struct device *dev, u32_t timeout, } } -static int wwdg_stm32_setup(struct device *dev, u8_t options) +static int wwdg_stm32_setup(const struct device *dev, u8_t options) { WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev); @@ -162,7 +163,7 @@ static int wwdg_stm32_setup(struct device *dev, u8_t options) return 0; } -static int wwdg_stm32_disable(struct device *dev) +static int wwdg_stm32_disable(const struct device *dev) { /* watchdog cannot be stopped once started unless SOC gets a reset */ ARG_UNUSED(dev); @@ -170,7 +171,7 @@ static int wwdg_stm32_disable(struct device *dev) return -EPERM; } -static int wwdg_stm32_install_timeout(struct device *dev, +static int wwdg_stm32_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *config) { struct wwdg_stm32_data *data = WWDG_STM32_DATA(dev); @@ -208,7 +209,7 @@ static int wwdg_stm32_install_timeout(struct device *dev, return 0; } -static int wwdg_stm32_feed(struct device *dev, int channel_id) +static int wwdg_stm32_feed(const struct device *dev, int channel_id) { WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev); struct wwdg_stm32_data *data = WWDG_STM32_DATA(dev); @@ -221,7 +222,7 @@ static int wwdg_stm32_feed(struct device *dev, int channel_id) void wwdg_stm32_isr(void *arg) { - struct device *const dev = (struct device *)arg; + const struct device *const dev = (const struct device *)arg; struct wwdg_stm32_data *data = WWDG_STM32_DATA(dev); WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev); @@ -240,9 +241,9 @@ static const struct wdt_driver_api wwdg_stm32_api = { .feed = wwdg_stm32_feed, }; -static int wwdg_stm32_init(struct device *dev) +static int wwdg_stm32_init(const struct device *dev) { - struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); + const struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); const struct wwdg_stm32_config *cfg = WWDG_STM32_CFG(dev); __ASSERT_NO_MSG(clk); @@ -272,7 +273,7 @@ DEVICE_AND_API_INIT(wwdg_stm32, DT_INST_LABEL(0), POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wwdg_stm32_api); -static void wwdg_stm32_irq_config(struct device *dev) +static void wwdg_stm32_irq_config(const struct device *dev) { WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev); diff --git a/drivers/wifi/esp/esp.c b/drivers/wifi/esp/esp.c index c1d65d4fd532..8f630a969e48 100644 --- a/drivers/wifi/esp/esp.c +++ b/drivers/wifi/esp/esp.c @@ -85,7 +85,7 @@ MODEM_CMD_DEFINE(on_cmd_error) } /* RX thread */ -static void esp_rx(struct device *dev) +static void esp_rx(const struct device *dev) { struct esp_data *data = dev->driver_data; @@ -527,7 +527,7 @@ static void esp_mgmt_scan_work(struct k_work *work) dev->scan_cb = NULL; } -static int esp_mgmt_scan(struct device *dev, scan_result_cb_t cb) +static int esp_mgmt_scan(const struct device *dev, scan_result_cb_t cb) { struct esp_data *data = dev->driver_data; @@ -590,7 +590,7 @@ static void esp_mgmt_connect_work(struct k_work *work) esp_flag_clear(dev, EDF_STA_CONNECTING); } -static int esp_mgmt_connect(struct device *dev, +static int esp_mgmt_connect(const struct device *dev, struct wifi_connect_req_params *params) { struct esp_data *data = dev->driver_data; @@ -627,7 +627,7 @@ static int esp_mgmt_connect(struct device *dev, return 0; } -static int esp_mgmt_disconnect(struct device *dev) +static int esp_mgmt_disconnect(const struct device *dev) { struct esp_data *data = dev->driver_data; int ret; @@ -639,7 +639,7 @@ static int esp_mgmt_disconnect(struct device *dev) return ret; } -static int esp_mgmt_ap_enable(struct device *dev, +static int esp_mgmt_ap_enable(const struct device *dev, struct wifi_connect_req_params *params) { char cmd[sizeof("AT+"_CWSAP"=\"\",\"\",xx,x") + WIFI_SSID_MAX_LEN + @@ -678,7 +678,7 @@ static int esp_mgmt_ap_enable(struct device *dev, return ret; } -static int esp_mgmt_ap_disable(struct device *dev) +static int esp_mgmt_ap_disable(const struct device *dev) { struct esp_data *data = dev->driver_data; int ret; @@ -776,7 +776,7 @@ static void esp_reset(struct esp_data *dev) static void esp_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct esp_data *data = dev->driver_data; net_if_flag_set(iface, NET_IF_NO_AUTO_START); @@ -794,7 +794,7 @@ static const struct net_wifi_mgmt_offload esp_api = { .ap_disable = esp_mgmt_ap_disable, }; -static int esp_init(struct device *dev) +static int esp_init(const struct device *dev) { struct esp_data *data = dev->driver_data; int ret = 0; diff --git a/drivers/wifi/eswifi/eswifi.h b/drivers/wifi/eswifi/eswifi.h index 0b3921c23e3c..25782da2d0c7 100644 --- a/drivers/wifi/eswifi/eswifi.h +++ b/drivers/wifi/eswifi/eswifi.h @@ -24,7 +24,7 @@ #define AT_RSP_DELIMITER_LEN 2 struct eswifi_gpio { - struct device *dev; + const struct device *dev; unsigned int pin; }; diff --git a/drivers/wifi/eswifi/eswifi_bus_spi.c b/drivers/wifi/eswifi/eswifi_bus_spi.c index ba6c005cead6..12485a0810fc 100644 --- a/drivers/wifi/eswifi/eswifi_bus_spi.c +++ b/drivers/wifi/eswifi/eswifi_bus_spi.c @@ -25,7 +25,7 @@ K_THREAD_STACK_MEMBER(eswifi_spi_poll_stack, ESWIFI_SPI_THREAD_STACK_SIZE); #define SPI_READ_CHUNK_SIZE 32 struct eswifi_spi_data { - struct device *spi_dev; + const struct device *spi_dev; struct eswifi_gpio csn; struct eswifi_gpio dr; struct k_thread poll_thread; diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c index 6fa138f11ce7..96501a8833b0 100644 --- a/drivers/wifi/eswifi/eswifi_core.c +++ b/drivers/wifi/eswifi/eswifi_core.c @@ -412,7 +412,7 @@ static void eswifi_iface_init(struct net_if *iface) } -static int eswifi_mgmt_scan(struct device *dev, scan_result_cb_t cb) +static int eswifi_mgmt_scan(const struct device *dev, scan_result_cb_t cb) { struct eswifi_dev *eswifi = dev->driver_data; @@ -429,7 +429,7 @@ static int eswifi_mgmt_scan(struct device *dev, scan_result_cb_t cb) return 0; } -static int eswifi_mgmt_disconnect(struct device *dev) +static int eswifi_mgmt_disconnect(const struct device *dev) { struct eswifi_dev *eswifi = dev->driver_data; @@ -474,7 +474,7 @@ static int __eswifi_sta_config(struct eswifi_dev *eswifi, return 0; } -static int eswifi_mgmt_connect(struct device *dev, +static int eswifi_mgmt_connect(const struct device *dev, struct wifi_connect_req_params *params) { struct eswifi_dev *eswifi = dev->driver_data; @@ -502,7 +502,7 @@ void eswifi_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len) } #if defined(CONFIG_NET_IPV4) -static int eswifi_mgmt_ap_enable(struct device *dev, +static int eswifi_mgmt_ap_enable(const struct device *dev, struct wifi_connect_req_params *params) { struct eswifi_dev *eswifi = dev->driver_data; @@ -601,7 +601,7 @@ static int eswifi_mgmt_ap_enable(struct device *dev, return err; } #else -static int eswifi_mgmt_ap_enable(struct device *dev, +static int eswifi_mgmt_ap_enable(const struct device *dev, struct wifi_connect_req_params *params) { LOG_ERR("IPv4 requested for AP mode"); @@ -609,7 +609,7 @@ static int eswifi_mgmt_ap_enable(struct device *dev, } #endif /* CONFIG_NET_IPV4 */ -static int eswifi_mgmt_ap_disable(struct device *dev) +static int eswifi_mgmt_ap_disable(const struct device *dev) { struct eswifi_dev *eswifi = dev->driver_data; char cmd[] = "AE\r"; @@ -630,7 +630,7 @@ static int eswifi_mgmt_ap_disable(struct device *dev) return 0; } -static int eswifi_init(struct device *dev) +static int eswifi_init(const struct device *dev) { struct eswifi_dev *eswifi = dev->driver_data; diff --git a/drivers/wifi/simplelink/simplelink.c b/drivers/wifi/simplelink/simplelink.c index 8c4b90811934..f8a71feb073f 100644 --- a/drivers/wifi/simplelink/simplelink.c +++ b/drivers/wifi/simplelink/simplelink.c @@ -122,7 +122,7 @@ static void simplelink_scan_work_handler(struct k_work *work) } } -static int simplelink_mgmt_scan(struct device *dev, scan_result_cb_t cb) +static int simplelink_mgmt_scan(const struct device *dev, scan_result_cb_t cb) { int err; int status; @@ -154,7 +154,7 @@ static int simplelink_mgmt_scan(struct device *dev, scan_result_cb_t cb) return status; } -static int simplelink_mgmt_connect(struct device *dev, +static int simplelink_mgmt_connect(const struct device *dev, struct wifi_connect_req_params *params) { int ret; @@ -164,7 +164,7 @@ static int simplelink_mgmt_connect(struct device *dev, return ret ? -EIO : ret; } -static int simplelink_mgmt_disconnect(struct device *dev) +static int simplelink_mgmt_disconnect(const struct device *dev) { int ret; @@ -248,7 +248,7 @@ static const struct net_wifi_mgmt_offload simplelink_api = { .disconnect = simplelink_mgmt_disconnect, }; -static int simplelink_init(struct device *dev) +static int simplelink_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c index b854ffd1b834..5d463e2a2162 100644 --- a/drivers/wifi/winc1500/wifi_winc1500.c +++ b/drivers/wifi/winc1500/wifi_winc1500.c @@ -957,7 +957,7 @@ static void winc1500_thread(void) } } -static int winc1500_mgmt_scan(struct device *dev, scan_result_cb_t cb) +static int winc1500_mgmt_scan(const struct device *dev, scan_result_cb_t cb) { if (w1500_data.scan_cb) { return -EALREADY; @@ -974,7 +974,7 @@ static int winc1500_mgmt_scan(struct device *dev, scan_result_cb_t cb) return 0; } -static int winc1500_mgmt_connect(struct device *dev, +static int winc1500_mgmt_connect(const struct device *dev, struct wifi_connect_req_params *params) { u8_t ssid[M2M_MAX_SSID_LEN]; @@ -1020,7 +1020,7 @@ static int winc1500_mgmt_connect(struct device *dev, return 0; } -static int winc1500_mgmt_disconnect(struct device *device) +static int winc1500_mgmt_disconnect(const struct device *device) { if (!w1500_data.connected) { return -EALREADY; @@ -1055,7 +1055,7 @@ static const struct net_wifi_mgmt_offload winc1500_api = { .disconnect = winc1500_mgmt_disconnect, }; -static int winc1500_init(struct device *dev) +static int winc1500_init(const struct device *dev) { tstrWifiInitParam param = { .pfAppWifiCb = winc1500_wifi_cb, diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c index f73a6f2e50ca..7541c6e6abd0 100644 --- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c +++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c @@ -15,7 +15,7 @@ struct winc1500_device winc1500; void (*isr_function)(void); -static inline void chip_isr(struct device *port, +static inline void chip_isr(const struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) { diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h index 90968187a9cf..1b3407fb6e8e 100644 --- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h +++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h @@ -30,14 +30,14 @@ enum winc1500_gpio_index { }; struct winc1500_gpio_configuration { - struct device *dev; + const struct device *dev; u32_t pin; }; struct winc1500_device { struct winc1500_gpio_configuration *gpios; struct gpio_callback gpio_cb; - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; }; diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c index 30721d990599..a03f9ec4fa33 100644 --- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c +++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c @@ -98,7 +98,7 @@ static s8_t spi_rw(u8_t *mosi, u8_t *miso, u16_t size) struct winc1500_gpio_configuration *winc1500_configure_gpios(void) { - struct device *gpio_en, *gpio_irq, *gpio_reset; + const struct device *gpio_en, *gpio_irq, *gpio_reset; gpio_en = device_get_binding( DT_INST_GPIO_LABEL(0, enable_gpios)); diff --git a/include/audio/codec.h b/include/audio/codec.h index 64fc0731dd5c..b68c24cb2cf1 100644 --- a/include/audio/codec.h +++ b/include/audio/codec.h @@ -115,12 +115,15 @@ typedef union { * For internal use only, skip these in public documentation. */ struct audio_codec_api { - int (*configure)(struct device *dev, struct audio_codec_cfg *cfg); - void (*start_output)(struct device *dev); - void (*stop_output)(struct device *dev); - int (*set_property)(struct device *dev, audio_property_t property, - audio_channel_t channel, audio_property_value_t val); - int (*apply_properties)(struct device *dev); + int (*configure)(const struct device *dev, + struct audio_codec_cfg *cfg); + void (*start_output)(const struct device *dev); + void (*stop_output)(const struct device *dev); + int (*set_property)(const struct device *dev, + audio_property_t property, + audio_channel_t channel, + audio_property_value_t val); + int (*apply_properties)(const struct device *dev); }; /** * @endcond @@ -137,8 +140,8 @@ struct audio_codec_api { * * @return 0 on success, negative error code on failure */ -static inline int audio_codec_configure(struct device *dev, - struct audio_codec_cfg *cfg) +static inline int audio_codec_configure(const struct device *dev, + struct audio_codec_cfg *cfg) { const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api; @@ -155,7 +158,7 @@ static inline int audio_codec_configure(struct device *dev, * * @return none */ -static inline void audio_codec_start_output(struct device *dev) +static inline void audio_codec_start_output(const struct device *dev) { const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api; @@ -172,7 +175,7 @@ static inline void audio_codec_start_output(struct device *dev) * * @return none */ -static inline void audio_codec_stop_output(struct device *dev) +static inline void audio_codec_stop_output(const struct device *dev) { const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api; @@ -192,8 +195,10 @@ static inline void audio_codec_stop_output(struct device *dev) * * @return 0 on success, negative error code on failure */ -static inline int audio_codec_set_property(struct device *dev, audio_property_t property, - audio_channel_t channel, audio_property_value_t val) +static inline int audio_codec_set_property(const struct device *dev, + audio_property_t property, + audio_channel_t channel, + audio_property_value_t val) { const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api; @@ -212,7 +217,7 @@ static inline int audio_codec_set_property(struct device *dev, audio_property_t * * @return 0 on success, negative error code on failure */ -static inline int audio_codec_apply_properties(struct device *dev) +static inline int audio_codec_apply_properties(const struct device *dev) { const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api; diff --git a/include/audio/dmic.h b/include/audio/dmic.h index 2dc2954ea271..07c2ba5a15ec 100644 --- a/include/audio/dmic.h +++ b/include/audio/dmic.h @@ -159,9 +159,9 @@ struct dmic_cfg { * Function pointers for the DMIC driver operations */ struct _dmic_ops { - int (*configure)(struct device *dev, struct dmic_cfg *config); - int (*trigger)(struct device *dev, enum dmic_trigger cmd); - int (*read)(struct device *dev, u8_t stream, void **buffer, + int (*configure)(const struct device *dev, struct dmic_cfg *config); + int (*trigger)(const struct device *dev, enum dmic_trigger cmd); + int (*read)(const struct device *dev, u8_t stream, void **buffer, size_t *size, s32_t timeout); }; @@ -237,7 +237,8 @@ static inline u32_t dmic_build_clk_skew_map(u8_t pdm, u8_t skew) * * @return 0 on success, a negative error code on failure */ -static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg) +static inline int dmic_configure(const struct device *dev, + struct dmic_cfg *cfg) { const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api; @@ -255,7 +256,8 @@ static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg) * * @return 0 on success, a negative error code on failure */ -static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd) +static inline int dmic_trigger(const struct device *dev, + enum dmic_trigger cmd) { const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api; @@ -278,8 +280,9 @@ static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd) * * @return 0 on success, a negative error code on failure */ -static inline int dmic_read(struct device *dev, u8_t stream, void **buffer, - size_t *size, s32_t timeout) +static inline int dmic_read(const struct device *dev, u8_t stream, + void **buffer, + size_t *size, s32_t timeout) { const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api; diff --git a/include/canbus/isotp.h b/include/canbus/isotp.h index 88566391cb5e..2a313c455ee8 100644 --- a/include/canbus/isotp.h +++ b/include/canbus/isotp.h @@ -155,7 +155,7 @@ struct isotp_recv_ctx; * @retval ISOTP_N_OK on success * @retval ISOTP_NO_FREE_FILTER if CAN device has no filters left. */ -int isotp_bind(struct isotp_recv_ctx *ctx, struct device *can_dev, +int isotp_bind(struct isotp_recv_ctx *ctx, const struct device *can_dev, const struct isotp_msg_id *rx_addr, const struct isotp_msg_id *tx_addr, const struct isotp_fc_opts *opts, @@ -235,7 +235,7 @@ int isotp_recv_net(struct isotp_recv_ctx *ctx, struct net_buf **buffer, * @retval ISOTP_N_OK on success * @retval ISOTP_N_* on error */ -int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev, +int isotp_send(struct isotp_send_ctx *ctx, const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -260,7 +260,7 @@ int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev, * @retval ISOTP_N_OK on success * @retval ISOTP_N_* on error */ -int isotp_send_ctx_buf(struct device *can_dev, +int isotp_send_ctx_buf(const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -285,7 +285,7 @@ int isotp_send_ctx_buf(struct device *can_dev, * @retval ISOTP_N_OK on success * @retval ISOTP_* on error */ -int isotp_send_net_ctx_buf(struct device *can_dev, +int isotp_send_net_ctx_buf(const struct device *can_dev, struct net_buf *data, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -315,7 +315,7 @@ int isotp_send_net_ctx_buf(struct device *can_dev, * @retval ISOTP_N_OK on success * @retval ISOTP_* on error */ -int isotp_send_buf(struct device *can_dev, +int isotp_send_buf(const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -333,7 +333,7 @@ struct isotp_callback { struct isotp_send_ctx { int filter_id; u32_t error_nr; - struct device *can_dev; + const struct device *can_dev; union { struct net_buf *buf; struct { @@ -362,7 +362,7 @@ struct isotp_send_ctx { struct isotp_recv_ctx { int filter_id; - struct device *can_dev; + const struct device *can_dev; struct net_buf *buf; struct net_buf *act_frag; sys_snode_t alloc_node; diff --git a/include/console/tty.h b/include/console/tty.h index 08ac26e8dd71..1288d54466b8 100644 --- a/include/console/tty.h +++ b/include/console/tty.h @@ -16,7 +16,7 @@ extern "C" { #endif struct tty_serial { - struct device *uart_dev; + const struct device *uart_dev; struct k_sem rx_sem; u8_t *rx_ringbuf; @@ -49,7 +49,7 @@ struct tty_serial { * * @return 0 on success, error code (<0) otherwise */ -int tty_init(struct tty_serial *tty, struct device *uart_dev); +int tty_init(struct tty_serial *tty, const struct device *uart_dev); /** * @brief Set receive timeout for tty device. diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h index 019daa4e2c25..48a09ef1190c 100644 --- a/include/crypto/cipher.h +++ b/include/crypto/cipher.h @@ -40,18 +40,18 @@ /* The API a crypto driver should implement */ __subsystem struct crypto_driver_api { - int (*query_hw_caps)(struct device *dev); + int (*query_hw_caps)(const struct device *dev); /* Setup a crypto session */ - int (*begin_session)(struct device *dev, struct cipher_ctx *ctx, - enum cipher_algo algo, enum cipher_mode mode, - enum cipher_op op_type); + int (*begin_session)(const struct device *dev, struct cipher_ctx *ctx, + enum cipher_algo algo, enum cipher_mode mode, + enum cipher_op op_type); /* Tear down an established session */ - int (*free_session)(struct device *dev, struct cipher_ctx *ctx); + int (*free_session)(const struct device *dev, struct cipher_ctx *ctx); /* Register async crypto op completion callback with the driver */ - int (*crypto_async_callback_set)(struct device *dev, + int (*crypto_async_callback_set)(const struct device *dev, crypto_completion_cb cb); }; @@ -73,7 +73,7 @@ __subsystem struct crypto_driver_api { * * @return bitmask of supported options. */ -static inline int cipher_query_hwcaps(struct device *dev) +static inline int cipher_query_hwcaps(const struct device *dev) { struct crypto_driver_api *api; int tmp; @@ -113,7 +113,7 @@ static inline int cipher_query_hwcaps(struct device *dev) * * @return 0 on success, negative errno code on fail. */ -static inline int cipher_begin_session(struct device *dev, +static inline int cipher_begin_session(const struct device *dev, struct cipher_ctx *ctx, enum cipher_algo algo, enum cipher_mode mode, @@ -155,7 +155,7 @@ static inline int cipher_begin_session(struct device *dev, * * @return 0 on success, negative errno code on fail. */ -static inline int cipher_free_session(struct device *dev, +static inline int cipher_free_session(const struct device *dev, struct cipher_ctx *ctx) { struct crypto_driver_api *api; @@ -179,7 +179,7 @@ static inline int cipher_free_session(struct device *dev, * @return 0 on success, -ENOTSUP if the driver does not support async op, * negative errno code on other error. */ -static inline int cipher_callback_set(struct device *dev, +static inline int cipher_callback_set(const struct device *dev, crypto_completion_cb cb) { struct crypto_driver_api *api; diff --git a/include/crypto/cipher_structs.h b/include/crypto/cipher_structs.h index e9405059bc33..0c2a2a81075d 100644 --- a/include/crypto/cipher_structs.h +++ b/include/crypto/cipher_structs.h @@ -128,7 +128,7 @@ struct cipher_ctx { /** The device driver instance this crypto context relates to. Will be * populated by the begin_session() API. */ - struct device *device; + const struct device *device; /** If the driver supports multiple simultaneously crypto sessions, this * will identify the specific driver state this crypto session relates diff --git a/include/device.h b/include/device.h index 047adcf4d22f..0e6b219f1c5d 100644 --- a/include/device.h +++ b/include/device.h @@ -27,6 +27,24 @@ extern "C" { #define Z_DEVICE_MAX_NAME_LEN 48 +struct device_context; + +/** + * @def DEVICE_NAME_GET + * + * @brief Expands to the full name of a global device object + * + * @details Return the full name of a device object symbol created by + * DEVICE_INIT(), using the dev_name provided to DEVICE_INIT(). + * + * It is meant to be used for declaring extern symbols pointing on device + * objects before using the DEVICE_GET macro to get the device object. + * + * @param name The same as dev_name provided to DEVICE_INIT() + * + * @return The expanded name of the device object created by DEVICE_INIT() + */ +#define DEVICE_NAME_GET(name) (_CONCAT(__device_, name)) /** * @def SYS_DEVICE_DEFINE @@ -97,13 +115,16 @@ extern "C" { #ifndef CONFIG_DEVICE_POWER_MANAGEMENT #define DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, data, cfg_info, \ level, prio, api) \ - static Z_DECL_ALIGN(struct device) \ - _CONCAT(__device_, dev_name) __used \ + static struct device_context _CONCAT(__dctx_, dev_name) = { \ + }; \ + static Z_DECL_ALIGN(const struct device) \ + const DEVICE_NAME_GET(dev_name) __used \ __attribute__((__section__(".device_" #level STRINGIFY(prio)))) = { \ .name = drv_name, \ .config_info = (cfg_info), \ .driver_api = (api), \ .driver_data = (data), \ + .driver_context = &_CONCAT(__dctx_, dev_name), \ }; \ Z_INIT_ENTRY_DEFINE(_CONCAT(__device_, dev_name), init_fn, \ (&_CONCAT(__device_, dev_name)), level, prio) @@ -151,13 +172,16 @@ extern "C" { K_POLL_MODE_NOTIFY_ONLY, \ &_CONCAT(__pm_, dev_name).signal), \ }; \ - static Z_DECL_ALIGN(struct device) \ - _CONCAT(__device_, dev_name) __used \ + static struct device_context _CONCAT(__dctx_, dev_name) = { \ + }; \ + static Z_DECL_ALIGN(const struct device) \ + const DEVICE_NAME_GET(dev_name) __used \ __attribute__((__section__(".device_" #level STRINGIFY(prio)))) = { \ .name = drv_name, \ .config_info = (cfg_info), \ .driver_api = (api), \ .driver_data = (data), \ + .driver_context = &_CONCAT(__dctx_, dev_name), \ .device_pm_control = (pm_control_fn), \ .pm = &_CONCAT(__pm_, dev_name), \ }; \ @@ -166,23 +190,6 @@ extern "C" { #endif -/** - * @def DEVICE_NAME_GET - * - * @brief Expands to the full name of a global device object - * - * @details Return the full name of a device object symbol created by - * DEVICE_INIT(), using the dev_name provided to DEVICE_INIT(). - * - * It is meant to be used for declaring extern symbols pointing on device - * objects before using the DEVICE_GET macro to get the device object. - * - * @param name The same as dev_name provided to DEVICE_INIT() - * - * @return The expanded name of the device object created by DEVICE_INIT() - */ -#define DEVICE_NAME_GET(name) (_CONCAT(__device_, name)) - /** * @def DEVICE_GET * @@ -195,7 +202,7 @@ extern "C" { * * @return A pointer to the device object created by DEVICE_INIT() */ -#define DEVICE_GET(name) (&DEVICE_NAME_GET(name)) +#define DEVICE_GET(name) ((struct device*)&DEVICE_NAME_GET(name)) /** @def DEVICE_DECLARE * @@ -212,9 +219,9 @@ extern "C" { * * @param name Device name */ -#define DEVICE_DECLARE(name) static struct device DEVICE_NAME_GET(name) +#define DEVICE_DECLARE(name) static struct device const DEVICE_NAME_GET(name) -typedef void (*device_pm_cb)(struct device *dev, +typedef void (*device_pm_cb)(const struct device *dev, int status, void *context, void *arg); /** @@ -229,7 +236,7 @@ typedef void (*device_pm_cb)(struct device *dev, * @param signal signal to notify the Async API callers */ struct device_pm { - struct device *dev; + const struct device *dev; struct k_sem lock; bool enable; atomic_t usage; @@ -239,6 +246,19 @@ struct device_pm { struct k_poll_signal signal; }; +/** + * @brief Runtime dynamic state for a driver instance. + * + * @param init_ok indicates device initialization was successful + * + * @note This may be embedded within a parent structure that provides + * driver-specific dynamic state. + */ +struct device_context { + /* Bitfield elements */ + _Bool init_ok:1; +}; + /** * @brief Runtime device structure (in memory) per driver instance * @@ -255,8 +275,9 @@ struct device { const void *config_info; const void *driver_api; void * const driver_data; + struct device_context * const driver_context; #ifdef CONFIG_DEVICE_POWER_MANAGEMENT - int (*device_pm_control)(struct device *device, u32_t command, + int (*device_pm_control)(const struct device *device, u32_t command, void *context, device_pm_cb cb, void *arg); struct device_pm * const pm; #endif @@ -274,7 +295,7 @@ struct device { * * @return pointer to device structure; NULL if not found or cannot be used. */ -__syscall struct device *device_get_binding(const char *name); +__syscall const struct device *device_get_binding(const char *name); /** * @} @@ -359,7 +380,7 @@ const char *device_pm_state_str(u32_t state); * * @param busy_dev Pointer to device structure of the driver instance. */ -void device_busy_set(struct device *busy_dev); +void device_busy_set(const struct device *busy_dev); /** * @brief Indicate that the device has completed its transaction @@ -368,7 +389,7 @@ void device_busy_set(struct device *busy_dev); * * @param busy_dev Pointer to device structure of the driver instance. */ -void device_busy_clear(struct device *busy_dev); +void device_busy_clear(const struct device *busy_dev); #ifdef CONFIG_DEVICE_POWER_MANAGEMENT /* @@ -389,7 +410,7 @@ void device_busy_clear(struct device *busy_dev); * * @retval 0 Always returns 0 */ -int device_pm_control_nop(struct device *unused_device, +int device_pm_control_nop(const struct device *unused_device, u32_t unused_ctrl_command, void *unused_context, device_pm_cb cb, @@ -408,7 +429,7 @@ int device_pm_control_nop(struct device *unused_device, * @retval 0 If successful in queuing the request or changing the state. * @retval Errno Negative errno code if failure. Callback will not be called. */ -static inline int device_set_power_state(struct device *device, +static inline int device_set_power_state(const struct device *device, u32_t device_power_state, device_pm_cb cb, void *arg) { @@ -430,7 +451,7 @@ static inline int device_set_power_state(struct device *device, * @retval 0 If successful. * @retval Errno Negative errno code if failure. */ -static inline int device_get_power_state(struct device *device, +static inline int device_get_power_state(const struct device *device, u32_t *device_power_state) { return device->device_pm_control(device, @@ -450,7 +471,7 @@ static inline int device_get_power_state(struct device *device, * @param device_list Pointer to receive the device list array * @param device_count Pointer to receive the device count */ -void device_list_get(struct device **device_list, int *device_count); +void device_list_get(const struct device **device_list, int *device_count); /** * @brief Check if any device is in the middle of a transaction @@ -474,7 +495,7 @@ int device_any_busy_check(void); * @retval 0 if the device is not busy * @retval -EBUSY if the device is busy */ -int device_busy_check(struct device *chk_dev); +int device_busy_check(const struct device *chk_dev); #ifdef CONFIG_DEVICE_IDLE_PM @@ -496,7 +517,7 @@ enum device_pm_fsm_state { * @param dev Pointer to device structure of the specific device driver * the caller is interested in. */ -void device_pm_enable(struct device *dev); +void device_pm_enable(const struct device *dev); /** * @brief Disable device idle PM @@ -507,7 +528,7 @@ void device_pm_enable(struct device *dev); * @param dev Pointer to device structure of the specific device driver * the caller is interested in. */ -void device_pm_disable(struct device *dev); +void device_pm_disable(const struct device *dev); /** * @brief Call device resume asynchronously based on usage count @@ -523,7 +544,7 @@ void device_pm_disable(struct device *dev); * pm signal mechanism to know the completion of resume operation. * @retval Errno Negative errno code if failure. */ -int device_pm_get(struct device *dev); +int device_pm_get(const struct device *dev); /** * @brief Call device resume synchronously based on usage count @@ -538,7 +559,7 @@ int device_pm_get(struct device *dev); * @retval 0 If successful. * @retval Errno Negative errno code if failure. */ -int device_pm_get_sync(struct device *dev); +int device_pm_get_sync(const struct device *dev); /** * @brief Call device suspend asynchronously based on usage count @@ -554,7 +575,7 @@ int device_pm_get_sync(struct device *dev); * signal mechanism to know the completion of suspend operation. * @retval Errno Negative errno code if failure. */ -int device_pm_put(struct device *dev); +int device_pm_put(const struct device *dev); /** * @brief Call device suspend synchronously based on usage count @@ -569,14 +590,14 @@ int device_pm_put(struct device *dev); * @retval 0 If successful. * @retval Errno Negative errno code if failure. */ -int device_pm_put_sync(struct device *dev); +int device_pm_put_sync(const struct device *dev); #else -static inline void device_pm_enable(struct device *dev) { } -static inline void device_pm_disable(struct device *dev) { } -static inline int device_pm_get(struct device *dev) { return -ENOTSUP; } -static inline int device_pm_get_sync(struct device *dev) { return -ENOTSUP; } -static inline int device_pm_put(struct device *dev) { return -ENOTSUP; } -static inline int device_pm_put_sync(struct device *dev) { return -ENOTSUP; } +static inline void device_pm_enable(const struct device *dev) { } +static inline void device_pm_disable(const struct device *dev) { } +static inline int device_pm_get(const struct device *dev) { return -ENOTSUP; } +static inline int device_pm_get_sync(const struct device *dev) { return -ENOTSUP; } +static inline int device_pm_put(const struct device *dev) { return -ENOTSUP; } +static inline int device_pm_put_sync(const struct device *dev) { return -ENOTSUP; } #endif #else #define device_pm_control_nop(...) NULL diff --git a/include/disk/disk_access.h b/include/disk/disk_access.h index bf6a45c48a03..8c43ca60fe41 100644 --- a/include/disk/disk_access.h +++ b/include/disk/disk_access.h @@ -58,7 +58,7 @@ struct disk_info { const struct disk_operations *ops; /* Disk device associated to this disk. */ - struct device *dev; + const struct device *dev; }; struct disk_operations { diff --git a/include/display/cfb.h b/include/display/cfb.h index 525a4aa5e757..2b441dffa09c 100644 --- a/include/display/cfb.h +++ b/include/display/cfb.h @@ -88,7 +88,7 @@ struct cfb_font { * * @return 0 on success, negative value otherwise */ -int cfb_print(struct device *dev, char *str, u16_t x, u16_t y); +int cfb_print(const struct device *dev, char *str, u16_t x, u16_t y); /** * @brief Clear framebuffer. @@ -98,7 +98,7 @@ int cfb_print(struct device *dev, char *str, u16_t x, u16_t y); * * @return 0 on success, negative value otherwise */ -int cfb_framebuffer_clear(struct device *dev, bool clear_display); +int cfb_framebuffer_clear(const struct device *dev, bool clear_display); /** * @brief Invert Pixels. @@ -107,7 +107,7 @@ int cfb_framebuffer_clear(struct device *dev, bool clear_display); * * @return 0 on success, negative value otherwise */ -int cfb_framebuffer_invert(struct device *dev); +int cfb_framebuffer_invert(const struct device *dev); /** * @brief Finalize framebuffer and write it to display RAM, @@ -117,7 +117,7 @@ int cfb_framebuffer_invert(struct device *dev); * * @return 0 on success, negative value otherwise */ -int cfb_framebuffer_finalize(struct device *dev); +int cfb_framebuffer_finalize(const struct device *dev); /** * @brief Get display parameter. @@ -127,7 +127,8 @@ int cfb_framebuffer_finalize(struct device *dev); * * @return Display parameter value */ -int cfb_get_display_parameter(struct device *dev, enum cfb_display_param); +int cfb_get_display_parameter(const struct device *dev, + enum cfb_display_param); /** * @brief Set font. @@ -137,7 +138,7 @@ int cfb_get_display_parameter(struct device *dev, enum cfb_display_param); * * @return 0 on success, negative value otherwise */ -int cfb_framebuffer_set_font(struct device *dev, u8_t idx); +int cfb_framebuffer_set_font(const struct device *dev, u8_t idx); /** * @brief Get font size. @@ -149,7 +150,8 @@ int cfb_framebuffer_set_font(struct device *dev, u8_t idx); * * @return 0 on success, negative value otherwise */ -int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height); +int cfb_get_font_size(const struct device *dev, u8_t idx, u8_t *width, + u8_t *height); /** * @brief Get number of fonts. @@ -158,7 +160,7 @@ int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height); * * @return number of fonts */ -int cfb_get_numof_fonts(struct device *dev); +int cfb_get_numof_fonts(const struct device *dev); /** * @brief Initialize Character Framebuffer. @@ -167,7 +169,7 @@ int cfb_get_numof_fonts(struct device *dev); * * @return 0 on success, negative value otherwise */ -int cfb_framebuffer_init(struct device *dev); +int cfb_framebuffer_init(const struct device *dev); #ifdef __cplusplus } diff --git a/include/display/grove_lcd.h b/include/display/grove_lcd.h index ca9335c9c959..74d162b38a44 100644 --- a/include/display/grove_lcd.h +++ b/include/display/grove_lcd.h @@ -34,7 +34,7 @@ extern "C" { * @param data the ASCII text to display * @param size the length of the text in bytes */ -void glcd_print(struct device *port, char *data, u32_t size); +void glcd_print(const struct device *port, char *data, u32_t size); /** @@ -44,14 +44,14 @@ void glcd_print(struct device *port, char *data, u32_t size); * @param col the column for the cursor to be moved to (0-15) * @param row the row it should be moved to (0 or 1) */ -void glcd_cursor_pos_set(struct device *port, u8_t col, u8_t row); +void glcd_cursor_pos_set(const struct device *port, u8_t col, u8_t row); /** * @brief Clear the current display * * @param port Pointer to device structure for driver instance. */ -void glcd_clear(struct device *port); +void glcd_clear(const struct device *port); /* Defines for the GLCD_CMD_DISPLAY_SWITCH options */ #define GLCD_DS_DISPLAY_ON (1 << 2) @@ -71,7 +71,7 @@ void glcd_clear(struct device *port); * @param opt An 8bit bitmask of GLCD_DS_* options. * */ -void glcd_display_state_set(struct device *port, u8_t opt); +void glcd_display_state_set(const struct device *port, u8_t opt); /** * @brief return the display feature set associated with the device @@ -80,7 +80,7 @@ void glcd_display_state_set(struct device *port, u8_t opt); * * @return the display feature set associated with the device. */ -u8_t glcd_display_state_get(struct device *port); +u8_t glcd_display_state_get(const struct device *port); /* Defines for the GLCD_CMD_INPUT_SET to change text direction */ #define GLCD_IS_SHIFT_INCREMENT (1 << 1) @@ -97,7 +97,7 @@ u8_t glcd_display_state_get(struct device *port); * @param opt A bitmask of GLCD_IS_* options * */ -void glcd_input_state_set(struct device *port, u8_t opt); +void glcd_input_state_set(const struct device *port, u8_t opt); /** * @brief return the input set associated with the device @@ -106,7 +106,7 @@ void glcd_input_state_set(struct device *port, u8_t opt); * * @return the input set associated with the device. */ -u8_t glcd_input_state_get(struct device *port); +u8_t glcd_input_state_get(const struct device *port); /* Defines for the LCD_FUNCTION_SET */ #define GLCD_FS_8BIT_MODE (1 << 4) @@ -125,7 +125,7 @@ u8_t glcd_input_state_get(struct device *port); * of the display as per needed. Controlling things like the number of rows, * dot size, and text display quality. */ -void glcd_function_set(struct device *port, u8_t opt); +void glcd_function_set(const struct device *port, u8_t opt); /** * @brief return the function set associated with the device @@ -134,7 +134,7 @@ void glcd_function_set(struct device *port, u8_t opt); * * @return the function features set associated with the device. */ -u8_t glcd_function_get(struct device *port); +u8_t glcd_function_get(const struct device *port); /* Available color selections */ @@ -147,7 +147,7 @@ u8_t glcd_function_get(struct device *port); * @param port Pointer to device structure for driver instance. * @param color One of the predefined color options */ -void glcd_color_select(struct device *port, u8_t color); +void glcd_color_select(const struct device *port, u8_t color); /** @@ -158,7 +158,7 @@ void glcd_color_select(struct device *port, u8_t color); * @param g A numeric value for the green color (max is 255) * @param b A numeric value for the blue color (max is 255) */ -void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b); +void glcd_color_set(const struct device *port, u8_t r, u8_t g, u8_t b); /** @@ -168,7 +168,7 @@ void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b); * * @return Returns 0 if all passes */ -int glcd_initialize(struct device *port); +int glcd_initialize(const struct device *port); /** diff --git a/include/drivers/adc.h b/include/drivers/adc.h index a80cf6c2c825..2a6a6465136c 100644 --- a/include/drivers/adc.h +++ b/include/drivers/adc.h @@ -225,7 +225,7 @@ enum adc_action { * @returns Action to be performed by the driver. See @ref adc_action. */ typedef enum adc_action (*adc_sequence_callback)( - struct device *dev, + const struct device *dev, const struct adc_sequence *sequence, u16_t sampling_index); @@ -327,14 +327,14 @@ struct adc_sequence { * @brief Type definition of ADC API function for configuring a channel. * See adc_channel_setup() for argument descriptions. */ -typedef int (*adc_api_channel_setup)(struct device *dev, +typedef int (*adc_api_channel_setup)(const struct device *dev, const struct adc_channel_cfg *channel_cfg); /** * @brief Type definition of ADC API function for setting a read request. * See adc_read() for argument descriptions. */ -typedef int (*adc_api_read)(struct device *dev, +typedef int (*adc_api_read)(const struct device *dev, const struct adc_sequence *sequence); #ifdef CONFIG_ADC_ASYNC @@ -343,7 +343,7 @@ typedef int (*adc_api_read)(struct device *dev, * read request. * See adc_read_async() for argument descriptions. */ -typedef int (*adc_api_read_async)(struct device *dev, +typedef int (*adc_api_read_async)(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async); #endif @@ -374,11 +374,11 @@ __subsystem struct adc_driver_api { * @retval 0 On success. * @retval -EINVAL If a parameter with an invalid value has been provided. */ -__syscall int adc_channel_setup(struct device *dev, +__syscall int adc_channel_setup(const struct device *dev, const struct adc_channel_cfg *channel_cfg); -static inline int z_impl_adc_channel_setup(struct device *dev, - const struct adc_channel_cfg *channel_cfg) +static inline int z_impl_adc_channel_setup(const struct device *dev, + const struct adc_channel_cfg *channel_cfg) { const struct adc_driver_api *api = (const struct adc_driver_api *)dev->driver_api; @@ -407,10 +407,10 @@ static inline int z_impl_adc_channel_setup(struct device *dev, * in the buffer, but at least some of them were taken with * an extra delay compared to what was scheduled. */ -__syscall int adc_read(struct device *dev, +__syscall int adc_read(const struct device *dev, const struct adc_sequence *sequence); -static inline int z_impl_adc_read(struct device *dev, +static inline int z_impl_adc_read(const struct device *dev, const struct adc_sequence *sequence) { const struct adc_driver_api *api = @@ -436,12 +436,12 @@ static inline int z_impl_adc_read(struct device *dev, * @returns 0 on success, negative error code otherwise. * */ -__syscall int adc_read_async(struct device *dev, +__syscall int adc_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async); -static inline int z_impl_adc_read_async(struct device *dev, +static inline int z_impl_adc_read_async(const struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { @@ -461,7 +461,7 @@ static inline int z_impl_adc_read_async(struct device *dev, * @return a positive value is the reference voltage value. Returns * zero if reference voltage information is not available. */ -static inline u16_t adc_ref_internal(struct device *dev) +static inline u16_t adc_ref_internal(const struct device *dev) { const struct adc_driver_api *api = (const struct adc_driver_api *)dev->driver_api; diff --git a/include/drivers/adc/lmp90xxx.h b/include/drivers/adc/lmp90xxx.h index 88bcb406a85d..683660ca4068 100644 --- a/include/drivers/adc/lmp90xxx.h +++ b/include/drivers/adc/lmp90xxx.h @@ -13,25 +13,30 @@ /* LMP90xxx supports GPIO D0..D6 */ #define LMP90XXX_GPIO_MAX 6 -int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin); +int lmp90xxx_gpio_set_output(const struct device *dev, u8_t pin); -int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin); +int lmp90xxx_gpio_set_input(const struct device *dev, u8_t pin); -int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value); +int lmp90xxx_gpio_set_pin_value(const struct device *dev, u8_t pin, + bool value); -int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value); +int lmp90xxx_gpio_get_pin_value(const struct device *dev, u8_t pin, + bool *value); -int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value); +int lmp90xxx_gpio_port_get_raw(const struct device *dev, + gpio_port_value_t *value); -int lmp90xxx_gpio_port_set_masked_raw(struct device *dev, +int lmp90xxx_gpio_port_set_masked_raw(const struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value); -int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins); +int lmp90xxx_gpio_port_set_bits_raw(const struct device *dev, + gpio_port_pins_t pins); -int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev, +int lmp90xxx_gpio_port_clear_bits_raw(const struct device *dev, gpio_port_pins_t pins); -int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins); +int lmp90xxx_gpio_port_toggle_bits(const struct device *dev, + gpio_port_pins_t pins); #endif /* ZEPHYR_INCLUDE_DRIVERS_ADC_LMP90XXX_H_ */ diff --git a/include/drivers/bluetooth/hci_driver.h b/include/drivers/bluetooth/hci_driver.h index 5d079605ec62..e3f808a65587 100644 --- a/include/drivers/bluetooth/hci_driver.h +++ b/include/drivers/bluetooth/hci_driver.h @@ -192,7 +192,7 @@ int bt_hci_driver_register(const struct bt_hci_driver *drv); * * @return 0 on success, negative error value on failure */ -int bt_hci_transport_setup(struct device *dev); +int bt_hci_transport_setup(const struct device *dev); /** Allocate an HCI event buffer. * diff --git a/include/drivers/can.h b/include/drivers/can.h index 7e2f2ecdfb19..87f8a2fe7e1e 100644 --- a/include/drivers/can.h +++ b/include/drivers/can.h @@ -265,29 +265,32 @@ typedef void (*can_rx_callback_t)(struct zcan_frame *msg, void *arg); typedef void(*can_state_change_isr_t)(enum can_state state, struct can_bus_err_cnt err_cnt); -typedef int (*can_configure_t)(struct device *dev, enum can_mode mode, +typedef int (*can_configure_t)(const struct device *dev, enum can_mode mode, u32_t bitrate); -typedef int (*can_send_t)(struct device *dev, const struct zcan_frame *msg, +typedef int (*can_send_t)(const struct device *dev, + const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback_isr, void *callback_arg); -typedef int (*can_attach_msgq_t)(struct device *dev, struct k_msgq *msg_q, +typedef int (*can_attach_msgq_t)(const struct device *dev, + struct k_msgq *msg_q, const struct zcan_filter *filter); -typedef int (*can_attach_isr_t)(struct device *dev, can_rx_callback_t isr, +typedef int (*can_attach_isr_t)(const struct device *dev, + can_rx_callback_t isr, void *callback_arg, const struct zcan_filter *filter); -typedef void (*can_detach_t)(struct device *dev, int filter_id); +typedef void (*can_detach_t)(const struct device *dev, int filter_id); -typedef int (*can_recover_t)(struct device *dev, k_timeout_t timeout); +typedef int (*can_recover_t)(const struct device *dev, k_timeout_t timeout); -typedef enum can_state (*can_get_state_t)(struct device *dev, +typedef enum can_state (*can_get_state_t)(const struct device *dev, struct can_bus_err_cnt *err_cnt); -typedef void(*can_register_state_change_isr_t)(struct device *dev, +typedef void(*can_register_state_change_isr_t)(const struct device *dev, can_state_change_isr_t isr); #ifndef CONFIG_CAN_WORKQ_FRAMES_BUF_CNT @@ -343,15 +346,15 @@ __subsystem struct can_driver_api { * @retval 0 If successful. * @retval CAN_TX_* on failure. */ -__syscall int can_send(struct device *dev, const struct zcan_frame *msg, +__syscall int can_send(const struct device *dev, const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback_isr, void *callback_arg); -static inline int z_impl_can_send(struct device *dev, - const struct zcan_frame *msg, - k_timeout_t timeout, - can_tx_callback_t callback_isr, - void *callback_arg) +static inline int z_impl_can_send(const struct device *dev, + const struct zcan_frame *msg, + k_timeout_t timeout, + can_tx_callback_t callback_isr, + void *callback_arg) { const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api; @@ -379,7 +382,8 @@ static inline int z_impl_can_send(struct device *dev, * @retval -EIO General input / output error. * @retval -EINVAL if length > 8. */ -static inline int can_write(struct device *dev, const u8_t *data, u8_t length, +static inline int can_write(const struct device *dev, const u8_t *data, + u8_t length, u32_t id, enum can_rtr rtr, k_timeout_t timeout) { struct zcan_frame msg; @@ -426,7 +430,7 @@ static inline int can_write(struct device *dev, const u8_t *data, u8_t length, * @retval filter_id on success. * @retval CAN_NO_FREE_FILTER if there is no filter left. */ -int can_attach_workq(struct device *dev, struct k_work_q *work_q, +int can_attach_workq(const struct device *dev, struct k_work_q *work_q, struct zcan_work *work, can_rx_callback_t callback, void *callback_arg, const struct zcan_filter *filter); @@ -450,7 +454,7 @@ int can_attach_workq(struct device *dev, struct k_work_q *work_q, * @retval filter_id on success. * @retval CAN_NO_FREE_FILTER if there is no filter left. */ -__syscall int can_attach_msgq(struct device *dev, struct k_msgq *msg_q, +__syscall int can_attach_msgq(const struct device *dev, struct k_msgq *msg_q, const struct zcan_filter *filter); /** @@ -472,7 +476,7 @@ __syscall int can_attach_msgq(struct device *dev, struct k_msgq *msg_q, * @retval filter_id on success. * @retval CAN_NO_FREE_FILTER if there is no filter left. */ -static inline int can_attach_isr(struct device *dev, +static inline int can_attach_isr(const struct device *dev, can_rx_callback_t isr, void *callback_arg, const struct zcan_filter *filter) @@ -494,9 +498,9 @@ static inline int can_attach_isr(struct device *dev, * * @retval none */ -__syscall void can_detach(struct device *dev, int filter_id); +__syscall void can_detach(const struct device *dev, int filter_id); -static inline void z_impl_can_detach(struct device *dev, int filter_id) +static inline void z_impl_can_detach(const struct device *dev, int filter_id) { const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api; @@ -514,11 +518,12 @@ static inline void z_impl_can_detach(struct device *dev, int filter_id) * @retval 0 If successful. * @retval -EIO General input / output error, failed to configure device. */ -__syscall int can_configure(struct device *dev, enum can_mode mode, +__syscall int can_configure(const struct device *dev, enum can_mode mode, u32_t bitrate); -static inline int z_impl_can_configure(struct device *dev, enum can_mode mode, - u32_t bitrate) +static inline int z_impl_can_configure(const struct device *dev, + enum can_mode mode, + u32_t bitrate) { const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api; @@ -536,11 +541,11 @@ static inline int z_impl_can_configure(struct device *dev, enum can_mode mode, * * @retval state */ -__syscall enum can_state can_get_state(struct device *dev, +__syscall enum can_state can_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt); static inline -enum can_state z_impl_can_get_state(struct device *dev, +enum can_state z_impl_can_get_state(const struct device *dev, struct can_bus_err_cnt *err_cnt) { const struct can_driver_api *api = @@ -561,9 +566,10 @@ enum can_state z_impl_can_get_state(struct device *dev, * @retval CAN_TIMEOUT on timeout. */ #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY -__syscall int can_recover(struct device *dev, k_timeout_t timeout); +__syscall int can_recover(const struct device *dev, k_timeout_t timeout); -static inline int z_impl_can_recover(struct device *dev, k_timeout_t timeout) +static inline int z_impl_can_recover(const struct device *dev, + k_timeout_t timeout) { const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api; @@ -572,7 +578,8 @@ static inline int z_impl_can_recover(struct device *dev, k_timeout_t timeout) } #else /* This implementation prevents inking errors for auto recovery */ -static inline int z_impl_can_recover(struct device *dev, k_timeout_t timeout) +static inline int z_impl_can_recover(const struct device *dev, + k_timeout_t timeout) { return 0; } @@ -588,7 +595,7 @@ static inline int z_impl_can_recover(struct device *dev, k_timeout_t timeout) * @param isr Pointer to ISR */ static inline -void can_register_state_change_isr(struct device *dev, +void can_register_state_change_isr(const struct device *dev, can_state_change_isr_t isr) { const struct can_driver_api *api = diff --git a/include/drivers/clock_control.h b/include/drivers/clock_control.h index ade64b2c8d2e..a5175477d7ac 100644 --- a/include/drivers/clock_control.h +++ b/include/drivers/clock_control.h @@ -72,7 +72,7 @@ typedef void *clock_control_subsys_t; * @param subsys Opaque data representing the clock. * @param user_data User data. */ -typedef void (*clock_control_cb_t)(struct device *dev, +typedef void (*clock_control_cb_t)(const struct device *dev, clock_control_subsys_t subsys, void *user_data); @@ -100,18 +100,19 @@ struct clock_control_async_data { void *user_data; }; -typedef int (*clock_control)(struct device *dev, clock_control_subsys_t sys); +typedef int (*clock_control)(const struct device *dev, + clock_control_subsys_t sys); -typedef int (*clock_control_get)(struct device *dev, +typedef int (*clock_control_get)(const struct device *dev, clock_control_subsys_t sys, u32_t *rate); -typedef int (*clock_control_async_on_fn)(struct device *dev, - clock_control_subsys_t sys, - struct clock_control_async_data *data); +typedef int (*clock_control_async_on_fn)(const struct device *dev, + clock_control_subsys_t sys, + struct clock_control_async_data *data); typedef enum clock_control_status (*clock_control_get_status_fn)( - struct device *dev, + const struct device *dev, clock_control_subsys_t sys); struct clock_control_driver_api { @@ -135,7 +136,7 @@ struct clock_control_driver_api { * @param sys Opaque data representing the clock. * @return 0 on success, negative errno on failure. */ -static inline int clock_control_on(struct device *dev, +static inline int clock_control_on(const struct device *dev, clock_control_subsys_t sys) { const struct clock_control_driver_api *api = @@ -154,7 +155,7 @@ static inline int clock_control_on(struct device *dev, * @param sys Opaque data representing the clock * @return 0 on success, negative errno on failure. */ -static inline int clock_control_off(struct device *dev, +static inline int clock_control_off(const struct device *dev, clock_control_subsys_t sys) { const struct clock_control_driver_api *api = @@ -181,7 +182,7 @@ static inline int clock_control_off(struct device *dev, * @retval -EBUSY if same request already scheduled and not yet completed. * @retval -ENOTSUP if not supported. */ -static inline int clock_control_async_on(struct device *dev, +static inline int clock_control_async_on(const struct device *dev, clock_control_subsys_t sys, struct clock_control_async_data *data) { @@ -204,7 +205,7 @@ static inline int clock_control_async_on(struct device *dev, * @return Status. */ static inline enum clock_control_status clock_control_get_status( - struct device *dev, + const struct device *dev, clock_control_subsys_t sys) { const struct clock_control_driver_api *api = @@ -224,7 +225,7 @@ static inline enum clock_control_status clock_control_get_status( * @param sys A pointer to an opaque data representing the sub-system * @param[out] rate Subsystem clock rate */ -static inline int clock_control_get_rate(struct device *dev, +static inline int clock_control_get_rate(const struct device *dev, clock_control_subsys_t sys, u32_t *rate) { diff --git a/include/drivers/console/ipm_console.h b/include/drivers/console/ipm_console.h index 75294f91d18a..16535522f0cf 100644 --- a/include/drivers/console/ipm_console.h +++ b/include/drivers/console/ipm_console.h @@ -71,7 +71,7 @@ struct ipm_console_receiver_runtime_data { struct k_sem sem; /** pointer to the bound low-level IPM device */ - struct device *ipm_device; + const struct device *ipm_device; /** Indicator that the channel is temporarily disabled due to * full buffer @@ -94,11 +94,11 @@ struct ipm_console_sender_config_info { }; #if CONFIG_IPM_CONSOLE_RECEIVER -int ipm_console_receiver_init(struct device *d); +int ipm_console_receiver_init(const struct device *d); #endif #if CONFIG_IPM_CONSOLE_SENDER -int ipm_console_sender_init(struct device *d); +int ipm_console_sender_init(const struct device *d); #endif #ifdef __cplusplus diff --git a/include/drivers/console/uart_mux.h b/include/drivers/console/uart_mux.h index 6806ed9f2bab..a719b77b50ab 100644 --- a/include/drivers/console/uart_mux.h +++ b/include/drivers/console/uart_mux.h @@ -39,7 +39,8 @@ struct gsm_dlci; * @param connected True if DLCI is connected, false otherwise. * @param user_data Arbitrary user data. */ -typedef void (*uart_mux_attach_cb_t)(struct device *mux, int dlci_address, +typedef void (*uart_mux_attach_cb_t)(const struct device *mux, + int dlci_address, bool connected, void *user_data); /** @brief UART mux driver API structure. */ @@ -55,7 +56,7 @@ __subsystem struct uart_mux_driver_api { * Attach the mux to this UART. The API will call the callback after * the DLCI is created or not. */ - int (*attach)(struct device *mux, struct device *uart, + int (*attach)(const struct device *mux, const struct device *uart, int dlci_address, uart_mux_attach_cb_t cb, void *user_data); }; @@ -72,7 +73,8 @@ __subsystem struct uart_mux_driver_api { * @retval 0 No errors, the attachment was successful * @retval <0 Error */ -static inline int uart_mux_attach(struct device *mux, struct device *uart, +static inline int uart_mux_attach(const struct device *mux, + const struct device *uart, int dlci_address, uart_mux_attach_cb_t cb, void *user_data) { @@ -89,7 +91,7 @@ static inline int uart_mux_attach(struct device *mux, struct device *uart, * * @return UART device if found, NULL otherwise */ -__syscall struct device *uart_mux_find(int dlci_address); +__syscall const struct device *uart_mux_find(int dlci_address); /** * @brief Allocate muxing UART device. @@ -102,7 +104,7 @@ __syscall struct device *uart_mux_find(int dlci_address); * @retval device New UART device that will automatically mux data sent to it. * @retval NULL if error */ -struct device *uart_mux_alloc(void); +const struct device *uart_mux_alloc(void); /** * @typedef uart_mux_cb_t @@ -113,7 +115,8 @@ struct device *uart_mux_alloc(void); * @param dlci_address DLCI channel id this UART is muxed * @param user_data A valid pointer to user data or NULL */ -typedef void (*uart_mux_cb_t)(struct device *uart, struct device *dev, +typedef void (*uart_mux_cb_t)(const struct device *uart, + const struct device *dev, int dlci_address, void *user_data); /** diff --git a/include/drivers/counter.h b/include/drivers/counter.h index 16824a07ae80..505aafc2c135 100644 --- a/include/drivers/counter.h +++ b/include/drivers/counter.h @@ -105,7 +105,7 @@ extern "C" { * @param ticks Counter value that triggered the alarm. * @param user_data User data. */ -typedef void (*counter_alarm_callback_t)(struct device *dev, +typedef void (*counter_alarm_callback_t)(const struct device *dev, u8_t chan_id, u32_t ticks, void *user_data); @@ -135,7 +135,8 @@ struct counter_alarm_cfg { * @param dev Pointer to the device structure for the driver instance. * @param user_data User data provided in @ref counter_set_top_value. */ -typedef void (*counter_top_callback_t)(struct device *dev, void *user_data); +typedef void (*counter_top_callback_t)(const struct device *dev, + void *user_data); /** @brief Top value configuration structure. * @@ -169,19 +170,22 @@ struct counter_config_info { u8_t channels; }; -typedef int (*counter_api_start)(struct device *dev); -typedef int (*counter_api_stop)(struct device *dev); -typedef int (*counter_api_get_value)(struct device *dev, u32_t *ticks); -typedef int (*counter_api_set_alarm)(struct device *dev, u8_t chan_id, - const struct counter_alarm_cfg *alarm_cfg); -typedef int (*counter_api_cancel_alarm)(struct device *dev, u8_t chan_id); -typedef int (*counter_api_set_top_value)(struct device *dev, +typedef int (*counter_api_start)(const struct device *dev); +typedef int (*counter_api_stop)(const struct device *dev); +typedef int (*counter_api_get_value)(const struct device *dev, u32_t *ticks); +typedef int (*counter_api_set_alarm)(const struct device *dev, u8_t chan_id, + const struct counter_alarm_cfg *alarm_cfg); +typedef int (*counter_api_cancel_alarm)(const struct device *dev, + u8_t chan_id); +typedef int (*counter_api_set_top_value)(const struct device *dev, const struct counter_top_cfg *cfg); -typedef u32_t (*counter_api_get_pending_int)(struct device *dev); -typedef u32_t (*counter_api_get_top_value)(struct device *dev); -typedef u32_t (*counter_api_get_max_relative_alarm)(struct device *dev); -typedef u32_t (*counter_api_get_guard_period)(struct device *dev, u32_t flags); -typedef int (*counter_api_set_guard_period)(struct device *dev, u32_t ticks, +typedef u32_t (*counter_api_get_pending_int)(const struct device *dev); +typedef u32_t (*counter_api_get_top_value)(const struct device *dev); +typedef u32_t (*counter_api_get_max_relative_alarm)(const struct device *dev); +typedef u32_t (*counter_api_get_guard_period)(const struct device *dev, + u32_t flags); +typedef int (*counter_api_set_guard_period)(const struct device *dev, + u32_t ticks, u32_t flags); __subsystem struct counter_driver_api { @@ -315,9 +319,9 @@ static inline u32_t z_impl_counter_get_max_top_value(const struct device *dev) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int counter_start(struct device *dev); +__syscall int counter_start(const struct device *dev); -static inline int z_impl_counter_start(struct device *dev) +static inline int z_impl_counter_start(const struct device *dev) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -334,9 +338,9 @@ static inline int z_impl_counter_start(struct device *dev) * @retval -ENOTSUP if the device doesn't support stopping the * counter. */ -__syscall int counter_stop(struct device *dev); +__syscall int counter_stop(const struct device *dev); -static inline int z_impl_counter_stop(struct device *dev) +static inline int z_impl_counter_stop(const struct device *dev) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -352,9 +356,10 @@ static inline int z_impl_counter_stop(struct device *dev) * @retval 0 If successful. * @retval Negative error code on failure getting the counter value */ -__syscall int counter_get_value(struct device *dev, u32_t *ticks); +__syscall int counter_get_value(const struct device *dev, u32_t *ticks); -static inline int z_impl_counter_get_value(struct device *dev, u32_t *ticks) +static inline int z_impl_counter_get_value(const struct device *dev, + u32_t *ticks) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -381,11 +386,13 @@ static inline int z_impl_counter_get_value(struct device *dev, u32_t *ticks) * @retval -EINVAL if alarm settings are invalid. * @retval -ETIME if absolute alarm was set too late. */ -__syscall int counter_set_channel_alarm(struct device *dev, u8_t chan_id, - const struct counter_alarm_cfg *alarm_cfg); +__syscall int counter_set_channel_alarm(const struct device *dev, + u8_t chan_id, + const struct counter_alarm_cfg *alarm_cfg); -static inline int z_impl_counter_set_channel_alarm(struct device *dev, - u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) +static inline int z_impl_counter_set_channel_alarm(const struct device *dev, + u8_t chan_id, + const struct counter_alarm_cfg *alarm_cfg) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -409,9 +416,10 @@ static inline int z_impl_counter_set_channel_alarm(struct device *dev, * @retval -ENOTSUP if request is not supported or the counter was not started * yet. */ -__syscall int counter_cancel_channel_alarm(struct device *dev, u8_t chan_id); +__syscall int counter_cancel_channel_alarm(const struct device *dev, + u8_t chan_id); -static inline int z_impl_counter_cancel_channel_alarm(struct device *dev, +static inline int z_impl_counter_cancel_channel_alarm(const struct device *dev, u8_t chan_id) { const struct counter_driver_api *api = @@ -448,10 +456,10 @@ static inline int z_impl_counter_cancel_channel_alarm(struct device *dev, * @retval -ETIME if @ref COUNTER_TOP_CFG_DONT_RESET was set and new top value * is smaller than current counter value (counter counting up). */ -__syscall int counter_set_top_value(struct device *dev, +__syscall int counter_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg); -static inline int z_impl_counter_set_top_value(struct device *dev, +static inline int z_impl_counter_set_top_value(const struct device *dev, const struct counter_top_cfg *cfg) { @@ -478,9 +486,9 @@ static inline int z_impl_counter_set_top_value(struct device *dev, * @retval 1 if any counter interrupt is pending. * @retval 0 if no counter interrupt is pending. */ -__syscall int counter_get_pending_int(struct device *dev); +__syscall int counter_get_pending_int(const struct device *dev); -static inline int z_impl_counter_get_pending_int(struct device *dev) +static inline int z_impl_counter_get_pending_int(const struct device *dev) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -495,9 +503,9 @@ static inline int z_impl_counter_get_pending_int(struct device *dev) * * @return Top value. */ -__syscall u32_t counter_get_top_value(struct device *dev); +__syscall u32_t counter_get_top_value(const struct device *dev); -static inline u32_t z_impl_counter_get_top_value(struct device *dev) +static inline u32_t z_impl_counter_get_top_value(const struct device *dev) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -513,9 +521,9 @@ static inline u32_t z_impl_counter_get_top_value(struct device *dev) * * @return Max alarm value. */ -__deprecated __syscall u32_t counter_get_max_relative_alarm(struct device *dev); +__deprecated __syscall u32_t counter_get_max_relative_alarm(const struct device *dev); -static inline u32_t z_impl_counter_get_max_relative_alarm(struct device *dev) +static inline u32_t z_impl_counter_get_max_relative_alarm(const struct device *dev) { const struct counter_driver_api *api = (struct counter_driver_api *)dev->driver_api; @@ -551,10 +559,10 @@ static inline u32_t z_impl_counter_get_max_relative_alarm(struct device *dev) * @retval -ENOTSUP if function or flags are not supported. * @retval -EINVAL if ticks value is invalid. */ -__syscall int counter_set_guard_period(struct device *dev, u32_t ticks, +__syscall int counter_set_guard_period(const struct device *dev, u32_t ticks, u32_t flags); -static inline int z_impl_counter_set_guard_period(struct device *dev, +static inline int z_impl_counter_set_guard_period(const struct device *dev, u32_t ticks, u32_t flags) { const struct counter_driver_api *api = @@ -578,9 +586,10 @@ static inline int z_impl_counter_set_guard_period(struct device *dev, * @return Guard period given in counter ticks or 0 if function or flags are * not supported. */ -__syscall u32_t counter_get_guard_period(struct device *dev, u32_t flags); +__syscall u32_t counter_get_guard_period(const struct device *dev, + u32_t flags); -static inline u32_t z_impl_counter_get_guard_period(struct device *dev, +static inline u32_t z_impl_counter_get_guard_period(const struct device *dev, u32_t flags) { const struct counter_driver_api *api = @@ -590,10 +599,10 @@ static inline u32_t z_impl_counter_get_guard_period(struct device *dev, } /* Deprecated counter callback. */ -typedef void (*counter_callback_t)(struct device *dev, void *user_data); +typedef void (*counter_callback_t)(const struct device *dev, void *user_data); /* Deprecated counter read function. Use counter_get_value() instead. */ -__deprecated static inline u32_t counter_read(struct device *dev) +__deprecated static inline u32_t counter_read(const struct device *dev) { u32_t ticks; diff --git a/include/drivers/dac.h b/include/drivers/dac.h index a52a5b9f8445..3e5b16321326 100644 --- a/include/drivers/dac.h +++ b/include/drivers/dac.h @@ -48,14 +48,14 @@ struct dac_channel_cfg { * Type definition of DAC API function for configuring a channel. * See dac_channel_setup() for argument descriptions. */ -typedef int (*dac_api_channel_setup)(struct device *dev, - const struct dac_channel_cfg *channel_cfg); +typedef int (*dac_api_channel_setup)(const struct device *dev, + const struct dac_channel_cfg *channel_cfg); /* * Type definition of DAC API function for setting a write request. * See dac_write_value() for argument descriptions. */ -typedef int (*dac_api_write_value)(struct device *dev, +typedef int (*dac_api_write_value)(const struct device *dev, u8_t channel, u32_t value); /* @@ -85,11 +85,11 @@ __subsystem struct dac_driver_api { * @retval -EINVAL If a parameter with an invalid value has been provided. * @retval -ENOTSUP If the requested resolution is not supported. */ -__syscall int dac_channel_setup(struct device *dev, +__syscall int dac_channel_setup(const struct device *dev, const struct dac_channel_cfg *channel_cfg); -static inline int z_impl_dac_channel_setup(struct device *dev, - const struct dac_channel_cfg *channel_cfg) +static inline int z_impl_dac_channel_setup(const struct device *dev, + const struct dac_channel_cfg *channel_cfg) { const struct dac_driver_api *api = (const struct dac_driver_api *)dev->driver_api; @@ -107,9 +107,10 @@ static inline int z_impl_dac_channel_setup(struct device *dev, * @retval 0 On success. * @retval -EINVAL If a parameter with an invalid value has been provided. */ -__syscall int dac_write_value(struct device *dev, u8_t channel, u32_t value); +__syscall int dac_write_value(const struct device *dev, u8_t channel, + u32_t value); -static inline int z_impl_dac_write_value(struct device *dev, +static inline int z_impl_dac_write_value(const struct device *dev, u8_t channel, u32_t value) { const struct dac_driver_api *api = diff --git a/include/drivers/dma.h b/include/drivers/dma.h index 11c0bd0a3db0..5dd5d4c805a9 100644 --- a/include/drivers/dma.h +++ b/include/drivers/dma.h @@ -176,17 +176,17 @@ struct dma_status { * public documentation. */ -typedef int (*dma_api_config)(struct device *dev, u32_t channel, +typedef int (*dma_api_config)(const struct device *dev, u32_t channel, struct dma_config *config); -typedef int (*dma_api_reload)(struct device *dev, u32_t channel, - u32_t src, u32_t dst, size_t size); +typedef int (*dma_api_reload)(const struct device *dev, u32_t channel, + u32_t src, u32_t dst, size_t size); -typedef int (*dma_api_start)(struct device *dev, u32_t channel); +typedef int (*dma_api_start)(const struct device *dev, u32_t channel); -typedef int (*dma_api_stop)(struct device *dev, u32_t channel); +typedef int (*dma_api_stop)(const struct device *dev, u32_t channel); -typedef int (*dma_api_get_status)(struct device *dev, u32_t channel, +typedef int (*dma_api_get_status)(const struct device *dev, u32_t channel, struct dma_status *status); __subsystem struct dma_driver_api { @@ -211,7 +211,7 @@ __subsystem struct dma_driver_api { * @retval 0 if successful. * @retval Negative errno code if failure. */ -static inline int dma_config(struct device *dev, u32_t channel, +static inline int dma_config(const struct device *dev, u32_t channel, struct dma_config *config) { const struct dma_driver_api *api = @@ -233,8 +233,8 @@ static inline int dma_config(struct device *dev, u32_t channel, * @retval 0 if successful. * @retval Negative errno code if failure. */ -static inline int dma_reload(struct device *dev, u32_t channel, - u32_t src, u32_t dst, size_t size) +static inline int dma_reload(const struct device *dev, u32_t channel, + u32_t src, u32_t dst, size_t size) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->driver_api; @@ -260,9 +260,9 @@ static inline int dma_reload(struct device *dev, u32_t channel, * @retval 0 if successful. * @retval Negative errno code if failure. */ -__syscall int dma_start(struct device *dev, u32_t channel); +__syscall int dma_start(const struct device *dev, u32_t channel); -static inline int z_impl_dma_start(struct device *dev, u32_t channel) +static inline int z_impl_dma_start(const struct device *dev, u32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->driver_api; @@ -283,9 +283,9 @@ static inline int z_impl_dma_start(struct device *dev, u32_t channel) * @retval 0 if successful. * @retval Negative errno code if failure. */ -__syscall int dma_stop(struct device *dev, u32_t channel); +__syscall int dma_stop(const struct device *dev, u32_t channel); -static inline int z_impl_dma_stop(struct device *dev, u32_t channel) +static inline int z_impl_dma_stop(const struct device *dev, u32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->driver_api; @@ -307,7 +307,7 @@ static inline int z_impl_dma_stop(struct device *dev, u32_t channel) * @retval non-negative if successful. * @retval Negative errno code if failure. */ -static inline int dma_get_status(struct device *dev, u32_t channel, +static inline int dma_get_status(const struct device *dev, u32_t channel, struct dma_status *stat) { const struct dma_driver_api *api = diff --git a/include/drivers/eeprom.h b/include/drivers/eeprom.h index cabab9cdf23a..f65c330ae4bb 100644 --- a/include/drivers/eeprom.h +++ b/include/drivers/eeprom.h @@ -32,11 +32,12 @@ extern "C" { #endif -typedef int (*eeprom_api_read)(struct device *dev, off_t offset, void *data, +typedef int (*eeprom_api_read)(const struct device *dev, off_t offset, + void *data, size_t len); -typedef int (*eeprom_api_write)(struct device *dev, off_t offset, +typedef int (*eeprom_api_write)(const struct device *dev, off_t offset, const void *data, size_t len); -typedef size_t (*eeprom_api_size)(struct device *dev); +typedef size_t (*eeprom_api_size)(const struct device *dev); __subsystem struct eeprom_driver_api { eeprom_api_read read; @@ -54,10 +55,10 @@ __subsystem struct eeprom_driver_api { * * @return 0 on success, negative errno code on failure. */ -__syscall int eeprom_read(struct device *dev, off_t offset, void *data, +__syscall int eeprom_read(const struct device *dev, off_t offset, void *data, size_t len); -static inline int z_impl_eeprom_read(struct device *dev, off_t offset, +static inline int z_impl_eeprom_read(const struct device *dev, off_t offset, void *data, size_t len) { const struct eeprom_driver_api *api = @@ -76,10 +77,11 @@ static inline int z_impl_eeprom_read(struct device *dev, off_t offset, * * @return 0 on success, negative errno code on failure. */ -__syscall int eeprom_write(struct device *dev, off_t offset, const void *data, +__syscall int eeprom_write(const struct device *dev, off_t offset, + const void *data, size_t len); -static inline int z_impl_eeprom_write(struct device *dev, off_t offset, +static inline int z_impl_eeprom_write(const struct device *dev, off_t offset, const void *data, size_t len) { const struct eeprom_driver_api *api = @@ -95,9 +97,9 @@ static inline int z_impl_eeprom_write(struct device *dev, off_t offset, * * @return EEPROM size in bytes. */ -__syscall size_t eeprom_get_size(struct device *dev); +__syscall size_t eeprom_get_size(const struct device *dev); -static inline size_t z_impl_eeprom_get_size(struct device *dev) +static inline size_t z_impl_eeprom_get_size(const struct device *dev) { const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api; diff --git a/include/drivers/entropy.h b/include/drivers/entropy.h index 0891ecebf94e..af3bd883b34e 100644 --- a/include/drivers/entropy.h +++ b/include/drivers/entropy.h @@ -33,16 +33,16 @@ extern "C" { * * See entropy_get_entropy() for argument description */ -typedef int (*entropy_get_entropy_t)(struct device *dev, - u8_t *buffer, - u16_t length); +typedef int (*entropy_get_entropy_t)(const struct device *dev, + u8_t *buffer, + u16_t length); /** * @typedef entropy_get_entropy_isr_t * @brief Callback API to get entropy from an ISR. * * See entropy_get_entropy_isr() for argument description */ -typedef int (*entropy_get_entropy_isr_t)(struct device *dev, +typedef int (*entropy_get_entropy_isr_t)(const struct device *dev, u8_t *buffer, u16_t length, u32_t flags); @@ -61,13 +61,13 @@ __subsystem struct entropy_driver_api { * @retval 0 on success. * @retval -ERRNO errno code on error. */ -__syscall int entropy_get_entropy(struct device *dev, +__syscall int entropy_get_entropy(const struct device *dev, u8_t *buffer, u16_t length); -static inline int z_impl_entropy_get_entropy(struct device *dev, - u8_t *buffer, - u16_t length) +static inline int z_impl_entropy_get_entropy(const struct device *dev, + u8_t *buffer, + u16_t length) { const struct entropy_driver_api *api = (const struct entropy_driver_api *)dev->driver_api; @@ -90,7 +90,7 @@ static inline int z_impl_entropy_get_entropy(struct device *dev, * @param flags Flags to modify the behavior of the call. * @retval number of bytes filled with entropy or -error. */ -static inline int entropy_get_entropy_isr(struct device *dev, +static inline int entropy_get_entropy_isr(const struct device *dev, u8_t *buffer, u16_t length, u32_t flags) diff --git a/include/drivers/espi.h b/include/drivers/espi.h index f5d7d93ea54e..7de62c700558 100644 --- a/include/drivers/espi.h +++ b/include/drivers/espi.h @@ -284,7 +284,7 @@ struct espi_callback; * @param espi_evt event details that trigger the callback handler. * */ -typedef void (*espi_callback_handler_t) (struct device *dev, +typedef void (*espi_callback_handler_t) (const struct device *dev, struct espi_callback *cb, struct espi_event espi_evt); @@ -321,39 +321,41 @@ struct espi_callback { * * (Internal use only.) */ -typedef int (*espi_api_config)(struct device *dev, struct espi_cfg *cfg); -typedef bool (*espi_api_get_channel_status)(struct device *dev, +typedef int (*espi_api_config)(const struct device *dev, struct espi_cfg *cfg); +typedef bool (*espi_api_get_channel_status)(const struct device *dev, enum espi_channel ch); /* Logical Channel 0 APIs */ -typedef int (*espi_api_read_request)(struct device *dev, +typedef int (*espi_api_read_request)(const struct device *dev, struct espi_request_packet *req); -typedef int (*espi_api_write_request)(struct device *dev, +typedef int (*espi_api_write_request)(const struct device *dev, struct espi_request_packet *req); -typedef int (*espi_api_lpc_read_request)(struct device *dev, - enum lpc_peripheral_opcode op, u32_t *data); -typedef int (*espi_api_lpc_write_request)(struct device *dev, - enum lpc_peripheral_opcode op, u32_t *data); +typedef int (*espi_api_lpc_read_request)(const struct device *dev, + enum lpc_peripheral_opcode op, + u32_t *data); +typedef int (*espi_api_lpc_write_request)(const struct device *dev, + enum lpc_peripheral_opcode op, + u32_t *data); /* Logical Channel 1 APIs */ -typedef int (*espi_api_send_vwire)(struct device *dev, +typedef int (*espi_api_send_vwire)(const struct device *dev, enum espi_vwire_signal vw, u8_t level); -typedef int (*espi_api_receive_vwire)(struct device *dev, +typedef int (*espi_api_receive_vwire)(const struct device *dev, enum espi_vwire_signal vw, u8_t *level); /* Logical Channel 2 APIs */ -typedef int (*espi_api_send_oob)(struct device *dev, +typedef int (*espi_api_send_oob)(const struct device *dev, struct espi_oob_packet *pckt); -typedef int (*espi_api_receive_oob)(struct device *dev, +typedef int (*espi_api_receive_oob)(const struct device *dev, struct espi_oob_packet *pckt); /* Logical Channel 3 APIs */ -typedef int (*espi_api_flash_read)(struct device *dev, +typedef int (*espi_api_flash_read)(const struct device *dev, struct espi_flash_packet *pckt); -typedef int (*espi_api_flash_write)(struct device *dev, +typedef int (*espi_api_flash_write)(const struct device *dev, struct espi_flash_packet *pckt); -typedef int (*espi_api_flash_erase)(struct device *dev, +typedef int (*espi_api_flash_erase)(const struct device *dev, struct espi_flash_packet *pckt); /* Callbacks and traffic intercept */ -typedef int (*espi_api_manage_callback)(struct device *dev, +typedef int (*espi_api_manage_callback)(const struct device *dev, struct espi_callback *callback, bool set); @@ -424,9 +426,9 @@ __subsystem struct espi_driver_api { * @retval -EINVAL invalid capabilities, failed to configure device. * @retval -ENOTSUP capability not supported by eSPI slave. */ -__syscall int espi_config(struct device *dev, struct espi_cfg *cfg); +__syscall int espi_config(const struct device *dev, struct espi_cfg *cfg); -static inline int z_impl_espi_config(struct device *dev, +static inline int z_impl_espi_config(const struct device *dev, struct espi_cfg *cfg) { const struct espi_driver_api *api = @@ -447,10 +449,10 @@ static inline int z_impl_espi_config(struct device *dev, * @retval true If eSPI channel is ready. * @retval false otherwise. */ -__syscall bool espi_get_channel_status(struct device *dev, +__syscall bool espi_get_channel_status(const struct device *dev, enum espi_channel ch); -static inline bool z_impl_espi_get_channel_status(struct device *dev, +static inline bool z_impl_espi_get_channel_status(const struct device *dev, enum espi_channel ch) { const struct espi_driver_api *api = @@ -473,10 +475,10 @@ static inline bool z_impl_espi_get_channel_status(struct device *dev, * low memory transactions are handled by controller hardware directly. * @retval -EIO General input / output error, failed to send over the bus. */ -__syscall int espi_read_request(struct device *dev, +__syscall int espi_read_request(const struct device *dev, struct espi_request_packet *req); -static inline int z_impl_espi_read_request(struct device *dev, +static inline int z_impl_espi_read_request(const struct device *dev, struct espi_request_packet *req) { const struct espi_driver_api *api = @@ -503,10 +505,10 @@ static inline int z_impl_espi_read_request(struct device *dev, * low memory transactions are handled by controller hardware directly. * @retval -EINVAL General input / output error, failed to send over the bus. */ -__syscall int espi_write_request(struct device *dev, +__syscall int espi_write_request(const struct device *dev, struct espi_request_packet *req); -static inline int z_impl_espi_write_request(struct device *dev, +static inline int z_impl_espi_write_request(const struct device *dev, struct espi_request_packet *req) { const struct espi_driver_api *api = @@ -535,10 +537,11 @@ static inline int z_impl_espi_write_request(struct device *dev, * @retval -ENOTSUP if eSPI peripheral is off or not supported. * @retval -EINVAL for unimplemented lpc opcode, but in range. */ -__syscall int espi_read_lpc_request(struct device *dev, - enum lpc_peripheral_opcode op, u32_t *data); +__syscall int espi_read_lpc_request(const struct device *dev, + enum lpc_peripheral_opcode op, + u32_t *data); -static inline int z_impl_espi_read_lpc_request(struct device *dev, +static inline int z_impl_espi_read_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -567,11 +570,11 @@ static inline int z_impl_espi_read_lpc_request(struct device *dev, * @retval -ENOTSUP if eSPI peripheral is off or not supported. * @retval -EINVAL for unimplemented lpc opcode, but in range. */ -__syscall int espi_write_lpc_request(struct device *dev, +__syscall int espi_write_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data); -static inline int z_impl_espi_write_lpc_request(struct device *dev, +static inline int z_impl_espi_write_lpc_request(const struct device *dev, enum lpc_peripheral_opcode op, u32_t *data) { @@ -598,11 +601,11 @@ static inline int z_impl_espi_write_lpc_request(struct device *dev, * @retval 0 If successful. * @retval -EIO General input / output error, failed to send over the bus. */ -__syscall int espi_send_vwire(struct device *dev, +__syscall int espi_send_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t level); -static inline int z_impl_espi_send_vwire(struct device *dev, +static inline int z_impl_espi_send_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t level) { @@ -624,11 +627,11 @@ static inline int z_impl_espi_send_vwire(struct device *dev, * * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_receive_vwire(struct device *dev, +__syscall int espi_receive_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t *level); -static inline int z_impl_espi_receive_vwire(struct device *dev, +static inline int z_impl_espi_receive_vwire(const struct device *dev, enum espi_vwire_signal signal, u8_t *level) { @@ -649,9 +652,10 @@ static inline int z_impl_espi_receive_vwire(struct device *dev, * * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_send_oob(struct device *dev, struct espi_oob_packet *pckt); +__syscall int espi_send_oob(const struct device *dev, + struct espi_oob_packet *pckt); -static inline int z_impl_espi_send_oob(struct device *dev, +static inline int z_impl_espi_send_oob(const struct device *dev, struct espi_oob_packet *pckt) { const struct espi_driver_api *api = @@ -675,10 +679,10 @@ static inline int z_impl_espi_send_oob(struct device *dev, * * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_receive_oob(struct device *dev, +__syscall int espi_receive_oob(const struct device *dev, struct espi_oob_packet *pckt); -static inline int z_impl_espi_receive_oob(struct device *dev, +static inline int z_impl_espi_receive_oob(const struct device *dev, struct espi_oob_packet *pckt) { const struct espi_driver_api *api = @@ -704,10 +708,10 @@ static inline int z_impl_espi_receive_oob(struct device *dev, * @retval -EBUSY eSPI flash channel is not ready or disabled by master. * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_read_flash(struct device *dev, +__syscall int espi_read_flash(const struct device *dev, struct espi_flash_packet *pckt); -static inline int z_impl_espi_read_flash(struct device *dev, +static inline int z_impl_espi_read_flash(const struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = @@ -733,10 +737,10 @@ static inline int z_impl_espi_read_flash(struct device *dev, * @retval -EBUSY eSPI flash channel is not ready or disabled by master. * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_write_flash(struct device *dev, +__syscall int espi_write_flash(const struct device *dev, struct espi_flash_packet *pckt); -static inline int z_impl_espi_write_flash(struct device *dev, +static inline int z_impl_espi_write_flash(const struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = @@ -762,10 +766,10 @@ static inline int z_impl_espi_write_flash(struct device *dev, * @retval -EBUSY eSPI flash channel is not ready or disabled by master. * @retval -EIO General input / output error, failed request to master. */ -__syscall int espi_flash_erase(struct device *dev, +__syscall int espi_flash_erase(const struct device *dev, struct espi_flash_packet *pckt); -static inline int z_impl_espi_flash_erase(struct device *dev, +static inline int z_impl_espi_flash_erase(const struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = @@ -869,7 +873,7 @@ static inline void espi_init_callback(struct espi_callback *callback, * * Note: enables to add as many callback as needed on the same device. */ -static inline int espi_add_callback(struct device *dev, +static inline int espi_add_callback(const struct device *dev, struct espi_callback *callback) { const struct espi_driver_api *api = @@ -898,7 +902,7 @@ static inline int espi_add_callback(struct device *dev, * Note: enables to remove as many callbacks as added through * espi_add_callback(). */ -static inline int espi_remove_callback(struct device *dev, +static inline int espi_remove_callback(const struct device *dev, struct espi_callback *callback) { const struct espi_driver_api *api = diff --git a/include/drivers/flash.h b/include/drivers/flash.h index 04d83b0c5897..86ce8773a814 100644 --- a/include/drivers/flash.h +++ b/include/drivers/flash.h @@ -36,12 +36,15 @@ struct flash_pages_layout { }; #endif /* CONFIG_FLASH_PAGE_LAYOUT */ -typedef int (*flash_api_read)(struct device *dev, off_t offset, void *data, +typedef int (*flash_api_read)(const struct device *dev, off_t offset, + void *data, size_t len); -typedef int (*flash_api_write)(struct device *dev, off_t offset, +typedef int (*flash_api_write)(const struct device *dev, off_t offset, const void *data, size_t len); -typedef int (*flash_api_erase)(struct device *dev, off_t offset, size_t size); -typedef int (*flash_api_write_protection)(struct device *dev, bool enable); +typedef int (*flash_api_erase)(const struct device *dev, off_t offset, + size_t size); +typedef int (*flash_api_write_protection)(const struct device *dev, + bool enable); #if defined(CONFIG_FLASH_PAGE_LAYOUT) /** @@ -65,7 +68,7 @@ typedef int (*flash_api_write_protection)(struct device *dev, bool enable); * @param layout The flash layout will be returned in this argument. * @param layout_size The number of elements in the returned layout. */ -typedef void (*flash_api_pages_layout)(struct device *dev, +typedef void (*flash_api_pages_layout)(const struct device *dev, const struct flash_pages_layout **layout, size_t *layout_size); #endif /* CONFIG_FLASH_PAGE_LAYOUT */ @@ -95,11 +98,12 @@ __subsystem struct flash_driver_api { * * @return 0 on success, negative errno code on fail. */ -__syscall int flash_read(struct device *dev, off_t offset, void *data, +__syscall int flash_read(const struct device *dev, off_t offset, void *data, size_t len); -static inline int z_impl_flash_read(struct device *dev, off_t offset, void *data, - size_t len) +static inline int z_impl_flash_read(const struct device *dev, off_t offset, + void *data, + size_t len) { const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api; @@ -120,11 +124,12 @@ static inline int z_impl_flash_read(struct device *dev, off_t offset, void *data * * @return 0 on success, negative errno code on fail. */ -__syscall int flash_write(struct device *dev, off_t offset, const void *data, +__syscall int flash_write(const struct device *dev, off_t offset, + const void *data, size_t len); -static inline int z_impl_flash_write(struct device *dev, off_t offset, - const void *data, size_t len) +static inline int z_impl_flash_write(const struct device *dev, off_t offset, + const void *data, size_t len) { const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api; @@ -153,10 +158,10 @@ static inline int z_impl_flash_write(struct device *dev, off_t offset, * @see flash_get_page_info_by_offs() * @see flash_get_page_info_by_idx() */ -__syscall int flash_erase(struct device *dev, off_t offset, size_t size); +__syscall int flash_erase(const struct device *dev, off_t offset, size_t size); -static inline int z_impl_flash_erase(struct device *dev, off_t offset, - size_t size) +static inline int z_impl_flash_erase(const struct device *dev, off_t offset, + size_t size) { const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api; @@ -197,10 +202,11 @@ static inline int z_impl_flash_erase(struct device *dev, off_t offset, * * @return 0 on success, negative errno code on fail. */ -__syscall int flash_write_protection_set(struct device *dev, bool enable); +__syscall int flash_write_protection_set(const struct device *dev, + bool enable); -static inline int z_impl_flash_write_protection_set(struct device *dev, - bool enable) +static inline int z_impl_flash_write_protection_set(const struct device *dev, + bool enable) { const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api; @@ -224,7 +230,8 @@ struct flash_pages_info { * * @return 0 on success, -EINVAL if page of the offset doesn't exist. */ -__syscall int flash_get_page_info_by_offs(struct device *dev, off_t offset, +__syscall int flash_get_page_info_by_offs(const struct device *dev, + off_t offset, struct flash_pages_info *info); /** @@ -236,7 +243,8 @@ __syscall int flash_get_page_info_by_offs(struct device *dev, off_t offset, * * @return 0 on success, -EINVAL if page of the index doesn't exist. */ -__syscall int flash_get_page_info_by_idx(struct device *dev, u32_t page_index, +__syscall int flash_get_page_info_by_idx(const struct device *dev, + u32_t page_index, struct flash_pages_info *info); /** @@ -246,7 +254,7 @@ __syscall int flash_get_page_info_by_idx(struct device *dev, u32_t page_index, * * @return Number of flash pages. */ -__syscall size_t flash_get_page_count(struct device *dev); +__syscall size_t flash_get_page_count(const struct device *dev); /** * @brief Callback type for iterating over flash pages present on a device. @@ -272,7 +280,8 @@ typedef bool (*flash_page_cb)(const struct flash_pages_info *info, void *data); * @param cb Callback to invoke for each flash page * @param data Private data for callback function */ -void flash_page_foreach(struct device *dev, flash_page_cb cb, void *data); +void flash_page_foreach(const struct device *dev, flash_page_cb cb, + void *data); #endif /* CONFIG_FLASH_PAGE_LAYOUT */ /** @@ -286,9 +295,9 @@ void flash_page_foreach(struct device *dev, flash_page_cb cb, void *data); * * @return write block size in bytes. */ -__syscall size_t flash_get_write_block_size(struct device *dev); +__syscall size_t flash_get_write_block_size(const struct device *dev); -static inline size_t z_impl_flash_get_write_block_size(struct device *dev) +static inline size_t z_impl_flash_get_write_block_size(const struct device *dev) { const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api; diff --git a/include/drivers/gna.h b/include/drivers/gna.h index 49d660cbc949..bf1bee08bd38 100644 --- a/include/drivers/gna.h +++ b/include/drivers/gna.h @@ -111,12 +111,16 @@ struct gna_inference_resp { */ typedef int (*gna_callback)(struct gna_inference_resp *result); -typedef int (*gna_api_config)(struct device *dev, struct gna_config *cfg); -typedef int (*gna_api_register)(struct device *dev, - struct gna_model_info *model, void **model_handle); -typedef int (*gna_api_deregister)(struct device *dev, void *model_handle); -typedef int (*gna_api_infer)(struct device *dev, struct gna_inference_req *req, - gna_callback callback); +typedef int (*gna_api_config)(const struct device *dev, + struct gna_config *cfg); +typedef int (*gna_api_register)(const struct device *dev, + struct gna_model_info *model, + void **model_handle); +typedef int (*gna_api_deregister)(const struct device *dev, + void *model_handle); +typedef int (*gna_api_infer)(const struct device *dev, + struct gna_inference_req *req, + gna_callback callback); struct gna_driver_api { gna_api_config configure; @@ -141,7 +145,8 @@ struct gna_driver_api { * @retval 0 If the configuration is successful * @retval A negative error code in case of a failure. */ -static inline int gna_configure(struct device *dev, struct gna_config *cfg) +static inline int gna_configure(const struct device *dev, + struct gna_config *cfg) { const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api; @@ -162,8 +167,9 @@ static inline int gna_configure(struct device *dev, struct gna_config *cfg) * @retval 0 If registration of the model is successful. * @retval A negative error code in case of a failure. */ -static inline int gna_register_model(struct device *dev, - struct gna_model_info *model, void **model_handle) +static inline int gna_register_model(const struct device *dev, + struct gna_model_info *model, + void **model_handle) { const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api; @@ -184,7 +190,7 @@ static inline int gna_register_model(struct device *dev, * @retval 0 If de-registration of the model is successful. * @retval A negative error code in case of a failure. */ -static inline int gna_deregister_model(struct device *dev, void *model) +static inline int gna_deregister_model(const struct device *dev, void *model) { const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api; @@ -206,8 +212,9 @@ static inline int gna_deregister_model(struct device *dev, void *model) * @retval 0 If the request is accepted * @retval A negative error code in case of a failure. */ -static inline int gna_infer(struct device *dev, struct gna_inference_req *req, - gna_callback callback) +static inline int gna_infer(const struct device *dev, + struct gna_inference_req *req, + gna_callback callback) { const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api; diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h index 773c16ecad58..05c3fbb73b33 100644 --- a/include/drivers/gpio.h +++ b/include/drivers/gpio.h @@ -486,7 +486,7 @@ struct gpio_callback; * CONTAINER_OF() if original struct gpio_callback is stored in * another private structure. */ -typedef void (*gpio_callback_handler_t)(struct device *port, +typedef void (*gpio_callback_handler_t)(const struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins); @@ -546,26 +546,34 @@ enum gpio_int_trig { }; __subsystem struct gpio_driver_api { - int (*pin_configure)(struct device *port, gpio_pin_t pin, gpio_flags_t flags); - int (*port_get_raw)(struct device *port, gpio_port_value_t *value); - int (*port_set_masked_raw)(struct device *port, gpio_port_pins_t mask, + int (*pin_configure)(const struct device *port, gpio_pin_t pin, + gpio_flags_t flags); + int (*port_get_raw)(const struct device *port, + gpio_port_value_t *value); + int (*port_set_masked_raw)(const struct device *port, + gpio_port_pins_t mask, gpio_port_value_t value); - int (*port_set_bits_raw)(struct device *port, gpio_port_pins_t pins); - int (*port_clear_bits_raw)(struct device *port, gpio_port_pins_t pins); - int (*port_toggle_bits)(struct device *port, gpio_port_pins_t pins); - int (*pin_interrupt_configure)(struct device *port, gpio_pin_t pin, + int (*port_set_bits_raw)(const struct device *port, + gpio_port_pins_t pins); + int (*port_clear_bits_raw)(const struct device *port, + gpio_port_pins_t pins); + int (*port_toggle_bits)(const struct device *port, + gpio_port_pins_t pins); + int (*pin_interrupt_configure)(const struct device *port, + gpio_pin_t pin, enum gpio_int_mode, enum gpio_int_trig); - int (*manage_callback)(struct device *port, struct gpio_callback *cb, + int (*manage_callback)(const struct device *port, + struct gpio_callback *cb, bool set); - int (*enable_callback)(struct device *port, gpio_pin_t pin); - int (*disable_callback)(struct device *port, gpio_pin_t pin); - u32_t (*get_pending_int)(struct device *dev); + int (*enable_callback)(const struct device *port, gpio_pin_t pin); + int (*disable_callback)(const struct device *port, gpio_pin_t pin); + u32_t (*get_pending_int)(const struct device *dev); }; -__syscall int gpio_config(struct device *port, gpio_pin_t pin, +__syscall int gpio_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags); -static inline int z_impl_gpio_config(struct device *port, +static inline int z_impl_gpio_config(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_driver_api *api = @@ -574,10 +582,10 @@ static inline int z_impl_gpio_config(struct device *port, return api->pin_configure(port, pin, flags); } -__syscall int gpio_enable_callback(struct device *port, gpio_pin_t pin); +__syscall int gpio_enable_callback(const struct device *port, gpio_pin_t pin); -static inline int z_impl_gpio_enable_callback(struct device *port, - gpio_pin_t pin) +static inline int z_impl_gpio_enable_callback(const struct device *port, + gpio_pin_t pin) { const struct gpio_driver_api *api = (const struct gpio_driver_api *)port->driver_api; @@ -595,10 +603,10 @@ static inline int z_impl_gpio_enable_callback(struct device *port, return api->enable_callback(port, pin); } -__syscall int gpio_disable_callback(struct device *port, gpio_pin_t pin); +__syscall int gpio_disable_callback(const struct device *port, gpio_pin_t pin); -static inline int z_impl_gpio_disable_callback(struct device *port, - gpio_pin_t pin) +static inline int z_impl_gpio_disable_callback(const struct device *port, + gpio_pin_t pin) { const struct gpio_driver_api *api = (const struct gpio_driver_api *)port->driver_api; @@ -639,11 +647,11 @@ static inline int z_impl_gpio_disable_callback(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_pin_interrupt_configure(struct device *port, +__syscall int gpio_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, gpio_flags_t flags); -static inline int z_impl_gpio_pin_interrupt_configure(struct device *port, +static inline int z_impl_gpio_pin_interrupt_configure(const struct device *port, gpio_pin_t pin, gpio_flags_t flags) { @@ -709,7 +717,8 @@ static inline int z_impl_gpio_pin_interrupt_configure(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_configure(struct device *port, gpio_pin_t pin, +static inline int gpio_pin_configure(const struct device *port, + gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_driver_api *api = @@ -786,9 +795,10 @@ static inline int gpio_pin_configure(struct device *port, gpio_pin_t pin, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_port_get_raw(struct device *port, gpio_port_value_t *value); +__syscall int gpio_port_get_raw(const struct device *port, + gpio_port_value_t *value); -static inline int z_impl_gpio_port_get_raw(struct device *port, +static inline int z_impl_gpio_port_get_raw(const struct device *port, gpio_port_value_t *value) { const struct gpio_driver_api *api = @@ -815,7 +825,8 @@ static inline int z_impl_gpio_port_get_raw(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_get(struct device *port, gpio_port_value_t *value) +static inline int gpio_port_get(const struct device *port, + gpio_port_value_t *value) { const struct gpio_driver_data *const data = (const struct gpio_driver_data *)port->driver_data; @@ -846,11 +857,13 @@ static inline int gpio_port_get(struct device *port, gpio_port_value_t *value) * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_port_set_masked_raw(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value); +__syscall int gpio_port_set_masked_raw(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value); -static inline int z_impl_gpio_port_set_masked_raw(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value) +static inline int z_impl_gpio_port_set_masked_raw(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value) { const struct gpio_driver_api *api = (const struct gpio_driver_api *)port->driver_api; @@ -878,8 +891,9 @@ static inline int z_impl_gpio_port_set_masked_raw(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_set_masked(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value) +static inline int gpio_port_set_masked(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value) { const struct gpio_driver_data *const data = (const struct gpio_driver_data *)port->driver_data; @@ -899,10 +913,10 @@ static inline int gpio_port_set_masked(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_port_set_bits_raw(struct device *port, +__syscall int gpio_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins); -static inline int z_impl_gpio_port_set_bits_raw(struct device *port, +static inline int z_impl_gpio_port_set_bits_raw(const struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = @@ -921,7 +935,8 @@ static inline int z_impl_gpio_port_set_bits_raw(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_set_bits(struct device *port, gpio_port_pins_t pins) +static inline int gpio_port_set_bits(const struct device *port, + gpio_port_pins_t pins) { return gpio_port_set_masked(port, pins, pins); } @@ -936,10 +951,10 @@ static inline int gpio_port_set_bits(struct device *port, gpio_port_pins_t pins) * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_port_clear_bits_raw(struct device *port, +__syscall int gpio_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins); -static inline int z_impl_gpio_port_clear_bits_raw(struct device *port, +static inline int z_impl_gpio_port_clear_bits_raw(const struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = @@ -958,7 +973,7 @@ static inline int z_impl_gpio_port_clear_bits_raw(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_clear_bits(struct device *port, +static inline int gpio_port_clear_bits(const struct device *port, gpio_port_pins_t pins) { return gpio_port_set_masked(port, pins, 0); @@ -974,9 +989,10 @@ static inline int gpio_port_clear_bits(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -__syscall int gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins); +__syscall int gpio_port_toggle_bits(const struct device *port, + gpio_port_pins_t pins); -static inline int z_impl_gpio_port_toggle_bits(struct device *port, +static inline int z_impl_gpio_port_toggle_bits(const struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = @@ -996,8 +1012,9 @@ static inline int z_impl_gpio_port_toggle_bits(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_set_clr_bits_raw(struct device *port, - gpio_port_pins_t set_pins, gpio_port_pins_t clear_pins) +static inline int gpio_port_set_clr_bits_raw(const struct device *port, + gpio_port_pins_t set_pins, + gpio_port_pins_t clear_pins) { __ASSERT((set_pins & clear_pins) == 0, "Set and Clear pins overlap"); @@ -1015,8 +1032,9 @@ static inline int gpio_port_set_clr_bits_raw(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_port_set_clr_bits(struct device *port, - gpio_port_pins_t set_pins, gpio_port_pins_t clear_pins) +static inline int gpio_port_set_clr_bits(const struct device *port, + gpio_port_pins_t set_pins, + gpio_port_pins_t clear_pins) { __ASSERT((set_pins & clear_pins) == 0, "Set and Clear pins overlap"); @@ -1038,7 +1056,7 @@ static inline int gpio_port_set_clr_bits(struct device *port, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_get_raw(struct device *port, gpio_pin_t pin) +static inline int gpio_pin_get_raw(const struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config_info; @@ -1076,7 +1094,7 @@ static inline int gpio_pin_get_raw(struct device *port, gpio_pin_t pin) * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_get(struct device *port, gpio_pin_t pin) +static inline int gpio_pin_get(const struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config_info; @@ -1110,7 +1128,7 @@ static inline int gpio_pin_get(struct device *port, gpio_pin_t pin) * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_set_raw(struct device *port, gpio_pin_t pin, +static inline int gpio_pin_set_raw(const struct device *port, gpio_pin_t pin, int value) { const struct gpio_driver_config *const cfg = @@ -1151,7 +1169,8 @@ static inline int gpio_pin_set_raw(struct device *port, gpio_pin_t pin, * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_set(struct device *port, gpio_pin_t pin, int value) +static inline int gpio_pin_set(const struct device *port, gpio_pin_t pin, + int value) { const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config_info; @@ -1179,7 +1198,7 @@ static inline int gpio_pin_set(struct device *port, gpio_pin_t pin, int value) * @retval -EIO I/O error when accessing an external GPIO chip. * @retval -EWOULDBLOCK if operation would block. */ -static inline int gpio_pin_toggle(struct device *port, gpio_pin_t pin) +static inline int gpio_pin_toggle(const struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config_info; @@ -1203,7 +1222,7 @@ static inline int gpio_pin_toggle(struct device *port, gpio_pin_t pin) * drivers. */ /* Deprecated in 2.2 release */ -__deprecated static inline int gpio_pin_write(struct device *port, +__deprecated static inline int gpio_pin_write(const struct device *port, gpio_pin_t pin, u32_t value) { @@ -1225,7 +1244,7 @@ __deprecated static inline int gpio_pin_write(struct device *port, * drivers. */ /* Deprecated in 2.2 release */ -__deprecated static inline int gpio_pin_read(struct device *port, +__deprecated static inline int gpio_pin_read(const struct device *port, gpio_pin_t pin, u32_t *value) { @@ -1267,7 +1286,7 @@ static inline void gpio_init_callback(struct gpio_callback *callback, * * Note: enables to add as many callback as needed on the same port. */ -static inline int gpio_add_callback(struct device *port, +static inline int gpio_add_callback(const struct device *port, struct gpio_callback *callback) { const struct gpio_driver_api *api = @@ -1296,7 +1315,7 @@ static inline int gpio_add_callback(struct device *port, * Note: enables to remove as many callbacks as added through * gpio_add_callback(). */ -static inline int gpio_remove_callback(struct device *port, +static inline int gpio_remove_callback(const struct device *port, struct gpio_callback *callback) { const struct gpio_driver_api *api = @@ -1323,7 +1342,7 @@ static inline int gpio_remove_callback(struct device *port, * interrupt configuration flags such as ``GPIO_INT_EDGE_TO_ACTIVE``. */ /* Deprecated in 2.2 release */ -__deprecated static inline int gpio_pin_enable_callback(struct device *port, +__deprecated static inline int gpio_pin_enable_callback(const struct device *port, gpio_pin_t pin) { return gpio_enable_callback(port, pin); @@ -1339,7 +1358,7 @@ __deprecated static inline int gpio_pin_enable_callback(struct device *port, * ``GPIO_INT_DISABLE``. */ /* Deprecated in 2.2 release */ -__deprecated static inline int gpio_pin_disable_callback(struct device *port, +__deprecated static inline int gpio_pin_disable_callback(const struct device *port, gpio_pin_t pin) { return gpio_disable_callback(port, pin); @@ -1358,9 +1377,9 @@ __deprecated static inline int gpio_pin_disable_callback(struct device *port, * @retval status != 0 if at least one gpio interrupt is pending. * @retval 0 if no gpio interrupt is pending. */ -__syscall int gpio_get_pending_int(struct device *dev); +__syscall int gpio_get_pending_int(const struct device *dev); -static inline int z_impl_gpio_get_pending_int(struct device *dev) +static inline int z_impl_gpio_get_pending_int(const struct device *dev) { const struct gpio_driver_api *api = (const struct gpio_driver_api *)dev->driver_api; diff --git a/include/drivers/gpio/gpio_mmio32.h b/include/drivers/gpio/gpio_mmio32.h index 9135c27a093b..d1b068f156b1 100644 --- a/include/drivers/gpio/gpio_mmio32.h +++ b/include/drivers/gpio/gpio_mmio32.h @@ -11,6 +11,8 @@ #include #include +extern const struct gpio_driver_api gpio_mmio32_api; + struct gpio_mmio32_config { /* gpio_driver_config needs to be first */ struct gpio_driver_config common; @@ -24,7 +26,7 @@ struct gpio_mmio32_context { const struct gpio_mmio32_config *config; }; -int gpio_mmio32_init(struct device *dev); +int gpio_mmio32_init(const struct device *dev); #ifdef CONFIG_GPIO_MMIO32 @@ -53,11 +55,12 @@ static const struct gpio_mmio32_config _dev_name##_dev_cfg = { \ .mask = _mask, \ }; \ \ -DEVICE_INIT(_dev_name, _drv_name, \ - &gpio_mmio32_init, \ - &_dev_name##_dev_data, \ - &_dev_name##_dev_cfg, \ - PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE) +DEVICE_AND_API_INIT(_dev_name, _drv_name, \ + &gpio_mmio32_init, \ + &_dev_name##_dev_data, \ + &_dev_name##_dev_cfg, \ + PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ + &gpio_mmio32_api) #else /* CONFIG_GPIO_MMIO32 */ diff --git a/include/drivers/i2c.h b/include/drivers/i2c.h index e6d36ba54c7a..690ca6630b31 100644 --- a/include/drivers/i2c.h +++ b/include/drivers/i2c.h @@ -163,17 +163,17 @@ struct i2c_slave_config { const struct i2c_slave_callbacks *callbacks; }; -typedef int (*i2c_api_configure_t)(struct device *dev, +typedef int (*i2c_api_configure_t)(const struct device *dev, u32_t dev_config); -typedef int (*i2c_api_full_io_t)(struct device *dev, +typedef int (*i2c_api_full_io_t)(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr); -typedef int (*i2c_api_slave_register_t)(struct device *dev, +typedef int (*i2c_api_slave_register_t)(const struct device *dev, struct i2c_slave_config *cfg); -typedef int (*i2c_api_slave_unregister_t)(struct device *dev, +typedef int (*i2c_api_slave_unregister_t)(const struct device *dev, struct i2c_slave_config *cfg); -typedef int (*i2c_api_recover_bus_t)(struct device *dev); +typedef int (*i2c_api_recover_bus_t)(const struct device *dev); __subsystem struct i2c_driver_api { i2c_api_configure_t configure; @@ -183,8 +183,8 @@ __subsystem struct i2c_driver_api { i2c_api_recover_bus_t recover_bus; }; -typedef int (*i2c_slave_api_register_t)(struct device *dev); -typedef int (*i2c_slave_api_unregister_t)(struct device *dev); +typedef int (*i2c_slave_api_register_t)(const struct device *dev); +typedef int (*i2c_slave_api_unregister_t)(const struct device *dev); struct i2c_slave_driver_api { i2c_slave_api_register_t driver_register; @@ -205,9 +205,10 @@ struct i2c_slave_driver_api { * @retval 0 If successful. * @retval -EIO General input / output error, failed to configure device. */ -__syscall int i2c_configure(struct device *dev, u32_t dev_config); +__syscall int i2c_configure(const struct device *dev, u32_t dev_config); -static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config) +static inline int z_impl_i2c_configure(const struct device *dev, + u32_t dev_config) { const struct i2c_driver_api *api = (const struct i2c_driver_api *)dev->driver_api; @@ -241,13 +242,13 @@ static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config) * @retval 0 If successful. * @retval -EIO General input / output error. */ -__syscall int i2c_transfer(struct device *dev, +__syscall int i2c_transfer(const struct device *dev, struct i2c_msg *msgs, u8_t num_msgs, u16_t addr); -static inline int z_impl_i2c_transfer(struct device *dev, - struct i2c_msg *msgs, u8_t num_msgs, - u16_t addr) +static inline int z_impl_i2c_transfer(const struct device *dev, + struct i2c_msg *msgs, u8_t num_msgs, + u16_t addr) { const struct i2c_driver_api *api = (const struct i2c_driver_api *)dev->driver_api; @@ -266,9 +267,9 @@ static inline int z_impl_i2c_transfer(struct device *dev, * @retval -EIO General input / output error. * @retval -ENOTSUP If bus recovery is not supported */ -__syscall int i2c_recover_bus(struct device *dev); +__syscall int i2c_recover_bus(const struct device *dev); -static inline int z_impl_i2c_recover_bus(struct device *dev) +static inline int z_impl_i2c_recover_bus(const struct device *dev) { const struct i2c_driver_api *api = (const struct i2c_driver_api *)dev->driver_api; @@ -303,7 +304,7 @@ static inline int z_impl_i2c_recover_bus(struct device *dev) * @retval -EIO General input / output error. * @retval -ENOTSUP If slave mode is not supported */ -static inline int i2c_slave_register(struct device *dev, +static inline int i2c_slave_register(const struct device *dev, struct i2c_slave_config *cfg) { const struct i2c_driver_api *api = @@ -331,7 +332,7 @@ static inline int i2c_slave_register(struct device *dev, * @retval -EINVAL If parameters are invalid * @retval -ENOTSUP If slave mode is not supported */ -static inline int i2c_slave_unregister(struct device *dev, +static inline int i2c_slave_unregister(const struct device *dev, struct i2c_slave_config *cfg) { const struct i2c_driver_api *api = @@ -356,9 +357,9 @@ static inline int i2c_slave_unregister(struct device *dev, * @retval -EINVAL If parameters are invalid * @retval -EIO General input / output error. */ -__syscall int i2c_slave_driver_register(struct device *dev); +__syscall int i2c_slave_driver_register(const struct device *dev); -static inline int z_impl_i2c_slave_driver_register(struct device *dev) +static inline int z_impl_i2c_slave_driver_register(const struct device *dev) { const struct i2c_slave_driver_api *api = (const struct i2c_slave_driver_api *)dev->driver_api; @@ -378,9 +379,9 @@ static inline int z_impl_i2c_slave_driver_register(struct device *dev) * @retval 0 Is successful * @retval -EINVAL If parameters are invalid */ -__syscall int i2c_slave_driver_unregister(struct device *dev); +__syscall int i2c_slave_driver_unregister(const struct device *dev); -static inline int z_impl_i2c_slave_driver_unregister(struct device *dev) +static inline int z_impl_i2c_slave_driver_unregister(const struct device *dev) { const struct i2c_slave_driver_api *api = (const struct i2c_slave_driver_api *)dev->driver_api; @@ -405,7 +406,7 @@ static inline int z_impl_i2c_slave_driver_unregister(struct device *dev) * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_write(struct device *dev, const u8_t *buf, +static inline int i2c_write(const struct device *dev, const u8_t *buf, u32_t num_bytes, u16_t addr) { struct i2c_msg msg; @@ -430,7 +431,7 @@ static inline int i2c_write(struct device *dev, const u8_t *buf, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_read(struct device *dev, u8_t *buf, +static inline int i2c_read(const struct device *dev, u8_t *buf, u32_t num_bytes, u16_t addr) { struct i2c_msg msg; @@ -459,7 +460,7 @@ static inline int i2c_read(struct device *dev, u8_t *buf, * @retval 0 if successful * @retval negative on error. */ -static inline int i2c_write_read(struct device *dev, u16_t addr, +static inline int i2c_write_read(const struct device *dev, u16_t addr, const void *write_buf, size_t num_write, void *read_buf, size_t num_read) { @@ -493,7 +494,7 @@ static inline int i2c_write_read(struct device *dev, u16_t addr, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_burst_read(struct device *dev, +static inline int i2c_burst_read(const struct device *dev, u16_t dev_addr, u8_t start_addr, u8_t *buf, @@ -524,7 +525,7 @@ static inline int i2c_burst_read(struct device *dev, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_burst_write(struct device *dev, +static inline int i2c_burst_write(const struct device *dev, u16_t dev_addr, u8_t start_addr, const u8_t *buf, @@ -557,7 +558,7 @@ static inline int i2c_burst_write(struct device *dev, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr, +static inline int i2c_reg_read_byte(const struct device *dev, u16_t dev_addr, u8_t reg_addr, u8_t *value) { return i2c_write_read(dev, dev_addr, @@ -582,7 +583,7 @@ static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr, +static inline int i2c_reg_write_byte(const struct device *dev, u16_t dev_addr, u8_t reg_addr, u8_t value) { u8_t tx_buf[2] = {reg_addr, value}; @@ -608,7 +609,7 @@ static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr, * @retval 0 If successful. * @retval -EIO General input / output error. */ -static inline int i2c_reg_update_byte(struct device *dev, u8_t dev_addr, +static inline int i2c_reg_update_byte(const struct device *dev, u8_t dev_addr, u8_t reg_addr, u8_t mask, u8_t value) { diff --git a/include/drivers/i2c/slave/eeprom.h b/include/drivers/i2c/slave/eeprom.h index d90bf9205465..d7215a8d175b 100644 --- a/include/drivers/i2c/slave/eeprom.h +++ b/include/drivers/i2c/slave/eeprom.h @@ -29,7 +29,7 @@ * @retval 0 If successful. * @retval -EINVAL Invalid data size */ -int eeprom_slave_program(struct device *dev, u8_t *eeprom_data, +int eeprom_slave_program(const struct device *dev, u8_t *eeprom_data, unsigned int length); /** @@ -42,7 +42,7 @@ int eeprom_slave_program(struct device *dev, u8_t *eeprom_data, * @retval 0 If successful. * @retval -EINVAL Invalid data pointer or offset */ -int eeprom_slave_read(struct device *dev, u8_t *eeprom_data, +int eeprom_slave_read(const struct device *dev, u8_t *eeprom_data, unsigned int offset); /** diff --git a/include/drivers/i2s.h b/include/drivers/i2s.h index b15b1d2c8f43..6e3d013d77ce 100644 --- a/include/drivers/i2s.h +++ b/include/drivers/i2s.h @@ -313,13 +313,13 @@ struct i2s_config { * For internal use only, skip these in public documentation. */ __subsystem struct i2s_driver_api { - int (*configure)(struct device *dev, enum i2s_dir dir, + int (*configure)(const struct device *dev, enum i2s_dir dir, struct i2s_config *cfg); - struct i2s_config *(*config_get)(struct device *dev, + struct i2s_config *(*config_get)(const struct device *dev, enum i2s_dir dir); - int (*read)(struct device *dev, void **mem_block, size_t *size); - int (*write)(struct device *dev, void *mem_block, size_t size); - int (*trigger)(struct device *dev, enum i2s_dir dir, + int (*read)(const struct device *dev, void **mem_block, size_t *size); + int (*write)(const struct device *dev, void *mem_block, size_t size); + int (*trigger)(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd); }; /** @@ -345,11 +345,12 @@ __subsystem struct i2s_driver_api { * @retval 0 If successful. * @retval -EINVAL Invalid argument. */ -__syscall int i2s_configure(struct device *dev, enum i2s_dir dir, +__syscall int i2s_configure(const struct device *dev, enum i2s_dir dir, struct i2s_config *cfg); -static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir, - struct i2s_config *cfg) +static inline int z_impl_i2s_configure(const struct device *dev, + enum i2s_dir dir, + struct i2s_config *cfg) { const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api; @@ -365,7 +366,7 @@ static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir, * @retval Pointer to the structure containing configuration parameters, * or NULL if un-configured */ -static inline struct i2s_config *i2s_config_get(struct device *dev, +static inline struct i2s_config *i2s_config_get(const struct device *dev, enum i2s_dir dir) { const struct i2s_driver_api *api = @@ -405,7 +406,7 @@ static inline struct i2s_config *i2s_config_get(struct device *dev, * @retval -EBUSY Returned without waiting. * @retval -EAGAIN Waiting period timed out. */ -static inline int i2s_read(struct device *dev, void **mem_block, +static inline int i2s_read(const struct device *dev, void **mem_block, size_t *size) { const struct i2s_driver_api *api = @@ -438,7 +439,7 @@ static inline int i2s_read(struct device *dev, void **mem_block, * @retval -EBUSY Returned without waiting. * @retval -EAGAIN Waiting period timed out. */ -__syscall int i2s_buf_read(struct device *dev, void *buf, size_t *size); +__syscall int i2s_buf_read(const struct device *dev, void *buf, size_t *size); /** * @brief Write data to the TX queue. @@ -466,7 +467,8 @@ __syscall int i2s_buf_read(struct device *dev, void *buf, size_t *size); * @retval -EBUSY Returned without waiting. * @retval -EAGAIN Waiting period timed out. */ -static inline int i2s_write(struct device *dev, void *mem_block, size_t size) +static inline int i2s_write(const struct device *dev, void *mem_block, + size_t size) { const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api; @@ -493,7 +495,7 @@ static inline int i2s_write(struct device *dev, void *mem_block, size_t size) * @retval -ENOMEM No memory in TX slab queue. * @retval -EINVAL Size parameter larger than TX queue memory block. */ -__syscall int i2s_buf_write(struct device *dev, void *buf, size_t size); +__syscall int i2s_buf_write(const struct device *dev, void *buf, size_t size); /** * @brief Send a trigger command. @@ -508,11 +510,12 @@ __syscall int i2s_buf_write(struct device *dev, void *buf, size_t size); * channel cannot be allocated. * @retval -ENOMEM RX/TX memory block not available. */ -__syscall int i2s_trigger(struct device *dev, enum i2s_dir dir, +__syscall int i2s_trigger(const struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd); -static inline int z_impl_i2s_trigger(struct device *dev, enum i2s_dir dir, - enum i2s_trigger_cmd cmd) +static inline int z_impl_i2s_trigger(const struct device *dev, + enum i2s_dir dir, + enum i2s_trigger_cmd cmd) { const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api; diff --git a/include/drivers/ipm.h b/include/drivers/ipm.h index 2ef49563295a..8cb3ffe4ab91 100644 --- a/include/drivers/ipm.h +++ b/include/drivers/ipm.h @@ -50,7 +50,7 @@ typedef void (*ipm_callback_t)(void *context, u32_t id, volatile void *data); * * See @a ipm_send() for argument definitions. */ -typedef int (*ipm_send_t)(struct device *ipmdev, int wait, u32_t id, +typedef int (*ipm_send_t)(const struct device *ipmdev, int wait, u32_t id, const void *data, int size); /** * @typedef ipm_max_data_size_get_t @@ -58,7 +58,7 @@ typedef int (*ipm_send_t)(struct device *ipmdev, int wait, u32_t id, * * See @a ipm_max_data_size_get() for argument definitions. */ -typedef int (*ipm_max_data_size_get_t)(struct device *ipmdev); +typedef int (*ipm_max_data_size_get_t)(const struct device *ipmdev); /** * @typedef ipm_max_id_val_get_t @@ -66,7 +66,7 @@ typedef int (*ipm_max_data_size_get_t)(struct device *ipmdev); * * See @a ipm_max_id_val_get() for argument definitions. */ -typedef u32_t (*ipm_max_id_val_get_t)(struct device *ipmdev); +typedef u32_t (*ipm_max_id_val_get_t)(const struct device *ipmdev); /** * @typedef ipm_register_callback_t @@ -74,7 +74,8 @@ typedef u32_t (*ipm_max_id_val_get_t)(struct device *ipmdev); * * See @a ipm_register_callback() for argument definitions. */ -typedef void (*ipm_register_callback_t)(struct device *port, ipm_callback_t cb, +typedef void (*ipm_register_callback_t)(const struct device *port, + ipm_callback_t cb, void *cb_context); /** @@ -83,7 +84,7 @@ typedef void (*ipm_register_callback_t)(struct device *port, ipm_callback_t cb, * * See @a ipm_set_enabled() for argument definitions. */ -typedef int (*ipm_set_enabled_t)(struct device *ipmdev, int enable); +typedef int (*ipm_set_enabled_t)(const struct device *ipmdev, int enable); __subsystem struct ipm_driver_api { ipm_send_t send; @@ -128,11 +129,12 @@ __subsystem struct ipm_driver_api { * or the device isn't an outbound IPM channel. * @retval 0 On success. */ -__syscall int ipm_send(struct device *ipmdev, int wait, u32_t id, +__syscall int ipm_send(const struct device *ipmdev, int wait, u32_t id, const void *data, int size); -static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id, - const void *data, int size) +static inline int z_impl_ipm_send(const struct device *ipmdev, int wait, + u32_t id, + const void *data, int size) { const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api; @@ -148,7 +150,7 @@ static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id, * @param context Application-specific context pointer which will be passed * to the callback function when executed. */ -static inline void ipm_register_callback(struct device *ipmdev, +static inline void ipm_register_callback(const struct device *ipmdev, ipm_callback_t cb, void *context) { const struct ipm_driver_api *api = @@ -167,9 +169,9 @@ static inline void ipm_register_callback(struct device *ipmdev, * * @return Maximum possible size of a message in bytes. */ -__syscall int ipm_max_data_size_get(struct device *ipmdev); +__syscall int ipm_max_data_size_get(const struct device *ipmdev); -static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev) +static inline int z_impl_ipm_max_data_size_get(const struct device *ipmdev) { const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api; @@ -188,9 +190,9 @@ static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev) * * @return Maximum possible value of a message ID. */ -__syscall u32_t ipm_max_id_val_get(struct device *ipmdev); +__syscall u32_t ipm_max_id_val_get(const struct device *ipmdev); -static inline u32_t z_impl_ipm_max_id_val_get(struct device *ipmdev) +static inline u32_t z_impl_ipm_max_id_val_get(const struct device *ipmdev) { const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api; @@ -207,9 +209,10 @@ static inline u32_t z_impl_ipm_max_id_val_get(struct device *ipmdev) * @retval 0 On success. * @retval -EINVAL If it isn't an inbound channel. */ -__syscall int ipm_set_enabled(struct device *ipmdev, int enable); +__syscall int ipm_set_enabled(const struct device *ipmdev, int enable); -static inline int z_impl_ipm_set_enabled(struct device *ipmdev, int enable) +static inline int z_impl_ipm_set_enabled(const struct device *ipmdev, + int enable) { const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api; diff --git a/include/drivers/kscan.h b/include/drivers/kscan.h index 5b9203546697..e3fddff5ad99 100644 --- a/include/drivers/kscan.h +++ b/include/drivers/kscan.h @@ -41,7 +41,8 @@ extern "C" { * @param row Describes row change. * @param pressed Describes the kind of key event. */ -typedef void (*kscan_callback_t)(struct device *dev, u32_t row, u32_t column, +typedef void (*kscan_callback_t)(const struct device *dev, u32_t row, + u32_t column, bool pressed); /** @@ -51,10 +52,10 @@ typedef void (*kscan_callback_t)(struct device *dev, u32_t row, u32_t column, * * (Internal use only.) */ -typedef int (*kscan_config_t)(struct device *dev, - kscan_callback_t callback); -typedef int (*kscan_disable_callback_t)(struct device *dev); -typedef int (*kscan_enable_callback_t)(struct device *dev); +typedef int (*kscan_config_t)(const struct device *dev, + kscan_callback_t callback); +typedef int (*kscan_disable_callback_t)(const struct device *dev); +typedef int (*kscan_enable_callback_t)(const struct device *dev); __subsystem struct kscan_driver_api { kscan_config_t config; @@ -75,10 +76,10 @@ __subsystem struct kscan_driver_api { * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int kscan_config(struct device *dev, +__syscall int kscan_config(const struct device *dev, kscan_callback_t callback); -static inline int z_impl_kscan_config(struct device *dev, +static inline int z_impl_kscan_config(const struct device *dev, kscan_callback_t callback) { const struct kscan_driver_api *api = @@ -93,9 +94,9 @@ static inline int z_impl_kscan_config(struct device *dev, * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int kscan_enable_callback(struct device *dev); +__syscall int kscan_enable_callback(const struct device *dev); -static inline int z_impl_kscan_enable_callback(struct device *dev) +static inline int z_impl_kscan_enable_callback(const struct device *dev) { const struct kscan_driver_api *api = (const struct kscan_driver_api *)dev->driver_api; @@ -114,9 +115,9 @@ static inline int z_impl_kscan_enable_callback(struct device *dev) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int kscan_disable_callback(struct device *dev); +__syscall int kscan_disable_callback(const struct device *dev); -static inline int z_impl_kscan_disable_callback(struct device *dev) +static inline int z_impl_kscan_disable_callback(const struct device *dev) { const struct kscan_driver_api *api = (const struct kscan_driver_api *)dev->driver_api; diff --git a/include/drivers/led.h b/include/drivers/led.h index 0cc318d3093c..5fc9ee023196 100644 --- a/include/drivers/led.h +++ b/include/drivers/led.h @@ -28,7 +28,7 @@ * * @see led_blink() for argument descriptions. */ -typedef int (*led_api_blink)(struct device *dev, u32_t led, +typedef int (*led_api_blink)(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off); /** @@ -37,7 +37,7 @@ typedef int (*led_api_blink)(struct device *dev, u32_t led, * * @see led_set_brightness() for argument descriptions. */ -typedef int (*led_api_set_brightness)(struct device *dev, u32_t led, +typedef int (*led_api_set_brightness)(const struct device *dev, u32_t led, u8_t value); /** * @typedef led_api_on() @@ -45,7 +45,7 @@ typedef int (*led_api_set_brightness)(struct device *dev, u32_t led, * * @see led_on() for argument descriptions. */ -typedef int (*led_api_on)(struct device *dev, u32_t led); +typedef int (*led_api_on)(const struct device *dev, u32_t led); /** * @typedef led_api_off() @@ -53,7 +53,7 @@ typedef int (*led_api_on)(struct device *dev, u32_t led); * * @see led_off() for argument descriptions. */ -typedef int (*led_api_off)(struct device *dev, u32_t led); +typedef int (*led_api_off)(const struct device *dev, u32_t led); /** * @brief LED driver API @@ -78,11 +78,11 @@ __subsystem struct led_driver_api { * @param delay_off Time period (in milliseconds) an LED should be OFF * @return 0 on success, negative on error */ -__syscall int led_blink(struct device *dev, u32_t led, +__syscall int led_blink(const struct device *dev, u32_t led, u32_t delay_on, u32_t delay_off); -static inline int z_impl_led_blink(struct device *dev, u32_t led, - u32_t delay_on, u32_t delay_off) +static inline int z_impl_led_blink(const struct device *dev, u32_t led, + u32_t delay_on, u32_t delay_off) { const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api; @@ -101,11 +101,12 @@ static inline int z_impl_led_blink(struct device *dev, u32_t led, * @param value Brightness value to set in percent * @return 0 on success, negative on error */ -__syscall int led_set_brightness(struct device *dev, u32_t led, +__syscall int led_set_brightness(const struct device *dev, u32_t led, u8_t value); -static inline int z_impl_led_set_brightness(struct device *dev, u32_t led, - u8_t value) +static inline int z_impl_led_set_brightness(const struct device *dev, + u32_t led, + u8_t value) { const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api; @@ -122,9 +123,9 @@ static inline int z_impl_led_set_brightness(struct device *dev, u32_t led, * @param led LED channel/pin * @return 0 on success, negative on error */ -__syscall int led_on(struct device *dev, u32_t led); +__syscall int led_on(const struct device *dev, u32_t led); -static inline int z_impl_led_on(struct device *dev, u32_t led) +static inline int z_impl_led_on(const struct device *dev, u32_t led) { const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api; @@ -141,9 +142,9 @@ static inline int z_impl_led_on(struct device *dev, u32_t led) * @param led LED channel/pin * @return 0 on success, negative on error */ -__syscall int led_off(struct device *dev, u32_t led); +__syscall int led_off(const struct device *dev, u32_t led); -static inline int z_impl_led_off(struct device *dev, u32_t led) +static inline int z_impl_led_off(const struct device *dev, u32_t led) { const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api; diff --git a/include/drivers/led/ht16k33.h b/include/drivers/led/ht16k33.h index 832db3f900fe..f8f59688d3be 100644 --- a/include/drivers/led/ht16k33.h +++ b/include/drivers/led/ht16k33.h @@ -22,8 +22,8 @@ * child device (0, 1, or 2). * @return 0 if successful, negative errno code on failure. */ -int ht16k33_register_keyscan_device(struct device *parent, - struct device *child, +int ht16k33_register_keyscan_device(const struct device *parent, + const struct device *child, u8_t keyscan_idx); /** @@ -32,7 +32,7 @@ int ht16k33_register_keyscan_device(struct device *parent, * @param parent HT16K33 parent device. * @return status != 0 if an interrupt is pending. */ -u32_t ht16k33_get_pending_int(struct device *parent); +u32_t ht16k33_get_pending_int(const struct device *parent); /** * Dispatch keyscan row data from a keyscan event to be handled by a @@ -41,7 +41,7 @@ u32_t ht16k33_get_pending_int(struct device *parent); * @param child HT16K33 keyscan child device. * @param keys Bitmask of key state for the row. */ -void ht16k33_process_keyscan_row_data(struct device *child, +void ht16k33_process_keyscan_row_data(const struct device *child, u32_t keys); #endif /* ZEPHYR_INCLUDE_DRIVERS_LED_HT16K33_H_ */ diff --git a/include/drivers/led_strip.h b/include/drivers/led_strip.h index 7824bad739f5..cf97bb6b4bfe 100644 --- a/include/drivers/led_strip.h +++ b/include/drivers/led_strip.h @@ -57,7 +57,8 @@ struct led_rgb { * * @see led_strip_update_rgb() for argument descriptions. */ -typedef int (*led_api_update_rgb)(struct device *dev, struct led_rgb *pixels, +typedef int (*led_api_update_rgb)(const struct device *dev, + struct led_rgb *pixels, size_t num_pixels); /** @@ -66,7 +67,8 @@ typedef int (*led_api_update_rgb)(struct device *dev, struct led_rgb *pixels, * * @see led_strip_update_channels() for argument descriptions. */ -typedef int (*led_api_update_channels)(struct device *dev, u8_t *channels, +typedef int (*led_api_update_channels)(const struct device *dev, + u8_t *channels, size_t num_channels); /** @@ -94,7 +96,7 @@ struct led_strip_driver_api { * @return 0 on success, negative on error * @warning May overwrite @a pixels */ -static inline int led_strip_update_rgb(struct device *dev, +static inline int led_strip_update_rgb(const struct device *dev, struct led_rgb *pixels, size_t num_pixels) { const struct led_strip_driver_api *api = @@ -120,7 +122,7 @@ static inline int led_strip_update_rgb(struct device *dev, * @return 0 on success, negative on error * @warning May overwrite @a channels */ -static inline int led_strip_update_channels(struct device *dev, +static inline int led_strip_update_channels(const struct device *dev, u8_t *channels, size_t num_channels) { const struct led_strip_driver_api *api = diff --git a/include/drivers/lora.h b/include/drivers/lora.h index b2cb016f7311..40bf0bf95543 100644 --- a/include/drivers/lora.h +++ b/include/drivers/lora.h @@ -54,7 +54,7 @@ struct lora_modem_config { * * @see lora_config() for argument descriptions. */ -typedef int (*lora_api_config)(struct device *dev, +typedef int (*lora_api_config)(const struct device *dev, struct lora_modem_config *config); /** @@ -63,7 +63,7 @@ typedef int (*lora_api_config)(struct device *dev, * * @see lora_send() for argument descriptions. */ -typedef int (*lora_api_send)(struct device *dev, +typedef int (*lora_api_send)(const struct device *dev, u8_t *data, u32_t data_len); /** @@ -72,7 +72,7 @@ typedef int (*lora_api_send)(struct device *dev, * * @see lora_recv() for argument descriptions. */ -typedef int (*lora_api_recv)(struct device *dev, u8_t *data, u8_t size, +typedef int (*lora_api_recv)(const struct device *dev, u8_t *data, u8_t size, k_timeout_t timeout, s16_t *rssi, s8_t *snr); /** @@ -81,7 +81,7 @@ typedef int (*lora_api_recv)(struct device *dev, u8_t *data, u8_t size, * * @see lora_test_cw() for argument descriptions. */ -typedef int (*lora_api_test_cw)(struct device *dev, u32_t frequency, +typedef int (*lora_api_test_cw)(const struct device *dev, u32_t frequency, s8_t tx_power, u16_t duration); struct lora_driver_api { @@ -99,7 +99,7 @@ struct lora_driver_api { modem * @return 0 on success, negative on error */ -static inline int lora_config(struct device *dev, +static inline int lora_config(const struct device *dev, struct lora_modem_config *config) { const struct lora_driver_api *api = dev->driver_api; @@ -117,7 +117,7 @@ static inline int lora_config(struct device *dev, * @param data_len Length of the data to be sent * @return 0 on success, negative on error */ -static inline int lora_send(struct device *dev, +static inline int lora_send(const struct device *dev, u8_t *data, u32_t data_len) { const struct lora_driver_api *api = dev->driver_api; @@ -141,7 +141,7 @@ static inline int lora_send(struct device *dev, * @param snr SNR of received data * @return Length of the data received on success, negative on error */ -static inline int lora_recv(struct device *dev, u8_t *data, u8_t size, +static inline int lora_recv(const struct device *dev, u8_t *data, u8_t size, k_timeout_t timeout, s16_t *rssi, s8_t *snr) { const struct lora_driver_api *api = dev->driver_api; @@ -161,7 +161,7 @@ static inline int lora_recv(struct device *dev, u8_t *data, u8_t size, * @param duration Transmission duration in seconds. * @return 0 on success, negative on error */ -static inline int lora_test_cw(struct device *dev, u32_t frequency, +static inline int lora_test_cw(const struct device *dev, u32_t frequency, s8_t tx_power, u16_t duration) { const struct lora_driver_api *api = dev->driver_api; diff --git a/include/drivers/peci.h b/include/drivers/peci.h index 93b316d5dd88..9091328447bd 100644 --- a/include/drivers/peci.h +++ b/include/drivers/peci.h @@ -192,10 +192,10 @@ struct peci_msg { * * (Internal use only.) */ -typedef int (*peci_config_t)(struct device *dev, u32_t bitrate); -typedef int (*peci_transfer_t)(struct device *dev, struct peci_msg *msg); -typedef int (*peci_disable_t)(struct device *dev); -typedef int (*peci_enable_t)(struct device *dev); +typedef int (*peci_config_t)(const struct device *dev, u32_t bitrate); +typedef int (*peci_transfer_t)(const struct device *dev, struct peci_msg *msg); +typedef int (*peci_disable_t)(const struct device *dev); +typedef int (*peci_enable_t)(const struct device *dev); struct peci_driver_api { peci_config_t config; @@ -218,9 +218,9 @@ struct peci_driver_api { * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int peci_config(struct device *dev, u32_t bitrate); +__syscall int peci_config(const struct device *dev, u32_t bitrate); -static inline int z_impl_peci_config(struct device *dev, u32_t bitrate) +static inline int z_impl_peci_config(const struct device *dev, u32_t bitrate) { struct peci_driver_api *api; @@ -236,9 +236,9 @@ static inline int z_impl_peci_config(struct device *dev, u32_t bitrate) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int peci_enable(struct device *dev); +__syscall int peci_enable(const struct device *dev); -static inline int z_impl_peci_enable(struct device *dev) +static inline int z_impl_peci_enable(const struct device *dev) { struct peci_driver_api *api; @@ -254,9 +254,9 @@ static inline int z_impl_peci_enable(struct device *dev) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int peci_disable(struct device *dev); +__syscall int peci_disable(const struct device *dev); -static inline int z_impl_peci_disable(struct device *dev) +static inline int z_impl_peci_disable(const struct device *dev) { struct peci_driver_api *api; @@ -274,9 +274,9 @@ static inline int z_impl_peci_disable(struct device *dev) * @retval Negative errno code if failure. */ -__syscall int peci_transfer(struct device *dev, struct peci_msg *msg); +__syscall int peci_transfer(const struct device *dev, struct peci_msg *msg); -static inline int z_impl_peci_transfer(struct device *dev, +static inline int z_impl_peci_transfer(const struct device *dev, struct peci_msg *msg) { struct peci_driver_api *api; diff --git a/include/drivers/pinmux.h b/include/drivers/pinmux.h index 7fbf5b2271a2..3ffa277d7b97 100644 --- a/include/drivers/pinmux.h +++ b/include/drivers/pinmux.h @@ -54,25 +54,25 @@ extern "C" { * @brief Callback API upon setting a PIN's function * See pinmux_pin_set() for argument description */ -typedef int (*pmux_set)(struct device *dev, u32_t pin, u32_t func); +typedef int (*pmux_set)(const struct device *dev, u32_t pin, u32_t func); /** * @typedef pmux_get * @brief Callback API upon getting a PIN's function * See pinmux_pin_get() for argument description */ -typedef int (*pmux_get)(struct device *dev, u32_t pin, u32_t *func); +typedef int (*pmux_get)(const struct device *dev, u32_t pin, u32_t *func); /** * @typedef pmux_pullup * @brief Callback API upon setting a PIN's pullup * See pinmix_pin_pullup() for argument description */ -typedef int (*pmux_pullup)(struct device *dev, u32_t pin, u8_t func); +typedef int (*pmux_pullup)(const struct device *dev, u32_t pin, u8_t func); /** * @typedef pmux_input * @brief Callback API upon setting a PIN's input function * See pinmux_input() for argument description */ -typedef int (*pmux_input)(struct device *dev, u32_t pin, u8_t func); +typedef int (*pmux_input)(const struct device *dev, u32_t pin, u8_t func); __subsystem struct pinmux_driver_api { pmux_set set; @@ -81,7 +81,8 @@ __subsystem struct pinmux_driver_api { pmux_input input; }; -static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func) +static inline int pinmux_pin_set(const struct device *dev, u32_t pin, + u32_t func) { const struct pinmux_driver_api *api = (const struct pinmux_driver_api *)dev->driver_api; @@ -89,7 +90,8 @@ static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func) return api->set(dev, pin, func); } -static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func) +static inline int pinmux_pin_get(const struct device *dev, u32_t pin, + u32_t *func) { const struct pinmux_driver_api *api = (const struct pinmux_driver_api *)dev->driver_api; @@ -97,7 +99,8 @@ static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func) return api->get(dev, pin, func); } -static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func) +static inline int pinmux_pin_pullup(const struct device *dev, u32_t pin, + u8_t func) { const struct pinmux_driver_api *api = (const struct pinmux_driver_api *)dev->driver_api; @@ -105,7 +108,7 @@ static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func) return api->pullup(dev, pin, func); } -static inline int pinmux_pin_input_enable(struct device *dev, u32_t pin, +static inline int pinmux_pin_input_enable(const struct device *dev, u32_t pin, u8_t func) { const struct pinmux_driver_api *api = diff --git a/include/drivers/ps2.h b/include/drivers/ps2.h index e7eec94b558c..a80011ee5afb 100644 --- a/include/drivers/ps2.h +++ b/include/drivers/ps2.h @@ -35,7 +35,7 @@ extern "C" { * @param dev Pointer to the device structure for the driver instance. * @param data Data byte passed pack to the user. */ -typedef void (*ps2_callback_t)(struct device *dev, u8_t data); +typedef void (*ps2_callback_t)(const struct device *dev, u8_t data); /** * @cond INTERNAL_HIDDEN @@ -44,11 +44,12 @@ typedef void (*ps2_callback_t)(struct device *dev, u8_t data); * * (Internal use only.) */ -typedef int (*ps2_config_t)(struct device *dev, ps2_callback_t callback_isr); -typedef int (*ps2_read_t)(struct device *dev, u8_t *value); -typedef int (*ps2_write_t)(struct device *dev, u8_t value); -typedef int (*ps2_disable_callback_t)(struct device *dev); -typedef int (*ps2_enable_callback_t)(struct device *dev); +typedef int (*ps2_config_t)(const struct device *dev, + ps2_callback_t callback_isr); +typedef int (*ps2_read_t)(const struct device *dev, u8_t *value); +typedef int (*ps2_write_t)(const struct device *dev, u8_t value); +typedef int (*ps2_disable_callback_t)(const struct device *dev); +typedef int (*ps2_enable_callback_t)(const struct device *dev); __subsystem struct ps2_driver_api { ps2_config_t config; @@ -71,9 +72,10 @@ __subsystem struct ps2_driver_api { * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int ps2_config(struct device *dev, ps2_callback_t callback_isr); +__syscall int ps2_config(const struct device *dev, + ps2_callback_t callback_isr); -static inline int z_impl_ps2_config(struct device *dev, +static inline int z_impl_ps2_config(const struct device *dev, ps2_callback_t callback_isr) { const struct ps2_driver_api *api = @@ -91,9 +93,9 @@ static inline int z_impl_ps2_config(struct device *dev, * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int ps2_write(struct device *dev, u8_t value); +__syscall int ps2_write(const struct device *dev, u8_t value); -static inline int z_impl_ps2_write(struct device *dev, u8_t value) +static inline int z_impl_ps2_write(const struct device *dev, u8_t value) { const struct ps2_driver_api *api = (const struct ps2_driver_api *)dev->driver_api; @@ -109,9 +111,9 @@ static inline int z_impl_ps2_write(struct device *dev, u8_t value) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int ps2_read(struct device *dev, u8_t *value); +__syscall int ps2_read(const struct device *dev, u8_t *value); -static inline int z_impl_ps2_read(struct device *dev, u8_t *value) +static inline int z_impl_ps2_read(const struct device *dev, u8_t *value) { const struct ps2_driver_api *api = (const struct ps2_driver_api *)dev->driver_api; @@ -126,9 +128,9 @@ static inline int z_impl_ps2_read(struct device *dev, u8_t *value) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int ps2_enable_callback(struct device *dev); +__syscall int ps2_enable_callback(const struct device *dev); -static inline int z_impl_ps2_enable_callback(struct device *dev) +static inline int z_impl_ps2_enable_callback(const struct device *dev) { const struct ps2_driver_api *api = (const struct ps2_driver_api *)dev->driver_api; @@ -147,9 +149,9 @@ static inline int z_impl_ps2_enable_callback(struct device *dev) * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int ps2_disable_callback(struct device *dev); +__syscall int ps2_disable_callback(const struct device *dev); -static inline int z_impl_ps2_disable_callback(struct device *dev) +static inline int z_impl_ps2_disable_callback(const struct device *dev) { const struct ps2_driver_api *api = (const struct ps2_driver_api *)dev->driver_api; diff --git a/include/drivers/pwm.h b/include/drivers/pwm.h index 4b7c7ec4556c..84bf2da46080 100644 --- a/include/drivers/pwm.h +++ b/include/drivers/pwm.h @@ -39,7 +39,7 @@ typedef u8_t pwm_flags_t; * @brief Callback API upon setting the pin * See @a pwm_pin_set_cycles() for argument description */ -typedef int (*pwm_pin_set_t)(struct device *dev, u32_t pwm, +typedef int (*pwm_pin_set_t)(const struct device *dev, u32_t pwm, u32_t period_cycles, u32_t pulse_cycles, pwm_flags_t flags); @@ -48,7 +48,7 @@ typedef int (*pwm_pin_set_t)(struct device *dev, u32_t pwm, * @brief Callback API upon getting cycles per second * See @a pwm_get_cycles_per_sec() for argument description */ -typedef int (*pwm_get_cycles_per_sec_t)(struct device *dev, u32_t pwm, +typedef int (*pwm_get_cycles_per_sec_t)(const struct device *dev, u32_t pwm, u64_t *cycles); /** @brief PWM driver API definition. */ @@ -69,10 +69,11 @@ __subsystem struct pwm_driver_api { * @retval 0 If successful. * @retval Negative errno code if failure. */ -__syscall int pwm_pin_set_cycles(struct device *dev, u32_t pwm, +__syscall int pwm_pin_set_cycles(const struct device *dev, u32_t pwm, u32_t period, u32_t pulse, pwm_flags_t flags); -static inline int z_impl_pwm_pin_set_cycles(struct device *dev, u32_t pwm, +static inline int z_impl_pwm_pin_set_cycles(const struct device *dev, + u32_t pwm, u32_t period, u32_t pulse, pwm_flags_t flags) { @@ -94,11 +95,12 @@ static inline int z_impl_pwm_pin_set_cycles(struct device *dev, u32_t pwm, * @retval Negative errno code if failure. */ -__syscall int pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, +__syscall int pwm_get_cycles_per_sec(const struct device *dev, u32_t pwm, u64_t *cycles); -static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, - u64_t *cycles) +static inline int z_impl_pwm_get_cycles_per_sec(const struct device *dev, + u32_t pwm, + u64_t *cycles) { struct pwm_driver_api *api; @@ -118,7 +120,7 @@ static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm, * @retval 0 If successful. * @retval Negative errno code if failure. */ -static inline int pwm_pin_set_usec(struct device *dev, u32_t pwm, +static inline int pwm_pin_set_usec(const struct device *dev, u32_t pwm, u32_t period, u32_t pulse, pwm_flags_t flags) { @@ -154,7 +156,7 @@ static inline int pwm_pin_set_usec(struct device *dev, u32_t pwm, * @retval 0 If successful. * @retval Negative errno code if failure. */ -static inline int pwm_pin_set_nsec(struct device *dev, u32_t pwm, +static inline int pwm_pin_set_nsec(const struct device *dev, u32_t pwm, u32_t period, u32_t pulse, pwm_flags_t flags) { diff --git a/include/drivers/rtc/maxim_ds3231.h b/include/drivers/rtc/maxim_ds3231.h index 8ef7cb8a4264..5ae1603b4f1d 100644 --- a/include/drivers/rtc/maxim_ds3231.h +++ b/include/drivers/rtc/maxim_ds3231.h @@ -228,7 +228,7 @@ extern "C" { * @param user_data the corresponding parameter from * maxim_ds3231_alarm::user_data. */ -typedef void (*maxim_ds3231_alarm_callback_handler_t)(struct device *dev, +typedef void (*maxim_ds3231_alarm_callback_handler_t)(const struct device *dev, u8_t id, u32_t syncclock, void *user_data); @@ -245,7 +245,7 @@ typedef void (*maxim_ds3231_alarm_callback_handler_t)(struct device *dev, * * @param res the result of the operation. */ -typedef void (*maxim_ds3231_notify_callback)(struct device *dev, +typedef void (*maxim_ds3231_notify_callback)(const struct device *dev, struct sys_notify *notify, int res); @@ -358,7 +358,7 @@ struct maxim_ds3231_syncpoint { * * @return the current value of the synchronization clock. */ -static inline u32_t maxim_ds3231_read_syncclock(struct device *dev) +static inline u32_t maxim_ds3231_read_syncclock(const struct device *dev) { return k_uptime_get_32(); } @@ -371,7 +371,7 @@ static inline u32_t maxim_ds3231_read_syncclock(struct device *dev) * * @return the frequency of the selected synchronization clock. */ -static inline u32_t maxim_ds3231_syncclock_frequency(struct device *dev) +static inline u32_t maxim_ds3231_syncclock_frequency(const struct device *dev) { return 1000U; } @@ -393,7 +393,7 @@ static inline u32_t maxim_ds3231_syncclock_frequency(struct device *dev) * @return the non-negative updated value of the register, or a * negative error code from an I2C transaction. */ -int maxim_ds3231_ctrl_update(struct device *dev, +int maxim_ds3231_ctrl_update(const struct device *dev, u8_t set_bits, u8_t clear_bits); @@ -426,7 +426,7 @@ int maxim_ds3231_ctrl_update(struct device *dev, * (disregarding the effect of clears and sets), or a negative error * code from an I2C transaction. */ -int maxim_ds3231_stat_update(struct device *dev, +int maxim_ds3231_stat_update(const struct device *dev, u8_t set_bits, u8_t clear_bits); @@ -448,7 +448,7 @@ int maxim_ds3231_stat_update(struct device *dev, * @return a non-negative value indicating successful conversion, or a * negative error code from an I2C transaction or invalid parameter. */ -int maxim_ds3231_get_alarm(struct device *dev, +int maxim_ds3231_get_alarm(const struct device *dev, u8_t id, struct maxim_ds3231_alarm *cfg); @@ -472,7 +472,7 @@ int maxim_ds3231_get_alarm(struct device *dev, * @return a non-negative value on success, or a negative error code * from an I2C transaction or an invalid parameter. */ -int maxim_ds3231_set_alarm(struct device *dev, +int maxim_ds3231_set_alarm(const struct device *dev, u8_t id, const struct maxim_ds3231_alarm *cfg); @@ -502,7 +502,7 @@ int maxim_ds3231_set_alarm(struct device *dev, * @retval -EINVAL if notify is not provided * @retval -ENOTSUP if the required interrupt is not configured */ -int maxim_ds3231_synchronize(struct device *dev, +int maxim_ds3231_synchronize(const struct device *dev, struct sys_notify *notify); /** @brief Request to update the synchronization point. @@ -520,7 +520,7 @@ int maxim_ds3231_synchronize(struct device *dev, * @retval -EBUSY if a synchronization or set is currently in progress * @retval -ENOTSUP if the required interrupt is not configured */ -__syscall int maxim_ds3231_req_syncpoint(struct device *dev, +__syscall int maxim_ds3231_req_syncpoint(const struct device *dev, struct k_poll_signal *signal); /** @brief Retrieve the most recent synchronization point. @@ -535,7 +535,7 @@ __syscall int maxim_ds3231_req_syncpoint(struct device *dev, * @retval non-negative on success * @retval -ENOENT if no syncpoint has been captured */ -__syscall int maxim_ds3231_get_syncpoint(struct device *dev, +__syscall int maxim_ds3231_get_syncpoint(const struct device *dev, struct maxim_ds3231_syncpoint *syncpoint); /** @brief Set the RTC to a time consistent with the provided @@ -565,7 +565,7 @@ __syscall int maxim_ds3231_get_syncpoint(struct device *dev, * @retval -ENOTSUP if the required interrupt signal is not configured * @retval -EBUSY if a synchronization or set is currently in progress */ -int maxim_ds3231_set(struct device *dev, +int maxim_ds3231_set(const struct device *dev, const struct maxim_ds3231_syncpoint *syncpoint, struct sys_notify *notify); @@ -586,7 +586,7 @@ int maxim_ds3231_set(struct device *dev, * @return a non-negative value that may have MAXIM_DS3231_ALARM1 and/or * MAXIM_DS3231_ALARM2 set, or a negative error code. */ -int maxim_ds3231_check_alarms(struct device *dev); +int maxim_ds3231_check_alarms(const struct device *dev); /** * @} diff --git a/include/drivers/sensor.h b/include/drivers/sensor.h index 6c27a327780e..8c1d4fb9571a 100644 --- a/include/drivers/sensor.h +++ b/include/drivers/sensor.h @@ -307,7 +307,7 @@ enum sensor_attribute { * @param "struct device *dev" Pointer to the sensor device * @param "struct sensor_trigger *trigger" The trigger */ -typedef void (*sensor_trigger_handler_t)(struct device *dev, +typedef void (*sensor_trigger_handler_t)(const struct device *dev, struct sensor_trigger *trigger); /** @@ -316,7 +316,7 @@ typedef void (*sensor_trigger_handler_t)(struct device *dev, * * See sensor_attr_set() for argument description */ -typedef int (*sensor_attr_set_t)(struct device *dev, +typedef int (*sensor_attr_set_t)(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); @@ -326,7 +326,7 @@ typedef int (*sensor_attr_set_t)(struct device *dev, * * See sensor_trigger_set() for argument description */ -typedef int (*sensor_trigger_set_t)(struct device *dev, +typedef int (*sensor_trigger_set_t)(const struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler); /** @@ -335,7 +335,7 @@ typedef int (*sensor_trigger_set_t)(struct device *dev, * * See sensor_sample_fetch() for argument description */ -typedef int (*sensor_sample_fetch_t)(struct device *dev, +typedef int (*sensor_sample_fetch_t)(const struct device *dev, enum sensor_channel chan); /** * @typedef sensor_channel_get_t @@ -343,7 +343,7 @@ typedef int (*sensor_sample_fetch_t)(struct device *dev, * * See sensor_channel_get() for argument description */ -typedef int (*sensor_channel_get_t)(struct device *dev, +typedef int (*sensor_channel_get_t)(const struct device *dev, enum sensor_channel chan, struct sensor_value *val); @@ -366,15 +366,15 @@ __subsystem struct sensor_driver_api { * * @return 0 if successful, negative errno code if failure. */ -__syscall int sensor_attr_set(struct device *dev, +__syscall int sensor_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val); -static inline int z_impl_sensor_attr_set(struct device *dev, - enum sensor_channel chan, - enum sensor_attribute attr, - const struct sensor_value *val) +static inline int z_impl_sensor_attr_set(const struct device *dev, + enum sensor_channel chan, + enum sensor_attribute attr, + const struct sensor_value *val) { const struct sensor_driver_api *api = (const struct sensor_driver_api *)dev->driver_api; @@ -403,7 +403,7 @@ static inline int z_impl_sensor_attr_set(struct device *dev, * * @return 0 if successful, negative errno code if failure. */ -static inline int sensor_trigger_set(struct device *dev, +static inline int sensor_trigger_set(const struct device *dev, struct sensor_trigger *trig, sensor_trigger_handler_t handler) { @@ -433,9 +433,9 @@ static inline int sensor_trigger_set(struct device *dev, * * @return 0 if successful, negative errno code if failure. */ -__syscall int sensor_sample_fetch(struct device *dev); +__syscall int sensor_sample_fetch(const struct device *dev); -static inline int z_impl_sensor_sample_fetch(struct device *dev) +static inline int z_impl_sensor_sample_fetch(const struct device *dev) { const struct sensor_driver_api *api = (const struct sensor_driver_api *)dev->driver_api; @@ -462,11 +462,11 @@ static inline int z_impl_sensor_sample_fetch(struct device *dev) * * @return 0 if successful, negative errno code if failure. */ -__syscall int sensor_sample_fetch_chan(struct device *dev, +__syscall int sensor_sample_fetch_chan(const struct device *dev, enum sensor_channel type); -static inline int z_impl_sensor_sample_fetch_chan(struct device *dev, - enum sensor_channel type) +static inline int z_impl_sensor_sample_fetch_chan(const struct device *dev, + enum sensor_channel type) { const struct sensor_driver_api *api = (const struct sensor_driver_api *)dev->driver_api; @@ -495,13 +495,13 @@ static inline int z_impl_sensor_sample_fetch_chan(struct device *dev, * * @return 0 if successful, negative errno code if failure. */ -__syscall int sensor_channel_get(struct device *dev, +__syscall int sensor_channel_get(const struct device *dev, enum sensor_channel chan, struct sensor_value *val); -static inline int z_impl_sensor_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static inline int z_impl_sensor_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { const struct sensor_driver_api *api = (const struct sensor_driver_api *)dev->driver_api; diff --git a/include/drivers/sensor/ccs811.h b/include/drivers/sensor/ccs811.h index 821880e05650..a787f69fa84a 100644 --- a/include/drivers/sensor/ccs811.h +++ b/include/drivers/sensor/ccs811.h @@ -80,7 +80,7 @@ struct ccs811_result_type { * * @return a pointer to the result information. */ -const struct ccs811_result_type *ccs811_result(struct device *dev); +const struct ccs811_result_type *ccs811_result(const struct device *dev); /** * @brief Get information about static CCS811 state. @@ -104,7 +104,7 @@ struct ccs811_configver_type { * * @return 0 on success, or a negative errno code on failure. */ -int ccs811_configver_fetch(struct device *dev, +int ccs811_configver_fetch(const struct device *dev, struct ccs811_configver_type *ptr); /** @@ -121,7 +121,7 @@ int ccs811_configver_fetch(struct device *dev, * @return a non-negative 16-bit register value, or a negative errno * code on failure. */ -int ccs811_baseline_fetch(struct device *dev); +int ccs811_baseline_fetch(const struct device *dev); /** * @brief Update the BASELINE register. @@ -135,7 +135,7 @@ int ccs811_baseline_fetch(struct device *dev); * * @return 0 if successful, negative errno code if failure. */ -int ccs811_baseline_update(struct device *dev, u16_t baseline); +int ccs811_baseline_update(const struct device *dev, u16_t baseline); /** * @brief Update the ENV_DATA register. @@ -151,7 +151,7 @@ int ccs811_baseline_update(struct device *dev, u16_t baseline); * * @return 0 if successful, negative errno code if failure. */ -int ccs811_envdata_update(struct device *dev, +int ccs811_envdata_update(const struct device *dev, const struct sensor_value *temperature, const struct sensor_value *humidity); diff --git a/include/drivers/spi.h b/include/drivers/spi.h index 18fb98c4a372..679768b2f9ee 100644 --- a/include/drivers/spi.h +++ b/include/drivers/spi.h @@ -131,7 +131,7 @@ extern "C" { * transmission and before releasing the CS line */ struct spi_cs_control { - struct device *gpio_dev; + const struct device *gpio_dev; u32_t gpio_pin; u32_t delay; }; @@ -194,7 +194,7 @@ struct spi_buf_set { * @brief Callback API for I/O * See spi_transceive() for argument descriptions */ -typedef int (*spi_api_io)(struct device *dev, +typedef int (*spi_api_io)(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs); @@ -204,7 +204,7 @@ typedef int (*spi_api_io)(struct device *dev, * @brief Callback API for asynchronous I/O * See spi_transceive_async() for argument descriptions */ -typedef int (*spi_api_io_async)(struct device *dev, +typedef int (*spi_api_io_async)(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -215,7 +215,7 @@ typedef int (*spi_api_io_async)(struct device *dev, * @brief Callback API for unlocking SPI device. * See spi_release() for argument descriptions */ -typedef int (*spi_api_release)(struct device *dev, +typedef int (*spi_api_release)(const struct device *dev, const struct spi_config *config); @@ -247,15 +247,15 @@ __subsystem struct spi_driver_api { * transaction: if successful it will return the amount of frames * received, negative errno code otherwise. */ -__syscall int spi_transceive(struct device *dev, +__syscall int spi_transceive(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs); -static inline int z_impl_spi_transceive(struct device *dev, - const struct spi_config *config, - const struct spi_buf_set *tx_bufs, - const struct spi_buf_set *rx_bufs) +static inline int z_impl_spi_transceive(const struct device *dev, + const struct spi_config *config, + const struct spi_buf_set *tx_bufs, + const struct spi_buf_set *rx_bufs) { const struct spi_driver_api *api = (const struct spi_driver_api *)dev->driver_api; @@ -276,7 +276,7 @@ static inline int z_impl_spi_transceive(struct device *dev, * * @note This function is an helper function calling spi_transceive. */ -static inline int spi_read(struct device *dev, +static inline int spi_read(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *rx_bufs) { @@ -296,7 +296,7 @@ static inline int spi_read(struct device *dev, * * @note This function is an helper function calling spi_transceive. */ -static inline int spi_write(struct device *dev, +static inline int spi_write(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs) { @@ -324,7 +324,7 @@ static inline int spi_write(struct device *dev, * transaction: if successful it will return the amount of frames * received, negative errno code otherwise. */ -static inline int spi_transceive_async(struct device *dev, +static inline int spi_transceive_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs, @@ -353,7 +353,7 @@ static inline int spi_transceive_async(struct device *dev, * * @note This function is an helper function calling spi_transceive_async. */ -static inline int spi_read_async(struct device *dev, +static inline int spi_read_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *rx_bufs, struct k_poll_signal *async) @@ -378,7 +378,7 @@ static inline int spi_read_async(struct device *dev, * * @note This function is an helper function calling spi_transceive_async. */ -static inline int spi_write_async(struct device *dev, +static inline int spi_write_async(const struct device *dev, const struct spi_config *config, const struct spi_buf_set *tx_bufs, struct k_poll_signal *async) @@ -400,11 +400,11 @@ static inline int spi_write_async(struct device *dev, * @param dev Pointer to the device structure for the driver instance * @param config Pointer to a valid spi_config structure instance. */ -__syscall int spi_release(struct device *dev, +__syscall int spi_release(const struct device *dev, const struct spi_config *config); -static inline int z_impl_spi_release(struct device *dev, - const struct spi_config *config) +static inline int z_impl_spi_release(const struct device *dev, + const struct spi_config *config) { const struct spi_driver_api *api = (const struct spi_driver_api *)dev->driver_api; diff --git a/include/drivers/timer/system_timer.h b/include/drivers/timer/system_timer.h index f3c4dc9a8ec7..c1807da9f0ca 100644 --- a/include/drivers/timer/system_timer.h +++ b/include/drivers/timer/system_timer.h @@ -31,7 +31,7 @@ extern "C" { * initialization callback. It is a weak symbol that will be * implemented as a noop if undefined in the clock driver. */ -extern int z_clock_driver_init(struct device *device); +extern int z_clock_driver_init(const struct device *device); /** * @brief Initialize system clock driver @@ -41,7 +41,8 @@ extern int z_clock_driver_init(struct device *device); * management. It is a weak symbol that will be implemented as a noop * if undefined in the clock driver. */ -extern int z_clock_device_ctrl(struct device *device, u32_t ctrl_command, +extern int z_clock_device_ctrl(const struct device *device, + u32_t ctrl_command, void *context, device_pm_cb cb, void *arg); /** diff --git a/include/drivers/uart.h b/include/drivers/uart.h index 7d8a6a89aab6..c01455dbac48 100644 --- a/include/drivers/uart.h +++ b/include/drivers/uart.h @@ -304,7 +304,7 @@ typedef void (*uart_irq_callback_user_data_t)(void *user_data); * * @param port Device struct for the UART device. */ -typedef void (*uart_irq_callback_t)(struct device *port); +typedef void (*uart_irq_callback_t)(const struct device *port); /** * @typedef uart_irq_config_func_t @@ -312,7 +312,7 @@ typedef void (*uart_irq_callback_t)(struct device *port); * * @internal */ -typedef void (*uart_irq_config_func_t)(struct device *port); +typedef void (*uart_irq_config_func_t)(const struct device *port); /** * @brief UART device configuration. @@ -341,86 +341,90 @@ __subsystem struct uart_driver_api { #ifdef CONFIG_UART_ASYNC_API - int (*callback_set)(struct device *dev, uart_callback_t callback, + int (*callback_set)(const struct device *dev, + uart_callback_t callback, void *user_data); - int (*tx)(struct device *dev, const u8_t *buf, size_t len, + int (*tx)(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout); - int (*tx_abort)(struct device *dev); + int (*tx_abort)(const struct device *dev); - int (*rx_enable)(struct device *dev, u8_t *buf, size_t len, + int (*rx_enable)(const struct device *dev, u8_t *buf, size_t len, s32_t timeout); - int (*rx_buf_rsp)(struct device *dev, u8_t *buf, size_t len); - int (*rx_disable)(struct device *dev); + int (*rx_buf_rsp)(const struct device *dev, u8_t *buf, size_t len); + int (*rx_disable)(const struct device *dev); #endif /** Console I/O function */ - int (*poll_in)(struct device *dev, unsigned char *p_char); - void (*poll_out)(struct device *dev, unsigned char out_char); + int (*poll_in)(const struct device *dev, unsigned char *p_char); + void (*poll_out)(const struct device *dev, unsigned char out_char); /** Console I/O function */ - int (*err_check)(struct device *dev); + int (*err_check)(const struct device *dev); /** UART configuration functions */ - int (*configure)(struct device *dev, const struct uart_config *cfg); - int (*config_get)(struct device *dev, struct uart_config *cfg); + int (*configure)(const struct device *dev, + const struct uart_config *cfg); + int (*config_get)(const struct device *dev, struct uart_config *cfg); #ifdef CONFIG_UART_INTERRUPT_DRIVEN /** Interrupt driven FIFO fill function */ - int (*fifo_fill)(struct device *dev, const u8_t *tx_data, int len); + int (*fifo_fill)(const struct device *dev, const u8_t *tx_data, + int len); /** Interrupt driven FIFO read function */ - int (*fifo_read)(struct device *dev, u8_t *rx_data, const int size); + int (*fifo_read)(const struct device *dev, u8_t *rx_data, + const int size); /** Interrupt driven transfer enabling function */ - void (*irq_tx_enable)(struct device *dev); + void (*irq_tx_enable)(const struct device *dev); /** Interrupt driven transfer disabling function */ - void (*irq_tx_disable)(struct device *dev); + void (*irq_tx_disable)(const struct device *dev); /** Interrupt driven transfer ready function */ - int (*irq_tx_ready)(struct device *dev); + int (*irq_tx_ready)(const struct device *dev); /** Interrupt driven receiver enabling function */ - void (*irq_rx_enable)(struct device *dev); + void (*irq_rx_enable)(const struct device *dev); /** Interrupt driven receiver disabling function */ - void (*irq_rx_disable)(struct device *dev); + void (*irq_rx_disable)(const struct device *dev); /** Interrupt driven transfer complete function */ - int (*irq_tx_complete)(struct device *dev); + int (*irq_tx_complete)(const struct device *dev); /** Interrupt driven receiver ready function */ - int (*irq_rx_ready)(struct device *dev); + int (*irq_rx_ready)(const struct device *dev); /** Interrupt driven error enabling function */ - void (*irq_err_enable)(struct device *dev); + void (*irq_err_enable)(const struct device *dev); /** Interrupt driven error disabling function */ - void (*irq_err_disable)(struct device *dev); + void (*irq_err_disable)(const struct device *dev); /** Interrupt driven pending status function */ - int (*irq_is_pending)(struct device *dev); + int (*irq_is_pending)(const struct device *dev); /** Interrupt driven interrupt update function */ - int (*irq_update)(struct device *dev); + int (*irq_update)(const struct device *dev); /** Set the irq callback function */ - void (*irq_callback_set)(struct device *dev, + void (*irq_callback_set)(const struct device *dev, uart_irq_callback_user_data_t cb, void *user_data); #endif #ifdef CONFIG_UART_LINE_CTRL - int (*line_ctrl_set)(struct device *dev, u32_t ctrl, u32_t val); - int (*line_ctrl_get)(struct device *dev, u32_t ctrl, u32_t *val); + int (*line_ctrl_set)(const struct device *dev, u32_t ctrl, u32_t val); + int (*line_ctrl_get)(const struct device *dev, u32_t ctrl, u32_t *val); #endif #ifdef CONFIG_UART_DRV_CMD - int (*drv_cmd)(struct device *dev, u32_t cmd, u32_t p); + int (*drv_cmd)(const struct device *dev, u32_t cmd, u32_t p); #endif }; @@ -436,7 +440,7 @@ __subsystem struct uart_driver_api { * * @retval 0 If successful, negative errno code otherwise. */ -static inline int uart_callback_set(struct device *dev, +static inline int uart_callback_set(const struct device *dev, uart_callback_t callback, void *user_data) { @@ -461,10 +465,10 @@ static inline int uart_callback_set(struct device *dev, * @retval -EBUSY There is already an ongoing transfer. * @retval 0 If successful, negative errno code otherwise. */ -__syscall int uart_tx(struct device *dev, const u8_t *buf, size_t len, +__syscall int uart_tx(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout); -static inline int z_impl_uart_tx(struct device *dev, const u8_t *buf, +static inline int z_impl_uart_tx(const struct device *dev, const u8_t *buf, size_t len, s32_t timeout) { @@ -484,9 +488,9 @@ static inline int z_impl_uart_tx(struct device *dev, const u8_t *buf, * @retval -EFAULT There is no active transmission. * @retval 0 If successful, negative errno code otherwise. */ -__syscall int uart_tx_abort(struct device *dev); +__syscall int uart_tx_abort(const struct device *dev); -static inline int z_impl_uart_tx_abort(struct device *dev) +static inline int z_impl_uart_tx_abort(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -510,10 +514,10 @@ static inline int z_impl_uart_tx_abort(struct device *dev) * @retval 0 If successful, negative errno code otherwise. * */ -__syscall int uart_rx_enable(struct device *dev, u8_t *buf, size_t len, +__syscall int uart_rx_enable(const struct device *dev, u8_t *buf, size_t len, s32_t timeout); -static inline int z_impl_uart_rx_enable(struct device *dev, u8_t *buf, +static inline int z_impl_uart_rx_enable(const struct device *dev, u8_t *buf, size_t len, s32_t timeout) { const struct uart_driver_api *api = @@ -540,7 +544,8 @@ static inline int z_impl_uart_rx_enable(struct device *dev, u8_t *buf, * @retval 0 If successful, negative errno code otherwise. * */ -static inline int uart_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) +static inline int uart_rx_buf_rsp(const struct device *dev, u8_t *buf, + size_t len) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -559,9 +564,9 @@ static inline int uart_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len) * @retval -EFAULT There is no active reception. * @retval 0 If successful, negative errno code otherwise. */ -__syscall int uart_rx_disable(struct device *dev); +__syscall int uart_rx_disable(const struct device *dev); -static inline int z_impl_uart_rx_disable(struct device *dev) +static inline int z_impl_uart_rx_disable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -579,9 +584,9 @@ static inline int z_impl_uart_rx_disable(struct device *dev) * @retval uart_rx_stop_reason If error during receiving occurred. * @retval 0 Otherwise. */ -__syscall int uart_err_check(struct device *dev); +__syscall int uart_err_check(const struct device *dev); -static inline int z_impl_uart_err_check(struct device *dev) +static inline int z_impl_uart_err_check(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -605,9 +610,10 @@ static inline int z_impl_uart_err_check(struct device *dev) * @retval -ENOTSUP If the operation is not supported. * @retval -EBUSY If reception was enabled using uart_rx_enabled */ -__syscall int uart_poll_in(struct device *dev, unsigned char *p_char); +__syscall int uart_poll_in(const struct device *dev, unsigned char *p_char); -static inline int z_impl_uart_poll_in(struct device *dev, unsigned char *p_char) +static inline int z_impl_uart_poll_in(const struct device *dev, + unsigned char *p_char) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -628,10 +634,10 @@ static inline int z_impl_uart_poll_in(struct device *dev, unsigned char *p_char) * @param dev UART device structure. * @param out_char Character to send. */ -__syscall void uart_poll_out(struct device *dev, +__syscall void uart_poll_out(const struct device *dev, unsigned char out_char); -static inline void z_impl_uart_poll_out(struct device *dev, +static inline void z_impl_uart_poll_out(const struct device *dev, unsigned char out_char) { const struct uart_driver_api *api = @@ -653,10 +659,11 @@ static inline void z_impl_uart_poll_out(struct device *dev, * or driver does not support setting configuration in runtime. * @retval 0 If successful, negative errno code otherwise. */ -__syscall int uart_configure(struct device *dev, const struct uart_config *cfg); +__syscall int uart_configure(const struct device *dev, + const struct uart_config *cfg); -static inline int z_impl_uart_configure(struct device *dev, - const struct uart_config *cfg) +static inline int z_impl_uart_configure(const struct device *dev, + const struct uart_config *cfg) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -680,10 +687,11 @@ static inline int z_impl_uart_configure(struct device *dev, * @retval -ENOTSUP If driver does not support getting current configuration. * @retval 0 If successful, negative errno code otherwise. */ -__syscall int uart_config_get(struct device *dev, struct uart_config *cfg); +__syscall int uart_config_get(const struct device *dev, + struct uart_config *cfg); -static inline int z_impl_uart_config_get(struct device *dev, - struct uart_config *cfg) +static inline int z_impl_uart_config_get(const struct device *dev, + struct uart_config *cfg) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -715,7 +723,8 @@ static inline int z_impl_uart_config_get(struct device *dev, * * @return Number of bytes sent. */ -static inline int uart_fifo_fill(struct device *dev, const u8_t *tx_data, +static inline int uart_fifo_fill(const struct device *dev, + const u8_t *tx_data, int size) { const struct uart_driver_api *api = @@ -750,7 +759,7 @@ static inline int uart_fifo_fill(struct device *dev, const u8_t *tx_data, * * @return Number of bytes read. */ -static inline int uart_fifo_read(struct device *dev, u8_t *rx_data, +static inline int uart_fifo_read(const struct device *dev, u8_t *rx_data, const int size) { const struct uart_driver_api *api = @@ -770,9 +779,9 @@ static inline int uart_fifo_read(struct device *dev, u8_t *rx_data, * * @return N/A */ -__syscall void uart_irq_tx_enable(struct device *dev); +__syscall void uart_irq_tx_enable(const struct device *dev); -static inline void z_impl_uart_irq_tx_enable(struct device *dev) +static inline void z_impl_uart_irq_tx_enable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -788,9 +797,9 @@ static inline void z_impl_uart_irq_tx_enable(struct device *dev) * * @return N/A */ -__syscall void uart_irq_tx_disable(struct device *dev); +__syscall void uart_irq_tx_disable(const struct device *dev); -static inline void z_impl_uart_irq_tx_disable(struct device *dev) +static inline void z_impl_uart_irq_tx_disable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -815,7 +824,7 @@ static inline void z_impl_uart_irq_tx_disable(struct device *dev) * @retval 1 If at least one char can be written to UART. * @retval 0 Otherwise. */ -static inline int uart_irq_tx_ready(struct device *dev) +static inline int uart_irq_tx_ready(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -834,9 +843,9 @@ static inline int uart_irq_tx_ready(struct device *dev) * * @return N/A */ -__syscall void uart_irq_rx_enable(struct device *dev); +__syscall void uart_irq_rx_enable(const struct device *dev); -static inline void z_impl_uart_irq_rx_enable(struct device *dev) +static inline void z_impl_uart_irq_rx_enable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -853,9 +862,9 @@ static inline void z_impl_uart_irq_rx_enable(struct device *dev) * * @return N/A */ -__syscall void uart_irq_rx_disable(struct device *dev); +__syscall void uart_irq_rx_disable(const struct device *dev); -static inline void z_impl_uart_irq_rx_disable(struct device *dev) +static inline void z_impl_uart_irq_rx_disable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -883,7 +892,7 @@ static inline void z_impl_uart_irq_rx_disable(struct device *dev) * @retval 0 Otherwise. * @retval -ENOTSUP if this function is not supported */ -static inline int uart_irq_tx_complete(struct device *dev) +static inline int uart_irq_tx_complete(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -914,7 +923,7 @@ static inline int uart_irq_tx_complete(struct device *dev) * @retval 0 Otherwise. * @retval -ENOTSUP if this function is not supported */ -static inline int uart_irq_rx_ready(struct device *dev) +static inline int uart_irq_rx_ready(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -932,9 +941,9 @@ static inline int uart_irq_rx_ready(struct device *dev) * * @return N/A */ -__syscall void uart_irq_err_enable(struct device *dev); +__syscall void uart_irq_err_enable(const struct device *dev); -static inline void z_impl_uart_irq_err_enable(struct device *dev) +static inline void z_impl_uart_irq_err_enable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -952,9 +961,9 @@ static inline void z_impl_uart_irq_err_enable(struct device *dev) * @retval 1 If an IRQ is ready. * @retval 0 Otherwise. */ -__syscall void uart_irq_err_disable(struct device *dev); +__syscall void uart_irq_err_disable(const struct device *dev); -static inline void z_impl_uart_irq_err_disable(struct device *dev) +static inline void z_impl_uart_irq_err_disable(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -972,9 +981,9 @@ static inline void z_impl_uart_irq_err_disable(struct device *dev) * @retval 1 If an IRQ is pending. * @retval 0 Otherwise. */ -__syscall int uart_irq_is_pending(struct device *dev); +__syscall int uart_irq_is_pending(const struct device *dev); -static inline int z_impl_uart_irq_is_pending(struct device *dev) +static inline int z_impl_uart_irq_is_pending(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -1009,9 +1018,9 @@ static inline int z_impl_uart_irq_is_pending(struct device *dev) * * @retval 1 Always. */ -__syscall int uart_irq_update(struct device *dev); +__syscall int uart_irq_update(const struct device *dev); -static inline int z_impl_uart_irq_update(struct device *dev) +static inline int z_impl_uart_irq_update(const struct device *dev) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -1037,7 +1046,7 @@ static inline int z_impl_uart_irq_update(struct device *dev) * @return N/A */ static inline void uart_irq_callback_user_data_set( - struct device *dev, + const struct device *dev, uart_irq_callback_user_data_t cb, void *user_data) { @@ -1060,11 +1069,11 @@ static inline void uart_irq_callback_user_data_set( * * @return N/A */ -static inline void uart_irq_callback_set(struct device *dev, +static inline void uart_irq_callback_set(const struct device *dev, uart_irq_callback_t cb) { uart_irq_callback_user_data_set(dev, (uart_irq_callback_user_data_t)cb, - dev); + (void *)dev); } #endif @@ -1081,11 +1090,11 @@ static inline void uart_irq_callback_set(struct device *dev, * @retval 0 If successful. * @retval failed Otherwise. */ -__syscall int uart_line_ctrl_set(struct device *dev, +__syscall int uart_line_ctrl_set(const struct device *dev, u32_t ctrl, u32_t val); -static inline int z_impl_uart_line_ctrl_set(struct device *dev, - u32_t ctrl, u32_t val) +static inline int z_impl_uart_line_ctrl_set(const struct device *dev, + u32_t ctrl, u32_t val) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -1107,10 +1116,11 @@ static inline int z_impl_uart_line_ctrl_set(struct device *dev, * @retval 0 If successful. * @retval failed Otherwise. */ -__syscall int uart_line_ctrl_get(struct device *dev, u32_t ctrl, u32_t *val); +__syscall int uart_line_ctrl_get(const struct device *dev, u32_t ctrl, + u32_t *val); -static inline int z_impl_uart_line_ctrl_get(struct device *dev, - u32_t ctrl, u32_t *val) +static inline int z_impl_uart_line_ctrl_get(const struct device *dev, + u32_t ctrl, u32_t *val) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; @@ -1139,9 +1149,10 @@ static inline int z_impl_uart_line_ctrl_get(struct device *dev, * @retval 0 If successful. * @retval failed Otherwise. */ -__syscall int uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p); +__syscall int uart_drv_cmd(const struct device *dev, u32_t cmd, u32_t p); -static inline int z_impl_uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p) +static inline int z_impl_uart_drv_cmd(const struct device *dev, u32_t cmd, + u32_t p) { const struct uart_driver_api *api = (const struct uart_driver_api *)dev->driver_api; diff --git a/include/drivers/video.h b/include/drivers/video.h index e6208528ced3..4dcfd5bf7a28 100644 --- a/include/drivers/video.h +++ b/include/drivers/video.h @@ -136,7 +136,7 @@ enum video_signal_result { * @brief Set video format * See video_set_format() for argument descriptions. */ -typedef int (*video_api_set_format_t)(struct device *dev, +typedef int (*video_api_set_format_t)(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt); @@ -145,7 +145,7 @@ typedef int (*video_api_set_format_t)(struct device *dev, * @brief get current video format * See video_get_format() for argument descriptions. */ -typedef int (*video_api_get_format_t)(struct device *dev, +typedef int (*video_api_get_format_t)(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt); @@ -154,7 +154,7 @@ typedef int (*video_api_get_format_t)(struct device *dev, * @brief Enqueue a buffer in the driver’s incoming queue. * See video_enqueue() for argument descriptions. */ -typedef int (*video_api_enqueue_t)(struct device *dev, +typedef int (*video_api_enqueue_t)(const struct device *dev, enum video_endpoint_id ep, struct video_buffer *buf); @@ -163,7 +163,7 @@ typedef int (*video_api_enqueue_t)(struct device *dev, * @brief Dequeue a buffer from the driver’s outgoing queue. * See video_dequeue() for argument descriptions. */ -typedef int (*video_api_dequeue_t)(struct device *dev, +typedef int (*video_api_dequeue_t)(const struct device *dev, enum video_endpoint_id ep, struct video_buffer **buf, k_timeout_t timeout); @@ -174,7 +174,7 @@ typedef int (*video_api_dequeue_t)(struct device *dev, * outgoing queue. * See video_flush() for argument descriptions. */ -typedef int (*video_api_flush_t)(struct device *dev, +typedef int (*video_api_flush_t)(const struct device *dev, enum video_endpoint_id ep, bool cancel); @@ -183,21 +183,22 @@ typedef int (*video_api_flush_t)(struct device *dev, * @brief Start the capture or output process. * See video_stream_start() for argument descriptions. */ -typedef int (*video_api_stream_start_t)(struct device *dev); +typedef int (*video_api_stream_start_t)(const struct device *dev); /** * @typedef video_api_stream_stop_t * @brief Stop the capture or output process. * See video_stream_stop() for argument descriptions. */ -typedef int (*video_api_stream_stop_t)(struct device *dev); +typedef int (*video_api_stream_stop_t)(const struct device *dev); /** * @typedef video_api_set_ctrl_t * @brief set a video control value. * See video_set_ctrl() for argument descriptions. */ -typedef int (*video_api_set_ctrl_t)(struct device *dev, unsigned int cid, +typedef int (*video_api_set_ctrl_t)(const struct device *dev, + unsigned int cid, void *value); /** @@ -205,7 +206,8 @@ typedef int (*video_api_set_ctrl_t)(struct device *dev, unsigned int cid, * @brief get a video control value. * See video_get_ctrl() for argument descriptions. */ -typedef int (*video_api_get_ctrl_t)(struct device *dev, unsigned int cid, +typedef int (*video_api_get_ctrl_t)(const struct device *dev, + unsigned int cid, void *value); /** @@ -213,7 +215,7 @@ typedef int (*video_api_get_ctrl_t)(struct device *dev, unsigned int cid, * @brief Get capabilities of a video endpoint. * See video_get_caps() for argument descriptions. */ -typedef int (*video_api_get_caps_t)(struct device *dev, +typedef int (*video_api_get_caps_t)(const struct device *dev, enum video_endpoint_id ep, struct video_caps *caps); @@ -222,7 +224,7 @@ typedef int (*video_api_get_caps_t)(struct device *dev, * @brief Register/Unregister poll signal for buffer events. * See video_set_signal() for argument descriptions. */ -typedef int (*video_api_set_signal_t)(struct device *dev, +typedef int (*video_api_set_signal_t)(const struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal); @@ -256,7 +258,7 @@ struct video_driver_api { * @retval -ENOTSUP If format is not supported. * @retval -EIO General input / output error. */ -static inline int video_set_format(struct device *dev, +static inline int video_set_format(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { @@ -279,7 +281,7 @@ static inline int video_set_format(struct device *dev, * * @retval pointer to video format */ -static inline int video_get_format(struct device *dev, +static inline int video_get_format(const struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { @@ -305,7 +307,8 @@ static inline int video_get_format(struct device *dev, * @retval -EINVAL If parameters are invalid. * @retval -EIO General input / output error. */ -static inline int video_enqueue(struct device *dev, enum video_endpoint_id ep, +static inline int video_enqueue(const struct device *dev, + enum video_endpoint_id ep, struct video_buffer *buf) { const struct video_driver_api *api = @@ -333,7 +336,8 @@ static inline int video_enqueue(struct device *dev, enum video_endpoint_id ep, * @retval -EINVAL If parameters are invalid. * @retval -EIO General input / output error. */ -static inline int video_dequeue(struct device *dev, enum video_endpoint_id ep, +static inline int video_dequeue(const struct device *dev, + enum video_endpoint_id ep, struct video_buffer **buf, k_timeout_t timeout) { @@ -362,7 +366,8 @@ static inline int video_dequeue(struct device *dev, enum video_endpoint_id ep, * * @retval 0 Is successful, -ERRNO code otherwise. */ -static inline int video_flush(struct device *dev, enum video_endpoint_id ep, +static inline int video_flush(const struct device *dev, + enum video_endpoint_id ep, bool cancel) { const struct video_driver_api *api = @@ -387,7 +392,7 @@ static inline int video_flush(struct device *dev, enum video_endpoint_id ep, * @retval 0 Is successful. * @retval -EIO General input / output error. */ -static inline int video_stream_start(struct device *dev) +static inline int video_stream_start(const struct device *dev) { const struct video_driver_api *api = (const struct video_driver_api *)dev->driver_api; @@ -407,7 +412,7 @@ static inline int video_stream_start(struct device *dev) * @retval 0 Is successful. * @retval -EIO General input / output error. */ -static inline int video_stream_stop(struct device *dev) +static inline int video_stream_stop(const struct device *dev) { const struct video_driver_api *api = (const struct video_driver_api *)dev->driver_api; @@ -431,7 +436,7 @@ static inline int video_stream_stop(struct device *dev) * * @retval 0 Is successful, -ERRNO code otherwise. */ -static inline int video_get_caps(struct device *dev, +static inline int video_get_caps(const struct device *dev, enum video_endpoint_id ep, struct video_caps *caps) { @@ -458,7 +463,7 @@ static inline int video_get_caps(struct device *dev, * @retval -ENOTSUP If format is not supported. * @retval -EIO General input / output error. */ -static inline int video_set_ctrl(struct device *dev, unsigned int cid, +static inline int video_set_ctrl(const struct device *dev, unsigned int cid, void *value) { const struct video_driver_api *api = @@ -486,7 +491,7 @@ static inline int video_set_ctrl(struct device *dev, unsigned int cid, * @retval -ENOTSUP If format is not supported. * @retval -EIO General input / output error. */ -static inline int video_get_ctrl(struct device *dev, unsigned int cid, +static inline int video_get_ctrl(const struct device *dev, unsigned int cid, void *value) { const struct video_driver_api *api = @@ -512,7 +517,7 @@ static inline int video_get_ctrl(struct device *dev, unsigned int cid, * * @retval 0 Is successful, -ERRNO code otherwise. */ -static inline int video_set_signal(struct device *dev, +static inline int video_set_signal(const struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal) { diff --git a/include/drivers/watchdog.h b/include/drivers/watchdog.h index 90ca1cc5d34e..697982da7fc3 100644 --- a/include/drivers/watchdog.h +++ b/include/drivers/watchdog.h @@ -81,7 +81,7 @@ struct wdt_window { }; /** Watchdog callback. */ -typedef void (*wdt_callback_t)(struct device *dev, int channel_id); +typedef void (*wdt_callback_t)(const struct device *dev, int channel_id); /** * @brief Watchdog timeout configuration struct. @@ -110,21 +110,21 @@ struct wdt_timeout_cfg { * @brief Callback API for setting up watchdog instance. * See wdt_setup() for argument descriptions */ -typedef int (*wdt_api_setup)(struct device *dev, u8_t options); +typedef int (*wdt_api_setup)(const struct device *dev, u8_t options); /** * @typedef wdt_api_disable * @brief Callback API for disabling watchdog instance. * See wdt_disable() for argument descriptions */ -typedef int (*wdt_api_disable)(struct device *dev); +typedef int (*wdt_api_disable)(const struct device *dev); /** * @typedef wdt_api_install_timeout * @brief Callback API for installing new timeout. * See wdt_install_timeout() for argument descriptions */ -typedef int (*wdt_api_install_timeout)(struct device *dev, +typedef int (*wdt_api_install_timeout)(const struct device *dev, const struct wdt_timeout_cfg *cfg); /** @@ -132,7 +132,7 @@ typedef int (*wdt_api_install_timeout)(struct device *dev, * @brief Callback API for feeding specified watchdog timeout. * See (wdt_feed) for argument descriptions */ -typedef int (*wdt_api_feed)(struct device *dev, int channel_id); +typedef int (*wdt_api_feed)(const struct device *dev, int channel_id); /** @cond INTERNAL_HIDDEN */ __subsystem struct wdt_driver_api { @@ -160,9 +160,9 @@ __subsystem struct wdt_driver_api { * @retval -ENOTSUP If any of the set options is not supported. * @retval -EBUSY If watchdog instance has been already setup. */ -__syscall int wdt_setup(struct device *dev, u8_t options); +__syscall int wdt_setup(const struct device *dev, u8_t options); -static inline int z_impl_wdt_setup(struct device *dev, u8_t options) +static inline int z_impl_wdt_setup(const struct device *dev, u8_t options) { const struct wdt_driver_api *api = (const struct wdt_driver_api *)dev->driver_api; @@ -183,9 +183,9 @@ static inline int z_impl_wdt_setup(struct device *dev, u8_t options) * @retval -EFAULT If watchdog instance is not enabled. * @retval -EPERM If watchdog can not be disabled directly by application code. */ -__syscall int wdt_disable(struct device *dev); +__syscall int wdt_disable(const struct device *dev); -static inline int z_impl_wdt_disable(struct device *dev) +static inline int z_impl_wdt_disable(const struct device *dev) { const struct wdt_driver_api *api = (const struct wdt_driver_api *)dev->driver_api; @@ -215,7 +215,7 @@ static inline int z_impl_wdt_disable(struct device *dev) * timeout value for all timeouts and the supplied timeout * window differs from windows for alarms installed so far. */ -static inline int wdt_install_timeout(struct device *dev, +static inline int wdt_install_timeout(const struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct wdt_driver_api *api = @@ -233,9 +233,9 @@ static inline int wdt_install_timeout(struct device *dev, * @retval 0 If successful. * @retval -EINVAL If there is no installed timeout for supplied channel. */ -__syscall int wdt_feed(struct device *dev, int channel_id); +__syscall int wdt_feed(const struct device *dev, int channel_id); -static inline int z_impl_wdt_feed(struct device *dev, int channel_id) +static inline int z_impl_wdt_feed(const struct device *dev, int channel_id) { const struct wdt_driver_api *api = (const struct wdt_driver_api *)dev->driver_api; diff --git a/include/fs/nvs.h b/include/fs/nvs.h index 471489c9dd47..d9467329d529 100644 --- a/include/fs/nvs.h +++ b/include/fs/nvs.h @@ -56,7 +56,7 @@ struct nvs_fs { bool ready; /* is the filesystem initialized ? */ struct k_mutex nvs_lock; - struct device *flash_device; + const struct device *flash_device; }; /** diff --git a/include/init.h b/include/init.h index e1977e875881..0e6e334375ec 100644 --- a/include/init.h +++ b/include/init.h @@ -41,8 +41,8 @@ struct device; * if the init entry is not used for a device driver but a service. */ struct init_entry { - int (*init)(struct device *dev); - struct device *dev; + int (*init)(const struct device *dev); + const struct device *dev; }; void z_sys_init_run_level(s32_t level); diff --git a/include/irq_nextlevel.h b/include/irq_nextlevel.h index 206c631e029d..d6fdacbd2ad1 100644 --- a/include/irq_nextlevel.h +++ b/include/irq_nextlevel.h @@ -21,11 +21,13 @@ extern "C" { * These are for internal use only, so skip these in * public documentation. */ -typedef void (*irq_next_level_func_t)(struct device *dev, unsigned int irq); -typedef unsigned int (*irq_next_level_get_state_t)(struct device *dev); -typedef void (*irq_next_level_priority_t)(struct device *dev, - unsigned int irq, unsigned int prio, u32_t flags); -typedef int (*irq_next_level_get_line_state_t)(struct device *dev, +typedef void (*irq_next_level_func_t)(const struct device *dev, + unsigned int irq); +typedef unsigned int (*irq_next_level_get_state_t)(const struct device *dev); +typedef void (*irq_next_level_priority_t)(const struct device *dev, + unsigned int irq, unsigned int prio, + u32_t flags); +typedef int (*irq_next_level_get_line_state_t)(const struct device *dev, unsigned int irq); struct irq_next_level_api { @@ -49,7 +51,7 @@ struct irq_next_level_api { * * @return N/A */ -static inline void irq_enable_next_level(struct device *dev, u32_t irq) +static inline void irq_enable_next_level(const struct device *dev, u32_t irq) { const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api; @@ -67,7 +69,7 @@ static inline void irq_enable_next_level(struct device *dev, u32_t irq) * * @return N/A */ -static inline void irq_disable_next_level(struct device *dev, u32_t irq) +static inline void irq_disable_next_level(const struct device *dev, u32_t irq) { const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api; @@ -85,7 +87,7 @@ static inline void irq_disable_next_level(struct device *dev, u32_t irq) * * @return interrupt enable state, true or false */ -static inline unsigned int irq_is_enabled_next_level(struct device *dev) +static inline unsigned int irq_is_enabled_next_level(const struct device *dev) { const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api; @@ -106,8 +108,9 @@ static inline unsigned int irq_is_enabled_next_level(struct device *dev) * * @return N/A */ -static inline void irq_set_priority_next_level(struct device *dev, u32_t irq, - u32_t prio, u32_t flags) +static inline void irq_set_priority_next_level(const struct device *dev, + u32_t irq, + u32_t prio, u32_t flags) { const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api; @@ -126,7 +129,7 @@ static inline void irq_set_priority_next_level(struct device *dev, u32_t irq, * * @return interrupt enable state, true or false */ -static inline unsigned int irq_line_is_enabled_next_level(struct device *dev, +static inline unsigned int irq_line_is_enabled_next_level(const struct device *dev, unsigned int irq) { const struct irq_next_level_api *api = diff --git a/include/kernel.h b/include/kernel.h index cc646216325a..47940056d656 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -233,7 +233,7 @@ struct z_object_assignment { * * @param obj Address of the kernel object */ -void z_object_init(void *obj); +void z_object_init(const void *obj); #else /* LCOV_EXCL_START */ #define K_THREAD_ACCESS_GRANT(thread, ...) @@ -241,7 +241,7 @@ void z_object_init(void *obj); /** * @internal */ -static inline void z_object_init(void *obj) +static inline void z_object_init(const void *obj) { ARG_UNUSED(obj); } @@ -249,7 +249,7 @@ static inline void z_object_init(void *obj) /** * @internal */ -static inline void z_impl_k_object_access_grant(void *object, +static inline void z_impl_k_object_access_grant(const void *object, struct k_thread *thread) { ARG_UNUSED(object); @@ -259,7 +259,7 @@ static inline void z_impl_k_object_access_grant(void *object, /** * @internal */ -static inline void k_object_access_revoke(void *object, +static inline void k_object_access_revoke(const void *object, struct k_thread *thread) { ARG_UNUSED(object); @@ -269,12 +269,12 @@ static inline void k_object_access_revoke(void *object, /** * @internal */ -static inline void z_impl_k_object_release(void *object) +static inline void z_impl_k_object_release(const void *object) { ARG_UNUSED(object); } -static inline void k_object_access_all_grant(void *object) +static inline void k_object_access_all_grant(const void *object) { ARG_UNUSED(object); } @@ -291,7 +291,7 @@ static inline void k_object_access_all_grant(void *object) * @param object Address of kernel object * @param thread Thread to grant access to the object */ -__syscall void k_object_access_grant(void *object, struct k_thread *thread); +__syscall void k_object_access_grant(const void *object, struct k_thread *thread); /** * Revoke a thread's access to a kernel object @@ -303,7 +303,7 @@ __syscall void k_object_access_grant(void *object, struct k_thread *thread); * @param object Address of kernel object * @param thread Thread to remove access to the object */ -void k_object_access_revoke(void *object, struct k_thread *thread); +void k_object_access_revoke(const void *object, struct k_thread *thread); /** * @brief Release an object @@ -314,7 +314,7 @@ void k_object_access_revoke(void *object, struct k_thread *thread); * @param object The object to be released * */ -__syscall void k_object_release(void *object); +__syscall void k_object_release(const void *object); /** * Grant all present and future threads access to an object @@ -333,7 +333,7 @@ __syscall void k_object_release(void *object); * * @param object Address of kernel object */ -void k_object_access_all_grant(void *object); +void k_object_access_all_grant(const void *object); /** * Allocate a kernel object of a designated type diff --git a/include/net/can.h b/include/net/can.h index 61f3ca81bf6a..d452a4c8b242 100644 --- a/include/net/can.h +++ b/include/net/can.h @@ -99,15 +99,15 @@ struct net_can_api { struct net_if_api iface_api; /** Send a single CAN frame */ - int (*send)(struct device *dev, const struct zcan_frame *frame, + int (*send)(const struct device *dev, const struct zcan_frame *frame, can_tx_callback_t cb, void *cb_arg, k_timeout_t timeout); /** Attach a filter with it's callback */ - int (*attach_filter)(struct device *dev, can_rx_callback_t cb, + int (*attach_filter)(const struct device *dev, can_rx_callback_t cb, void *cb_arg, const struct zcan_filter *filter); /** Detach a filter */ - void (*detach_filter)(struct device *dev, int filter_id); + void (*detach_filter)(const struct device *dev, int filter_id); /** Enable or disable the reception of frames for net CAN */ - int (*enable)(struct device *dev, bool enable); + int (*enable)(const struct device *dev, bool enable); }; /* Make sure that the network interface API is properly setup inside diff --git a/include/net/dummy.h b/include/net/dummy.h index 4f3344fcfedb..3aeca7b0ebce 100644 --- a/include/net/dummy.h +++ b/include/net/dummy.h @@ -30,7 +30,7 @@ struct dummy_api { struct net_if_api iface_api; /** Send a network packet */ - int (*send)(struct device *dev, struct net_pkt *pkt); + int (*send)(const struct device *dev, struct net_pkt *pkt); }; /* Make sure that the network interface API is properly setup inside diff --git a/include/net/ethernet.h b/include/net/ethernet.h index 843ebd14ea0e..9caedec17851 100644 --- a/include/net/ethernet.h +++ b/include/net/ethernet.h @@ -224,25 +224,25 @@ struct ethernet_api { * should be set by driver if statistics needs to be collected * for that driver. */ - struct net_stats_eth *(*get_stats)(struct device *dev); + struct net_stats_eth *(*get_stats)(const struct device *dev); #endif /** Start the device */ - int (*start)(struct device *dev); + int (*start)(const struct device *dev); /** Stop the device */ - int (*stop)(struct device *dev); + int (*stop)(const struct device *dev); /** Get the device capabilities */ - enum ethernet_hw_caps (*get_capabilities)(struct device *dev); + enum ethernet_hw_caps (*get_capabilities)(const struct device *dev); /** Set specific hardware configuration */ - int (*set_config)(struct device *dev, + int (*set_config)(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config); /** Get hardware specific configuration */ - int (*get_config)(struct device *dev, + int (*get_config)(const struct device *dev, enum ethernet_config_type type, struct ethernet_config *config); @@ -252,17 +252,17 @@ struct ethernet_api { * if it is false then the tag was removed. The driver can utilize * this information if needed. */ - int (*vlan_setup)(struct device *dev, struct net_if *iface, + int (*vlan_setup)(const struct device *dev, struct net_if *iface, u16_t tag, bool enable); #endif /* CONFIG_NET_VLAN */ #if defined(CONFIG_PTP_CLOCK) /** Return ptp_clock device that is tied to this ethernet device */ - struct device *(*get_ptp_clock)(struct device *dev); + const struct device *(*get_ptp_clock)(const struct device *dev); #endif /* CONFIG_PTP_CLOCK */ /** Send a network packet */ - int (*send)(struct device *dev, struct net_pkt *pkt); + int (*send)(const struct device *dev, struct net_pkt *pkt); }; /* Make sure that the network interface API is properly setup inside @@ -680,9 +680,9 @@ int net_eth_promisc_mode(struct net_if *iface, bool enable); * ethernet interface does not support PTP. */ #if defined(CONFIG_PTP_CLOCK) -struct device *net_eth_get_ptp_clock(struct net_if *iface); +const struct device *net_eth_get_ptp_clock(struct net_if *iface); #else -static inline struct device *net_eth_get_ptp_clock(struct net_if *iface) +static inline const struct device *net_eth_get_ptp_clock(struct net_if *iface) { ARG_UNUSED(iface); @@ -699,7 +699,7 @@ static inline struct device *net_eth_get_ptp_clock(struct net_if *iface) * @return Pointer to PTP clock if found, NULL if not found or if this * ethernet interface index does not support PTP. */ -__syscall struct device *net_eth_get_ptp_clock_by_index(int index); +__syscall const struct device *net_eth_get_ptp_clock_by_index(int index); /** * @brief Return gPTP port number attached to this interface. diff --git a/include/net/ieee802154_radio.h b/include/net/ieee802154_radio.h index 51ea4f2f56f4..493dd0a14f41 100644 --- a/include/net/ieee802154_radio.h +++ b/include/net/ieee802154_radio.h @@ -50,9 +50,9 @@ enum ieee802154_event { IEEE802154_EVENT_TX_STARTED /* Data transmission started */ }; -typedef void (*energy_scan_done_cb_t)(struct device *dev, s16_t max_ed); +typedef void (*energy_scan_done_cb_t)(const struct device *dev, s16_t max_ed); -typedef void (*ieee802154_event_cb_t)(struct device *dev, +typedef void (*ieee802154_event_cb_t)(const struct device *dev, enum ieee802154_event evt, void *event_params); @@ -167,48 +167,48 @@ struct ieee802154_radio_api { struct net_if_api iface_api; /** Get the device capabilities */ - enum ieee802154_hw_caps (*get_capabilities)(struct device *dev); + enum ieee802154_hw_caps (*get_capabilities)(const struct device *dev); /** Clear Channel Assesment - Check channel's activity */ - int (*cca)(struct device *dev); + int (*cca)(const struct device *dev); /** Set current channel */ - int (*set_channel)(struct device *dev, u16_t channel); + int (*set_channel)(const struct device *dev, u16_t channel); /** Set/Unset filters (for IEEE802154_HW_FILTER ) */ - int (*filter)(struct device *dev, + int (*filter)(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter); /** Set TX power level in dbm */ - int (*set_txpower)(struct device *dev, s16_t dbm); + int (*set_txpower)(const struct device *dev, s16_t dbm); /** Transmit a packet fragment */ - int (*tx)(struct device *dev, enum ieee802154_tx_mode mode, + int (*tx)(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag); /** Start the device */ - int (*start)(struct device *dev); + int (*start)(const struct device *dev); /** Stop the device */ - int (*stop)(struct device *dev); + int (*stop)(const struct device *dev); /** Set specific radio driver configuration. */ - int (*configure)(struct device *dev, + int (*configure)(const struct device *dev, enum ieee802154_config_type type, const struct ieee802154_config *config); #ifdef CONFIG_NET_L2_IEEE802154_SUB_GHZ /** Get the available amount of Sub-GHz channels */ - u16_t (*get_subg_channel_count)(struct device *dev); + u16_t (*get_subg_channel_count)(const struct device *dev); #endif /* CONFIG_NET_L2_IEEE802154_SUB_GHZ */ /** Run an energy detection scan. * Note: channel must be set prior to request this function. * duration parameter is in ms. */ - int (*ed_scan)(struct device *dev, + int (*ed_scan)(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb); }; diff --git a/include/net/net_if.h b/include/net/net_if.h index c879f6048294..1bb36e5fd900 100644 --- a/include/net/net_if.h +++ b/include/net/net_if.h @@ -422,7 +422,7 @@ struct net_traffic_class { */ struct net_if_dev { /** The actually device driver instance the net_if is related to */ - struct device *dev; + const struct device *dev; /** Interface's L2 layer */ const struct net_l2 * const l2; @@ -597,7 +597,7 @@ static inline void *net_if_l2_data(struct net_if *iface) * * @return a pointer to the device driver instance */ -static inline struct device *net_if_get_device(struct net_if *iface) +static inline const struct device *net_if_get_device(struct net_if *iface) { return iface->if_dev->dev; } @@ -802,7 +802,7 @@ struct net_if *net_if_get_by_link_addr(struct net_linkaddr *ll_addr); * * @return a valid struct net_if pointer on success, NULL otherwise */ -struct net_if *net_if_lookup_by_dev(struct device *dev); +struct net_if *net_if_lookup_by_dev(const struct device *dev); /** * @brief Get network interface IP config diff --git a/include/net/ppp.h b/include/net/ppp.h index fb1c1ca400ad..1cd7c52ad7ff 100644 --- a/include/net/ppp.h +++ b/include/net/ppp.h @@ -45,20 +45,20 @@ struct ppp_api { struct net_if_api iface_api; /** Start the device */ - int (*start)(struct device *dev); + int (*start)(const struct device *dev); /** Stop the device */ - int (*stop)(struct device *dev); + int (*stop)(const struct device *dev); /** Send a network packet */ - int (*send)(struct device *dev, struct net_pkt *pkt); + int (*send)(const struct device *dev, struct net_pkt *pkt); #if defined(CONFIG_NET_STATISTICS_PPP) /** Collect optional PPP specific statistics. This pointer * should be set by driver if statistics needs to be collected * for that driver. */ - struct net_stats_ppp *(*get_stats)(struct device *dev); + struct net_stats_ppp *(*get_stats)(const struct device *dev); #endif }; diff --git a/include/net/socket_can.h b/include/net/socket_can.h index 8aaf3d196c44..cb86721e5520 100644 --- a/include/net/socket_can.h +++ b/include/net/socket_can.h @@ -63,17 +63,19 @@ struct canbus_api { struct net_if_api iface_api; /** Send a CAN packet by socket */ - int (*send)(struct device *dev, struct net_pkt *pkt); + int (*send)(const struct device *dev, struct net_pkt *pkt); /** Close the related CAN socket */ - void (*close)(struct device *dev, int filter_id); + void (*close)(const struct device *dev, int filter_id); /** Set socket CAN option */ - int (*setsockopt)(struct device *dev, void *obj, int level, int optname, + int (*setsockopt)(const struct device *dev, void *obj, int level, + int optname, const void *optval, socklen_t optlen); /** Get socket CAN option */ - int (*getsockopt)(struct device *dev, void *obj, int level, int optname, + int (*getsockopt)(const struct device *dev, void *obj, int level, + int optname, const void *optval, socklen_t *optlen); }; diff --git a/include/net/wifi_mgmt.h b/include/net/wifi_mgmt.h index 114f483395f1..8d95b4b73c86 100644 --- a/include/net/wifi_mgmt.h +++ b/include/net/wifi_mgmt.h @@ -122,13 +122,13 @@ struct net_wifi_mgmt_offload { * result by the driver. The wifi mgmt part will take care of * raising the necessary event etc... */ - int (*scan)(struct device *dev, scan_result_cb_t cb); - int (*connect)(struct device *dev, + int (*scan)(const struct device *dev, scan_result_cb_t cb); + int (*connect)(const struct device *dev, struct wifi_connect_req_params *params); - int (*disconnect)(struct device *dev); - int (*ap_enable)(struct device *dev, + int (*disconnect)(const struct device *dev); + int (*ap_enable)(const struct device *dev, struct wifi_connect_req_params *params); - int (*ap_disable)(struct device *dev); + int (*ap_disable)(const struct device *dev); }; /* Make sure that the network interface API is properly setup inside diff --git a/include/ptp_clock.h b/include/ptp_clock.h index 803912870d81..7f2704b2b42d 100644 --- a/include/ptp_clock.h +++ b/include/ptp_clock.h @@ -23,10 +23,10 @@ extern "C" { #endif __subsystem struct ptp_clock_driver_api { - int (*set)(struct device *dev, struct net_ptp_time *tm); - int (*get)(struct device *dev, struct net_ptp_time *tm); - int (*adjust)(struct device *dev, int increment); - int (*rate_adjust)(struct device *dev, float ratio); + int (*set)(const struct device *dev, struct net_ptp_time *tm); + int (*get)(const struct device *dev, struct net_ptp_time *tm); + int (*adjust)(const struct device *dev, int increment); + int (*rate_adjust)(const struct device *dev, float ratio); }; /** @@ -37,7 +37,8 @@ __subsystem struct ptp_clock_driver_api { * * @return 0 if ok, <0 if error */ -static inline int ptp_clock_set(struct device *dev, struct net_ptp_time *tm) +static inline int ptp_clock_set(const struct device *dev, + struct net_ptp_time *tm) { const struct ptp_clock_driver_api *api = (const struct ptp_clock_driver_api *)dev->driver_api; @@ -53,9 +54,9 @@ static inline int ptp_clock_set(struct device *dev, struct net_ptp_time *tm) * * @return 0 if ok, <0 if error */ -__syscall int ptp_clock_get(struct device *dev, struct net_ptp_time *tm); +__syscall int ptp_clock_get(const struct device *dev, struct net_ptp_time *tm); -static inline int z_impl_ptp_clock_get(struct device *dev, +static inline int z_impl_ptp_clock_get(const struct device *dev, struct net_ptp_time *tm) { const struct ptp_clock_driver_api *api = @@ -72,7 +73,7 @@ static inline int z_impl_ptp_clock_get(struct device *dev, * * @return 0 if ok, <0 if error */ -static inline int ptp_clock_adjust(struct device *dev, int increment) +static inline int ptp_clock_adjust(const struct device *dev, int increment) { const struct ptp_clock_driver_api *api = (const struct ptp_clock_driver_api *)dev->driver_api; @@ -88,7 +89,7 @@ static inline int ptp_clock_adjust(struct device *dev, int increment) * * @return 0 if ok, <0 if error */ -static inline int ptp_clock_rate_adjust(struct device *dev, float rate) +static inline int ptp_clock_rate_adjust(const struct device *dev, float rate) { const struct ptp_clock_driver_api *api = (const struct ptp_clock_driver_api *)dev->driver_api; diff --git a/include/shared_irq.h b/include/shared_irq.h index ef9950cea769..e5947bccbd54 100644 --- a/include/shared_irq.h +++ b/include/shared_irq.h @@ -15,14 +15,16 @@ extern "C" { #endif -typedef int (*isr_t)(struct device *dev); +typedef int (*isr_t)(const struct device *dev); /* driver API definition */ -typedef int (*shared_irq_register_t)(struct device *dev, - isr_t isr_func, - struct device *isr_dev); -typedef int (*shared_irq_enable_t)(struct device *dev, struct device *isr_dev); -typedef int (*shared_irq_disable_t)(struct device *dev, struct device *isr_dev); +typedef int (*shared_irq_register_t)(const struct device *dev, + isr_t isr_func, + const struct device *isr_dev); +typedef int (*shared_irq_enable_t)(const struct device *dev, + const struct device *isr_dev); +typedef int (*shared_irq_disable_t)(const struct device *dev, + const struct device *isr_dev); struct shared_irq_driver_api { shared_irq_register_t isr_register; @@ -30,7 +32,7 @@ struct shared_irq_driver_api { shared_irq_disable_t disable; }; -extern int shared_irq_initialize(struct device *port); +extern int shared_irq_initialize(const struct device *port); typedef void (*shared_irq_config_irq_t)(void); @@ -41,7 +43,7 @@ struct shared_irq_config { }; struct shared_irq_client { - struct device *isr_dev; + const struct device *isr_dev; isr_t isr_func; u32_t enabled; }; @@ -56,8 +58,9 @@ struct shared_irq_runtime { * @param isr_func Pointer to the ISR function for the device. * @param isr_dev Pointer to the device that will service the interrupt. */ -static inline int shared_irq_isr_register(struct device *dev, isr_t isr_func, - struct device *isr_dev) +static inline int shared_irq_isr_register(const struct device *dev, + isr_t isr_func, + const struct device *isr_dev) { const struct shared_irq_driver_api *api = (const struct shared_irq_driver_api *)dev->driver_api; @@ -70,7 +73,8 @@ static inline int shared_irq_isr_register(struct device *dev, isr_t isr_func, * @param dev Pointer to device structure for SHARED_IRQ driver instance. * @param isr_dev Pointer to the device that will service the interrupt. */ -static inline int shared_irq_enable(struct device *dev, struct device *isr_dev) +static inline int shared_irq_enable(const struct device *dev, + const struct device *isr_dev) { const struct shared_irq_driver_api *api = (const struct shared_irq_driver_api *)dev->driver_api; @@ -83,7 +87,8 @@ static inline int shared_irq_enable(struct device *dev, struct device *isr_dev) * @param dev Pointer to device structure for SHARED_IRQ driver instance. * @param isr_dev Pointer to the device that will service the interrupt. */ -static inline int shared_irq_disable(struct device *dev, struct device *isr_dev) +static inline int shared_irq_disable(const struct device *dev, + const struct device *isr_dev) { const struct shared_irq_driver_api *api = (const struct shared_irq_driver_api *)dev->driver_api; diff --git a/include/shell/shell_uart.h b/include/shell/shell_uart.h index 6f2ae8ac0acc..bdbd0bcfaca2 100644 --- a/include/shell/shell_uart.h +++ b/include/shell/shell_uart.h @@ -22,7 +22,7 @@ extern const struct shell_transport_api shell_uart_transport_api; /** @brief Shell UART transport instance control block (RW data). */ struct shell_uart_ctrl_blk { - struct device *dev; + const struct device *dev; shell_transport_handler_t handler; void *context; atomic_t tx_busy; diff --git a/include/storage/flash_map.h b/include/storage/flash_map.h index 6449cb18cbfa..c50b52e4fb1d 100644 --- a/include/storage/flash_map.h +++ b/include/storage/flash_map.h @@ -207,7 +207,7 @@ int flash_area_has_driver(const struct flash_area *fa); * * @return device driver. */ -struct device *flash_area_get_device(const struct flash_area *fa); +const struct device *flash_area_get_device(const struct flash_area *fa); #define FLASH_AREA_LABEL_EXISTS(label) \ DT_HAS_FIXED_PARTITION_LABEL(label) diff --git a/include/storage/stream_flash.h b/include/storage/stream_flash.h index 484718fde392..3b13aeba3721 100644 --- a/include/storage/stream_flash.h +++ b/include/storage/stream_flash.h @@ -54,7 +54,7 @@ struct stream_flash_ctx { u8_t *buf; /* Write buffer */ size_t buf_len; /* Length of write buffer */ size_t buf_bytes; /* Number of bytes currently stored in write buf */ - struct device *fdev; /* Flash device */ + const struct device *fdev; /* Flash device */ size_t bytes_written; /* Number of bytes written to flash */ size_t offset; /* Offset from base of flash device to write area */ size_t available; /* Available bytes in write area */ @@ -79,7 +79,7 @@ struct stream_flash_ctx { * * @return non-negative on success, negative errno code on fail */ -int stream_flash_init(struct stream_flash_ctx *ctx, struct device *fdev, +int stream_flash_init(struct stream_flash_ctx *ctx, const struct device *fdev, u8_t *buf, size_t buf_len, size_t offset, size_t size, stream_flash_callback_t cb); /** diff --git a/include/syscall_handler.h b/include/syscall_handler.h index 7185a995c4ce..300a1fea967e 100644 --- a/include/syscall_handler.h +++ b/include/syscall_handler.h @@ -57,7 +57,7 @@ int z_object_validate(struct z_object *ko, enum k_objects otype, * @param ko If retval=-EPERM, struct z_object * that was looked up, or NULL * @param otype Expected type of the kernel object */ -extern void z_dump_object_error(int retval, void *obj, struct z_object *ko, +extern void z_dump_object_error(int retval, const void *obj, struct z_object *ko, enum k_objects otype); /** @@ -70,7 +70,7 @@ extern void z_dump_object_error(int retval, void *obj, struct z_object *ko, * @return Kernel object's metadata, or NULL if the parameter wasn't the * memory address of a kernel object */ -extern struct z_object *z_object_find(void *obj); +extern struct z_object *z_object_find(const void *obj); typedef void (*_wordlist_cb_func_t)(struct z_object *ko, void *context); @@ -414,7 +414,7 @@ static inline int z_obj_validation_check(struct z_object *ko, } #define Z_SYSCALL_IS_OBJ(ptr, type, init) \ - Z_SYSCALL_VERIFY_MSG(z_obj_validation_check(z_object_find((void *)ptr), (void *)ptr, \ + Z_SYSCALL_VERIFY_MSG(z_obj_validation_check(z_object_find((const void *)ptr), (void *)ptr, \ type, init) == 0, "access denied") /** @@ -430,7 +430,7 @@ static inline int z_obj_validation_check(struct z_object *ko, #define Z_SYSCALL_DRIVER_OP(ptr, api_name, op) \ ({ \ struct api_name *__device__ = (struct api_name *) \ - ((struct device *)ptr)->driver_api; \ + ((const struct device *)ptr)->driver_api; \ Z_SYSCALL_VERIFY_MSG(__device__->op != NULL, \ "Operation %s not defined for driver " \ "instance %p", \ @@ -457,10 +457,12 @@ static inline int z_obj_validation_check(struct z_object *ko, */ #define Z_SYSCALL_SPECIFIC_DRIVER(_device, _dtype, _api) \ ({ \ - struct device *_dev = (struct device *)_device; \ + const struct device *_dev = (const struct device *)_device; \ Z_SYSCALL_OBJ(_dev, _dtype) || \ Z_SYSCALL_VERIFY_MSG(_dev->driver_api == _api, \ - "API structure mismatch"); \ + "API structure mismatch") || \ + Z_SYSCALL_VERIFY_MSG(_dev->driver_context->init_ok, \ + "Driver not initialized"); \ }) /** diff --git a/include/usb/class/usb_audio.h b/include/usb/class/usb_audio.h index 496109508abc..7b8a53f66789 100644 --- a/include/usb/class/usb_audio.h +++ b/include/usb/class/usb_audio.h @@ -199,8 +199,8 @@ typedef void (*usb_audio_data_completion_cb_t)(const struct device *dev, * Pointer sturct is temporary and is valid only during the * execution of this callback. */ -typedef void (*usb_audio_feature_updated_cb_t)(struct device *dev, - const struct usb_audio_fu_evt *evt); +typedef void (*usb_audio_feature_updated_cb_t)(const struct device *dev, + const struct usb_audio_fu_evt *evt); /** * @brief Audio callbacks used to interact with audio devices by user App. @@ -257,7 +257,7 @@ size_t usb_audio_get_in_frame_size(const struct device *dev); * @param ops USB audio callback structure. Callback are used to * inform the user about what is happening */ -void usb_audio_register(struct device *dev, +void usb_audio_register(const struct device *dev, const struct usb_audio_ops *ops); /** diff --git a/include/usb/class/usb_hid.h b/include/usb/class/usb_hid.h index 83cc7defbcdb..ecf1e3f48ea4 100644 --- a/include/usb/class/usb_hid.h +++ b/include/usb/class/usb_hid.h @@ -431,7 +431,8 @@ enum hid_kbd_led { }; /* Register HID device */ -void usb_hid_register_device(struct device *dev, const u8_t *desc, size_t size, +void usb_hid_register_device(const struct device *dev, const u8_t *desc, + size_t size, const struct hid_ops *op); /* Write to hid interrupt endpoint */ diff --git a/kernel/device.c b/kernel/device.c index 5dd4e5b79000..7946396785dd 100644 --- a/kernel/device.c +++ b/kernel/device.c @@ -56,7 +56,7 @@ void z_sys_init_run_level(s32_t level) const struct init_entry *entry; for (entry = levels[level]; entry < levels[level+1]; entry++) { - struct device *dev = entry->dev; + const struct device *dev = entry->dev; int retval; if (dev != NULL) { @@ -64,21 +64,15 @@ void z_sys_init_run_level(s32_t level) } retval = entry->init(dev); - if (retval != 0) { - if (dev) { - /* Initialization failed. Clear the API struct - * so that device_get_binding() will not succeed - * for it. - */ - dev->driver_api = NULL; - } + if ((retval == 0) && (dev != NULL)) { + dev->driver_context->init_ok = true; } } } -struct device *z_impl_device_get_binding(const char *name) +const struct device *z_impl_device_get_binding(const char *name) { - struct device *dev; + const struct device *dev; /* Split the search into two loops: in the common scenario, where * device names are stored in ROM (and are referenced by the user @@ -103,7 +97,7 @@ struct device *z_impl_device_get_binding(const char *name) } #ifdef CONFIG_USERSPACE -static inline struct device *z_vrfy_device_get_binding(const char *name) +static inline const struct device *z_vrfy_device_get_binding(const char *name) { char name_copy[Z_DEVICE_MAX_NAME_LEN]; @@ -118,16 +112,16 @@ static inline struct device *z_vrfy_device_get_binding(const char *name) #endif /* CONFIG_USERSPACE */ #ifdef CONFIG_DEVICE_POWER_MANAGEMENT -int device_pm_control_nop(struct device *unused_device, - u32_t unused_ctrl_command, - void *unused_context, - device_pm_cb cb, - void *unused_arg) +int device_pm_control_nop(const struct device *unused_device, + u32_t unused_ctrl_command, + void *unused_context, + device_pm_cb cb, + void *unused_arg) { return 0; } -void device_list_get(struct device **device_list, int *device_count) +void device_list_get(const struct device **device_list, int *device_count) { *device_list = __device_start; @@ -147,7 +141,7 @@ int device_any_busy_check(void) return 0; } -int device_busy_check(struct device *chk_dev) +int device_busy_check(const struct device *chk_dev) { if (atomic_test_bit((const atomic_t *)__device_busy_start, (chk_dev - __device_start))) { @@ -158,7 +152,7 @@ int device_busy_check(struct device *chk_dev) #endif -void device_busy_set(struct device *busy_dev) +void device_busy_set(const struct device *busy_dev) { #ifdef CONFIG_DEVICE_POWER_MANAGEMENT atomic_set_bit((atomic_t *) __device_busy_start, @@ -168,7 +162,7 @@ void device_busy_set(struct device *busy_dev) #endif } -void device_busy_clear(struct device *busy_dev) +void device_busy_clear(const struct device *busy_dev) { #ifdef CONFIG_DEVICE_POWER_MANAGEMENT atomic_clear_bit((atomic_t *) __device_busy_start, diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h index 89e8107ef43f..1978d04dad8f 100644 --- a/kernel/include/kernel_offsets.h +++ b/kernel/include/kernel_offsets.h @@ -80,7 +80,7 @@ GEN_OFFSET_SYM(_thread_t, custom_data); GEN_ABSOLUTE_SYM(K_THREAD_SIZEOF, sizeof(struct k_thread)); /* size of the device structure. Used by linker scripts */ -GEN_ABSOLUTE_SYM(_DEVICE_STRUCT_SIZEOF, sizeof(struct device)); +GEN_ABSOLUTE_SYM(_DEVICE_STRUCT_SIZEOF, sizeof(const struct device)); /* LCOV_EXCL_STOP */ #endif /* ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_ */ diff --git a/kernel/init.c b/kernel/init.c index fb25ff3fb3ae..e27d39fe425f 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -377,7 +377,7 @@ void z_early_boot_rand_get(u8_t *buf, size_t length) { int n = sizeof(u32_t); #ifdef CONFIG_ENTROPY_HAS_DRIVER - struct device *entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL); + const struct device *entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL); int rc; if (entropy == NULL) { diff --git a/kernel/kheap.c b/kernel/kheap.c index 12344ceb12c8..e1f6b8ff8eef 100644 --- a/kernel/kheap.c +++ b/kernel/kheap.c @@ -15,7 +15,7 @@ void k_heap_init(struct k_heap *h, void *mem, size_t bytes) sys_heap_init(&h->heap, mem, bytes); } -static int statics_init(struct device *unused) +static int statics_init(const struct device *unused) { ARG_UNUSED(unused); Z_STRUCT_SECTION_FOREACH(k_heap, h) { diff --git a/kernel/mailbox.c b/kernel/mailbox.c index cd9016feb9e1..9dcaf878d2c9 100644 --- a/kernel/mailbox.c +++ b/kernel/mailbox.c @@ -54,7 +54,7 @@ struct k_mbox *_trace_list_k_mbox; /* * Do run-time initialization of mailbox object subsystem. */ -static int init_mbox_module(struct device *dev) +static int init_mbox_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c index 8534ae71ca37..ebb0b60204a7 100644 --- a/kernel/mem_domain.c +++ b/kernel/mem_domain.c @@ -247,7 +247,7 @@ void k_mem_domain_remove_thread(k_tid_t thread) k_spin_unlock(&lock, key); } -static int init_mem_domain_module(struct device *arg) +static int init_mem_domain_module(const struct device *arg) { ARG_UNUSED(arg); diff --git a/kernel/mem_slab.c b/kernel/mem_slab.c index 6c4dc807dd5b..7135ae5d1ff1 100644 --- a/kernel/mem_slab.c +++ b/kernel/mem_slab.c @@ -58,7 +58,7 @@ static int create_free_list(struct k_mem_slab *slab) * * @return N/A */ -static int init_mem_slab_module(struct device *dev) +static int init_mem_slab_module(const struct device *dev) { int rc = 0; ARG_UNUSED(dev); diff --git a/kernel/mempool_sys.c b/kernel/mempool_sys.c index da78107ece5b..3ac8e12ea3eb 100644 --- a/kernel/mempool_sys.c +++ b/kernel/mempool_sys.c @@ -31,7 +31,7 @@ static void k_mem_pool_init(struct k_mem_pool *p) z_sys_mem_pool_base_init(&p->base); } -int init_static_pools(struct device *unused) +int init_static_pools(const struct device *unused) { ARG_UNUSED(unused); diff --git a/kernel/msg_q.c b/kernel/msg_q.c index f7351f28ea75..a325ca4d83a5 100644 --- a/kernel/msg_q.c +++ b/kernel/msg_q.c @@ -32,7 +32,7 @@ struct k_msgq *_trace_list_k_msgq; /* * Complete initialization of statically defined message queues. */ -static int init_msgq_module(struct device *dev) +static int init_msgq_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/mutex.c b/kernel/mutex.c index b22c9ae76cfb..d75d9ca9e22f 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -54,7 +54,7 @@ struct k_mutex *_trace_list_k_mutex; /* * Complete initialization of statically defined mutexes. */ -static int init_mutex_module(struct device *dev) +static int init_mutex_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/pipes.c b/kernel/pipes.c index d28d7a33cf69..22348ecaee49 100644 --- a/kernel/pipes.c +++ b/kernel/pipes.c @@ -83,7 +83,7 @@ static void pipe_async_finish(struct k_pipe_async *async_desc) /* * Do run-time initialization of pipe object subsystem. */ -static int init_pipes_module(struct device *dev) +static int init_pipes_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/queue.c b/kernel/queue.c index c60c9f7cc9c7..c6288904d146 100644 --- a/kernel/queue.c +++ b/kernel/queue.c @@ -64,7 +64,7 @@ struct k_queue *_trace_list_k_queue; /* * Complete initialization of statically defined queues. */ -static int init_queue_module(struct device *dev) +static int init_queue_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/sem.c b/kernel/sem.c index acf175eacdbb..cffc3bc97c51 100644 --- a/kernel/sem.c +++ b/kernel/sem.c @@ -46,7 +46,7 @@ struct k_sem *_trace_list_k_sem; /* * Complete initialization of statically defined semaphores. */ -static int init_sem_module(struct device *dev) +static int init_sem_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/stack.c b/kernel/stack.c index be00a1fd3487..c4d56e562293 100644 --- a/kernel/stack.c +++ b/kernel/stack.c @@ -27,7 +27,7 @@ struct k_stack *_trace_list_k_stack; /* * Complete initialization of statically defined stacks. */ -static int init_stack_module(struct device *dev) +static int init_stack_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/system_work_q.c b/kernel/system_work_q.c index 48c6791ea30b..6435ad35333e 100644 --- a/kernel/system_work_q.c +++ b/kernel/system_work_q.c @@ -18,7 +18,7 @@ K_THREAD_STACK_DEFINE(sys_work_q_stack, CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE); struct k_work_q k_sys_work_q; -static int k_sys_work_q_init(struct device *dev) +static int k_sys_work_q_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/timer.c b/kernel/timer.c index 900e88e2a8c3..6ba0d0cc4624 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -22,7 +22,7 @@ struct k_timer *_trace_list_k_timer; /* * Complete initialization of statically defined timers. */ -static int init_timer_module(struct device *dev) +static int init_timer_module(const struct device *dev) { ARG_UNUSED(dev); diff --git a/kernel/userspace.c b/kernel/userspace.c index 281f072c8858..6489c9a6bb81 100644 --- a/kernel/userspace.c +++ b/kernel/userspace.c @@ -117,7 +117,7 @@ struct dyn_obj { u8_t data[]; /* The object itself */ }; -extern struct z_object *z_object_gperf_find(void *obj); +extern struct z_object *z_object_gperf_find(const void *obj); extern void z_object_gperf_wordlist_foreach(_wordlist_cb_func_t func, void *context); @@ -149,7 +149,7 @@ static size_t obj_size_get(enum k_objects otype) switch (otype) { #include default: - ret = sizeof(struct device); + ret = sizeof(const struct device); break; } @@ -326,7 +326,7 @@ void k_object_free(void *obj) } } -struct z_object *z_object_find(void *obj) +struct z_object *z_object_find(const void *obj) { struct z_object *ret; @@ -335,7 +335,11 @@ struct z_object *z_object_find(void *obj) if (ret == NULL) { struct dyn_obj *dynamic_obj; - dynamic_obj = dyn_object_find(obj); + /* The cast to pointer-to-non-const violates MISRA + * 11.8 but is justified since we know dynamic objects + * were not declared with a const qualifier. + */ + dynamic_obj = dyn_object_find((void *)obj); if (dynamic_obj != NULL) { ret = &dynamic_obj->kobj; } @@ -502,7 +506,7 @@ static void dump_permission_error(struct z_object *ko) LOG_HEXDUMP_ERR(ko->perms, sizeof(ko->perms), "permission bitmap"); } -void z_dump_object_error(int retval, void *obj, struct z_object *ko, +void z_dump_object_error(int retval, const void *obj, struct z_object *ko, enum k_objects otype) { switch (retval) { @@ -524,7 +528,7 @@ void z_dump_object_error(int retval, void *obj, struct z_object *ko, } } -void z_impl_k_object_access_grant(void *object, struct k_thread *thread) +void z_impl_k_object_access_grant(const void *object, struct k_thread *thread) { struct z_object *ko = z_object_find(object); @@ -533,7 +537,7 @@ void z_impl_k_object_access_grant(void *object, struct k_thread *thread) } } -void k_object_access_revoke(void *object, struct k_thread *thread) +void k_object_access_revoke(const void *object, struct k_thread *thread) { struct z_object *ko = z_object_find(object); @@ -542,12 +546,12 @@ void k_object_access_revoke(void *object, struct k_thread *thread) } } -void z_impl_k_object_release(void *object) +void z_impl_k_object_release(const void *object) { k_object_access_revoke(object, _current); } -void k_object_access_all_grant(void *object) +void k_object_access_all_grant(const void *object) { struct z_object *ko = z_object_find(object); @@ -589,7 +593,7 @@ int z_object_validate(struct z_object *ko, enum k_objects otype, return 0; } -void z_object_init(void *obj) +void z_object_init(const void *obj) { struct z_object *ko; @@ -757,7 +761,7 @@ int z_user_string_copy(char *dst, const char *src, size_t maxlen) extern char __app_shmem_regions_start[]; extern char __app_shmem_regions_end[]; -static int app_shmem_bss_zero(struct device *unused) +static int app_shmem_bss_zero(const struct device *unused) { struct z_app_region *region, *end; diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c index dc4602ca9110..43a78e87f839 100644 --- a/kernel/userspace_handler.c +++ b/kernel/userspace_handler.c @@ -8,7 +8,7 @@ #include #include -static struct z_object *validate_any_object(void *obj) +static struct z_object *validate_any_object(const void *obj) { struct z_object *ko; int ret; @@ -36,7 +36,7 @@ static struct z_object *validate_any_object(void *obj) * To avoid double z_object_find() lookups, we don't call the implementation * function, but call a level deeper. */ -static inline void z_vrfy_k_object_access_grant(void *object, +static inline void z_vrfy_k_object_access_grant(const void *object, struct k_thread *thread) { struct z_object *ko; @@ -49,7 +49,7 @@ static inline void z_vrfy_k_object_access_grant(void *object, } #include -static inline void z_vrfy_k_object_release(void *object) +static inline void z_vrfy_k_object_release(const void *object) { struct z_object *ko; diff --git a/lib/gui/lvgl/lvgl.c b/lib/gui/lvgl/lvgl.c index c310000b740d..4903a24a0e31 100644 --- a/lib/gui/lvgl/lvgl.c +++ b/lib/gui/lvgl/lvgl.c @@ -88,7 +88,7 @@ static int lvgl_allocate_rendering_buffers(lv_disp_drv_t *disp_drv) u16_t buf_nbr_pixels; u32_t buf_size; struct display_capabilities cap; - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; display_get_capabilities(display_dev, &cap); @@ -153,7 +153,7 @@ static int lvgl_allocate_rendering_buffers(lv_disp_drv_t *disp_drv) K_MSGQ_DEFINE(kscan_msgq, sizeof(lv_indev_data_t), CONFIG_LVGL_POINTER_KSCAN_MSGQ_COUNT, 4); -static void lvgl_pointer_kscan_callback(struct device *dev, u32_t row, +static void lvgl_pointer_kscan_callback(const struct device *dev, u32_t row, u32_t col, bool pressed) { lv_indev_data_t data = { @@ -188,7 +188,7 @@ static bool lvgl_pointer_kscan_read(lv_indev_drv_t *drv, lv_indev_data_t *data) static int lvgl_pointer_kscan_init(void) { - struct device *kscan_dev = + const struct device *kscan_dev = device_get_binding(CONFIG_LVGL_POINTER_KSCAN_DEV_NAME); lv_indev_drv_t indev_drv; @@ -218,11 +218,11 @@ static int lvgl_pointer_kscan_init(void) } #endif /* CONFIG_LVGL_POINTER_KSCAN */ -static int lvgl_init(struct device *dev) +static int lvgl_init(const struct device *dev) { ARG_UNUSED(dev); - struct device *display_dev = + const struct device *display_dev = device_get_binding(CONFIG_LVGL_DISPLAY_DEV_NAME); lv_disp_drv_t disp_drv; diff --git a/lib/gui/lvgl/lvgl_display.c b/lib/gui/lvgl/lvgl_display.c index d3cf127270c3..ccc8ea69d7a3 100644 --- a/lib/gui/lvgl/lvgl_display.c +++ b/lib/gui/lvgl/lvgl_display.c @@ -9,7 +9,7 @@ int set_lvgl_rendering_cb(lv_disp_drv_t *disp_drv) { int err = 0; - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; struct display_capabilities cap; display_get_capabilities(display_dev, &cap); diff --git a/lib/gui/lvgl/lvgl_display_16bit.c b/lib/gui/lvgl/lvgl_display_16bit.c index 66f6d74951f9..7094054d53a6 100644 --- a/lib/gui/lvgl/lvgl_display_16bit.c +++ b/lib/gui/lvgl/lvgl_display_16bit.c @@ -11,7 +11,7 @@ void lvgl_flush_cb_16bit(struct _disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) { - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; u16_t w = area->x2 - area->x1 + 1; u16_t h = area->y2 - area->y1 + 1; struct display_buffer_descriptor desc; diff --git a/lib/gui/lvgl/lvgl_display_24bit.c b/lib/gui/lvgl/lvgl_display_24bit.c index bc75349bb14d..34f80e489b91 100644 --- a/lib/gui/lvgl/lvgl_display_24bit.c +++ b/lib/gui/lvgl/lvgl_display_24bit.c @@ -11,7 +11,7 @@ void lvgl_flush_cb_24bit(struct _disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) { - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; u16_t w = area->x2 - area->x1 + 1; u16_t h = area->y2 - area->y1 + 1; struct display_buffer_descriptor desc; diff --git a/lib/gui/lvgl/lvgl_display_32bit.c b/lib/gui/lvgl/lvgl_display_32bit.c index eebd132c251f..b449c72034e5 100644 --- a/lib/gui/lvgl/lvgl_display_32bit.c +++ b/lib/gui/lvgl/lvgl_display_32bit.c @@ -11,7 +11,7 @@ void lvgl_flush_cb_32bit(struct _disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) { - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; u16_t w = area->x2 - area->x1 + 1; u16_t h = area->y2 - area->y1 + 1; struct display_buffer_descriptor desc; diff --git a/lib/gui/lvgl/lvgl_display_mono.c b/lib/gui/lvgl/lvgl_display_mono.c index 18769a87cbea..a9c442470745 100644 --- a/lib/gui/lvgl/lvgl_display_mono.c +++ b/lib/gui/lvgl/lvgl_display_mono.c @@ -13,7 +13,7 @@ void lvgl_flush_cb_mono(struct _disp_drv_t *disp_drv, { u16_t w = area->x2 - area->x1 + 1; u16_t h = area->y2 - area->y1 + 1; - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; struct display_capabilities cap; struct display_buffer_descriptor desc; @@ -37,7 +37,7 @@ void lvgl_set_px_cb_mono(struct _disp_drv_t *disp_drv, u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa) { - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; u8_t *buf_xy; u8_t bit; struct display_capabilities cap; @@ -80,7 +80,7 @@ void lvgl_set_px_cb_mono(struct _disp_drv_t *disp_drv, void lvgl_rounder_cb_mono(struct _disp_drv_t *disp_drv, lv_area_t *area) { - struct device *display_dev = (struct device *)disp_drv->user_data; + const struct device *display_dev = (const struct device *)disp_drv->user_data; struct display_capabilities cap; display_get_capabilities(display_dev, &cap); diff --git a/lib/gui/lvgl/lvgl_mem_user.c b/lib/gui/lvgl/lvgl_mem_user.c index fc7714a11b82..e52a54b7b72a 100644 --- a/lib/gui/lvgl/lvgl_mem_user.c +++ b/lib/gui/lvgl/lvgl_mem_user.c @@ -24,7 +24,7 @@ void lvgl_free(void *ptr) sys_mem_pool_free(ptr); } -static int lvgl_mem_pool_init(struct device *unused) +static int lvgl_mem_pool_init(const struct device *unused) { sys_mem_pool_init(&lvgl_mem_pool); return 0; diff --git a/lib/libc/minimal/source/stdlib/malloc.c b/lib/libc/minimal/source/stdlib/malloc.c index 3d1d654a1d67..42ef126bbf07 100644 --- a/lib/libc/minimal/source/stdlib/malloc.c +++ b/lib/libc/minimal/source/stdlib/malloc.c @@ -42,7 +42,7 @@ void *malloc(size_t size) return ret; } -static int malloc_prepare(struct device *unused) +static int malloc_prepare(const struct device *unused) { ARG_UNUSED(unused); diff --git a/lib/libc/newlib/libc-hooks.c b/lib/libc/newlib/libc-hooks.c index 89712bc74e59..f298f4be2883 100644 --- a/lib/libc/newlib/libc-hooks.c +++ b/lib/libc/newlib/libc-hooks.c @@ -79,7 +79,7 @@ extern void *_heap_sentry; #ifdef CONFIG_USERSPACE struct k_mem_partition z_malloc_partition; -static int malloc_prepare(struct device *unused) +static int malloc_prepare(const struct device *unused) { ARG_UNUSED(unused); diff --git a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c index ba8b22c23c3a..f2556ca29b70 100644 --- a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c +++ b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c @@ -16,14 +16,14 @@ static struct hello_world_dev_data { u32_t foo; } data; -static int init(struct device *dev) +static int init(const struct device *dev) { data.foo = 5; return 0; } -static void print_impl(struct device *dev) +static void print_impl(const struct device *dev) { printk("Hello World from the kernel: %d\n", data.foo); diff --git a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h index c8c1914b34f0..7cb9bdf2f108 100644 --- a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h +++ b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h @@ -28,11 +28,11 @@ struct hello_world_driver_api { * pointer to a function that takes 'struct device *dev' as an * argument and returns 'void'. */ - void (*print)(struct device *dev); + void (*print)(const struct device *dev); }; -__syscall void hello_world_print(struct device *dev); -static inline void z_impl_hello_world_print(struct device *dev) +__syscall void hello_world_print(const struct device *dev); +static inline void z_impl_hello_world_print(const struct device *dev) { const struct hello_world_driver_api *api = dev->driver_api; diff --git a/samples/application_development/out_of_tree_driver/src/main.c b/samples/application_development/out_of_tree_driver/src/main.c index 9d8cf322b957..a82d01d34809 100644 --- a/samples/application_development/out_of_tree_driver/src/main.c +++ b/samples/application_development/out_of_tree_driver/src/main.c @@ -12,7 +12,7 @@ void main(void) { printk("Hello World from the app!\n"); - struct device *dev = device_get_binding("CUSTOM_DRIVER"); + const struct device *dev = device_get_binding("CUSTOM_DRIVER"); __ASSERT(dev, "Failed to get device binding"); diff --git a/samples/basic/blinky/src/main.c b/samples/basic/blinky/src/main.c index 5e21be343614..18d8aca5e91f 100644 --- a/samples/basic/blinky/src/main.c +++ b/samples/basic/blinky/src/main.c @@ -34,7 +34,7 @@ void main(void) { - struct device *dev; + const struct device *dev; bool led_is_on = true; int ret; diff --git a/samples/basic/blinky_pwm/src/main.c b/samples/basic/blinky_pwm/src/main.c index 94285b261868..510b9a3dc4d9 100644 --- a/samples/basic/blinky_pwm/src/main.c +++ b/samples/basic/blinky_pwm/src/main.c @@ -42,7 +42,7 @@ void main(void) { - struct device *pwm; + const struct device *pwm; u32_t max_period; u32_t period; u8_t dir = 0U; diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c index 497381085793..8dea7e0985fd 100644 --- a/samples/basic/button/src/main.c +++ b/samples/basic/button/src/main.c @@ -45,12 +45,13 @@ #endif /* LED helpers, which use the led0 devicetree alias if it's available. */ -static struct device *initialize_led(void); -static void match_led_to_button(struct device *button, struct device *led); +static const struct device *initialize_led(void); +static void match_led_to_button(const struct device *button, + const struct device *led); static struct gpio_callback button_cb_data; -void button_pressed(struct device *dev, struct gpio_callback *cb, +void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { printk("Button pressed at %" PRIu32 "\n", k_cycle_get_32()); @@ -58,8 +59,8 @@ void button_pressed(struct device *dev, struct gpio_callback *cb, void main(void) { - struct device *button; - struct device *led; + const struct device *button; + const struct device *led; int ret; button = device_get_binding(SW0_GPIO_LABEL); @@ -111,9 +112,9 @@ void main(void) #endif #ifdef LED0_GPIO_LABEL -static struct device *initialize_led(void) +static const struct device *initialize_led(void) { - struct device *led; + const struct device *led; int ret; led = device_get_binding(LED0_GPIO_LABEL); @@ -134,7 +135,8 @@ static struct device *initialize_led(void) return led; } -static void match_led_to_button(struct device *button, struct device *led) +static void match_led_to_button(const struct device *button, + const struct device *led) { bool val; @@ -143,13 +145,14 @@ static void match_led_to_button(struct device *button, struct device *led) } #else /* !defined(LED0_GPIO_LABEL) */ -static struct device *initialize_led(void) +static const struct device *initialize_led(void) { printk("No LED device was defined\n"); return NULL; } -static void match_led_to_button(struct device *button, struct device *led) +static void match_led_to_button(const struct device *button, + const struct device *led) { return; } diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c index 54add86c18b9..b252f47922c8 100644 --- a/samples/basic/fade_led/src/main.c +++ b/samples/basic/fade_led/src/main.c @@ -49,7 +49,7 @@ void main(void) { - struct device *pwm; + const struct device *pwm; u32_t pulse_width = 0U; u8_t dir = 1U; int ret; diff --git a/samples/basic/rgb_led/src/main.c b/samples/basic/rgb_led/src/main.c index ccb28ee7d962..61e4f37369d4 100644 --- a/samples/basic/rgb_led/src/main.c +++ b/samples/basic/rgb_led/src/main.c @@ -71,7 +71,7 @@ #define PERIOD_USEC (USEC_PER_SEC / 50U) #define STEPSIZE_USEC 2000 -static int pwm_set(struct device *pwm_dev, u32_t pwm_pin, +static int pwm_set(const struct device *pwm_dev, u32_t pwm_pin, u32_t pulse_width, pwm_flags_t flags) { return pwm_pin_set_usec(pwm_dev, pwm_pin, PERIOD_USEC, @@ -82,7 +82,7 @@ enum { RED, GREEN, BLUE }; void main(void) { - struct device *pwm_dev[3]; + const struct device *pwm_dev[3]; u32_t pulse_red, pulse_green, pulse_blue; /* pulse widths */ int ret; diff --git a/samples/basic/servo_motor/src/main.c b/samples/basic/servo_motor/src/main.c index ee318f819c05..6b043e0dc5d8 100644 --- a/samples/basic/servo_motor/src/main.c +++ b/samples/basic/servo_motor/src/main.c @@ -33,7 +33,7 @@ void main(void) { - struct device *pwm; + const struct device *pwm; u32_t pulse_width = MIN_PULSE_USEC; u8_t dir = 0U; diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c index b34f491379ea..9a3abe9b88c4 100644 --- a/samples/basic/threads/src/main.c +++ b/samples/basic/threads/src/main.c @@ -47,7 +47,7 @@ struct led { void blink(const struct led *led, u32_t sleep_ms, u32_t id) { - struct device *gpio_dev; + const struct device *gpio_dev; int cnt = 0; int ret; diff --git a/samples/bluetooth/hci_rpmsg/src/main.c b/samples/bluetooth/hci_rpmsg/src/main.c index 26f6abc42974..aecf26e0c8a0 100644 --- a/samples/bluetooth/hci_rpmsg/src/main.c +++ b/samples/bluetooth/hci_rpmsg/src/main.c @@ -57,8 +57,8 @@ BUILD_ASSERT((SHM_START_ADDR + SHM_SIZE - SHM_BASE_ADDRESS) /* End of configuration defines */ -static struct device *ipm_tx_handle; -static struct device *ipm_rx_handle; +static const struct device *ipm_tx_handle; +static const struct device *ipm_rx_handle; static metal_phys_addr_t shm_physmap[] = { SHM_START_ADDR }; static struct metal_device shm_device = { diff --git a/samples/bluetooth/hci_spi/src/main.c b/samples/bluetooth/hci_spi/src/main.c index 8fd7888f4ee8..c7268a96c171 100644 --- a/samples/bluetooth/hci_spi/src/main.c +++ b/samples/bluetooth/hci_spi/src/main.c @@ -71,11 +71,11 @@ const static struct spi_buf_set tx_bufs = { /* HCI buffer pools */ #define CMD_BUF_SIZE BT_BUF_RX_SIZE -static struct device *spi_hci_dev; +static const struct device *spi_hci_dev; static struct spi_config spi_cfg = { .operation = SPI_WORD_SET(8) | SPI_OP_MODE_SLAVE, }; -static struct device *gpio_dev; +static const struct device *gpio_dev; static K_THREAD_STACK_DEFINE(bt_tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE); static struct k_thread bt_tx_thread_data; @@ -235,7 +235,7 @@ static void bt_tx_thread(void *p1, void *p2, void *p3) } } -static int hci_spi_init(struct device *unused) +static int hci_spi_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c index 3d0e0f5c632f..4720f755bdc7 100644 --- a/samples/bluetooth/hci_uart/src/main.c +++ b/samples/bluetooth/hci_uart/src/main.c @@ -30,7 +30,7 @@ #define LOG_MODULE_NAME hci_uart LOG_MODULE_REGISTER(LOG_MODULE_NAME); -static struct device *hci_uart_dev; +static const struct device *hci_uart_dev; static K_THREAD_STACK_DEFINE(tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE); static struct k_thread tx_thread_data; static K_FIFO_DEFINE(tx_queue); @@ -49,7 +49,7 @@ static K_FIFO_DEFINE(tx_queue); */ #define H4_DISCARD_LEN 33 -static int h4_read(struct device *uart, u8_t *buf, +static int h4_read(const struct device *uart, u8_t *buf, size_t len, size_t min) { int total = 0; @@ -75,7 +75,7 @@ static int h4_read(struct device *uart, u8_t *buf, return total; } -static size_t h4_discard(struct device *uart, size_t len) +static size_t h4_discard(const struct device *uart, size_t len) { u8_t buf[H4_DISCARD_LEN]; @@ -110,7 +110,7 @@ static void h4_acl_recv(struct net_buf *buf, int *remaining) LOG_DBG("len %u", *remaining); } -static void bt_uart_isr(struct device *unused) +static void bt_uart_isr(const struct device *unused) { static struct net_buf *buf; static int remaining; @@ -276,7 +276,7 @@ void bt_ctlr_assert_handle(char *file, u32_t line) } #endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */ -static int hci_uart_init(struct device *unused) +static int hci_uart_init(const struct device *unused) { LOG_DBG(""); diff --git a/samples/bluetooth/mesh/src/microbit.c b/samples/bluetooth/mesh/src/microbit.c index bf086c8581ab..7c0d04d5ffed 100644 --- a/samples/bluetooth/mesh/src/microbit.c +++ b/samples/bluetooth/mesh/src/microbit.c @@ -15,9 +15,9 @@ #include "board.h" static u32_t oob_number; -static struct device *gpio; +static const struct device *gpio; -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mb_display *disp = mb_display_get(); diff --git a/samples/bluetooth/mesh_demo/src/microbit.c b/samples/bluetooth/mesh_demo/src/microbit.c index a9f6641d9a0b..6b0d04b50837 100644 --- a/samples/bluetooth/mesh_demo/src/microbit.c +++ b/samples/bluetooth/mesh_demo/src/microbit.c @@ -29,9 +29,9 @@ #define SEQ_PAGE (NRF_FICR->CODEPAGESIZE * (NRF_FICR->CODESIZE - 1)) #define SEQ_MAX (NRF_FICR->CODEPAGESIZE * 8 * SEQ_PER_BIT) -static struct device *gpio; -static struct device *nvm; -static struct device *pwm; +static const struct device *gpio; +static const struct device *nvm; +static const struct device *pwm; static struct k_work button_work; @@ -41,7 +41,7 @@ static void button_send_pressed(struct k_work *work) board_button_1_pressed(); } -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mb_display *disp = mb_display_get(); diff --git a/samples/bluetooth/peripheral_ht/src/hts.c b/samples/bluetooth/peripheral_ht/src/hts.c index 79dca8be9cf9..e639e9f7a4dd 100644 --- a/samples/bluetooth/peripheral_ht/src/hts.c +++ b/samples/bluetooth/peripheral_ht/src/hts.c @@ -25,7 +25,7 @@ #include #include -static struct device *temp_dev; +static const struct device *temp_dev; static u8_t simulate_htm; static u8_t indicating; diff --git a/samples/bluetooth/st_ble_sensor/src/button_svc.c b/samples/bluetooth/st_ble_sensor/src/button_svc.c index 7cd3f3ced716..2725706b6080 100644 --- a/samples/bluetooth/st_ble_sensor/src/button_svc.c +++ b/samples/bluetooth/st_ble_sensor/src/button_svc.c @@ -34,11 +34,11 @@ extern struct bt_conn *conn; extern struct bt_gatt_service_static stsensor_svc[]; extern volatile bool notify_enable; -static struct device *button_dev; +static const struct device *button_dev; static struct gpio_callback gpio_cb; u16_t but_val; -void button_pressed(struct device *gpiob, struct gpio_callback *cb, +void button_pressed(const struct device *gpiob, struct gpio_callback *cb, u32_t pins) { int err; diff --git a/samples/bluetooth/st_ble_sensor/src/led_svc.c b/samples/bluetooth/st_ble_sensor/src/led_svc.c index 4df5ee8646fb..712af7d53a79 100644 --- a/samples/bluetooth/st_ble_sensor/src/led_svc.c +++ b/samples/bluetooth/st_ble_sensor/src/led_svc.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(led_svc); #define LED_PORT DT_GPIO_LABEL(DT_ALIAS(led0), gpios) #define LED DT_GPIO_PIN(DT_ALIAS(led0), gpios) -struct device *led_dev; +const struct device *led_dev; bool led_state; void led_on_off(bool led_state) diff --git a/samples/bluetooth/st_ble_sensor/src/main.c b/samples/bluetooth/st_ble_sensor/src/main.c index 3d635b7d8ee4..22d5d548994d 100644 --- a/samples/bluetooth/st_ble_sensor/src/main.c +++ b/samples/bluetooth/st_ble_sensor/src/main.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(main); extern u16_t but_val; -extern struct device *led_dev; +extern const struct device *led_dev; extern bool led_state; /* Prototype */ diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c index b7fa2ec3c910..956a949dfc73 100644 --- a/samples/boards/96b_argonkey/microphone/src/main.c +++ b/samples/boards/96b_argonkey/microphone/src/main.c @@ -48,7 +48,7 @@ struct dmic_cfg cfg = { void signal_sampling_started(void) { - static struct device *led0, *led1; + static const struct device *led0, *led1; led0 = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(led0), gpios)); gpio_pin_configure(led0, DT_GPIO_PIN(DT_ALIAS(led0), gpios), @@ -63,7 +63,7 @@ void signal_sampling_started(void) void signal_sampling_stopped(void) { - static struct device *led0, *led1; + static const struct device *led0, *led1; led0 = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(led0), gpios)); gpio_pin_configure(led0, DT_GPIO_PIN(DT_ALIAS(led0), gpios), @@ -78,7 +78,7 @@ void signal_sampling_stopped(void) void signal_print_stopped(void) { - static struct device *led0, *led1; + static const struct device *led0, *led1; led0 = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(led0), gpios)); gpio_pin_configure(led0, DT_GPIO_PIN(DT_ALIAS(led0), gpios), @@ -100,7 +100,7 @@ void main(void) u32_t ms; #ifdef CONFIG_LP3943 - static struct device *ledc; + static const struct device *ledc; ledc = device_get_binding(DT_LABEL(DT_INST(0, ti_lp3943))); if (!ledc) { @@ -127,7 +127,7 @@ void main(void) int ret; - struct device *mic_dev = device_get_binding(DT_LABEL(DT_INST(0, st_mpxxdtyy))); + const struct device *mic_dev = device_get_binding(DT_LABEL(DT_INST(0, st_mpxxdtyy))); if (!mic_dev) { printk("Could not get pointer to %s device\n", diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c index 8e85b8fd7e29..d8ca8c72bf2a 100644 --- a/samples/boards/96b_argonkey/sensors/src/main.c +++ b/samples/boards/96b_argonkey/sensors/src/main.c @@ -27,7 +27,7 @@ static inline float out_ev(struct sensor_value *val) static int lsm6dsl_trig_cnt; #ifdef CONFIG_LSM6DSL_TRIGGER -static void lsm6dsl_trigger_handler(struct device *dev, +static void lsm6dsl_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { #ifdef ARGONKEY_TEST_LOG @@ -107,11 +107,11 @@ void main(void) { int cnt = 0; char out_str[64]; - static struct device *led0, *led1; + static const struct device *led0, *led1; int i, on = 1; #ifdef CONFIG_LP3943 - static struct device *ledc; + static const struct device *ledc; ledc = device_get_binding(DT_LABEL(DT_INST(0, ti_lp3943))); if (!ledc) { @@ -152,7 +152,7 @@ void main(void) printk("ArgonKey test!!\n"); #ifdef CONFIG_LPS22HB - struct device *baro_dev = + const struct device *baro_dev = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hb_press))); if (!baro_dev) { @@ -163,7 +163,7 @@ void main(void) #endif #ifdef CONFIG_HTS221 - struct device *hum_dev = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); + const struct device *hum_dev = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); if (!hum_dev) { printk("Could not get pointer to %s sensor\n", @@ -173,7 +173,7 @@ void main(void) #endif #ifdef CONFIG_LSM6DSL - struct device *accel_dev = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); + const struct device *accel_dev = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); if (!accel_dev) { printk("Could not get pointer to %s sensor\n", @@ -238,7 +238,7 @@ void main(void) #endif #ifdef CONFIG_VL53L0X - struct device *tof_dev = device_get_binding(DT_LABEL(DT_INST(0, st_vl53l0x))); + const struct device *tof_dev = device_get_binding(DT_LABEL(DT_INST(0, st_vl53l0x))); if (!tof_dev) { printk("Could not get pointer to %s sensor\n", diff --git a/samples/boards/bbc_microbit/line_follower_robot/src/main.c b/samples/boards/bbc_microbit/line_follower_robot/src/main.c index 50a62219d968..ac6e99e222e4 100644 --- a/samples/boards/bbc_microbit/line_follower_robot/src/main.c +++ b/samples/boards/bbc_microbit/line_follower_robot/src/main.c @@ -15,15 +15,15 @@ #define EXT_P13_GPIO_PIN 23 /* P13, SPI1 SCK */ #define EXT_P14_GPIO_PIN 22 /* P14, SPI1 MISO */ -static struct device *gpio; -struct device *i2c_dev; +static const struct device *gpio; +const struct device *i2c_dev; unsigned int left_line[1]; unsigned int right_line[1]; unsigned char buf[3]; unsigned char speed_hex[1]; /* Setup gpio of the microbit board */ -static void line_detection(struct device *dev, struct gpio_callback *cb, +static void line_detection(const struct device *dev, struct gpio_callback *cb, u32_t pins) { left_line[0] = gpio_pin_get_raw(gpio, EXT_P13_GPIO_PIN); diff --git a/samples/boards/bbc_microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c index 75ac364e0591..a1e506c9c74d 100644 --- a/samples/boards/bbc_microbit/pong/src/main.c +++ b/samples/boards/bbc_microbit/pong/src/main.c @@ -111,7 +111,7 @@ static s64_t b_timestamp; #define SOUND_PERIOD_PADDLE 200 #define SOUND_PERIOD_WALL 1000 -static struct device *pwm; +static const struct device *pwm; static enum sound_state { SOUND_IDLE, /* No sound */ @@ -392,7 +392,7 @@ void pong_ball_received(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel) k_delayed_work_submit(&refresh, K_NO_WAIT); } -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { /* Filter out spurious presses */ @@ -485,7 +485,7 @@ void pong_remote_lost(void) static void configure_buttons(void) { static struct gpio_callback button_cb_data; - struct device *gpio; + const struct device *gpio; gpio = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(sw0), gpios)); diff --git a/samples/boards/bbc_microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c index 9cb7919230aa..acc42588821a 100644 --- a/samples/boards/bbc_microbit/sound/src/main.c +++ b/samples/boards/bbc_microbit/sound/src/main.c @@ -23,8 +23,8 @@ #define US_TO_HZ(_us) (USEC_PER_SEC / (_us)) -static struct device *pwm; -static struct device *gpio; +static const struct device *pwm; +static const struct device *gpio; static u32_t period = PERIOD_INIT; static struct k_work beep_work; static volatile bool beep_active; @@ -45,7 +45,7 @@ static void beep(struct k_work *work) beep_active = false; } -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mb_display *disp; diff --git a/samples/boards/intel_s1000_crb/audio/src/audio_driver.c b/samples/boards/intel_s1000_crb/audio/src/audio_driver.c index 91884b1f7596..c439ec3ea5e4 100644 --- a/samples/boards/intel_s1000_crb/audio/src/audio_driver.c +++ b/samples/boards/intel_s1000_crb/audio/src/audio_driver.c @@ -49,10 +49,10 @@ __attribute__((section(".dma_buffers"))) static struct { s32_t mic_in[MIC_IN_BUF_COUNT][MIC_FRAME_SAMPLES]; } audio_buffers; -static struct device *codec_dev; -static struct device *i2s_spk_out_dev; -static struct device *i2s_host_dev; -static struct device *dmic_device; +static const struct device *codec_dev; +static const struct device *i2s_spk_out_dev; +static const struct device *i2s_host_dev; +static const struct device *dmic_device; static struct k_mem_slab mic_in_mem_slab; static struct k_mem_slab host_inout_mem_slab; diff --git a/samples/boards/intel_s1000_crb/audio/src/usb_transport.c b/samples/boards/intel_s1000_crb/audio/src/usb_transport.c index 39a8c8fdaa0f..25e09520c4b5 100644 --- a/samples/boards/intel_s1000_crb/audio/src/usb_transport.c +++ b/samples/boards/intel_s1000_crb/audio/src/usb_transport.c @@ -78,7 +78,7 @@ static const u8_t usb_transport_hid_report_desc[] = { static usb_transport_receive_callback_t receive_data_cb; -static struct device *hid_device; +static const struct device *hid_device; int usb_transport_init(usb_transport_receive_callback_t callback) { diff --git a/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c b/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c index cab89a989ddf..653185702457 100644 --- a/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c +++ b/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c @@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(dmic_sample); static struct k_mem_slab dmic_mem_slab; __attribute__((section(".dma_buffers"))) static char audio_buffers[MIC_FRAME_BYTES][MIC_IN_BUF_COUNT]; -static struct device *dmic_device; +static const struct device *dmic_device; static void dmic_init(void) { diff --git a/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c b/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c index 495ca630463d..2fcb4facc4d3 100644 --- a/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c +++ b/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c @@ -59,9 +59,9 @@ LOG_MODULE_REGISTER(i2s_sample); static struct k_mem_slab i2s_mem_slab; __attribute__((section(".dma_buffers"))) static char audio_buffers[AUDIO_FRAME_BUF_BYTES][I2S_PLAY_BUF_COUNT]; -static struct device *spk_i2s_dev; -static struct device *host_i2s_dev; -static struct device *codec_device; +static const struct device *spk_i2s_dev; +static const struct device *host_i2s_dev; +static const struct device *codec_device; #ifndef AUDIO_PLAY_FROM_HOST static inline int audio_playback_buffer_fill(float phase_delta, s32_t *buffer, @@ -208,7 +208,7 @@ static void i2s_start_audio(void) } } -static void i2s_prepare_audio(struct device *dev) +static void i2s_prepare_audio(const struct device *dev) { int frame_counter = 0; void *buffer; diff --git a/samples/boards/nrf/battery/src/battery.c b/samples/boards/nrf/battery/src/battery.c index 1f4ffc4e841f..6ed58dfba3fb 100644 --- a/samples/boards/nrf/battery/src/battery.c +++ b/samples/boards/nrf/battery/src/battery.c @@ -79,8 +79,8 @@ static const struct divider_config divider_config = { }; struct divider_data { - struct device *adc; - struct device *gpio; + const struct device *adc; + const struct device *gpio; struct adc_channel_cfg adc_cfg; struct adc_sequence adc_seq; s16_t raw; @@ -157,7 +157,7 @@ static int divider_setup(void) static bool battery_ok; -static int battery_setup(struct device *arg) +static int battery_setup(const struct device *arg) { int rc = divider_setup(); diff --git a/samples/boards/nrf/mesh/onoff-app/src/main.c b/samples/boards/nrf/mesh/onoff-app/src/main.c index 93d6f23753b0..bc74c48402c5 100644 --- a/samples/boards/nrf/mesh/onoff-app/src/main.c +++ b/samples/boards/nrf/mesh/onoff-app/src/main.c @@ -170,7 +170,7 @@ struct onoff_state { u8_t current; u8_t previous; u8_t led_gpio_pin; - struct device *led_device; + const struct device *led_device; }; /* @@ -274,7 +274,7 @@ static const struct bt_mesh_comp comp = { .elem_count = ARRAY_SIZE(elements), }; -struct device *sw_device; +const struct device *sw_device; struct sw { u8_t sw_num; @@ -426,7 +426,7 @@ static uint8_t pin_to_sw(uint32_t pin_pos) return 0; } -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pin_pos) { /* diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c index 2d993c4abeb1..d3197c9d5a6e 100644 --- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c @@ -10,12 +10,12 @@ #include "app_gpio.h" #include "publisher.h" -struct device *led_device[4]; -struct device *button_device[4]; +const struct device *led_device[4]; +const struct device *button_device[4]; K_WORK_DEFINE(button_work, publish); -static void button_pressed(struct device *dev, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { k_work_submit(&button_work); diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h index 78c0beabe8a0..884e8dc84d78 100644 --- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h @@ -9,8 +9,8 @@ #define _APP_GPIO_H /* GPIO */ -extern struct device *button_device[4]; -extern struct device *led_device[4]; +extern const struct device *button_device[4]; +extern const struct device *led_device[4]; void app_gpio_init(void); diff --git a/samples/boards/reel_board/mesh_badge/src/periphs.c b/samples/boards/reel_board/mesh_badge/src/periphs.c index 79ad2cd8cb9f..a40114e8f8fa 100644 --- a/samples/boards/reel_board/mesh_badge/src/periphs.c +++ b/samples/boards/reel_board/mesh_badge/src/periphs.c @@ -13,7 +13,7 @@ #include struct device_info { - struct device *dev; + const struct device *dev; char *name; }; @@ -103,7 +103,8 @@ static void motion_timeout(struct k_work *work) } } -static void motion_handler(struct device *dev, struct sensor_trigger *trig) +static void motion_handler(const struct device *dev, + struct sensor_trigger *trig) { int err; diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c index 6daadc887962..25760a0d5a33 100644 --- a/samples/boards/reel_board/mesh_badge/src/reel_board.c +++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c @@ -48,16 +48,16 @@ struct font_info { #define STAT_COUNT 128 -static struct device *epd_dev; +static const struct device *epd_dev; static bool pressed; static u8_t screen_id = SCREEN_MAIN; -static struct device *gpio; +static const struct device *gpio; static struct k_delayed_work epd_work; static struct k_delayed_work long_press_work; static char str_buf[256]; static struct { - struct device *dev; + const struct device *dev; const char *name; gpio_pin_t pin; gpio_flags_t flags; @@ -447,7 +447,8 @@ static bool button_is_pressed(void) return gpio_pin_get(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios)) > 0; } -static void button_interrupt(struct device *dev, struct gpio_callback *cb, +static void button_interrupt(const struct device *dev, + struct gpio_callback *cb, u32_t pins) { if (button_is_pressed() == pressed) { @@ -576,7 +577,7 @@ static int configure_leds(void) static int erase_storage(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL); diff --git a/samples/boards/sensortile_box/src/main.c b/samples/boards/sensortile_box/src/main.c index 9db2d1f1155b..a66e57128942 100644 --- a/samples/boards/sensortile_box/src/main.c +++ b/samples/boards/sensortile_box/src/main.c @@ -21,7 +21,7 @@ #ifdef CONFIG_LPS22HH_TRIGGER static int lps22hh_trig_cnt; -static void lps22hh_trigger_handler(struct device *dev, +static void lps22hh_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_PRESS); @@ -32,8 +32,8 @@ static void lps22hh_trigger_handler(struct device *dev, #ifdef CONFIG_LIS2DW12_TRIGGER static int lis2dw12_trig_cnt; -static void lis2dw12_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void lis2dw12_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lis2dw12_trig_cnt++; @@ -45,22 +45,22 @@ static int lsm6dso_acc_trig_cnt; static int lsm6dso_gyr_trig_cnt; static int lsm6dso_temp_trig_cnt; -static void lsm6dso_acc_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_acc_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lsm6dso_acc_trig_cnt++; } -static void lsm6dso_gyr_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_gyr_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_GYRO_XYZ); lsm6dso_gyr_trig_cnt++; } -static void lsm6dso_temp_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_temp_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_DIE_TEMP); lsm6dso_temp_trig_cnt++; @@ -70,7 +70,7 @@ static void lsm6dso_temp_trig_handler(struct device *dev, #ifdef CONFIG_STTS751_TRIGGER static int stts751_trig_cnt; -static void stts751_trigger_handler(struct device *dev, +static void stts751_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { stts751_trig_cnt++; @@ -80,7 +80,7 @@ static void stts751_trigger_handler(struct device *dev, #ifdef CONFIG_IIS3DHHC_TRIGGER static int iis3dhhc_trig_cnt; -static void iis3dhhc_trigger_handler(struct device *dev, +static void iis3dhhc_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); @@ -88,7 +88,7 @@ static void iis3dhhc_trigger_handler(struct device *dev, } #endif -static void lps22hh_config(struct device *lps22hh) +static void lps22hh_config(const struct device *lps22hh) { struct sensor_value odr_attr; @@ -111,7 +111,7 @@ static void lps22hh_config(struct device *lps22hh) #endif } -static void lis2dw12_config(struct device *lis2dw12) +static void lis2dw12_config(const struct device *lis2dw12) { struct sensor_value odr_attr, fs_attr; @@ -142,7 +142,7 @@ static void lis2dw12_config(struct device *lis2dw12) #endif } -static void lsm6dso_config(struct device *lsm6dso) +static void lsm6dso_config(const struct device *lsm6dso) { struct sensor_value odr_attr, fs_attr; @@ -199,7 +199,7 @@ static void lsm6dso_config(struct device *lsm6dso) #endif } -static void stts751_config(struct device *stts751) +static void stts751_config(const struct device *stts751) { struct sensor_value odr_attr; @@ -222,7 +222,7 @@ static void stts751_config(struct device *stts751) #endif } -static void iis3dhhc_config(struct device *iis3dhhc) +static void iis3dhhc_config(const struct device *iis3dhhc) { struct sensor_value odr_attr; @@ -247,7 +247,7 @@ static void iis3dhhc_config(struct device *iis3dhhc) void main(void) { - static struct device *led0, *led1; + static const struct device *led0, *led1; int i, on = 1; int cnt = 1; @@ -273,13 +273,13 @@ void main(void) printk("SensorTile.box test!!\n"); - struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); - struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); - struct device *lps22hh = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hh))); - struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); - struct device *stts751 = device_get_binding(DT_LABEL(DT_INST(0, st_stts751))); - struct device *iis3dhhc = device_get_binding(DT_LABEL(DT_INST(0, st_iis3dhhc))); - struct device *lis2mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); + const struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); + const struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); + const struct device *lps22hh = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hh))); + const struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); + const struct device *stts751 = device_get_binding(DT_LABEL(DT_INST(0, st_stts751))); + const struct device *iis3dhhc = device_get_binding(DT_LABEL(DT_INST(0, st_iis3dhhc))); + const struct device *lis2mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); if (!hts221) { printk("Could not get pointer to %s sensor\n", diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c index a6848e975d6e..660d8392a0ed 100644 --- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c +++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c @@ -21,7 +21,7 @@ /* * ======== CC1352R1_LAUNCHXL_sendExtFlashByte ======== */ -void CC1352R1_LAUNCHXL_sendExtFlashByte(struct device *dev, u8_t byte) +void CC1352R1_LAUNCHXL_sendExtFlashByte(const struct device *dev, u8_t byte) { u8_t i; @@ -56,7 +56,7 @@ void CC1352R1_LAUNCHXL_sendExtFlashByte(struct device *dev, u8_t byte) /* * ======== CC1352R1_LAUNCHXL_wakeUpExtFlash ======== */ -void CC1352R1_LAUNCHXL_wakeUpExtFlash(struct device *dev) +void CC1352R1_LAUNCHXL_wakeUpExtFlash(const struct device *dev) { /* * To wake up we need to toggle the chip select at @@ -77,7 +77,7 @@ void CC1352R1_LAUNCHXL_wakeUpExtFlash(struct device *dev) */ void CC1352R1_LAUNCHXL_shutDownExtFlash(void) { - struct device *dev; + const struct device *dev; u8_t extFlashShutdown = 0xB9; dev = device_get_binding(GPIO_PORT); diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c index e6a0c322eed9..68bde9f5aee3 100644 --- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c +++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c @@ -28,7 +28,7 @@ extern void CC1352R1_LAUNCHXL_shutDownExtFlash(void); void main(void) { u32_t config, status; - struct device *gpiob; + const struct device *gpiob; printk("\n%s system off demo\n", CONFIG_BOARD); diff --git a/samples/boards/up_squared/gpio_counter/src/main.c b/samples/boards/up_squared/gpio_counter/src/main.c index 39cb4a759724..114dc2d27f5d 100644 --- a/samples/boards/up_squared/gpio_counter/src/main.c +++ b/samples/boards/up_squared/gpio_counter/src/main.c @@ -41,7 +41,7 @@ struct _pin { u32_t hat_num; u32_t pin; const char *gpio_dev_name; - struct device *gpio_dev; + const struct device *gpio_dev; }; struct _pin counter_pins[] = { @@ -82,7 +82,8 @@ K_SEM_DEFINE(counter_sem, 0, 1); #define NUM_PINS ARRAY_SIZE(counter_pins) #define MASK (BIT(NUM_PINS) - 1) -void button_cb(struct device *gpiodev, struct gpio_callback *cb, u32_t pin) +void button_cb(const struct device *gpiodev, struct gpio_callback *cb, + u32_t pin) { counter++; k_sem_give(&counter_sem); diff --git a/samples/display/cfb/src/main.c b/samples/display/cfb/src/main.c index 27343aaf1f26..86f34330c994 100644 --- a/samples/display/cfb/src/main.c +++ b/samples/display/cfb/src/main.c @@ -23,7 +23,7 @@ void main(void) { - struct device *dev; + const struct device *dev; u16_t rows; u8_t ppt; u8_t font_width; diff --git a/samples/display/cfb_custom_font/src/main.c b/samples/display/cfb_custom_font/src/main.c index b461141e45da..6a3a09832ad1 100644 --- a/samples/display/cfb_custom_font/src/main.c +++ b/samples/display/cfb_custom_font/src/main.c @@ -17,7 +17,7 @@ #error Unsupported board #endif -struct device *display; +const struct device *display; void main(void) { diff --git a/samples/display/grove_display/src/main.c b/samples/display/grove_display/src/main.c index d27168792b14..312488f36702 100644 --- a/samples/display/grove_display/src/main.c +++ b/samples/display/grove_display/src/main.c @@ -33,7 +33,7 @@ u8_t clamp_rgb(int val) void main(void) { - struct device *glcd; + const struct device *glcd; char str[20]; int rgb[] = { 0x0, 0x0, 0x0 }; u8_t rgb_chg[3]; diff --git a/samples/display/lvgl/src/main.c b/samples/display/lvgl/src/main.c index 294d0be3346f..e14aeb87eb8c 100644 --- a/samples/display/lvgl/src/main.c +++ b/samples/display/lvgl/src/main.c @@ -19,7 +19,7 @@ void main(void) { u32_t count = 0U; char count_str[11] = {0}; - struct device *display_dev; + const struct device *display_dev; lv_obj_t *hello_world_label; lv_obj_t *count_label; diff --git a/samples/drivers/can/src/main.c b/samples/drivers/can/src/main.c index 1e857e37a6b4..3c6cbddc5b4f 100644 --- a/samples/drivers/can/src/main.c +++ b/samples/drivers/can/src/main.c @@ -25,7 +25,7 @@ K_THREAD_STACK_DEFINE(rx_thread_stack, RX_THREAD_STACK_SIZE); K_THREAD_STACK_DEFINE(poll_state_stack, STATE_POLL_THREAD_STACK_SIZE); -struct device *can_dev; +const struct device *can_dev; struct k_thread rx_thread_data; struct k_thread poll_state_thread_data; @@ -79,7 +79,7 @@ void rx_thread(void *arg1, void *arg2, void *arg3) void change_led(struct zcan_frame *msg, void *led_dev_param) { - struct device *led_dev = (struct device *)led_dev_param; + const struct device *led_dev = (const struct device *)led_dev_param; #if DT_PHA_HAS_CELL(DT_ALIAS(led0), gpios, pin) && \ DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios) @@ -192,7 +192,7 @@ void main(void) }; u8_t toggle = 1; u16_t counter = 0; - struct device *led_gpio_dev = NULL; + const struct device *led_gpio_dev = NULL; k_tid_t rx_tid, get_state_tid; int ret; diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c index 4c96ea1f0710..220981510757 100644 --- a/samples/drivers/counter/alarm/src/main.c +++ b/samples/drivers/counter/alarm/src/main.c @@ -23,7 +23,7 @@ struct counter_alarm_cfg alarm_cfg; #define TIMER DT_LABEL(DT_INST(0, st_stm32_rtc)) #endif -static void test_counter_interrupt_fn(struct device *counter_dev, +static void test_counter_interrupt_fn(const struct device *counter_dev, u8_t chan_id, u32_t ticks, void *user_data) { @@ -62,7 +62,7 @@ static void test_counter_interrupt_fn(struct device *counter_dev, void main(void) { - struct device *counter_dev; + const struct device *counter_dev; int err; printk("Counter alarm sample\n\n"); diff --git a/samples/drivers/counter/maxim_ds3231/src/main.c b/samples/drivers/counter/maxim_ds3231/src/main.c index 3fb7c919b9de..a33adab392d9 100644 --- a/samples/drivers/counter/maxim_ds3231/src/main.c +++ b/samples/drivers/counter/maxim_ds3231/src/main.c @@ -30,7 +30,7 @@ static const char *format_time(time_t time, return buf; } -static void sec_counter_callback(struct device *dev, +static void sec_counter_callback(const struct device *dev, u8_t id, u32_t ticks, void *ud) @@ -39,7 +39,7 @@ static void sec_counter_callback(struct device *dev, k_uptime_get_32(), id, ticks, ud); } -static void sec_alarm_handler(struct device *dev, +static void sec_alarm_handler(const struct device *dev, u8_t id, u32_t syncclock, void *ud) @@ -94,7 +94,7 @@ void timespec_add(struct timespec *apb, } } -static void min_alarm_handler(struct device *dev, +static void min_alarm_handler(const struct device *dev, u8_t id, u32_t syncclock, void *ud) @@ -149,7 +149,7 @@ static void min_alarm_handler(struct device *dev, struct maxim_ds3231_alarm sec_alarm; struct maxim_ds3231_alarm min_alarm; -static void show_counter(struct device *ds3231) +static void show_counter(const struct device *ds3231) { u32_t now = 0; @@ -176,7 +176,7 @@ static void show_counter(struct device *ds3231) * Subsequent reads of the RTC time adjusted based on a syncpoint * should match the uptime relative to the programmed hour. */ -static void set_aligned_clock(struct device *ds3231) +static void set_aligned_clock(const struct device *ds3231) { if (!IS_ENABLED(CONFIG_APP_SET_ALIGNED_CLOCK)) { return; @@ -229,7 +229,7 @@ static void set_aligned_clock(struct device *ds3231) void main(void) { - struct device *ds3231; + const struct device *ds3231; const char *const dev_id = DT_LABEL(DT_INST(0, maxim_ds3231)); ds3231 = device_get_binding(dev_id); diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c index 0528fa6ed03c..7ef855761e7f 100644 --- a/samples/drivers/crypto/src/main.c +++ b/samples/drivers/crypto/src/main.c @@ -75,7 +75,7 @@ static void print_buffer_comparison(const u8_t *wanted_result, printk("\n"); } -int validate_hw_compatibility(struct device *dev) +int validate_hw_compatibility(const struct device *dev) { u32_t flags = 0U; @@ -104,7 +104,7 @@ int validate_hw_compatibility(struct device *dev) } -void ecb_mode(struct device *dev) +void ecb_mode(const struct device *dev) { /* from FIPS-197 test vectors */ u8_t ecb_key[16] = { @@ -200,7 +200,7 @@ static const u8_t cbc_ciphertext[80] = { 0x12, 0x0e, 0xca, 0x30, 0x75, 0x86, 0xe1, 0xa7 }; -void cbc_mode(struct device *dev) +void cbc_mode(const struct device *dev) { u8_t encrypted[80] = {0}; u8_t decrypted[64] = {0}; @@ -289,7 +289,7 @@ static const u8_t ctr_ciphertext[64] = { 0xa3, 0x5c, 0x85, 0x3a, 0xb9, 0x2c, 0x6, 0xbb }; -void ctr_mode(struct device *dev) +void ctr_mode(const struct device *dev) { u8_t encrypted[64] = {0}; u8_t decrypted[64] = {0}; @@ -389,7 +389,7 @@ static const u8_t ccm_expected[31] = { 0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0 }; -void ccm_mode(struct device *dev) +void ccm_mode(const struct device *dev) { u8_t encrypted[50]; u8_t decrypted[25]; @@ -506,7 +506,7 @@ static const u8_t gcm_expected[58] = { 0x96, 0x04, 0x94, 0xc3 }; -void gcm_mode(struct device *dev) +void gcm_mode(const struct device *dev) { u8_t encrypted[60] = {0}; u8_t decrypted[44] = {0}; @@ -598,12 +598,12 @@ void gcm_mode(struct device *dev) struct mode_test { const char *mode; - void (*mode_func)(struct device *dev); + void (*mode_func)(const struct device *dev); }; void main(void) { - struct device *dev = device_get_binding(CRYPTO_DRV_NAME); + const struct device *dev = device_get_binding(CRYPTO_DRV_NAME); const struct mode_test modes[] = { { .mode = "ECB Mode", .mode_func = ecb_mode }, { .mode = "CBC Mode", .mode_func = cbc_mode }, diff --git a/samples/drivers/current_sensing/src/main.c b/samples/drivers/current_sensing/src/main.c index 3f27d3f3ad5a..31fafba8bb29 100644 --- a/samples/drivers/current_sensing/src/main.c +++ b/samples/drivers/current_sensing/src/main.c @@ -32,7 +32,7 @@ #define CUR_LSB 100 #define PWR_LSB 2000 -int read_reg16(struct device *i2c_dev, u8_t reg_addr, +int read_reg16(const struct device *i2c_dev, u8_t reg_addr, u8_t *data) { u8_t wr_addr; @@ -56,7 +56,7 @@ int read_reg16(struct device *i2c_dev, u8_t reg_addr, return i2c_transfer(i2c_dev, &msgs[0], 2, I2C_SLV_ADDR); } -int write_reg16(struct device *i2c_dev, u8_t reg_addr, +int write_reg16(const struct device *i2c_dev, u8_t reg_addr, u8_t *data) { u8_t wr_addr; @@ -82,7 +82,7 @@ int write_reg16(struct device *i2c_dev, u8_t reg_addr, void main(void) { - struct device *i2c_dev; + const struct device *i2c_dev; u8_t data[2]; u32_t shunt_volt, bus_volt, current, power; diff --git a/samples/drivers/dac/src/main.c b/samples/drivers/dac/src/main.c index 71674cfadd78..f95b4c34309b 100644 --- a/samples/drivers/dac/src/main.c +++ b/samples/drivers/dac/src/main.c @@ -31,7 +31,7 @@ static const struct dac_channel_cfg dac_ch_cfg = { void main(void) { - struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); + const struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); if (!dac_dev) { printk("Cannot get DAC device\n"); diff --git a/samples/drivers/display/src/main.c b/samples/drivers/display/src/main.c index 4e672c488ab8..09b197100efe 100644 --- a/samples/drivers/display/src/main.c +++ b/samples/drivers/display/src/main.c @@ -201,7 +201,7 @@ void main(void) size_t grey_count; u8_t *buf; s32_t grey_scale_sleep; - struct device *display_dev; + const struct device *display_dev; struct display_capabilities capabilities; struct display_buffer_descriptor buf_desc; size_t buf_size = 0; diff --git a/samples/drivers/entropy/src/main.c b/samples/drivers/entropy/src/main.c index 2bb4acabd846..84e7022a4041 100644 --- a/samples/drivers/entropy/src/main.c +++ b/samples/drivers/entropy/src/main.c @@ -10,7 +10,7 @@ void main(void) { - struct device *dev; + const struct device *dev; printf("Entropy Example! %s\n", CONFIG_ARCH); diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c index f4b0452ac1b0..a2fe001c679c 100644 --- a/samples/drivers/espi/src/main.c +++ b/samples/drivers/espi/src/main.c @@ -54,12 +54,12 @@ struct oob_response { }; #ifdef CONFIG_ESPI_GPIO_DEV_NEEDED -static struct device *gpio_dev0; -static struct device *gpio_dev1; +static const struct device *gpio_dev0; +static const struct device *gpio_dev1; #define PWR_SEQ_TIMEOUT 3000u #endif -static struct device *espi_dev; +static const struct device *espi_dev; static struct espi_callback espi_bus_cb; static struct espi_callback vw_rdy_cb; static struct espi_callback vw_cb; @@ -98,7 +98,7 @@ static void host_warn_handler(u32_t signal, u32_t status) } /* eSPI bus event handler */ -static void espi_reset_handler(struct device *dev, +static void espi_reset_handler(const struct device *dev, struct espi_callback *cb, struct espi_event event) { @@ -109,7 +109,8 @@ static void espi_reset_handler(struct device *dev, } /* eSPI logical channels enable/disable event handler */ -static void espi_ch_handler(struct device *dev, struct espi_callback *cb, +static void espi_ch_handler(const struct device *dev, + struct espi_callback *cb, struct espi_event event) { if (event.evt_type == ESPI_BUS_EVENT_CHANNEL_READY) { @@ -122,7 +123,7 @@ static void espi_ch_handler(struct device *dev, struct espi_callback *cb, } /* eSPI vwire received event handler */ -static void vwire_handler(struct device *dev, struct espi_callback *cb, +static void vwire_handler(const struct device *dev, struct espi_callback *cb, struct espi_event event) { if (event.evt_type == ESPI_BUS_EVENT_VWIRE_RECEIVED) { @@ -145,7 +146,7 @@ static void vwire_handler(struct device *dev, struct espi_callback *cb, } /* eSPI peripheral channel notifications handler */ -static void periph_handler(struct device *dev, struct espi_callback *cb, +static void periph_handler(const struct device *dev, struct espi_callback *cb, struct espi_event event) { u8_t periph_type; @@ -217,7 +218,7 @@ int espi_init(void) return ret; } -static int wait_for_pin(struct device *dev, u8_t pin, u16_t timeout, +static int wait_for_pin(const struct device *dev, u8_t pin, u16_t timeout, int exp_level) { u16_t loop_cnt = timeout; @@ -247,7 +248,7 @@ static int wait_for_pin(struct device *dev, u8_t pin, u16_t timeout, return 0; } -static int wait_for_vwire(struct device *espi_dev, +static int wait_for_vwire(const struct device *espi_dev, enum espi_vwire_signal signal, u16_t timeout, u8_t exp_level) { @@ -455,7 +456,7 @@ static int espi_flash_test(u32_t start_flash_addr, u8_t blocks) } #endif /* CONFIG_ESPI_FLASH_CHANNEL */ -int get_pch_temp(struct device *dev) +int get_pch_temp(const struct device *dev) { struct espi_oob_packet req_pckt; struct espi_oob_packet resp_pckt; diff --git a/samples/drivers/flash_shell/src/main.c b/samples/drivers/flash_shell/src/main.c index 4a984c983bf3..b331d3a7a6a8 100644 --- a/samples/drivers/flash_shell/src/main.c +++ b/samples/drivers/flash_shell/src/main.c @@ -81,7 +81,7 @@ LOG_MODULE_REGISTER(app); #error Please increase CONFIG_SHELL_ARGC_MAX parameter. #endif -static struct device *flash_device; +static const struct device *flash_device; static int check_flash_device(const struct shell *shell) { @@ -557,7 +557,7 @@ static int cmd_page_write(const struct shell *shell, size_t argc, char **argv) static int cmd_set_dev(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; const char *name; name = argv[1]; diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c index 075020850fb6..b42d67694c5d 100644 --- a/samples/drivers/ht16k33/src/main.c +++ b/samples/drivers/ht16k33/src/main.c @@ -20,11 +20,11 @@ LOG_MODULE_REGISTER(main); #define KEYSCAN_DEVICES 3 -struct device *led_dev; -struct device *ks_dev[KEYSCAN_DEVICES]; +const struct device *led_dev; +const struct device *ks_dev[KEYSCAN_DEVICES]; static struct gpio_callback ks_cb[KEYSCAN_DEVICES]; -static void keyscan_callback(struct device *gpiob, +static void keyscan_callback(const struct device *gpiob, struct gpio_callback *cb, u32_t pins) { LOG_INF("%s: 0x%08x", gpiob->name, pins); diff --git a/samples/drivers/i2c_fujitsu_fram/src/main.c b/samples/drivers/i2c_fujitsu_fram/src/main.c index 6e94311d9b96..20358e0e52d5 100644 --- a/samples/drivers/i2c_fujitsu_fram/src/main.c +++ b/samples/drivers/i2c_fujitsu_fram/src/main.c @@ -18,7 +18,7 @@ #define FRAM_I2C_ADDR 0x50 -static int write_bytes(struct device *i2c_dev, u16_t addr, +static int write_bytes(const struct device *i2c_dev, u16_t addr, u8_t *data, u32_t num_bytes) { u8_t wr_addr[2]; @@ -43,7 +43,7 @@ static int write_bytes(struct device *i2c_dev, u16_t addr, return i2c_transfer(i2c_dev, &msgs[0], 2, FRAM_I2C_ADDR); } -static int read_bytes(struct device *i2c_dev, u16_t addr, +static int read_bytes(const struct device *i2c_dev, u16_t addr, u8_t *data, u32_t num_bytes) { u8_t wr_addr[2]; @@ -72,7 +72,7 @@ static int read_bytes(struct device *i2c_dev, u16_t addr, void main(void) { - struct device *i2c_dev; + const struct device *i2c_dev; u8_t cmp_data[16]; u8_t data[16]; int i, ret; diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c index 4e5f2f469617..6ea0ea0c7579 100644 --- a/samples/drivers/kscan/src/main.c +++ b/samples/drivers/kscan/src/main.c @@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(main); #define KSCAN_LABEL DT_LABEL(DT_ALIAS(kscan0)) -struct device *kscan_dev; +const struct device *kscan_dev; static struct k_timer typematic_timer; static struct k_timer block_matrix_timer; @@ -122,7 +122,8 @@ static void typematic_callback(struct k_timer *timer) LOG_INF("Typematic : %u\n", last_key); } -static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed) +static void kb_callback(const struct device *dev, u32_t row, u32_t col, + bool pressed) { ARG_UNUSED(dev); last_key = keymap[col][row]; diff --git a/samples/drivers/kscan_touch/src/main.c b/samples/drivers/kscan_touch/src/main.c index 31896ffaa902..2bfcbdac441f 100644 --- a/samples/drivers/kscan_touch/src/main.c +++ b/samples/drivers/kscan_touch/src/main.c @@ -15,11 +15,12 @@ LOG_MODULE_REGISTER(main); -struct device *kscan_dev; +const struct device *kscan_dev; #define TOUCH_CONTROLLER_LABEL DT_LABEL(DT_ALIAS(kscan0)) -static void k_callback(struct device *dev, u32_t row, u32_t col, bool pressed) +static void k_callback(const struct device *dev, u32_t row, u32_t col, + bool pressed) { ARG_UNUSED(dev); if (pressed) { diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c index 3670e1c24b88..04409ac9cb45 100644 --- a/samples/drivers/lcd_hd44780/src/main.c +++ b/samples/drivers/lcd_hd44780/src/main.c @@ -180,7 +180,7 @@ void _set_row_offsets(s8_t row0, s8_t row1, s8_t row2, s8_t row3) } -void _pi_lcd_toggle_enable(struct device *gpio_dev) +void _pi_lcd_toggle_enable(const struct device *gpio_dev) { GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC25_E, LOW); k_msleep(ENABLE_DELAY); @@ -191,7 +191,7 @@ void _pi_lcd_toggle_enable(struct device *gpio_dev) } -void _pi_lcd_4bits_wr(struct device *gpio_dev, u8_t bits) +void _pi_lcd_4bits_wr(const struct device *gpio_dev, u8_t bits) { /* High bits */ GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC24_D4, LOW); @@ -236,7 +236,7 @@ void _pi_lcd_4bits_wr(struct device *gpio_dev, u8_t bits) _pi_lcd_toggle_enable(gpio_dev); } -void _pi_lcd_8bits_wr(struct device *gpio_dev, u8_t bits) +void _pi_lcd_8bits_wr(const struct device *gpio_dev, u8_t bits) { /* High bits */ GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC21_D7, LOW); @@ -278,7 +278,7 @@ void _pi_lcd_8bits_wr(struct device *gpio_dev, u8_t bits) _pi_lcd_toggle_enable(gpio_dev); } -void _pi_lcd_data(struct device *gpio_dev, u8_t bits) +void _pi_lcd_data(const struct device *gpio_dev, u8_t bits) { if (lcd_data.disp_func & LCD_8BIT_MODE) { _pi_lcd_8bits_wr(gpio_dev, bits); @@ -287,14 +287,14 @@ void _pi_lcd_data(struct device *gpio_dev, u8_t bits) } } -void _pi_lcd_command(struct device *gpio_dev, u8_t bits) +void _pi_lcd_command(const struct device *gpio_dev, u8_t bits) { /* mode = False for command */ GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC28_RS, LOW); _pi_lcd_data(gpio_dev, bits); } -void _pi_lcd_write(struct device *gpio_dev, u8_t bits) +void _pi_lcd_write(const struct device *gpio_dev, u8_t bits) { /* mode = True for character */ GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC28_RS, HIGH); @@ -306,14 +306,14 @@ void _pi_lcd_write(struct device *gpio_dev, u8_t bits) * USER can use these APIs *************************/ /** Home */ -void pi_lcd_home(struct device *gpio_dev) +void pi_lcd_home(const struct device *gpio_dev) { _pi_lcd_command(gpio_dev, LCD_RETURN_HOME); k_sleep(K_MSEC(2)); /* wait for 2ms */ } /** Set curson position */ -void pi_lcd_set_cursor(struct device *gpio_dev, u8_t col, u8_t row) +void pi_lcd_set_cursor(const struct device *gpio_dev, u8_t col, u8_t row) { size_t max_lines; @@ -329,7 +329,7 @@ void pi_lcd_set_cursor(struct device *gpio_dev, u8_t col, u8_t row) /** Clear display */ -void pi_lcd_clear(struct device *gpio_dev) +void pi_lcd_clear(const struct device *gpio_dev) { _pi_lcd_command(gpio_dev, LCD_CLEAR_DISPLAY); k_sleep(K_MSEC(2)); /* wait for 2ms */ @@ -337,7 +337,7 @@ void pi_lcd_clear(struct device *gpio_dev) /** Display ON */ -void pi_lcd_display_on(struct device *gpio_dev) +void pi_lcd_display_on(const struct device *gpio_dev) { lcd_data.disp_cntl |= LCD_DISPLAY_ON; _pi_lcd_command(gpio_dev, @@ -345,7 +345,7 @@ void pi_lcd_display_on(struct device *gpio_dev) } /** Display OFF */ -void pi_lcd_display_off(struct device *gpio_dev) +void pi_lcd_display_off(const struct device *gpio_dev) { lcd_data.disp_cntl &= ~LCD_DISPLAY_ON; _pi_lcd_command(gpio_dev, @@ -354,7 +354,7 @@ void pi_lcd_display_off(struct device *gpio_dev) /** Turns cursor off */ -void pi_lcd_cursor_off(struct device *gpio_dev) +void pi_lcd_cursor_off(const struct device *gpio_dev) { lcd_data.disp_cntl &= ~LCD_CURSOR_ON; _pi_lcd_command(gpio_dev, @@ -362,7 +362,7 @@ void pi_lcd_cursor_off(struct device *gpio_dev) } /** Turn cursor on */ -void pi_lcd_cursor_on(struct device *gpio_dev) +void pi_lcd_cursor_on(const struct device *gpio_dev) { lcd_data.disp_cntl |= LCD_CURSOR_ON; _pi_lcd_command(gpio_dev, @@ -371,7 +371,7 @@ void pi_lcd_cursor_on(struct device *gpio_dev) /** Turn off the blinking cursor */ -void pi_lcd_blink_off(struct device *gpio_dev) +void pi_lcd_blink_off(const struct device *gpio_dev) { lcd_data.disp_cntl &= ~LCD_BLINK_ON; _pi_lcd_command(gpio_dev, @@ -379,7 +379,7 @@ void pi_lcd_blink_off(struct device *gpio_dev) } /** Turn on the blinking cursor */ -void pi_lcd_blink_on(struct device *gpio_dev) +void pi_lcd_blink_on(const struct device *gpio_dev) { lcd_data.disp_cntl |= LCD_BLINK_ON; _pi_lcd_command(gpio_dev, @@ -387,21 +387,21 @@ void pi_lcd_blink_on(struct device *gpio_dev) } /** Scroll the display left without changing the RAM */ -void pi_lcd_scroll_left(struct device *gpio_dev) +void pi_lcd_scroll_left(const struct device *gpio_dev) { _pi_lcd_command(gpio_dev, LCD_CURSOR_SHIFT | LCD_DISPLAY_MOVE | LCD_MOVE_LEFT); } /** Scroll the display right without changing the RAM */ -void pi_lcd_scroll_right(struct device *gpio_dev) +void pi_lcd_scroll_right(const struct device *gpio_dev) { _pi_lcd_command(gpio_dev, LCD_CURSOR_SHIFT | LCD_DISPLAY_MOVE | LCD_MOVE_RIGHT); } /** Text that flows from left to right */ -void pi_lcd_left_to_right(struct device *gpio_dev) +void pi_lcd_left_to_right(const struct device *gpio_dev) { lcd_data.disp_mode |= LCD_ENTRY_LEFT; _pi_lcd_command(gpio_dev, @@ -409,7 +409,7 @@ void pi_lcd_left_to_right(struct device *gpio_dev) } /** Text that flows from right to left */ -void pi_lcd_right_to_left(struct device *gpio_dev) +void pi_lcd_right_to_left(const struct device *gpio_dev) { lcd_data.disp_mode &= ~LCD_ENTRY_LEFT; _pi_lcd_command(gpio_dev, @@ -417,7 +417,7 @@ void pi_lcd_right_to_left(struct device *gpio_dev) } /** Right justify text from the cursor location */ -void pi_lcd_auto_scroll_right(struct device *gpio_dev) +void pi_lcd_auto_scroll_right(const struct device *gpio_dev) { lcd_data.disp_mode |= LCD_ENTRY_SHIFT_INCREMENT; _pi_lcd_command(gpio_dev, @@ -425,14 +425,14 @@ void pi_lcd_auto_scroll_right(struct device *gpio_dev) } /** Left justify text from the cursor location */ -void pi_lcd_auto_scroll_left(struct device *gpio_dev) +void pi_lcd_auto_scroll_left(const struct device *gpio_dev) { lcd_data.disp_mode &= ~LCD_ENTRY_SHIFT_INCREMENT; _pi_lcd_command(gpio_dev, LCD_ENTRY_MODE_SET | lcd_data.disp_cntl); } -void pi_lcd_string(struct device *gpio_dev, char *msg) +void pi_lcd_string(const struct device *gpio_dev, char *msg) { int i; int len = 0; @@ -451,7 +451,8 @@ void pi_lcd_string(struct device *gpio_dev, char *msg) /** LCD initialization function */ -void pi_lcd_init(struct device *gpio_dev, u8_t cols, u8_t rows, u8_t dotsize) +void pi_lcd_init(const struct device *gpio_dev, u8_t cols, u8_t rows, + u8_t dotsize) { if (rows > 1) { lcd_data.disp_func |= LCD_2_LINE; @@ -525,7 +526,7 @@ void pi_lcd_init(struct device *gpio_dev, u8_t cols, u8_t rows, u8_t dotsize) void main(void) { - struct device *gpio_dev; + const struct device *gpio_dev; gpio_dev = device_get_binding(GPIO_DRV_NAME); if (!gpio_dev) { diff --git a/samples/drivers/led_apa102/src/main.c b/samples/drivers/led_apa102/src/main.c index 8d8f71158449..0ec5687e6f8a 100644 --- a/samples/drivers/led_apa102/src/main.c +++ b/samples/drivers/led_apa102/src/main.c @@ -53,7 +53,7 @@ const struct led_rgb *color_at(size_t time, size_t i) #define DELAY_TIME K_MSEC(40) void main(void) { - struct device *strip; + const struct device *strip; size_t i, time; strip = device_get_binding(DT_LABEL(DT_INST(0, apa_apa102))); diff --git a/samples/drivers/led_apa102c_bitbang/src/main.c b/samples/drivers/led_apa102c_bitbang/src/main.c index f15dc038ea3a..394a9b0980aa 100644 --- a/samples/drivers/led_apa102c_bitbang/src/main.c +++ b/samples/drivers/led_apa102c_bitbang/src/main.c @@ -49,7 +49,7 @@ u32_t rgb[] = { /* Number of LEDS linked together */ #define NUM_LEDS 1 -void send_rgb(struct device *gpio_dev, u32_t rgb) +void send_rgb(const struct device *gpio_dev, u32_t rgb) { int i; @@ -67,7 +67,7 @@ void send_rgb(struct device *gpio_dev, u32_t rgb) void main(void) { - struct device *gpio_dev; + const struct device *gpio_dev; int ret; int idx = 0; int leds = 0; diff --git a/samples/drivers/led_lp3943/src/main.c b/samples/drivers/led_lp3943/src/main.c index 4cac526ff6f5..a8ffcc8fa04b 100644 --- a/samples/drivers/led_lp3943/src/main.c +++ b/samples/drivers/led_lp3943/src/main.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(app); void main(void) { - struct device *led_dev; + const struct device *led_dev; int i, ret; led_dev = device_get_binding(LED_DEV_NAME); diff --git a/samples/drivers/led_lp5562/src/main.c b/samples/drivers/led_lp5562/src/main.c index ba899b782335..912977118d07 100644 --- a/samples/drivers/led_lp5562/src/main.c +++ b/samples/drivers/led_lp5562/src/main.c @@ -66,7 +66,7 @@ static inline u8_t scale_color_to_percent(u8_t hex) * * @return 0 if successful, -ERRNO otherwise. */ -static int set_static_color(struct device *dev, u8_t r, u8_t g, u8_t b) +static int set_static_color(const struct device *dev, u8_t r, u8_t g, u8_t b) { int ret; @@ -110,8 +110,8 @@ static int set_static_color(struct device *dev, u8_t r, u8_t g, u8_t b) * * @return 0 if successful, -ERRNO otherwise. */ -static int blink_color(struct device *dev, bool r, bool g, bool b, - u32_t delay_on, u32_t delay_off) +static int blink_color(const struct device *dev, bool r, bool g, bool b, + u32_t delay_on, u32_t delay_off) { int ret; @@ -149,7 +149,7 @@ static int blink_color(struct device *dev, bool r, bool g, bool b, * * @return 0 if successful, -ERRNO otherwise. */ -static int turn_off_all_leds(struct device *dev) +static int turn_off_all_leds(const struct device *dev) { for (int i = 0; i < NUM_LEDS; i++) { int ret = led_off(dev, i); @@ -164,7 +164,7 @@ static int turn_off_all_leds(struct device *dev) void main(void) { - struct device *dev; + const struct device *dev; int i, ret; dev = device_get_binding(LED_DEV_NAME); diff --git a/samples/drivers/led_lpd8806/src/main.c b/samples/drivers/led_lpd8806/src/main.c index 3d125334637b..a5068e6d8845 100644 --- a/samples/drivers/led_lpd8806/src/main.c +++ b/samples/drivers/led_lpd8806/src/main.c @@ -52,7 +52,7 @@ const struct led_rgb *color_at(size_t time, size_t i) void main(void) { - struct device *strip; + const struct device *strip; size_t i, time; strip = device_get_binding(STRIP_DEV_NAME); diff --git a/samples/drivers/led_pca9633/src/main.c b/samples/drivers/led_pca9633/src/main.c index c204e8880db1..a4db1b989f95 100644 --- a/samples/drivers/led_pca9633/src/main.c +++ b/samples/drivers/led_pca9633/src/main.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(main); void main(void) { - struct device *led_dev; + const struct device *led_dev; int i, ret; led_dev = device_get_binding(LED_DEV_NAME); diff --git a/samples/drivers/led_ws2812/src/main.c b/samples/drivers/led_ws2812/src/main.c index 2ee641274b5f..d23eba636b08 100644 --- a/samples/drivers/led_ws2812/src/main.c +++ b/samples/drivers/led_ws2812/src/main.c @@ -35,7 +35,7 @@ struct led_rgb pixels[STRIP_NUM_PIXELS]; void main(void) { - struct device *strip; + const struct device *strip; size_t cursor = 0, color = 0; int rc; diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c index a0e07dd09985..87b16765d6ee 100644 --- a/samples/drivers/lora/receive/src/main.c +++ b/samples/drivers/lora/receive/src/main.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(lora_receive); void main(void) { - struct device *lora_dev; + const struct device *lora_dev; struct lora_modem_config config; int ret, len; u8_t data[MAX_DATA_LEN] = {0}; diff --git a/samples/drivers/lora/send/src/main.c b/samples/drivers/lora/send/src/main.c index 71f166f72b44..8dce27902021 100644 --- a/samples/drivers/lora/send/src/main.c +++ b/samples/drivers/lora/send/src/main.c @@ -25,7 +25,7 @@ char data[MAX_DATA_LEN] = {'h', 'e', 'l', 'l', 'o', 'w', 'o', 'r', 'l', 'd'}; void main(void) { - struct device *lora_dev; + const struct device *lora_dev; struct lora_modem_config config; int ret; diff --git a/samples/drivers/peci/src/main.c b/samples/drivers/peci/src/main.c index 01db3cfe2abd..053861d7e2d3 100644 --- a/samples/drivers/peci/src/main.c +++ b/samples/drivers/peci/src/main.c @@ -23,7 +23,7 @@ #define PECI_SAFE_TEMP 72 -static struct device *peci_dev; +static const struct device *peci_dev; static bool peci_initialized; static u8_t tjmax; static u8_t rx_fcs; diff --git a/samples/drivers/ps2/src/main.c b/samples/drivers/ps2/src/main.c index 455871498056..783684ae2cab 100644 --- a/samples/drivers/ps2/src/main.c +++ b/samples/drivers/ps2/src/main.c @@ -33,7 +33,7 @@ K_MSGQ_DEFINE(aux_to_host_queue, sizeof(u8_t), 8, 4); /* We use a timer to saturate the queue */ K_TIMER_DEFINE(block_ps2_timer, saturate_ps2, NULL); -static struct device *ps2_0_dev; +static const struct device *ps2_0_dev; static void saturate_ps2(struct k_timer *timer) { @@ -45,7 +45,7 @@ static void saturate_ps2(struct k_timer *timer) ps2_enable_callback(ps2_0_dev); } -static void mb_callback(struct device *dev, u8_t value) +static void mb_callback(const struct device *dev, u8_t value) { if (k_msgq_put(&aux_to_host_queue, &value, K_NO_WAIT) != 0) { ps2_disable_callback(ps2_0_dev); diff --git a/samples/drivers/soc_flash_nrf/src/main.c b/samples/drivers/soc_flash_nrf/src/main.c index cfa46f4f4fa8..c4c015576e8b 100644 --- a/samples/drivers/soc_flash_nrf/src/main.c +++ b/samples/drivers/soc_flash_nrf/src/main.c @@ -29,7 +29,7 @@ void main(void) { - struct device *flash_dev; + const struct device *flash_dev; u32_t buf_array_1[4] = { TEST_DATA_WORD_0, TEST_DATA_WORD_1, TEST_DATA_WORD_2, TEST_DATA_WORD_3 }; u32_t buf_array_2[4] = { TEST_DATA_WORD_3, TEST_DATA_WORD_1, diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c index a183c1d060af..93225fb05aa3 100644 --- a/samples/drivers/spi_flash/src/main.c +++ b/samples/drivers/spi_flash/src/main.c @@ -38,7 +38,7 @@ void main(void) const u8_t expected[] = { 0x55, 0xaa, 0x66, 0x99 }; const size_t len = sizeof(expected); u8_t buf[sizeof(expected)]; - struct device *flash_dev; + const struct device *flash_dev; int rc; printf("\n" FLASH_NAME " SPI flash testing\n"); diff --git a/samples/drivers/spi_flash_at45/src/main.c b/samples/drivers/spi_flash_at45/src/main.c index 351026ba94f2..bf60deb12415 100644 --- a/samples/drivers/spi_flash_at45/src/main.c +++ b/samples/drivers/spi_flash_at45/src/main.c @@ -28,7 +28,7 @@ void main(void) { printk("DataFlash sample on %s\n", CONFIG_BOARD); - struct device *flash_dev; + const struct device *flash_dev; int i; int err; u8_t data; diff --git a/samples/drivers/spi_fujitsu_fram/src/main.c b/samples/drivers/spi_fujitsu_fram/src/main.c index f6c9792877f6..850624a6815d 100644 --- a/samples/drivers/spi_fujitsu_fram/src/main.c +++ b/samples/drivers/spi_fujitsu_fram/src/main.c @@ -22,7 +22,8 @@ static u8_t data[MAX_USER_DATA_LENGTH], cmp_data[MAX_USER_DATA_LENGTH]; -static int mb85rs64v_access(struct device *spi, struct spi_config *spi_cfg, +static int mb85rs64v_access(const struct device *spi, + struct spi_config *spi_cfg, u8_t cmd, u16_t addr, void *data, size_t len) { u8_t access[3]; @@ -64,7 +65,8 @@ static int mb85rs64v_access(struct device *spi, struct spi_config *spi_cfg, } -static int mb85rs64v_read_id(struct device *spi, struct spi_config *spi_cfg) +static int mb85rs64v_read_id(const struct device *spi, + struct spi_config *spi_cfg) { u8_t id[4]; int err; @@ -95,7 +97,7 @@ static int mb85rs64v_read_id(struct device *spi, struct spi_config *spi_cfg) return 0; } -static int write_bytes(struct device *spi, struct spi_config *spi_cfg, +static int write_bytes(const struct device *spi, struct spi_config *spi_cfg, u16_t addr, u8_t *data, u32_t num_bytes) { int err; @@ -119,7 +121,7 @@ static int write_bytes(struct device *spi, struct spi_config *spi_cfg, return 0; } -static int read_bytes(struct device *spi, struct spi_config *spi_cfg, +static int read_bytes(const struct device *spi, struct spi_config *spi_cfg, u16_t addr, u8_t *data, u32_t num_bytes) { int err; @@ -137,7 +139,7 @@ static int read_bytes(struct device *spi, struct spi_config *spi_cfg, void main(void) { - struct device *spi; + const struct device *spi; struct spi_config spi_cfg; int err; diff --git a/samples/drivers/watchdog/src/main.c b/samples/drivers/watchdog/src/main.c index 3153391705ce..ea387386715d 100644 --- a/samples/drivers/watchdog/src/main.c +++ b/samples/drivers/watchdog/src/main.c @@ -47,7 +47,7 @@ #error "Unsupported SoC and no watchdog0 alias in zephyr.dts" #endif -static void wdt_callback(struct device *wdt_dev, int channel_id) +static void wdt_callback(const struct device *wdt_dev, int channel_id) { static bool handled_event; @@ -65,7 +65,7 @@ void main(void) { int err; int wdt_channel_id; - struct device *wdt; + const struct device *wdt; struct wdt_timeout_cfg wdt_config; printk("Watchdog sample application\n"); diff --git a/samples/mpu/mpu_test/src/main.c b/samples/mpu/mpu_test/src/main.c index 23c9a6a9bf05..c6a913ca3577 100644 --- a/samples/mpu/mpu_test/src/main.c +++ b/samples/mpu/mpu_test/src/main.c @@ -46,7 +46,7 @@ static int cmd_write_mcux(const struct shell *shell, size_t argc, char *argv[]) ARG_UNUSED(argc); ARG_UNUSED(argv); - struct device *flash_dev; + const struct device *flash_dev; u32_t value[2]; u32_t offset; @@ -79,7 +79,7 @@ static int cmd_write_stm32(const struct shell *shell, size_t argc, char *argv[]) ARG_UNUSED(argc); ARG_UNUSED(argv); - struct device *flash_dev; + const struct device *flash_dev; flash_dev = device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL); diff --git a/samples/net/gsm_modem/src/main.c b/samples/net/gsm_modem/src/main.c index 334ec6a6d9be..4a1471d1e8ba 100644 --- a/samples/net/gsm_modem/src/main.c +++ b/samples/net/gsm_modem/src/main.c @@ -37,7 +37,7 @@ static void event_handler(struct net_mgmt_event_callback *cb, int main(void) { - struct device *uart_dev = device_get_binding(CONFIG_MODEM_GSM_UART_NAME); + const struct device *uart_dev = device_get_binding(CONFIG_MODEM_GSM_UART_NAME); LOG_INF("%s: booted board '%s' APN '%s' UART '%s' device %p", __func__, CONFIG_BOARD, CONFIG_MODEM_GSM_APN, diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c index fd86452afc42..22ab3c147e7e 100644 --- a/samples/net/lwm2m_client/src/lwm2m-client.c +++ b/samples/net/lwm2m_client/src/lwm2m-client.c @@ -73,7 +73,7 @@ static u8_t bat_status = LWM2M_DEVICE_BATTERY_STATUS_CHARGING; static int mem_free = 15; static int mem_total = 25; -static struct device *led_dev; +static const struct device *led_dev; static u32_t led_state; static struct lwm2m_ctx client; @@ -188,7 +188,7 @@ static void *temperature_get_buf(u16_t obj_inst_id, u16_t res_id, { /* Last read temperature value, will use 25.5C if no sensor available */ static struct float32_value v = { 25, 500000 }; - struct device *dev = NULL; + const struct device *dev = NULL; #if defined(CONFIG_FXOS8700_TEMP) dev = device_get_binding(DT_LABEL(DT_INST(0, nxp_fxos8700))); diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c index ef6c1cb75962..c758b8a213b2 100644 --- a/samples/net/wpan_serial/src/main.c +++ b/samples/net/wpan_serial/src/main.c @@ -49,11 +49,11 @@ static u8_t slip_buf[1 + 2 * CONFIG_NET_BUF_DATA_SIZE]; /* ieee802.15.4 device */ static struct ieee802154_radio_api *radio_api; -static struct device *ieee802154_dev; +static const struct device *ieee802154_dev; u8_t mac_addr[8]; /* UART device */ -static struct device *uart_dev; +static const struct device *uart_dev; /* SLIP state machine */ static u8_t slip_state = STATE_OK; @@ -126,7 +126,7 @@ static int slip_process_byte(unsigned char c) return 0; } -static void interrupt_handler(struct device *dev) +static void interrupt_handler(const struct device *dev) { while (uart_irq_update(dev) && uart_irq_is_pending(dev)) { unsigned char byte; @@ -427,7 +427,7 @@ static void init_tx_queue(void) /** * FIXME choose correct OUI, or add support in L2 */ -static u8_t *get_mac(struct device *dev) +static u8_t *get_mac(const struct device *dev) { u32_t *ptr = (u32_t *)mac_addr; @@ -513,7 +513,7 @@ int net_recv_data(struct net_if *iface, struct net_pkt *pkt) void main(void) { - struct device *dev; + const struct device *dev; u32_t baudrate, dtr = 0U; int ret; diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c index 342c3d674b1f..ad690f6771c8 100644 --- a/samples/net/wpanusb/src/wpanusb.c +++ b/samples/net/wpanusb/src/wpanusb.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(wpanusb); #define WPANUSB_IN_EP_IDX 0 static struct ieee802154_radio_api *radio_api; -static struct device *ieee802154_dev; +static const struct device *ieee802154_dev; static struct k_fifo tx_queue; diff --git a/samples/nfc/nfc_hello/src/main.c b/samples/nfc/nfc_hello/src/main.c index 17f7bfccbd8e..d26ab9e6b8c4 100644 --- a/samples/nfc/nfc_hello/src/main.c +++ b/samples/nfc/nfc_hello/src/main.c @@ -14,7 +14,7 @@ #define BUF_MAXSIZE 256 #define SLEEP_TIME 500 -static struct device *uart1_dev; +static const struct device *uart1_dev; static u8_t rx_buf[BUF_MAXSIZE]; static u8_t tx_buf[BUF_MAXSIZE]; static u8_t nci_reset[] = {0x20, 0x00, 0x01, 0x00}; @@ -30,7 +30,7 @@ static void msg_dump(const char *s, u8_t *data, unsigned len) printf("(%u bytes)\n", len); } -static void uart1_isr(struct device *x) +static void uart1_isr(const struct device *x) { int len = uart_fifo_read(uart1_dev, rx_buf, BUF_MAXSIZE); diff --git a/samples/sensor/adt7420/src/main.c b/samples/sensor/adt7420/src/main.c index a588856b198c..36443e8c7f71 100644 --- a/samples/sensor/adt7420/src/main.c +++ b/samples/sensor/adt7420/src/main.c @@ -39,7 +39,8 @@ static const char *now_str(void) h, min, s, ms); return buf; } -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { k_sem_give(&sem); } @@ -47,7 +48,8 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) static int low_ucel; static int high_ucel; -static int sensor_set_attribute(struct device *dev, enum sensor_channel chan, +static int sensor_set_attribute(const struct device *dev, + enum sensor_channel chan, enum sensor_attribute attr, int value) { struct sensor_value sensor_val; @@ -71,7 +73,7 @@ static bool temp_in_window(const struct sensor_value *val) return (temp_ucel >= low_ucel) && (temp_ucel <= high_ucel); } -static int sensor_set_window(struct device *dev, +static int sensor_set_window(const struct device *dev, const struct sensor_value *val) { int temp_ucel = val->val1 * UCEL_PER_CEL + val->val2; @@ -96,7 +98,7 @@ static int sensor_set_window(struct device *dev, return rc; } -static void process(struct device *dev) +static void process(const struct device *dev) { struct sensor_value temp_val; int ret; @@ -169,7 +171,7 @@ static void process(struct device *dev) void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adt7420))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adt7420))); if (dev == NULL) { printf("Failed to get device binding\n"); diff --git a/samples/sensor/adxl362/src/main.c b/samples/sensor/adxl362/src/main.c index 929bb72f2967..2c554696a64b 100644 --- a/samples/sensor/adxl362/src/main.c +++ b/samples/sensor/adxl362/src/main.c @@ -11,7 +11,8 @@ K_SEM_DEFINE(sem, 0, 1); -static void trigger_handler(struct device *dev, struct sensor_trigger *trig) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { switch (trig->type) { case SENSOR_TRIG_DATA_READY: @@ -33,7 +34,7 @@ void main(void) { struct sensor_value accel[3]; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adxl362))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adxl362))); if (dev == NULL) { printf("Device get binding device\n"); return; diff --git a/samples/sensor/adxl372/src/main.c b/samples/sensor/adxl372/src/main.c index ec105afd3a8c..d76cd656a745 100644 --- a/samples/sensor/adxl372/src/main.c +++ b/samples/sensor/adxl372/src/main.c @@ -28,7 +28,8 @@ static double sqrt(double value) K_SEM_DEFINE(sem, 0, 1); -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { ARG_UNUSED(trigger); @@ -47,7 +48,7 @@ void main(void) int i; char meter[200]; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adxl372))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, adi_adxl372))); if (dev == NULL) { printf("Could not get %s device\n", DT_LABEL(DT_INST(0, adi_adxl372))); diff --git a/samples/sensor/amg88xx/src/main.c b/samples/sensor/amg88xx/src/main.c index 3bd2860b96b7..d1cd96663b64 100644 --- a/samples/sensor/amg88xx/src/main.c +++ b/samples/sensor/amg88xx/src/main.c @@ -14,7 +14,8 @@ static struct sensor_value temp_value[64]; #ifdef CONFIG_AMG88XX_TRIGGER K_SEM_DEFINE(sem, 0, 1); -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { ARG_UNUSED(dev); ARG_UNUSED(trigger); @@ -50,7 +51,7 @@ void print_buffer(void *ptr, size_t l) void main(void) { int ret; - struct device *dev = device_get_binding( + const struct device *dev = device_get_binding( DT_LABEL(DT_INST(0, panasonic_amg88xx))); if (dev == NULL) { diff --git a/samples/sensor/ams_iAQcore/src/main.c b/samples/sensor/ams_iAQcore/src/main.c index 4040de85abf4..55f33ec14ab9 100644 --- a/samples/sensor/ams_iAQcore/src/main.c +++ b/samples/sensor/ams_iAQcore/src/main.c @@ -11,7 +11,7 @@ void main(void) { - struct device *dev; + const struct device *dev; struct sensor_value co2, voc; dev = device_get_binding(DT_LABEL(DT_INST(0, ams_iaqcore))); diff --git a/samples/sensor/apds9960/src/main.c b/samples/sensor/apds9960/src/main.c index 94757765701f..26eebaed2c9f 100644 --- a/samples/sensor/apds9960/src/main.c +++ b/samples/sensor/apds9960/src/main.c @@ -14,7 +14,8 @@ #ifdef CONFIG_APDS9960_TRIGGER K_SEM_DEFINE(sem, 0, 1); -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { ARG_UNUSED(dev); ARG_UNUSED(trigger); @@ -25,7 +26,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) void main(void) { - struct device *dev; + const struct device *dev; struct sensor_value intensity, pdata; printk("APDS9960 sample application\n"); diff --git a/samples/sensor/bme280/src/main.c b/samples/sensor/bme280/src/main.c index dadf847aa90a..ef2c8aad23d6 100644 --- a/samples/sensor/bme280/src/main.c +++ b/samples/sensor/bme280/src/main.c @@ -20,7 +20,7 @@ void main(void) { - struct device *dev = device_get_binding(BME280_LABEL); + const struct device *dev = device_get_binding(BME280_LABEL); if (dev == NULL) { printk("No device \"%s\" found; did initialization fail?\n", diff --git a/samples/sensor/bme680/src/main.c b/samples/sensor/bme680/src/main.c index c1b660272838..ecfc29319f0c 100644 --- a/samples/sensor/bme680/src/main.c +++ b/samples/sensor/bme680/src/main.c @@ -11,7 +11,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, bosch_bme680))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, bosch_bme680))); struct sensor_value temp, press, humidity, gas_res; printf("Device %p name is %s\n", dev, dev->name); diff --git a/samples/sensor/bmg160/src/main.c b/samples/sensor/bmg160/src/main.c index de458723c452..ee629fe11442 100644 --- a/samples/sensor/bmg160/src/main.c +++ b/samples/sensor/bmg160/src/main.c @@ -17,7 +17,7 @@ #define MAX_TEST_TIME 15000 #define SLEEPTIME 300 -static void print_gyro_data(struct device *bmg160) +static void print_gyro_data(const struct device *bmg160) { struct sensor_value val[3]; @@ -32,7 +32,7 @@ static void print_gyro_data(struct device *bmg160) val[2].val1 + val[2].val2 / 1000000.0); } -static void print_temp_data(struct device *bmg160) +static void print_temp_data(const struct device *bmg160) { struct sensor_value val; @@ -45,7 +45,7 @@ static void print_temp_data(struct device *bmg160) val.val1 + val.val2 / 1000000.0); } -static void test_polling_mode(struct device *bmg160) +static void test_polling_mode(const struct device *bmg160) { s32_t remaining_test_time = MAX_TEST_TIME; @@ -65,7 +65,8 @@ static void test_polling_mode(struct device *bmg160) } while (remaining_test_time > 0); } -static void trigger_handler(struct device *bmg160, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *bmg160, + struct sensor_trigger *trigger) { if (trigger->type != SENSOR_TRIG_DATA_READY && trigger->type != SENSOR_TRIG_DELTA) { @@ -80,7 +81,7 @@ static void trigger_handler(struct device *bmg160, struct sensor_trigger *trigge print_gyro_data(bmg160); } -static void test_trigger_mode(struct device *bmg160) +static void test_trigger_mode(const struct device *bmg160) { s32_t remaining_test_time = MAX_TEST_TIME; struct sensor_trigger trig; @@ -167,7 +168,7 @@ static void test_trigger_mode(struct device *bmg160) void main(void) { - struct device *bmg160; + const struct device *bmg160; #if defined(CONFIG_BMG160_RANGE_RUNTIME) struct sensor_value attr; #endif diff --git a/samples/sensor/bmm150/src/main.c b/samples/sensor/bmm150/src/main.c index 409b623ed0d6..f31628f6be3a 100644 --- a/samples/sensor/bmm150/src/main.c +++ b/samples/sensor/bmm150/src/main.c @@ -10,7 +10,7 @@ #include #include -void do_main(struct device *dev) +void do_main(const struct device *dev) { int ret; struct sensor_value x, y, z; @@ -35,10 +35,10 @@ void do_main(struct device *dev) } } -struct device *sensor_search() +const struct device *sensor_search() { static const char *const magn_sensor[] = { "bmm150", NULL }; - struct device *dev; + const struct device *dev; int i; i = 0; @@ -56,7 +56,7 @@ struct device *sensor_search() void main(void) { - struct device *dev; + const struct device *dev; printk("BMM150 Geomagnetic sensor Application\n"); diff --git a/samples/sensor/bq274xx/src/main.c b/samples/sensor/bq274xx/src/main.c index a08897959289..5b620120e32d 100644 --- a/samples/sensor/bq274xx/src/main.c +++ b/samples/sensor/bq274xx/src/main.c @@ -24,7 +24,7 @@ static void bq274xx_show_values(const char *type, struct sensor_value value) } } -static void do_main(struct device *dev) +static void do_main(const struct device *dev) { struct sensor_value voltage, current, state_of_charge, full_charge_capacity, remaining_charge_capacity, avg_power, @@ -130,7 +130,7 @@ static void do_main(struct device *dev) void main(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding(DT_LABEL(DT_INST(0, ti_bq274xx))); if (!dev) { diff --git a/samples/sensor/ccs811/src/main.c b/samples/sensor/ccs811/src/main.c index f3df3edaba21..d78f095226c6 100644 --- a/samples/sensor/ccs811/src/main.c +++ b/samples/sensor/ccs811/src/main.c @@ -35,7 +35,7 @@ static const char *now_str(void) return buf; } -static int do_fetch(struct device *dev) +static int do_fetch(const struct device *dev) { struct sensor_value co2, tvoc, voltage, current; int rc = 0; @@ -78,7 +78,8 @@ static int do_fetch(struct device *dev) #ifndef CONFIG_CCS811_TRIGGER_NONE -static void trigger_handler(struct device *dev, struct sensor_trigger *trig) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { int rc = do_fetch(dev); @@ -93,7 +94,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trig) #endif /* !CONFIG_CCS811_TRIGGER_NONE */ -static void do_main(struct device *dev) +static void do_main(const struct device *dev) { while (true) { int rc = do_fetch(dev); @@ -112,7 +113,7 @@ static void do_main(struct device *dev) void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, ams_ccs811))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, ams_ccs811))); struct ccs811_configver_type cfgver; int rc; diff --git a/samples/sensor/dht/src/main.c b/samples/sensor/dht/src/main.c index cea245a85c8f..3182837bbcdc 100644 --- a/samples/sensor/dht/src/main.c +++ b/samples/sensor/dht/src/main.c @@ -33,7 +33,7 @@ static const char *now_str(void) void main(void) { const char *const label = DT_LABEL(DT_INST(0, aosong_dht)); - struct device *dht22 = device_get_binding(label); + const struct device *dht22 = device_get_binding(label); if (!dht22) { printf("Failed to find sensor %s\n", label); diff --git a/samples/sensor/dps310/src/main.c b/samples/sensor/dps310/src/main.c index f5af859de042..e594176f6901 100644 --- a/samples/sensor/dps310/src/main.c +++ b/samples/sensor/dps310/src/main.c @@ -12,7 +12,7 @@ void main(void) { printk("Hello DPS310\n"); - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, infineon_dps310))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, infineon_dps310))); if (dev == NULL) { printk("Could not get DPS310 device\n"); diff --git a/samples/sensor/ens210/src/main.c b/samples/sensor/ens210/src/main.c index 3d1b61121a2c..884846fb841f 100644 --- a/samples/sensor/ens210/src/main.c +++ b/samples/sensor/ens210/src/main.c @@ -11,7 +11,7 @@ void main(void) { - struct device *dev; + const struct device *dev; struct sensor_value temperature, humidity; dev = device_get_binding(DT_LABEL(DT_INST(0, ams_ens210))); diff --git a/samples/sensor/fxas21002/src/main.c b/samples/sensor/fxas21002/src/main.c index 6fa0875d0742..10a42b65a981 100644 --- a/samples/sensor/fxas21002/src/main.c +++ b/samples/sensor/fxas21002/src/main.c @@ -10,7 +10,8 @@ K_SEM_DEFINE(sem, 0, 1); /* starts off "not available" */ -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { k_sem_give(&sem); } @@ -18,7 +19,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) void main(void) { struct sensor_value gyro[3]; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, nxp_fxas21002))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, nxp_fxas21002))); if (dev == NULL) { printf("Could not get fxas21002 device\n"); diff --git a/samples/sensor/fxos8700-hid/src/main.c b/samples/sensor/fxos8700-hid/src/main.c index 7317cd0f519d..c376f8d89461 100644 --- a/samples/sensor/fxos8700-hid/src/main.c +++ b/samples/sensor/fxos8700-hid/src/main.c @@ -74,7 +74,7 @@ static struct gpio_callback callback[4]; #define MOUSE_BTN_MIDDLE BIT(2) -static void left_button(struct device *gpio, struct gpio_callback *cb, +static void left_button(const struct device *gpio, struct gpio_callback *cb, u32_t pins) { u32_t cur_val; @@ -94,7 +94,7 @@ static void left_button(struct device *gpio, struct gpio_callback *cb, } #if DT_PHA_HAS_CELL(DT_ALIAS(sw1), gpios, pin) -static void right_button(struct device *gpio, struct gpio_callback *cb, +static void right_button(const struct device *gpio, struct gpio_callback *cb, u32_t pins) { u32_t cur_val; @@ -114,9 +114,10 @@ static void right_button(struct device *gpio, struct gpio_callback *cb, } #endif -int callbacks_configure(struct device *gpio, u32_t pin, int flags, - void (*handler)(struct device*, struct gpio_callback*, - u32_t), struct gpio_callback *callback, u32_t *val) +int callbacks_configure(const struct device *gpio, u32_t pin, int flags, + void (*handler)(const struct device*, struct gpio_callback*, + u32_t), + struct gpio_callback *callback, u32_t *val) { int ret; @@ -141,7 +142,7 @@ int callbacks_configure(struct device *gpio, u32_t pin, int flags, return 0; } -static bool read_accel(struct device *dev) +static bool read_accel(const struct device *dev) { struct sensor_value val[3]; int ret; @@ -174,7 +175,8 @@ static bool read_accel(struct device *dev) } } -static void trigger_handler(struct device *dev, struct sensor_trigger *tr) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *tr) { ARG_UNUSED(tr); @@ -195,7 +197,7 @@ void main(void) { int ret; u8_t report[4] = { 0x00 }; - struct device *led_dev, *accel_dev, *hid_dev; + const struct device *led_dev, *accel_dev, *hid_dev; led_dev = device_get_binding(LED_PORT); if (led_dev == NULL) { diff --git a/samples/sensor/fxos8700/src/main.c b/samples/sensor/fxos8700/src/main.c index df1c6b956db2..06c233d83300 100644 --- a/samples/sensor/fxos8700/src/main.c +++ b/samples/sensor/fxos8700/src/main.c @@ -12,7 +12,8 @@ K_SEM_DEFINE(sem, 0, 1); /* starts off "not available" */ #if !defined(CONFIG_FXOS8700_TRIGGER_NONE) -static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trigger) { ARG_UNUSED(trigger); @@ -31,7 +32,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) void main(void) { struct sensor_value accel[3]; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, nxp_fxos8700))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, nxp_fxos8700))); if (dev == NULL) { printf("Could not get fxos8700 device\n"); diff --git a/samples/sensor/grove_light/src/main.c b/samples/sensor/grove_light/src/main.c index 8968862cdd50..8ca8dc6ff6d3 100644 --- a/samples/sensor/grove_light/src/main.c +++ b/samples/sensor/grove_light/src/main.c @@ -13,7 +13,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, grove_light))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, grove_light))); if (dev == NULL) { printf("device not found. aborting test.\n"); diff --git a/samples/sensor/grove_temperature/src/main.c b/samples/sensor/grove_temperature/src/main.c index 8e855264c353..a7f539836194 100644 --- a/samples/sensor/grove_temperature/src/main.c +++ b/samples/sensor/grove_temperature/src/main.c @@ -19,7 +19,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, grove_temperature))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, grove_temperature))); struct sensor_value temp; int read; @@ -28,7 +28,7 @@ void main(void) return; } #ifdef CONFIG_GROVE_LCD_RGB - struct device *glcd; + const struct device *glcd; glcd = device_get_binding(GROVE_LCD_NAME); if (glcd == NULL) { diff --git a/samples/sensor/hmc5883l/src/main.c b/samples/sensor/hmc5883l/src/main.c index 9613d6876012..1574a4b3b843 100644 --- a/samples/sensor/hmc5883l/src/main.c +++ b/samples/sensor/hmc5883l/src/main.c @@ -11,7 +11,7 @@ #include -static s32_t read_sensor(struct device *sensor) +static s32_t read_sensor(const struct device *sensor) { struct sensor_value val[3]; s32_t ret = 0; @@ -38,7 +38,7 @@ static s32_t read_sensor(struct device *sensor) void main(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding(DT_LABEL(DT_INST(0, honeywell_hmc5883l))); diff --git a/samples/sensor/hts221/src/main.c b/samples/sensor/hts221/src/main.c index fb6360beef73..b6f625f906ea 100644 --- a/samples/sensor/hts221/src/main.c +++ b/samples/sensor/hts221/src/main.c @@ -10,7 +10,7 @@ #include #include -static void process_sample(struct device *dev) +static void process_sample(const struct device *dev) { static unsigned int obs; struct sensor_value temp, hum; @@ -40,7 +40,7 @@ static void process_sample(struct device *dev) sensor_value_to_double(&hum)); } -static void hts221_handler(struct device *dev, +static void hts221_handler(const struct device *dev, struct sensor_trigger *trig) { process_sample(dev); @@ -48,7 +48,7 @@ static void hts221_handler(struct device *dev, void main(void) { - struct device *dev = device_get_binding("HTS221"); + const struct device *dev = device_get_binding("HTS221"); if (dev == NULL) { printf("Could not get HTS221 device\n"); diff --git a/samples/sensor/isl29035/src/main.c b/samples/sensor/isl29035/src/main.c index 71e72add2f4e..5845bbec784c 100644 --- a/samples/sensor/isl29035/src/main.c +++ b/samples/sensor/isl29035/src/main.c @@ -15,7 +15,7 @@ static volatile bool alerted; struct k_sem sem; -static void trigger_handler(struct device *dev, +static void trigger_handler(const struct device *dev, struct sensor_trigger *trig) { #ifdef CONFIG_ISL29035_TRIGGER @@ -45,7 +45,7 @@ static const char *now_str(void) return buf; } -static void process_sample(struct device *dev) +static void process_sample(const struct device *dev) { static bool last_alerted; struct sensor_value val; @@ -102,7 +102,7 @@ static void process_sample(struct device *dev) void main(void) { - struct device *dev = device_get_binding("ISL29035"); + const struct device *dev = device_get_binding("ISL29035"); if (dev == NULL) { printf("Could not get ISL29035 device\n"); diff --git a/samples/sensor/lis2dh/src/main.c b/samples/sensor/lis2dh/src/main.c index eea3caf3dbee..4276d85e8b3c 100644 --- a/samples/sensor/lis2dh/src/main.c +++ b/samples/sensor/lis2dh/src/main.c @@ -9,7 +9,7 @@ #include #include -static void fetch_and_display(struct device *sensor) +static void fetch_and_display(const struct device *sensor) { static unsigned int count; struct sensor_value accel[3]; @@ -41,7 +41,7 @@ static void fetch_and_display(struct device *sensor) } #ifdef CONFIG_LIS2DH_TRIGGER -static void trigger_handler(struct device *dev, +static void trigger_handler(const struct device *dev, struct sensor_trigger *trig) { fetch_and_display(dev); @@ -50,7 +50,7 @@ static void trigger_handler(struct device *dev, void main(void) { - struct device *sensor = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dh))); + const struct device *sensor = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dh))); if (sensor == NULL) { printf("Could not get %s device\n", diff --git a/samples/sensor/lps22hb/src/main.c b/samples/sensor/lps22hb/src/main.c index 9e7ba4e96631..d76f375d7daa 100644 --- a/samples/sensor/lps22hb/src/main.c +++ b/samples/sensor/lps22hb/src/main.c @@ -10,7 +10,7 @@ #include #include -static void process_sample(struct device *dev) +static void process_sample(const struct device *dev) { static unsigned int obs; struct sensor_value pressure, temp; @@ -43,7 +43,7 @@ static void process_sample(struct device *dev) void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hb_press))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hb_press))); if (dev == NULL) { printf("Could not get LPS22HB device\n"); diff --git a/samples/sensor/lps22hh/src/main.c b/samples/sensor/lps22hh/src/main.c index 08dcf37df02a..5c29b287798a 100644 --- a/samples/sensor/lps22hh/src/main.c +++ b/samples/sensor/lps22hh/src/main.c @@ -11,7 +11,7 @@ #include #include -static void process_sample(struct device *dev) +static void process_sample(const struct device *dev) { static unsigned int obs; struct sensor_value pressure, temp; @@ -42,15 +42,15 @@ static void process_sample(struct device *dev) } -static void lps22hh_handler(struct device *dev, - struct sensor_trigger *trig) +static void lps22hh_handler(const struct device *dev, + struct sensor_trigger *trig) { process_sample(dev); } void main(void) { - struct device *dev = device_get_binding("LPS22HH"); + const struct device *dev = device_get_binding("LPS22HH"); if (dev == NULL) { printf("Could not get LPS22HH device\n"); diff --git a/samples/sensor/lsm303dlhc/src/main.c b/samples/sensor/lsm303dlhc/src/main.c index 314dd2a2b261..625e5676be11 100644 --- a/samples/sensor/lsm303dlhc/src/main.c +++ b/samples/sensor/lsm303dlhc/src/main.c @@ -10,7 +10,8 @@ #include #include -static s32_t read_sensor(struct device *sensor, enum sensor_channel channel) +static s32_t read_sensor(const struct device *sensor, + enum sensor_channel channel) { struct sensor_value val[3]; s32_t ret = 0; @@ -37,9 +38,9 @@ static s32_t read_sensor(struct device *sensor, enum sensor_channel channel) void main(void) { - struct device *accelerometer = device_get_binding( + const struct device *accelerometer = device_get_binding( DT_LABEL(DT_INST(0, st_lis2dh))); - struct device *magnetometer = device_get_binding( + const struct device *magnetometer = device_get_binding( DT_LABEL(DT_INST(0, st_lsm303dlhc_magn))); if (accelerometer == NULL) { diff --git a/samples/sensor/lsm6dsl/src/main.c b/samples/sensor/lsm6dsl/src/main.c index f281935e99de..86fff70c9202 100644 --- a/samples/sensor/lsm6dsl/src/main.c +++ b/samples/sensor/lsm6dsl/src/main.c @@ -28,7 +28,7 @@ static struct sensor_value press_out, temp_out; #endif #ifdef CONFIG_LSM6DSL_TRIGGER -static void lsm6dsl_trigger_handler(struct device *dev, +static void lsm6dsl_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { static struct sensor_value accel_x, accel_y, accel_z; @@ -100,7 +100,7 @@ void main(void) int cnt = 0; char out_str[64]; struct sensor_value odr_attr; - struct device *lsm6dsl_dev = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); + const struct device *lsm6dsl_dev = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); if (lsm6dsl_dev == NULL) { printk("Could not get LSM6DSL device\n"); diff --git a/samples/sensor/magn_polling/src/main.c b/samples/sensor/magn_polling/src/main.c index 31c4e2d8e3fb..83296981c405 100644 --- a/samples/sensor/magn_polling/src/main.c +++ b/samples/sensor/magn_polling/src/main.c @@ -10,7 +10,7 @@ #include #include -static void do_main(struct device *dev) +static void do_main(const struct device *dev) { int ret; struct sensor_value value_x, value_y, value_z; @@ -34,10 +34,10 @@ static void do_main(struct device *dev) } } -struct device *sensor_search_for_magnetometer() +const struct device *sensor_search_for_magnetometer() { static char *magn_sensors[] = {"bmc150_magn", NULL}; - struct device *dev; + const struct device *dev; int i; i = 0; @@ -54,7 +54,7 @@ struct device *sensor_search_for_magnetometer() void main(void) { - struct device *dev; + const struct device *dev; dev = sensor_search_for_magnetometer(); if (dev) { diff --git a/samples/sensor/max30101/src/main.c b/samples/sensor/max30101/src/main.c index 7c7d48c13f3f..5417be097795 100644 --- a/samples/sensor/max30101/src/main.c +++ b/samples/sensor/max30101/src/main.c @@ -11,7 +11,7 @@ void main(void) { struct sensor_value green; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, max_max30101))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, max_max30101))); if (dev == NULL) { printf("Could not get max30101 device\n"); diff --git a/samples/sensor/max44009/src/main.c b/samples/sensor/max44009/src/main.c index 1c2d16599ede..55ae119b2451 100644 --- a/samples/sensor/max44009/src/main.c +++ b/samples/sensor/max44009/src/main.c @@ -17,7 +17,7 @@ void main(void) { - struct device *dev; + const struct device *dev; struct sensor_value val; u32_t lum = 0U; diff --git a/samples/sensor/mcp9808/src/main.c b/samples/sensor/mcp9808/src/main.c index 73306ebec3b8..06bf63dd39cd 100644 --- a/samples/sensor/mcp9808/src/main.c +++ b/samples/sensor/mcp9808/src/main.c @@ -40,7 +40,7 @@ static const char *now_str(void) static struct sensor_trigger trig; -static int set_window(struct device *dev, +static int set_window(const struct device *dev, const struct sensor_value *temp) { const int temp_ucel = temp->val1 * UCEL_PER_CEL + temp->val2; @@ -68,8 +68,8 @@ static int set_window(struct device *dev, return rc; } -static inline int set_window_ucel(struct device *dev, - int temp_ucel) +static inline int set_window_ucel(const struct device *dev, + int temp_ucel) { struct sensor_value val = { .val1 = temp_ucel / UCEL_PER_CEL, @@ -79,7 +79,8 @@ static inline int set_window_ucel(struct device *dev, return set_window(dev, &val); } -static void trigger_handler(struct device *dev, struct sensor_trigger *trig) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { struct sensor_value temp; static size_t cnt; @@ -97,7 +98,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trig) void main(void) { const char *const devname = DT_LABEL(DT_INST(0, microchip_mcp9808)); - struct device *dev = device_get_binding(devname); + const struct device *dev = device_get_binding(devname); int rc; if (dev == NULL) { diff --git a/samples/sensor/mpr/src/main.c b/samples/sensor/mpr/src/main.c index bf695ff0b745..09739a1a9373 100644 --- a/samples/sensor/mpr/src/main.c +++ b/samples/sensor/mpr/src/main.c @@ -12,7 +12,7 @@ void main(void) { const char *const devname = DT_LABEL(DT_INST(0, honeywell_mpr)); - struct device *dev = device_get_binding(devname); + const struct device *dev = device_get_binding(devname); int rc; if (dev == NULL) { diff --git a/samples/sensor/mpu6050/src/main.c b/samples/sensor/mpu6050/src/main.c index c53dcf12636e..bf982addc054 100644 --- a/samples/sensor/mpu6050/src/main.c +++ b/samples/sensor/mpu6050/src/main.c @@ -30,7 +30,7 @@ static const char *now_str(void) return buf; } -static int process_mpu6050(struct device *dev) +static int process_mpu6050(const struct device *dev) { struct sensor_value temperature; struct sensor_value accel[3]; @@ -71,7 +71,7 @@ static int process_mpu6050(struct device *dev) #ifdef CONFIG_MPU6050_TRIGGER static struct sensor_trigger trigger; -static void handle_mpu6050_drdy(struct device *dev, +static void handle_mpu6050_drdy(const struct device *dev, struct sensor_trigger *trig) { int rc = process_mpu6050(dev); @@ -87,7 +87,7 @@ static void handle_mpu6050_drdy(struct device *dev, void main(void) { const char *const label = DT_LABEL(DT_INST(0, invensense_mpu6050)); - struct device *mpu6050 = device_get_binding(label); + const struct device *mpu6050 = device_get_binding(label); if (!mpu6050) { printf("Failed to find sensor %s\n", label); diff --git a/samples/sensor/ms5837/src/main.c b/samples/sensor/ms5837/src/main.c index 900ebe9df609..220a70743680 100644 --- a/samples/sensor/ms5837/src/main.c +++ b/samples/sensor/ms5837/src/main.c @@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(main); void main(void) { struct sensor_value oversampling_rate = { 8192, 0 }; - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, meas_ms5837))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, meas_ms5837))); if (dev == NULL) { LOG_ERR("Could not find MS5837 device, aborting test."); diff --git a/samples/sensor/sht3xd/src/main.c b/samples/sensor/sht3xd/src/main.c index c0a7ebcffb78..eed883d70a15 100644 --- a/samples/sensor/sht3xd/src/main.c +++ b/samples/sensor/sht3xd/src/main.c @@ -15,7 +15,8 @@ #ifdef CONFIG_SHT3XD_TRIGGER static volatile bool alerted; -static void trigger_handler(struct device *dev, struct sensor_trigger *trig) +static void trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { alerted = !alerted; } @@ -24,7 +25,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trig) void main(void) { - struct device *dev = device_get_binding("SHT3XD"); + const struct device *dev = device_get_binding("SHT3XD"); int rc; if (dev == NULL) { diff --git a/samples/sensor/sx9500/src/main.c b/samples/sensor/sx9500/src/main.c index 6a9be0a48e96..07b757d09ae2 100644 --- a/samples/sensor/sx9500/src/main.c +++ b/samples/sensor/sx9500/src/main.c @@ -11,7 +11,8 @@ #include #ifdef CONFIG_SX9500_TRIGGER -static void sensor_trigger_handler(struct device *dev, struct sensor_trigger *trig) +static void sensor_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { struct sensor_value prox_value; int ret; @@ -26,7 +27,7 @@ static void sensor_trigger_handler(struct device *dev, struct sensor_trigger *tr printk("prox is %d\n", prox_value.val1); } -static void setup_trigger(struct device *dev) +static void setup_trigger(const struct device *dev) { int ret; struct sensor_trigger trig = { @@ -39,7 +40,7 @@ static void setup_trigger(struct device *dev) } } -void do_main(struct device *dev) +void do_main(const struct device *dev) { setup_trigger(dev); @@ -50,7 +51,7 @@ void do_main(struct device *dev) #else /* CONFIG_SX9500_TRIGGER */ -static void do_main(struct device *dev) +static void do_main(const struct device *dev) { int ret; struct sensor_value prox_value; @@ -73,7 +74,7 @@ static void do_main(struct device *dev) void main(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding("SX9500"); diff --git a/samples/sensor/th02/src/main.c b/samples/sensor/th02/src/main.c index d50bc7af6db3..4d2d6a8ee4ff 100644 --- a/samples/sensor/th02/src/main.c +++ b/samples/sensor/th02/src/main.c @@ -29,7 +29,7 @@ static struct channel_info info[] = { void main(void) { - struct device *dev[ARRAY_SIZE(info)]; + const struct device *dev[ARRAY_SIZE(info)]; struct sensor_value val[ARRAY_SIZE(info)]; unsigned int i; int rc; @@ -44,7 +44,7 @@ void main(void) } #ifdef CONFIG_GROVE_LCD_RGB - struct device *glcd; + const struct device *glcd; glcd = device_get_binding(GROVE_LCD_NAME); if (glcd == NULL) { diff --git a/samples/sensor/thermometer/src/main.c b/samples/sensor/thermometer/src/main.c index b1824178e02c..3a632ce99b99 100644 --- a/samples/sensor/thermometer/src/main.c +++ b/samples/sensor/thermometer/src/main.c @@ -10,7 +10,7 @@ void main(void) { - struct device *temp_dev; + const struct device *temp_dev; printf("Thermometer Example! %s\n", CONFIG_ARCH); diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c index 3d97a168f3b4..50e40af7a5d1 100644 --- a/samples/sensor/ti_hdc/src/main.c +++ b/samples/sensor/ti_hdc/src/main.c @@ -15,7 +15,7 @@ void main(void) { printk("Running on %s!\n", CONFIG_ARCH); - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, ti_hdc))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, ti_hdc))); __ASSERT(dev != NULL, "Failed to get device binding"); diff --git a/samples/sensor/tmp112/src/main.c b/samples/sensor/tmp112/src/main.c index 2375b6f767b7..96aa759cce6e 100644 --- a/samples/sensor/tmp112/src/main.c +++ b/samples/sensor/tmp112/src/main.c @@ -10,7 +10,7 @@ #include #include -static void do_main(struct device *dev) +static void do_main(const struct device *dev) { int ret; struct sensor_value temp_value; @@ -56,7 +56,7 @@ static void do_main(struct device *dev) void main(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding("TMP112"); __ASSERT(dev != NULL, "Failed to get device binding"); diff --git a/samples/sensor/tmp116/src/main.c b/samples/sensor/tmp116/src/main.c index 553a4f01091e..8f72a1a6ad09 100644 --- a/samples/sensor/tmp116/src/main.c +++ b/samples/sensor/tmp116/src/main.c @@ -12,7 +12,7 @@ void main(void) { - struct device *dev; + const struct device *dev; struct sensor_value temp_value; int ret; diff --git a/samples/sensor/vl53l0x/src/main.c b/samples/sensor/vl53l0x/src/main.c index aaf81e673fdc..fb7038243502 100644 --- a/samples/sensor/vl53l0x/src/main.c +++ b/samples/sensor/vl53l0x/src/main.c @@ -12,7 +12,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, st_vl53l0x))); + const struct device *dev = device_get_binding(DT_LABEL(DT_INST(0, st_vl53l0x))); struct sensor_value value; int ret; diff --git a/samples/shields/lmp90100_evb/rtd/src/main.c b/samples/shields/lmp90100_evb/rtd/src/main.c index beac5ef00454..1a8c591225e6 100644 --- a/samples/shields/lmp90100_evb/rtd/src/main.c +++ b/samples/shields/lmp90100_evb/rtd/src/main.c @@ -47,7 +47,7 @@ static double rtd_temperature(int nom, double resistance) void main(void) { - struct device *lmp90100; + const struct device *lmp90100; double resistance; s32_t buffer; int err; diff --git a/samples/shields/x_nucleo_iks01a1/src/main.c b/samples/shields/x_nucleo_iks01a1/src/main.c index 385c768d8e8e..9adf082bb81f 100644 --- a/samples/shields/x_nucleo_iks01a1/src/main.c +++ b/samples/shields/x_nucleo_iks01a1/src/main.c @@ -13,7 +13,7 @@ #ifdef CONFIG_LIS3MDL_TRIGGER static int lis3mdl_trig_cnt; -static void lis3mdl_trigger_handler(struct device *dev, +static void lis3mdl_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, trig->chan); @@ -25,10 +25,10 @@ void main(void) { struct sensor_value temp, hum, press; struct sensor_value magn_xyz[3], accel_xyz[3]; - struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); - struct device *lis3mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis3mdl_magn))); - struct device *lsm6ds0 = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6ds0))); - struct device *lps25hb = device_get_binding(DT_LABEL(DT_INST(0, st_lps25hb_press))); + const struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); + const struct device *lis3mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis3mdl_magn))); + const struct device *lsm6ds0 = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6ds0))); + const struct device *lps25hb = device_get_binding(DT_LABEL(DT_INST(0, st_lps25hb_press))); #if defined(CONFIG_LIS3MDL_TRIGGER) struct sensor_trigger trig; int cnt = 1; diff --git a/samples/shields/x_nucleo_iks01a2/src/main.c b/samples/shields/x_nucleo_iks01a2/src/main.c index 2e0e8e375b84..d52571fffc2f 100644 --- a/samples/shields/x_nucleo_iks01a2/src/main.c +++ b/samples/shields/x_nucleo_iks01a2/src/main.c @@ -16,11 +16,11 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); - struct device *lps22hb = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hb_press))); - struct device *lsm6dsl = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); - struct device *lsm303agr_a = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dh))); - struct device *lsm303agr_m = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); + const struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); + const struct device *lps22hb = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hb_press))); + const struct device *lsm6dsl = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dsl))); + const struct device *lsm303agr_a = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dh))); + const struct device *lsm303agr_m = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); if (hts221 == NULL) { printf("Could not get HTS221 device\n"); diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c b/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c index 3723c602c758..c4e7eb9a83f9 100644 --- a/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c +++ b/samples/shields/x_nucleo_iks01a3/sensorhub/src/main.c @@ -13,8 +13,8 @@ #ifdef CONFIG_LIS2DW12_TRIGGER static int lis2dw12_trig_cnt; -static void lis2dw12_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void lis2dw12_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lis2dw12_trig_cnt++; @@ -26,29 +26,29 @@ static int lsm6dso_acc_trig_cnt; static int lsm6dso_gyr_trig_cnt; static int lsm6dso_temp_trig_cnt; -static void lsm6dso_acc_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_acc_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lsm6dso_acc_trig_cnt++; } -static void lsm6dso_gyr_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_gyr_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_GYRO_XYZ); lsm6dso_gyr_trig_cnt++; } -static void lsm6dso_temp_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_temp_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_DIE_TEMP); lsm6dso_temp_trig_cnt++; } #endif -static void lis2dw12_config(struct device *lis2dw12) +static void lis2dw12_config(const struct device *lis2dw12) { struct sensor_value odr_attr, fs_attr; @@ -79,7 +79,7 @@ static void lis2dw12_config(struct device *lis2dw12) #endif } -static void lsm6dso_config(struct device *lsm6dso) +static void lsm6dso_config(const struct device *lsm6dso) { struct sensor_value odr_attr, fs_attr; @@ -179,8 +179,8 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); - struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); + const struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); + const struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); int cnt = 1; if (lis2dw12 == NULL) { diff --git a/samples/shields/x_nucleo_iks01a3/standard/src/main.c b/samples/shields/x_nucleo_iks01a3/standard/src/main.c index 056211d8dd4c..ab465ee3a586 100644 --- a/samples/shields/x_nucleo_iks01a3/standard/src/main.c +++ b/samples/shields/x_nucleo_iks01a3/standard/src/main.c @@ -13,7 +13,7 @@ #ifdef CONFIG_LIS2MDL_TRIGGER static int lis2mdl_trig_cnt; -static void lis2mdl_trigger_handler(struct device *dev, +static void lis2mdl_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ALL); @@ -24,7 +24,7 @@ static void lis2mdl_trigger_handler(struct device *dev, #ifdef CONFIG_LPS22HH_TRIGGER static int lps22hh_trig_cnt; -static void lps22hh_trigger_handler(struct device *dev, +static void lps22hh_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_PRESS); @@ -35,7 +35,7 @@ static void lps22hh_trigger_handler(struct device *dev, #ifdef CONFIG_STTS751_TRIGGER static int stts751_trig_cnt; -static void stts751_trigger_handler(struct device *dev, +static void stts751_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { stts751_trig_cnt++; @@ -45,8 +45,8 @@ static void stts751_trigger_handler(struct device *dev, #ifdef CONFIG_LIS2DW12_TRIGGER static int lis2dw12_trig_cnt; -static void lis2dw12_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void lis2dw12_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lis2dw12_trig_cnt++; @@ -58,29 +58,29 @@ static int lsm6dso_acc_trig_cnt; static int lsm6dso_gyr_trig_cnt; static int lsm6dso_temp_trig_cnt; -static void lsm6dso_acc_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_acc_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); lsm6dso_acc_trig_cnt++; } -static void lsm6dso_gyr_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_gyr_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_GYRO_XYZ); lsm6dso_gyr_trig_cnt++; } -static void lsm6dso_temp_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void lsm6dso_temp_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_DIE_TEMP); lsm6dso_temp_trig_cnt++; } #endif -static void lis2mdl_config(struct device *lis2mdl) +static void lis2mdl_config(const struct device *lis2mdl) { struct sensor_value odr_attr; @@ -103,7 +103,7 @@ static void lis2mdl_config(struct device *lis2mdl) #endif } -static void lps22hh_config(struct device *lps22hh) +static void lps22hh_config(const struct device *lps22hh) { struct sensor_value odr_attr; @@ -126,7 +126,7 @@ static void lps22hh_config(struct device *lps22hh) #endif } -static void stts751_config(struct device *stts751) +static void stts751_config(const struct device *stts751) { struct sensor_value odr_attr; @@ -149,7 +149,7 @@ static void stts751_config(struct device *stts751) #endif } -static void lis2dw12_config(struct device *lis2dw12) +static void lis2dw12_config(const struct device *lis2dw12) { struct sensor_value odr_attr, fs_attr; @@ -180,7 +180,7 @@ static void lis2dw12_config(struct device *lis2dw12) #endif } -static void lsm6dso_config(struct device *lsm6dso) +static void lsm6dso_config(const struct device *lsm6dso) { struct sensor_value odr_attr, fs_attr; @@ -247,12 +247,12 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); - struct device *lps22hh = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hh))); - struct device *stts751 = device_get_binding(DT_LABEL(DT_INST(0, st_stts751))); - struct device *lis2mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); - struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); - struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); + const struct device *hts221 = device_get_binding(DT_LABEL(DT_INST(0, st_hts221))); + const struct device *lps22hh = device_get_binding(DT_LABEL(DT_INST(0, st_lps22hh))); + const struct device *stts751 = device_get_binding(DT_LABEL(DT_INST(0, st_stts751))); + const struct device *lis2mdl = device_get_binding(DT_LABEL(DT_INST(0, st_lis2mdl))); + const struct device *lis2dw12 = device_get_binding(DT_LABEL(DT_INST(0, st_lis2dw12))); + const struct device *lsm6dso = device_get_binding(DT_LABEL(DT_INST(0, st_lsm6dso))); int cnt = 1; if (hts221 == NULL) { diff --git a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c index 70aba7d5bd42..415fc6e44f54 100644 --- a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c +++ b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c @@ -49,7 +49,7 @@ void main(void) u32_t ms; int ret; - struct device *mic_dev = device_get_binding(DT_LABEL(DT_INST(0, st_mpxxdtyy))); + const struct device *mic_dev = device_get_binding(DT_LABEL(DT_INST(0, st_mpxxdtyy))); if (!mic_dev) { printk("Could not get pointer to mic device\n"); diff --git a/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c b/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c index 5988755b71b6..61c4622da7e6 100644 --- a/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c +++ b/samples/shields/x_nucleo_iks02a1/sensorhub/src/main.c @@ -13,8 +13,8 @@ #ifdef CONFIG_IIS2DLPC_TRIGGER static int iis2dlpc_trig_cnt; -static void iis2dlpc_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void iis2dlpc_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); iis2dlpc_trig_cnt++; @@ -26,29 +26,29 @@ static int ism330dhcx_acc_trig_cnt; static int ism330dhcx_gyr_trig_cnt; static int ism330dhcx_temp_trig_cnt; -static void ism330dhcx_acc_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void ism330dhcx_acc_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); ism330dhcx_acc_trig_cnt++; } -static void ism330dhcx_gyr_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void ism330dhcx_gyr_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_GYRO_XYZ); ism330dhcx_gyr_trig_cnt++; } -static void ism330dhcx_temp_trig_handler(struct device *dev, - struct sensor_trigger *trig) +static void ism330dhcx_temp_trig_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_DIE_TEMP); ism330dhcx_temp_trig_cnt++; } #endif -static void iis2dlpc_config(struct device *iis2dlpc) +static void iis2dlpc_config(const struct device *iis2dlpc) { struct sensor_value odr_attr, fs_attr; @@ -79,7 +79,7 @@ static void iis2dlpc_config(struct device *iis2dlpc) #endif } -static void ism330dhcx_config(struct device *ism330dhcx) +static void ism330dhcx_config(const struct device *ism330dhcx) { struct sensor_value odr_attr, fs_attr; @@ -156,8 +156,8 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *iis2dlpc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2dlpc))); - struct device *ism330dhcx = device_get_binding(DT_LABEL(DT_INST(0, st_ism330dhcx))); + const struct device *iis2dlpc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2dlpc))); + const struct device *ism330dhcx = device_get_binding(DT_LABEL(DT_INST(0, st_ism330dhcx))); int cnt = 1; if (iis2dlpc == NULL) { diff --git a/samples/shields/x_nucleo_iks02a1/standard/src/main.c b/samples/shields/x_nucleo_iks02a1/standard/src/main.c index 695e4ef050a1..cdef4befb6d7 100644 --- a/samples/shields/x_nucleo_iks02a1/standard/src/main.c +++ b/samples/shields/x_nucleo_iks02a1/standard/src/main.c @@ -13,8 +13,8 @@ #ifdef CONFIG_IIS2DLPC_TRIGGER static int iis2dlpc_trig_cnt; -static void iis2dlpc_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void iis2dlpc_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); iis2dlpc_trig_cnt++; @@ -24,7 +24,7 @@ static void iis2dlpc_trigger_handler(struct device *dev, #ifdef CONFIG_IIS2MDC_TRIGGER static int iis2mdc_trig_cnt; -static void iis2mdc_trigger_handler(struct device *dev, +static void iis2mdc_trigger_handler(const struct device *dev, struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ALL); @@ -36,22 +36,22 @@ static void iis2mdc_trigger_handler(struct device *dev, static int ism330dhcx_acc_trig_cnt; static int ism330dhcx_gyr_trig_cnt; -static void ism330dhcx_acc_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void ism330dhcx_acc_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_ACCEL_XYZ); ism330dhcx_acc_trig_cnt++; } -static void ism330dhcx_gyr_trigger_handler(struct device *dev, - struct sensor_trigger *trig) +static void ism330dhcx_gyr_trigger_handler(const struct device *dev, + struct sensor_trigger *trig) { sensor_sample_fetch_chan(dev, SENSOR_CHAN_GYRO_XYZ); ism330dhcx_gyr_trig_cnt++; } #endif -static void iis2dlpc_config(struct device *iis2dlpc) +static void iis2dlpc_config(const struct device *iis2dlpc) { struct sensor_value odr_attr, fs_attr; @@ -82,7 +82,7 @@ static void iis2dlpc_config(struct device *iis2dlpc) #endif } -static void iis2mdc_config(struct device *iis2mdc) +static void iis2mdc_config(const struct device *iis2mdc) { struct sensor_value odr_attr; @@ -105,7 +105,7 @@ static void iis2mdc_config(struct device *iis2mdc) #endif } -static void ism330dhcx_config(struct device *ism330dhcx) +static void ism330dhcx_config(const struct device *ism330dhcx) { struct sensor_value odr_attr, fs_attr; @@ -167,9 +167,9 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *iis2dlpc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2dlpc))); - struct device *iis2mdc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2mdc))); - struct device *ism330dhcx = device_get_binding(DT_LABEL(DT_INST(0, st_ism330dhcx))); + const struct device *iis2dlpc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2dlpc))); + const struct device *iis2mdc = device_get_binding(DT_LABEL(DT_INST(0, st_iis2mdc))); + const struct device *ism330dhcx = device_get_binding(DT_LABEL(DT_INST(0, st_ism330dhcx))); int cnt = 1; if (iis2dlpc == NULL) { diff --git a/samples/subsys/canbus/canopen/src/main.c b/samples/subsys/canbus/canopen/src/main.c index d76865f157ed..f5ecc49b8519 100644 --- a/samples/subsys/canbus/canopen/src/main.c +++ b/samples/subsys/canbus/canopen/src/main.c @@ -41,7 +41,7 @@ static struct gpio_callback button_callback; #endif struct led_indicator { - struct device *dev; + const struct device *dev; gpio_pin_t pin; }; @@ -145,7 +145,8 @@ static CO_SDO_abortCode_t odf_2102(CO_ODF_arg_t *odf_arg) * @param pins GPIO pin mask that triggered the interrupt. */ #ifdef BUTTON_PORT -static void button_isr_callback(struct device *port, struct gpio_callback *cb, +static void button_isr_callback(const struct device *port, + struct gpio_callback *cb, u32_t pins) { counter++; @@ -160,7 +161,7 @@ static void button_isr_callback(struct device *port, struct gpio_callback *cb, static void config_button(void) { #ifdef BUTTON_PORT - struct device *dev; + const struct device *dev; int err; dev = device_get_binding(BUTTON_PORT); @@ -201,7 +202,7 @@ void main(void) { CO_NMT_reset_cmd_t reset = CO_RESET_NOT; CO_ReturnError_t err; - struct device *can; + const struct device *can; u16_t timeout; u32_t elapsed; s64_t timestamp; diff --git a/samples/subsys/canbus/isotp/src/main.c b/samples/subsys/canbus/isotp/src/main.c index a90c718fd731..e2e70a1500aa 100644 --- a/samples/subsys/canbus/isotp/src/main.c +++ b/samples/subsys/canbus/isotp/src/main.c @@ -35,7 +35,7 @@ const struct isotp_msg_id tx_addr_0_5 = { .use_ext_addr = 0 }; -struct device *can_dev; +const struct device *can_dev; struct isotp_recv_ctx recv_ctx_8_0; struct isotp_recv_ctx recv_ctx_0_5; diff --git a/samples/subsys/ipc/ipm_imx/src/main.c b/samples/subsys/ipc/ipm_imx/src/main.c index 7afbb124e11e..cc2f046e279d 100644 --- a/samples/subsys/ipc/ipm_imx/src/main.c +++ b/samples/subsys/ipc/ipm_imx/src/main.c @@ -9,7 +9,7 @@ #include #include -static struct device *ipm; +static const struct device *ipm; static void ipm_callback(void *context, u32_t id, volatile void *data) { diff --git a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c index 4d395f8194b8..25cddd0e0d68 100644 --- a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c +++ b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c @@ -9,7 +9,7 @@ #include #include -struct device *ipm; +const struct device *ipm; void ping_ipm_callback(void *context, u32_t id, volatile void *data) { diff --git a/samples/subsys/ipc/ipm_mcux/src/main_master.c b/samples/subsys/ipc/ipm_mcux/src/main_master.c index 231801148419..41456d4e4621 100644 --- a/samples/subsys/ipc/ipm_mcux/src/main_master.c +++ b/samples/subsys/ipc/ipm_mcux/src/main_master.c @@ -9,7 +9,7 @@ #include #include -struct device *ipm; +const struct device *ipm; int gcounter; void ping_ipm_callback(void *context, u32_t id, volatile void *data) diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c index 93ef11447135..a43740905141 100644 --- a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c +++ b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c @@ -14,7 +14,7 @@ enum cpu_id_t { MHU_CPU_MAX, }; -struct device *mhu0; +const struct device *mhu0; static void main_cpu_0(void) { diff --git a/samples/subsys/ipc/openamp/remote/src/main.c b/samples/subsys/ipc/openamp/remote/src/main.c index 86d44d5da233..12f984f50524 100644 --- a/samples/subsys/ipc/openamp/remote/src/main.c +++ b/samples/subsys/ipc/openamp/remote/src/main.c @@ -23,7 +23,7 @@ K_THREAD_STACK_DEFINE(thread_stack, APP_TASK_STACK_SIZE); static struct k_thread thread_data; -static struct device *ipm_handle; +static const struct device *ipm_handle; static metal_phys_addr_t shm_physmap[] = { SHM_START_ADDR }; static struct metal_device shm_device = { diff --git a/samples/subsys/ipc/openamp/src/main.c b/samples/subsys/ipc/openamp/src/main.c index 4d28adaa55af..51a242293b8f 100644 --- a/samples/subsys/ipc/openamp/src/main.c +++ b/samples/subsys/ipc/openamp/src/main.c @@ -24,7 +24,7 @@ K_THREAD_STACK_DEFINE(thread_stack, APP_TASK_STACK_SIZE); static struct k_thread thread_data; -static struct device *ipm_handle; +static const struct device *ipm_handle; static metal_phys_addr_t shm_physmap[] = { SHM_START_ADDR }; static struct metal_device shm_device = { @@ -299,7 +299,7 @@ void main(void) /* Make sure we clear out the status flag very early (before we bringup the * secondary core) so the secondary core see's the proper status */ -int init_status_flag(struct device *arg) +int init_status_flag(const struct device *arg) { virtio_set_status(NULL, 0); diff --git a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c index 336c4136e547..97e5604d16d6 100644 --- a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c +++ b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c @@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(openamp_rsc_table, LOG_LEVEL_DBG); K_THREAD_STACK_DEFINE(thread_stack, APP_TASK_STACK_SIZE); static struct k_thread thread_data; -static struct device *ipm_handle; +static const struct device *ipm_handle; static metal_phys_addr_t shm_physmap = SHM_START_ADDR; diff --git a/samples/subsys/power/device_pm/src/dummy_driver.c b/samples/subsys/power/device_pm/src/dummy_driver.c index 0fda210b29b1..719a96fbf08a 100644 --- a/samples/subsys/power/device_pm/src/dummy_driver.c +++ b/samples/subsys/power/device_pm/src/dummy_driver.c @@ -10,9 +10,9 @@ static struct k_poll_event async_evt; u32_t device_power_state; -static struct device *parent; +static const struct device *parent; -static int dummy_open(struct device *dev) +static int dummy_open(const struct device *dev) { int ret; int signaled = 0, result; @@ -52,7 +52,7 @@ static int dummy_open(struct device *dev) return ret; } -static int dummy_read(struct device *dev, u32_t *val) +static int dummy_read(const struct device *dev, u32_t *val) { struct dummy_parent_api *api; int ret; @@ -64,7 +64,7 @@ static int dummy_read(struct device *dev, u32_t *val) return ret; } -static int dummy_write(struct device *dev, u32_t val) +static int dummy_write(const struct device *dev, u32_t val) { struct dummy_parent_api *api; int ret; @@ -75,7 +75,7 @@ static int dummy_write(struct device *dev, u32_t val) return ret; } -static int dummy_close(struct device *dev) +static int dummy_close(const struct device *dev) { int ret; @@ -93,12 +93,12 @@ static int dummy_close(struct device *dev) return ret; } -static u32_t dummy_get_power_state(struct device *dev) +static u32_t dummy_get_power_state(const struct device *dev) { return device_power_state; } -static int dummy_suspend(struct device *dev) +static int dummy_suspend(const struct device *dev) { printk("child suspending..\n"); device_power_state = DEVICE_PM_SUSPEND_STATE; @@ -106,7 +106,7 @@ static int dummy_suspend(struct device *dev) return 0; } -static int dummy_resume_from_suspend(struct device *dev) +static int dummy_resume_from_suspend(const struct device *dev) { printk("child resuming..\n"); device_power_state = DEVICE_PM_ACTIVE_STATE; @@ -114,7 +114,7 @@ static int dummy_resume_from_suspend(struct device *dev) return 0; } -static int dummy_device_pm_ctrl(struct device *dev, u32_t ctrl_command, +static int dummy_device_pm_ctrl(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -147,7 +147,7 @@ static const struct dummy_driver_api funcs = { .close = dummy_close, }; -int dummy_init(struct device *dev) +int dummy_init(const struct device *dev) { parent = device_get_binding(DUMMY_PARENT_NAME); if (!parent) { diff --git a/samples/subsys/power/device_pm/src/dummy_driver.h b/samples/subsys/power/device_pm/src/dummy_driver.h index 0fc5994e5cca..2a5743c28f7b 100644 --- a/samples/subsys/power/device_pm/src/dummy_driver.h +++ b/samples/subsys/power/device_pm/src/dummy_driver.h @@ -8,13 +8,13 @@ #include #define DUMMY_DRIVER_NAME "dummy_driver" -typedef int (*dummy_api_open_t)(struct device *dev); +typedef int (*dummy_api_open_t)(const struct device *dev); -typedef int (*dummy_api_read_t)(struct device *dev, +typedef int (*dummy_api_read_t)(const struct device *dev, u32_t *val); -typedef int (*dummy_api_write_t)(struct device *dev, +typedef int (*dummy_api_write_t)(const struct device *dev, u32_t val); -typedef int (*dummy_api_close_t)(struct device *dev); +typedef int (*dummy_api_close_t)(const struct device *dev); struct dummy_driver_api { dummy_api_open_t open; diff --git a/samples/subsys/power/device_pm/src/dummy_parent.c b/samples/subsys/power/device_pm/src/dummy_parent.c index 89c071822264..b38558ad0893 100644 --- a/samples/subsys/power/device_pm/src/dummy_parent.c +++ b/samples/subsys/power/device_pm/src/dummy_parent.c @@ -10,7 +10,7 @@ static u32_t store_value; u32_t parent_power_state; -static int dummy_transfer(struct device *dev, u32_t cmd, u32_t *val) +static int dummy_transfer(const struct device *dev, u32_t cmd, u32_t *val) { printk("transfer()\n"); @@ -23,12 +23,12 @@ static int dummy_transfer(struct device *dev, u32_t cmd, u32_t *val) return 0; } -static u32_t dummy_get_power_state(struct device *dev) +static u32_t dummy_get_power_state(const struct device *dev) { return parent_power_state; } -static int dummy_suspend(struct device *dev) +static int dummy_suspend(const struct device *dev) { printk("parent suspending..\n"); parent_power_state = DEVICE_PM_SUSPEND_STATE; @@ -36,7 +36,7 @@ static int dummy_suspend(struct device *dev) return 0; } -static int dummy_resume_from_suspend(struct device *dev) +static int dummy_resume_from_suspend(const struct device *dev) { printk("parent resuming..\n"); parent_power_state = DEVICE_PM_ACTIVE_STATE; @@ -44,7 +44,7 @@ static int dummy_resume_from_suspend(struct device *dev) return 0; } -static int dummy_parent_pm_ctrl(struct device *dev, u32_t ctrl_command, +static int dummy_parent_pm_ctrl(const struct device *dev, u32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; @@ -73,7 +73,7 @@ static const struct dummy_parent_api funcs = { .transfer = dummy_transfer, }; -int dummy_parent_init(struct device *dev) +int dummy_parent_init(const struct device *dev) { device_pm_enable(dev); parent_power_state = DEVICE_PM_ACTIVE_STATE; diff --git a/samples/subsys/power/device_pm/src/dummy_parent.h b/samples/subsys/power/device_pm/src/dummy_parent.h index 77195b5559a1..cde2aba22eeb 100644 --- a/samples/subsys/power/device_pm/src/dummy_parent.h +++ b/samples/subsys/power/device_pm/src/dummy_parent.h @@ -11,7 +11,8 @@ #define DUMMY_PARENT_RD 0 #define DUMMY_PARENT_WR 1 -typedef int (*dummy_api_transfer_t)(struct device *dev, u32_t cmd, u32_t *val); +typedef int (*dummy_api_transfer_t)(const struct device *dev, u32_t cmd, + u32_t *val); struct dummy_parent_api { dummy_api_transfer_t transfer; diff --git a/samples/subsys/power/device_pm/src/main.c b/samples/subsys/power/device_pm/src/main.c index a0ea6ec3011f..331d92d5bd6a 100644 --- a/samples/subsys/power/device_pm/src/main.c +++ b/samples/subsys/power/device_pm/src/main.c @@ -10,7 +10,7 @@ /* Application main Thread */ void main(void) { - struct device *dev; + const struct device *dev; struct dummy_driver_api *api; int ret, val; diff --git a/samples/subsys/usb/audio/headphones_microphone/src/main.c b/samples/subsys/usb/audio/headphones_microphone/src/main.c index 6baf3aed5193..541ad71d147e 100644 --- a/samples/subsys/usb/audio/headphones_microphone/src/main.c +++ b/samples/subsys/usb/audio/headphones_microphone/src/main.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(main, LOG_LEVEL_INF); -static struct device *mic_dev; +static const struct device *mic_dev; static void data_received(const struct device *dev, struct net_buf *buffer, @@ -42,7 +42,7 @@ static void data_received(const struct device *dev, } } -static void feature_update(struct device *dev, +static void feature_update(const struct device *dev, const struct usb_audio_fu_evt *evt) { LOG_DBG("Control selector %d for channel %d updated", @@ -65,7 +65,7 @@ static const struct usb_audio_ops mic_ops = { void main(void) { - struct device *hp_dev = device_get_binding("HEADPHONES"); + const struct device *hp_dev = device_get_binding("HEADPHONES"); int ret; LOG_INF("Entered %s", __func__); diff --git a/samples/subsys/usb/audio/headset/src/main.c b/samples/subsys/usb/audio/headset/src/main.c index f3627783a233..b9ab72f16f8f 100644 --- a/samples/subsys/usb/audio/headset/src/main.c +++ b/samples/subsys/usb/audio/headset/src/main.c @@ -40,7 +40,7 @@ static void data_received(const struct device *dev, } } -static void feature_update(struct device *dev, +static void feature_update(const struct device *dev, const struct usb_audio_fu_evt *evt) { LOG_DBG("Control selector %d for channel %d updated", @@ -59,7 +59,7 @@ static const struct usb_audio_ops ops = { void main(void) { - struct device *hs_dev; + const struct device *hs_dev; int ret; LOG_INF("Entered %s", __func__); diff --git a/samples/subsys/usb/cdc_acm/src/main.c b/samples/subsys/usb/cdc_acm/src/main.c index 8c2bb6abf5dc..d5ee692d72b3 100644 --- a/samples/subsys/usb/cdc_acm/src/main.c +++ b/samples/subsys/usb/cdc_acm/src/main.c @@ -28,7 +28,7 @@ u8_t ring_buffer[RING_BUF_SIZE]; struct ring_buf ringbuf; -static void interrupt_handler(struct device *dev) +static void interrupt_handler(const struct device *dev) { while (uart_irq_update(dev) && uart_irq_is_pending(dev)) { if (uart_irq_rx_ready(dev)) { @@ -72,7 +72,7 @@ static void interrupt_handler(struct device *dev) void main(void) { - struct device *dev; + const struct device *dev; u32_t baudrate, dtr = 0U; int ret; diff --git a/samples/subsys/usb/cdc_acm_composite/src/main.c b/samples/subsys/usb/cdc_acm_composite/src/main.c index 92a598501aaf..676c6cfe6643 100644 --- a/samples/subsys/usb/cdc_acm_composite/src/main.c +++ b/samples/subsys/usb/cdc_acm_composite/src/main.c @@ -29,8 +29,8 @@ u8_t buffer0[RING_BUF_SIZE]; u8_t buffer1[RING_BUF_SIZE]; static struct serial_data { - struct device *dev; - struct device *peer; + const struct device *dev; + const struct device *peer; struct serial_data *peer_data; struct ring_buf ringbuf; } peers[2]; @@ -38,11 +38,11 @@ static struct serial_data { static void interrupt_handler(void *user_data) { struct serial_data *dev_data = user_data; - struct device *dev = dev_data->dev; + const struct device *dev = dev_data->dev; while (uart_irq_update(dev) && uart_irq_is_pending(dev)) { - struct device *peer = dev_data->peer; + const struct device *peer = dev_data->peer; LOG_DBG("dev %p dev_data %p", dev, dev_data); @@ -83,7 +83,7 @@ static void interrupt_handler(void *user_data) } } -static void uart_line_set(struct device *dev) +static void uart_line_set(const struct device *dev) { u32_t baudrate; int ret; @@ -116,7 +116,7 @@ void main(void) struct serial_data *dev_data0 = &peers[0]; struct serial_data *dev_data1 = &peers[1]; - struct device *dev0, *dev1; + const struct device *dev0, *dev1; u32_t dtr = 0U; dev0 = device_get_binding("CDC_ACM_0"); diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c index a6be4bd06bb2..7afd90375daa 100644 --- a/samples/subsys/usb/hid-cdc/src/main.c +++ b/samples/subsys/usb/hid-cdc/src/main.c @@ -381,7 +381,7 @@ static void flush_buffer_kbd(void) memset(data_buf_kbd, 0, sizeof(data_buf_kbd)); } -static void write_data(struct device *dev, const char *buf, int len) +static void write_data(const struct device *dev, const char *buf, int len) { uart_irq_tx_enable(dev); @@ -401,7 +401,7 @@ static void write_data(struct device *dev, const char *buf, int len) uart_irq_tx_disable(dev); } -static void cdc_mouse_int_handler(struct device *dev) +static void cdc_mouse_int_handler(const struct device *dev) { uart_irq_update(dev); @@ -447,7 +447,7 @@ static void cdc_mouse_int_handler(struct device *dev) } } -static void cdc_kbd_int_handler(struct device *dev) +static void cdc_kbd_int_handler(const struct device *dev) { uart_irq_update(dev); @@ -480,7 +480,8 @@ static void cdc_kbd_int_handler(struct device *dev) /* Devices */ -static void btn0(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void btn0(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { struct app_evt_t *ev = app_evt_alloc(); @@ -490,7 +491,8 @@ static void btn0(struct device *gpio, struct gpio_callback *cb, u32_t pins) } #if DT_NODE_HAS_STATUS(SW1_NODE, okay) -static void btn1(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void btn1(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { struct app_evt_t *ev = app_evt_alloc(); @@ -501,7 +503,8 @@ static void btn1(struct device *gpio, struct gpio_callback *cb, u32_t pins) #endif #if DT_NODE_HAS_STATUS(SW2_NODE, okay) -static void btn2(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void btn2(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { struct app_evt_t *ev = app_evt_alloc(); @@ -512,7 +515,8 @@ static void btn2(struct device *gpio, struct gpio_callback *cb, u32_t pins) #endif #if DT_NODE_HAS_STATUS(SW3_NODE, okay) -static void btn3(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void btn3(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { struct app_evt_t *ev = app_evt_alloc(); @@ -522,9 +526,10 @@ static void btn3(struct device *gpio, struct gpio_callback *cb, u32_t pins) } #endif -int callbacks_configure(struct device *gpio, u32_t pin, int flags, - void (*handler)(struct device*, struct gpio_callback*, - u32_t), struct gpio_callback *callback) +int callbacks_configure(const struct device *gpio, u32_t pin, int flags, + void (*handler)(const struct device*, struct gpio_callback*, + u32_t), + struct gpio_callback *callback) { if (!gpio) { LOG_ERR("Could not find PORT"); @@ -550,7 +555,7 @@ void main(void) { int ret; - struct device *hid0_dev, *hid1_dev, *cdc0_dev, *cdc1_dev; + const struct device *hid0_dev, *hid1_dev, *cdc0_dev, *cdc1_dev; u32_t dtr = 0U; struct app_evt_t *ev; diff --git a/samples/subsys/usb/hid-mouse/src/main.c b/samples/subsys/usb/hid-mouse/src/main.c index 539d9f64c941..b07cbc34e8ad 100644 --- a/samples/subsys/usb/hid-mouse/src/main.c +++ b/samples/subsys/usb/hid-mouse/src/main.c @@ -92,7 +92,7 @@ static void status_cb(enum usb_dc_status_code status, const u8_t *param) usb_status = status; } -static void left_button(struct device *gpio, struct gpio_callback *cb, +static void left_button(const struct device *gpio, struct gpio_callback *cb, u32_t pins) { int ret; @@ -125,7 +125,7 @@ static void left_button(struct device *gpio, struct gpio_callback *cb, } #if DT_NODE_HAS_STATUS(SW1_NODE, okay) -static void right_button(struct device *gpio, struct gpio_callback *cb, +static void right_button(const struct device *gpio, struct gpio_callback *cb, u32_t pins) { int ret; @@ -159,7 +159,8 @@ static void right_button(struct device *gpio, struct gpio_callback *cb, #endif #if DT_NODE_HAS_STATUS(SW2_NODE, okay) -static void x_move(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void x_move(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { int ret; u8_t state = status[MOUSE_X_REPORT_POS]; @@ -183,7 +184,8 @@ static void x_move(struct device *gpio, struct gpio_callback *cb, u32_t pins) #endif #if DT_NODE_HAS_STATUS(SW3_NODE, okay) -static void y_move(struct device *gpio, struct gpio_callback *cb, u32_t pins) +static void y_move(const struct device *gpio, struct gpio_callback *cb, + u32_t pins) { int ret; u8_t state = status[MOUSE_Y_REPORT_POS]; @@ -206,7 +208,7 @@ static void y_move(struct device *gpio, struct gpio_callback *cb, u32_t pins) } #endif -int callbacks_configure(struct device *gpio, u32_t pin, int flags, +int callbacks_configure(const struct device *gpio, u32_t pin, int flags, gpio_callback_handler_t handler, struct gpio_callback *callback, u8_t *val) { @@ -255,7 +257,7 @@ void main(void) { int ret; u8_t report[4] = { 0x00 }; - struct device *led_dev, *hid_dev; + const struct device *led_dev, *hid_dev; led_dev = device_get_binding(LED_PORT); if (led_dev == NULL) { diff --git a/samples/subsys/usb/hid/src/main.c b/samples/subsys/usb/hid/src/main.c index bc199b13af96..1418062df207 100644 --- a/samples/subsys/usb/hid/src/main.c +++ b/samples/subsys/usb/hid/src/main.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(main); static struct k_delayed_work delayed_report_send; -static struct device *hdev; +static const struct device *hdev; #define REPORT_TIMEOUT K_SECONDS(2) @@ -128,7 +128,7 @@ void main(void) k_delayed_work_init(&delayed_report_send, send_report); } -static int composite_pre_init(struct device *dev) +static int composite_pre_init(const struct device *dev) { hdev = device_get_binding("HID_0"); if (hdev == NULL) { diff --git a/samples/userspace/prod_consumer/src/app_a.c b/samples/userspace/prod_consumer/src/app_a.c index 2f35f3871090..7adeacde0694 100644 --- a/samples/userspace/prod_consumer/src/app_a.c +++ b/samples/userspace/prod_consumer/src/app_a.c @@ -49,14 +49,14 @@ K_THREAD_STACK_DEFINE(writeback_stack, 2048); * we ensure all this gets linked into the continuous region denoted by * app_a_partition. */ -APP_A_BSS struct device *sample_device; +APP_A_BSS const struct device *sample_device; APP_A_BSS unsigned int pending_count; /* ISR-level callback function. Runs in supervisor mode. Does what's needed * to get the data into this application's accessible memory and have the * worker thread running in user mode do the rest. */ -void sample_callback(struct device *dev, void *context, void *data) +void sample_callback(const struct device *dev, void *context, void *data) { int ret; diff --git a/samples/userspace/prod_consumer/src/sample_driver.h b/samples/userspace/prod_consumer/src/sample_driver.h index ec7ae867568a..ead105ea6df6 100644 --- a/samples/userspace/prod_consumer/src/sample_driver.h +++ b/samples/userspace/prod_consumer/src/sample_driver.h @@ -12,16 +12,17 @@ #define SAMPLE_DRIVER_NAME_0 "SAMPLE_DRIVER_0" #define SAMPLE_DRIVER_MSG_SIZE 128 -typedef void (*sample_driver_callback_t)(struct device *dev, +typedef void (*sample_driver_callback_t)(const struct device *dev, void *context, void *data); -typedef int (*sample_driver_write_t)(struct device *dev, void *buf); +typedef int (*sample_driver_write_t)(const struct device *dev, void *buf); -typedef int (*sample_driver_set_callback_t)(struct device *dev, +typedef int (*sample_driver_set_callback_t)(const struct device *dev, sample_driver_callback_t cb, void *context); -typedef int (*sample_driver_state_set_t)(struct device *dev, bool active); +typedef int (*sample_driver_state_set_t)(const struct device *dev, + bool active); __subsystem struct sample_driver_api { sample_driver_write_t write; @@ -39,9 +40,10 @@ __subsystem struct sample_driver_api { * @param buf Processed data, of size SAMPLE_DRIVER_MSG_SIZE * @return 0 Success, nonzero if an error occurred */ -__syscall int sample_driver_write(struct device *dev, void *buf); +__syscall int sample_driver_write(const struct device *dev, void *buf); -static inline int z_impl_sample_driver_write(struct device *dev, void *buf) +static inline int z_impl_sample_driver_write(const struct device *dev, + void *buf) { const struct sample_driver_api *api = dev->driver_api; @@ -54,9 +56,9 @@ static inline int z_impl_sample_driver_write(struct device *dev, void *buf) * @param dev Sample driver device * @param active Whether to activate/deactivate interrupts */ -__syscall int sample_driver_state_set(struct device *dev, bool active); +__syscall int sample_driver_state_set(const struct device *dev, bool active); -static inline int z_impl_sample_driver_state_set(struct device *dev, +static inline int z_impl_sample_driver_state_set(const struct device *dev, bool active) { const struct sample_driver_api *api = dev->driver_api; @@ -75,7 +77,7 @@ static inline int z_impl_sample_driver_state_set(struct device *dev, * @param context Context passed to callback function, or NULL if not needed * @return 0 Success, nonzero if an error occurred */ -static inline int sample_driver_set_callback(struct device *dev, +static inline int sample_driver_set_callback(const struct device *dev, sample_driver_callback_t cb, void *context) { diff --git a/samples/userspace/prod_consumer/src/sample_driver_foo.c b/samples/userspace/prod_consumer/src/sample_driver_foo.c index 693254fd6f8c..dfc562aba055 100644 --- a/samples/userspace/prod_consumer/src/sample_driver_foo.c +++ b/samples/userspace/prod_consumer/src/sample_driver_foo.c @@ -30,16 +30,16 @@ struct sample_driver_foo_dev_data { u32_t count; }; -static int sample_driver_foo_write(struct device *dev, void *buf) +static int sample_driver_foo_write(const struct device *dev, void *buf) { LOG_DBG("%s(%p, %p)", __func__, dev, buf); return 0; } -static int sample_driver_foo_set_callback(struct device *dev, - sample_driver_callback_t cb, - void *context) +static int sample_driver_foo_set_callback(const struct device *dev, + sample_driver_callback_t cb, + void *context) { struct sample_driver_foo_dev_data *data = DEV_DATA(dev); int key = irq_lock(); @@ -51,7 +51,7 @@ static int sample_driver_foo_set_callback(struct device *dev, return 0; } -static int sample_driver_foo_state_set(struct device *dev, bool active) +static int sample_driver_foo_state_set(const struct device *dev, bool active) { struct sample_driver_foo_dev_data *data = DEV_DATA(dev); @@ -75,7 +75,7 @@ static struct sample_driver_api sample_driver_foo_api = { static void sample_driver_foo_isr(void *param) { - struct device *dev = param; + const struct device *dev = param; struct sample_driver_foo_dev_data *data = DEV_DATA(dev); char data_payload[SAMPLE_DRIVER_MSG_SIZE]; @@ -96,7 +96,7 @@ static void sample_driver_timer_cb(struct k_timer *timer) sample_driver_foo_isr(timer->user_data); } -static int sample_driver_foo_init(struct device *dev) +static int sample_driver_foo_init(const struct device *dev) { struct sample_driver_foo_dev_data *data = DEV_DATA(dev); diff --git a/samples/userspace/prod_consumer/src/sample_driver_handlers.c b/samples/userspace/prod_consumer/src/sample_driver_handlers.c index 6446ff133371..909becbd9c60 100644 --- a/samples/userspace/prod_consumer/src/sample_driver_handlers.c +++ b/samples/userspace/prod_consumer/src/sample_driver_handlers.c @@ -8,7 +8,7 @@ #include #include "sample_driver.h" -int z_vrfy_sample_driver_state_set(struct device *dev, bool active) +int z_vrfy_sample_driver_state_set(const struct device *dev, bool active) { if (Z_SYSCALL_DRIVER_SAMPLE(dev, state_set)) { return -EINVAL; @@ -19,7 +19,7 @@ int z_vrfy_sample_driver_state_set(struct device *dev, bool active) #include -int z_vrfy_sample_driver_write(struct device *dev, void *buf) +int z_vrfy_sample_driver_write(const struct device *dev, void *buf) { if (Z_SYSCALL_DRIVER_SAMPLE(dev, write)) { return -EINVAL; diff --git a/samples/video/capture/src/main.c b/samples/video/capture/src/main.c index b2d6cf22d4de..c1ab4127d3e2 100644 --- a/samples/video/capture/src/main.c +++ b/samples/video/capture/src/main.c @@ -24,7 +24,7 @@ void main(void) struct video_buffer *buffers[2], *vbuf; struct video_format fmt; struct video_caps caps; - struct device *video; + const struct device *video; unsigned int frame = 0; size_t bsize; int i = 0; @@ -39,7 +39,7 @@ void main(void) /* But would be better to use a real video device if any */ #ifdef VIDEO_DEV { - struct device *dev = device_get_binding(VIDEO_DEV); + const struct device *dev = device_get_binding(VIDEO_DEV); if (dev == NULL) { LOG_ERR("Video device %s not found, " diff --git a/samples/video/tcpserversink/src/main.c b/samples/video/tcpserversink/src/main.c index 9aa8725ac760..2c761c6a5eb8 100644 --- a/samples/video/tcpserversink/src/main.c +++ b/samples/video/tcpserversink/src/main.c @@ -46,7 +46,7 @@ void main(void) struct video_buffer *buffers[2], *vbuf; int i, ret, sock, client; struct video_format fmt; - struct device *video; + const struct device *video; /* Prepare Network */ (void)memset(&addr, 0, sizeof(addr)); diff --git a/scripts/gen_kobject_list.py b/scripts/gen_kobject_list.py index dd859db36579..493601d1588b 100755 --- a/scripts/gen_kobject_list.py +++ b/scripts/gen_kobject_list.py @@ -678,7 +678,7 @@ def get_symbols(elf): # turned into a string, we told gperf to expect binary strings that are not # NULL-terminated. footer = """%% -struct z_object *z_object_gperf_find(void *obj) +struct z_object *z_object_gperf_find(const void *obj) { return z_object_lookup((const char *)obj, sizeof(void *)); } @@ -695,7 +695,7 @@ def get_symbols(elf): } #ifndef CONFIG_DYNAMIC_OBJECTS -struct z_object *z_object_find(void *obj) +struct z_object *z_object_find(const void *obj) ALIAS_OF(z_object_gperf_find); void z_object_wordlist_foreach(_wordlist_cb_func_t func, void *context) diff --git a/soc/arc/snps_arc_hsdk/soc.c b/soc/arc/snps_arc_hsdk/soc.c index f3de79de06b0..5c0854ccb082 100644 --- a/soc/arc/snps_arc_hsdk/soc.c +++ b/soc/arc/snps_arc_hsdk/soc.c @@ -12,7 +12,7 @@ #include #include "soc.h" -static int arc_hsdk_init(struct device *dev) +static int arc_hsdk_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/arc/snps_arc_iot/soc.c b/soc/arc/snps_arc_iot/soc.c index 9f6397920780..c9be0b8528e1 100644 --- a/soc/arc/snps_arc_iot/soc.c +++ b/soc/arc/snps_arc_iot/soc.c @@ -15,7 +15,7 @@ #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency) -static int arc_iot_init(struct device *dev) +static int arc_iot_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/arc/snps_emsk/soc_config.c b/soc/arc/snps_emsk/soc_config.c index 5d77f4d50ac1..e0812430c5df 100644 --- a/soc/arc/snps_emsk/soc_config.c +++ b/soc/arc/snps_emsk/soc_config.c @@ -11,7 +11,7 @@ #ifdef CONFIG_UART_NS16550 -static int uart_ns16550_init(struct device *dev) +static int uart_ns16550_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/arc/snps_nsim/soc.c b/soc/arc/snps_nsim/soc.c index 2fbe6693b5f4..40aeb96dbce4 100644 --- a/soc/arc/snps_nsim/soc.c +++ b/soc/arc/snps_nsim/soc.c @@ -17,7 +17,7 @@ #include "soc.h" #ifdef CONFIG_SMP -static int arc_nsim_init(struct device *dev) +static int arc_nsim_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/arm/arm/beetle/soc.c b/soc/arm/arm/beetle/soc.c index 38e5faf21fdd..a4cd27e382a4 100644 --- a/soc/arm/arm/beetle/soc.c +++ b/soc/arm/arm/beetle/soc.c @@ -30,7 +30,7 @@ * * @return 0 */ -static int arm_beetle_init(struct device *arg) +static int arm_beetle_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/arm/mps2/soc.c b/soc/arm/arm/mps2/soc.c index 0c1d0082376e..e64bd264de16 100644 --- a/soc/arm/arm/mps2/soc.c +++ b/soc/arm/arm/mps2/soc.c @@ -81,7 +81,7 @@ u32_t sse_200_platform_get_cpu_id(void) * * @return 0 */ -static int arm_mps2_init(struct device *arg) +static int arm_mps2_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/arm/musca_a/soc.c b/soc/arm/arm/musca_a/soc.c index 66ae4b0d0285..f14ee9d4cc45 100644 --- a/soc/arm/arm/musca_a/soc.c +++ b/soc/arm/arm/musca_a/soc.c @@ -52,7 +52,7 @@ u32_t sse_200_platform_get_cpu_id(void) * * @return 0 */ -static int arm_musca_init(struct device *arg) +static int arm_musca_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/arm/musca_b1/soc.c b/soc/arm/arm/musca_b1/soc.c index 1da1fd7a7484..e75f08728a39 100644 --- a/soc/arm/arm/musca_b1/soc.c +++ b/soc/arm/arm/musca_b1/soc.c @@ -52,7 +52,7 @@ u32_t sse_200_platform_get_cpu_id(void) * * @return 0 */ -static int arm_musca_b1_init(struct device *arg) +static int arm_musca_b1_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/atmel_sam/sam3x/soc.c b/soc/arm/atmel_sam/sam3x/soc.c index 7c383d025e48..183dadd8d43b 100644 --- a/soc/arm/atmel_sam/sam3x/soc.c +++ b/soc/arm/atmel_sam/sam3x/soc.c @@ -201,7 +201,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int atmel_sam3x_init(struct device *arg) +static int atmel_sam3x_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam/sam4e/soc.c b/soc/arm/atmel_sam/sam4e/soc.c index c7226903b34d..bc2c45e9cffc 100644 --- a/soc/arm/atmel_sam/sam4e/soc.c +++ b/soc/arm/atmel_sam/sam4e/soc.c @@ -189,7 +189,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int atmel_sam4e_init(struct device *arg) +static int atmel_sam4e_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam/sam4s/soc.c b/soc/arm/atmel_sam/sam4s/soc.c index cfd29864aafc..b92f0402f3c8 100644 --- a/soc/arm/atmel_sam/sam4s/soc.c +++ b/soc/arm/atmel_sam/sam4s/soc.c @@ -188,7 +188,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int atmel_sam4s_init(struct device *arg) +static int atmel_sam4s_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam/same70/soc.c b/soc/arm/atmel_sam/same70/soc.c index 62db692e6d64..0803b9a777f5 100644 --- a/soc/arm/atmel_sam/same70/soc.c +++ b/soc/arm/atmel_sam/same70/soc.c @@ -223,7 +223,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int atmel_same70_init(struct device *arg) +static int atmel_same70_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam/same70/soc_config.c b/soc/arm/atmel_sam/same70/soc_config.c index 82750efe8482..410b08b2abae 100644 --- a/soc/arm/atmel_sam/same70/soc_config.c +++ b/soc/arm/atmel_sam/same70/soc_config.c @@ -20,7 +20,7 @@ * * @return 0 */ -static int atmel_same70_config(struct device *dev) +static int atmel_same70_config(const struct device *dev) { #ifdef CONFIG_SOC_ATMEL_SAME70_DISABLE_ERASE_PIN /* Disable ERASE function on PB12 pin, this is controlled by Bus Matrix */ diff --git a/soc/arm/atmel_sam/samv71/soc.c b/soc/arm/atmel_sam/samv71/soc.c index b9ebc55f8b91..32af2c710a18 100644 --- a/soc/arm/atmel_sam/samv71/soc.c +++ b/soc/arm/atmel_sam/samv71/soc.c @@ -224,7 +224,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int atmel_samv71_init(struct device *arg) +static int atmel_samv71_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam/samv71/soc_config.c b/soc/arm/atmel_sam/samv71/soc_config.c index b308540aa0bd..72cafdc4aa8e 100644 --- a/soc/arm/atmel_sam/samv71/soc_config.c +++ b/soc/arm/atmel_sam/samv71/soc_config.c @@ -21,7 +21,7 @@ * * @return 0 */ -static int atmel_samv71_config(struct device *dev) +static int atmel_samv71_config(const struct device *dev) { #ifdef CONFIG_SOC_ATMEL_SAMV71_DISABLE_ERASE_PIN /* Disable ERASE function on PB12 pin, this is controlled by Bus diff --git a/soc/arm/atmel_sam0/common/soc_samd2x.c b/soc/arm/atmel_sam0/common/soc_samd2x.c index 56356d3fcfb3..6d1a1eea47ee 100644 --- a/soc/arm/atmel_sam0/common/soc_samd2x.c +++ b/soc/arm/atmel_sam0/common/soc_samd2x.c @@ -172,7 +172,7 @@ static void dividers_init(void) /* TODO(mlhx): enable clock failure detection? */ } -static int atmel_samd_init(struct device *arg) +static int atmel_samd_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/atmel_sam0/common/soc_samd5x.c b/soc/arm/atmel_sam0/common/soc_samd5x.c index f61bc43be240..8707402e5308 100644 --- a/soc/arm/atmel_sam0/common/soc_samd5x.c +++ b/soc/arm/atmel_sam0/common/soc_samd5x.c @@ -98,7 +98,7 @@ static void gclk_connect(u8_t gclk, u8_t src, u8_t div) | GCLK_GENCTRL_GENEN; } -static int atmel_samd_init(struct device *arg) +static int atmel_samd_init(const struct device *arg) { u32_t key; u8_t dfll_div; diff --git a/soc/arm/bcm_vk/valkyrie/soc.c b/soc/arm/bcm_vk/valkyrie/soc.c index 5e8542e140c2..d3621e4bb456 100644 --- a/soc/arm/bcm_vk/valkyrie/soc.c +++ b/soc/arm/bcm_vk/valkyrie/soc.c @@ -16,7 +16,7 @@ * * @return 0 */ -static int valkyrie_init(struct device *arg) +static int valkyrie_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/bcm_vk/viper/soc.c b/soc/arm/bcm_vk/viper/soc.c index f2c88621bcf9..85d9c710bb80 100644 --- a/soc/arm/bcm_vk/viper/soc.c +++ b/soc/arm/bcm_vk/viper/soc.c @@ -17,7 +17,7 @@ * * @return 0 */ -static int viper_init(struct device *arg) +static int viper_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/cypress/psoc6/soc.c b/soc/arm/cypress/psoc6/soc.c index 562b33e1377d..efe1177ae6de 100644 --- a/soc/arm/cypress/psoc6/soc.c +++ b/soc/arm/cypress/psoc6/soc.c @@ -370,7 +370,7 @@ void Cy_SystemInit(void) Cy_SysClk_PeriphEnableDivider(CY_SYSCLK_DIV_8_BIT, 0u); } -static int init_cycfg_platform_wraper(struct device *arg) +static int init_cycfg_platform_wraper(const struct device *arg) { ARG_UNUSED(arg); SystemInit(); diff --git a/soc/arm/microchip_mec/mec1501/soc.c b/soc/arm/microchip_mec/mec1501/soc.c index a603fdb1d991..8d609c5944e5 100644 --- a/soc/arm/microchip_mec/mec1501/soc.c +++ b/soc/arm/microchip_mec/mec1501/soc.c @@ -132,7 +132,7 @@ static int soc_ecia_init(void) return 0; } -static int soc_init(struct device *dev) +static int soc_init(const struct device *dev) { u32_t isave; diff --git a/soc/arm/microchip_mec/mec1701/soc.c b/soc/arm/microchip_mec/mec1701/soc.c index 83226f5eeaff..4004334575f0 100644 --- a/soc/arm/microchip_mec/mec1701/soc.c +++ b/soc/arm/microchip_mec/mec1701/soc.c @@ -10,7 +10,7 @@ #include -static int soc_init(struct device *dev) +static int soc_init(const struct device *dev) { __IO uint32_t *girc_enable_set; diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c index 87f8d5bf28a2..a6aa45a77a13 100644 --- a/soc/arm/nordic_nrf/nrf51/soc.c +++ b/soc/arm/nordic_nrf/nrf51/soc.c @@ -38,7 +38,7 @@ void sys_arch_reboot(int type) NVIC_SystemReset(); } -static int nordicsemi_nrf51_init(struct device *arg) +static int nordicsemi_nrf51_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c index 005ea2ffbb44..9f9759c49507 100644 --- a/soc/arm/nordic_nrf/nrf52/soc.c +++ b/soc/arm/nordic_nrf/nrf52/soc.c @@ -53,7 +53,7 @@ void sys_arch_reboot(int type) NVIC_SystemReset(); } -static int nordicsemi_nrf52_init(struct device *arg) +static int nordicsemi_nrf52_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/nordic_nrf/nrf53/soc.c b/soc/arm/nordic_nrf/nrf53/soc.c index 64bd585c5223..a2e6448ac2be 100644 --- a/soc/arm/nordic_nrf/nrf53/soc.c +++ b/soc/arm/nordic_nrf/nrf53/soc.c @@ -36,7 +36,7 @@ extern void z_arm_nmi_init(void); #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL LOG_MODULE_REGISTER(soc); -static int nordicsemi_nrf53_init(struct device *arg) +static int nordicsemi_nrf53_init(const struct device *arg) { u32_t key; @@ -102,7 +102,7 @@ bool nrf53_has_erratum19(void) } #ifndef CONFIG_NRF5340_CPUAPP_ERRATUM19 -static int check_erratum19(struct device *arg) +static int check_erratum19(const struct device *arg) { ARG_UNUSED(arg); if (nrf53_has_erratum19()) { diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c index f2ff3735fcd8..a1ee81785ed8 100644 --- a/soc/arm/nordic_nrf/nrf91/soc.c +++ b/soc/arm/nordic_nrf/nrf91/soc.c @@ -34,7 +34,7 @@ extern void z_arm_nmi_init(void); #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL LOG_MODULE_REGISTER(soc); -static int nordicsemi_nrf91_init(struct device *arg) +static int nordicsemi_nrf91_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/nxp_imx/mcimx6x_m4/soc.c b/soc/arm/nxp_imx/mcimx6x_m4/soc.c index e324b31daac4..66108e120a56 100644 --- a/soc/arm/nxp_imx/mcimx6x_m4/soc.c +++ b/soc/arm/nxp_imx/mcimx6x_m4/soc.c @@ -169,7 +169,7 @@ static void SOC_ClockInit(void) * * @return 0 */ -static int mcimx6x_m4_init(struct device *arg) +static int mcimx6x_m4_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_imx/mcimx7_m4/soc.c b/soc/arm/nxp_imx/mcimx7_m4/soc.c index ec8b32d9d06b..69d6c51f0d56 100644 --- a/soc/arm/nxp_imx/mcimx7_m4/soc.c +++ b/soc/arm/nxp_imx/mcimx7_m4/soc.c @@ -221,7 +221,7 @@ static void nxp_mcimx7_mu_config(void) } #endif /* CONFIG_IPM_IMX */ -static int nxp_mcimx7_init(struct device *arg) +static int nxp_mcimx7_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_imx/rt/soc.c b/soc/arm/nxp_imx/rt/soc.c index 9b25405ea252..f9cd63bdd211 100644 --- a/soc/arm/nxp_imx/rt/soc.c +++ b/soc/arm/nxp_imx/rt/soc.c @@ -253,7 +253,7 @@ void imxrt_usdhc_pinmux(u16_t nusdhc, bool init, * @return 0 */ -static int imxrt_init(struct device *arg) +static int imxrt_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/k2x/soc.c b/soc/arm/nxp_kinetis/k2x/soc.c index 3379c389d0b8..514eb5d7164c 100644 --- a/soc/arm/nxp_kinetis/k2x/soc.c +++ b/soc/arm/nxp_kinetis/k2x/soc.c @@ -120,7 +120,7 @@ static ALWAYS_INLINE void clock_init(void) * @return 0 */ -static int fsl_frdm_k22f_init(struct device *arg) +static int fsl_frdm_k22f_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/k6x/soc.c b/soc/arm/nxp_kinetis/k6x/soc.c index a463a8182913..d6121c8b516f 100644 --- a/soc/arm/nxp_kinetis/k6x/soc.c +++ b/soc/arm/nxp_kinetis/k6x/soc.c @@ -120,7 +120,7 @@ static ALWAYS_INLINE void clock_init(void) * @return 0 */ -static int k6x_init(struct device *arg) +static int k6x_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/k8x/soc.c b/soc/arm/nxp_kinetis/k8x/soc.c index 9f0d458da4e4..a1431622b141 100644 --- a/soc/arm/nxp_kinetis/k8x/soc.c +++ b/soc/arm/nxp_kinetis/k8x/soc.c @@ -95,7 +95,7 @@ static ALWAYS_INLINE void clk_init(void) #endif } -static int k8x_init(struct device *arg) +static int k8x_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c index 24ba6b158a99..480ec3f23497 100644 --- a/soc/arm/nxp_kinetis/ke1xf/soc.c +++ b/soc/arm/nxp_kinetis/ke1xf/soc.c @@ -221,7 +221,7 @@ static ALWAYS_INLINE void clk_init(void) #endif } -static int ke1xf_init(struct device *arg) +static int ke1xf_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/kl2x/soc.c b/soc/arm/nxp_kinetis/kl2x/soc.c index 290a37521e45..5cbf774e64fc 100644 --- a/soc/arm/nxp_kinetis/kl2x/soc.c +++ b/soc/arm/nxp_kinetis/kl2x/soc.c @@ -72,7 +72,7 @@ static ALWAYS_INLINE void clock_init(void) #endif } -static int kl2x_init(struct device *arg) +static int kl2x_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/kv5x/soc.c b/soc/arm/nxp_kinetis/kv5x/soc.c index ab5de9867113..6104f8b1a5ab 100644 --- a/soc/arm/nxp_kinetis/kv5x/soc.c +++ b/soc/arm/nxp_kinetis/kv5x/soc.c @@ -80,7 +80,7 @@ static ALWAYS_INLINE void clk_init(void) CLOCK_SetSimConfig(&sim_config); } -static int kv5x_init(struct device *arg) +static int kv5x_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c index 57e3ea7c4faa..00b415e1a446 100644 --- a/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c +++ b/soc/arm/nxp_kinetis/kwx/soc_kw2xd.c @@ -145,7 +145,7 @@ static ALWAYS_INLINE void clock_init(void) * * @return 0 */ -static int kw2xd_init(struct device *arg) +static int kw2xd_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c index ba35c75dce26..8fa6ebdb2054 100644 --- a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c +++ b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c @@ -79,7 +79,7 @@ static ALWAYS_INLINE void clock_init(void) #endif } -static int kwx_init(struct device *arg) +static int kwx_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.c b/soc/arm/nxp_lpc/lpc54xxx/soc.c index eea67f9fe68a..b708745b7545 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/soc.c +++ b/soc/arm/nxp_lpc/lpc54xxx/soc.c @@ -96,7 +96,7 @@ static ALWAYS_INLINE void clock_init(void) * @return 0 */ -static int nxp_lpc54114_init(struct device *arg) +static int nxp_lpc54114_init(const struct device *arg) { ARG_UNUSED(arg); @@ -145,7 +145,7 @@ static const char core_m0[] = { * @return N/A */ /* This function is also called at deep sleep resume. */ -int _slave_init(struct device *arg) +int _slave_init(const struct device *arg) { s32_t temp; diff --git a/soc/arm/nxp_lpc/lpc55xxx/soc.c b/soc/arm/nxp_lpc/lpc55xxx/soc.c index 3b511d32aa22..e75196b5be4a 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/soc.c +++ b/soc/arm/nxp_lpc/lpc55xxx/soc.c @@ -90,7 +90,7 @@ static ALWAYS_INLINE void clock_init(void) * @return 0 */ -static int nxp_lpc55xxx_init(struct device *arg) +static int nxp_lpc55xxx_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/silabs_exx32/common/soc.c b/soc/arm/silabs_exx32/common/soc.c index 1a331e5c585c..f4fb064efd12 100644 --- a/soc/arm/silabs_exx32/common/soc.c +++ b/soc/arm/silabs_exx32/common/soc.c @@ -132,7 +132,7 @@ static void swo_init(void) * * @return 0 */ -static int silabs_exx32_init(struct device *arg) +static int silabs_exx32_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/st_stm32/stm32f0/soc.c b/soc/arm/st_stm32/stm32f0/soc.c index 71c28b0d5dfc..a4cfbef0882f 100644 --- a/soc/arm/st_stm32/stm32f0/soc.c +++ b/soc/arm/st_stm32/stm32f0/soc.c @@ -54,7 +54,7 @@ void relocate_vector_table(void) * * @return 0 */ -static int stm32f0_init(struct device *arg) +static int stm32f0_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32f1/soc.c b/soc/arm/st_stm32/stm32f1/soc.c index b5740cef9529..d4f665ebe107 100644 --- a/soc/arm/st_stm32/stm32f1/soc.c +++ b/soc/arm/st_stm32/stm32f1/soc.c @@ -22,7 +22,7 @@ * * @return 0 */ -static int stm32f1_init(struct device *arg) +static int stm32f1_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32f2/soc.c b/soc/arm/st_stm32/stm32f2/soc.c index 75167d145b96..524445be9e2a 100644 --- a/soc/arm/st_stm32/stm32f2/soc.c +++ b/soc/arm/st_stm32/stm32f2/soc.c @@ -26,7 +26,7 @@ * * @return 0 */ -static int stm32f2_init(struct device *arg) +static int stm32f2_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32f3/soc.c b/soc/arm/st_stm32/stm32f3/soc.c index 5fca00e19b92..1b34a34b8b01 100644 --- a/soc/arm/st_stm32/stm32f3/soc.c +++ b/soc/arm/st_stm32/stm32f3/soc.c @@ -22,7 +22,7 @@ * * @return 0 */ -static int stm32f3_init(struct device *arg) +static int stm32f3_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32f4/soc.c b/soc/arm/st_stm32/stm32f4/soc.c index f98e1a09e56d..892686e18413 100644 --- a/soc/arm/st_stm32/stm32f4/soc.c +++ b/soc/arm/st_stm32/stm32f4/soc.c @@ -23,7 +23,7 @@ * * @return 0 */ -static int st_stm32f4_init(struct device *arg) +static int st_stm32f4_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32f7/soc.c b/soc/arm/st_stm32/stm32f7/soc.c index f6c2e41e253d..4e4fc7cbd8c6 100644 --- a/soc/arm/st_stm32/stm32f7/soc.c +++ b/soc/arm/st_stm32/stm32f7/soc.c @@ -24,7 +24,7 @@ * * @return 0 */ -static int st_stm32f7_init(struct device *arg) +static int st_stm32f7_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32g0/soc.c b/soc/arm/st_stm32/stm32g0/soc.c index ee8a176dcc6a..c9a44a440efd 100644 --- a/soc/arm/st_stm32/stm32g0/soc.c +++ b/soc/arm/st_stm32/stm32g0/soc.c @@ -25,7 +25,7 @@ * * @return 0 */ -static int stm32g0_init(struct device *arg) +static int stm32g0_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32g4/soc.c b/soc/arm/st_stm32/stm32g4/soc.c index c22457a0ac60..b7d4f429f4bf 100644 --- a/soc/arm/st_stm32/stm32g4/soc.c +++ b/soc/arm/st_stm32/stm32g4/soc.c @@ -22,7 +22,7 @@ * * @return 0 */ -static int stm32g4_init(struct device *arg) +static int stm32g4_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32h7/soc_m4.c b/soc/arm/st_stm32/stm32h7/soc_m4.c index e7be63b713b6..5d31afba701b 100644 --- a/soc/arm/st_stm32/stm32h7/soc_m4.c +++ b/soc/arm/st_stm32/stm32h7/soc_m4.c @@ -59,7 +59,7 @@ void stm32h7_m4_boot_stop(void) * * @return 0 */ -static int stm32h7_m4_init(struct device *arg) +static int stm32h7_m4_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32h7/soc_m7.c b/soc/arm/st_stm32/stm32h7/soc_m7.c index 3486473fb358..1e7c4ad053fd 100644 --- a/soc/arm/st_stm32/stm32h7/soc_m7.c +++ b/soc/arm/st_stm32/stm32h7/soc_m7.c @@ -17,7 +17,7 @@ #include #if defined(CONFIG_STM32H7_DUAL_CORE) -static int stm32h7_m4_wakeup(struct device *arg) +static int stm32h7_m4_wakeup(const struct device *arg) { /*HW semaphore Clock enable*/ @@ -60,7 +60,7 @@ static int stm32h7_m4_wakeup(struct device *arg) * * @return 0 */ -static int stm32h7_init(struct device *arg) +static int stm32h7_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32l0/soc.c b/soc/arm/st_stm32/stm32l0/soc.c index c4fa72db1b3e..8266664a4689 100644 --- a/soc/arm/st_stm32/stm32l0/soc.c +++ b/soc/arm/st_stm32/stm32l0/soc.c @@ -24,7 +24,7 @@ * * @return 0 */ -static int stm32l0_init(struct device *arg) +static int stm32l0_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32l1/soc.c b/soc/arm/st_stm32/stm32l1/soc.c index 257889a15b68..36a1b6bd4f0a 100644 --- a/soc/arm/st_stm32/stm32l1/soc.c +++ b/soc/arm/st_stm32/stm32l1/soc.c @@ -24,7 +24,7 @@ * * @return 0 */ -static int stm32l1_init(struct device *arg) +static int stm32l1_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32l4/soc.c b/soc/arm/st_stm32/stm32l4/soc.c index e23f8ae2a87a..bc81aee0c4eb 100644 --- a/soc/arm/st_stm32/stm32l4/soc.c +++ b/soc/arm/st_stm32/stm32l4/soc.c @@ -23,7 +23,7 @@ * * @return 0 */ -static int stm32l4_init(struct device *arg) +static int stm32l4_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32l5/soc.c b/soc/arm/st_stm32/stm32l5/soc.c index a2a766f8d070..1fcc2d9d23c8 100644 --- a/soc/arm/st_stm32/stm32l5/soc.c +++ b/soc/arm/st_stm32/stm32l5/soc.c @@ -22,7 +22,7 @@ * * @return 0 */ -static int stm32l5_init(struct device *arg) +static int stm32l5_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32mp1/soc.c b/soc/arm/st_stm32/stm32mp1/soc.c index aea44c654d24..d137c0932fbf 100644 --- a/soc/arm/st_stm32/stm32mp1/soc.c +++ b/soc/arm/st_stm32/stm32mp1/soc.c @@ -24,7 +24,7 @@ * * @return 0 */ -static int stm32m4_init(struct device *arg) +static int stm32m4_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/st_stm32/stm32wb/soc.c b/soc/arm/st_stm32/stm32wb/soc.c index 1609889455c3..4bb638d8dbb1 100644 --- a/soc/arm/st_stm32/stm32wb/soc.c +++ b/soc/arm/st_stm32/stm32wb/soc.c @@ -22,7 +22,7 @@ * * @return 0 */ -static int stm32wb_init(struct device *arg) +static int stm32wb_init(const struct device *arg) { u32_t key; diff --git a/soc/arm/ti_lm3s6965/soc.c b/soc/arm/ti_lm3s6965/soc.c index 402a84db29a4..116d31610485 100644 --- a/soc/arm/ti_lm3s6965/soc.c +++ b/soc/arm/ti_lm3s6965/soc.c @@ -30,7 +30,7 @@ * @return 0 */ -static int ti_lm3s6965_init(struct device *arg) +static int ti_lm3s6965_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/ti_lm3s6965/soc_config.c b/soc/arm/ti_lm3s6965/soc_config.c index 4743bfd177fa..1682cbcaf332 100644 --- a/soc/arm/ti_lm3s6965/soc_config.c +++ b/soc/arm/ti_lm3s6965/soc_config.c @@ -24,7 +24,7 @@ #define RCGC1_UART1_EN 0x00000002 #define RCGC1_UART2_EN 0x00000004 -static int uart_stellaris_init(struct device *dev) +static int uart_stellaris_init(const struct device *dev) { #ifdef CONFIG_UART_STELLARIS_PORT_0 RCGC1 |= RCGC1_UART0_EN; @@ -52,7 +52,7 @@ SYS_INIT(uart_stellaris_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); #define RCGC2_PHY_EN 0x40000000 #define RCGC2_EMAC_EN 0x10000000 -static int eth_stellaris_init(struct device *dev) +static int eth_stellaris_init(const struct device *dev) { RCGC2 |= (RCGC2_PHY_EN | RCGC2_EMAC_EN); return 0; diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c index 513ff564c75e..60fc186baf59 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c @@ -126,7 +126,7 @@ void _sys_pm_power_state_exit_post_ops(enum power_states state) } /* Initialize TI Power module */ -static int power_initialize(struct device *dev) +static int power_initialize(const struct device *dev) { unsigned int ret; @@ -144,7 +144,7 @@ static int power_initialize(struct device *dev) * This needs to be called during POST_KERNEL in order for "Booting Zephyr" * message to show up */ -static int unlatch_pins(struct device *dev) +static int unlatch_pins(const struct device *dev) { /* Get the reason for reset. */ u32_t rSrc = SysCtrlResetSourceGet(); diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c index 210ac1fa183a..7ddd376378c5 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/soc.c @@ -8,7 +8,7 @@ #include -static int ti_cc13x2_cc26x2_init(struct device *dev) +static int ti_cc13x2_cc26x2_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/arm/ti_simplelink/cc32xx/soc.c b/soc/arm/ti_simplelink/cc32xx/soc.c index d655be7a313f..3d9055e43731 100644 --- a/soc/arm/ti_simplelink/cc32xx/soc.c +++ b/soc/arm/ti_simplelink/cc32xx/soc.c @@ -12,7 +12,7 @@ #include #include -static int ti_cc32xx_init(struct device *arg) +static int ti_cc32xx_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/ti_simplelink/msp432p4xx/soc.c b/soc/arm/ti_simplelink/msp432p4xx/soc.c index 185157816bff..471179779bad 100644 --- a/soc/arm/ti_simplelink/msp432p4xx/soc.c +++ b/soc/arm/ti_simplelink/msp432p4xx/soc.c @@ -9,7 +9,7 @@ #include #include -static int ti_msp432p4xx_init(struct device *arg) +static int ti_msp432p4xx_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/arm/xilinx_zynqmp/soc.c b/soc/arm/xilinx_zynqmp/soc.c index 1e621c95a042..0732e4d161e2 100644 --- a/soc/arm/xilinx_zynqmp/soc.c +++ b/soc/arm/xilinx_zynqmp/soc.c @@ -17,7 +17,7 @@ * @return 0 */ -static int soc_init(struct device *arg) +static int soc_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/soc/riscv/openisa_rv32m1/soc.c b/soc/riscv/openisa_rv32m1/soc.c index e0d818692b2e..ddaaa8b4c340 100644 --- a/soc/riscv/openisa_rv32m1/soc.c +++ b/soc/riscv/openisa_rv32m1/soc.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(soc); #define SCG_LPFLL_DISABLE 0U -static struct device *dev_intmux; +static const struct device *dev_intmux; /* * Run-mode configuration for the fast internal reference clock (FIRC). @@ -218,7 +218,7 @@ static void rv32m1_setup_peripheral_clocks(void) * * @return 0 */ -static int soc_rv32m1_init(struct device *arg) +static int soc_rv32m1_init(const struct device *arg) { unsigned int key; diff --git a/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c b/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c index 4814bc5bc0af..bedb3c8da156 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c +++ b/soc/riscv/riscv-privilege/sifive-freedom/fe310_clock.c @@ -11,7 +11,7 @@ /* Selects the 16MHz oscilator on the HiFive1 board, which provides a clock * that's accurate enough to actually drive serial ports off of. */ -static int fe310_clock_init(struct device *dev) +static int fe310_clock_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/soc/xtensa/intel_apl_adsp/adsp.c b/soc/xtensa/intel_apl_adsp/adsp.c index 2ef7d35c7a0a..8283a5c7ac45 100644 --- a/soc/xtensa/intel_apl_adsp/adsp.c +++ b/soc/xtensa/intel_apl_adsp/adsp.c @@ -106,7 +106,7 @@ static void send_fw_ready(void) ipc_write(IPC_DIPCI, (0x80000000 | ADSP_IPC_FW_READY)); } -static int adsp_init(struct device *dev) +static int adsp_init(const struct device *dev) { prepare_host_windows(); diff --git a/soc/xtensa/intel_apl_adsp/soc.c b/soc/xtensa/intel_apl_adsp/soc.c index d769ba81963f..af3137f57c20 100644 --- a/soc/xtensa/intel_apl_adsp/soc.c +++ b/soc/xtensa/intel_apl_adsp/soc.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(soc); void z_soc_irq_enable(u32_t irq) { - struct device *dev_cavs; + const struct device *dev_cavs; switch (XTENSA_IRQ_NUMBER(irq)) { case DT_IRQN(CAVS_INTC_NODE(0)): @@ -63,7 +63,7 @@ void z_soc_irq_enable(u32_t irq) void z_soc_irq_disable(u32_t irq) { - struct device *dev_cavs; + const struct device *dev_cavs; switch (XTENSA_IRQ_NUMBER(irq)) { case DT_IRQN(CAVS_INTC_NODE(0)): @@ -103,7 +103,7 @@ void z_soc_irq_disable(u32_t irq) int z_soc_irq_is_enabled(unsigned int irq) { - struct device *dev_cavs; + const struct device *dev_cavs; int ret = 0; switch (XTENSA_IRQ_NUMBER(irq)) { @@ -226,7 +226,7 @@ static inline void soc_set_power_and_clock(void) dsp_shim_regs->lpsctl = dsp_shim_regs->lpsctl; } -static int soc_init(struct device *dev) +static int soc_init(const struct device *dev) { soc_set_power_and_clock(); diff --git a/soc/xtensa/intel_apl_adsp/soc_mp.c b/soc/xtensa/intel_apl_adsp/soc_mp.c index 4aa5e65fac7c..cd187bd8432c 100644 --- a/soc/xtensa/intel_apl_adsp/soc_mp.c +++ b/soc/xtensa/intel_apl_adsp/soc_mp.c @@ -49,7 +49,7 @@ LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL); #define IDC_MSG_POWER_UP_EXT(x) IDC_EXTENSION((x) >> 2) -static struct device *idc; +static const struct device *idc; #endif extern void __start(void); diff --git a/soc/xtensa/intel_s1000/soc.c b/soc/xtensa/intel_s1000/soc.c index be728018c1bd..82ec83993cb0 100644 --- a/soc/xtensa/intel_s1000/soc.c +++ b/soc/xtensa/intel_s1000/soc.c @@ -23,7 +23,7 @@ static u32_t ref_clk_freq; void z_soc_irq_enable(u32_t irq) { - struct device *dev_cavs, *dev_ictl; + const struct device *dev_cavs, *dev_ictl; switch (XTENSA_IRQ_NUMBER(irq)) { case DT_IRQN(CAVS_INTC_NODE(0)): @@ -82,7 +82,7 @@ void z_soc_irq_enable(u32_t irq) void z_soc_irq_disable(u32_t irq) { - struct device *dev_cavs, *dev_ictl; + const struct device *dev_cavs, *dev_ictl; switch (XTENSA_IRQ_NUMBER(irq)) { case DT_IRQN(CAVS_INTC_NODE(0)): @@ -151,7 +151,7 @@ void z_soc_irq_disable(u32_t irq) int z_soc_irq_is_enabled(unsigned int irq) { - struct device *dev_cavs, *dev_ictl; + const struct device *dev_cavs, *dev_ictl; int ret = -EINVAL; switch (XTENSA_IRQ_NUMBER(irq)) { @@ -317,7 +317,7 @@ static inline void soc_read_bootstraps(void) } } -static int soc_init(struct device *dev) +static int soc_init(const struct device *dev) { soc_read_bootstraps(); diff --git a/soc/xtensa/intel_s1000/soc_mp.c b/soc/xtensa/intel_s1000/soc_mp.c index c7cf32594b74..ed7bde4abb72 100644 --- a/soc/xtensa/intel_s1000/soc_mp.c +++ b/soc/xtensa/intel_s1000/soc_mp.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL); #include #include -static struct device *idc; +static const struct device *idc; #endif extern void __start(void); diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c index 70b41f6f4ea8..923c2fced4cf 100644 --- a/subsys/bluetooth/controller/hci/hci_driver.c +++ b/subsys/bluetooth/controller/hci/hci_driver.c @@ -495,7 +495,7 @@ static const struct bt_hci_driver drv = { .send = hci_driver_send, }; -static int hci_driver_init(struct device *unused) +static int hci_driver_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c index 1e58161dcf4c..83a8c672de53 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c @@ -49,7 +49,7 @@ static struct { } event; /* Entropy device */ -static struct device *dev_entropy; +static const struct device *dev_entropy; static int init_reset(void); static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb, diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c index 2a51592593fb..e2a3c63bd52d 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c @@ -19,10 +19,11 @@ #define LFCLOCK_TIMEOUT_MS 500 #define HFCLOCK_TIMEOUT_MS 2 -static void clock_ready(struct device *dev, clock_control_subsys_t subsys, +static void clock_ready(const struct device *dev, + clock_control_subsys_t subsys, void *user_data); -static struct device *dev; +static const struct device *dev; int lll_clock_init(void) { @@ -117,7 +118,8 @@ int lll_hfclock_off(void) return err; } -static void clock_ready(struct device *dev, clock_control_subsys_t subsys, +static void clock_ready(const struct device *dev, + clock_control_subsys_t subsys, void *user_data) { k_sem_give(user_data); diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h index a87978678504..299509dc1002 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h +++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h @@ -31,9 +31,9 @@ #include -extern struct device *vega_debug_portb; -extern struct device *vega_debug_portc; -extern struct device *vega_debug_portd; +extern const struct device *vega_debug_portb; +extern const struct device *vega_debug_portc; +extern const struct device *vega_debug_portd; #define DEBUG0_PIN 5 #define DEBUG0_PORT vega_debug_portd diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c index daf3ae88d7d5..9d938ed77fa3 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c +++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c @@ -42,11 +42,11 @@ static struct { } event; static struct { - struct device *clk; + const struct device *clk; } lll; /* Entropy device */ -static struct device *dev_entropy; +static const struct device *dev_entropy; static int init_reset(void); static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb, @@ -110,7 +110,7 @@ static void swi_ull_low_rv32m1_isr(void *arg) int lll_init(void) { - struct device *clk_k32; + const struct device *clk_k32; int err; ARG_UNUSED(clk_k32); diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index 9185715b10d2..38fe51e7872f 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -169,7 +169,7 @@ static struct ll_conn conn_pool[CONFIG_BT_MAX_CONN]; static struct ll_conn *conn_upd_curr; static void *conn_free; -static struct device *entropy; +static const struct device *entropy; struct ll_conn *ll_conn_acquire(void) { diff --git a/subsys/bluetooth/controller/util/util.c b/subsys/bluetooth/controller/util/util.c index e3a50e3288ff..3f723158b8a0 100644 --- a/subsys/bluetooth/controller/util/util.c +++ b/subsys/bluetooth/controller/util/util.c @@ -40,7 +40,7 @@ u8_t util_ones_count_get(u8_t *octets, u8_t octets_len) int util_rand(void *buf, size_t len) { - static struct device *dev; + static const struct device *dev; if (unlikely(!dev)) { /* Only one entropy device exists, so this is safe even diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c index cd288d49186e..ef6b0f555097 100644 --- a/subsys/bluetooth/host/monitor.c +++ b/subsys/bluetooth/host/monitor.c @@ -45,7 +45,7 @@ /* Maximum (string) length of a log message */ #define MONITOR_MSG_MAX 128 -static struct device *monitor_dev; +static const struct device *monitor_dev; enum { BT_LOG_BUSY, @@ -322,7 +322,7 @@ static const struct log_backend_api monitor_log_api = { LOG_BACKEND_DEFINE(bt_monitor, monitor_log_api, true); #endif /* CONFIG_LOG_MINIMAL */ -static int bt_monitor_init(struct device *d) +static int bt_monitor_init(const struct device *d) { ARG_UNUSED(d); diff --git a/subsys/bluetooth/services/bas.c b/subsys/bluetooth/services/bas.c index 585da309fc5c..563f531f065d 100644 --- a/subsys/bluetooth/services/bas.c +++ b/subsys/bluetooth/services/bas.c @@ -57,7 +57,7 @@ BT_GATT_SERVICE_DEFINE(bas, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE), ); -static int bas_init(struct device *dev) +static int bas_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/bluetooth/services/hrs.c b/subsys/bluetooth/services/hrs.c index 6b3cd09d87f6..c439facbf0f6 100644 --- a/subsys/bluetooth/services/hrs.c +++ b/subsys/bluetooth/services/hrs.c @@ -56,7 +56,7 @@ BT_GATT_SERVICE_DEFINE(hrs_svc, BT_GATT_PERM_NONE, NULL, NULL, NULL), ); -static int hrs_init(struct device *dev) +static int hrs_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/canbus/canopen/CO_driver.c b/subsys/canbus/canopen/CO_driver.c index 7a101cbacec1..3036afba668c 100644 --- a/subsys/canbus/canopen/CO_driver.c +++ b/subsys/canbus/canopen/CO_driver.c @@ -463,7 +463,7 @@ void CO_CANverifyErrors(CO_CANmodule_t *CANmodule) } } -static int canopen_init(struct device *dev) +static int canopen_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/canbus/canopen/CO_driver_target.h b/subsys/canbus/canopen/CO_driver_target.h index a1f9c4438454..d21e6a17057f 100644 --- a/subsys/canbus/canopen/CO_driver_target.h +++ b/subsys/canbus/canopen/CO_driver_target.h @@ -80,7 +80,7 @@ typedef struct canopen_tx { } CO_CANtx_t; typedef struct canopen_module { - struct device *dev; + const struct device *dev; CO_CANrx_t *rx_array; CO_CANtx_t *tx_array; u16_t rx_size; diff --git a/subsys/canbus/isotp/isotp.c b/subsys/canbus/isotp/isotp.c index 77822a859ea0..b4ac15904d39 100644 --- a/subsys/canbus/isotp/isotp.c +++ b/subsys/canbus/isotp/isotp.c @@ -547,7 +547,7 @@ static inline int attach_ff_filter(struct isotp_recv_ctx *ctx) return 0; } -int isotp_bind(struct isotp_recv_ctx *ctx, struct device *can_dev, +int isotp_bind(struct isotp_recv_ctx *ctx, const struct device *can_dev, const struct isotp_msg_id *rx_addr, const struct isotp_msg_id *tx_addr, const struct isotp_fc_opts *opts, @@ -1096,7 +1096,7 @@ static inline int attach_fc_filter(struct isotp_send_ctx *ctx) return 0; } -static int send(struct isotp_send_ctx *ctx, struct device *can_dev, +static int send(struct isotp_send_ctx *ctx, const struct device *can_dev, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, isotp_tx_callback_t complete_cb, void *cb_arg) @@ -1159,7 +1159,7 @@ static int send(struct isotp_send_ctx *ctx, struct device *can_dev, return ISOTP_N_OK; } -int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev, +int isotp_send(struct isotp_send_ctx *ctx, const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -1175,7 +1175,7 @@ int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev, #ifdef CONFIG_ISOTP_ENABLE_CONTEXT_BUFFERS -int isotp_send_ctx_buf(struct device *can_dev, +int isotp_send_ctx_buf(const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -1199,7 +1199,7 @@ int isotp_send_ctx_buf(struct device *can_dev, return send(ctx, can_dev, tx_addr, rx_addr, complete_cb, cb_arg); } -int isotp_send_net_ctx_buf(struct device *can_dev, +int isotp_send_net_ctx_buf(const struct device *can_dev, struct net_buf *data, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -1223,7 +1223,7 @@ int isotp_send_net_ctx_buf(struct device *can_dev, } #ifdef CONFIG_ISOTP_USE_TX_BUF -int isotp_send_buf(struct device *can_dev, +int isotp_send_buf(const struct device *can_dev, const u8_t *data, size_t len, const struct isotp_msg_id *tx_addr, const struct isotp_msg_id *rx_addr, @@ -1257,7 +1257,7 @@ int isotp_send_buf(struct device *can_dev, #endif /*CONFIG_ISOTP_USE_TX_BUF*/ #endif /*CONFIG_ISOTP_ENABLE_CONTEXT_BUFFERS*/ -static int isotp_workq_init(struct device *dev) +static int isotp_workq_init(const struct device *dev) { ARG_UNUSED(dev); LOG_DBG("Starting workqueue"); diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c index 130b47fffa53..ce6422c88991 100644 --- a/subsys/console/getchar.c +++ b/subsys/console/getchar.c @@ -49,7 +49,7 @@ int console_getchar(void) int console_init(void) { - struct device *uart_dev; + const struct device *uart_dev; int ret; uart_dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME); diff --git a/subsys/console/tty.c b/subsys/console/tty.c index 0927573c7a77..48e3b5ed3dac 100644 --- a/subsys/console/tty.c +++ b/subsys/console/tty.c @@ -15,7 +15,7 @@ static int tty_putchar(struct tty_serial *tty, u8_t c); static void tty_uart_isr(void *user_data) { struct tty_serial *tty = user_data; - struct device *dev = tty->uart_dev; + const struct device *dev = tty->uart_dev; uart_irq_update(dev); @@ -237,7 +237,7 @@ ssize_t tty_read(struct tty_serial *tty, void *buf, size_t size) return out_size; } -int tty_init(struct tty_serial *tty, struct device *uart_dev) +int tty_init(struct tty_serial *tty, const struct device *uart_dev) { if (!uart_dev) { return -ENODEV; diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c index 88a47f3dafbe..39088d1e5386 100644 --- a/subsys/dfu/img_util/flash_img.c +++ b/subsys/dfu/img_util/flash_img.c @@ -64,7 +64,7 @@ size_t flash_img_bytes_written(struct flash_img_context *ctx) int flash_img_init_id(struct flash_img_context *ctx, u8_t area_id) { int rc; - struct device *flash_dev; + const struct device *flash_dev; rc = flash_area_open(area_id, (const struct flash_area **)&(ctx->flash_area)); diff --git a/subsys/disk/disk_access.c b/subsys/disk/disk_access.c index 5277488e8058..7e39a09319d1 100644 --- a/subsys/disk/disk_access.c +++ b/subsys/disk/disk_access.c @@ -169,7 +169,7 @@ int disk_access_unregister(struct disk_info *disk) return rc; } -static int disk_init(struct device *dev) +static int disk_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/disk/disk_access_flash.c b/subsys/disk/disk_access_flash.c index d58c7a8e9db4..58b8c55013e6 100644 --- a/subsys/disk/disk_access_flash.c +++ b/subsys/disk/disk_access_flash.c @@ -16,7 +16,7 @@ #define SECTOR_SIZE 512 -static struct device *flash_dev; +static const struct device *flash_dev; /* flash read-copy-erase-write operation */ static u8_t __aligned(4) read_copy_buf[CONFIG_DISK_ERASE_BLOCK_SIZE]; @@ -289,7 +289,7 @@ static struct disk_info flash_disk = { .ops = &flash_disk_ops, }; -static int disk_flash_init(struct device *dev) +static int disk_flash_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/disk/disk_access_ram.c b/subsys/disk/disk_access_ram.c index 5943ea362a26..b9da76e7864f 100644 --- a/subsys/disk/disk_access_ram.c +++ b/subsys/disk/disk_access_ram.c @@ -95,7 +95,7 @@ static struct disk_info ram_disk = { .ops = &ram_disk_ops, }; -static int disk_ram_init(struct device *dev) +static int disk_ram_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/disk/disk_access_spi_sdhc.c b/subsys/disk/disk_access_spi_sdhc.c index f416215e0327..e32c540ea703 100644 --- a/subsys/disk/disk_access_spi_sdhc.c +++ b/subsys/disk/disk_access_spi_sdhc.c @@ -24,9 +24,9 @@ LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL); #warning NO SDHC slot specified on board #else struct sdhc_spi_data { - struct device *spi; + const struct device *spi; struct spi_config cfg; - struct device *cs; + const struct device *cs; u32_t pin; gpio_dt_flags_t flags; @@ -760,9 +760,9 @@ static int sdhc_spi_write(struct sdhc_spi_data *data, return err; } -static int disk_spi_sdhc_init(struct device *dev); +static int disk_spi_sdhc_init(const struct device *dev); -static int sdhc_spi_init(struct device *dev) +static int sdhc_spi_init(const struct device *dev) { struct sdhc_spi_data *data = dev->driver_data; @@ -786,7 +786,7 @@ static int sdhc_spi_init(struct device *dev) static int disk_spi_sdhc_access_status(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct sdhc_spi_data *data = dev->driver_data; return data->status; @@ -795,7 +795,7 @@ static int disk_spi_sdhc_access_status(struct disk_info *disk) static int disk_spi_sdhc_access_read(struct disk_info *disk, u8_t *buf, u32_t sector, u32_t count) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct sdhc_spi_data *data = dev->driver_data; int err; @@ -813,7 +813,7 @@ static int disk_spi_sdhc_access_read(struct disk_info *disk, static int disk_spi_sdhc_access_write(struct disk_info *disk, const u8_t *buf, u32_t sector, u32_t count) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct sdhc_spi_data *data = dev->driver_data; int err; @@ -831,7 +831,7 @@ static int disk_spi_sdhc_access_write(struct disk_info *disk, static int disk_spi_sdhc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buf) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct sdhc_spi_data *data = dev->driver_data; int err; @@ -861,7 +861,7 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk, static int disk_spi_sdhc_access_init(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct sdhc_spi_data *data = dev->driver_data; int err; @@ -884,7 +884,7 @@ static struct disk_info spi_sdhc_disk = { .ops = &spi_sdhc_disk_ops, }; -static int disk_spi_sdhc_init(struct device *dev) +static int disk_spi_sdhc_init(const struct device *dev) { struct sdhc_spi_data *data = dev->driver_data; diff --git a/subsys/disk/disk_access_stm32_sdmmc.c b/subsys/disk/disk_access_stm32_sdmmc.c index c55a4023964e..95b156b6c152 100644 --- a/subsys/disk/disk_access_stm32_sdmmc.c +++ b/subsys/disk/disk_access_stm32_sdmmc.c @@ -23,13 +23,13 @@ struct stm32_sdmmc_priv { struct gpio_callback cd_cb; struct { const char *name; - struct device *port; + const struct device *port; int pin; int flags; } cd; struct { const char *name; - struct device *port; + const struct device *port; int pin; int flags; } pe; @@ -38,7 +38,7 @@ struct stm32_sdmmc_priv { static int stm32_sdmmc_clock_enable(struct stm32_sdmmc_priv *priv) { - struct device *clock; + const struct device *clock; #if CONFIG_SOC_SERIES_STM32L4X LL_RCC_PLLSAI1_Disable(); @@ -71,7 +71,7 @@ static int stm32_sdmmc_clock_enable(struct stm32_sdmmc_priv *priv) static int stm32_sdmmc_clock_disable(struct stm32_sdmmc_priv *priv) { - struct device *clock; + const struct device *clock; clock = device_get_binding(STM32_CLOCK_CONTROL_NAME); if (!clock) { @@ -84,7 +84,7 @@ static int stm32_sdmmc_clock_disable(struct stm32_sdmmc_priv *priv) static int stm32_sdmmc_access_init(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct stm32_sdmmc_priv *priv = dev->driver_data; int err; @@ -120,7 +120,7 @@ static void stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv) static int stm32_sdmmc_access_status(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct stm32_sdmmc_priv *priv = dev->driver_data; return priv->status; @@ -129,7 +129,7 @@ static int stm32_sdmmc_access_status(struct disk_info *disk) static int stm32_sdmmc_access_read(struct disk_info *disk, u8_t *data_buf, u32_t start_sector, u32_t num_sector) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct stm32_sdmmc_priv *priv = dev->driver_data; int err; @@ -150,7 +150,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk, const u8_t *data_buf, u32_t start_sector, u32_t num_sector) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct stm32_sdmmc_priv *priv = dev->driver_data; int err; @@ -169,7 +169,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk, static int stm32_sdmmc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buff) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct stm32_sdmmc_priv *priv = dev->driver_data; HAL_SD_CardInfoTypeDef info; int err; @@ -251,7 +251,7 @@ static void stm32_sdmmc_cd_handler(struct k_work *item) } } -static void stm32_sdmmc_cd_callback(struct device *gpiodev, +static void stm32_sdmmc_cd_callback(const struct device *gpiodev, struct gpio_callback *cb, u32_t pin) { @@ -350,7 +350,7 @@ static int stm32_sdmmc_pwr_uninit(struct stm32_sdmmc_priv *priv) return 0; } -static int disk_stm32_sdmmc_init(struct device *dev) +static int disk_stm32_sdmmc_init(const struct device *dev) { struct stm32_sdmmc_priv *priv = dev->driver_data; int err; diff --git a/subsys/disk/disk_access_usdhc.c b/subsys/disk/disk_access_usdhc.c index 5b3aa8a002de..1590b7dace8a 100644 --- a/subsys/disk/disk_access_usdhc.c +++ b/subsys/disk/disk_access_usdhc.c @@ -437,11 +437,11 @@ struct usdhc_client_info { }; struct usdhc_board_config { - struct device *pwr_gpio; + const struct device *pwr_gpio; u32_t pwr_pin; gpio_dt_flags_t pwr_flags; - struct device *detect_gpio; + const struct device *detect_gpio; u32_t detect_pin; gpio_dt_flags_t detect_flags; struct gpio_callback detect_cb; @@ -457,7 +457,7 @@ struct usdhc_priv { enum host_detect_type detect_type; bool inserted; - struct device *clock_dev; + const struct device *clock_dev; clock_control_subsys_t clock_sys; struct usdhc_config host_config; @@ -2219,7 +2219,7 @@ static void usdhc_host_hw_init(USDHC_Type *base, } -static void usdhc_cd_gpio_cb(struct device *dev, +static void usdhc_cd_gpio_cb(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct usdhc_board_config *board_cfg = @@ -2229,9 +2229,9 @@ static void usdhc_cd_gpio_cb(struct device *dev, GPIO_INT_DISABLE); } -static int usdhc_cd_gpio_init(struct device *detect_gpio, - u32_t pin, gpio_dt_flags_t flags, - struct gpio_callback *callback) +static int usdhc_cd_gpio_init(const struct device *detect_gpio, + u32_t pin, gpio_dt_flags_t flags, + struct gpio_callback *callback) { int ret; @@ -2779,7 +2779,7 @@ static int usdhc_access_init(const struct device *dev) static int disk_usdhc_access_status(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct usdhc_priv *priv = dev->driver_data; return priv->status; @@ -2788,7 +2788,7 @@ static int disk_usdhc_access_status(struct disk_info *disk) static int disk_usdhc_access_read(struct disk_info *disk, u8_t *buf, u32_t sector, u32_t count) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct usdhc_priv *priv = dev->driver_data; LOG_DBG("sector=%u count=%u", sector, count); @@ -2799,7 +2799,7 @@ static int disk_usdhc_access_read(struct disk_info *disk, u8_t *buf, static int disk_usdhc_access_write(struct disk_info *disk, const u8_t *buf, u32_t sector, u32_t count) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct usdhc_priv *priv = dev->driver_data; LOG_DBG("sector=%u count=%u", sector, count); @@ -2809,7 +2809,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const u8_t *buf, static int disk_usdhc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buf) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct usdhc_priv *priv = dev->driver_data; int err; @@ -2839,7 +2839,7 @@ static int disk_usdhc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buf) static int disk_usdhc_access_init(struct disk_info *disk) { - struct device *dev = disk->dev; + const struct device *dev = disk->dev; struct usdhc_priv *priv = dev->driver_data; if (priv->status == DISK_STATUS_OK) { @@ -2863,7 +2863,7 @@ static struct disk_info usdhc_disk = { .ops = &usdhc_disk_ops, }; -static int disk_usdhc_init(struct device *dev) +static int disk_usdhc_init(const struct device *dev) { struct usdhc_priv *priv = dev->driver_data; diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c index a8b733ccf73c..3342d64de758 100644 --- a/subsys/fb/cfb.c +++ b/subsys/fb/cfb.c @@ -119,7 +119,7 @@ static u8_t draw_char_vtmono(const struct char_framebuffer *fb, return fptr->width; } -int cfb_print(struct device *dev, char *str, u16_t x, u16_t y) +int cfb_print(const struct device *dev, char *str, u16_t x, u16_t y) { const struct char_framebuffer *fb = &char_fb; const struct cfb_font *fptr; @@ -159,7 +159,7 @@ static int cfb_invert(const struct char_framebuffer *fb) return 0; } -int cfb_framebuffer_clear(struct device *dev, bool clear_display) +int cfb_framebuffer_clear(const struct device *dev, bool clear_display) { const struct char_framebuffer *fb = &char_fb; struct display_buffer_descriptor desc; @@ -178,7 +178,7 @@ int cfb_framebuffer_clear(struct device *dev, bool clear_display) } -int cfb_framebuffer_invert(struct device *dev) +int cfb_framebuffer_invert(const struct device *dev) { struct char_framebuffer *fb = &char_fb; @@ -191,7 +191,7 @@ int cfb_framebuffer_invert(struct device *dev) return 0; } -int cfb_framebuffer_finalize(struct device *dev) +int cfb_framebuffer_finalize(const struct device *dev) { const struct display_driver_api *api = dev->driver_api; const struct char_framebuffer *fb = &char_fb; @@ -213,7 +213,7 @@ int cfb_framebuffer_finalize(struct device *dev) return api->write(dev, 0, 0, &desc, fb->buf); } -int cfb_get_display_parameter(struct device *dev, +int cfb_get_display_parameter(const struct device *dev, enum cfb_display_param param) { const struct char_framebuffer *fb = &char_fb; @@ -239,7 +239,7 @@ int cfb_get_display_parameter(struct device *dev, return 0; } -int cfb_framebuffer_set_font(struct device *dev, u8_t idx) +int cfb_framebuffer_set_font(const struct device *dev, u8_t idx) { struct char_framebuffer *fb = &char_fb; @@ -252,7 +252,8 @@ int cfb_framebuffer_set_font(struct device *dev, u8_t idx) return 0; } -int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height) +int cfb_get_font_size(const struct device *dev, u8_t idx, u8_t *width, + u8_t *height) { const struct char_framebuffer *fb = &char_fb; @@ -271,14 +272,14 @@ int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height) return 0; } -int cfb_get_numof_fonts(struct device *dev) +int cfb_get_numof_fonts(const struct device *dev) { const struct char_framebuffer *fb = &char_fb; return fb->numof_fonts; } -int cfb_framebuffer_init(struct device *dev) +int cfb_framebuffer_init(const struct device *dev) { const struct display_driver_api *api = dev->driver_api; struct char_framebuffer *fb = &char_fb; diff --git a/subsys/fb/cfb_shell.c b/subsys/fb/cfb_shell.c index a82038f799f2..925fed0c58aa 100644 --- a/subsys/fb/cfb_shell.c +++ b/subsys/fb/cfb_shell.c @@ -22,7 +22,7 @@ #define DISPLAY_DRIVER CONFIG_CHARACTER_FRAMEBUFFER_SHELL_DRIVER_NAME -static struct device *dev; +static const struct device *dev; static const char * const param_name[] = { "height", "width", "ppt", "rows", "cols"}; diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c index aed0dc117a06..818696ec1e86 100644 --- a/subsys/fs/fat_fs.c +++ b/subsys/fs/fat_fs.c @@ -387,7 +387,7 @@ static struct fs_file_system_t fatfs_fs = { .statvfs = fatfs_statvfs, }; -static int fatfs_init(struct device *dev) +static int fatfs_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/fs/fs.c b/subsys/fs/fs.c index 9df7031ee06f..0365d7d25bfa 100644 --- a/subsys/fs/fs.c +++ b/subsys/fs/fs.c @@ -668,7 +668,7 @@ int fs_unregister(enum fs_type type, struct fs_file_system_t *fs) return rc; } -static int fs_init(struct device *dev) +static int fs_init(const struct device *dev) { k_mutex_init(&mutex); sys_dlist_init(&fs_mnt_list); diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c index a91727557e6e..3b2df224dffb 100644 --- a/subsys/fs/littlefs_fs.c +++ b/subsys/fs/littlefs_fs.c @@ -521,7 +521,7 @@ static lfs_size_t get_block_size(const struct flash_area *fa) .area = fa, .max_size = 0, }; - struct device *dev = flash_area_get_device(fa); + const struct device *dev = flash_area_get_device(fa); flash_page_foreach(dev, get_page_cb, &ctx); @@ -533,7 +533,7 @@ static int littlefs_mount(struct fs_mount_t *mountp) int ret; struct fs_littlefs *fs = mountp->fs_data; unsigned int area_id = (uintptr_t)mountp->storage_dev; - struct device *dev; + const struct device *dev; LOG_INF("LittleFS version %u.%u, disk version %u.%u", LFS_VERSION_MAJOR, LFS_VERSION_MINOR, @@ -728,7 +728,7 @@ static struct fs_file_system_t littlefs_fs = { .statvfs = littlefs_statvfs, }; -static int littlefs_init(struct device *dev) +static int littlefs_init(const struct device *dev) { ARG_UNUSED(dev); return fs_register(FS_LITTLEFS, &littlefs_fs); diff --git a/subsys/logging/log_backend_uart.c b/subsys/logging/log_backend_uart.c index a57fdb5f0324..a226aa6bad8b 100644 --- a/subsys/logging/log_backend_uart.c +++ b/subsys/logging/log_backend_uart.c @@ -15,7 +15,7 @@ static int char_out(u8_t *data, size_t length, void *ctx) { - struct device *dev = (struct device *)ctx; + const struct device *dev = (const struct device *)ctx; for (size_t i = 0; i < length; i++) { uart_poll_out(dev, data[i]); @@ -39,12 +39,12 @@ static void put(const struct log_backend *const backend, static void log_backend_uart_init(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME); assert(dev); - log_output_ctx_set(&log_output, dev); + log_output_ctx_set(&log_output, (void *)dev); } static void panic(struct log_backend const *const backend) diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c index 8e81037d06cf..1c6b130000c9 100644 --- a/subsys/logging/log_core.c +++ b/subsys/logging/log_core.c @@ -1163,7 +1163,7 @@ static void log_process_thread_func(void *dummy1, void *dummy2, void *dummy3) K_THREAD_STACK_DEFINE(logging_stack, CONFIG_LOG_PROCESS_THREAD_STACK_SIZE); struct k_thread logging_thread; -static int enable_logger(struct device *arg) +static int enable_logger(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/logging/log_output_syst.c b/subsys/logging/log_output_syst.c index d4cd6fbde61f..e302b82cb3ff 100644 --- a/subsys/logging/log_output_syst.c +++ b/subsys/logging/log_output_syst.c @@ -370,7 +370,7 @@ void log_output_hexdump_syst_process(const struct log_output *log_output, MIPI_SYST_WRITE(&log_syst_handle, severity, 0x1A, data, length); } -static int syst_init(struct device *arg) +static int syst_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/mgmt/smp_bt.c b/subsys/mgmt/smp_bt.c index d76de20b2892..e913b6fc6608 100644 --- a/subsys/mgmt/smp_bt.c +++ b/subsys/mgmt/smp_bt.c @@ -190,7 +190,7 @@ int smp_bt_unregister(void) return bt_gatt_service_unregister(&smp_bt_svc); } -static int smp_bt_init(struct device *dev) +static int smp_bt_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/mgmt/smp_shell.c b/subsys/mgmt/smp_shell.c index 3b2b3fd38081..2d290a45347c 100644 --- a/subsys/mgmt/smp_shell.c +++ b/subsys/mgmt/smp_shell.c @@ -155,7 +155,7 @@ static int smp_shell_tx_pkt(struct zephyr_smp_transport *zst, return rc; } -static int smp_shell_init(struct device *dev) +static int smp_shell_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/mgmt/smp_uart.c b/subsys/mgmt/smp_uart.c index 0e496056c29a..effe314ed800 100644 --- a/subsys/mgmt/smp_uart.c +++ b/subsys/mgmt/smp_uart.c @@ -87,7 +87,7 @@ static int smp_uart_tx_pkt(struct zephyr_smp_transport *zst, return rc; } -static int smp_uart_init(struct device *dev) +static int smp_uart_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/mgmt/smp_udp.c b/subsys/mgmt/smp_udp.c index ac77a2dc07ff..7fe4a2f5809f 100644 --- a/subsys/mgmt/smp_udp.c +++ b/subsys/mgmt/smp_udp.c @@ -132,7 +132,7 @@ static void smp_udp_receive_thread(void *p1, void *p2, void *p3) } } -static int smp_udp_init(struct device *dev) +static int smp_udp_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c index bb50b254f75b..e5af020b3090 100644 --- a/subsys/net/ip/net_core.c +++ b/subsys/net/ip/net_core.c @@ -446,7 +446,7 @@ static inline int services_init(void) return status; } -static int net_init(struct device *unused) +static int net_init(const struct device *unused) { net_hostname_init(); diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c index c26142447eb1..381b31b059c7 100644 --- a/subsys/net/ip/net_if.c +++ b/subsys/net/ip/net_if.c @@ -433,7 +433,7 @@ struct net_if *net_if_get_by_link_addr(struct net_linkaddr *ll_addr) return NULL; } -struct net_if *net_if_lookup_by_dev(struct device *dev) +struct net_if *net_if_lookup_by_dev(const struct device *dev) { struct net_if *iface; diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c index 3c73d1e0970f..1b5665d63bf5 100644 --- a/subsys/net/ip/net_shell.c +++ b/subsys/net/ip/net_shell.c @@ -4048,7 +4048,7 @@ static int cmd_net_suspend(const struct shell *shell, size_t argc, #if defined(CONFIG_NET_POWER_MANAGEMENT) if (argv[1]) { struct net_if *iface = NULL; - struct device *dev; + const struct device *dev; int idx; int ret; @@ -4093,7 +4093,7 @@ static int cmd_net_resume(const struct shell *shell, size_t argc, #if defined(CONFIG_NET_POWER_MANAGEMENT) if (argv[1]) { struct net_if *iface = NULL; - struct device *dev; + const struct device *dev; int idx; int ret; diff --git a/subsys/net/l2/bluetooth/bluetooth.c b/subsys/net/l2/bluetooth/bluetooth.c index c89fe007602f..f0cc68af8fc5 100644 --- a/subsys/net/l2/bluetooth/bluetooth.c +++ b/subsys/net/l2/bluetooth/bluetooth.c @@ -602,7 +602,7 @@ static struct bt_conn_cb conn_callbacks = { }; #endif /* CONFIG_NET_L2_BT_MGMT */ -static int net_bt_init(struct device *dev) +static int net_bt_init(const struct device *dev) { NET_DBG("dev %p driver_data %p", dev, dev->driver_data); diff --git a/subsys/net/l2/canbus/6locan.c b/subsys/net/l2/canbus/6locan.c index 78e224194c5b..ee6acab63fcb 100644 --- a/subsys/net/l2/canbus/6locan.c +++ b/subsys/net/l2/canbus/6locan.c @@ -425,7 +425,7 @@ static void canbus_fc_send_cb(u32_t err_flags, void *arg) } } -static int canbus_send_fc(struct device *net_can_dev, +static int canbus_send_fc(const struct device *net_can_dev, struct net_canbus_lladdr *dest, struct net_canbus_lladdr *src, u8_t fs) { @@ -496,7 +496,7 @@ static enum net_verdict canbus_process_cf(struct net_pkt *pkt) { struct canbus_isotp_rx_ctx *rx_ctx; enum net_verdict ret; - struct device *net_can_dev; + const struct device *net_can_dev; struct net_canbus_lladdr src, dest; bool mcast; @@ -556,7 +556,7 @@ static enum net_verdict canbus_process_cf(struct net_pkt *pkt) static enum net_verdict canbus_process_ff(struct net_pkt *pkt) { - struct device *net_can_dev = net_if_get_device(pkt->iface); + const struct device *net_can_dev = net_if_get_device(pkt->iface); struct canbus_isotp_rx_ctx *rx_ctx = NULL; struct net_pkt *new_pkt = NULL; int ret; @@ -697,7 +697,7 @@ static void canbus_tx_frame_isr(u32_t err_flags, void *arg) static inline int canbus_send_cf(struct net_pkt *pkt) { struct canbus_isotp_tx_ctx *ctx = pkt->canbus_tx_ctx; - struct device *net_can_dev = net_if_get_device(pkt->iface); + const struct device *net_can_dev = net_if_get_device(pkt->iface); const struct net_can_api *api = net_can_dev->driver_api; struct zcan_frame frame; struct net_pkt_cursor cursor_backup; @@ -872,7 +872,7 @@ static enum net_verdict canbus_process_fc(struct net_pkt *pkt) static inline int canbus_send_ff(struct net_pkt *pkt, size_t len, bool mcast, struct net_canbus_lladdr *dest_addr) { - struct device *net_can_dev = net_if_get_device(pkt->iface); + const struct device *net_can_dev = net_if_get_device(pkt->iface); const struct net_can_api *api = net_can_dev->driver_api; struct net_linkaddr *lladdr_inline; struct zcan_frame frame; @@ -942,7 +942,7 @@ static inline int canbus_send_single_frame(struct net_pkt *pkt, size_t len, bool mcast, struct net_canbus_lladdr *dest_addr) { - struct device *net_can_dev = net_if_get_device(pkt->iface); + const struct device *net_can_dev = net_if_get_device(pkt->iface); const struct net_can_api *api = net_can_dev->driver_api; int index = 0; struct zcan_frame frame; @@ -1495,7 +1495,7 @@ static enum net_verdict canbus_recv(struct net_if *iface, return ret; } -static inline int canbus_send_dad_request(struct device *net_can_dev, +static inline int canbus_send_dad_request(const struct device *net_can_dev, struct net_canbus_lladdr *ll_addr) { const struct net_can_api *api = net_can_dev->driver_api; @@ -1541,7 +1541,7 @@ static inline void canbus_send_dad_response(struct k_work *item) dad_work); struct net_if *iface = ctx->iface; struct net_linkaddr *ll_addr = net_if_get_link_addr(iface); - struct device *net_can_dev = net_if_get_device(iface); + const struct device *net_can_dev = net_if_get_device(iface); const struct net_can_api *api = net_can_dev->driver_api; struct zcan_frame frame; int ret; @@ -1561,7 +1561,7 @@ static inline void canbus_send_dad_response(struct k_work *item) } } -static inline void canbus_detach_filter(struct device *net_can_dev, +static inline void canbus_detach_filter(const struct device *net_can_dev, int filter_id) { const struct net_can_api *api = net_can_dev->driver_api; @@ -1577,7 +1577,7 @@ static void canbus_dad_resp_cb(struct zcan_frame *frame, void *arg) } static inline -int canbus_attach_dad_resp_filter(struct device *net_can_dev, +int canbus_attach_dad_resp_filter(const struct device *net_can_dev, struct net_canbus_lladdr *ll_addr, struct k_sem *dad_sem) { @@ -1608,7 +1608,7 @@ static void canbus_dad_request_cb(struct zcan_frame *frame, void *arg) k_work_submit_to_queue(&net_canbus_workq, work); } -static inline int canbus_attach_dad_filter(struct device *net_can_dev, +static inline int canbus_attach_dad_filter(const struct device *net_can_dev, struct net_canbus_lladdr *ll_addr, struct k_work *dad_work) { @@ -1635,7 +1635,7 @@ static inline int canbus_attach_dad_filter(struct device *net_can_dev, static inline int canbus_init_ll_addr(struct net_if *iface) { struct canbus_net_ctx *ctx = net_if_l2_data(iface); - struct device *net_can_dev = net_if_get_device(iface); + const struct device *net_can_dev = net_if_get_device(iface); int dad_resp_filter_id = CAN_NET_FILTER_NOT_SET; struct net_canbus_lladdr ll_addr; int ret; @@ -1742,7 +1742,7 @@ void net_6locan_init(struct net_if *iface) static int canbus_enable(struct net_if *iface, bool state) { - struct device *net_can_dev = net_if_get_device(iface); + const struct device *net_can_dev = net_if_get_device(iface); const struct net_can_api *api = net_can_dev->driver_api; struct canbus_net_ctx *ctx = net_if_l2_data(iface); int dad_retry_cnt, ret; diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c index f1b451cf4a23..603f7b3d0632 100644 --- a/subsys/net/l2/ethernet/ethernet.c +++ b/subsys/net/l2/ethernet/ethernet.c @@ -144,7 +144,7 @@ static void ethernet_update_rx_stats(struct net_if *iface, static inline bool eth_is_vlan_tag_stripped(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); const struct ethernet_api *api = dev->driver_api; return (api->get_capabilities(dev) & ETHERNET_HW_VLAN_TAG_STRIP); @@ -1021,9 +1021,9 @@ void net_eth_carrier_off(struct net_if *iface) } #if defined(CONFIG_PTP_CLOCK) -struct device *net_eth_get_ptp_clock(struct net_if *iface) +const struct device *net_eth_get_ptp_clock(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); const struct ethernet_api *api = dev->driver_api; if (!api) { @@ -1043,7 +1043,7 @@ struct device *net_eth_get_ptp_clock(struct net_if *iface) #endif /* CONFIG_PTP_CLOCK */ #if defined(CONFIG_PTP_CLOCK) -struct device *z_impl_net_eth_get_ptp_clock_by_index(int index) +const struct device *z_impl_net_eth_get_ptp_clock_by_index(int index) { struct net_if *iface; @@ -1056,14 +1056,14 @@ struct device *z_impl_net_eth_get_ptp_clock_by_index(int index) } #ifdef CONFIG_USERSPACE -static inline struct device *z_vrfy_net_eth_get_ptp_clock_by_index(int index) +static inline const struct device *z_vrfy_net_eth_get_ptp_clock_by_index(int index) { return z_impl_net_eth_get_ptp_clock_by_index(index); } #include #endif /* CONFIG_USERSPACE */ #else /* CONFIG_PTP_CLOCK */ -struct device *z_impl_net_eth_get_ptp_clock_by_index(int index) +const struct device *z_impl_net_eth_get_ptp_clock_by_index(int index) { ARG_UNUSED(index); diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c index 11ba443bf4be..ba7880578015 100644 --- a/subsys/net/l2/ethernet/ethernet_mgmt.c +++ b/subsys/net/l2/ethernet/ethernet_mgmt.c @@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(net_ethernet_mgmt, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); #include #include -static inline bool is_hw_caps_supported(struct device *dev, +static inline bool is_hw_caps_supported(const struct device *dev, enum ethernet_hw_caps caps) { const struct ethernet_api *api = dev->driver_api; @@ -30,7 +30,7 @@ static int ethernet_set_config(u32_t mgmt_request, void *data, size_t len) { struct ethernet_req_params *params = (struct ethernet_req_params *)data; - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); const struct ethernet_api *api = dev->driver_api; struct ethernet_config config = { 0 }; enum ethernet_config_type type; @@ -176,7 +176,7 @@ static int ethernet_get_config(u32_t mgmt_request, void *data, size_t len) { struct ethernet_req_params *params = (struct ethernet_req_params *)data; - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); const struct ethernet_api *api = dev->driver_api; struct ethernet_config config = { 0 }; int ret = 0; diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c index 1f891670855d..abb60f84c86b 100644 --- a/subsys/net/l2/ethernet/gptp/gptp.c +++ b/subsys/net/l2/ethernet/gptp/gptp.c @@ -563,7 +563,7 @@ static void gptp_thread(void) static void gptp_add_port(struct net_if *iface, void *user_data) { int *num_ports = user_data; - struct device *clk; + const struct device *clk; if (*num_ports >= CONFIG_NET_GPTP_NUM_PORTS) { return; @@ -827,7 +827,7 @@ struct port_user_data { static void gptp_get_port(struct net_if *iface, void *user_data) { struct port_user_data *ud = user_data; - struct device *clk; + const struct device *clk; /* Check if interface has a PTP clock. */ clk = net_eth_get_ptp_clock(iface); diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c index d3fcb1a5f45d..b630d6ec34a9 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_mi.c +++ b/subsys/net/l2/ethernet/gptp/gptp_mi.c @@ -279,7 +279,7 @@ void gptp_mi_init_state_machine(void) u64_t gptp_get_current_time_nanosecond(int port) { - struct device *clk; + const struct device *clk; clk = net_eth_get_ptp_clock(GPTP_PORT_IFACE(port)); if (clk) { @@ -688,7 +688,7 @@ static void gptp_update_local_port_clock(void) int port; s64_t nanosecond_diff; s64_t second_diff; - struct device *clk; + const struct device *clk; struct net_ptp_time tm; int key; diff --git a/subsys/net/l2/ethernet/gptp/gptp_user_api.c b/subsys/net/l2/ethernet/gptp/gptp_user_api.c index c79e8639bbc5..dbc9ee1306b0 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_user_api.c +++ b/subsys/net/l2/ethernet/gptp/gptp_user_api.c @@ -54,7 +54,7 @@ void gptp_call_phase_dis_cb(void) int gptp_event_capture(struct net_ptp_time *slave_time, bool *gm_present) { int port, key; - struct device *clk; + const struct device *clk; key = irq_lock(); *gm_present = GPTP_GLOBAL_DS()->gm_present; diff --git a/subsys/net/l2/ieee802154/ieee802154_security.c b/subsys/net/l2/ieee802154/ieee802154_security.c index d31d1304f708..adad446227c5 100644 --- a/subsys/net/l2/ieee802154/ieee802154_security.c +++ b/subsys/net/l2/ieee802154/ieee802154_security.c @@ -173,7 +173,7 @@ bool ieee802154_encrypt_auth(struct ieee802154_security_ctx *sec_ctx, int ieee802154_security_init(struct ieee802154_security_ctx *sec_ctx) { - struct device *dev; + const struct device *dev; (void)memset(&sec_ctx->enc, 0, sizeof(struct cipher_ctx)); (void)memset(&sec_ctx->dec, 0, sizeof(struct cipher_ctx)); diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c index dffe6a08b0f5..c24b949484a8 100644 --- a/subsys/net/l2/wifi/wifi_mgmt.c +++ b/subsys/net/l2/wifi/wifi_mgmt.c @@ -18,7 +18,7 @@ static int wifi_connect(u32_t mgmt_request, struct net_if *iface, { struct wifi_connect_req_params *params = (struct wifi_connect_req_params *)data; - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = (struct net_wifi_mgmt_offload *) dev->driver_api; @@ -72,7 +72,7 @@ static void scan_result_cb(struct net_if *iface, int status, static int wifi_scan(u32_t mgmt_request, struct net_if *iface, void *data, size_t len) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = (struct net_wifi_mgmt_offload *) dev->driver_api; @@ -89,7 +89,7 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_SCAN, wifi_scan); static int wifi_disconnect(u32_t mgmt_request, struct net_if *iface, void *data, size_t len) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = (struct net_wifi_mgmt_offload *) dev->driver_api; @@ -129,7 +129,7 @@ static int wifi_ap_enable(u32_t mgmt_request, struct net_if *iface, { struct wifi_connect_req_params *params = (struct wifi_connect_req_params *)data; - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = (struct net_wifi_mgmt_offload *) dev->driver_api; @@ -145,7 +145,7 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_ENABLE, wifi_ap_enable); static int wifi_ap_disable(u32_t mgmt_request, struct net_if *iface, void *data, size_t len) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = (struct net_wifi_mgmt_offload *) dev->driver_api; diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c index 44ba674f3437..c7c8f05dfd0e 100644 --- a/subsys/net/l2/wifi/wifi_shell.c +++ b/subsys/net/l2/wifi/wifi_shell.c @@ -326,7 +326,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands, SHELL_CMD_REGISTER(wifi, &wifi_commands, "Wifi commands", NULL); -static int wifi_shell_init(struct device *unused) +static int wifi_shell_init(const struct device *unused) { ARG_UNUSED(unused); diff --git a/subsys/net/lib/config/bt_settings.c b/subsys/net/lib/config/bt_settings.c index f98d56eaa676..558630f4dea3 100644 --- a/subsys/net/lib/config/bt_settings.c +++ b/subsys/net/lib/config/bt_settings.c @@ -33,7 +33,7 @@ BT_GATT_SERVICE_DEFINE(ipss_svc, int z_net_config_bt_setup(void) { struct net_if *iface; - struct device *dev; + const struct device *dev; int err; err = bt_enable(NULL); diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c index c4814a9940e0..26f44edb4d8e 100644 --- a/subsys/net/lib/config/ieee802154_settings.c +++ b/subsys/net/lib/config/ieee802154_settings.c @@ -33,7 +33,7 @@ int z_net_config_ieee802154_setup(void) #endif /* CONFIG_NET_L2_IEEE802154_SECURITY */ struct net_if *iface; - struct device *dev; + const struct device *dev; dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); if (!dev) { diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c index ede7c7c30459..5dc68eee82e1 100644 --- a/subsys/net/lib/config/init.c +++ b/subsys/net/lib/config/init.c @@ -418,7 +418,7 @@ int net_config_init(const char *app_info, u32_t flags, s32_t timeout) } #if defined(CONFIG_NET_CONFIG_AUTO_INIT) -static int init_app(struct device *device) +static int init_app(const struct device *device) { u32_t flags = 0U; int ret; diff --git a/subsys/net/lib/conn_mgr/conn_mgr.c b/subsys/net/lib/conn_mgr/conn_mgr.c index 7d707e7d4f7e..fc0b922a8fb0 100644 --- a/subsys/net/lib/conn_mgr/conn_mgr.c +++ b/subsys/net/lib/conn_mgr/conn_mgr.c @@ -183,7 +183,7 @@ void net_conn_mgr_resend_status(void) } } -static int conn_mgr_init(struct device *dev) +static int conn_mgr_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c index 6d6acfb60ad8..88a7c6e08237 100644 --- a/subsys/net/lib/dns/llmnr_responder.c +++ b/subsys/net/lib/dns/llmnr_responder.c @@ -651,7 +651,7 @@ static int init_listener(void) return !ok; } -static int llmnr_responder_init(struct device *device) +static int llmnr_responder_init(const struct device *device) { ARG_UNUSED(device); diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c index 59d62feffd67..66e2df7b033f 100644 --- a/subsys/net/lib/dns/mdns_responder.c +++ b/subsys/net/lib/dns/mdns_responder.c @@ -514,7 +514,7 @@ static int init_listener(void) return !ok; } -static int mdns_responder_init(struct device *device) +static int mdns_responder_init(const struct device *device) { ARG_UNUSED(device); diff --git a/subsys/net/lib/lwm2m/ipso_accelerometer.c b/subsys/net/lib/lwm2m/ipso_accelerometer.c index 27d8fa64e502..e82ffe28a8e7 100644 --- a/subsys/net/lib/lwm2m/ipso_accelerometer.c +++ b/subsys/net/lib/lwm2m/ipso_accelerometer.c @@ -142,7 +142,7 @@ static struct lwm2m_engine_obj_inst *accel_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_accel_init(struct device *dev) +static int ipso_accel_init(const struct device *dev) { accel.obj_id = IPSO_OBJECT_ACCELEROMETER_ID; accel.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_buzzer.c b/subsys/net/lib/lwm2m/ipso_buzzer.c index 5bf82966b6b4..02ecb8876219 100644 --- a/subsys/net/lib/lwm2m/ipso_buzzer.c +++ b/subsys/net/lib/lwm2m/ipso_buzzer.c @@ -243,7 +243,7 @@ static struct lwm2m_engine_obj_inst *buzzer_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_buzzer_init(struct device *dev) +static int ipso_buzzer_init(const struct device *dev) { buzzer.obj_id = IPSO_OBJECT_BUZZER_ID; buzzer.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_light_control.c b/subsys/net/lib/lwm2m/ipso_light_control.c index 442f82b6ce67..19d6e8e4d3c9 100644 --- a/subsys/net/lib/lwm2m/ipso_light_control.c +++ b/subsys/net/lib/lwm2m/ipso_light_control.c @@ -199,7 +199,7 @@ static struct lwm2m_engine_obj_inst *light_control_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_light_control_init(struct device *dev) +static int ipso_light_control_init(const struct device *dev) { light_control.obj_id = IPSO_OBJECT_LIGHT_CONTROL_ID; light_control.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_onoff_switch.c b/subsys/net/lib/lwm2m/ipso_onoff_switch.c index 170c774c81f4..f2e9df6cb3bc 100644 --- a/subsys/net/lib/lwm2m/ipso_onoff_switch.c +++ b/subsys/net/lib/lwm2m/ipso_onoff_switch.c @@ -240,7 +240,7 @@ static struct lwm2m_engine_obj_inst *switch_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_switch_init(struct device *dev) +static int ipso_switch_init(const struct device *dev) { onoff_switch.obj_id = IPSO_OBJECT_ONOFF_SWITCH_ID; onoff_switch.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_push_button.c b/subsys/net/lib/lwm2m/ipso_push_button.c index 2a4229cb4fdd..2640d41a7de8 100644 --- a/subsys/net/lib/lwm2m/ipso_push_button.c +++ b/subsys/net/lib/lwm2m/ipso_push_button.c @@ -166,7 +166,7 @@ static struct lwm2m_engine_obj_inst *button_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_button_init(struct device *dev) +static int ipso_button_init(const struct device *dev) { onoff_switch.obj_id = IPSO_OBJECT_PUSH_BUTTON_ID; onoff_switch.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_temp_sensor.c b/subsys/net/lib/lwm2m/ipso_temp_sensor.c index 09f2ab9b972f..2e327b37a808 100644 --- a/subsys/net/lib/lwm2m/ipso_temp_sensor.c +++ b/subsys/net/lib/lwm2m/ipso_temp_sensor.c @@ -232,7 +232,7 @@ static struct lwm2m_engine_obj_inst *temp_sensor_create(u16_t obj_inst_id) return &inst[index]; } -static int ipso_temp_sensor_init(struct device *dev) +static int ipso_temp_sensor_init(const struct device *dev) { temp_sensor.obj_id = IPSO_OBJECT_TEMP_SENSOR_ID; temp_sensor.fields = fields; diff --git a/subsys/net/lib/lwm2m/ipso_timer.c b/subsys/net/lib/lwm2m/ipso_timer.c index 41a946c2c059..f5ac8f2ac213 100644 --- a/subsys/net/lib/lwm2m/ipso_timer.c +++ b/subsys/net/lib/lwm2m/ipso_timer.c @@ -382,7 +382,7 @@ static struct lwm2m_engine_obj_inst *timer_create(u16_t obj_inst_id) return &inst[avail]; } -static int ipso_timer_init(struct device *dev) +static int ipso_timer_init(const struct device *dev) { timer.obj_id = IPSO_OBJECT_TIMER_ID; timer.fields = fields; diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c index 306b714fdec9..130d735d5e5c 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.c +++ b/subsys/net/lib/lwm2m/lwm2m_engine.c @@ -4393,7 +4393,7 @@ int lwm2m_engine_start(struct lwm2m_ctx *client_ctx) return lwm2m_socket_start(client_ctx); } -static int lwm2m_engine_init(struct device *dev) +static int lwm2m_engine_init(const struct device *dev) { int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c index 948f328d7506..8628f995e382 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c @@ -141,7 +141,7 @@ static struct lwm2m_engine_obj_inst *connmon_create(u16_t obj_inst_id) return &inst; } -static int lwm2m_connmon_init(struct device *dev) +static int lwm2m_connmon_init(const struct device *dev) { struct lwm2m_engine_obj_inst *obj_inst = NULL; int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_device.c b/subsys/net/lib/lwm2m/lwm2m_obj_device.c index b63f106bb52d..15fba253be3c 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_device.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_device.c @@ -346,7 +346,7 @@ static struct lwm2m_engine_obj_inst *device_create(u16_t obj_inst_id) return &inst; } -static int lwm2m_device_init(struct device *dev) +static int lwm2m_device_init(const struct device *dev) { struct lwm2m_engine_obj_inst *obj_inst = NULL; int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c index e34d3db481e6..5cc14b652139 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c @@ -335,7 +335,7 @@ static struct lwm2m_engine_obj_inst *firmware_create(u16_t obj_inst_id) return &inst; } -static int lwm2m_firmware_init(struct device *dev) +static int lwm2m_firmware_init(const struct device *dev) { struct lwm2m_engine_obj_inst *obj_inst = NULL; int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_location.c b/subsys/net/lib/lwm2m/lwm2m_obj_location.c index e4f5e705224d..7a519fb381ef 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_location.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_location.c @@ -90,7 +90,7 @@ static struct lwm2m_engine_obj_inst *location_create(u16_t obj_inst_id) return &inst; } -static int ipso_location_init(struct device *dev) +static int ipso_location_init(const struct device *dev) { int ret; struct lwm2m_engine_obj_inst *obj_inst = NULL; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_security.c b/subsys/net/lib/lwm2m/lwm2m_obj_security.c index 514bca02cdc2..f2607ec26bbf 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_security.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_security.c @@ -170,7 +170,7 @@ int lwm2m_security_index_to_inst_id(int index) return inst[index].obj_inst_id; } -static int lwm2m_security_init(struct device *dev) +static int lwm2m_security_init(const struct device *dev) { struct lwm2m_engine_obj_inst *obj_inst = NULL; int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_server.c b/subsys/net/lib/lwm2m/lwm2m_obj_server.c index 91269bd6096a..f87153120231 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_server.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_server.c @@ -209,7 +209,7 @@ static struct lwm2m_engine_obj_inst *server_create(u16_t obj_inst_id) return &inst[index]; } -static int lwm2m_server_init(struct device *dev) +static int lwm2m_server_init(const struct device *dev) { struct lwm2m_engine_obj_inst *obj_inst = NULL; int ret = 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c index 5e4b6691c9f7..c353a27cec7e 100644 --- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c +++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c @@ -921,7 +921,7 @@ void lwm2m_rd_client_stop(struct lwm2m_ctx *client_ctx, LOG_INF("Stop LWM2M Client: %s", log_strdup(client.ep_name)); } -static int lwm2m_rd_client_init(struct device *dev) +static int lwm2m_rd_client_init(const struct device *dev) { return lwm2m_engine_add_service(lwm2m_rd_client_service, STATE_MACHINE_UPDATE_INTERVAL_MS); diff --git a/subsys/net/lib/openthread/platform/entropy.c b/subsys/net/lib/openthread/platform/entropy.c index 35a3d37bacb5..f9dcc39b208a 100644 --- a/subsys/net/lib/openthread/platform/entropy.c +++ b/subsys/net/lib/openthread/platform/entropy.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(net_otPlat_entropy, CONFIG_OPENTHREAD_L2_LOG_LEVEL); otError otPlatEntropyGet(uint8_t *aOutput, uint16_t aOutputLength) { /* static to obtain it once in a first call */ - static struct device *dev; + static const struct device *dev; int err; if ((aOutput == NULL) || (aOutputLength == 0)) { diff --git a/subsys/net/lib/openthread/platform/flash.c b/subsys/net/lib/openthread/platform/flash.c index cf0cc9052774..f96fb6c2fc91 100644 --- a/subsys/net/lib/openthread/platform/flash.c +++ b/subsys/net/lib/openthread/platform/flash.c @@ -9,7 +9,7 @@ #include "platform-zephyr.h" -static struct device *flash_dev; +static const struct device *flash_dev; static size_t ot_flash_size; static size_t ot_flash_offset; diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c index a6490c02bd72..fd55b4b2900a 100644 --- a/subsys/net/lib/openthread/platform/radio.c +++ b/subsys/net/lib/openthread/platform/radio.c @@ -67,7 +67,7 @@ static u8_t ack_psdu[ACK_PKT_LENGTH]; static struct net_pkt *tx_pkt; static struct net_buf *tx_payload; -static struct device *radio_dev; +static const struct device *radio_dev; static struct ieee802154_radio_api *radio_api; static s8_t tx_power; @@ -106,7 +106,7 @@ static inline void clear_pending_events(void) atomic_clear(pending_events); } -void energy_detected(struct device *dev, s16_t max_ed) +void energy_detected(const struct device *dev, s16_t max_ed) { if (dev == radio_dev) { energy_detected_value = max_ed; @@ -146,7 +146,7 @@ enum net_verdict ieee802154_radio_handle_ack(struct net_if *iface, return NET_OK; } -void handle_radio_event(struct device *dev, enum ieee802154_event evt, +void handle_radio_event(const struct device *dev, enum ieee802154_event evt, void *event_params) { ARG_UNUSED(event_params); @@ -497,7 +497,7 @@ otRadioFrame *otPlatRadioGetTransmitBuffer(otInstance *aInstance) return &sTransmitFrame; } -static void get_rssi_energy_detected(struct device *dev, s16_t max_ed) +static void get_rssi_energy_detected(const struct device *dev, s16_t max_ed) { ARG_UNUSED(dev); energy_detected_value = max_ed; diff --git a/subsys/net/lib/openthread/platform/uart.c b/subsys/net/lib/openthread/platform/uart.c index 86ca768409ba..361fcdc4ac72 100644 --- a/subsys/net/lib/openthread/platform/uart.c +++ b/subsys/net/lib/openthread/platform/uart.c @@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); struct openthread_uart { struct ring_buf *tx_ringbuf; struct ring_buf *rx_ringbuf; - struct device *dev; + const struct device *dev; atomic_t tx_busy; atomic_t tx_finished; }; diff --git a/subsys/net/lib/sockets/sockets_can.c b/subsys/net/lib/sockets/sockets_can.c index b652bfe29e87..6ee00f666f69 100644 --- a/subsys/net/lib/sockets/sockets_can.c +++ b/subsys/net/lib/sockets/sockets_can.c @@ -367,7 +367,7 @@ static int close_socket(struct net_context *ctx) { const struct canbus_api *api; struct net_if *iface; - struct device *dev; + const struct device *dev; iface = net_context_get_iface(ctx); dev = net_if_get_device(iface); @@ -482,7 +482,7 @@ static int can_sock_getsockopt_vmeth(void *obj, int level, int optname, if (level == SOL_CAN_RAW) { const struct canbus_api *api; struct net_if *iface; - struct device *dev; + const struct device *dev; if (optval == NULL) { errno = EINVAL; @@ -591,7 +591,7 @@ static int can_sock_setsockopt_vmeth(void *obj, int level, int optname, { const struct canbus_api *api; struct net_if *iface; - struct device *dev; + const struct device *dev; int ret; if (level != SOL_CAN_RAW) { diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c index ecb5d21d7198..b152c4d840d7 100644 --- a/subsys/net/lib/sockets/sockets_tls.c +++ b/subsys/net/lib/sockets/sockets_tls.c @@ -251,13 +251,13 @@ static int dtls_timing_get_delay(void *data) #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ /* Initialize TLS internals. */ -static int tls_init(struct device *unused) +static int tls_init(const struct device *unused) { ARG_UNUSED(unused); int ret; static const unsigned char drbg_seed[] = "zephyr"; - struct device *dev = NULL; + const struct device *dev = NULL; #if defined(CONFIG_ENTROPY_HAS_DRIVER) dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL); diff --git a/subsys/net/lib/tls_credentials/tls_credentials.c b/subsys/net/lib/tls_credentials/tls_credentials.c index 61f7144f1594..aa47cdc67530 100644 --- a/subsys/net/lib/tls_credentials/tls_credentials.c +++ b/subsys/net/lib/tls_credentials/tls_credentials.c @@ -16,7 +16,7 @@ static struct tls_credential credentials[CONFIG_TLS_MAX_CREDENTIALS_NUMBER]; /* A mutex for protecting access to the credentials array. */ static struct k_mutex credential_lock; -static int credentials_init(struct device *unused) +static int credentials_init(const struct device *unused) { (void)memset(credentials, 0, sizeof(credentials)); diff --git a/subsys/power/device.c b/subsys/power/device.c index e0c673924b15..735850e3d2ec 100644 --- a/subsys/power/device.c +++ b/subsys/power/device.c @@ -51,7 +51,7 @@ typedef u16_t device_idx_t; #define DEVICE_IDX_MAX ((device_idx_t)(-1)) /* An array of all devices in the application. */ -static struct device *all_devices; +static const struct device *all_devices; /* Indexes into all_devices for devices that support pm, * in dependency order (later may depend on earlier). @@ -88,7 +88,7 @@ static int _sys_pm_devices(u32_t state) for (int i = num_pm - 1; i >= 0; i--) { device_idx_t idx = pm_devices[i]; - struct device *dev = &all_devices[idx]; + const struct device *dev = &all_devices[idx]; int rc; /* TODO: Improve the logic by checking device status diff --git a/subsys/power/device_pm.c b/subsys/power/device_pm.c index 5b46282cc556..ed7cf6969a52 100644 --- a/subsys/power/device_pm.c +++ b/subsys/power/device_pm.c @@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(power); #define DEVICE_PM_SYNC (0 << 0) #define DEVICE_PM_ASYNC (1 << 0) -static void device_pm_callback(struct device *dev, +static void device_pm_callback(const struct device *dev, int retval, void *context, void *arg) { __ASSERT(retval == 0, "Device set power state failed"); @@ -38,7 +38,7 @@ static void pm_work_handler(struct k_work *work) { struct device_pm *pm = CONTAINER_OF(work, struct device_pm, work); - struct device *dev = pm->dev; + const struct device *dev = pm->dev; int ret = 0; u8_t pm_state; @@ -85,7 +85,7 @@ static void pm_work_handler(struct k_work *work) k_poll_signal_raise(&dev->pm->signal, pm_state); } -static int device_pm_request(struct device *dev, +static int device_pm_request(const struct device *dev, u32_t target_state, u32_t pm_flags) { int result, signaled = 0; @@ -125,29 +125,29 @@ static int device_pm_request(struct device *dev, return result == target_state ? 0 : -EIO; } -int device_pm_get(struct device *dev) +int device_pm_get(const struct device *dev) { return device_pm_request(dev, DEVICE_PM_ACTIVE_STATE, DEVICE_PM_ASYNC); } -int device_pm_get_sync(struct device *dev) +int device_pm_get_sync(const struct device *dev) { return device_pm_request(dev, DEVICE_PM_ACTIVE_STATE, 0); } -int device_pm_put(struct device *dev) +int device_pm_put(const struct device *dev) { return device_pm_request(dev, DEVICE_PM_SUSPEND_STATE, DEVICE_PM_ASYNC); } -int device_pm_put_sync(struct device *dev) +int device_pm_put_sync(const struct device *dev) { return device_pm_request(dev, DEVICE_PM_SUSPEND_STATE, 0); } -void device_pm_enable(struct device *dev) +void device_pm_enable(const struct device *dev) { k_sem_take(&dev->pm->lock, K_FOREVER); dev->pm->enable = true; @@ -167,7 +167,7 @@ void device_pm_enable(struct device *dev) k_sem_give(&dev->pm->lock); } -void device_pm_disable(struct device *dev) +void device_pm_disable(const struct device *dev) { k_sem_take(&dev->pm->lock, K_FOREVER); dev->pm->enable = false; diff --git a/subsys/power/power.c b/subsys/power/power.c index 6243d9479b5c..d01103aa3468 100644 --- a/subsys/power/power.c +++ b/subsys/power/power.c @@ -192,7 +192,7 @@ void _sys_resume(void) } #if CONFIG_DEVICE_POWER_MANAGEMENT -static int sys_pm_init(struct device *dev) +static int sys_pm_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/subsys/random/rand32_ctr_drbg.c b/subsys/random/rand32_ctr_drbg.c index 67d682707793..89975d39e155 100644 --- a/subsys/random/rand32_ctr_drbg.c +++ b/subsys/random/rand32_ctr_drbg.c @@ -28,7 +28,7 @@ static K_SEM_DEFINE(state_sem, 1, 1); -static struct device *entropy_driver; +static const struct device *entropy_driver; static const unsigned char drbg_seed[] = CONFIG_CS_CTR_DRBG_PERSONALIZATION; #if defined(CONFIG_MBEDTLS) diff --git a/subsys/random/rand32_entropy_device.c b/subsys/random/rand32_entropy_device.c index 3f1b531c9d50..1233e773892d 100644 --- a/subsys/random/rand32_entropy_device.c +++ b/subsys/random/rand32_entropy_device.c @@ -9,12 +9,12 @@ #include #include -static struct device *entropy_driver; +static const struct device *entropy_driver; #if defined(CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR) u32_t sys_rand32_get(void) { - struct device *dev = entropy_driver; + const struct device *dev = entropy_driver; u32_t random_num; int ret; @@ -48,7 +48,7 @@ u32_t sys_rand32_get(void) static int rand_get(u8_t *dst, size_t outlen, bool csrand) { - struct device *dev = entropy_driver; + const struct device *dev = entropy_driver; u32_t random_num; int ret; diff --git a/subsys/random/rand32_xoroshiro128.c b/subsys/random/rand32_xoroshiro128.c index 32506d4c1249..509f73c0456f 100644 --- a/subsys/random/rand32_xoroshiro128.c +++ b/subsys/random/rand32_xoroshiro128.c @@ -50,7 +50,7 @@ static inline u64_t rotl(const u64_t x, int k) return (x << k) | (x >> (64 - k)); } -static int xoroshiro128_initialize(struct device *dev) +static int xoroshiro128_initialize(const struct device *dev) { dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL); if (!dev) { diff --git a/subsys/shell/modules/device_service.c b/subsys/shell/modules/device_service.c index d9cdace82d7d..10148ac0d852 100644 --- a/subsys/shell/modules/device_service.c +++ b/subsys/shell/modules/device_service.c @@ -21,7 +21,7 @@ extern struct device __device_end[]; extern struct device __device_SMP_start[]; #endif -static struct device *levels[] = { +static const struct device *levels[] = { __device_PRE_KERNEL_1_start, __device_PRE_KERNEL_2_start, __device_POST_KERNEL_start, @@ -35,11 +35,11 @@ static struct device *levels[] = { static bool device_get_config_level(const struct shell *shell, int level) { - struct device *dev; + const struct device *dev; bool devices = false; for (dev = levels[level]; dev < levels[level+1]; dev++) { - if (dev->driver_api != NULL) { + if (dev->driver_context->init_ok) { devices = true; shell_fprintf(shell, SHELL_NORMAL, "- %s\n", dev->name); @@ -85,7 +85,7 @@ static int cmd_device_levels(const struct shell *shell, static int cmd_device_list(const struct shell *shell, size_t argc, char **argv) { - struct device *dev; + const struct device *dev; ARG_UNUSED(argc); ARG_UNUSED(argv); diff --git a/subsys/shell/shell_dummy.c b/subsys/shell/shell_dummy.c index bb302399634d..342143bf9716 100644 --- a/subsys/shell/shell_dummy.c +++ b/subsys/shell/shell_dummy.c @@ -98,7 +98,7 @@ const struct shell_transport_api shell_dummy_transport_api = { .read = read }; -static int enable_shell_dummy(struct device *arg) +static int enable_shell_dummy(const struct device *arg) { ARG_UNUSED(arg); shell_init(&shell_dummy, NULL, true, true, LOG_LEVEL_INF); diff --git a/subsys/shell/shell_rtt.c b/subsys/shell/shell_rtt.c index 1caea172886a..f141e57b4b64 100644 --- a/subsys/shell/shell_rtt.c +++ b/subsys/shell/shell_rtt.c @@ -103,7 +103,7 @@ const struct shell_transport_api shell_rtt_transport_api = { .read = read }; -static int enable_shell_rtt(struct device *arg) +static int enable_shell_rtt(const struct device *arg) { ARG_UNUSED(arg); bool log_backend = CONFIG_SHELL_RTT_INIT_LOG_LEVEL > 0; diff --git a/subsys/shell/shell_telnet.c b/subsys/shell/shell_telnet.c index 346229f7359c..f90af9a23c7c 100644 --- a/subsys/shell/shell_telnet.c +++ b/subsys/shell/shell_telnet.c @@ -485,7 +485,7 @@ const struct shell_transport_api shell_telnet_transport_api = { .read = read }; -static int enable_shell_telnet(struct device *arg) +static int enable_shell_telnet(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/shell/shell_uart.c b/subsys/shell/shell_uart.c index 6e5422ed5f6f..3d4f6a8310f0 100644 --- a/subsys/shell/shell_uart.c +++ b/subsys/shell/shell_uart.c @@ -95,7 +95,7 @@ static void uart_rx_handle(const struct shell_uart *sh_uart) static void uart_tx_handle(const struct shell_uart *sh_uart) { - struct device *dev = sh_uart->ctrl_blk->dev; + const struct device *dev = sh_uart->ctrl_blk->dev; u32_t len; int err; const u8_t *data; @@ -118,7 +118,7 @@ static void uart_tx_handle(const struct shell_uart *sh_uart) static void uart_callback(void *user_data) { const struct shell_uart *sh_uart = (struct shell_uart *)user_data; - struct device *dev = sh_uart->ctrl_blk->dev; + const struct device *dev = sh_uart->ctrl_blk->dev; uart_irq_update(dev); @@ -135,7 +135,7 @@ static void uart_callback(void *user_data) static void uart_irq_init(const struct shell_uart *sh_uart) { #ifdef CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN - struct device *dev = sh_uart->ctrl_blk->dev; + const struct device *dev = sh_uart->ctrl_blk->dev; uart_irq_callback_user_data_set(dev, uart_callback, (void *)sh_uart); uart_irq_rx_enable(dev); @@ -164,7 +164,7 @@ static int init(const struct shell_transport *transport, { const struct shell_uart *sh_uart = (struct shell_uart *)transport->ctx; - sh_uart->ctrl_blk->dev = (struct device *)config; + sh_uart->ctrl_blk->dev = (const struct device *)config; sh_uart->ctrl_blk->handler = evt_handler; sh_uart->ctrl_blk->context = context; @@ -264,10 +264,10 @@ const struct shell_transport_api shell_uart_transport_api = { #endif /* CONFIG_MCUMGR_SMP_SHELL */ }; -static int enable_shell_uart(struct device *arg) +static int enable_shell_uart(const struct device *arg) { ARG_UNUSED(arg); - struct device *dev = + const struct device *dev = device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME); bool log_backend = CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > 0; u32_t level = diff --git a/subsys/storage/flash_map/flash_map.c b/subsys/storage/flash_map/flash_map.c index 9f3c9053b835..21748687e1c9 100644 --- a/subsys/storage/flash_map/flash_map.c +++ b/subsys/storage/flash_map/flash_map.c @@ -118,7 +118,7 @@ static bool should_bail(const struct flash_pages_info *info, static int flash_area_layout(int idx, u32_t *cnt, void *ret, flash_page_cb cb, struct layout_data *cb_data) { - struct device *flash_dev; + const struct device *flash_dev; cb_data->area_idx = idx; @@ -180,7 +180,7 @@ int flash_area_get_sectors(int idx, u32_t *cnt, struct flash_sector *ret) int flash_area_read(const struct flash_area *fa, off_t off, void *dst, size_t len) { - struct device *dev; + const struct device *dev; if (!is_in_flash_area_bounds(fa, off, len)) { return -EINVAL; @@ -194,7 +194,7 @@ int flash_area_read(const struct flash_area *fa, off_t off, void *dst, int flash_area_write(const struct flash_area *fa, off_t off, const void *src, size_t len) { - struct device *flash_dev; + const struct device *flash_dev; int rc; if (!is_in_flash_area_bounds(fa, off, len)) { @@ -218,7 +218,7 @@ int flash_area_write(const struct flash_area *fa, off_t off, const void *src, int flash_area_erase(const struct flash_area *fa, off_t off, size_t len) { - struct device *flash_dev; + const struct device *flash_dev; int rc; if (!is_in_flash_area_bounds(fa, off, len)) { @@ -242,7 +242,7 @@ int flash_area_erase(const struct flash_area *fa, off_t off, size_t len) u8_t flash_area_align(const struct flash_area *fa) { - struct device *dev; + const struct device *dev; dev = device_get_binding(fa->fa_dev_name); @@ -258,7 +258,7 @@ int flash_area_has_driver(const struct flash_area *fa) return 1; } -struct device *flash_area_get_device(const struct flash_area *fa) +const struct device *flash_area_get_device(const struct flash_area *fa) { return device_get_binding(fa->fa_dev_name); } diff --git a/subsys/storage/stream/stream_flash.c b/subsys/storage/stream/stream_flash.c index 86e122882260..b51ee4dce1d1 100644 --- a/subsys/storage/stream/stream_flash.c +++ b/subsys/storage/stream/stream_flash.c @@ -155,7 +155,7 @@ size_t stream_flash_bytes_written(struct stream_flash_ctx *ctx) return ctx->bytes_written; } -int stream_flash_init(struct stream_flash_ctx *ctx, struct device *fdev, +int stream_flash_init(struct stream_flash_ctx *ctx, const struct device *fdev, u8_t *buf, size_t buf_len, size_t offset, size_t size, stream_flash_callback_t cb) { diff --git a/subsys/tracing/cpu_stats.c b/subsys/tracing/cpu_stats.c index ba9ee044f0f3..382435589d11 100644 --- a/subsys/tracing/cpu_stats.c +++ b/subsys/tracing/cpu_stats.c @@ -163,7 +163,7 @@ static void cpu_stats_log_fn(struct k_work *item) CONFIG_TRACING_CPU_STATS_INTERVAL); } -static int cpu_stats_log_init(struct device *dev) +static int cpu_stats_log_init(const struct device *dev) { k_delayed_work_init(&cpu_stats_log, cpu_stats_log_fn); k_delayed_work_submit(&cpu_stats_log, diff --git a/subsys/tracing/sysview/sysview.c b/subsys/tracing/sysview/sysview.c index 632e340ccd92..121aaaa5d955 100644 --- a/subsys/tracing/sysview/sysview.c +++ b/subsys/tracing/sysview/sysview.c @@ -98,7 +98,7 @@ const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI = { }; -static int sysview_init(struct device *arg) +static int sysview_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/tracing/tracing_backend_uart.c b/subsys/tracing/tracing_backend_uart.c index 80beb7d2fd27..aafda4557a5e 100644 --- a/subsys/tracing/tracing_backend_uart.c +++ b/subsys/tracing/tracing_backend_uart.c @@ -14,10 +14,10 @@ #include #include -static struct device *dev; +static const struct device *dev; #ifdef CONFIG_TRACING_HANDLE_HOST_CMD -static void uart_isr(struct device *dev) +static void uart_isr(const struct device *dev) { int rx; u8_t byte; diff --git a/subsys/tracing/tracing_core.c b/subsys/tracing/tracing_core.c index bc5ca021965a..4e7dea3378d4 100644 --- a/subsys/tracing/tracing_core.c +++ b/subsys/tracing/tracing_core.c @@ -80,7 +80,7 @@ static void tracing_set_state(enum tracing_state state) atomic_set(&tracing_state, state); } -static int tracing_init(struct device *arg) +static int tracing_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/usb/class/audio/audio.c b/subsys/usb/class/audio/audio.c index 54f90f9c0d11..92942f19db3c 100644 --- a/subsys/usb/class/audio/audio.c +++ b/subsys/usb/class/audio/audio.c @@ -775,7 +775,7 @@ static int audio_class_handle_req(struct usb_setup_packet *pSetup, } } -static int usb_audio_device_init(struct device *dev) +static int usb_audio_device_init(const struct device *dev) { LOG_DBG("Init Audio Device: dev %p (%s)", dev, dev->name); @@ -897,7 +897,7 @@ static void audio_receive_cb(u8_t ep, enum usb_dc_ep_cb_status_code status) } } -void usb_audio_register(struct device *dev, +void usb_audio_register(const struct device *dev, const struct usb_audio_ops *ops) { struct usb_audio_dev_data *audio_dev_data = dev->driver_data; diff --git a/subsys/usb/class/bluetooth.c b/subsys/usb/class/bluetooth.c index 2bf0e12e5017..4159badcd68f 100644 --- a/subsys/usb/class/bluetooth.c +++ b/subsys/usb/class/bluetooth.c @@ -333,7 +333,7 @@ USBD_CFG_DATA_DEFINE(primary, hci) struct usb_cfg_data bluetooth_config = { .endpoint = bluetooth_ep_data, }; -static int bluetooth_init(struct device *dev) +static int bluetooth_init(const struct device *dev) { int ret; diff --git a/subsys/usb/class/bt_h4.c b/subsys/usb/class/bt_h4.c index bd1bab856bd2..21f639a1ea2c 100644 --- a/subsys/usb/class/bt_h4.c +++ b/subsys/usb/class/bt_h4.c @@ -221,7 +221,7 @@ USBD_CFG_DATA_DEFINE(primary, hci_h4) struct usb_cfg_data bt_h4_config = { .endpoint = bt_h4_ep_data, }; -static int bt_h4_init(struct device *dev) +static int bt_h4_init(const struct device *dev) { int ret; diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c index 689dbdb1fa61..71282554e2b0 100644 --- a/subsys/usb/class/cdc_acm.c +++ b/subsys/usb/class/cdc_acm.c @@ -287,7 +287,7 @@ static void tx_work_handler(struct k_work *work) { struct cdc_acm_dev_data_t *dev_data = CONTAINER_OF(work, struct cdc_acm_dev_data_t, tx_work); - struct device *dev = dev_data->common.dev; + const struct device *dev = dev_data->common.dev; struct usb_cfg_data *cfg = (void *)dev->config_info; u8_t ep = cfg->endpoint[ACM_IN_EP_IDX].ep_addr; u8_t *data; @@ -399,7 +399,7 @@ static void cdc_acm_do_cb(struct cdc_acm_dev_data_t *dev_data, enum usb_dc_status_code status, const u8_t *param) { - struct device *dev = dev_data->common.dev; + const struct device *dev = dev_data->common.dev; struct usb_cfg_data *cfg = (void *)dev->config_info; /* Store the new status */ @@ -513,7 +513,7 @@ static void cdc_acm_irq_callback_work_handler(struct k_work *work) * * @return 0 always. */ -static int cdc_acm_init(struct device *dev) +static int cdc_acm_init(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); int ret = 0; @@ -540,7 +540,7 @@ static int cdc_acm_init(struct device *dev) * * @return Number of bytes sent. */ -static int cdc_acm_fifo_fill(struct device *dev, +static int cdc_acm_fifo_fill(const struct device *dev, const u8_t *tx_data, int len) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -576,7 +576,8 @@ static int cdc_acm_fifo_fill(struct device *dev, * * @return Number of bytes read. */ -static int cdc_acm_fifo_read(struct device *dev, u8_t *rx_data, const int size) +static int cdc_acm_fifo_read(const struct device *dev, u8_t *rx_data, + const int size) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); u32_t len; @@ -600,7 +601,7 @@ static int cdc_acm_fifo_read(struct device *dev, u8_t *rx_data, const int size) * * @return N/A. */ -static void cdc_acm_irq_tx_enable(struct device *dev) +static void cdc_acm_irq_tx_enable(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -618,7 +619,7 @@ static void cdc_acm_irq_tx_enable(struct device *dev) * * @return N/A. */ -static void cdc_acm_irq_tx_disable(struct device *dev) +static void cdc_acm_irq_tx_disable(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -632,7 +633,7 @@ static void cdc_acm_irq_tx_disable(struct device *dev) * * @return 1 if a Tx IRQ is pending, 0 otherwise. */ -static int cdc_acm_irq_tx_ready(struct device *dev) +static int cdc_acm_irq_tx_ready(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -650,7 +651,7 @@ static int cdc_acm_irq_tx_ready(struct device *dev) * * @return N/A */ -static void cdc_acm_irq_rx_enable(struct device *dev) +static void cdc_acm_irq_rx_enable(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -668,7 +669,7 @@ static void cdc_acm_irq_rx_enable(struct device *dev) * * @return N/A. */ -static void cdc_acm_irq_rx_disable(struct device *dev) +static void cdc_acm_irq_rx_disable(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -682,7 +683,7 @@ static void cdc_acm_irq_rx_disable(struct device *dev) * * @return 1 if an IRQ is ready, 0 otherwise. */ -static int cdc_acm_irq_rx_ready(struct device *dev) +static int cdc_acm_irq_rx_ready(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -700,7 +701,7 @@ static int cdc_acm_irq_rx_ready(struct device *dev) * * @return 1 if a Tx or Rx IRQ is pending, 0 otherwise. */ -static int cdc_acm_irq_is_pending(struct device *dev) +static int cdc_acm_irq_is_pending(const struct device *dev) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -720,7 +721,7 @@ static int cdc_acm_irq_is_pending(struct device *dev) * * @return Always 1 */ -static int cdc_acm_irq_update(struct device *dev) +static int cdc_acm_irq_update(const struct device *dev) { ARG_UNUSED(dev); @@ -735,7 +736,7 @@ static int cdc_acm_irq_update(struct device *dev) * * @return N/A */ -static void cdc_acm_irq_callback_set(struct device *dev, +static void cdc_acm_irq_callback_set(const struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { @@ -757,7 +758,7 @@ static void cdc_acm_irq_callback_set(struct device *dev, * * @return N/A. */ -static void cdc_acm_baudrate_set(struct device *dev, u32_t baudrate) +static void cdc_acm_baudrate_set(const struct device *dev, u32_t baudrate) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -775,7 +776,8 @@ static void cdc_acm_baudrate_set(struct device *dev, u32_t baudrate) * * @return N/A. */ -static int cdc_acm_send_notification(struct device *dev, u16_t serial_state) +static int cdc_acm_send_notification(const struct device *dev, + u16_t serial_state) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); struct usb_cfg_data * const cfg = (void *)dev->config_info; @@ -816,7 +818,7 @@ static int cdc_acm_send_notification(struct device *dev, u16_t serial_state) * * @return 0 if successful, failed otherwise. */ -static int cdc_acm_line_ctrl_set(struct device *dev, +static int cdc_acm_line_ctrl_set(const struct device *dev, u32_t ctrl, u32_t val) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -897,7 +899,7 @@ static int cdc_acm_line_ctrl_set(struct device *dev, * * @return 0 if successful, failed otherwise. */ -static int cdc_acm_line_ctrl_get(struct device *dev, +static int cdc_acm_line_ctrl_get(const struct device *dev, u32_t ctrl, u32_t *val) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); @@ -929,7 +931,7 @@ static int cdc_acm_line_ctrl_get(struct device *dev, * exported by CDC ACM driver. Apps should use fifo_read API instead. */ -static int cdc_acm_poll_in(struct device *dev, unsigned char *c) +static int cdc_acm_poll_in(const struct device *dev, unsigned char *c) { ARG_UNUSED(dev); ARG_UNUSED(c); @@ -943,7 +945,7 @@ static int cdc_acm_poll_in(struct device *dev, unsigned char *c) * The UART poll method for USB UART is simulated by waiting till * we get the next BULK In upcall from the USB device controller or 100 ms. */ -static void cdc_acm_poll_out(struct device *dev, +static void cdc_acm_poll_out(const struct device *dev, unsigned char c) { cdc_acm_fifo_fill(dev, &c, 1); diff --git a/subsys/usb/class/hid/core.c b/subsys/usb/class/hid/core.c index cffbc513ccca..c4b963b04127 100644 --- a/subsys/usb/class/hid/core.c +++ b/subsys/usb/class/hid/core.c @@ -657,7 +657,7 @@ int usb_hid_init(const struct device *dev) return 0; } -void usb_hid_register_device(struct device *dev, const u8_t *desc, +void usb_hid_register_device(const struct device *dev, const u8_t *desc, size_t size, const struct hid_ops *ops) { struct hid_device_info *dev_data = dev->driver_data; @@ -700,7 +700,7 @@ static const struct usb_hid_device_api { void (*init)(void); } hid_api; -static int usb_hid_device_init(struct device *dev) +static int usb_hid_device_init(const struct device *dev) { LOG_DBG("Init HID Device: dev %p (%s)", dev, dev->name); diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c index 7485d907a5ea..3f35b842a639 100644 --- a/subsys/usb/class/mass_storage.c +++ b/subsys/usb/class/mass_storage.c @@ -946,7 +946,7 @@ static void mass_thread_main(int arg1, int unused) * * @return negative errno code on fatal failure, 0 otherwise */ -static int mass_storage_init(struct device *dev) +static int mass_storage_init(const struct device *dev) { u32_t block_size = 0U; diff --git a/subsys/usb/class/netusb/function_rndis.c b/subsys/usb/class/netusb/function_rndis.c index fdf94fae9790..538e014b9452 100644 --- a/subsys/usb/class/netusb/function_rndis.c +++ b/subsys/usb/class/netusb/function_rndis.c @@ -1075,7 +1075,7 @@ static struct usb_os_descriptor os_desc = { }; #endif /* CONFIG_USB_DEVICE_OS_DESC */ -static int rndis_init(struct device *arg) +static int rndis_init(const struct device *arg) { ARG_UNUSED(arg); diff --git a/subsys/usb/class/netusb/netusb.c b/subsys/usb/class/netusb/netusb.c index 6bdb9acd1087..e06a5f3920d0 100644 --- a/subsys/usb/class/netusb/netusb.c +++ b/subsys/usb/class/netusb/netusb.c @@ -26,7 +26,7 @@ static struct __netusb { const struct netusb_function *func; } netusb; -static int netusb_send(struct device *dev, struct net_pkt *pkt) +static int netusb_send(const struct device *dev, struct net_pkt *pkt) { int ret; @@ -154,7 +154,7 @@ static const struct ethernet_api netusb_api_funcs = { .send = netusb_send, }; -static int netusb_init_dev(struct device *dev) +static int netusb_init_dev(const struct device *dev) { ARG_UNUSED(dev); return 0; diff --git a/subsys/usb/class/usb_dfu.c b/subsys/usb/class/usb_dfu.c index 935d69acd5fb..5757c667de91 100644 --- a/subsys/usb/class/usb_dfu.c +++ b/subsys/usb/class/usb_dfu.c @@ -761,7 +761,7 @@ static void dfu_work_handler(struct k_work *item) } } -static int usb_dfu_init(struct device *dev) +static int usb_dfu_init(const struct device *dev) { const struct flash_area *fa; diff --git a/subsys/usb/usb_descriptor.c b/subsys/usb/usb_descriptor.c index 14507080e385..72d61040003d 100644 --- a/subsys/usb/usb_descriptor.c +++ b/subsys/usb/usb_descriptor.c @@ -484,7 +484,7 @@ struct usb_dev_data *usb_get_dev_data_by_cfg(sys_slist_t *list, struct usb_dev_data *dev_data; SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { - struct device *dev = dev_data->dev; + const struct device *dev = dev_data->dev; const struct usb_cfg_data *cfg_cur = dev->config_info; if (cfg_cur == cfg) { @@ -503,7 +503,7 @@ struct usb_dev_data *usb_get_dev_data_by_iface(sys_slist_t *list, struct usb_dev_data *dev_data; SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { - struct device *dev = dev_data->dev; + const struct device *dev = dev_data->dev; const struct usb_cfg_data *cfg = dev->config_info; const struct usb_if_descriptor *if_desc = cfg->interface_descriptor; @@ -523,7 +523,7 @@ struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, u8_t ep) struct usb_dev_data *dev_data; SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { - struct device *dev = dev_data->dev; + const struct device *dev = dev_data->dev; const struct usb_cfg_data *cfg = dev->config_info; const struct usb_ep_cfg_data *ep_data = cfg->endpoint; diff --git a/subsys/usb/usb_descriptor.h b/subsys/usb/usb_descriptor.h index 96f0e80a44b2..ce1b00266e30 100644 --- a/subsys/usb/usb_descriptor.h +++ b/subsys/usb/usb_descriptor.h @@ -39,7 +39,7 @@ /* Common part of device data */ struct usb_dev_data { - struct device *dev; + const struct device *dev; sys_snode_t node; }; diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c index 8707ef725280..a327e88d20a9 100644 --- a/subsys/usb/usb_device.c +++ b/subsys/usb/usb_device.c @@ -1050,7 +1050,7 @@ static int usb_vbus_set(bool on) #if DT_NODE_HAS_STATUS(USB_DEV_NODE, okay) && \ DT_NODE_HAS_PROP(USB_DEV_NODE, vbus_gpios) int ret = 0; - struct device *gpio_dev; + const struct device *gpio_dev; gpio_dev = device_get_binding(DT_LABEL(USB_DEV_NODE)); if (!gpio_dev) { @@ -1419,7 +1419,7 @@ int usb_enable(usb_dc_status_callback status_cb) * This function configures the USB device stack based on USB descriptor and * usb_cfg_data. */ -static int usb_device_init(struct device *dev) +static int usb_device_init(const struct device *dev) { u8_t *device_descriptor; diff --git a/tests/application_development/cpp/src/main.cpp b/tests/application_development/cpp/src/main.cpp index 5505ef6b5ff4..641c8232b502 100644 --- a/tests/application_development/cpp/src/main.cpp +++ b/tests/application_development/cpp/src/main.cpp @@ -50,7 +50,7 @@ static struct foo foos[5]; BUILD_ASSERT(ARRAY_SIZE(foos) == 5, "expected 5 elements"); /* Check that SYS_INIT() compiles. */ -static int test_init(struct device *dev) +static int test_init(const struct device *dev) { return 0; } diff --git a/tests/arch/x86/info/src/timer.c b/tests/arch/x86/info/src/timer.c index e85e790e0020..699135763cc2 100644 --- a/tests/arch/x86/info/src/timer.c +++ b/tests/arch/x86/info/src/timer.c @@ -9,7 +9,7 @@ #define NR_SAMPLES 10 /* sample timer 10 times */ -static u32_t sync(struct device *cmos) +static u32_t sync(const struct device *cmos) { u32_t this, last; int err; @@ -34,7 +34,7 @@ static u32_t sync(struct device *cmos) void timer(void) { - struct device *cmos; + const struct device *cmos; #if defined(CONFIG_LOAPIC_TIMER) printk("TIMER: legacy local APIC"); diff --git a/tests/bluetooth/mesh/src/microbit.c b/tests/bluetooth/mesh/src/microbit.c index f34bd37a6c30..f02a3231206f 100644 --- a/tests/bluetooth/mesh/src/microbit.c +++ b/tests/bluetooth/mesh/src/microbit.c @@ -15,9 +15,9 @@ #include "board.h" static u32_t oob_number; -static struct device *gpio; +static const struct device *gpio; -static void button_pressed(struct device *dev, struct gpio_callback *cb, +static void button_pressed(const struct device *dev, struct gpio_callback *cb, u32_t pins) { struct mb_display *disp = mb_display_get(); diff --git a/tests/boards/altera_max10/i2c_master/src/i2c_master.c b/tests/boards/altera_max10/i2c_master/src/i2c_master.c index 874c87f72690..f6a0db384a13 100644 --- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c +++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c @@ -28,7 +28,7 @@ #define ADV7513_WRITE_TEST_REG 0x2 #define WRITE_TEST_VAL 0x66 -static int powerup_adv7513(struct device *i2c_dev) +static int powerup_adv7513(const struct device *i2c_dev) { u8_t data; @@ -65,7 +65,7 @@ static int powerup_adv7513(struct device *i2c_dev) static int test_i2c_adv7513(void) { - struct device *i2c_dev = device_get_binding(DT_LABEL(DT_INST(0, nios2_i2c))); + const struct device *i2c_dev = device_get_binding(DT_LABEL(DT_INST(0, nios2_i2c))); u32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER; u8_t data; diff --git a/tests/boards/altera_max10/msgdma/src/dma.c b/tests/boards/altera_max10/msgdma/src/dma.c index 2d5e0d9a0b36..15d19180c514 100644 --- a/tests/boards/altera_max10/msgdma/src/dma.c +++ b/tests/boards/altera_max10/msgdma/src/dma.c @@ -39,7 +39,7 @@ static void dma_user_callback(void *arg, u32_t id, int error_code) void test_msgdma(void) { - struct device *dma; + const struct device *dma; static u32_t chan_id; int i; diff --git a/tests/boards/altera_max10/qspi/src/qspi_flash.c b/tests/boards/altera_max10/qspi/src/qspi_flash.c index 4494f913d256..fb4da21f741b 100644 --- a/tests/boards/altera_max10/qspi/src/qspi_flash.c +++ b/tests/boards/altera_max10/qspi/src/qspi_flash.c @@ -17,7 +17,7 @@ void test_qspi_flash(void) { - struct device *flash_dev; + const struct device *flash_dev; u32_t i, offset, rd_val, wr_val; u8_t wr_buf[4] = {0xAA, 0xBB, 0xCC, 0xDD}; u8_t rd_buf[2]; diff --git a/tests/boards/intel_s1000_crb/main/src/dma_test.c b/tests/boards/intel_s1000_crb/main/src/dma_test.c index 3ee3fb73f972..86fb43979af4 100644 --- a/tests/boards/intel_s1000_crb/main/src/dma_test.c +++ b/tests/boards/intel_s1000_crb/main/src/dma_test.c @@ -97,7 +97,7 @@ static struct transfers transfer_blocks[MAX_TRANSFERS] = { .size = sizeof(tx_data4), }, }; -static struct device *dma_device; +static const struct device *dma_device; static u32_t current_block_count, total_block_count; static void test_done(void *arg, u32_t channel, int error_code) diff --git a/tests/boards/intel_s1000_crb/main/src/gpio_test.c b/tests/boards/intel_s1000_crb/main/src/gpio_test.c index fe31d2edf154..ed09606cd9a8 100644 --- a/tests/boards/intel_s1000_crb/main/src/gpio_test.c +++ b/tests/boards/intel_s1000_crb/main/src/gpio_test.c @@ -49,15 +49,15 @@ extern struct k_sem thread_sem; -void gpio_test_callback(struct device *port, - struct gpio_callback *cb, u32_t pins) +void gpio_test_callback(const struct device *port, + struct gpio_callback *cb, u32_t pins) { printk(GPIO_NAME "%d triggered\n", GPIO_INT_PIN); } static struct gpio_callback gpio_cb; -void setup_gpio(struct device *gpio_dev) +void setup_gpio(const struct device *gpio_dev) { int ret; @@ -94,7 +94,7 @@ void setup_gpio(struct device *gpio_dev) /* gpio_thread is a static thread that is spawned automatically */ void gpio_thread(void *dummy1, void *dummy2, void *dummy3) { - struct device *gpio_dev; + const struct device *gpio_dev; int ret; ARG_UNUSED(dummy1); diff --git a/tests/boards/intel_s1000_crb/main/src/i2c_test.c b/tests/boards/intel_s1000_crb/main/src/i2c_test.c index b829cb7d73da..66d9df214541 100644 --- a/tests/boards/intel_s1000_crb/main/src/i2c_test.c +++ b/tests/boards/intel_s1000_crb/main/src/i2c_test.c @@ -54,7 +54,8 @@ extern struct k_sem thread_sem; -void test_i2c_write_led(struct device *i2c_dev, u16_t i2c_slave_led, u8_t color) +void test_i2c_write_led(const struct device *i2c_dev, u16_t i2c_slave_led, + u8_t color) { int ret; int led_val[6]; @@ -120,7 +121,7 @@ void test_i2c_write_led(struct device *i2c_dev, u16_t i2c_slave_led, u8_t color) } } -void test_i2c_read_led(struct device *i2c_dev, u16_t i2c_slave_led) +void test_i2c_read_led(const struct device *i2c_dev, u16_t i2c_slave_led) { int ret; u8_t data = 0U; @@ -136,7 +137,7 @@ void test_i2c_read_led(struct device *i2c_dev, u16_t i2c_slave_led) /* i2c_thread is a static thread that is spawned automatically */ void i2c_thread(void *dummy1, void *dummy2, void *dummy3) { - struct device *i2c_dev; + const struct device *i2c_dev; int toggle = LED_LIGHT_PAT; ARG_UNUSED(dummy1); diff --git a/tests/boards/intel_s1000_crb/main/src/i2s_test.c b/tests/boards/intel_s1000_crb/main/src/i2s_test.c index 9529c362c8f4..00485d808f2b 100644 --- a/tests/boards/intel_s1000_crb/main/src/i2s_test.c +++ b/tests/boards/intel_s1000_crb/main/src/i2s_test.c @@ -55,7 +55,7 @@ static struct k_mem_slab i2s_mem_slab; void test_i2s_bidirectional_transfer_configure(void) { int ret; - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; k_mem_slab_init(&i2s_mem_slab, audio_buffers, BLOCK_SIZE_BYTES, @@ -96,7 +96,7 @@ void test_i2s_bidirectional_transfer_configure(void) */ void test_i2s_bidirectional_transfer(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int frames = 0; void *buffer; size_t size; diff --git a/tests/boards/intel_s1000_crb/main/src/spi_flash.c b/tests/boards/intel_s1000_crb/main/src/spi_flash.c index 62f9ceee3e61..8485fd71ca8e 100644 --- a/tests/boards/intel_s1000_crb/main/src/spi_flash.c +++ b/tests/boards/intel_s1000_crb/main/src/spi_flash.c @@ -51,7 +51,7 @@ int flash_region_is_empty(u32_t off, void *dst, u32_t len) void test_flash(void) { - struct device *flash_dev; + const struct device *flash_dev; u8_t buf[TEST_DATA_LEN]; u32_t magic[4]; int i; diff --git a/tests/boards/intel_s1000_crb/main/src/test_hid.c b/tests/boards/intel_s1000_crb/main/src/test_hid.c index 15daf7b03dde..5f615948221f 100644 --- a/tests/boards/intel_s1000_crb/main/src/test_hid.c +++ b/tests/boards/intel_s1000_crb/main/src/test_hid.c @@ -98,7 +98,7 @@ static struct hid_ops ops = { void hid_thread(void) { u8_t report_1[2] = { REPORT_ID_1, 0x00 }; - struct device *hid_dev; + const struct device *hid_dev; int ret, wrote; LOG_DBG("Starting application"); diff --git a/tests/drivers/adc/adc_api/src/main.c b/tests/drivers/adc/adc_api/src/main.c index 7478c0e14412..e085225e1a48 100644 --- a/tests/drivers/adc/adc_api/src/main.c +++ b/tests/drivers/adc/adc_api/src/main.c @@ -22,7 +22,7 @@ extern void test_adc_asynchronous_call(void); extern void test_adc_sample_with_interval(void); extern void test_adc_repeated_samplings(void); extern void test_adc_invalid_request(void); -extern struct device *get_adc_device(void); +extern const struct device *get_adc_device(void); extern struct k_poll_signal async_sig; void test_main(void) diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index d91f08094200..40b4886188bc 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -226,15 +226,15 @@ static const struct adc_channel_cfg m_2nd_channel_cfg = { }; #endif /* defined(ADC_2ND_CHANNEL_ID) */ -struct device *get_adc_device(void) +const struct device *get_adc_device(void) { return device_get_binding(ADC_DEVICE_NAME); } -static struct device *init_adc(void) +static const struct device *init_adc(void) { int ret; - struct device *adc_dev = device_get_binding(ADC_DEVICE_NAME); + const struct device *adc_dev = device_get_binding(ADC_DEVICE_NAME); zassert_not_null(adc_dev, "Cannot get ADC device"); @@ -286,7 +286,7 @@ static int test_task_one_channel(void) .resolution = ADC_RESOLUTION, }; - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; @@ -320,7 +320,7 @@ static int test_task_two_channels(void) .resolution = ADC_RESOLUTION, }; - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; @@ -369,7 +369,7 @@ static int test_task_asynchronous_call(void) K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, &async_sig); - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; @@ -400,7 +400,7 @@ void test_adc_asynchronous_call(void) * test_adc_sample_with_interval */ static enum adc_action sample_with_interval_callback( - struct device *dev, + const struct device *dev, const struct adc_sequence *sequence, u16_t sampling_index) { @@ -424,7 +424,7 @@ static int test_task_with_interval(void) .resolution = ADC_RESOLUTION, }; - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; @@ -448,7 +448,7 @@ void test_adc_sample_with_interval(void) */ static u8_t m_samplings_done; static enum adc_action repeated_samplings_callback( - struct device *dev, + const struct device *dev, const struct adc_sequence *sequence, u16_t sampling_index) { @@ -512,7 +512,7 @@ static int test_task_repeated_samplings(void) .resolution = ADC_RESOLUTION, }; - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; @@ -542,7 +542,7 @@ static int test_task_invalid_request(void) .resolution = 0, /* intentionally invalid value */ }; - struct device *adc_dev = init_adc(); + const struct device *adc_dev = init_adc(); if (!adc_dev) { return TC_FAIL; diff --git a/tests/drivers/can/api/src/main.c b/tests/drivers/can/api/src/main.c index f80abb4e3278..2475b00cc57c 100644 --- a/tests/drivers/can/api/src/main.c +++ b/tests/drivers/can/api/src/main.c @@ -51,7 +51,7 @@ CAN_DEFINE_MSGQ(can_msgq, 5); struct k_sem rx_isr_sem; struct k_sem rx_cb_sem; struct k_sem tx_cb_sem; -struct device *can_dev; +const struct device *can_dev; struct zcan_frame test_std_msg = { .id_type = CAN_STANDARD_IDENTIFIER, @@ -245,7 +245,8 @@ static void rx_ext_mask_cb(struct zcan_frame *msg, void *arg) k_sem_give(&rx_cb_sem); } -static void send_test_msg(struct device *can_dev, struct zcan_frame *msg) +static void send_test_msg(const struct device *can_dev, + struct zcan_frame *msg) { int ret; @@ -255,7 +256,8 @@ static void send_test_msg(struct device *can_dev, struct zcan_frame *msg) zassert_equal(ret, CAN_TX_OK, "Can't send a message. Err: %d", ret); } -static void send_test_msg_nowait(struct device *can_dev, struct zcan_frame *msg) +static void send_test_msg_nowait(const struct device *can_dev, + struct zcan_frame *msg) { int ret; @@ -282,7 +284,7 @@ static void send_test_msg_nowait(struct device *can_dev, struct zcan_frame *msg) zassert_equal(ret, CAN_TX_OK, "Can't send a message. Err: %d", ret); } -static inline int attach_msgq(struct device *can_dev, +static inline int attach_msgq(const struct device *can_dev, const struct zcan_filter *filter) { int filter_id; @@ -295,8 +297,8 @@ static inline int attach_msgq(struct device *can_dev, return filter_id; } -static inline int attach_workq(struct device *can_dev, - const struct zcan_filter *filter) +static inline int attach_workq(const struct device *can_dev, + const struct zcan_filter *filter) { int filter_id; @@ -329,7 +331,7 @@ static inline int attach_workq(struct device *can_dev, return filter_id; } -static inline int attach_isr(struct device *can_dev, +static inline int attach_isr(const struct device *can_dev, const struct zcan_filter *filter) { int filter_id; diff --git a/tests/drivers/can/stm32/src/main.c b/tests/drivers/can/stm32/src/main.c index f5086a57164d..7d2bf76c0667 100644 --- a/tests/drivers/can/stm32/src/main.c +++ b/tests/drivers/can/stm32/src/main.c @@ -109,7 +109,8 @@ static inline void check_msg(struct zcan_frame *msg1, struct zcan_frame *msg2) zassert_equal(cmp_res, 0, "Received data differ"); } -static void send_test_msg(struct device *can_dev, struct zcan_frame *msg) +static void send_test_msg(const struct device *can_dev, + struct zcan_frame *msg) { int ret; @@ -126,7 +127,7 @@ static void send_test_msg(struct device *can_dev, struct zcan_frame *msg) */ static void test_filter_handling(void) { - struct device *can_dev; + const struct device *can_dev; int ret, filter_id_1, filter_id_2; struct zcan_frame msg_buffer; diff --git a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c index 576c88c3818d..cdccfd3f46a3 100644 --- a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c +++ b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c @@ -55,7 +55,7 @@ typedef bool (*test_capability_check_t)(const char *dev_name, static void setup_instance(const char *dev_name, clock_control_subsys_t subsys) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); int err; k_busy_wait(1000); @@ -68,7 +68,7 @@ static void setup_instance(const char *dev_name, clock_control_subsys_t subsys) static void tear_down_instance(const char *dev_name, clock_control_subsys_t subsys) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); clock_control_on(dev, subsys); } @@ -107,7 +107,7 @@ static void test_on_off_status_instance(const char *dev_name, clock_control_subsys_t subsys, u32_t startup_us) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); enum clock_control_status status; int err; @@ -153,7 +153,7 @@ static void test_multiple_users_instance(const char *dev_name, clock_control_subsys_t subsys, u32_t startup_us) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); enum clock_control_status status; int users = 5; int err; @@ -192,7 +192,7 @@ static void test_multiple_users(void) static bool async_capable(const char *dev_name, clock_control_subsys_t subsys) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); if (clock_control_async_on(dev, subsys, NULL) != 0) { return false; @@ -206,7 +206,7 @@ static bool async_capable(const char *dev_name, clock_control_subsys_t subsys) /* * Test checks that callbacks are called after clock is started. */ -static void clock_on_callback(struct device *dev, +static void clock_on_callback(const struct device *dev, clock_control_subsys_t subsys, void *user_data) { @@ -219,7 +219,7 @@ static void test_async_on_instance(const char *dev_name, clock_control_subsys_t subsys, u32_t startup_us) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); enum clock_control_status status; int err; bool executed1 = false; @@ -263,7 +263,7 @@ static void test_async_on_stopped_on_instance(const char *dev_name, clock_control_subsys_t subsys, u32_t startup_us) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); enum clock_control_status status; int err; int key; @@ -305,7 +305,7 @@ static void test_immediate_cb_when_clock_on_on_instance(const char *dev_name, clock_control_subsys_t subsys, u32_t startup_us) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); enum clock_control_status status; int err; bool executed1 = false; diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c index 4d9b0f67be7c..6580803c1da0 100644 --- a/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c +++ b/tests/drivers/clock_control/nrf_clock_calibration/src/mock_temp_nrf5.c @@ -18,21 +18,21 @@ void mock_temp_nrf5_value_set(struct sensor_value *val) value = *val; } -static int mock_temp_nrf5_init(struct device *dev) +static int mock_temp_nrf5_init(const struct device *dev) { return 0; } -static int mock_temp_nrf5_sample_fetch(struct device *dev, +static int mock_temp_nrf5_sample_fetch(const struct device *dev, enum sensor_channel chan) { k_sleep(K_MSEC(1)); return 0; } -static int mock_temp_nrf5_channel_get(struct device *dev, - enum sensor_channel chan, - struct sensor_value *val) +static int mock_temp_nrf5_channel_get(const struct device *dev, + enum sensor_channel chan, + struct sensor_value *val) { *val = value; return 0; diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c index 4fb854514fcd..d24e3e28cba8 100644 --- a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c +++ b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c @@ -19,7 +19,8 @@ LOG_MODULE_REGISTER(test); extern void mock_temp_nrf5_value_set(struct sensor_value *val); -static void turn_on_clock(struct device *dev, clock_control_subsys_t subsys) +static void turn_on_clock(const struct device *dev, + clock_control_subsys_t subsys) { clock_control_on(dev, subsys); while (clock_control_get_status(dev, subsys) != @@ -28,7 +29,8 @@ static void turn_on_clock(struct device *dev, clock_control_subsys_t subsys) } } -static void turn_off_clock(struct device *dev, clock_control_subsys_t subsys) +static void turn_off_clock(const struct device *dev, + clock_control_subsys_t subsys) { int err; @@ -98,7 +100,7 @@ static void test_basic_clock_calibration(void) /* Test checks if calibration happens just after clock is enabled. */ static void test_calibration_after_enabling_lfclk(void) { - struct device *clk_dev = + const struct device *clk_dev = device_get_binding(DT_LABEL(DT_INST(0, nordic_nrf_clock))); struct sensor_value value = { .val1 = 0, .val2 = 0 }; diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c index 58dceaf55cdc..9051c7657d89 100644 --- a/tests/drivers/counter/counter_basic_api/src/test_counter.c +++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c @@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(test); static struct k_sem top_cnt_sem; static struct k_sem alarm_cnt_sem; -static void top_handler(struct device *dev, void *user_data); +static void top_handler(const struct device *dev, void *user_data); void *exp_user_data = (void *)199; @@ -84,7 +84,7 @@ static void counter_setup_instance(const char *dev_name) static void counter_tear_down_instance(const char *dev_name) { int err; - struct device *dev; + const struct device *dev; struct counter_top_cfg top_cfg = { .callback = NULL, .user_data = NULL, @@ -129,7 +129,7 @@ static void test_all_instances(counter_test_func_t func, static bool set_top_value_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct counter_top_cfg cfg = { .ticks = counter_get_top_value(dev) - 1 }; @@ -149,7 +149,7 @@ static bool set_top_value_capable(const char *dev_name) return true; } -static void top_handler(struct device *dev, void *user_data) +static void top_handler(const struct device *dev, void *user_data) { zassert_true(user_data == exp_user_data, "%s: Unexpected callback", dev->name); @@ -158,7 +158,7 @@ static void top_handler(struct device *dev, void *user_data) void test_set_top_value_with_alarm_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t cnt; u32_t top_cnt; @@ -208,7 +208,7 @@ void test_set_top_value_with_alarm(void) void test_set_top_value_without_alarm_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t cnt; u32_t top_cnt; @@ -251,7 +251,8 @@ void test_set_top_value_without_alarm(void) set_top_value_capable); } -static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter, +static void alarm_handler(const struct device *dev, u8_t chan_id, + u32_t counter, void *user_data) { /* Arbitrary limit for alarm processing - time between hw expiration @@ -294,7 +295,7 @@ static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter, void test_single_shot_alarm_instance(const char *dev_name, bool set_top) { - struct device *dev; + const struct device *dev; int err; u32_t ticks; u32_t alarm_cnt; @@ -384,7 +385,7 @@ void test_single_shot_alarm_top_instance(const char *dev_name) static bool single_channel_alarm_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); return (counter_get_num_of_channels(dev) > 0); } @@ -409,7 +410,8 @@ void test_single_shot_alarm_top(void) static void *clbk_data[10]; -static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter, +static void alarm_handler2(const struct device *dev, u8_t chan_id, + u32_t counter, void *user_data) { clbk_data[k_sem_count_get(&alarm_cnt_sem)] = user_data; @@ -424,7 +426,7 @@ static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter, */ void test_multiple_alarms_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t ticks; u32_t alarm_cnt; @@ -493,7 +495,7 @@ void test_multiple_alarms_instance(const char *dev_name) static bool multiple_channel_alarm_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); return (counter_get_num_of_channels(dev) > 1); } @@ -506,7 +508,7 @@ void test_multiple_alarms(void) void test_all_channels_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; const int n = 10; int nchan = 0; @@ -570,7 +572,7 @@ void test_late_alarm_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); u32_t guard = counter_us_to_ticks(dev, 200); struct counter_alarm_cfg alarm_cfg = { @@ -621,7 +623,7 @@ void test_late_alarm_instance(const char *dev_name) void test_late_alarm_error_instance(const char *dev_name) { int err; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); u32_t guard = counter_us_to_ticks(dev, 200); struct counter_alarm_cfg alarm_cfg = { @@ -657,7 +659,7 @@ void test_late_alarm_error_instance(const char *dev_name) static bool late_detection_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t guard = counter_get_guard_period(dev, COUNTER_GUARD_PERIOD_LATE_TO_SET); int err = counter_set_guard_period(dev, guard, @@ -685,7 +687,7 @@ static void test_short_relative_alarm_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); struct counter_alarm_cfg alarm_cfg = { .callback = alarm_handler, @@ -720,7 +722,7 @@ static void test_short_relative_alarm_instance(const char *dev_name) */ static bool short_relative_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct counter_alarm_cfg alarm_cfg = { .callback = alarm_handler, .flags = 0, @@ -776,7 +778,7 @@ static void test_cancelled_alarm_does_not_expire_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t us = 1000; u32_t ticks = counter_us_to_ticks(dev, us); u32_t top = counter_get_top_value(dev); @@ -887,7 +889,7 @@ void test_cancelled_alarm_does_not_expire(void) void test_main(void) { - struct device *dev; + const struct device *dev; int i; /* Give required clocks some time to stabilize. In particular, nRF SoCs diff --git a/tests/drivers/counter/counter_cmos/src/main.c b/tests/drivers/counter/counter_cmos/src/main.c index 59b7d0229729..a63ebbaefce4 100644 --- a/tests/drivers/counter/counter_cmos/src/main.c +++ b/tests/drivers/counter/counter_cmos/src/main.c @@ -17,7 +17,7 @@ void test_cmos_rate(void) { - struct device *cmos; + const struct device *cmos; u32_t start, elapsed; int err; diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c index c515ff952ab5..69a296851472 100644 --- a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c +++ b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c @@ -35,7 +35,7 @@ static void counter_setup_instance(const char *dev_name) static void counter_tear_down_instance(const char *dev_name) { int err; - struct device *dev; + const struct device *dev; dev = device_get_binding(dev_name); @@ -57,7 +57,7 @@ static void test_all_instances(counter_test_func_t func) void test_set_custom_top_value_fails_on_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; struct counter_top_cfg top_cfg = { .callback = NULL, @@ -76,14 +76,14 @@ void test_set_custom_top_value_fails(void) test_all_instances(test_set_custom_top_value_fails_on_instance); } -static void top_handler(struct device *dev, void *user_data) +static void top_handler(const struct device *dev, void *user_data) { top_cnt++; } void test_top_handler_on_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; u32_t tmp_top_cnt; int err; struct counter_top_cfg top_cfg = { diff --git a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c index 69f46d17807c..309b30763bab 100644 --- a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c +++ b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c @@ -15,7 +15,7 @@ static struct k_sem top_cnt_sem; static struct k_sem alarm_cnt_sem; static struct k_poll_signal sync_sig; -static void top_handler(struct device *dev, void *user_data); +static void top_handler(const struct device *dev, void *user_data); void *exp_user_data = (void *)199; @@ -40,7 +40,7 @@ static void counter_setup_instance(const char *dev_name) static void counter_tear_down_instance(const char *dev_name) { int err; - struct device *dev; + const struct device *dev; struct counter_top_cfg top_cfg = { .callback = NULL, .user_data = NULL, @@ -86,7 +86,7 @@ static void test_all_instances(counter_test_func_t func, static bool set_top_value_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct counter_top_cfg cfg = { .ticks = counter_get_top_value(dev) - 1 }; @@ -106,7 +106,7 @@ static bool set_top_value_capable(const char *dev_name) return true; } -static void top_handler(struct device *dev, void *user_data) +static void top_handler(const struct device *dev, void *user_data) { zassert_true(user_data == exp_user_data, "%s: Unexpected callback", dev->name); @@ -115,7 +115,7 @@ static void top_handler(struct device *dev, void *user_data) void test_set_top_value_with_alarm_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t cnt; u32_t top_cnt; @@ -165,7 +165,7 @@ void test_set_top_value_with_alarm(void) void test_set_top_value_without_alarm_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t cnt; u32_t top_cnt; @@ -208,7 +208,8 @@ void test_set_top_value_without_alarm(void) set_top_value_capable); } -static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter, +static void alarm_handler(const struct device *dev, u8_t chan_id, + u32_t counter, void *user_data) { u32_t now; @@ -241,7 +242,7 @@ static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter, void test_single_shot_alarm_instance(const char *dev_name, bool set_top) { - struct device *dev; + const struct device *dev; int err; u32_t ticks; u32_t alarm_cnt; @@ -333,7 +334,7 @@ void test_single_shot_alarm_top_instance(const char *dev_name) static bool single_channel_alarm_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); return (counter_get_num_of_channels(dev) > 0); } @@ -358,7 +359,8 @@ void test_single_shot_alarm_top(void) static void *clbk_data[10]; -static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter, +static void alarm_handler2(const struct device *dev, u8_t chan_id, + u32_t counter, void *user_data) { clbk_data[k_sem_count_get(&alarm_cnt_sem)] = user_data; @@ -373,7 +375,7 @@ static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter, */ void test_multiple_alarms_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; u32_t ticks; u32_t alarm_cnt; @@ -443,7 +445,7 @@ void test_multiple_alarms_instance(const char *dev_name) static bool multiple_channel_alarm_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); return (counter_get_num_of_channels(dev) > 1); } @@ -469,7 +471,7 @@ void test_multiple_alarms(void) void test_all_channels_instance(const char *dev_name) { - struct device *dev; + const struct device *dev; int err; const int n = 10; int nchan = 0; @@ -540,7 +542,7 @@ void test_late_alarm_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); u32_t guard = counter_us_to_ticks(dev, 200); struct counter_alarm_cfg alarm_cfg = { @@ -591,7 +593,7 @@ void test_late_alarm_instance(const char *dev_name) void test_late_alarm_error_instance(const char *dev_name) { int err; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); u32_t guard = counter_us_to_ticks(dev, 200); struct counter_alarm_cfg alarm_cfg = { @@ -627,7 +629,7 @@ void test_late_alarm_error_instance(const char *dev_name) static bool late_detection_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t guard = counter_get_guard_period(dev, COUNTER_GUARD_PERIOD_LATE_TO_SET); int err = counter_set_guard_period(dev, guard, @@ -655,7 +657,7 @@ static void test_short_relative_alarm_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1); struct counter_alarm_cfg alarm_cfg = { .callback = alarm_handler, @@ -690,7 +692,7 @@ static void test_short_relative_alarm_instance(const char *dev_name) */ static bool short_relative_capable(const char *dev_name) { - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct counter_alarm_cfg alarm_cfg = { .callback = alarm_handler, .flags = 0, @@ -746,7 +748,7 @@ static void test_cancelled_alarm_does_not_expire_instance(const char *dev_name) { int err; u32_t alarm_cnt; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); u32_t us = 1000; u32_t ticks = counter_us_to_ticks(dev, us); @@ -855,7 +857,7 @@ void test_cancelled_alarm_does_not_expire(void) static void test_ds3231_synchronize(void) { const char *dev_name = devices[0]; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct sys_notify notify; struct k_poll_event evt = K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, @@ -884,7 +886,7 @@ static void test_ds3231_synchronize(void) static void test_ds3231_get_syncpoint(void) { const char *dev_name = devices[0]; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct maxim_ds3231_syncpoint syncpoint; int rc; @@ -901,7 +903,7 @@ static void test_ds3231_get_syncpoint(void) static void test_ds3231_req_syncpoint(void) { const char *dev_name = devices[0]; - struct device *dev = device_get_binding(dev_name); + const struct device *dev = device_get_binding(dev_name); struct k_poll_event evt = K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL, K_POLL_MODE_NOTIFY_ONLY, &sync_sig); @@ -922,7 +924,7 @@ static void test_ds3231_req_syncpoint(void) void test_main(void) { - struct device *dev; + const struct device *dev; int i; /* Give required clocks some time to stabilize. In particular, nRF SoCs diff --git a/tests/drivers/dac/dac_api/src/main.c b/tests/drivers/dac/dac_api/src/main.c index be420fc8ed7e..084856753d43 100644 --- a/tests/drivers/dac/dac_api/src/main.c +++ b/tests/drivers/dac/dac_api/src/main.c @@ -15,7 +15,7 @@ #include extern void test_dac_write_value(void); -extern struct device *get_dac_device(void); +extern const struct device *get_dac_device(void); void test_main(void) { diff --git a/tests/drivers/dac/dac_api/src/test_dac.c b/tests/drivers/dac/dac_api/src/test_dac.c index d4da967d0a9b..ee25bf6be117 100644 --- a/tests/drivers/dac/dac_api/src/test_dac.c +++ b/tests/drivers/dac/dac_api/src/test_dac.c @@ -43,15 +43,15 @@ static const struct dac_channel_cfg dac_ch_cfg = { .resolution = DAC_RESOLUTION }; -struct device *get_dac_device(void) +const struct device *get_dac_device(void) { return device_get_binding(DAC_DEVICE_NAME); } -static struct device *init_dac(void) +static const struct device *init_dac(void) { int ret; - struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); + const struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); zassert_not_null(dac_dev, "Cannot get DAC device"); @@ -69,7 +69,7 @@ static int test_task_write_value(void) { int ret; - struct device *dac_dev = init_dac(); + const struct device *dac_dev = init_dac(); if (!dac_dev) { return TC_FAIL; diff --git a/tests/drivers/dac/dac_loopback/src/test_dac.c b/tests/drivers/dac/dac_loopback/src/test_dac.c index 8a470756d4b5..cb9c17c85989 100644 --- a/tests/drivers/dac/dac_loopback/src/test_dac.c +++ b/tests/drivers/dac/dac_loopback/src/test_dac.c @@ -90,10 +90,10 @@ static const struct adc_channel_cfg adc_ch_cfg = { .channel_id = ADC_CHANNEL_ID, }; -static struct device *init_dac(void) +static const struct device *init_dac(void) { int ret; - struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); + const struct device *dac_dev = device_get_binding(DAC_DEVICE_NAME); zassert_not_null(dac_dev, "Cannot get DAC device"); @@ -105,10 +105,10 @@ static struct device *init_dac(void) } /* ADC necessary to read back the value from DAC */ -static struct device *init_adc(void) +static const struct device *init_adc(void) { int ret; - struct device *adc_dev = device_get_binding(ADC_DEVICE_NAME); + const struct device *adc_dev = device_get_binding(ADC_DEVICE_NAME); zassert_not_null(adc_dev, "Cannot get ADC device"); @@ -126,8 +126,8 @@ static int test_task_loopback(void) { int ret; - struct device *dac_dev = init_dac(); - struct device *adc_dev = init_adc(); + const struct device *dac_dev = init_dac(); + const struct device *adc_dev = init_adc(); if (!dac_dev || !adc_dev) { return TC_FAIL; diff --git a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c index 90571fa195d9..607ebc3acd30 100644 --- a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c +++ b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c @@ -42,7 +42,7 @@ static int test_task(u32_t chan_id, u32_t blen) { struct dma_config dma_cfg = {0}; struct dma_block_config dma_block_cfg = {0}; - struct device *dma = device_get_binding(DMA_DEVICE_NAME); + const struct device *dma = device_get_binding(DMA_DEVICE_NAME); if (!dma) { TC_PRINT("Cannot get dma controller\n"); diff --git a/tests/drivers/dma/loop_transfer/src/dma.c b/tests/drivers/dma/loop_transfer/src/dma.c index e0d95749788f..76b36948c7d5 100644 --- a/tests/drivers/dma/loop_transfer/src/dma.c +++ b/tests/drivers/dma/loop_transfer/src/dma.c @@ -28,7 +28,7 @@ volatile u8_t transfer_count; static struct dma_config dma_cfg = {0}; static struct dma_block_config dma_block_cfg = {0}; -static void test_transfer(struct device *dev, u32_t id) +static void test_transfer(const struct device *dev, u32_t id) { int ret; @@ -52,7 +52,7 @@ static void test_error(void) static void dma_user_callback(void *arg, u32_t id, int error_code) { - struct device *dev = (struct device *)arg; + const struct device *dev = (const struct device *)arg; if (error_code == 0) { test_transfer(dev, id); @@ -63,7 +63,7 @@ static void dma_user_callback(void *arg, u32_t id, int error_code) void main(void) { - struct device *dma; + const struct device *dma; static u32_t chan_id; printk("DMA memory to memory transfer started on %s\n", diff --git a/tests/drivers/eeprom/src/main.c b/tests/drivers/eeprom/src/main.c index 6d37cc5f07a9..273e63f46e1c 100644 --- a/tests/drivers/eeprom/src/main.c +++ b/tests/drivers/eeprom/src/main.c @@ -10,7 +10,7 @@ static void test_size(void) { - struct device *eeprom; + const struct device *eeprom; size_t size; eeprom = device_get_binding(DT_LABEL(DT_ALIAS(eeprom_0))); @@ -22,7 +22,7 @@ static void test_size(void) static void test_out_of_bounds(void) { const u8_t data[4] = { 0x01, 0x02, 0x03, 0x03 }; - struct device *eeprom; + const struct device *eeprom; size_t size; int rc; @@ -38,7 +38,7 @@ static void test_write_and_verify(void) const u8_t wr_buf1[4] = { 0xFF, 0xEE, 0xDD, 0xCC }; const u8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD }; u8_t rd_buf[sizeof(wr_buf1)]; - struct device *eeprom; + const struct device *eeprom; int rc; eeprom = device_get_binding(DT_LABEL(DT_ALIAS(eeprom_0))); @@ -67,7 +67,7 @@ static void test_zero_length_write(void) const u8_t wr_buf1[4] = { 0x10, 0x20, 0x30, 0x40 }; const u8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD }; u8_t rd_buf[sizeof(wr_buf1)]; - struct device *eeprom; + const struct device *eeprom; int rc; eeprom = device_get_binding(DT_LABEL(DT_ALIAS(eeprom_0))); @@ -93,7 +93,7 @@ static void test_zero_length_write(void) void test_main(void) { - static struct device *eeprom; + static const struct device *eeprom; eeprom = device_get_binding(DT_LABEL(DT_ALIAS(eeprom_0))); zassert_not_null(eeprom, "Unable to get EEPROM device"); diff --git a/tests/drivers/entropy/api/src/main.c b/tests/drivers/entropy/api/src/main.c index eb5610c240c2..01acee3272e9 100644 --- a/tests/drivers/entropy/api/src/main.c +++ b/tests/drivers/entropy/api/src/main.c @@ -24,7 +24,7 @@ #define BUFFER_LENGTH 10 #define RECHECK_RANDOM_ENTROPY 0x10 -static int random_entropy(struct device *dev, char *buffer, char num) +static int random_entropy(const struct device *dev, char *buffer, char num) { int ret, i; int count = 0; @@ -67,7 +67,7 @@ static int random_entropy(struct device *dev, char *buffer, char num) */ static int get_entropy(void) { - struct device *dev; + const struct device *dev; u8_t buffer[BUFFER_LENGTH] = { 0 }; int ret; diff --git a/tests/drivers/flash_simulator/src/main.c b/tests/drivers/flash_simulator/src/main.c index 026bd2c420be..779afa603fea 100644 --- a/tests/drivers/flash_simulator/src/main.c +++ b/tests/drivers/flash_simulator/src/main.c @@ -25,7 +25,7 @@ #define TEST_SIM_FLASH_END (TEST_SIM_FLASH_SIZE +\ FLASH_SIMULATOR_BASE_OFFSET) -static struct device *flash_dev; +static const struct device *flash_dev; static u8_t test_read_buf[TEST_SIM_FLASH_SIZE]; static u32_t p32_inc; diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_config.c b/tests/drivers/gpio/gpio_api_1pin/src/test_config.c index b957beb0423a..87833facd473 100644 --- a/tests/drivers/gpio/gpio_api_1pin/src/test_config.c +++ b/tests/drivers/gpio/gpio_api_1pin/src/test_config.c @@ -20,7 +20,8 @@ #define TEST_GPIO_MAX_SINGLE_ENDED_RISE_FALL_TIME_MS 100 #define TEST_POINT(n) (n) -static void pin_get_raw_and_verify(struct device *port, unsigned int pin, +static void pin_get_raw_and_verify(const struct device *port, + unsigned int pin, int val_expected, int idx) { int val_actual; @@ -32,7 +33,8 @@ static void pin_get_raw_and_verify(struct device *port, unsigned int pin, "Test point %d: invalid pin get value", idx); } -static void pin_set_raw_and_verify(struct device *port, unsigned int pin, +static void pin_set_raw_and_verify(const struct device *port, + unsigned int pin, int val, int idx) { zassert_equal(gpio_pin_set_raw(port, pin, val), 0, @@ -53,7 +55,7 @@ static void pin_set_raw_and_verify(struct device *port, unsigned int pin, */ void test_gpio_pin_configure_push_pull(void) { - struct device *port; + const struct device *port; int ret; port = device_get_binding(TEST_DEV); @@ -166,7 +168,7 @@ void test_gpio_pin_configure_push_pull(void) */ void test_gpio_pin_configure_single_ended(void) { - struct device *port; + const struct device *port; int pin_in_val; int pin_val; unsigned int cfg_flag; diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c b/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c index 382cc7f58bfe..051adf35e8cb 100644 --- a/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c +++ b/tests/drivers/gpio/gpio_api_1pin/src/test_pin.c @@ -17,7 +17,8 @@ #include #include "test_gpio_api.h" -static void pin_get_raw_and_verify(struct device *port, unsigned int pin, +static void pin_get_raw_and_verify(const struct device *port, + unsigned int pin, int val_expected, int idx) { int val_actual; @@ -29,7 +30,7 @@ static void pin_get_raw_and_verify(struct device *port, unsigned int pin, "Test point %d: invalid physical pin get value", idx); } -static void pin_get_and_verify(struct device *port, unsigned int pin, +static void pin_get_and_verify(const struct device *port, unsigned int pin, int val_expected, int idx) { int val_actual; @@ -41,7 +42,8 @@ static void pin_get_and_verify(struct device *port, unsigned int pin, "Test point %d: invalid logical pin get value", idx); } -static void pin_set_raw_and_verify(struct device *port, unsigned int pin, +static void pin_set_raw_and_verify(const struct device *port, + unsigned int pin, int val, int idx) { zassert_equal(gpio_pin_set_raw(port, pin, val), 0, @@ -49,7 +51,8 @@ static void pin_set_raw_and_verify(struct device *port, unsigned int pin, k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void pin_set_and_verify(struct device *port, unsigned int pin, int val, +static void pin_set_and_verify(const struct device *port, unsigned int pin, + int val, int idx) { zassert_equal(gpio_pin_set(port, pin, val), 0, @@ -64,7 +67,7 @@ static void pin_set_and_verify(struct device *port, unsigned int pin, int val, */ void test_gpio_pin_toggle(void) { - struct device *port; + const struct device *port; int val_expected; int ret; @@ -106,7 +109,7 @@ void test_gpio_pin_toggle(void) */ void test_gpio_pin_toggle_visual(void) { - struct device *port; + const struct device *port; int val_expected; int ret; @@ -141,7 +144,7 @@ void test_gpio_pin_toggle_visual(void) */ void test_gpio_pin_set_get_raw(void) { - struct device *port; + const struct device *port; int val_expected; int ret; @@ -178,7 +181,7 @@ void test_gpio_pin_set_get_raw(void) */ void test_gpio_pin_set_get(void) { - struct device *port; + const struct device *port; int val_expected; int ret; @@ -217,7 +220,7 @@ void test_gpio_pin_set_get(void) */ void test_gpio_pin_set_get_active_high(void) { - struct device *port; + const struct device *port; int val_expected; int ret; @@ -267,7 +270,7 @@ void test_gpio_pin_set_get_active_high(void) */ void test_gpio_pin_set_get_active_low(void) { - struct device *port; + const struct device *port; int val_expected, val_raw_expected; int ret; diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c b/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c index 0c97f63b13d5..6aa5ca712f13 100644 --- a/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c +++ b/tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c @@ -20,7 +20,7 @@ struct gpio_callback gpio_cb; static int cb_count; -static void callback_edge(struct device *port, struct gpio_callback *cb, +static void callback_edge(const struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) { zassert_equal(pins, BIT(TEST_PIN), @@ -28,7 +28,8 @@ static void callback_edge(struct device *port, struct gpio_callback *cb, cb_count++; } -static void callback_level(struct device *port, struct gpio_callback *cb, +static void callback_level(const struct device *port, + struct gpio_callback *cb, gpio_port_pins_t pins) { int ret; @@ -43,7 +44,8 @@ static void callback_level(struct device *port, struct gpio_callback *cb, cb_count++; } -static void pin_set_and_verify(struct device *port, unsigned int pin, int val, +static void pin_set_and_verify(const struct device *port, unsigned int pin, + int val, int idx) { zassert_equal(gpio_pin_set(port, pin, val), 0, @@ -54,7 +56,7 @@ static void pin_set_and_verify(struct device *port, unsigned int pin, int val, void test_gpio_pin_interrupt_edge(unsigned int cfg_flags, unsigned int int_flags) { - struct device *port; + const struct device *port; int cb_count_expected; unsigned int cfg_out_flag; int ret; @@ -127,7 +129,7 @@ void test_gpio_pin_interrupt_edge(unsigned int cfg_flags, void test_gpio_pin_interrupt_level(unsigned int cfg_flags, unsigned int int_flags) { - struct device *port; + const struct device *port; int cb_count_expected; unsigned int cfg_out_flag; int pin_out_val; diff --git a/tests/drivers/gpio/gpio_api_1pin/src/test_port.c b/tests/drivers/gpio/gpio_api_1pin/src/test_port.c index ac94487b1fd9..8ebd55702e67 100644 --- a/tests/drivers/gpio/gpio_api_1pin/src/test_port.c +++ b/tests/drivers/gpio/gpio_api_1pin/src/test_port.c @@ -19,7 +19,8 @@ #define TEST_GPIO_PORT_VALUE_MAX ((1LLU << GPIO_MAX_PINS_PER_PORT) - 1) -static void port_get_raw_and_verify(struct device *port, gpio_port_pins_t mask, +static void port_get_raw_and_verify(const struct device *port, + gpio_port_pins_t mask, gpio_port_value_t val_expected, int idx) { gpio_port_value_t val_actual; @@ -30,7 +31,8 @@ static void port_get_raw_and_verify(struct device *port, gpio_port_pins_t mask, "Test point %d: invalid physical port get value", idx); } -static void port_get_and_verify(struct device *port, gpio_port_pins_t mask, +static void port_get_and_verify(const struct device *port, + gpio_port_pins_t mask, gpio_port_value_t val_expected, int idx) { gpio_port_value_t val_actual; @@ -41,64 +43,68 @@ static void port_get_and_verify(struct device *port, gpio_port_pins_t mask, "Test point %d: invalid logical port get value", idx); } -static void port_set_masked_raw_and_verify(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value, int idx) +static void port_set_masked_raw_and_verify(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value, int idx) { zassert_equal(gpio_port_set_masked_raw(port, mask, value), 0, "Test point %d: failed to set physical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_set_masked_and_verify(struct device *port, - gpio_port_pins_t mask, gpio_port_value_t value, int idx) +static void port_set_masked_and_verify(const struct device *port, + gpio_port_pins_t mask, + gpio_port_value_t value, int idx) { zassert_equal(gpio_port_set_masked(port, mask, value), 0, "Test point %d: failed to set logical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_set_bits_raw_and_verify(struct device *port, - gpio_port_pins_t pins, int idx) +static void port_set_bits_raw_and_verify(const struct device *port, + gpio_port_pins_t pins, int idx) { zassert_equal(gpio_port_set_bits_raw(port, pins), 0, "Test point %d: failed to set physical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_set_bits_and_verify(struct device *port, - gpio_port_pins_t pins, int idx) +static void port_set_bits_and_verify(const struct device *port, + gpio_port_pins_t pins, int idx) { zassert_equal(gpio_port_set_bits(port, pins), 0, "Test point %d: failed to set logical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_clear_bits_raw_and_verify(struct device *port, - gpio_port_pins_t pins, int idx) +static void port_clear_bits_raw_and_verify(const struct device *port, + gpio_port_pins_t pins, int idx) { zassert_equal(gpio_port_clear_bits_raw(port, pins), 0, "Test point %d: failed to set physical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_clear_bits_and_verify(struct device *port, - gpio_port_pins_t pins, int idx) +static void port_clear_bits_and_verify(const struct device *port, + gpio_port_pins_t pins, int idx) { zassert_equal(gpio_port_clear_bits(port, pins), 0, "Test point %d: failed to set logical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_set_clr_bits_raw(struct device *port, - gpio_port_pins_t set_pins, gpio_port_pins_t clear_pins, int idx) +static void port_set_clr_bits_raw(const struct device *port, + gpio_port_pins_t set_pins, + gpio_port_pins_t clear_pins, int idx) { zassert_equal(gpio_port_set_clr_bits_raw(port, set_pins, clear_pins), 0, "Test point %d: failed to set physical port value", idx); k_busy_wait(TEST_GPIO_MAX_RISE_FALL_TIME_US); } -static void port_set_clr_bits(struct device *port, - gpio_port_pins_t set_pins, gpio_port_pins_t clear_pins, int idx) +static void port_set_clr_bits(const struct device *port, + gpio_port_pins_t set_pins, + gpio_port_pins_t clear_pins, int idx) { zassert_equal(gpio_port_set_clr_bits(port, set_pins, clear_pins), 0, "Test point %d: failed to set logical port value", idx); @@ -112,7 +118,7 @@ static void port_set_clr_bits(struct device *port, */ void test_gpio_port_toggle(void) { - struct device *port; + const struct device *port; gpio_port_value_t val_expected; int ret; @@ -146,7 +152,7 @@ void test_gpio_port_toggle(void) void test_gpio_port_set_masked_get_raw(void) { - struct device *port; + const struct device *port; int ret; const gpio_port_value_t test_vector[] = { @@ -186,7 +192,7 @@ void test_gpio_port_set_masked_get_raw(void) void test_gpio_port_set_masked_get(void) { - struct device *port; + const struct device *port; int ret; const gpio_port_value_t test_vector[] = { @@ -226,7 +232,7 @@ void test_gpio_port_set_masked_get(void) void test_gpio_port_set_masked_get_active_high(void) { - struct device *port; + const struct device *port; int ret; const gpio_port_value_t test_vector[] = { @@ -277,7 +283,7 @@ void test_gpio_port_set_masked_get_active_high(void) void test_gpio_port_set_masked_get_active_low(void) { - struct device *port; + const struct device *port; int ret; const gpio_port_value_t test_vector[] = { @@ -328,7 +334,7 @@ void test_gpio_port_set_masked_get_active_low(void) void test_gpio_port_set_bits_clear_bits_raw(void) { - struct device *port; + const struct device *port; gpio_port_value_t val_expected = 0; int ret; @@ -367,7 +373,7 @@ void test_gpio_port_set_bits_clear_bits_raw(void) void test_gpio_port_set_bits_clear_bits(void) { - struct device *port; + const struct device *port; gpio_port_value_t val_expected = 0; int ret; @@ -406,7 +412,7 @@ void test_gpio_port_set_bits_clear_bits(void) void test_gpio_port_set_clr_bits_raw(void) { - struct device *port; + const struct device *port; gpio_port_value_t val_expected = 0; int ret; @@ -444,7 +450,7 @@ void test_gpio_port_set_clr_bits_raw(void) void test_gpio_port_set_clr_bits(void) { - struct device *port; + const struct device *port; gpio_port_value_t val_expected = 0; int ret; diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c index c5d9d477da81..a544c37411f9 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/main.c +++ b/tests/drivers/gpio/gpio_basic_api/src/main.c @@ -36,7 +36,7 @@ static void board_setup(void) #if defined(CONFIG_BOARD_FRDM_K64F) /* TODO figure out how to get this from "GPIO_2" */ const char *pmx_name = "portc"; - struct device *pmx = device_get_binding(pmx_name); + const struct device *pmx = device_get_binding(pmx_name); pinmux_pin_set(pmx, PIN_OUT, PORT_PCR_MUX(kPORT_MuxAsGpio)); pinmux_pin_set(pmx, PIN_IN, PORT_PCR_MUX(kPORT_MuxAsGpio)); @@ -98,7 +98,7 @@ static void board_setup(void) IOMUXC_SW_PAD_CTL_PAD_DSE(6)); #elif defined(CONFIG_SOC_FAMILY_LPC) /* Assumes ARDUINO pins are mapped on PORT0 on all boards*/ - struct device *port0 = + const struct device *port0 = device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT0_NAME); const u32_t pin_config = ( IOCON_PIO_FUNC0 | @@ -111,7 +111,7 @@ static void board_setup(void) pinmux_pin_set(port0, PIN_OUT, pin_config); #elif defined(CONFIG_BOARD_RV32M1_VEGA) const char *pmx_name = DT_LABEL(DT_NODELABEL(porta)); - struct device *pmx = device_get_binding(pmx_name); + const struct device *pmx = device_get_binding(pmx_name); pinmux_pin_set(pmx, PIN_OUT, PORT_PCR_MUX(kPORT_MuxAsGpio)); pinmux_pin_set(pmx, PIN_IN, PORT_PCR_MUX(kPORT_MuxAsGpio)); diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c index bdb7778e32d9..30f4d10c939e 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c +++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c @@ -17,21 +17,21 @@ static struct drv_data cb_data[2]; static int cb_cnt[2]; -static void callback_1(struct device *dev, +static void callback_1(const struct device *dev, struct gpio_callback *gpio_cb, u32_t pins) { TC_PRINT("%s triggered: %d\n", __func__, ++cb_cnt[0]); } -static void callback_2(struct device *dev, +static void callback_2(const struct device *dev, struct gpio_callback *gpio_cb, u32_t pins) { TC_PRINT("%s triggered: %d\n", __func__, ++cb_cnt[1]); } -static void callback_remove_self(struct device *dev, - struct gpio_callback *gpio_cb, u32_t pins) +static void callback_remove_self(const struct device *dev, + struct gpio_callback *gpio_cb, u32_t pins) { struct drv_data *dd = CONTAINER_OF(gpio_cb, struct drv_data, gpio_cb); @@ -39,7 +39,7 @@ static void callback_remove_self(struct device *dev, dd->aux = gpio_remove_callback(dev, gpio_cb); } -static int init_callback(struct device *dev, +static int init_callback(const struct device *dev, gpio_callback_handler_t handler_1, gpio_callback_handler_t handler_2) { @@ -72,7 +72,7 @@ static int init_callback(struct device *dev, return rc; } -static void trigger_callback(struct device *dev, int enable_cb) +static void trigger_callback(const struct device *dev, int enable_cb) { gpio_pin_set(dev, PIN_OUT, 0); k_sleep(K_MSEC(100)); @@ -91,7 +91,7 @@ static void trigger_callback(struct device *dev, int enable_cb) static int test_callback_add_remove(void) { - struct device *dev = device_get_binding(DEV_NAME); + const struct device *dev = device_get_binding(DEV_NAME); /* SetUp: initialize environment */ int rc = init_callback(dev, callback_1, callback_2); @@ -140,7 +140,7 @@ static int test_callback_add_remove(void) static int test_callback_self_remove(void) { int res = TC_FAIL; - struct device *dev = device_get_binding(DEV_NAME); + const struct device *dev = device_get_binding(DEV_NAME); /* SetUp: initialize environment */ int rc = init_callback(dev, callback_1, callback_remove_self); @@ -192,7 +192,7 @@ static int test_callback_self_remove(void) static int test_callback_enable_disable(void) { - struct device *dev = device_get_binding(DEV_NAME); + const struct device *dev = device_get_binding(DEV_NAME); /* SetUp: initialize environment */ int rc = init_callback(dev, callback_1, callback_2); diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c index 40de70e75528..30e2f798f2a4 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c +++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c @@ -18,7 +18,7 @@ static struct drv_data data; static int cb_cnt; -static void callback(struct device *dev, +static void callback(const struct device *dev, struct gpio_callback *gpio_cb, u32_t pins) { const struct drv_data *dd = CONTAINER_OF(gpio_cb, @@ -41,7 +41,7 @@ static void callback(struct device *dev, static int test_callback(int mode) { - struct device *dev = device_get_binding(DEV_NAME); + const struct device *dev = device_get_binding(DEV_NAME); struct drv_data *drv_data = &data; gpio_pin_interrupt_configure(dev, PIN_IN, GPIO_INT_DISABLE); diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c b/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c index e4a28677c8a4..84a92267ddce 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c +++ b/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c @@ -18,7 +18,7 @@ static struct drv_data data; static int cb_cnt; -static void callback(struct device *dev, +static void callback(const struct device *dev, struct gpio_callback *gpio_cb, u32_t pins) { int rc; @@ -53,7 +53,7 @@ static void callback(struct device *dev, static int test_callback(gpio_flags_t int_flags) { - struct device *dev = device_get_binding(DEV_NAME); + const struct device *dev = device_get_binding(DEV_NAME); struct drv_data *drv_data = &data; bool active_level = (int_flags & GPIO_INT_ACTIVE_HIGH) != 0; int rc; diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio_port.c b/tests/drivers/gpio/gpio_basic_api/src/test_gpio_port.c index 93a4f8753bca..0af3cdc5cf1d 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio_port.c +++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio_port.c @@ -16,7 +16,7 @@ #define ALL_BITS ((gpio_port_value_t)-1) -static struct device *dev; +static const struct device *dev; /* Short-hand for a checked read of PIN_IN raw state */ static bool raw_in(void) diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c index 6df2bc8683ac..40612d5f3389 100644 --- a/tests/drivers/i2c/i2c_api/src/test_i2c.c +++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c @@ -31,7 +31,7 @@ u32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER; static int test_gy271(void) { unsigned char datas[6]; - struct device *i2c_dev = device_get_binding(I2C_DEV_NAME); + const struct device *i2c_dev = device_get_binding(I2C_DEV_NAME); if (!i2c_dev) { TC_PRINT("Cannot get I2C device\n"); @@ -86,7 +86,7 @@ static int test_gy271(void) static int test_burst_gy271(void) { unsigned char datas[6]; - struct device *i2c_dev = device_get_binding(I2C_DEV_NAME); + const struct device *i2c_dev = device_get_binding(I2C_DEV_NAME); if (!i2c_dev) { TC_PRINT("Cannot get I2C device\n"); diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c index 1c55ef9016c6..e17f61661a1d 100644 --- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c +++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c @@ -21,7 +21,7 @@ struct i2c_virtual_data { sys_slist_t slaves; }; -int i2c_virtual_runtime_configure(struct device *dev, u32_t config) +int i2c_virtual_runtime_configure(const struct device *dev, u32_t config) { return 0; } @@ -47,7 +47,7 @@ static struct i2c_slave_config *find_address(struct i2c_virtual_data *data, } /* Attach I2C slaves */ -int i2c_virtual_slave_register(struct device *dev, +int i2c_virtual_slave_register(const struct device *dev, struct i2c_slave_config *config) { struct i2c_virtual_data *data = DEV_DATA(dev); @@ -68,7 +68,7 @@ int i2c_virtual_slave_register(struct device *dev, } -int i2c_virtual_slave_unregister(struct device *dev, +int i2c_virtual_slave_unregister(const struct device *dev, struct i2c_slave_config *config) { struct i2c_virtual_data *data = DEV_DATA(dev); @@ -84,7 +84,8 @@ int i2c_virtual_slave_unregister(struct device *dev, return 0; } -static int i2c_virtual_msg_write(struct device *dev, struct i2c_msg *msg, +static int i2c_virtual_msg_write(const struct device *dev, + struct i2c_msg *msg, struct i2c_slave_config *config, bool prev_write) { @@ -118,7 +119,7 @@ static int i2c_virtual_msg_write(struct device *dev, struct i2c_msg *msg, return -EIO; } -static int i2c_virtual_msg_read(struct device *dev, struct i2c_msg *msg, +static int i2c_virtual_msg_read(const struct device *dev, struct i2c_msg *msg, struct i2c_slave_config *config) { unsigned int len = msg->len; @@ -147,8 +148,8 @@ static int i2c_virtual_msg_read(struct device *dev, struct i2c_msg *msg, #define OPERATION(msg) (((struct i2c_msg *) msg)->flags & I2C_MSG_RW_MASK) -static int i2c_virtual_transfer(struct device *dev, struct i2c_msg *msg, - u8_t num_msgs, u16_t slave) +static int i2c_virtual_transfer(const struct device *dev, struct i2c_msg *msg, + u8_t num_msgs, u16_t slave) { struct i2c_virtual_data *data = DEV_DATA(dev); struct i2c_msg *current, *next; @@ -212,7 +213,7 @@ static const struct i2c_driver_api api_funcs = { .slave_unregister = i2c_virtual_slave_unregister, }; -static int i2c_virtual_init(struct device *dev) +static int i2c_virtual_init(const struct device *dev) { struct i2c_virtual_data *data = DEV_DATA(dev); diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c index 17476a45b4a7..32e57a8515ea 100644 --- a/tests/drivers/i2c/i2c_slave_api/src/main.c +++ b/tests/drivers/i2c/i2c_slave_api/src/main.c @@ -43,7 +43,8 @@ static void to_display_format(const u8_t *src, size_t size, char *dst) } } -static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer) +static void run_full_read(const struct device *i2c, u8_t addr, + u8_t *comp_buffer) { int ret; @@ -69,7 +70,8 @@ static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer) } } -static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer, +static void run_partial_read(const struct device *i2c, u8_t addr, + u8_t *comp_buffer, unsigned int offset) { int ret; @@ -95,7 +97,8 @@ static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer, } } -static void run_program_read(struct device *i2c, u8_t addr, unsigned int offset) +static void run_program_read(const struct device *i2c, u8_t addr, + unsigned int offset) { int ret, i; @@ -131,10 +134,10 @@ static void run_program_read(struct device *i2c, u8_t addr, unsigned int offset) void test_eeprom_slave(void) { - struct device *eeprom_0; - struct device *eeprom_1; - struct device *i2c_0; - struct device *i2c_1; + const struct device *eeprom_0; + const struct device *eeprom_1; + const struct device *i2c_0; + const struct device *i2c_1; int ret, offset; diff --git a/tests/drivers/i2s/i2s_api/src/common.c b/tests/drivers/i2s/i2s_api/src/common.c index bd8e6a4404e7..bfe002e465e3 100644 --- a/tests/drivers/i2s/i2s_api/src/common.c +++ b/tests/drivers/i2s/i2s_api/src/common.c @@ -81,7 +81,7 @@ int verify_buf_const(s16_t *rx_block, s16_t val_l, s16_t val_r) return TC_PASS; } -int tx_block_write_slab(struct device *dev_i2s, int att, int err, +int tx_block_write_slab(const struct device *dev_i2s, int att, int err, struct k_mem_slab *slab) { char tx_block[BLOCK_SIZE]; @@ -98,7 +98,7 @@ int tx_block_write_slab(struct device *dev_i2s, int att, int err, return TC_PASS; } -int rx_block_read_slab(struct device *dev_i2s, int att, +int rx_block_read_slab(const struct device *dev_i2s, int att, struct k_mem_slab *slab) { char rx_block[BLOCK_SIZE]; diff --git a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h index 8a661bf13758..6ff36f6906e8 100644 --- a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h +++ b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h @@ -43,9 +43,9 @@ extern s16_t data_r[SAMPLE_NO]; #define I2S_DEV_NAME "I2S_0" #define BLOCK_SIZE (2 * sizeof(data_l)) -int rx_block_read_slab(struct device *dev_i2s, int att, +int rx_block_read_slab(const struct device *dev_i2s, int att, struct k_mem_slab *slab); -int tx_block_write_slab(struct device *dev_i2s, int att, int err, +int tx_block_write_slab(const struct device *dev_i2s, int att, int err, struct k_mem_slab *slab); void fill_buf_const(s16_t *tx_block, s16_t val_l, s16_t val_r); diff --git a/tests/drivers/i2s/i2s_api/src/main.c b/tests/drivers/i2s/i2s_api/src/main.c index 861c29aa7677..6a8d8218cfc2 100644 --- a/tests/drivers/i2s/i2s_api/src/main.c +++ b/tests/drivers/i2s/i2s_api/src/main.c @@ -19,7 +19,7 @@ void test_main(void) { - struct device *dev_i2s; + const struct device *dev_i2s; k_thread_access_grant(k_current_get(), &rx_0_mem_slab, &tx_0_mem_slab, diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c index 8f4b806dbdee..f7c055fd7f03 100644 --- a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c +++ b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c @@ -22,11 +22,11 @@ K_MEM_SLAB_DEFINE(rx_0_mem_slab, BLOCK_SIZE, NUM_RX_BLOCKS, 32); K_MEM_SLAB_DEFINE(tx_0_mem_slab, BLOCK_SIZE, NUM_TX_BLOCKS, 32); -static int tx_block_write(struct device *dev_i2s, int att, int err) +static int tx_block_write(const struct device *dev_i2s, int att, int err) { return tx_block_write_slab(dev_i2s, att, err, &tx_0_mem_slab); } -static int rx_block_read(struct device *dev_i2s, int att) +static int rx_block_read(const struct device *dev_i2s, int att) { return rx_block_read_slab(dev_i2s, att, &rx_0_mem_slab); } @@ -34,7 +34,7 @@ static int rx_block_read(struct device *dev_i2s, int att) /** Configure I2S TX transfer. */ void test_i2s_tx_transfer_configure_0(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -60,7 +60,7 @@ void test_i2s_tx_transfer_configure_0(void) /** Configure I2S RX transfer. */ void test_i2s_rx_transfer_configure_0(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -93,7 +93,7 @@ void test_i2s_rx_transfer_configure_0(void) */ void test_i2s_transfer_short(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); @@ -157,7 +157,7 @@ void test_i2s_transfer_short(void) */ void test_i2s_transfer_long(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); @@ -209,7 +209,7 @@ void test_i2s_transfer_long(void) */ void test_i2s_rx_sync_start(void) { - struct device *dev_i2s; + const struct device *dev_i2s; size_t rx_size; int ret; char buf[BLOCK_SIZE]; @@ -259,7 +259,7 @@ void test_i2s_rx_sync_start(void) */ void test_i2s_rx_empty_timeout(void) { - struct device *dev_i2s; + const struct device *dev_i2s; size_t rx_size; int ret; char buf[BLOCK_SIZE]; @@ -279,7 +279,7 @@ void test_i2s_rx_empty_timeout(void) */ void test_i2s_transfer_restart(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); @@ -362,7 +362,7 @@ void test_i2s_transfer_restart(void) */ void test_i2s_transfer_rx_overrun(void) { - struct device *dev_i2s; + const struct device *dev_i2s; size_t rx_size; int ret; char rx_buf[BLOCK_SIZE]; @@ -434,7 +434,7 @@ void test_i2s_transfer_rx_overrun(void) */ void test_i2s_transfer_tx_underrun(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c index e0aa03118eea..b1471f592257 100644 --- a/tests/drivers/i2s/i2s_api/src/test_i2s_states.c +++ b/tests/drivers/i2s/i2s_api/src/test_i2s_states.c @@ -24,11 +24,11 @@ K_MEM_SLAB_DEFINE(rx_1_mem_slab, BLOCK_SIZE, NUM_RX_BLOCKS, 32); K_MEM_SLAB_DEFINE(tx_1_mem_slab, BLOCK_SIZE, NUM_TX_BLOCKS, 32); -static int tx_block_write(struct device *dev_i2s, int att, int err) +static int tx_block_write(const struct device *dev_i2s, int att, int err) { return tx_block_write_slab(dev_i2s, att, err, &tx_1_mem_slab); } -static int rx_block_read(struct device *dev_i2s, int att) +static int rx_block_read(const struct device *dev_i2s, int att) { return rx_block_read_slab(dev_i2s, att, &rx_1_mem_slab); } @@ -36,7 +36,7 @@ static int rx_block_read(struct device *dev_i2s, int att) /** Configure I2S TX transfer. */ void test_i2s_tx_transfer_configure_1(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -62,7 +62,7 @@ void test_i2s_tx_transfer_configure_1(void) /** Configure I2S RX transfer. */ void test_i2s_rx_transfer_configure_1(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -94,7 +94,7 @@ void test_i2s_rx_transfer_configure_1(void) */ void test_i2s_state_not_ready_neg(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; size_t rx_size; int ret; @@ -158,7 +158,7 @@ void test_i2s_state_not_ready_neg(void) */ void test_i2s_state_ready_neg(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -218,7 +218,7 @@ void test_i2s_state_ready_neg(void) */ void test_i2s_state_running_neg(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); @@ -273,7 +273,7 @@ void test_i2s_state_running_neg(void) */ void test_i2s_state_stopping_neg(void) { - struct device *dev_i2s; + const struct device *dev_i2s; int ret; dev_i2s = device_get_binding(I2S_DEV_NAME); @@ -335,7 +335,7 @@ void test_i2s_state_stopping_neg(void) */ void test_i2s_state_error_neg(void) { - struct device *dev_i2s; + const struct device *dev_i2s; size_t rx_size; int ret; char rx_buf[BLOCK_SIZE]; diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c index f3382a31955d..14c4f3049dfb 100644 --- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c +++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c @@ -83,7 +83,7 @@ static int verify_buf(s16_t *rx_block, int att) /** Configure I2S TX transfer. */ void test_i2s_tx_transfer_configure(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -109,7 +109,7 @@ void test_i2s_tx_transfer_configure(void) /** Configure I2S RX transfer. */ void test_i2s_rx_transfer_configure(void) { - struct device *dev_i2s; + const struct device *dev_i2s; struct i2s_config i2s_cfg; int ret; @@ -142,7 +142,7 @@ void test_i2s_rx_transfer_configure(void) */ void test_i2s_transfer_short(void) { - struct device *dev_i2s; + const struct device *dev_i2s; void *rx_block[3]; void *tx_block; size_t rx_size; @@ -218,7 +218,7 @@ void test_i2s_transfer_short(void) */ void test_i2s_transfer_long(void) { - struct device *dev_i2s; + const struct device *dev_i2s; void *rx_block[NUM_BLOCKS]; void *tx_block[NUM_BLOCKS]; size_t rx_size; diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c index 0b723d52f6c6..182d7a05dd40 100644 --- a/tests/drivers/ipm/src/ipm_dummy.c +++ b/tests/drivers/ipm/src/ipm_dummy.c @@ -23,7 +23,7 @@ */ static void ipm_dummy_isr(void *data) { - struct device *d = (struct device *)data; + const struct device *d = (const struct device *)data; struct ipm_dummy_driver_data *driver_data = d->driver_data; /* In a real driver the interrupt simply wouldn't fire, we fake @@ -43,7 +43,7 @@ static void ipm_dummy_isr(void *data) /* IPM API functions for the dummy driver */ -static int ipm_dummy_send(struct device *d, int wait, u32_t id, +static int ipm_dummy_send(const struct device *d, int wait, u32_t id, const void *data, int size) { struct ipm_dummy_driver_data *driver_data; @@ -69,7 +69,7 @@ static int ipm_dummy_send(struct device *d, int wait, u32_t id, driver_data->regs.id = id; driver_data->regs.busy = 1U; - irq_offload(ipm_dummy_isr, d); + irq_offload(ipm_dummy_isr, (void *)d); if (wait) { while (driver_data->regs.busy) { @@ -79,7 +79,8 @@ static int ipm_dummy_send(struct device *d, int wait, u32_t id, return 0; } -static void ipm_dummy_register_callback(struct device *d, ipm_callback_t cb, +static void ipm_dummy_register_callback(const struct device *d, + ipm_callback_t cb, void *cb_context) { struct ipm_dummy_driver_data *driver_data; @@ -89,24 +90,24 @@ static void ipm_dummy_register_callback(struct device *d, ipm_callback_t cb, driver_data->cb_context = cb_context; } -static int ipm_dummy_set_enabled(struct device *d, int enable) +static int ipm_dummy_set_enabled(const struct device *d, int enable) { struct ipm_dummy_driver_data *driver_data = d->driver_data; driver_data->regs.enabled = enable; if (enable) { /* In case there are pending messages */ - irq_offload(ipm_dummy_isr, d); + irq_offload(ipm_dummy_isr, (void *)d); } return 0; } -static u32_t ipm_dummy_max_id_val_get(struct device *d) +static u32_t ipm_dummy_max_id_val_get(const struct device *d) { return 0xFFFFFFFF; } -static int ipm_dummy_max_data_size_get(struct device *d) +static int ipm_dummy_max_data_size_get(const struct device *d) { return DUMMY_IPM_DATA_WORDS * sizeof(u32_t); } @@ -123,7 +124,7 @@ struct ipm_driver_api ipm_dummy_api = { * to high-level drivers under test */ -int ipm_dummy_init(struct device *d) +int ipm_dummy_init(const struct device *d) { struct ipm_dummy_driver_data *driver_data; diff --git a/tests/drivers/ipm/src/ipm_dummy.h b/tests/drivers/ipm/src/ipm_dummy.h index 5b55ace9b040..1ace7b217b25 100644 --- a/tests/drivers/ipm/src/ipm_dummy.h +++ b/tests/drivers/ipm/src/ipm_dummy.h @@ -28,5 +28,5 @@ struct ipm_dummy_driver_data { volatile struct ipm_dummy_regs regs; }; -int ipm_dummy_init(struct device *d); +int ipm_dummy_init(const struct device *d); #endif diff --git a/tests/drivers/ipm/src/main.c b/tests/drivers/ipm/src/main.c index a3b4688a0935..cb1e77463539 100644 --- a/tests/drivers/ipm/src/main.c +++ b/tests/drivers/ipm/src/main.c @@ -76,7 +76,7 @@ static const char thestr[] = "everything is awesome\n"; void main(void) { int rv, i; - struct device *ipm; + const struct device *ipm; TC_START("Test IPM"); ipm = device_get_binding("ipm_dummy0"); diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c index 325fbbdcacf9..66c2c512a61b 100644 --- a/tests/drivers/kscan/kscan_api/src/test_kscan.c +++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c @@ -12,7 +12,8 @@ #define KSCAN_DEV_NAME DT_LABEL(DT_ALIAS(kscan0)) -static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed) +static void kb_callback(const struct device *dev, u32_t row, u32_t col, + bool pressed) { ARG_UNUSED(dev); ARG_UNUSED(row); @@ -22,7 +23,7 @@ static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed) static int test_kb_callback(void) { - struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); + const struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); if (!kscan_dev) { TC_PRINT("Cannot get KBSCAN device\n"); @@ -39,7 +40,7 @@ static int test_kb_callback(void) static int test_null_callback(void) { - struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); + const struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); if (!kscan_dev) { TC_PRINT("Cannot get KBSCAN device\n"); @@ -56,7 +57,7 @@ static int test_null_callback(void) static int test_disable_enable_callback(void) { - struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); + const struct device *kscan_dev = device_get_binding(KSCAN_DEV_NAME); if (!kscan_dev) { TC_PRINT("Cannot get KBSCAN device\n"); diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c index 05886a777590..441f67710d8f 100644 --- a/tests/drivers/pwm/pwm_api/src/test_pwm.c +++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c @@ -77,7 +77,7 @@ static int test_task(u32_t port, u32_t period, u32_t pulse, u8_t unit) TC_PRINT("[PWM]: %" PRIu8 ", [period]: %" PRIu32 ", [pulse]: %" PRIu32 "\n", port, period, pulse); - struct device *pwm_dev = device_get_binding(PWM_DEV_NAME); + const struct device *pwm_dev = device_get_binding(PWM_DEV_NAME); if (!pwm_dev) { TC_PRINT("Cannot get PWM device\n"); diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c index b688188591be..4c9246b394fe 100644 --- a/tests/drivers/spi/spi_loopback/src/spi.c +++ b/tests/drivers/spi/spi_loopback/src/spi.c @@ -102,7 +102,7 @@ static int cs_ctrl_gpio_config(void) #endif /* CONFIG_SPI_LOOPBACK_CS_GPIO */ /* test transferring different buffers on the same dma channels */ -static int spi_complete_multiple(struct device *dev, +static int spi_complete_multiple(const struct device *dev, struct spi_config *spi_conf) { struct spi_buf tx_bufs[2]; @@ -167,7 +167,8 @@ static int spi_complete_multiple(struct device *dev, return 0; } -static int spi_complete_loop(struct device *dev, struct spi_config *spi_conf) +static int spi_complete_loop(const struct device *dev, + struct spi_config *spi_conf) { const struct spi_buf tx_bufs[] = { { @@ -217,7 +218,8 @@ static int spi_complete_loop(struct device *dev, struct spi_config *spi_conf) return 0; } -static int spi_null_tx_buf(struct device *dev, struct spi_config *spi_conf) +static int spi_null_tx_buf(const struct device *dev, + struct spi_config *spi_conf) { static const u8_t EXPECTED_NOP_RETURN_BUF[BUF_SIZE] = { 0 }; (void)memset(buffer_rx, 0x77, BUF_SIZE); @@ -272,7 +274,8 @@ static int spi_null_tx_buf(struct device *dev, struct spi_config *spi_conf) return 0; } -static int spi_rx_half_start(struct device *dev, struct spi_config *spi_conf) +static int spi_rx_half_start(const struct device *dev, + struct spi_config *spi_conf) { const struct spi_buf tx_bufs[] = { { @@ -323,7 +326,8 @@ static int spi_rx_half_start(struct device *dev, struct spi_config *spi_conf) return 0; } -static int spi_rx_half_end(struct device *dev, struct spi_config *spi_conf) +static int spi_rx_half_end(const struct device *dev, + struct spi_config *spi_conf) { const struct spi_buf tx_bufs[] = { { @@ -383,7 +387,8 @@ static int spi_rx_half_end(struct device *dev, struct spi_config *spi_conf) return 0; } -static int spi_rx_every_4(struct device *dev, struct spi_config *spi_conf) +static int spi_rx_every_4(const struct device *dev, + struct spi_config *spi_conf) { const struct spi_buf tx_bufs[] = { { @@ -491,7 +496,8 @@ static void spi_async_call_cb(struct k_poll_event *async_evt, } } -static int spi_async_call(struct device *dev, struct spi_config *spi_conf) +static int spi_async_call(const struct device *dev, + struct spi_config *spi_conf) { const struct spi_buf tx_bufs[] = { { @@ -543,9 +549,9 @@ static int spi_async_call(struct device *dev, struct spi_config *spi_conf) } #endif -static int spi_resource_lock_test(struct device *lock_dev, +static int spi_resource_lock_test(const struct device *lock_dev, struct spi_config *spi_conf_lock, - struct device *try_dev, + const struct device *try_dev, struct spi_config *spi_conf_try) { spi_conf_lock->operation |= SPI_LOCK_ON; @@ -573,8 +579,8 @@ void test_spi_loopback(void) struct k_thread async_thread; k_tid_t async_thread_id; #endif - struct device *spi_slow; - struct device *spi_fast; + const struct device *spi_slow; + const struct device *spi_fast; LOG_INF("SPI test on buffers TX/RX %p/%p", buffer_tx, buffer_rx); diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c index c268726decf6..01716581fb9d 100644 --- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c +++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c @@ -15,7 +15,7 @@ K_SEM_DEFINE(rx_disabled, 0, 1); #ifdef CONFIG_USERSPACE void set_permissions(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); k_thread_access_grant(k_current_get(), &tx_done, &tx_aborted, &rx_rdy, &rx_buf_released, &rx_disabled, @@ -51,7 +51,7 @@ ZTEST_BMEM volatile u32_t tx_aborted_count; void test_single_read_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_single_read_callback, @@ -60,7 +60,7 @@ void test_single_read_setup(void) void test_single_read(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t rx_buf[10] = {0}; @@ -98,7 +98,7 @@ ZTEST_BMEM volatile size_t read_len; void test_chained_read_callback(struct uart_event *evt, void *user_data) { - struct device *uart_dev = (struct device *) user_data; + const struct device *uart_dev = (const struct device *) user_data; switch (evt->type) { case UART_TX_DONE: @@ -133,14 +133,14 @@ void test_chained_read_callback(struct uart_event *evt, void *user_data) void test_chained_read_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_chained_read_callback, uart_dev); } void test_chained_read(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t tx_buf[10]; uart_rx_enable(uart_dev, chained_read_buf0, 10, 50); @@ -172,7 +172,7 @@ ZTEST_DMEM u8_t *next_buf = double_buffer[1]; void test_double_buffer_callback(struct uart_event *evt, void *user_data) { - struct device *uart_dev = (struct device *) user_data; + const struct device *uart_dev = (const struct device *) user_data; switch (evt->type) { case UART_TX_DONE: @@ -200,14 +200,14 @@ void test_double_buffer_callback(struct uart_event *evt, void *user_data) void test_double_buffer_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_double_buffer_callback, uart_dev); } void test_double_buffer(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t tx_buf[4]; zassert_equal(uart_rx_enable(uart_dev, @@ -255,14 +255,14 @@ void test_read_abort_callback(struct uart_event *evt, void *user_data) void test_read_abort_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_read_abort_callback, NULL); } void test_read_abort(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t rx_buf[100]; u8_t tx_buf[100]; @@ -321,14 +321,14 @@ void test_write_abort_callback(struct uart_event *evt, void *user_data) void test_write_abort_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_write_abort_callback, NULL); } void test_write_abort(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t rx_buf[100]; u8_t tx_buf[100]; @@ -388,14 +388,14 @@ void test_forever_timeout_callback(struct uart_event *evt, void *user_data) void test_forever_timeout_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_forever_timeout_callback, NULL); } void test_forever_timeout(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t rx_buf[100]; u8_t tx_buf[100]; @@ -437,7 +437,7 @@ ZTEST_BMEM volatile u8_t tx_sent; void test_chained_write_callback(struct uart_event *evt, void *user_data) { - struct device *uart_dev = (struct device *) user_data; + const struct device *uart_dev = (const struct device *) user_data; switch (evt->type) { case UART_TX_DONE: @@ -469,14 +469,14 @@ void test_chained_write_callback(struct uart_event *evt, void *user_data) void test_chained_write_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_chained_write_callback, uart_dev); } void test_chained_write(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); u8_t rx_buf[20]; @@ -512,7 +512,7 @@ ZTEST_BMEM size_t long_received[2]; void test_long_buffers_callback(struct uart_event *evt, void *user_data) { - struct device *uart_dev = (struct device *) user_data; + const struct device *uart_dev = (const struct device *) user_data; static bool next_buf = true; switch (evt->type) { @@ -548,14 +548,14 @@ void test_long_buffers_callback(struct uart_event *evt, void *user_data) void test_long_buffers_setup(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); uart_callback_set(uart_dev, test_long_buffers_callback, uart_dev); } void test_long_buffers(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); memset(long_rx_buf, 0, sizeof(long_rx_buf)); memset(long_tx_buf, 1, sizeof(long_tx_buf)); diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_config.c b/tests/drivers/uart/uart_basic_api/src/test_uart_config.c index e80ceb187711..3c24866996ec 100644 --- a/tests/drivers/uart/uart_basic_api/src/test_uart_config.c +++ b/tests/drivers/uart/uart_basic_api/src/test_uart_config.c @@ -36,7 +36,7 @@ const struct uart_config uart_cfg = { static int test_configure(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); if (!uart_dev) { TC_PRINT("Cannot get UART device\n"); @@ -58,7 +58,7 @@ static int test_configure(void) /* test UART configure get (retrieve configuration) */ static int test_config_get(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); if (!uart_dev) { TC_PRINT("Cannot get UART device\n"); diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c b/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c index 00805bd66db6..95131ca0b6b2 100644 --- a/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c +++ b/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c @@ -41,7 +41,7 @@ static const char fifo_data[] = "This is a FIFO test.\r\n"; #define DATA_SIZE (sizeof(fifo_data) - 1) -static void uart_fifo_callback(struct device *dev) +static void uart_fifo_callback(const struct device *dev) { u8_t recvData; static int tx_data_idx; @@ -90,7 +90,7 @@ static void uart_fifo_callback(struct device *dev) static int test_fifo_read(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); /* Verify uart_irq_callback_set() */ uart_irq_callback_set(uart_dev, uart_fifo_callback); @@ -113,7 +113,7 @@ static int test_fifo_read(void) static int test_fifo_fill(void) { - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); char_sent = 0; diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_poll.c b/tests/drivers/uart/uart_basic_api/src/test_uart_poll.c index 1fb6e5991b6b..9b536dc054fc 100644 --- a/tests/drivers/uart/uart_basic_api/src/test_uart_poll.c +++ b/tests/drivers/uart/uart_basic_api/src/test_uart_poll.c @@ -11,7 +11,7 @@ static const char *poll_data = "This is a POLL test.\r\n"; static int test_poll_in(void) { unsigned char recv_char; - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); if (!uart_dev) { TC_PRINT("Cannot get UART device\n"); @@ -38,7 +38,7 @@ static int test_poll_in(void) static int test_poll_out(void) { int i; - struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); + const struct device *uart_dev = device_get_binding(UART_DEVICE_NAME); if (!uart_dev) { TC_PRINT("Cannot get UART device\n"); diff --git a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c index e5b19a8e332e..2a5b53e3f889 100644 --- a/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c +++ b/tests/drivers/watchdog/wdt_basic_api/src/test_wdt.c @@ -131,7 +131,7 @@ volatile uint32_t m_testcase_index __attribute__((section(".noinit.test_wdt"))); volatile uint32_t m_testvalue __attribute__((section(".noinit.test_wdt"))); #if TEST_WDT_CALLBACK_1 -static void wdt_int_cb0(struct device *wdt_dev, int channel_id) +static void wdt_int_cb0(const struct device *wdt_dev, int channel_id) { ARG_UNUSED(wdt_dev); ARG_UNUSED(channel_id); @@ -140,7 +140,7 @@ static void wdt_int_cb0(struct device *wdt_dev, int channel_id) #endif #if TEST_WDT_CALLBACK_2 -static void wdt_int_cb1(struct device *wdt_dev, int channel_id) +static void wdt_int_cb1(const struct device *wdt_dev, int channel_id) { ARG_UNUSED(wdt_dev); ARG_UNUSED(channel_id); @@ -151,7 +151,7 @@ static void wdt_int_cb1(struct device *wdt_dev, int channel_id) static int test_wdt_no_callback(void) { int err; - struct device *wdt = device_get_binding(WDT_DEV_NAME); + const struct device *wdt = device_get_binding(WDT_DEV_NAME); if (!wdt) { TC_PRINT("Cannot get WDT device\n"); @@ -192,7 +192,7 @@ static int test_wdt_no_callback(void) static int test_wdt_callback_1(void) { int err; - struct device *wdt = device_get_binding(WDT_DEV_NAME); + const struct device *wdt = device_get_binding(WDT_DEV_NAME); if (!wdt) { TC_PRINT("Cannot get WDT device\n"); @@ -241,7 +241,7 @@ static int test_wdt_callback_1(void) static int test_wdt_callback_2(void) { int err; - struct device *wdt = device_get_binding(WDT_DEV_NAME); + const struct device *wdt = device_get_binding(WDT_DEV_NAME); if (!wdt) { TC_PRINT("Cannot get WDT device\n"); @@ -302,7 +302,7 @@ static int test_wdt_callback_2(void) static int test_wdt_bad_window_max(void) { int err; - struct device *wdt = device_get_binding(WDT_DEV_NAME); + const struct device *wdt = device_get_binding(WDT_DEV_NAME); if (!wdt) { TC_PRINT("Cannot get WDT device\n"); diff --git a/tests/kernel/device/src/bad_driver.c b/tests/kernel/device/src/bad_driver.c index d6b1016f601c..aa6c04cffc47 100644 --- a/tests/kernel/device/src/bad_driver.c +++ b/tests/kernel/device/src/bad_driver.c @@ -10,7 +10,7 @@ #define BAD_DRIVER_NAME "bad_driver" -typedef int (*bad_api_configure_t)(struct device *dev, +typedef int (*bad_api_configure_t)(const struct device *dev, u32_t dev_config); @@ -18,7 +18,7 @@ struct bad_driver_api { bad_api_configure_t configure; }; -static int bad_configure(struct device *dev, u32_t config) +static int bad_configure(const struct device *dev, u32_t config) { return 0; } @@ -27,7 +27,7 @@ static const struct bad_driver_api funcs = { .configure = bad_configure, }; -int bad_driver_init(struct device *dev) +int bad_driver_init(const struct device *dev) { return -EINVAL; } diff --git a/tests/kernel/device/src/dummy_driver.c b/tests/kernel/device/src/dummy_driver.c index b8b57dba53e2..c6d88d170ddf 100644 --- a/tests/kernel/device/src/dummy_driver.c +++ b/tests/kernel/device/src/dummy_driver.c @@ -10,7 +10,7 @@ #define DUMMY_DRIVER_NAME "dummy_driver" -typedef int (*dummy_api_configure_t)(struct device *dev, +typedef int (*dummy_api_configure_t)(const struct device *dev, u32_t dev_config); @@ -18,7 +18,7 @@ struct dummy_driver_api { dummy_api_configure_t configure; }; -static int dummy_configure(struct device *dev, u32_t config) +static int dummy_configure(const struct device *dev, u32_t config) { return 0; } @@ -27,7 +27,7 @@ static const struct dummy_driver_api funcs = { .configure = dummy_configure, }; -int dummy_init(struct device *dev) +int dummy_init(const struct device *dev) { return 0; } diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c index 579aa3c316b4..7276745fcacc 100644 --- a/tests/kernel/device/src/main.c +++ b/tests/kernel/device/src/main.c @@ -39,7 +39,7 @@ */ void test_dummy_device(void) { - struct device *dev; + const struct device *dev; dev = device_get_binding(DUMMY_PORT_1); zassert_equal(dev, NULL, NULL); @@ -65,7 +65,7 @@ void test_dummy_device(void) */ static void test_dynamic_name(void) { - struct device *mux; + const struct device *mux; char name[sizeof(DUMMY_PORT_2)]; snprintk(name, sizeof(name), "%s", DUMMY_PORT_2); @@ -83,7 +83,7 @@ static void test_dynamic_name(void) */ static void test_bogus_dynamic_name(void) { - struct device *mux; + const struct device *mux; char name[64]; snprintk(name, sizeof(name), "ANOTHER_BOGUS_NAME"); @@ -108,22 +108,22 @@ static int add_init_record(bool pre_kernel) return 0; } -static int pre1_fn(struct device *dev) +static int pre1_fn(const struct device *dev) { return add_init_record(true); } -static int pre2_fn(struct device *dev) +static int pre2_fn(const struct device *dev) { return add_init_record(true); } -static int post_fn(struct device *dev) +static int post_fn(const struct device *dev) { return add_init_record(false); } -static int app_fn(struct device *dev) +static int app_fn(const struct device *dev) { return add_init_record(false); } @@ -178,7 +178,7 @@ void test_pre_kernel_detection(void) static void test_build_suspend_device_list(void) { int devcount; - struct device *devices; + const struct device *devices; device_list_get(&devices, &devcount); zassert_false((devcount == 0), NULL); @@ -197,7 +197,7 @@ static void test_build_suspend_device_list(void) */ void test_dummy_device_pm(void) { - struct device *dev; + const struct device *dev; int busy, ret; dev = device_get_binding(DUMMY_PORT_2); diff --git a/tests/kernel/early_sleep/src/main.c b/tests/kernel/early_sleep/src/main.c index 82340e7a0338..c19da9e8961f 100644 --- a/tests/kernel/early_sleep/src/main.c +++ b/tests/kernel/early_sleep/src/main.c @@ -65,7 +65,7 @@ static int ticks_to_sleep(int ticks) } -static int test_early_sleep_post_kernel(struct device *unused) +static int test_early_sleep_post_kernel(const struct device *unused) { ARG_UNUSED(unused); actual_post_kernel_sleep_ticks = ticks_to_sleep(TEST_TICKS_TO_SLEEP); @@ -75,7 +75,7 @@ static int test_early_sleep_post_kernel(struct device *unused) SYS_INIT(test_early_sleep_post_kernel, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); -static int test_early_sleep_app(struct device *unused) +static int test_early_sleep_app(const struct device *unused) { ARG_UNUSED(unused); actual_app_sleep_ticks = ticks_to_sleep(TEST_TICKS_TO_SLEEP); diff --git a/tests/lib/devicetree/src/main.c b/tests/lib/devicetree/src/main.c index f38922c53f3e..0b0e0b513213 100644 --- a/tests/lib/devicetree/src/main.c +++ b/tests/lib/devicetree/src/main.c @@ -1180,7 +1180,7 @@ struct test_gpio_data { bool is_gpio_ctlr; }; -static int test_gpio_init(struct device *dev) +static int test_gpio_init(const struct device *dev) { struct test_gpio_data *data = dev->driver_data; @@ -1214,21 +1214,21 @@ static const struct gpio_driver_api test_api; DT_INST_FOREACH_STATUS_OKAY(TEST_GPIO_INIT) -static inline struct test_gpio_data *to_data(struct device *dev) +static inline struct test_gpio_data *to_data(const struct device *dev) { return (struct test_gpio_data *)dev->driver_data; } -static inline const struct test_gpio_info *to_info(struct device *dev) +static inline const struct test_gpio_info *to_info(const struct device *dev) { return (const struct test_gpio_info *)dev->config_info; } static void test_devices(void) { - struct device *devs[3]; + const struct device *devs[3]; int i = 0; - struct device *dev_abcd; + const struct device *dev_abcd; unsigned int val; zassert_equal(DT_NUM_INST_STATUS_OKAY(vnd_gpio), 2, diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c index 0a779c279a93..b081d3e07557 100644 --- a/tests/net/6lo/src/main.c +++ b/tests/net/6lo/src/main.c @@ -245,7 +245,7 @@ struct net_6lo_data { } __packed; -int net_6lo_dev_init(struct device *dev) +int net_6lo_dev_init(const struct device *dev) { struct net_6lo_context *net_6lo_context = dev->driver_data; @@ -259,7 +259,7 @@ static void net_6lo_iface_init(struct net_if *iface) net_if_set_link_addr(iface, src_mac, 8, NET_LINK_IEEE802154); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { return 0; } diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c index fb6f1d41ce52..f98ed75864fe 100644 --- a/tests/net/arp/src/main.c +++ b/tests/net/arp/src/main.c @@ -49,7 +49,7 @@ struct net_arp_context { struct net_linkaddr ll_addr; }; -int net_arp_dev_init(struct device *dev) +int net_arp_dev_init(const struct device *dev) { struct net_arp_context *net_arp_context = dev->driver_data; @@ -58,7 +58,7 @@ int net_arp_dev_init(struct device *dev) return 0; } -static u8_t *net_arp_get_mac(struct device *dev) +static u8_t *net_arp_get_mac(const struct device *dev) { struct net_arp_context *context = dev->driver_data; @@ -82,7 +82,7 @@ static void net_arp_iface_init(struct net_if *iface) net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct net_eth_hdr *hdr; diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c index 0fd45e391b98..2c0d5ccaacae 100644 --- a/tests/net/checksum_offload/src/main.c +++ b/tests/net/checksum_offload/src/main.c @@ -95,7 +95,7 @@ static struct eth_context eth_context_offloading_enabled; static void eth_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_addr, @@ -135,7 +135,8 @@ static u16_t get_udp_chksum(struct net_pkt *pkt) return udp_hdr->chksum; } -static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt) +static int eth_tx_offloading_disabled(const struct device *dev, + struct net_pkt *pkt) { struct eth_context *context = dev->driver_data; @@ -214,7 +215,8 @@ static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt) return 0; } -static int eth_tx_offloading_enabled(struct device *dev, struct net_pkt *pkt) +static int eth_tx_offloading_enabled(const struct device *dev, + struct net_pkt *pkt) { struct eth_context *context = dev->driver_data; @@ -242,13 +244,13 @@ static int eth_tx_offloading_enabled(struct device *dev, struct net_pkt *pkt) return 0; } -static enum ethernet_hw_caps eth_offloading_enabled(struct device *dev) +static enum ethernet_hw_caps eth_offloading_enabled(const struct device *dev) { return ETHERNET_HW_TX_CHKSUM_OFFLOAD | ETHERNET_HW_RX_CHKSUM_OFFLOAD; } -static enum ethernet_hw_caps eth_offloading_disabled(struct device *dev) +static enum ethernet_hw_caps eth_offloading_disabled(const struct device *dev) { return 0; } @@ -278,7 +280,7 @@ static void generate_mac(u8_t *mac_addr) mac_addr[5] = sys_rand32_get(); } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c index 8e137ad830b0..92478687a159 100644 --- a/tests/net/context/src/main.c +++ b/tests/net/context/src/main.c @@ -856,12 +856,12 @@ struct net_context_test { struct net_linkaddr ll_addr; }; -int net_context_dev_init(struct device *dev) +int net_context_dev_init(const struct device *dev) { return 0; } -static u8_t *net_context_get_mac(struct device *dev) +static u8_t *net_context_get_mac(const struct device *dev) { struct net_context_test *context = dev->driver_data; @@ -886,7 +886,7 @@ static void net_context_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct net_udp_hdr hdr, *udp_hdr; diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c index 271d525d9ee8..ae06bb123419 100644 --- a/tests/net/dhcpv4/src/main.c +++ b/tests/net/dhcpv4/src/main.c @@ -163,7 +163,7 @@ struct net_dhcpv4_context { struct net_linkaddr ll_addr; }; -static int net_dhcpv4_dev_init(struct device *dev) +static int net_dhcpv4_dev_init(const struct device *dev) { struct net_dhcpv4_context *net_dhcpv4_context = dev->driver_data; @@ -172,7 +172,7 @@ static int net_dhcpv4_dev_init(struct device *dev) return 0; } -static u8_t *net_dhcpv4_get_mac(struct device *dev) +static u8_t *net_dhcpv4_get_mac(const struct device *dev) { struct net_dhcpv4_context *context = dev->driver_data; @@ -331,7 +331,7 @@ static int parse_dhcp_message(struct net_pkt *pkt, struct dhcp_msg *msg) return 0; } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct net_pkt *rpkt; struct dhcp_msg msg; diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c index 2daf4da5c756..431a54d3cf7f 100644 --- a/tests/net/ethernet_mgmt/src/main.c +++ b/tests/net/ethernet_mgmt/src/main.c @@ -41,7 +41,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -53,7 +53,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); @@ -62,7 +62,7 @@ static int eth_fake_send(struct device *dev, return 0; } -static enum ethernet_hw_caps eth_fake_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_fake_get_capabilities(const struct device *dev) { return ETHERNET_AUTO_NEGOTIATION_SET | ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T | ETHERNET_DUPLEX_SET | ETHERNET_QAV | @@ -115,7 +115,7 @@ static void eth_fake_recalc_qav_idle_slopes(struct eth_fake_context *ctx) } } -static int eth_fake_set_config(struct device *dev, +static int eth_fake_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -210,7 +210,7 @@ static int eth_fake_set_config(struct device *dev, return 0; } -static int eth_fake_get_config(struct device *dev, +static int eth_fake_get_config(const struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { @@ -272,7 +272,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { struct eth_fake_context *ctx = dev->driver_data; int i; @@ -445,7 +445,7 @@ static void test_change_same_duplex(void) static void test_change_qav_params(void) { struct net_if *iface = net_if_get_default(); - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; struct ethernet_req_params params; int available_priority_queues; diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c index c6b71f8fe7a5..891c0e4405cc 100644 --- a/tests/net/hostname/src/main.c +++ b/tests/net/hostname/src/main.c @@ -61,12 +61,12 @@ struct net_if_test { struct net_linkaddr ll_addr; }; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -94,7 +94,7 @@ static void net_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); @@ -139,7 +139,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -159,7 +159,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); @@ -173,7 +173,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { struct eth_fake_context *ctx = dev->driver_data; diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c index 7c77b1a44870..a9d364a55cd4 100644 --- a/tests/net/icmpv4/src/main.c +++ b/tests/net/icmpv4/src/main.c @@ -137,7 +137,7 @@ struct net_icmpv4_context { struct net_linkaddr ll_addr; }; -static int net_icmpv4_dev_init(struct device *dev) +static int net_icmpv4_dev_init(const struct device *dev) { struct net_icmpv4_context *net_icmpv4_context = dev->driver_data; @@ -146,7 +146,7 @@ static int net_icmpv4_dev_init(struct device *dev) return 0; } -static u8_t *net_icmpv4_get_mac(struct device *dev) +static u8_t *net_icmpv4_get_mac(const struct device *dev) { struct net_icmpv4_context *context = dev->driver_data; @@ -286,7 +286,7 @@ static int verify_echo_reply_with_opts(struct net_pkt *pkt) return 0; } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { if (current == TEST_ICMPV4_ECHO_REQ) { return verify_echo_reply(pkt); diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c index 2265ce370611..0fb4d01dde8e 100644 --- a/tests/net/ieee802154/fragment/src/main.c +++ b/tests/net/ieee802154/fragment/src/main.c @@ -159,7 +159,7 @@ struct net_fragment_data { } __packed; -int net_fragment_dev_init(struct device *dev) +int net_fragment_dev_init(const struct device *dev) { return 0; } @@ -171,7 +171,7 @@ static void net_fragment_iface_init(struct net_if *iface) net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { return 0; } diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c index 6c9dc47d68f8..d4ce6e0c857d 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c +++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c @@ -20,24 +20,24 @@ LOG_MODULE_REGISTER(net_ieee802154_fake_driver, LOG_LEVEL_DBG); extern struct net_pkt *current_pkt; extern struct k_sem driver_lock; -static enum ieee802154_hw_caps fake_get_capabilities(struct device *dev) +static enum ieee802154_hw_caps fake_get_capabilities(const struct device *dev) { return IEEE802154_HW_FCS | IEEE802154_HW_2_4_GHZ; } -static int fake_cca(struct device *dev) +static int fake_cca(const struct device *dev) { return 0; } -static int fake_set_channel(struct device *dev, u16_t channel) +static int fake_set_channel(const struct device *dev, u16_t channel) { NET_INFO("Channel %u\n", channel); return 0; } -static int fake_set_txpower(struct device *dev, s16_t dbm) +static int fake_set_txpower(const struct device *dev, s16_t dbm) { NET_INFO("TX power %d dbm\n", dbm); @@ -59,7 +59,7 @@ static inline void insert_frag(struct net_pkt *pkt, struct net_buf *frag) net_pkt_frag_add(current_pkt, new_frag); } -static int fake_tx(struct device *dev, +static int fake_tx(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) @@ -78,14 +78,14 @@ static int fake_tx(struct device *dev, return 0; } -static int fake_start(struct device *dev) +static int fake_start(const struct device *dev) { NET_INFO("FAKE ieee802154 driver started\n"); return 0; } -static int fake_stop(struct device *dev) +static int fake_stop(const struct device *dev) { NET_INFO("FAKE ieee802154 driver stopped\n"); @@ -107,7 +107,7 @@ static void fake_iface_init(struct net_if *iface) NET_INFO("FAKE ieee802154 iface initialized\n"); } -static int fake_init(struct device *dev) +static int fake_init(const struct device *dev) { fake_stop(dev); diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c index ecede5c53574..7fb4fda56e25 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_test.c +++ b/tests/net/ieee802154/l2/src/ieee802154_test.c @@ -263,7 +263,7 @@ static bool test_ack_reply(struct ieee802154_pkt_test *t) static bool initialize_test_environment(void) { - struct device *dev; + const struct device *dev; k_sem_reset(&driver_lock); diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c index 90e4e3c05c38..374d08062278 100644 --- a/tests/net/iface/src/main.c +++ b/tests/net/iface/src/main.c @@ -74,12 +74,12 @@ struct net_if_test { struct net_linkaddr ll_addr; }; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -107,7 +107,7 @@ static void net_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); @@ -194,7 +194,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -206,7 +206,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); @@ -215,12 +215,12 @@ static int eth_fake_send(struct device *dev, return 0; } -static enum ethernet_hw_caps eth_fake_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_fake_get_capabilities(const struct device *dev) { return ETHERNET_PROMISC_MODE; } -static int eth_fake_set_config(struct device *dev, +static int eth_fake_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -251,7 +251,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { struct eth_fake_context *ctx = dev->driver_data; diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c index 6c7dc8bcd8a5..f22f0c4a34eb 100644 --- a/tests/net/ip-addr/src/main.c +++ b/tests/net/ip-addr/src/main.c @@ -104,7 +104,7 @@ struct net_test_context { struct net_linkaddr ll_addr; }; -int net_test_init(struct device *dev) +int net_test_init(const struct device *dev) { struct net_test_context *net_test_context = dev->driver_data; @@ -113,7 +113,7 @@ int net_test_init(struct device *dev) return 0; } -static u8_t *net_test_get_mac(struct device *dev) +static u8_t *net_test_get_mac(const struct device *dev) { struct net_test_context *context = dev->driver_data; @@ -137,7 +137,7 @@ static void net_test_iface_init(struct net_if *iface) net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { return 0; } diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c index 9f4722a3873c..e1b33c104e17 100644 --- a/tests/net/ipv6/src/main.c +++ b/tests/net/ipv6/src/main.c @@ -138,12 +138,12 @@ struct net_test_ipv6 { struct net_linkaddr ll_addr; }; -int net_test_dev_init(struct device *dev) +int net_test_dev_init(const struct device *dev) { return 0; } -static u8_t *net_test_get_mac(struct device *dev) +static u8_t *net_test_get_mac(const struct device *dev) { struct net_test_ipv6 *context = dev->driver_data; @@ -225,7 +225,7 @@ static struct net_icmp_hdr *get_icmp_hdr(struct net_pkt *pkt) } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct net_icmp_hdr *icmp; diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c index 448ac5f28219..ca947c26a2b7 100644 --- a/tests/net/ipv6_fragment/src/main.c +++ b/tests/net/ipv6_fragment/src/main.c @@ -925,12 +925,12 @@ enum net_test_type { static enum net_test_type test_type = NO_TEST_TYPE; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -1327,7 +1327,7 @@ static int verify_fragment(struct net_pkt *pkt) return 0; } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { NET_DBG("No data to send!"); diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c index dccd086e1d29..170311df23f8 100644 --- a/tests/net/lib/dns_addremove/src/main.c +++ b/tests/net/lib/dns_addremove/src/main.c @@ -78,12 +78,12 @@ struct net_if_test { u8_t mac_addr[sizeof(struct net_eth_addr)]; }; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -108,7 +108,7 @@ static void net_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { DBG("No data to send!\n"); diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c index efb7107fec33..b4b9ea861aa8 100644 --- a/tests/net/lib/dns_resolve/src/main.c +++ b/tests/net/lib/dns_resolve/src/main.c @@ -76,12 +76,12 @@ struct net_if_test { struct net_linkaddr ll_addr; }; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -123,7 +123,7 @@ static inline int get_slot_by_id(struct dns_resolve_context *ctx, return -1; } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { DBG("No data to send!\n"); diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c index 2b05b2af1cfc..da5c191ff655 100644 --- a/tests/net/mgmt/src/mgmt.c +++ b/tests/net/mgmt/src/mgmt.c @@ -65,7 +65,7 @@ static int test_mgmt_request(u32_t mgmt_request, NET_MGMT_REGISTER_REQUEST_HANDLER(TEST_MGMT_REQUEST, test_mgmt_request); -int fake_dev_init(struct device *dev) +int fake_dev_init(const struct device *dev) { ARG_UNUSED(dev); @@ -79,7 +79,7 @@ static void fake_iface_init(struct net_if *iface) net_if_set_link_addr(iface, mac, 8, NET_LINK_DUMMY); } -static int fake_iface_send(struct device *dev, struct net_pkt *pkt) +static int fake_iface_send(const struct device *dev, struct net_pkt *pkt) { return 0; } diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c index 9cc3a922d92a..f62cd744046e 100644 --- a/tests/net/mld/src/main.c +++ b/tests/net/mld/src/main.c @@ -66,12 +66,12 @@ struct net_test_mld { struct net_linkaddr ll_addr; }; -int net_test_dev_init(struct device *dev) +int net_test_dev_init(const struct device *dev) { return 0; } -static u8_t *net_test_get_mac(struct device *dev) +static u8_t *net_test_get_mac(const struct device *dev) { struct net_test_mld *context = dev->driver_data; @@ -106,7 +106,7 @@ static struct net_icmp_hdr *get_icmp_hdr(struct net_pkt *pkt) return (struct net_icmp_hdr *)net_pkt_cursor_get_pos(pkt); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct net_icmp_hdr *icmp; diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c index 921c17ee3172..03a389218d41 100644 --- a/tests/net/net_pkt/src/main.c +++ b/tests/net/net_pkt/src/main.c @@ -40,12 +40,12 @@ static void fake_dev_iface_init(struct net_if *iface) eth_if = iface; } -static int fake_dev_send(struct device *dev, struct net_pkt *pkt) +static int fake_dev_send(const struct device *dev, struct net_pkt *pkt) { return 0; } -int fake_dev_init(struct device *dev) +int fake_dev_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c index 75009d3338c0..b7eb5e68fe85 100644 --- a/tests/net/promiscuous/src/main.c +++ b/tests/net/promiscuous/src/main.c @@ -76,7 +76,7 @@ static struct eth_fake_context eth_fake_data2; static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -88,7 +88,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); @@ -97,12 +97,12 @@ static int eth_fake_send(struct device *dev, return 0; } -static enum ethernet_hw_caps eth_fake_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_fake_get_capabilities(const struct device *dev) { return ETHERNET_PROMISC_MODE; } -static int eth_fake_set_config(struct device *dev, +static int eth_fake_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -133,7 +133,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { struct eth_fake_context *ctx = dev->driver_data; diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c index 19d473b9c182..562ca01950e5 100644 --- a/tests/net/ptp/clock/src/main.c +++ b/tests/net/ptp/clock/src/main.c @@ -75,7 +75,7 @@ struct eth_context { u8_t mac_addr[6]; struct net_ptp_time time; - struct device *ptp_clock; + const struct device *ptp_clock; }; static struct eth_context eth_context_1; @@ -84,7 +84,7 @@ static struct eth_context eth_context_3; static void eth_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_addr, @@ -94,7 +94,7 @@ static void eth_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_context *context = dev->driver_data; @@ -115,12 +115,12 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static enum ethernet_hw_caps eth_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_capabilities(const struct device *dev) { return ETHERNET_PTP; } -static struct device *eth_get_ptp_clock(struct device *dev) +static const struct device *eth_get_ptp_clock(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -146,7 +146,7 @@ static void generate_mac(u8_t *mac_addr) mac_addr[5] = sys_rand32_get(); } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -180,7 +180,7 @@ struct ptp_context { struct eth_context *eth_context; }; -static int my_ptp_clock_set(struct device *dev, struct net_ptp_time *tm) +static int my_ptp_clock_set(const struct device *dev, struct net_ptp_time *tm) { struct ptp_context *ptp_ctx = dev->driver_data; struct eth_context *eth_ctx = ptp_ctx->eth_context; @@ -194,7 +194,7 @@ static int my_ptp_clock_set(struct device *dev, struct net_ptp_time *tm) return 0; } -static int my_ptp_clock_get(struct device *dev, struct net_ptp_time *tm) +static int my_ptp_clock_get(const struct device *dev, struct net_ptp_time *tm) { struct ptp_context *ptp_ctx = dev->driver_data; struct eth_context *eth_ctx = ptp_ctx->eth_context; @@ -204,7 +204,7 @@ static int my_ptp_clock_get(struct device *dev, struct net_ptp_time *tm) return 0; } -static int my_ptp_clock_adjust(struct device *dev, int increment) +static int my_ptp_clock_adjust(const struct device *dev, int increment) { struct ptp_context *ptp_ctx = dev->driver_data; struct eth_context *eth_ctx = ptp_ctx->eth_context; @@ -214,7 +214,7 @@ static int my_ptp_clock_adjust(struct device *dev, int increment) return 0; } -static int my_ptp_clock_rate_adjust(struct device *dev, float ratio) +static int my_ptp_clock_rate_adjust(const struct device *dev, float ratio) { return 0; } @@ -229,9 +229,9 @@ static const struct ptp_clock_driver_api api = { .rate_adjust = my_ptp_clock_rate_adjust, }; -static int ptp_test_1_init(struct device *port) +static int ptp_test_1_init(const struct device *port) { - struct device *eth_dev = DEVICE_GET(eth_test_1); + const struct device *eth_dev = DEVICE_GET(eth_test_1); struct eth_context *context = eth_dev->driver_data; struct ptp_context *ptp_context = port->driver_data; @@ -245,9 +245,9 @@ DEVICE_AND_API_INIT(ptp_clock_1, PTP_CLOCK_NAME, ptp_test_1_init, &ptp_test_1_context, NULL, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY, &api); -static int ptp_test_2_init(struct device *port) +static int ptp_test_2_init(const struct device *port) { - struct device *eth_dev = DEVICE_GET(eth_test_2); + const struct device *eth_dev = DEVICE_GET(eth_test_2); struct eth_context *context = eth_dev->driver_data; struct ptp_context *ptp_context = port->driver_data; @@ -288,7 +288,7 @@ static void iface_cb(struct net_if *iface, void *user_data) if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) { static int ptp_iface_idx; - struct device *clk; + const struct device *clk; if (ud->eth_if_count >= ARRAY_SIZE(eth_interfaces)) { DBG("Invalid interface %p\n", iface); @@ -394,8 +394,8 @@ static void test_address_setup(void) static void test_ptp_clock_interfaces(void) { - struct device *clk_by_index; - struct device *clk; + const struct device *clk_by_index; + const struct device *clk; int idx; idx = ptp_interface[0]; @@ -425,7 +425,7 @@ static void test_ptp_clock_iface(int idx) .second = 1, .nanosecond = 1, }; - struct device *clk; + const struct device *clk; u64_t orig, new_value; clk = net_eth_get_ptp_clock(eth_interfaces[idx]); @@ -464,12 +464,12 @@ static void test_ptp_clock_iface_2(void) test_ptp_clock_iface(ptp_interface[1]); } -static ZTEST_BMEM struct device *clk0; -static ZTEST_BMEM struct device *clk1; +static ZTEST_BMEM const struct device *clk0; +static ZTEST_BMEM const struct device *clk1; static void test_ptp_clock_get_by_index(void) { - struct device *clk, *clk_by_index; + const struct device *clk, *clk_by_index; int idx; idx = ptp_interface[0]; @@ -499,7 +499,7 @@ static void test_ptp_clock_get_by_index(void) static void test_ptp_clock_get_by_index_user(void) { - struct device *clk_by_index; + const struct device *clk_by_index; clk_by_index = net_eth_get_ptp_clock_by_index(ptp_clocks[0]); zassert_not_null(clk_by_index, "PTP 0 not found"); @@ -515,7 +515,7 @@ static ZTEST_BMEM struct net_ptp_time empty; static void test_ptp_clock_get_by_xxx(const char *who) { - struct device *clk_by_index; + const struct device *clk_by_index; int ret; clk_by_index = net_eth_get_ptp_clock_by_index(ptp_clocks[0]); @@ -531,7 +531,7 @@ static void test_ptp_clock_get_by_xxx(const char *who) static void test_ptp_clock_get_kernel(void) { - struct device *clk; + const struct device *clk; /* Make sure that this function is really run in kernel mode by * calling a function that will not work in user mode. @@ -548,7 +548,7 @@ static void test_ptp_clock_get_user(void) void test_main(void) { - struct device *clk; + const struct device *clk; clk = device_get_binding(PTP_CLOCK_NAME); if (clk != NULL) { diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c index 4d9b77277390..2fe4dd9fe5d1 100644 --- a/tests/net/route/src/main.c +++ b/tests/net/route/src/main.c @@ -92,12 +92,12 @@ struct net_route_test { struct net_linkaddr ll_addr; }; -int net_route_dev_init(struct device *dev) +int net_route_dev_init(const struct device *dev) { return 0; } -static u8_t *net_route_get_mac(struct device *dev) +static u8_t *net_route_get_mac(const struct device *dev) { struct net_route_test *route = dev->driver_data; @@ -125,7 +125,7 @@ static void net_route_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { TC_ERROR("No data to send!\n"); @@ -163,7 +163,7 @@ static int tester_send(struct device *dev, struct net_pkt *pkt) return 0; } -static int tester_send_peer(struct device *dev, struct net_pkt *pkt) +static int tester_send_peer(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { TC_ERROR("No data to send!\n"); diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c index b4b82ff9903e..dc6da74faee0 100644 --- a/tests/net/shell/src/main.c +++ b/tests/net/shell/src/main.c @@ -57,7 +57,7 @@ struct net_udp_context { struct net_linkaddr ll_addr; }; -int net_udp_dev_init(struct device *dev) +int net_udp_dev_init(const struct device *dev) { struct net_udp_context *net_udp_context = dev->driver_data; @@ -66,7 +66,7 @@ int net_udp_dev_init(struct device *dev) return 0; } -static u8_t *net_udp_get_mac(struct device *dev) +static u8_t *net_udp_get_mac(const struct device *dev) { struct net_udp_context *context = dev->driver_data; @@ -92,7 +92,7 @@ static void net_udp_iface_init(struct net_if *iface) static int send_status = -EINVAL; -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { DBG("No data to send!\n"); diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c index ac3acf0738de..a308f496f66c 100644 --- a/tests/net/socket/af_packet/src/main.c +++ b/tests/net/socket/af_packet/src/main.c @@ -35,7 +35,7 @@ static struct eth_fake_context eth_fake_data2 = { .mac_address = lladdr2 }; -static int eth_fake_send(struct device *dev, struct net_pkt *pkt) +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); ARG_UNUSED(pkt); @@ -45,7 +45,7 @@ static int eth_fake_send(struct device *dev, struct net_pkt *pkt) static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -60,7 +60,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c index a6df63d98fac..4d52200517e8 100644 --- a/tests/net/socket/net_mgmt/src/main.c +++ b/tests/net/socket/net_mgmt/src/main.c @@ -53,7 +53,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -65,7 +65,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { ARG_UNUSED(dev); @@ -120,7 +120,7 @@ static void eth_fake_recalc_qav_idle_slopes(struct eth_fake_context *ctx) } } -static int eth_fake_set_config(struct device *dev, +static int eth_fake_set_config(const struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { @@ -167,7 +167,7 @@ static int eth_fake_set_config(struct device *dev, return 0; } -static int eth_fake_get_config(struct device *dev, +static int eth_fake_get_config(const struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { @@ -217,7 +217,7 @@ static int eth_fake_get_config(struct device *dev, return 0; } -static enum ethernet_hw_caps eth_fake_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_fake_get_capabilities(const struct device *dev) { return ETHERNET_AUTO_NEGOTIATION_SET | ETHERNET_LINK_10BASE_T | ETHERNET_LINK_100BASE_T | ETHERNET_DUPLEX_SET | ETHERNET_QAV | @@ -233,7 +233,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { struct eth_fake_context *ctx = dev->driver_data; int i; diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c index 93824dd068eb..41122401fc57 100644 --- a/tests/net/socket/udp/src/main.c +++ b/tests/net/socket/udp/src/main.c @@ -761,7 +761,7 @@ static struct net_linkaddr server_link_addr = { static void eth_fake_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_fake_context *ctx = dev->driver_data; ctx->iface = iface; @@ -773,7 +773,7 @@ static void eth_fake_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_fake_send(struct device *dev, struct net_pkt *pkt) +static int eth_fake_send(const struct device *dev, struct net_pkt *pkt) { u64_t txtime; @@ -801,7 +801,7 @@ static struct ethernet_api eth_fake_api_funcs = { .send = eth_fake_send, }; -static int eth_fake_init(struct device *dev) +static int eth_fake_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c index c4c069d47613..3db9dc929535 100644 --- a/tests/net/tcp/src/main.c +++ b/tests/net/tcp/src/main.c @@ -85,7 +85,7 @@ static bool syn_v6_sent; struct net_tcp_context { }; -int net_tcp_dev_init(struct device *dev) +int net_tcp_dev_init(const struct device *dev) { return 0; } @@ -237,7 +237,7 @@ static void v6_send_syn_ack(struct net_pkt *req) static int send_status = -EINVAL; -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); @@ -254,7 +254,7 @@ static int tester_send(struct device *dev, struct net_pkt *pkt) return 0; } -static int tester_send_peer(struct device *dev, struct net_pkt *pkt) +static int tester_send_peer(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); diff --git a/tests/net/tcp2/src/main.c b/tests/net/tcp2/src/main.c index 2dcee17d68de..356c4397e376 100644 --- a/tests/net/tcp2/src/main.c +++ b/tests/net/tcp2/src/main.c @@ -87,7 +87,7 @@ static enum test_state t_state; static struct k_delayed_work test_server; static void test_server_timeout(struct k_work *work); -static int tester_send(struct device *dev, struct net_pkt *pkt); +static int tester_send(const struct device *dev, struct net_pkt *pkt); static void handle_client_test(sa_family_t af, struct tcphdr *th); static void handle_server_test(sa_family_t af, struct tcphdr *th); @@ -111,7 +111,7 @@ struct net_tcp_context { struct net_linkaddr ll_addr; }; -static int net_tcp_dev_init(struct device *dev) +static int net_tcp_dev_init(const struct device *dev) { struct net_tcp_context *net_tcp_context = dev->driver_data; @@ -120,7 +120,7 @@ static int net_tcp_dev_init(struct device *dev) return 0; } -static u8_t *net_tcp_get_mac(struct device *dev) +static u8_t *net_tcp_get_mac(const struct device *dev) { struct net_tcp_context *context = dev->driver_data; @@ -347,7 +347,7 @@ static int read_tcp_header(struct net_pkt *pkt, struct tcphdr *th) return -EINVAL; } -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { struct tcphdr th; int ret; diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c index 26b667b526de..44ba17894752 100644 --- a/tests/net/traffic_class/src/main.c +++ b/tests/net/traffic_class/src/main.c @@ -105,7 +105,7 @@ static struct eth_context eth_context; static void eth_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_addr, @@ -154,7 +154,7 @@ static bool check_higher_priority_pkt_recv(int tc, struct net_pkt *pkt) /* The eth_tx() will handle both sent packets or and it will also * simulate the receiving of the packets. */ -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); @@ -252,7 +252,7 @@ static void generate_mac(u8_t *mac_addr) mac_addr[5] = sys_rand32_get(); } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c index 1da006967e55..feb5de98fbe8 100644 --- a/tests/net/tx_timestamp/src/main.c +++ b/tests/net/tx_timestamp/src/main.c @@ -87,7 +87,7 @@ static struct eth_context eth_context2; static void eth_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_addr, @@ -97,7 +97,7 @@ static void eth_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { if (!pkt->buffer) { DBG("No data to send!\n"); @@ -120,7 +120,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static enum ethernet_hw_caps eth_get_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_get_capabilities(const struct device *dev) { return 0; } @@ -143,7 +143,7 @@ static void generate_mac(u8_t *mac_addr) mac_addr[5] = sys_rand32_get(); } -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c index 2bcc6efe5322..d93e348326ff 100644 --- a/tests/net/udp/src/main.c +++ b/tests/net/udp/src/main.c @@ -59,7 +59,7 @@ struct net_udp_context { struct net_linkaddr ll_addr; }; -int net_udp_dev_init(struct device *dev) +int net_udp_dev_init(const struct device *dev) { struct net_udp_context *net_udp_context = dev->driver_data; @@ -68,7 +68,7 @@ int net_udp_dev_init(struct device *dev) return 0; } -static u8_t *net_udp_get_mac(struct device *dev) +static u8_t *net_udp_get_mac(const struct device *dev) { struct net_udp_context *context = dev->driver_data; @@ -94,7 +94,7 @@ static void net_udp_iface_init(struct net_if *iface) static int send_status = -EINVAL; -static int tester_send(struct device *dev, struct net_pkt *pkt) +static int tester_send(const struct device *dev, struct net_pkt *pkt) { if (!pkt->frags) { DBG("No data to send!\n"); diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c index ac14e2b8905a..c842fc4b847f 100644 --- a/tests/net/vlan/src/main.c +++ b/tests/net/vlan/src/main.c @@ -95,7 +95,7 @@ static struct eth_context eth_vlan_context; static void eth_vlan_iface_init(struct net_if *iface) { - struct device *dev = net_if_get_device(iface); + const struct device *dev = net_if_get_device(iface); struct eth_context *context = dev->driver_data; net_if_set_link_addr(iface, context->mac_addr, @@ -105,7 +105,7 @@ static void eth_vlan_iface_init(struct net_if *iface) ethernet_init(iface); } -static int eth_tx(struct device *dev, struct net_pkt *pkt) +static int eth_tx(const struct device *dev, struct net_pkt *pkt) { struct eth_context *context = dev->driver_data; @@ -138,7 +138,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) return 0; } -static enum ethernet_hw_caps eth_capabilities(struct device *dev) +static enum ethernet_hw_caps eth_capabilities(const struct device *dev) { return ETHERNET_HW_VLAN; } @@ -161,7 +161,7 @@ static void generate_mac(u8_t *mac_addr) mac_addr[5] = sys_rand32_get(); } -static int eth_vlan_init(struct device *dev) +static int eth_vlan_init(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -175,7 +175,7 @@ ETH_NET_DEVICE_INIT(eth_vlan_test, "eth_vlan_test", ð_vlan_context, NULL, CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU); -static int eth_init(struct device *dev) +static int eth_init(const struct device *dev) { struct eth_context *context = dev->driver_data; @@ -199,12 +199,12 @@ struct net_if_test { struct net_linkaddr ll_addr; }; -static int net_iface_dev_init(struct device *dev) +static int net_iface_dev_init(const struct device *dev) { return 0; } -static u8_t *net_iface_get_mac(struct device *dev) +static u8_t *net_iface_get_mac(const struct device *dev) { struct net_if_test *data = dev->driver_data; @@ -232,7 +232,7 @@ static void net_iface_init(struct net_if *iface) NET_LINK_ETHERNET); } -static int sender_iface(struct device *dev, struct net_pkt *pkt) +static int sender_iface(const struct device *dev, struct net_pkt *pkt) { return 0; } diff --git a/tests/subsys/canbus/isotp/conformance/src/main.c b/tests/subsys/canbus/isotp/conformance/src/main.c index 929de91ef563..36fa24a2aff9 100644 --- a/tests/subsys/canbus/isotp/conformance/src/main.c +++ b/tests/subsys/canbus/isotp/conformance/src/main.c @@ -104,7 +104,7 @@ const struct isotp_msg_id tx_addr_ext = { .ext_addr = EXT_ADDR }; -struct device *can_dev; +const struct device *can_dev; struct isotp_recv_ctx recv_ctx; struct isotp_send_ctx send_ctx; u8_t data_buf[128]; diff --git a/tests/subsys/canbus/isotp/implementation/src/main.c b/tests/subsys/canbus/isotp/implementation/src/main.c index 37b29e8a8267..2bfc11555266 100644 --- a/tests/subsys/canbus/isotp/implementation/src/main.c +++ b/tests/subsys/canbus/isotp/implementation/src/main.c @@ -31,7 +31,7 @@ * @} */ -struct device *can_dev; +const struct device *can_dev; const struct isotp_fc_opts fc_opts = { .bs = 8, @@ -61,7 +61,7 @@ void send_complette_cb(int error_nr, void *arg) zassert_equal(error_nr, ISOTP_N_OK, "Sending failed (%d)", error_nr); } -static void send_sf(struct device *can_dev) +static void send_sf(const struct device *can_dev) { int ret; @@ -110,7 +110,8 @@ void print_hex(const u8_t *ptr, size_t len) } } -static void send_test_data(struct device *can_dev, const u8_t *data, size_t len) +static void send_test_data(const struct device *can_dev, const u8_t *data, + size_t len) { int ret; diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c index 0ee047335aad..c26fa88a930b 100644 --- a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c +++ b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c @@ -88,7 +88,7 @@ static struct disk_info ram_disk = { .ops = &ram_disk_ops, }; -static int disk_ram_test_init(struct device *dev) +static int disk_ram_test_init(const struct device *dev) { ARG_UNUSED(dev); diff --git a/tests/subsys/fs/multi-fs/src/test_ram_backend.c b/tests/subsys/fs/multi-fs/src/test_ram_backend.c index ffa77fda25e3..abef3584bdae 100644 --- a/tests/subsys/fs/multi-fs/src/test_ram_backend.c +++ b/tests/subsys/fs/multi-fs/src/test_ram_backend.c @@ -14,17 +14,19 @@ static u8_t rambuf[FLASH_AREA_SIZE(storage)]; -static int test_ram_flash_init(struct device *dev) +static int test_ram_flash_init(const struct device *dev) { return 0; } -static int test_flash_ram_write_protection(struct device *dev, bool enable) +static int test_flash_ram_write_protection(const struct device *dev, + bool enable) { return 0; } -static int test_flash_ram_erase(struct device *dev, off_t offset, size_t len) +static int test_flash_ram_erase(const struct device *dev, off_t offset, + size_t len) { struct flash_pages_info info; off_t end_offset = offset + len; @@ -42,7 +44,7 @@ static int test_flash_ram_erase(struct device *dev, off_t offset, size_t len) return 0; } -static int test_flash_ram_write(struct device *dev, off_t offset, +static int test_flash_ram_write(const struct device *dev, off_t offset, const void *data, size_t len) { zassert_true(offset >= 0, "invalid offset"); @@ -54,7 +56,8 @@ static int test_flash_ram_write(struct device *dev, off_t offset, return 0; } -static int test_flash_ram_read(struct device *dev, off_t offset, void *data, +static int test_flash_ram_read(const struct device *dev, off_t offset, + void *data, size_t len) { zassert_true(offset >= 0, "invalid offset"); @@ -66,9 +69,9 @@ static int test_flash_ram_read(struct device *dev, off_t offset, void *data, return 0; } -static void test_flash_ram_pages_layout(struct device *dev, - const struct flash_pages_layout **layout, - size_t *layout_size) +static void test_flash_ram_pages_layout(const struct device *dev, + const struct flash_pages_layout **layout, + size_t *layout_size) { /* Same as used in Mynewt native "flash" backend */ static struct flash_pages_layout dev_layout[] = { diff --git a/tests/subsys/openthread/radio_stub.c b/tests/subsys/openthread/radio_stub.c index c61aab8c4c24..591b081cd7fd 100644 --- a/tests/subsys/openthread/radio_stub.c +++ b/tests/subsys/openthread/radio_stub.c @@ -19,7 +19,7 @@ #define CONFIG_NET_L2_OPENTHREAD 1 /* needed for stubbing device driver */ -struct device *device_get_binding_stub(const char *name); +const struct device *device_get_binding_stub(const char *name); #define device_get_binding device_get_binding_stub /* file itself */ diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c index 9d9933d5bfb4..3f4041cd1d0a 100644 --- a/tests/subsys/openthread/radio_test.c +++ b/tests/subsys/openthread/radio_test.c @@ -38,20 +38,21 @@ energy_scan_done_cb_t scan_done_cb; otInstance *ot = (otInstance *)0xAAAA; /* forward declarations */ -static int scan_mock(struct device *dev, u16_t duration, +static int scan_mock(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb); -static enum ieee802154_hw_caps get_capabilities(struct device *dev); -static int cca_mock(struct device *dev); -static int set_channel_mock(struct device *dev, u16_t channel); -static int filter_mock(struct device *dev, bool set, +static enum ieee802154_hw_caps get_capabilities(const struct device *dev); +static int cca_mock(const struct device *dev); +static int set_channel_mock(const struct device *dev, u16_t channel); +static int filter_mock(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter); -static int set_txpower_mock(struct device *dev, s16_t dbm); -static int tx_mock(struct device *dev, enum ieee802154_tx_mode mode, +static int set_txpower_mock(const struct device *dev, s16_t dbm); +static int tx_mock(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag); -static int start_mock(struct device *dev); -static int stop_mock(struct device *dev); -static int configure_mock(struct device *dev, enum ieee802154_config_type type, +static int start_mock(const struct device *dev); +static int stop_mock(const struct device *dev); +static int configure_mock(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config); /* mocks */ @@ -73,7 +74,7 @@ static struct ieee802154_radio_api rapi = { static struct device radio = { .driver_api = &rapi }; -static int scan_mock(struct device *dev, u16_t duration, +static int scan_mock(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb) { zassert_equal(dev, &radio, "Device handle incorrect."); @@ -82,7 +83,7 @@ static int scan_mock(struct device *dev, u16_t duration, return ztest_get_return_value(); } -static int rssi_scan_mock(struct device *dev, u16_t duration, +static int rssi_scan_mock(const struct device *dev, u16_t duration, energy_scan_done_cb_t done_cb) { zassert_equal(dev, &radio, "Device handle incorrect."); @@ -95,7 +96,7 @@ static int rssi_scan_mock(struct device *dev, u16_t duration, return 0; } -static int set_channel_mock(struct device *dev, u16_t channel) +static int set_channel_mock(const struct device *dev, u16_t channel) { zassert_equal(dev, &radio, "Device handle incorrect."); ztest_check_expected_value(channel); @@ -141,7 +142,7 @@ void otPlatRadioTxDone(otInstance *aInstance, otRadioFrame *aFrame, ztest_check_expected_value(aError); } -static enum ieee802154_hw_caps get_capabilities(struct device *dev) +static enum ieee802154_hw_caps get_capabilities(const struct device *dev) { zassert_equal(dev, &radio, "Device handle incorrect."); @@ -150,14 +151,15 @@ static enum ieee802154_hw_caps get_capabilities(struct device *dev) IEEE802154_HW_ENERGY_SCAN; } -static enum ieee802154_hw_caps get_capabilities_caps_mock(struct device *dev) +static enum ieee802154_hw_caps get_capabilities_caps_mock(const struct device *dev) { zassert_equal(dev, &radio, "Device handle incorrect."); return ztest_get_return_value(); } -static int configure_mock(struct device *dev, enum ieee802154_config_type type, +static int configure_mock(const struct device *dev, + enum ieee802154_config_type type, const struct ieee802154_config *config) { zassert_equal(dev, &radio, "Device handle incorrect."); @@ -168,7 +170,7 @@ static int configure_mock(struct device *dev, enum ieee802154_config_type type, return 0; } -static int configure_match_mock(struct device *dev, +static int configure_match_mock(const struct device *dev, enum ieee802154_config_type type, const struct ieee802154_config *config) { @@ -195,7 +197,7 @@ static int configure_match_mock(struct device *dev, return 0; } -static int configure_promiscuous_mock(struct device *dev, +static int configure_promiscuous_mock(const struct device *dev, enum ieee802154_config_type type, const struct ieee802154_config *config) { @@ -207,14 +209,14 @@ static int configure_promiscuous_mock(struct device *dev, return 0; } -static int cca_mock(struct device *dev) +static int cca_mock(const struct device *dev) { /* not using assert to verify function called */ ztest_check_expected_value(dev); return 0; } -static int filter_mock(struct device *dev, bool set, +static int filter_mock(const struct device *dev, bool set, enum ieee802154_filter_type type, const struct ieee802154_filter *filter) { @@ -239,7 +241,7 @@ static int filter_mock(struct device *dev, bool set, return 0; } -static int set_txpower_mock(struct device *dev, s16_t dbm) +static int set_txpower_mock(const struct device *dev, s16_t dbm) { zassert_equal(dev, &radio, "Device handle incorrect."); ztest_check_expected_value(dbm); @@ -247,7 +249,7 @@ static int set_txpower_mock(struct device *dev, s16_t dbm) return 0; } -static int tx_mock(struct device *dev, enum ieee802154_tx_mode mode, +static int tx_mock(const struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) { zassert_equal(dev, &radio, "Device handle incorrect."); @@ -256,19 +258,19 @@ static int tx_mock(struct device *dev, enum ieee802154_tx_mode mode, return 0; } -static int start_mock(struct device *dev) +static int start_mock(const struct device *dev) { ztest_check_expected_value(dev); return 0; } -static int stop_mock(struct device *dev) +static int stop_mock(const struct device *dev) { ztest_check_expected_value(dev); return 0; } -struct device *device_get_binding_stub(const char *name) +const struct device *device_get_binding_stub(const char *name) { return &radio; } diff --git a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c index e73b4ca80d8a..783405f28475 100644 --- a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c +++ b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c @@ -89,7 +89,7 @@ void test_prepare_storage(void) */ int err; const struct flash_area *fa; - struct device *dev; + const struct device *dev; u8_t new_val[FLASH_WRITE_BLOCK_SIZE]; if (prepared_mark[0] == ERASED_VAL) { diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c index 6b38737f91aa..35b80afee487 100644 --- a/tests/subsys/storage/flash_map/src/main.c +++ b/tests/subsys/storage/flash_map/src/main.c @@ -24,7 +24,7 @@ void test_flash_area_get_sectors(void) off_t off; u8_t wd[256]; u8_t rd[256]; - struct device *flash_dev; + const struct device *flash_dev; rc = flash_area_open(FLASH_AREA_ID(image_1), &fa); zassert_true(rc == 0, "flash_area_open() fail"); diff --git a/tests/subsys/storage/stream/stream_flash/src/main.c b/tests/subsys/storage/stream/stream_flash/src/main.c index 8bb2d3f9c1f0..2a7813b210f1 100644 --- a/tests/subsys/storage/stream/stream_flash/src/main.c +++ b/tests/subsys/storage/stream/stream_flash/src/main.c @@ -24,7 +24,7 @@ #define FLASH_BASE (64*1024) #define FLASH_AVAILABLE (FLASH_SIZE-FLASH_BASE) -static struct device *fdev; +static const struct device *fdev; static const struct flash_driver_api *api; static const struct flash_pages_layout *layout; static size_t layout_size; diff --git a/west.yml b/west.yml index 48d4b5d78141..bbe650c05732 100644 --- a/west.yml +++ b/west.yml @@ -74,7 +74,7 @@ manifest: revision: d1bc80d021f4ebc31f6e8b36f14b738cc26c7b03 path: modules/hal/stm32 - name: hal_ti - revision: c398cc7959097d27a9cfec857eeade9b851cd46c + revision: pull/14/head path: modules/hal/ti - name: libmetal revision: 3c3c9ec83bbb99390e34f8f2ba273ec86cf2b67c @@ -83,7 +83,7 @@ manifest: revision: 74fc2e753a997bd71cefa34dd9c56dcb954b42e2 path: modules/lib/gui/lvgl - name: mbedtls - revision: 821154171b246f64eaeef3ccc267f58d8274739a + revision: pull/10/head path: modules/crypto/mbedtls - name: mcuboot revision: e88113bbebe34ff2ccc6627ffae885cfeed6fdfd @@ -107,7 +107,7 @@ manifest: revision: a83d18cf18bc8cd431ad6704ad0bf0e6d08c99d7 path: modules/lib/openthread - name: segger - revision: 6fcf61606d6012d2c44129edc033f59331e268bc + revision: pull/1/head path: modules/debug/segger - name: tinycbor path: modules/lib/tinycbor