projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml...
[seabios.git]
/
src
/
boot.c
diff --git
a/src/boot.c
b/src/boot.c
index e26dad1ea54e7777e2f5d4f8249fb74dc3a2e8a3..9dd37fd57478d7522fb5251f85f64db88f9b479e 100644
(file)
--- a/
src/boot.c
+++ b/
src/boot.c
@@
-380,6
+380,9
@@
interactive_bootmenu(void)
u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT);
enable_bootsplash();
u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT);
enable_bootsplash();
+ if (1 == 1) {
+ return;
+ }
int scan_code = get_keystroke(menutime);
disable_bootsplash();
if (scan_code != 0x86)
int scan_code = get_keystroke(menutime);
disable_bootsplash();
if (scan_code != 0x86)
@@
-461,11
+464,14
@@
boot_prep(void)
// XXX - show available drives?
// Allow user to modify BCV/IPL order.
// XXX - show available drives?
// Allow user to modify BCV/IPL order.
+ dprintf(3, "[wurm] bp1\n");
interactive_bootmenu();
interactive_bootmenu();
+ dprintf(3, "[wurm] bp2\n");
wait_threads();
// Map drives and populate BEV list
struct bootentry_s *pos = BootList;
wait_threads();
// Map drives and populate BEV list
struct bootentry_s *pos = BootList;
+ dprintf(3, "[wurm] bp3\n");
while (pos) {
switch (pos->type) {
case IPL_TYPE_BCV:
while (pos) {
switch (pos->type) {
case IPL_TYPE_BCV:
@@
-489,10
+495,12
@@
boot_prep(void)
}
pos = pos->next;
}
}
pos = pos->next;
}
+ dprintf(3, "[wurm] bp4\n");
// If nothing added a floppy/hd boot - add it manually.
add_bev(IPL_TYPE_FLOPPY, 0);
add_bev(IPL_TYPE_HARDDISK, 0);
// If nothing added a floppy/hd boot - add it manually.
add_bev(IPL_TYPE_FLOPPY, 0);
add_bev(IPL_TYPE_HARDDISK, 0);
+ dprintf(3, "[wurm] bp5\n");
}
}