aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorShao Miller <shao.miller@yrdsb.edu.on.ca>2009-08-01 01:30:42 -0400
committerShao Miller <shao.miller@yrdsb.edu.on.ca>2009-08-03 22:09:37 -0400
commitec5a587d90a2484f182b27f25c09cc70a23935cc (patch)
treeac954b18ac4104be72423bb8136c71e2cc34e5f8 /memdisk
parent004082b85c0362ab7a47598b889c9d9c4ef570d8 (diff)
downloadsyslinux.git-ec5a587d90a2484f182b27f25c09cc70a23935cc.tar.gz
syslinux.git-ec5a587d90a2484f182b27f25c09cc70a23935cc.tar.xz
syslinux.git-ec5a587d90a2484f182b27f25c09cc70a23935cc.zip
[memdisk] Rename CHS and EDD hooks to describe their sector size
Suffixed with _512 to indicate a sector size of 512 bytes.
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile4
-rw-r--r--memdisk/memdisk_chs_512.asm (renamed from memdisk/memdisk_chs.asm)0
-rw-r--r--memdisk/memdisk_edd_512.asm (renamed from memdisk/memdisk_edd.asm)0
-rw-r--r--memdisk/setup.c20
4 files changed, 12 insertions, 12 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 06413b68..35d7bef9 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -38,11 +38,11 @@ endif
# Important: init.o16 must be first!!
OBJS16 = init.o16 init32.o
OBJS32 = start32.o setup.o msetup.o e820func.o conio.o memcpy.o memset.o \
- memmove.o unzip.o memdisk_chs.o memdisk_edd.o dskprobe.o
+ memmove.o unzip.o memdisk_chs_512.o memdisk_edd_512.o dskprobe.o
CSRC = setup.c msetup.c e820func.c conio.c unzip.c dskprobe.c
SSRC = start32.S memcpy.S memset.S memmove.S
-NASMSRC = memdisk_chs.asm memdisk_edd.asm memdisk16.asm
+NASMSRC = memdisk_chs_512.asm memdisk_edd_512.asm memdisk16.asm
all: memdisk # e820test
diff --git a/memdisk/memdisk_chs.asm b/memdisk/memdisk_chs_512.asm
index 4b06a856..4b06a856 100644
--- a/memdisk/memdisk_chs.asm
+++ b/memdisk/memdisk_chs_512.asm
diff --git a/memdisk/memdisk_edd.asm b/memdisk/memdisk_edd_512.asm
index d2e7b1cf..d2e7b1cf 100644
--- a/memdisk/memdisk_edd.asm
+++ b/memdisk/memdisk_edd_512.asm
diff --git a/memdisk/setup.c b/memdisk/setup.c
index e3b9d31c..158a065c 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -24,12 +24,12 @@ const char memdisk_version[] = "MEMDISK " VERSION_STR " " DATE;
const char copyright[] =
"Copyright " FIRSTYEAR "-" YEAR_STR " H. Peter Anvin et al";
-extern const char _binary_memdisk_chs_bin_start[];
-extern const char _binary_memdisk_chs_bin_end[];
-extern const char _binary_memdisk_chs_bin_size[];
-extern const char _binary_memdisk_edd_bin_start[];
-extern const char _binary_memdisk_edd_bin_end[];
-extern const char _binary_memdisk_edd_bin_size[];
+extern const char _binary_memdisk_chs_512_bin_start[];
+extern const char _binary_memdisk_chs_512_bin_end[];
+extern const char _binary_memdisk_chs_512_bin_size[];
+extern const char _binary_memdisk_edd_512_bin_start[];
+extern const char _binary_memdisk_edd_512_bin_end[];
+extern const char _binary_memdisk_edd_512_bin_size[];
struct memdisk_header {
uint16_t int13_offs;
@@ -758,11 +758,11 @@ void setup(const struct real_mode_args *rm_args_ptr)
/* Choose the appropriate installable memdisk hook */
if (do_edd) {
- bin_size = (int)&_binary_memdisk_edd_bin_size;
- memdisk_hook = (char *)&_binary_memdisk_edd_bin_start;
+ bin_size = (int)&_binary_memdisk_edd_512_bin_size;
+ memdisk_hook = (char *)&_binary_memdisk_edd_512_bin_start;
} else {
- bin_size = (int)&_binary_memdisk_chs_bin_size;
- memdisk_hook = (char *)&_binary_memdisk_chs_bin_start;
+ bin_size = (int)&_binary_memdisk_chs_512_bin_size;
+ memdisk_hook = (char *)&_binary_memdisk_chs_512_bin_start;
}
/* Reserve the ramdisk memory */