zephyr: Fix serial recovery compilation warnings

de-nordic · nvlsianpu · commit e8bfc030a541 · 2020-10-02T12:09:17.000+02:00
Missing const on pointers to device structures caused compilation
warnings when compiling bootloader with serial recovery enabled.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
@@ -317,7 +317,7 @@ void main(void)
 
 #ifdef CONFIG_MCUBOOT_SERIAL
 
-    struct device *detect_port;
+    struct device const *detect_port;
     uint32_t detect_value = !CONFIG_BOOT_SERIAL_DETECT_PIN_VAL;
 
     detect_port = device_get_binding(CONFIG_BOOT_SERIAL_DETECT_PORT);
diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
@@ -41,7 +41,7 @@ struct line_input {
 	char line[CONFIG_BOOT_MAX_LINE_INPUT_LEN];
 };
 
-static struct device *uart_dev;
+static struct device const *uart_dev;
 static struct line_input line_bufs[2];
 
 static sys_slist_t avail_queue;
@@ -115,7 +115,7 @@ boot_console_init(void)
 }
 
 static void
-boot_uart_fifo_callback(struct device *dev, void *user_data)
+boot_uart_fifo_callback(const struct device *dev, void *user_data)
 {
 	static struct line_input *cmd;
 	uint8_t byte;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ struct line_input {`
`41`	`41`	`char line[CONFIG_BOOT_MAX_LINE_INPUT_LEN];`
`42`	`42`	`};`
`43`	`43`
`44`		`-static struct device *uart_dev;`
	`44`	`+static struct device const *uart_dev;`
`45`	`45`	`static struct line_input line_bufs[2];`
`46`	`46`
`47`	`47`	`static sys_slist_t avail_queue;`
`@@ -115,7 +115,7 @@ boot_console_init(void)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`static void`
`118`		`-boot_uart_fifo_callback(struct device dev, void user_data)`
	`118`	`+boot_uart_fifo_callback(const struct device dev, void user_data)`
`119`	`119`	`{`
`120`	`120`	`static struct line_input *cmd;`
`121`	`121`	`uint8_t byte;`