chore(bootloader): Cleanup includes

Signed-off-by: Rahix <rahix@rahix.de>

bootloader/bootloader-usb.c

@@ -38,22 +38,26 @@
  * @brief   USB Mass Storage Class
  */
 
-#include <stdio.h>
-#include <stddef.h>
+#include "bootloader.h"
+#include "descriptors.h"
+
+#include "display.h"
+#include "GUI_Paint.h"
+#include "card10.h"
+#include "led.h"
+
 #include "mxc_config.h"
 #include "mxc_sys.h"
 #include "mxc_delay.h"
 #include "board.h"
-#include "led.h"
 #include "usb.h"
 #include "usb_event.h"
 #include "enumerate.h"
 #include "msc.h"
-#include "descriptors.h"
 #include "mscmem.h"
-#include "card10.h"
-#include "display.h"
-#include "GUI_Paint.h"
+
+#include <stdio.h>
+#include <stddef.h>
 
 /***** Definitions *****/
 #define EVENT_ENUM_COMP MAXUSB_NUM_EVENTS

bootloader/bootloader.h

+#pragma once
+
+void run_usbmsc(void);
+
+void bootloader_stop(void);
+void bootloader_dirty(void);
+void bootloader_clean(void);

bootloader/main.c

-#include <stdio.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <string.h>
+#include "bootloader.h"
 
-#include "mxc_config.h"
-#include "mxc_sys.h"
-#include "mxc_delay.h"
-#include "flc.h"
-#include "icc.h"
-#include "i2c.h"
-#include "crc.h"
-#include "board.h"
-#include "led.h"
-#include "ff.h"
-#include "crc16-ccitt.h"
-#include "pb.h"
-#include "display.h"
 #include "GUI_Paint.h"
 #include "card10.h"
-
+#include "display.h"
+#include "led.h"
+#include "pb.h"
 #include "pmic.h"
 
+#include "board.h"
+#include "crc.h"
+#include "crc16-ccitt.h"
+#include "ff.h"
+#include "flc.h"
+#include "i2c.h"
+#include "icc.h"
+#include "mxc_config.h"
+#include "mxc_delay.h"
+#include "mxc_sys.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+
 #define GPIO_PORT_IN PORT_1
 #define GPIO_PIN_IN PIN_6
 
 #define PARTITION_START (0x10000000 + 64 * 1024)
 #define PARTITION_END (0x10000000 + 1024 * 1024 - 1)
 
-extern void run_usbmsc(void);
-
 DIR dir;
 FATFS FatFs;
 
@@ -220,6 +220,9 @@ int main(void)
 	printf("\n\nBootloader\n");
 	card10_init();
 
+	/*
+	 * Make the power/reset button restart card10.
+	 */
 	pmic_set_button_callback(pmic_button);
 
 	Paint_DrawString_EN(0, 16 * 0, "Bootloader", &Font16, 0x0000, 0xffff);

bootloader/mscmem.c

+#include "bootloader.h"
+
 #include "mscmem.h"
-#include <string.h>
-#include <stdio.h>
 #include "mx25lba.h"
 
-void bootloader_stop(void);
-void bootloader_dirty(void);
-void bootloader_clean(void);
+#include <string.h>
+#include <stdio.h>
 
 static int dirty = 0;