stmhal: Clean up some header includes.

stmhal/boards/LIMIFROG/mpconfigboard.h

@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "LIMIFROG"
 #define MICROPY_HW_MCU_NAME         "STM32L476"
 

stmhal/boards/NUCLEO_F429ZI/mpconfigboard.h

@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "NUCLEO-F429ZI"
 #define MICROPY_HW_MCU_NAME         "STM32F429"
 

stmhal/boards/STM32F429DISC/mpconfigboard.h

@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "F429I-DISCO"
 #define MICROPY_HW_MCU_NAME         "STM32F429"
 

stmhal/boards/STM32L476DISC/mpconfigboard.h

@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_BOARD_EARLY_INIT    STM32L476DISC_board_early_init
 void STM32L476DISC_board_early_init(void);
 

stmhal/dac.c

@@ -28,9 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include STM32_HAL_H
-
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "timer.h"
 #include "dac.h"

stmhal/dma.c

@@ -27,10 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include STM32_HAL_H
 
-#include "dma.h"
 #include "py/obj.h"
+#include "dma.h"
 #include "irq.h"
 
 typedef enum {

stmhal/flash.c

@@ -24,11 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include STM32_HAL_H
-
-#include "flash.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "py/misc.h"
+#include "flash.h"
 
 typedef struct {
     uint32_t base_address;

stmhal/modpyb.c

@@ -27,8 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/mpstate.h"
 #include "py/nlr.h"
 #include "py/obj.h"

stmhal/modstm.c

@@ -27,15 +27,11 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include STM32_HAL_H
-
-#include "py/nlr.h"
 #include "py/obj.h"
-#include "extmod/machine_mem.h"
-#include "portmodules.h"
-
 #include "py/objint.h"
+#include "extmod/machine_mem.h"
 #include "genhdr/modstm_mpz.h"
+#include "portmodules.h"
 
 STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_stm) },

stmhal/modutime.c

@@ -26,9 +26,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include STM32_HAL_H
 
-#include "py/nlr.h"
+#include "py/runtime.h"
 #include "py/smallint.h"
 #include "py/obj.h"
 #include "lib/timeutils/timeutils.h"

stmhal/pendsv.c

@@ -25,7 +25,6 @@
  */
 
 #include <stdlib.h>
-#include STM32_HAL_H
 
 #include "py/mpstate.h"
 #include "py/runtime.h"

stmhal/rng.c

@@ -26,8 +26,6 @@
 
 #include <string.h>
 
-#include STM32_HAL_H
-
 #include "py/obj.h"
 #include "rng.h"
 

stmhal/rtc.c

@@ -26,12 +26,9 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/runtime.h"
 #include "rtc.h"
 #include "irq.h"
-#include "mphalport.h"
 
 /// \moduleref pyb
 /// \class RTC - real time clock

stmhal/servo.c

@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "timer.h"

stmhal/stm32_it.c

@@ -67,12 +67,10 @@
 
 #include <stdio.h>
 
-#include "stm32_it.h"
-#include STM32_HAL_H
-
 #include "py/mpstate.h"
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "stm32_it.h"
 #include "pendsv.h"
 #include "irq.h"
 #include "pybthread.h"

stmhal/system_stm32.c

@@ -87,8 +87,7 @@
   * @{
   */
 
-#include "mpconfigboard.h"
-#include STM32_HAL_H
+#include "py/mphal.h"
 
 void __fatal_error(const char *msg);
 

stmhal/timer.c

@@ -28,11 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include STM32_HAL_H
 #include "usbd_cdc_msc_hid.h"
 #include "usbd_cdc_interface.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "timer.h"

stmhal/usbd_conf.c

@@ -30,7 +30,6 @@
   */
 
 /* Includes ------------------------------------------------------------------*/
-#include STM32_HAL_H
 #include "usbd_core.h"
 #include "py/obj.h"
 #include "irq.h"

stmhal/usbd_conf.h

@@ -34,7 +34,6 @@
 #define __USBD_CONF_H
 
 /* Includes ------------------------------------------------------------------*/
-#include STM32_HAL_H
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

stmhal/wdt.c

@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/runtime.h"
 #include "wdt.h"