[syslinux:firmware] com32: Delete duplicate ipappend.c

syslinux-bot for Matt Fleming matt.fleming at intel.com
Fri Nov 9 09:06:10 PST 2012


Commit-ID:  db7c040e4e4a343b179d75b7edfd721fbe85eec7
Gitweb:     http://www.syslinux.org/commit/db7c040e4e4a343b179d75b7edfd721fbe85eec7
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Fri, 20 Jan 2012 12:47:48 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Fri, 20 Jan 2012 12:49:59 +0000

com32: Delete duplicate ipappend.c

ipappend.c is already part of ldlinux and so we don't need the
duplicate copy in com32/lib/syslinux. This file should have been
deleted when com32/elflink/ldlinux/ipappend.c was created.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/lib/Makefile            |    2 +-
 com32/lib/syslinux/ipappend.c |   58 -----------------------------------------
 2 files changed, 1 insertions(+), 59 deletions(-)

diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index fbd8395..7823fad 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -40,7 +40,7 @@ LIBPCI_OBJS = \
 LIBSYSLINUX_OBJS = \
 	syslinux/reboot.o syslinux/keyboard.o				\
 	syslinux/features.o syslinux/config.o	\
-	syslinux/ipappend.o syslinux/dsinfo.o syslinux/version.o	\
+	syslinux/dsinfo.o syslinux/version.o	\
 	syslinux/pxe_get_cached.o syslinux/pxe_get_nic.o		\
 	syslinux/pxe_dns.o						\
 	syslinux/video/fontquery.o syslinux/video/forcetext.o		\
diff --git a/com32/lib/syslinux/ipappend.c b/com32/lib/syslinux/ipappend.c
deleted file mode 100644
index bd00092..0000000
--- a/com32/lib/syslinux/ipappend.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *
- *   Copyright 2008 H. Peter Anvin - All Rights Reserved
- *
- *   Permission is hereby granted, free of charge, to any person
- *   obtaining a copy of this software and associated documentation
- *   files (the "Software"), to deal in the Software without
- *   restriction, including without limitation the rights to use,
- *   copy, modify, merge, publish, distribute, sublicense, and/or
- *   sell copies of the Software, and to permit persons to whom
- *   the Software is furnished to do so, subject to the following
- *   conditions:
- *
- *   The above copyright notice and this permission notice shall
- *   be included in all copies or substantial portions of the Software.
- *
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *   OTHER DEALINGS IN THE SOFTWARE.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * syslinux/ipappend.c
- *
- * Get ipappend strings
- */
-
-#include <syslinux/config.h>
-#include <klibc/compiler.h>
-#include <com32.h>
-
-struct syslinux_ipappend_strings __syslinux_ipappend_strings;
-static const char *syslinux_ipappend_string_list[32];
-
-void __constructor __syslinux_get_ipappend_strings(void)
-{
-    static com32sys_t reg;
-    int i;
-
-    reg.eax.w[0] = 0x000f;
-    __intcall(0x22, &reg, &reg);
-
-    if (!(reg.eflags.l & EFLAGS_CF)) {
-	__syslinux_ipappend_strings.count = reg.ecx.w[0];
-	__syslinux_ipappend_strings.ptr = syslinux_ipappend_string_list;
-	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));
-	}
-    }
-}


More information about the Syslinux-commits mailing list