From 151296fbf9b2dfc65365ac71b5f4483c3d532f8d Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Fri, 6 Apr 2012 14:25:10 +0200 Subject: [PATCH] grml... --- src/boot.c | 8 ++++++++ src/post.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/boot.c b/src/boot.c index e26dad1..9dd37fd 100644 --- 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(); + 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"); } diff --git a/src/post.c b/src/post.c index 7c76959..cf7501e 100644 --- a/src/post.c +++ b/src/post.c @@ -266,24 +266,32 @@ maininit(void) } // Run option roms + dprintf(3, "[wurm] optionrom_setup\n"); optionrom_setup(); // Run BCVs and show optional boot menu + dprintf(3, "[wurm] boot_prep\n"); boot_prep(); // Finalize data structures before boot + dprintf(3, "[wurm] cdemu_setup\n"); cdemu_setup(); + dprintf(3, "[wurm] pmm_finalize\n"); pmm_finalize(); + dprintf(3, "[wurm] malloc_finalize\n"); malloc_finalize(); + dprintf(3, "[wurm] memmap_finalize\n"); memmap_finalize(); // Setup bios checksum. BiosChecksum -= checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE); // Write protect bios memory. + dprintf(3, "[wurm] make_bios_readonly\n"); make_bios_readonly(); // Invoke int 19 to start boot process. + dprintf(3, "[wurm] startBoot\n"); startBoot(); } -- 2.25.1