diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-08 14:39:20 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-08 14:39:20 -0800 |
| commit | cbbf4aa64d4f7f6d0e3d94b8114a19c0a2ec77ff (patch) | |
| tree | f95d95d54790321e1db19208bea61dd4d2564224 /com32/include/syslinux | |
| parent | addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa (diff) | |
| parent | 60701611cfd3242f5ed4dc8fa985477eb53ad202 (diff) | |
| download | syslinux-09214cb8e459d08aab1794c5053310841c16967e.tar.gz | |
Merge branch 'master' into i915ressyslinux-3.85-pre63
Diffstat (limited to 'com32/include/syslinux')
| -rw-r--r-- | com32/include/syslinux/config.h | 2 | ||||
| -rw-r--r-- | com32/include/syslinux/pxe.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/com32/include/syslinux/config.h b/com32/include/syslinux/config.h index 168a5160..868b0f10 100644 --- a/com32/include/syslinux/config.h +++ b/com32/include/syslinux/config.h @@ -110,7 +110,7 @@ union syslinux_derivative_info { uint32_t _edi, _esi, _ebp, _esp, _ebx; uint16_t apiver; uint16_t _dxh; - uint32_t _ecx; + uint32_t myip; uint8_t filesystem, ah; uint16_t _axh; uint32_t _eflags; diff --git a/com32/include/syslinux/pxe.h b/com32/include/syslinux/pxe.h index 037642bc..6e2a769b 100644 --- a/com32/include/syslinux/pxe.h +++ b/com32/include/syslinux/pxe.h @@ -37,6 +37,7 @@ #include <stdint.h> #include <netinet/in.h> #include <klibc/compiler.h> +#include <com32.h> /* PXE spec structures and definitions. These mostly follow the PXE spec, except when the PXE spec is unnecessarily stupid. Of course, @@ -57,10 +58,7 @@ typedef struct { uint16_t segsize; } __packed pxe_segdesc_t; -typedef struct { - uint16_t offs; - uint16_t seg; -} segoff16_t; +typedef far_ptr_t segoff16_t; typedef struct { uint8_t opcode; @@ -522,5 +520,6 @@ typedef struct s_PXENV_UNDI_ISR { /* SYSLINUX-defined PXE utility functions */ int pxe_get_cached_info(int level, void **buf, size_t * len); int pxe_get_nic_type(t_PXENV_UNDI_GET_NIC_TYPE * gnt); +uint32_t pxe_dns(const char *hostname); #endif /* _SYSLINUX_PXE_H */ |