diff --git a/Makefile b/Makefile index 3624766..2582f48 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ LIVECD := $(RELEASE_DIR)/aurix-$(GITREV)-livecd_$(ARCH)-$(PLATFORM).iso LIVEHDD := $(RELEASE_DIR)/aurix-$(GITREV)-livehdd_$(ARCH)-$(PLATFORM).img LIVESD := $(RELEASE_DIR)/aurix-$(GITREV)-livesd_$(ARCH)-$(PLATFORM).img -QEMU_FLAGS := -m 2G -smp 4 -serial stdio +QEMU_FLAGS := -m 2G -smp 4 -rtc base=localtime -serial stdio # QEMU Audio support #QEMU_FLAGS += -audiodev coreaudio,id=coreaudio0 -device ich9-intel-hda -device hda-output,audiodev=coreaudio0 diff --git a/boot/common/config/config.c b/boot/common/config/config.c index 98ab515..c0d5a21 100644 --- a/boot/common/config/config.c +++ b/boot/common/config/config.c @@ -30,7 +30,10 @@ #include #define DEFAULT_ENTRY 0 -#define DEFAULT_TIMEOUT 30 +// default timeout of 0 disables the UI entirely, which is essentialy what *should* happen now since the UI +// is... in a catastrophic state. Just remember to set this back to 30 once the UI is ready +#define DEFAULT_TIMEOUT 0 +// #define DEFAULT_TIMEOUT 30 char *config_paths[] = { "\\AxBoot\\axboot.cfg", diff --git a/boot/common/i18n/cs_CZ.c b/boot/common/i18n/cs_CZ.c index 951129a..754544d 100644 --- a/boot/common/i18n/cs_CZ.c +++ b/boot/common/i18n/cs_CZ.c @@ -22,5 +22,8 @@ struct language i18n_csCZ = { .shutdown = "Vypnout", .reboot = "Restartovat", - .reboot_to_firmware = "Přejít do nastavení firmwaru" + .reboot_to_firmware = "Přejít do nastavení firmwaru", + .resolution = "Rozlišení", + + .language = "Jazyk" }; diff --git a/boot/common/i18n/en_US.c b/boot/common/i18n/en_US.c index 0d67ecd..629e26b 100644 --- a/boot/common/i18n/en_US.c +++ b/boot/common/i18n/en_US.c @@ -22,5 +22,8 @@ struct language i18n_enUS = { .shutdown = "Shutdown", .reboot = "Reboot", - .reboot_to_firmware = "Reboot to Firmware" + .reboot_to_firmware = "Reboot to Firmware", + .resolution = "Resolution", + + .language = "Language" }; diff --git a/boot/common/i18n/i18n.c b/boot/common/i18n/i18n.c index 158591c..c2860a1 100644 --- a/boot/common/i18n/i18n.c +++ b/boot/common/i18n/i18n.c @@ -19,6 +19,20 @@ #include +extern struct language i18n_csCZ; extern struct language i18n_enUS; -struct language *i18n_lang = &i18n_enUS; \ No newline at end of file +struct language_selection i18n_languages[] = { + { + "Čeština", + "cs_CZ", + &i18n_csCZ + }, + { + "English", + "en_US", + &i18n_enUS + } +}; + +struct language_selection *i18n_curlang = &i18n_languages[1]; // english \ No newline at end of file diff --git a/boot/common/init.c b/boot/common/init.c index 886cedc..ac35140 100644 --- a/boot/common/init.c +++ b/boot/common/init.c @@ -38,6 +38,12 @@ void axboot_init() //config_init(); + // boot straight away + if (config_get_timeout() < 1) { + struct axboot_entry *entries = config_get_entries(); + loader_load(&(entries[config_get_default()])); + } + ui_init(); debug("axboot_init(): Returned from main menu, something went wrong. Halting!"); diff --git a/boot/common/ui/ui.c b/boot/common/ui/ui.c index 689e349..80c5239 100644 --- a/boot/common/ui/ui.c +++ b/boot/common/ui/ui.c @@ -20,9 +20,11 @@ #include #include #include +#include #include #include #include +#include #include