grml...

[seabios.git] / src / boot.c

diff --git a/src/boot.c b/src/boot.c
index 119f29007de5fa8b14ad590f281e07ccc4b90145..9dd37fd57478d7522fb5251f85f64db88f9b479e 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -191,9 +191,9 @@ int bootprio_find_usb(struct pci_device *pci, u64 path)
     for (i=56; i>0; i-=8) {
         int port = (path >> i) & 0xff;
         if (port != 0xff)
-            p += snprintf(p, desc+sizeof(desc)-p, "/hub@%x", port);
+            p += snprintf(p, desc+sizeof(desc)-p, "/hub@%x", port+1);
     }
-    snprintf(p, desc+sizeof(desc)-p, "/*@%x", (u32)(path & 0xff));
+    snprintf(p, desc+sizeof(desc)-p, "/*@%x", (u32)(path & 0xff)+1);
     return find_prio(desc);
 }
 
@@ -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");
 }