diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-27 10:41:30 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-30 09:51:36 +0100 |
| commit | 0d6f330878173c7ba45b884f3e41ce40b917c73c (patch) | |
| tree | 0a887066d35d8b01914330d6ab6818fe015a5a9d /com32/samples | |
| parent | 0fcd9a48603497dcc2727570a50a4401bb0fd085 (diff) | |
| parent | f0bbf9dd40f37f8c4870a33784996efd56955a75 (diff) | |
| download | syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.tar.gz syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.tar.xz syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.zip | |
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
Conflicts:
Makefile
com32/elflink/ldlinux/adv.c
com32/elflink/ldlinux/kernel.c
com32/elflink/ldlinux/ldlinux.c
com32/include/bitsize/stddef.h
com32/include/bitsize/stdint.h
com32/include/stdint.h
com32/include/sys/module.h
com32/include/sys/x86_64/bitops.h
com32/include/syslinux/linux.h
com32/lib/Makefile
com32/lib/sys/ansicon_write.c
com32/lib/sys/module/elfutils.h
com32/lib/sys/vesa/efi/fill.h
com32/lib/syslinux/load_linux.c
com32/lib/syslinux/serial.c
com32/lib/syslinux/shuffle.c
core/conio.c
core/elflink/config.c
core/elflink/load_env32.c
core/graphics.c
core/include/graphics.h
core/init.c
core/pxelinux.asm
mk/elf.mk
mk/lib.mk
Diffstat (limited to 'com32/samples')
| -rw-r--r-- | com32/samples/Makefile | 3 | ||||
| -rw-r--r-- | com32/samples/resolv.c | 17 |
2 files changed, 5 insertions, 15 deletions
diff --git a/com32/samples/Makefile b/com32/samples/Makefile index 167c638c..bca197ed 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -18,6 +18,9 @@ topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk +LDFLAGS_fancyhello.o = $(com32)/libutil/libutil_com.c32 +LDFLAGS_keytest.o = $(com32)/libutil/libutil_com.c32 + all: hello.c32 resolv.c32 serialinfo.c32 \ localboot.c32 \ fancyhello.c32 fancyhello.lnx \ diff --git a/com32/samples/resolv.c b/com32/samples/resolv.c index fae6649b..8f062d19 100644 --- a/com32/samples/resolv.c +++ b/com32/samples/resolv.c @@ -16,6 +16,7 @@ * Resolve an IP address */ +#include <syslinux/pxe_api.h> #include <string.h> #include <stdio.h> #include <console.h> @@ -24,21 +25,7 @@ uint32_t resolv(const char *name) { - com32sys_t reg; - - strcpy((char *)__com32.cs_bounce, name); - - memset(®, 0, sizeof reg); - reg.eax.w[0] = 0x0010; - reg.ebx.w[0] = OFFS(__com32.cs_bounce); - reg.es = SEG(__com32.cs_bounce); - - __intcall(0x22, ®, ®); - - if (reg.eflags.l & EFLAGS_CF) - return 0; - else - return reg.eax.l; + return dns_resolv(name); } int main(int argc, char *argv[]) |