Merge branch 'nocomapi'syslinux-6.03-pre7

1 files changed, 26 insertions, 13 deletions

diff --git a/core/bios.c b/core/bios.c
index 6de4f2d6..328c729a 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -12,6 +12,7 @@
 #include <sys/vesa/video.h>
 #include <sys/vesa/debug.h>
 #include <minmax.h>
+#include "core.h"
 
 __export struct firmware *firmware = NULL;
 
@@ -165,22 +166,12 @@ static void bios_get_serial_console_info(uint16_t *iobase, uint16_t *divisor,
 	*flowctl |= (0x80 << 8);
 }
 
-void *__syslinux_adv_ptr;
-size_t __syslinux_adv_size;
-
 void bios_adv_init(void)
 {
     static com32sys_t reg;
 
     memset(&reg, 0, sizeof(reg));
-    reg.eax.w[0] = 0x0025;
-    __intcall(0x22, &reg, &reg);
-
-    memset(&reg, 0, sizeof(reg));
-    reg.eax.w[0] = 0x001c;
-    __intcall(0x22, &reg, &reg);
-    __syslinux_adv_ptr = MK_PTR(reg.es, reg.ebx.w[0]);
-    __syslinux_adv_size = reg.ecx.w[0];
+    call16(adv_init, &reg, NULL);
 }
 
 int bios_adv_write(void)
@@ -188,8 +179,7 @@ int bios_adv_write(void)
     static com32sys_t reg;
 
     memset(&reg, 0, sizeof(reg));
-    reg.eax.w[0] = 0x001d;
-    __intcall(0x22, &reg, &reg);
+    call16(adv_write, &reg, &reg);
     return (reg.eflags.l & EFLAGS_CF) ? -1 : 0;
 }
 
@@ -675,6 +665,29 @@ void bios_init(void)
 	dmi_init();
 }
 
+extern void bios_timer_cleanup(void);
+
+extern uint32_t OrigFDCTabPtr;
+
+static void bios_cleanup_hardware(void)
+{
+	/* Restore the original pointer to the floppy descriptor table */
+	if (OrigFDCTabPtr)
+		*((uint32_t *)(4 * 0x1e)) = OrigFDCTabPtr;
+
+	/*
+	 * Linux wants the floppy motor shut off before starting the
+	 * kernel, at least bootsect.S seems to imply so.  If we don't
+	 * load the floppy driver, this is *definitely* so!
+	 */
+	__intcall(0x13, &zero_regs, NULL);
+
+	call16(bios_timer_cleanup, &zero_regs, NULL);
+
+	/* If we enabled serial port interrupts, clean them up now */
+	sirq_cleanup();
+}
+
 extern void *bios_malloc(size_t, enum heap, size_t);
 extern void *bios_realloc(void *, size_t);
 extern void bios_free(void *);