From 2a3669d768d774ac9200aa1d1e0764d516e71b58 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Wed, 1 Sep 2021 15:22:18 -0500 Subject: [PATCH] drv/ioport: use correct function namespace This changes pbio_ioport_reset_passive_devices() to pbdrv_ioport_reset_passive_devices(). Since the module is in the drv/ folder, the correct prefix is "pbdrv_". --- lib/pbio/drv/ioport/ioport_lpf2.c | 2 +- lib/pbio/include/pbdrv/ioport.h | 6 +++--- lib/pbio/src/main.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/pbio/drv/ioport/ioport_lpf2.c b/lib/pbio/drv/ioport/ioport_lpf2.c index 7dcd7fc5a..8df74e02c 100644 --- a/lib/pbio/drv/ioport/ioport_lpf2.c +++ b/lib/pbio/drv/ioport/ioport_lpf2.c @@ -201,7 +201,7 @@ pbio_error_t pbdrv_ioport_get_iodev(pbio_port_id_t port, pbio_iodev_t **iodev) { } // Turns off power to passive (non-uart) devices -void pbio_ioport_reset_passive_devices(void) { +void pbdrv_ioport_reset_passive_devices(void) { for (int i = 0; i < PBDRV_CONFIG_IOPORT_LPF2_NUM_PORTS; i++) { if (ioport_devs[i].connected_type_id != PBIO_IODEV_TYPE_ID_LPF2_UNKNOWN_UART) { pbdrv_motor_coast(i + PBDRV_CONFIG_IOPORT_LPF2_FIRST_PORT); diff --git a/lib/pbio/include/pbdrv/ioport.h b/lib/pbio/include/pbdrv/ioport.h index e351b55cf..e3f1c52e0 100644 --- a/lib/pbio/include/pbdrv/ioport.h +++ b/lib/pbio/include/pbdrv/ioport.h @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// Copyright (c) 2018-2020 The Pybricks Authors +// Copyright (c) 2018-2021 The Pybricks Authors /** * @addtogroup IOPortDriver Driver: I/O Port @@ -20,7 +20,7 @@ pbio_error_t pbdrv_ioport_get_iodev(pbio_port_id_t port, pbio_iodev_t **iodev); -void pbio_ioport_reset_passive_devices(void); +void pbdrv_ioport_reset_passive_devices(void); #else // PBDRV_CONFIG_IOPORT @@ -29,7 +29,7 @@ static inline pbio_error_t pbdrv_ioport_get_iodev(pbio_port_id_t port, pbio_iode return PBIO_ERROR_NOT_SUPPORTED; } -static inline void pbio_ioport_reset_passive_devices(void) { +static inline void pbdrv_ioport_reset_passive_devices(void) { } #endif // PBDRV_CONFIG_IOPORT diff --git a/lib/pbio/src/main.c b/lib/pbio/src/main.c index c253d36c5..ede9ca7fb 100644 --- a/lib/pbio/src/main.c +++ b/lib/pbio/src/main.c @@ -69,7 +69,7 @@ void pbio_stop_all(void) { pbio_light_animation_stop_all(); #endif #if PBDRV_CONFIG_IOPORT_LPF2 - pbio_ioport_reset_passive_devices(); + pbdrv_ioport_reset_passive_devices(); #endif pbio_motor_process_reset(); pbdrv_sound_stop();