The following changes since commit 4fc3fd1e14f4c1b9208ef262e5b6aef853e9fce4:
graphics: make use of syslinux_force_text_mode() (2012-05-19 02:05:38 -0300)
are available in the git repository at:
git://github.com/aericson/syslinux.git elflink
for you to fetch changes up to 2779b713bdd8644ee2b52962ece6daa209b4ba6b:
com32: remove duplicate modules (2012-05-22 20:59:51 -0300)
----------------------------------------------------------------
Andre Ericson (1):
com32: remove duplicate modules
com32/modules/Makefile | 3 +--
com32/modules/hello.c | 26 --------------------------
com32/samples/hello.c | 37 ++++++++++++++-----------------------
3 files changed, 15 insertions(+), 51 deletions(-)
delete mode 100644 com32/modules/hello.c
diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index 9d88d75..b408410 100644
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -23,8 +23,7 @@ MODULES = chain.c32 config.c32 ethersel.c32 dmitest.c32
cpuidtest.c32 \
disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \
meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \
- ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32 \
- hello.c32
+ ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32
TESTFILES
diff --git a/com32/modules/hello.c b/com32/modules/hello.c
deleted file mode 100644
index d3d4d29..0000000
--- a/com32/modules/hello.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * hello.c - A simple ELF module that sorts a couple of numbers
- *
- * Created on: Aug 11, 2008
- * Author: Stefan Bucur <stefanb at zytor.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "sort.h"
-
-#define NUM_COUNT 10
-#define MAX_NUM 100
-
-int main(int argc __unused, char **argv __unused)
-{
- int *nums = NULL;
-
- nums = malloc(NUM_COUNT * sizeof(int));
- printf("Hello, world, from 0x%08X! malloc return %p\n", (unsigned
int)&main, nums);
-
- free(nums);
-
- return 0;
-}
diff --git a/com32/samples/hello.c b/com32/samples/hello.c
index 77e93ac..d3d4d29 100644
--- a/com32/samples/hello.c
+++ b/com32/samples/hello.c
@@ -1,35 +1,26 @@
-/* ----------------------------------------------------------------------- *
- *
- * Copyright 2004-2008 H. Peter Anvin - All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, Inc., 53 Temple Place Ste 330,
- * Boston MA 02111-1307, USA; either version 2 of the License, or
- * (at your option) any later version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
/*
- * hello.c
+ * hello.c - A simple ELF module that sorts a couple of numbers
*
- * Hello, World! using libcom32
+ * Created on: Aug 11, 2008
+ * Author: Stefan Bucur <stefanb at zytor.com>
*/
-#include <string.h>
#include <stdio.h>
-#include <console.h>
+#include <stdlib.h>
-int main(int argc, char *argv[])
-{
- int i;
+#include "sort.h"
+
+#define NUM_COUNT 10
+#define MAX_NUM 100
- openconsole(&dev_stdcon_r, &dev_stdcon_w);
+int main(int argc __unused, char **argv __unused)
+{
+ int *nums = NULL;
- printf("Hello, World!\n");
+ nums = malloc(NUM_COUNT * sizeof(int));
+ printf("Hello, world, from 0x%08X! malloc return %p\n", (unsigned
int)&main, nums);
- for (i = 1; i < argc; i++)
- printf("%s%c", argv[i], (i == argc - 1) ? '\n' : '
');
+ free(nums);
return 0;
}