diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-13 16:09:13 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-13 16:09:13 -0800 |
| commit | a5727651bb78e7cd1bd90046e24fbcedf4f7dfb9 (patch) | |
| tree | 6cf28a5896cd1c71841b7bb3e713c257ed86af69 /com32/lib/syslinux/shuffle.c | |
| parent | 636504f7bb6f9e86cc65addbfb36aed14dc1ecb4 (diff) | |
| download | syslinux-a5727651bb78e7cd1bd90046e24fbcedf4f7dfb9.tar.gz | |
bios: Remove shuffle and boot comapi call
Remove the shuffle and boot comapi call. This is the last of the
comapi calls left; we should now be able to completely remove the
comapi support.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'com32/lib/syslinux/shuffle.c')
| -rw-r--r-- | com32/lib/syslinux/shuffle.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/com32/lib/syslinux/shuffle.c b/com32/lib/syslinux/shuffle.c index ce85a5c4..2752c881 100644 --- a/com32/lib/syslinux/shuffle.c +++ b/com32/lib/syslinux/shuffle.c @@ -43,6 +43,7 @@ #include <dprintf.h> #include <syslinux/movebits.h> #include <klibc/compiler.h> +#include <syslinux/boot.h> struct shuffle_descriptor { uint32_t dst, src, len; @@ -78,7 +79,6 @@ int syslinux_do_shuffle(struct syslinux_movelist *fraglist, int need_ptrs; addr_t desczone, descfree, descaddr; int nmoves, nzero; - com32sys_t ireg; descaddr = 0; dp = dbuf = NULL; @@ -224,13 +224,8 @@ bail: return rv; /* Actually do it... */ - memset(&ireg, 0, sizeof ireg); - ireg.edi.l = descaddr; - ireg.esi.l = (addr_t) dbuf; - ireg.ecx.l = (addr_t) dp - (addr_t) dbuf; - ireg.edx.w[0] = bootflags; - ireg.eax.w[0] = 0x0024; - __intcall(0x22, &ireg, NULL); + bios_do_shuffle_and_boot(bootflags, descaddr, dbuf, + (addr_t)dp - (addr_t)dbuf); return -1; /* Shouldn't have returned! */ } |