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
This commit is contained in:
Aidan MacDonald 2022-03-05 09:40:57 +00:00
parent 5bdb2fccdb
commit ed897d1359
2 changed files with 4 additions and 27 deletions

View file

@ -88,10 +88,10 @@ show_logo.c
sansaconnect.c sansaconnect.c
show_logo.c show_logo.c
#elif defined(FIIO_M3K) || defined(SHANLING_Q1) || defined(EROS_QN) #elif defined(FIIO_M3K) || defined(SHANLING_Q1) || defined(EROS_QN)
x1000.c
x1000/boot.c x1000/boot.c
x1000/gui.c x1000/gui.c
x1000/install.c x1000/install.c
x1000/main.c
x1000/recovery.c x1000/recovery.c
x1000/utils.c x1000/utils.c
#endif #endif

View file

@ -19,42 +19,19 @@
* *
****************************************************************************/ ****************************************************************************/
/* Unified bootloader for all X1000 targets. This is a bit messy. #include "x1000bootloader.h"
*
* Features:
* - Text based user interface
* - USB mass storage access
* - Bootloader installation / backup / restore
*
* Possible future improvements:
* - Allow booting original firmware from the UI
*/
#include "system.h" #include "system.h"
#include "core_alloc.h" #include "core_alloc.h"
#include "kernel/kernel-internal.h" #include "kernel/kernel-internal.h"
#include "i2c.h"
#include "power.h" #include "power.h"
#include "lcd.h"
#include "font.h"
#include "backlight.h"
#include "backlight-target.h"
#include "button.h" #include "button.h"
#include "storage.h" #include "storage.h"
#include "file_internal.h"
#include "disk.h" #include "disk.h"
#include "file_internal.h"
#include "usb.h" #include "usb.h"
#include "rb-loader.h" #include "i2c-x1000.h"
#include "loader_strerror.h"
#include "version.h"
#include "boot-x1000.h" #include "boot-x1000.h"
#include "installer-x1000.h"
#include "x1000/x1000bootloader.h"
#include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
void main(void) void main(void)
{ {