X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=seabios.git;a=blobdiff_plain;f=src%2Fboot.c;h=9dd37fd57478d7522fb5251f85f64db88f9b479e;hp=93928d38dd5ff3df57d100b5e57e08cb0621992f;hb=refs%2Fheads%2Fcoreboot;hpb=2762de0867345d059ab70690f98144921f8e151b diff --git a/src/boot.c b/src/boot.c index 93928d3..9dd37fd 100644 --- a/src/boot.c +++ b/src/boot.c @@ -326,7 +326,7 @@ boot_add_bev(u16 seg, u16 bev, u16 desc, int prio) void boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio) { - bootentry_add(IPL_TYPE_BCV, defPrio(prio, DEFAULT_PRIO) + bootentry_add(IPL_TYPE_BCV, defPrio(prio, DefaultHDPrio) , SEGOFF(seg, ip).segoff , desc ? MAKE_FLATPTR(seg, desc) : "Legacy option rom"); } @@ -380,6 +380,9 @@ interactive_bootmenu(void) 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) @@ -461,11 +464,14 @@ boot_prep(void) // XXX - show available drives? // Allow user to modify BCV/IPL order. + dprintf(3, "[wurm] bp1\n"); interactive_bootmenu(); + dprintf(3, "[wurm] bp2\n"); 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: @@ -489,10 +495,12 @@ boot_prep(void) } 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); + dprintf(3, "[wurm] bp5\n"); }