diff --git a/Devices/m5stack-papers3/source/drivers/papers3_power.cpp b/Devices/m5stack-papers3/source/drivers/papers3_power.cpp index 0fa67d438..83faf20dc 100644 --- a/Devices/m5stack-papers3/source/drivers/papers3_power.cpp +++ b/Devices/m5stack-papers3/source/drivers/papers3_power.cpp @@ -1,8 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 #include "papers3_power.h" + #include #include +#include #include #include #include @@ -13,7 +15,7 @@ #include -#define TAG "Papers3Power" +constexpr auto* TAG = "Papers3Power"; #define GET_CONFIG(device) (static_cast((device)->config)) // Power-off signal timing, ported from the old deprecated-HAL PaperS3Power::powerOff(). @@ -192,7 +194,7 @@ static void destroy_power_supply_child(Device* child) { // region Driver lifecycle static error_t acquire_input(const GpioPinSpec& pin, GpioDescriptor** out_descriptor) { - *out_descriptor = gpio_descriptor_acquire(pin.gpio_controller, pin.pin, GPIO_FLAG_DIRECTION_INPUT, GPIO_OWNER_GPIO); + *out_descriptor = gpio_descriptor_acquire(pin.gpio_controller, pin.pin, pin.flags | GPIO_FLAG_DIRECTION_INPUT, GPIO_OWNER_GPIO); return (*out_descriptor != nullptr) ? ERROR_NONE : ERROR_RESOURCE; } diff --git a/Platforms/platform-esp32/source/drivers/esp32_sdmmc.cpp b/Platforms/platform-esp32/source/drivers/esp32_sdmmc.cpp index 16d850386..7edfbc067 100644 --- a/Platforms/platform-esp32/source/drivers/esp32_sdmmc.cpp +++ b/Platforms/platform-esp32/source/drivers/esp32_sdmmc.cpp @@ -14,7 +14,7 @@ #include #include -#define TAG "esp32_sdmmc" +constexpr auto* TAG = "esp32_sdmmc"; #define GET_CONFIG(device) ((const struct Esp32SdmmcConfig*)device->config) #define GET_DATA(device) ((struct Esp32SdmmcInternal*)device_get_driver_data(device)) @@ -85,7 +85,7 @@ static error_t start(Device* device) { // Acquire pins from the specified GPIO pin specs. Optional pins are allowed. bool pins_ok = acquire_pin_or_set_null(sdmmc_config->pin_clk, GPIO_FLAG_DIRECTION_OUTPUT, &data->pin_clk_descriptor) && - acquire_pin_or_set_null(sdmmc_config->pin_cmd, GPIO_FLAG_DIRECTION_OUTPUT, &data->pin_cmd_descriptor) && + acquire_pin_or_set_null(sdmmc_config->pin_cmd, GPIO_FLAG_DIRECTION_INPUT_OUTPUT, &data->pin_cmd_descriptor) && acquire_pin_or_set_null(sdmmc_config->pin_d0, GPIO_FLAG_DIRECTION_INPUT_OUTPUT, &data->pin_d0_descriptor) && acquire_pin_or_set_null(sdmmc_config->pin_d1, GPIO_FLAG_DIRECTION_INPUT_OUTPUT, &data->pin_d1_descriptor) && acquire_pin_or_set_null(sdmmc_config->pin_d2, GPIO_FLAG_DIRECTION_INPUT_OUTPUT, &data->pin_d2_descriptor) &&