Commit 8bd3081f authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

boot/zephyr: cleanup GPIO pin setup 



Removed configuration of gpio pin using flags which were
removed for zephyr-project long ago. Also old method of read
the pin value was removed.
No sense to keep that as nowadays MCUboot is also not compatible
with zephyr version which supports these flags and methods.

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent de518072

boot/zephyr/main.c

+2 −14
Original line number Diff line number Diff line
@@ -380,20 +380,12 @@ static bool detect_pin(const char* port, int pin, uint32_t expected, int delay) 
     * use the raw interface.

     */

    rc = gpio_pin_configure(detect_port, pin,

#ifdef GPIO_INPUT

                            GPIO_INPUT | GPIO_PULL_UP

#else

                            GPIO_DIR_IN | GPIO_PUD_PULL_UP

#endif

           );

                            GPIO_INPUT | GPIO_PULL_UP);

    __ASSERT(rc == 0, "Failed to initialize boot detect pin.\n");



#ifdef GPIO_INPUT

    rc = gpio_pin_get_raw(detect_port, pin);

    detect_value = rc;

#else

    rc = gpio_pin_read(detect_port, pin, &detect_value);

#endif



    __ASSERT(rc >= 0, "Failed to read boot detect pin.\n");



    if (detect_value == expected) {
@@ -404,12 +396,8 @@ static bool detect_pin(const char* port, int pin, uint32_t expected, int delay) 
            int64_t timestamp = k_uptime_get();



            for(;;) {

#ifdef GPIO_INPUT

                rc = gpio_pin_get_raw(detect_port, pin);

                detect_value = rc;

#else

                rc = gpio_pin_read(detect_port, pin, &detect_value);

#endif

                __ASSERT(rc >= 0, "Failed to read boot detect pin.\n");



                /* Get delta from when this started */

CRA Git | Maintained and supported by SUSTech CRA and CCSE