Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version and fix mode prompts

Browse Source
This commit is contained in:
K. Lange 2018-07-12 14:54:58 +09:00
parent e7ccc61d62
commit d49a69343e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boot/cstuff.c
View File

@ -19,14 +19,15 @@ EFI_HANDLE ImageHandleIn;
#include "options.h"
/* Basic text strings */
#define BASE_VERSION "ToaruOS-NIH Bootloader v2.0"
#ifdef EFI_PLATFORM
# if defined(__x86_64__)
# define VERSION_TEXT "ToaruOS-NIH Bootloader v1.3 (EFI, X64)"
# define VERSION_TEXT BASE_VERSION " (EFI, X64)"
# else
# define VERSION_TEXT "ToaruOS-NIH Bootloader v1.3 (EFI, IA32)"
# define VERSION_TEXT BASE_VERSION " (EFI, IA32)"
# endif
#else
# define VERSION_TEXT "ToaruOS-NIH Bootloader v1.3 (BIOS)"
# define VERSION_TEXT BASE_VERSION " (BIOS)"
#endif
#define HELP_TEXT "Press <Enter> or select a menu option with \030/\031/\032/\033."
#define COPYRIGHT_TEXT "ToaruOS is free software under the NCSA license."

3
boot/moremultiboot.h
View File

@ -226,11 +226,14 @@ static void move_kernel(void) {
print_("y/n? ");
int resp = read_scancode();
if (resp == 'y') {
print_("y\n");
biggest = i;
goto done_video;
} else if (resp == 'n') {
print_("n\n");
break;
}
print_("?\n");
}
}
}