From ab1de66dd37cffcac5220251283738431d8a7ecd Mon Sep 17 00:00:00 2001 From: Florin Maticu Date: Tue, 4 Oct 2022 23:55:05 +0200 Subject: [PATCH] Remove redundant header files. --- ports/stm/common-hal/alarm/pin/PinAlarm.c | 2 -- ports/stm/common-hal/alarm/time/TimeAlarm.c | 1 - ports/stm/common-hal/analogio/AnalogOut.c | 3 +++ ports/stm/common-hal/busio/I2C.c | 1 - ports/stm/common-hal/busio/SPI.c | 3 --- ports/stm/common-hal/digitalio/DigitalInOut.c | 2 -- ports/stm/common-hal/microcontroller/Pin.c | 2 -- ports/stm/common-hal/pulseio/PulseIn.c | 1 - ports/stm/common-hal/pulseio/PulseOut.c | 4 ---- ports/stm/common-hal/pwmio/PWMOut.c | 1 - ports/stm/common-hal/rtc/RTC.c | 4 ---- ports/stm/mphalport.c | 3 --- ports/stm/peripherals/exti.c | 7 ++----- ports/stm/peripherals/rtc.c | 3 --- ports/stm/peripherals/timers.c | 1 - ports/stm/supervisor/internal_flash.c | 5 ----- ports/stm/supervisor/port.c | 1 - ports/stm/supervisor/usb.c | 2 -- 18 files changed, 5 insertions(+), 41 deletions(-) diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.c b/ports/stm/common-hal/alarm/pin/PinAlarm.c index 799922ae8f..0e5fa9e94d 100644 --- a/ports/stm/common-hal/alarm/pin/PinAlarm.c +++ b/ports/stm/common-hal/alarm/pin/PinAlarm.c @@ -27,8 +27,6 @@ #include "py/runtime.h" #include "shared-bindings/alarm/pin/PinAlarm.h" -#include "shared-bindings/microcontroller/__init__.h" -#include "shared-bindings/microcontroller/Pin.h" #include "peripherals/exti.h" diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c index 2eb8ee4a81..6d508cd8cc 100644 --- a/ports/stm/common-hal/alarm/time/TimeAlarm.c +++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c @@ -28,7 +28,6 @@ #include "shared-bindings/alarm/time/TimeAlarm.h" #include "shared-bindings/time/__init__.h" -#include "supervisor/port.h" #include "peripherals/rtc.h" #include STM32_HAL_H diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c index 3c2860c9ad..4dd8783545 100644 --- a/ports/stm/common-hal/analogio/AnalogOut.c +++ b/ports/stm/common-hal/analogio/AnalogOut.c @@ -28,9 +28,12 @@ #include #include + #include "py/mperrno.h" #include "py/runtime.h" + + #include "shared-bindings/analogio/AnalogOut.h" #include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/translate/translate.h" diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c index 4faa5ca2ef..259d678f2b 100644 --- a/ports/stm/common-hal/busio/I2C.c +++ b/ports/stm/common-hal/busio/I2C.c @@ -30,7 +30,6 @@ #include "py/mperrno.h" #include "py/runtime.h" -#include "shared-bindings/microcontroller/__init__.h" #include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index 7886e18a0c..89ec4b7cdc 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -28,11 +28,8 @@ #include #include "shared-bindings/busio/SPI.h" -#include "py/mperrno.h" #include "py/runtime.h" -#include "shared-bindings/microcontroller/__init__.h" -#include "supervisor/board.h" #include "supervisor/shared/translate/translate.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/digitalio/DigitalInOut.c b/ports/stm/common-hal/digitalio/DigitalInOut.c index 58f81b43b6..51b05907f7 100644 --- a/ports/stm/common-hal/digitalio/DigitalInOut.c +++ b/ports/stm/common-hal/digitalio/DigitalInOut.c @@ -27,8 +27,6 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/microcontroller/Pin.h" -#include "py/runtime.h" -#include "supervisor/shared/translate/translate.h" // The HAL is sparse on obtaining register information, so we use the LLs here. #if (CPY_STM32H7) diff --git a/ports/stm/common-hal/microcontroller/Pin.c b/ports/stm/common-hal/microcontroller/Pin.c index 9d6c8ec71a..7c4f4511e7 100644 --- a/ports/stm/common-hal/microcontroller/Pin.c +++ b/ports/stm/common-hal/microcontroller/Pin.c @@ -26,9 +26,7 @@ */ #include "shared-bindings/microcontroller/Pin.h" -#include "shared-bindings/digitalio/DigitalInOut.h" -#include "py/mphal.h" #include "pins.h" #if defined(TFBGA216) diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c index 1c323ad711..4ed2600d55 100644 --- a/ports/stm/common-hal/pulseio/PulseIn.c +++ b/ports/stm/common-hal/pulseio/PulseIn.c @@ -28,7 +28,6 @@ #include #include #include "py/mpconfig.h" -#include "py/gc.h" #include "py/runtime.h" #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm/common-hal/pulseio/PulseOut.c index 7725d8cdde..f558c8f776 100644 --- a/ports/stm/common-hal/pulseio/PulseOut.c +++ b/ports/stm/common-hal/pulseio/PulseOut.c @@ -29,14 +29,10 @@ #include #include "py/mpconfig.h" -#include "py/gc.h" -#include "py/runtime.h" #include "shared-bindings/pulseio/PulseOut.h" #include "shared-bindings/pwmio/PWMOut.h" -#include "supervisor/shared/translate/translate.h" #include STM32_HAL_H -#include "shared-bindings/microcontroller/Pin.h" #include "timers.h" // A single timer is shared amongst all PulseOut objects under the assumption that diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c index 45f00b901b..16d510b605 100644 --- a/ports/stm/common-hal/pwmio/PWMOut.c +++ b/ports/stm/common-hal/pwmio/PWMOut.c @@ -31,7 +31,6 @@ #include "shared-bindings/pwmio/PWMOut.h" #include "supervisor/shared/translate/translate.h" -#include "shared-bindings/microcontroller/__init__.h" #include STM32_HAL_H #include "shared-bindings/microcontroller/Pin.h" diff --git a/ports/stm/common-hal/rtc/RTC.c b/ports/stm/common-hal/rtc/RTC.c index 48c47fda8c..c9dc50d769 100644 --- a/ports/stm/common-hal/rtc/RTC.c +++ b/ports/stm/common-hal/rtc/RTC.c @@ -26,13 +26,9 @@ #include -#include "py/obj.h" #include "py/runtime.h" #include "shared/timeutils/timeutils.h" -#include "shared-bindings/rtc/__init__.h" -#include "common-hal/rtc/RTC.h" #include "shared-bindings/rtc/RTC.h" -#include "supervisor/port.h" #include "supervisor/shared/translate/translate.h" #include "peripherals/rtc.h" diff --git a/ports/stm/mphalport.c b/ports/stm/mphalport.c index bb62b07987..647798f6d5 100644 --- a/ports/stm/mphalport.c +++ b/ports/stm/mphalport.c @@ -28,11 +28,8 @@ #include #include "py/mphal.h" -#include "py/mpstate.h" -#include "py/gc.h" #include "shared-bindings/microcontroller/__init__.h" -#include "supervisor/shared/tick.h" void mp_hal_delay_us(mp_uint_t delay) { common_hal_mcu_delay_us(delay); diff --git a/ports/stm/peripherals/exti.c b/ports/stm/peripherals/exti.c index a161898491..a97de55531 100644 --- a/ports/stm/peripherals/exti.c +++ b/ports/stm/peripherals/exti.c @@ -26,9 +26,6 @@ #include #include "py/mpconfig.h" -#include "py/gc.h" -#include "py/obj.h" -#include "py/runtime.h" #include "peripherals/exti.h" @@ -128,7 +125,7 @@ void EXTI4_IRQHandler(void) { #endif void EXTI9_5_IRQHandler(void) { uint32_t pending = EXTI->PR; - for (uint i = 5; i <= 9; i++) { + for (uint8_t i = 5; i <= 9; i++) { if (pending & (1 << i)) { stm_exti_callback[i](i); } @@ -137,7 +134,7 @@ void EXTI9_5_IRQHandler(void) { void EXTI15_10_IRQHandler(void) { uint32_t pending = EXTI->PR; - for (uint i = 10; i <= 15; i++) { + for (uint8_t i = 10; i <= 15; i++) { if (pending & (1 << i)) { stm_exti_callback[i](i); } diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c index bd65ccbf17..15f82ba78d 100644 --- a/ports/stm/peripherals/rtc.c +++ b/ports/stm/peripherals/rtc.c @@ -29,9 +29,6 @@ #include STM32_HAL_H #include "py/mpconfig.h" -#include "py/gc.h" -#include "py/obj.h" -#include "py/runtime.h" #include "shared/timeutils/timeutils.h" // Default period for ticks is 1/1024 second diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c index 371b8f414b..ed0f2ec38a 100644 --- a/ports/stm/peripherals/timers.c +++ b/ports/stm/peripherals/timers.c @@ -26,7 +26,6 @@ #include "timers.h" #include "py/mpconfig.h" -#include "py/gc.h" #include "py/obj.h" #include "py/runtime.h" #include "supervisor/shared/translate/translate.h" diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c index cd693d0c66..e0f4153cb1 100644 --- a/ports/stm/supervisor/internal_flash.c +++ b/ports/stm/supervisor/internal_flash.c @@ -29,12 +29,7 @@ #include #include -#include "extmod/vfs.h" -#include "extmod/vfs_fat.h" -#include "py/mphal.h" #include "py/obj.h" -#include "py/runtime.h" -#include "lib/oofatfs/ff.h" #include "supervisor/flash.h" #include "supervisor/shared/safe_mode.h" diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c index 896d58b013..97bd1c4982 100644 --- a/ports/stm/supervisor/port.c +++ b/ports/stm/supervisor/port.c @@ -29,7 +29,6 @@ #include "supervisor/background_callback.h" #include "supervisor/board.h" #include "supervisor/port.h" -#include "shared/timeutils/timeutils.h" #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/microcontroller/__init__.h" diff --git a/ports/stm/supervisor/usb.c b/ports/stm/supervisor/usb.c index 168bacc569..cafa401bd4 100644 --- a/ports/stm/supervisor/usb.c +++ b/ports/stm/supervisor/usb.c @@ -27,9 +27,7 @@ #include "supervisor/usb.h" -#include "shared/runtime/interrupt_char.h" #include "shared/readline/readline.h" -#include "lib/tinyusb/src/device/usbd.h" #include "py/mpconfig.h"