stmhal: Include mpconfig.h before all other includes.

It defines types used by all other headers.

Fixes #691.

20 files changed, 20 insertions, 19 deletions

diff --git a/stmhal/boards/stm32f4xx-prefix.c b/stmhal/boards/stm32f4xx-prefix.c
index 4d2313075a..3bbb6bda0e 100644
--- a/stmhal/boards/stm32f4xx-prefix.c
+++ b/stmhal/boards/stm32f4xx-prefix.c
@@ -5,8 +5,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "pin.h"
diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c
index dd72655520..1f823ea963 100644
--- a/stmhal/bufhelper.c
+++ b/stmhal/bufhelper.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "bufhelper.h"
diff --git a/stmhal/diskio.c b/stmhal/diskio.c
index cde5874946..35b9eab99f 100644
--- a/stmhal/diskio.c
+++ b/stmhal/diskio.c
@@ -32,8 +32,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "systick.h"
diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c
index 79082e2f2e..721aa062d1 100644
--- a/stmhal/gccollect.c
+++ b/stmhal/gccollect.c
@@ -28,8 +28,8 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "gc.h"
diff --git a/stmhal/import.c b/stmhal/import.c
index abc618bef0..88ddaefacf 100644
--- a/stmhal/import.c
+++ b/stmhal/import.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "ff.h"
diff --git a/stmhal/lexerfatfs.c b/stmhal/lexerfatfs.c
index 6a0e83fb13..c578b13af6 100644
--- a/stmhal/lexerfatfs.c
+++ b/stmhal/lexerfatfs.c
@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "lexerfatfs.h"
diff --git a/stmhal/main.c b/stmhal/main.c
index 9f48fbfd65..d6c12602e0 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -29,10 +29,10 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "misc.h"
 #include "systick.h"
 #include "pendsv.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "misc.h"
 #include "nlr.h"
diff --git a/stmhal/pendsv.c b/stmhal/pendsv.c
index f8e3b30072..a0eff7e5de 100644
--- a/stmhal/pendsv.c
+++ b/stmhal/pendsv.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <stm32f4xx_hal.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "pendsv.h"
diff --git a/stmhal/pin_named_pins.c b/stmhal/pin_named_pins.c
index 3a1794e1d9..d59ba8d11d 100644
--- a/stmhal/pin_named_pins.c
+++ b/stmhal/pin_named_pins.c
@@ -30,8 +30,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
diff --git a/stmhal/printf.c b/stmhal/printf.c
index 26c552039f..c4731aa88d 100644
--- a/stmhal/printf.c
+++ b/stmhal/printf.c
@@ -28,10 +28,10 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include "mpconfig.h"
 #include "std.h"
 #include "misc.h"
 #include "systick.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "pfenv.h"
diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c
index 05ea06eb44..13057a8a06 100644
--- a/stmhal/pybstdio.c
+++ b/stmhal/pybstdio.c
@@ -28,8 +28,8 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "misc.h"
 #include "obj.h"
diff --git a/stmhal/readline.c b/stmhal/readline.c
index d40bd4219b..0e7ed2d644 100644
--- a/stmhal/readline.c
+++ b/stmhal/readline.c
@@ -29,8 +29,8 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "misc.h"
 #include "obj.h"
diff --git a/stmhal/rng.c b/stmhal/rng.c
index 69fcb9d6ff..ea636770c0 100644
--- a/stmhal/rng.c
+++ b/stmhal/rng.c
@@ -28,8 +28,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "rng.h"
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index 412816c396..8f0d007327 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -28,8 +28,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
diff --git a/stmhal/sdcard.c b/stmhal/sdcard.c
index bd45af3a14..204dbe3b46 100644
--- a/stmhal/sdcard.c
+++ b/stmhal/sdcard.c
@@ -28,8 +28,8 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
diff --git a/stmhal/stm32f4xx_hal_msp.c b/stmhal/stm32f4xx_hal_msp.c
index 5816249e25..90baa41f82 100644
--- a/stmhal/stm32f4xx_hal_msp.c
+++ b/stmhal/stm32f4xx_hal_msp.c
@@ -66,8 +66,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "servo.h"
diff --git a/stmhal/stm32f4xx_it.c b/stmhal/stm32f4xx_it.c
index 17cdaf5fa2..5fa7f8289d 100644
--- a/stmhal/stm32f4xx_it.c
+++ b/stmhal/stm32f4xx_it.c
@@ -70,8 +70,8 @@
 #include "stm32f4xx_it.h"
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "extint.h"
diff --git a/stmhal/storage.c b/stmhal/storage.c
index ba7e303e21..001d87afe0 100644
--- a/stmhal/storage.c
+++ b/stmhal/storage.c
@@ -28,9 +28,9 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "misc.h"
 #include "systick.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "led.h"
diff --git a/stmhal/systick.c b/stmhal/systick.c
index 8a8d6403dc..196f1fbcae 100644
--- a/stmhal/systick.c
+++ b/stmhal/systick.c
@@ -25,6 +25,7 @@
  */
 
 #include <stm32f4xx_hal.h>
+#include "mpconfig.h"
 #include "misc.h"
 #include "systick.h"
 
diff --git a/stmhal/usrsw.c b/stmhal/usrsw.c
index 4ed9e3abe4..8a082eac95 100644
--- a/stmhal/usrsw.c
+++ b/stmhal/usrsw.c
@@ -28,8 +28,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"