From ed897d1359bcf09692746d2b8b31fcbd2da95b58 Mon Sep 17 00:00:00 2001
From: Aidan MacDonald <amachronic@protonmail.com>
Date: Sat, 5 Mar 2022 09:40:57 +0000
Subject: [PATCH] x1000: bootloader: move the main function to its own file

Now that everything has been refactored into separate files the
main routine is the only thing left to move. Put it in main.c.

Change-Id: I53aba87ed281b52944fb80d9a62beaec1c87f152
---
 bootloader/SOURCES                   |  2 +-
 bootloader/{x1000.c => x1000/main.c} | 29 +++-------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)
 rename bootloader/{x1000.c => x1000/main.c} (79%)

diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 95836eb016..8a4358ca77 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -88,10 +88,10 @@ show_logo.c
 sansaconnect.c
 show_logo.c
 #elif defined(FIIO_M3K) || defined(SHANLING_Q1) || defined(EROS_QN)
-x1000.c
 x1000/boot.c
 x1000/gui.c
 x1000/install.c
+x1000/main.c
 x1000/recovery.c
 x1000/utils.c
 #endif
diff --git a/bootloader/x1000.c b/bootloader/x1000/main.c
similarity index 79%
rename from bootloader/x1000.c
rename to bootloader/x1000/main.c
index bc56b8f822..c507b1d2c9 100644
--- a/bootloader/x1000.c
+++ b/bootloader/x1000/main.c
@@ -19,42 +19,19 @@
  *
  ****************************************************************************/
 
-/* Unified bootloader for all X1000 targets. This is a bit messy.
- *
- * Features:
- * - Text based user interface
- * - USB mass storage access
- * - Bootloader installation / backup / restore
- *
- * Possible future improvements:
- * - Allow booting original firmware from the UI
- */
-
+#include "x1000bootloader.h"
 #include "system.h"
 #include "core_alloc.h"
 #include "kernel/kernel-internal.h"
-#include "i2c.h"
 #include "power.h"
-#include "lcd.h"
-#include "font.h"
-#include "backlight.h"
-#include "backlight-target.h"
 #include "button.h"
 #include "storage.h"
-#include "file_internal.h"
 #include "disk.h"
+#include "file_internal.h"
 #include "usb.h"
-#include "rb-loader.h"
-#include "loader_strerror.h"
-#include "version.h"
+#include "i2c-x1000.h"
 #include "boot-x1000.h"
-#include "installer-x1000.h"
-#include "x1000/x1000bootloader.h"
-#include <stddef.h>
 #include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
 
 void main(void)
 {