aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-06-19 16:14:37 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-06-19 16:14:37 +0100
commitce709840593ab0e71556df316951bd2c70fc438c (patch)
tree18bb1236b26e849b9cb5a24b34cec0d5d0fe06e8
parent17bb7fc8d7f7a3c5daf21f61aaa1663805cafa92 (diff)
downloadsyslinux-ce709840593ab0e71556df316951bd2c70fc438c.tar.gz
syslinux-ce709840593ab0e71556df316951bd2c70fc438c.tar.xz
syslinux-ce709840593ab0e71556df316951bd2c70fc438c.zip
ipappend: delete .ipappend_strings()
It's no longer referenced anywhere as everything has now moved to *sysappend*. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/include/syslinux/firmware.h1
-rw-r--r--core/bios.c25
-rw-r--r--efi/main.c9
3 files changed, 0 insertions, 35 deletions
diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index 636faeaa..032d8eec 100644
--- a/com32/include/syslinux/firmware.h
+++ b/com32/include/syslinux/firmware.h
@@ -56,7 +56,6 @@ struct firmware {
struct output_ops *o_ops;
struct input_ops *i_ops;
void (*get_serial_console_info)(uint16_t *, uint16_t *, uint16_t *);
- bool (*ipappend_strings)(char **, int *);
struct adv_ops *adv_ops;
int (*boot_linux)(void *, size_t, struct initramfs *,
struct setup_data *, char *);
diff --git a/core/bios.c b/core/bios.c
index c6768204..a239c03b 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -141,30 +141,6 @@ struct input_ops bios_input_ops = {
.pollchar = bios_pollchar,
};
-static const char *syslinux_ipappend_string_list[32];
-bool bios_ipappend_strings(char **list, int *count)
-{
- static com32sys_t reg;
- int i;
-
- reg.eax.w[0] = 0x000f;
- __intcall(0x22, &reg, &reg);
-
- if (reg.eflags.l & EFLAGS_CF)
- return false;
-
- for (i = 0; i < reg.ecx.w[0]; i++) {
- syslinux_ipappend_string_list[i] =
- MK_PTR(reg.es,
- *(uint16_t *) MK_PTR(reg.es, reg.ebx.w[0] + i * 2));
- }
-
- *list = syslinux_ipappend_string_list;
- *count = reg.ecx.w[0];
-
- return true;
-}
-
static void bios_get_serial_console_info(uint16_t *iobase, uint16_t *divisor,
uint16_t *flowctl)
{
@@ -566,7 +542,6 @@ struct firmware bios_fw = {
.disk_init = bios_disk_init,
.o_ops = &bios_output_ops,
.i_ops = &bios_input_ops,
- .ipappend_strings = bios_ipappend_strings,
.get_serial_console_info = bios_get_serial_console_info,
.adv_ops = &bios_adv_ops,
.vesa = &bios_vesa_ops,
diff --git a/efi/main.c b/efi/main.c
index ae7ae05f..19f8b388 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -150,8 +150,6 @@ void pxenv(void)
{
}
-size_t numIPAppends = 0;
-const uint16_t IPAppends[32];
uint16_t BIOS_fbm = 1;
far_ptr_t InitStack;
far_ptr_t PXEEntry;
@@ -362,12 +360,6 @@ struct input_ops efi_iops = {
.pollchar = efi_pollchar,
};
-bool efi_ipappend_strings(char **list, int *count)
-{
- *count = numIPAppends;
- *list = (char *)IPAppends;
-}
-
extern void efi_adv_init(void);
extern int efi_adv_write(void);
@@ -1119,7 +1111,6 @@ struct firmware efi_fw = {
.o_ops = &efi_ops,
.i_ops = &efi_iops,
.get_serial_console_info = serialcfg,
- .ipappend_strings = efi_ipappend_strings,
.adv_ops = &efi_adv_ops,
.boot_linux = efi_boot_linux,
.vesa = &efi_vesa_ops,