commit 36e9029ff01d1e64a77d2e2a0bb9e2cc75ab97c8
author Peter Bigot <peter.bigot@nordicsemi.no> Thu Jan 30 05:36:47 2020 -0600
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Mon Feb 03 16:49:14 2020 +0100
tree f8d6b97975093e0917c1adf48060894447dc957b
parent 1b19d2a198c40f47286f49b2a3420cc0035eb0b2

boot: zephyr: move to non-deprecated GPIO flags

GPIO_DIR_IN has been replaced by GPIO_INPUT, GPIO_PUD_PULL_UP by
GPIO_PULL_UP, and gpio_pin_read() by gpio_pin_get_raw().  Update the
code to use the preferred API if it available.  This avoids
deprecation warnings in the build.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index b9ecf51..fc2d9e2 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -201,18 +201,32 @@
 #ifdef CONFIG_MCUBOOT_SERIAL
 
     struct device *detect_port;
-    u32_t detect_value;
+    u32_t detect_value = !CONFIG_BOOT_SERIAL_DETECT_PIN_VAL;
 
     detect_port = device_get_binding(CONFIG_BOOT_SERIAL_DETECT_PORT);
     __ASSERT(detect_port, "Error: Bad port for boot serial detection.\n");
 
+    /* The default presence value is 0 which would normally be
+     * active-low, but historically the raw value was checked so we'll
+     * use the raw interface.
+     */
     rc = gpio_pin_configure(detect_port, CONFIG_BOOT_SERIAL_DETECT_PIN,
-                            GPIO_DIR_IN | GPIO_PUD_PULL_UP);
+#ifdef GPIO_INPUT
+                            GPIO_INPUT | GPIO_PULL_UP
+#else
+                            GPIO_DIR_IN | GPIO_PUD_PULL_UP
+#endif
+	    );
     __ASSERT(rc == 0, "Error of boot detect pin initialization.\n");
 
+#ifdef GPIO_INPUT
+    rc = gpio_pin_get_raw(detect_port, CONFIG_BOOT_SERIAL_DETECT_PIN);
+    detect_value = rc;
+#else
     rc = gpio_pin_read(detect_port, CONFIG_BOOT_SERIAL_DETECT_PIN,
                        &detect_value);
-    __ASSERT(rc == 0, "Error of the reading the detect pin.\n");
+#endif
+    __ASSERT(rc >= 0, "Error of the reading the detect pin.\n");
     if (detect_value == CONFIG_BOOT_SERIAL_DETECT_PIN_VAL &&
         !boot_skip_serial_recovery()) {
         BOOT_LOG_INF("Enter the serial recovery mode");