From 54b000c1492dbdcd8335e20277548b991a2d5308 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 14 Dec 2004 21:49:13 +0000 Subject: [PATCH] use new function emile_second_set_buffer_size --- libemile/emile_floppy_create_image.c | 3 ++- libemile/emile_second_get_kernel.c | 3 +-- libemile/emile_second_set_kernel.c | 5 +---- tools/emile.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libemile/emile_floppy_create_image.c b/libemile/emile_floppy_create_image.c index b079275..48f48bd 100644 --- a/libemile/emile_floppy_create_image.c +++ b/libemile/emile_floppy_create_image.c @@ -187,7 +187,8 @@ int emile_floppy_create_image(char* first_level, char* second_level, ret = emile_second_set_kernel(fd, kernel_image, FIRST_LEVEL_SIZE + emile_file_get_size(second_level), - buffer_size, ramdisk); + ramdisk); + ret = emile_second_set_buffer_size(fd, buffer_size); close(fd); diff --git a/libemile/emile_second_get_kernel.c b/libemile/emile_second_get_kernel.c index f3fcde5..9a6d87f 100644 --- a/libemile/emile_second_get_kernel.c +++ b/libemile/emile_second_get_kernel.c @@ -14,7 +14,7 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; int emile_second_get_kernel(int fd, u_int32_t *kernel_offset, u_int32_t *kernel_image_size, - u_int32_t *kernel_size, u_int32_t *ramdisk_offset, + u_int32_t *ramdisk_offset, u_int32_t *ramdisk_size) { emile_l2_header_t header; @@ -26,7 +26,6 @@ int emile_second_get_kernel(int fd, u_int32_t *kernel_offset, *kernel_offset = read_long(&header.kernel_image_offset); *kernel_image_size = read_long(&header.kernel_image_size); - *kernel_size = read_long(&header.kernel_size); *ramdisk_offset = read_long(&header.ramdisk_offset); *ramdisk_size = read_long(&header.ramdisk_size); diff --git a/libemile/emile_second_set_kernel.c b/libemile/emile_second_set_kernel.c index 337298f..c7ab8db 100644 --- a/libemile/emile_second_set_kernel.c +++ b/libemile/emile_second_set_kernel.c @@ -14,8 +14,7 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "bootblock.h" int emile_second_set_kernel(int fd, char *kernel_image, - u_int32_t kernel_offset, - u_int32_t buffer_size, char* ramdisk) + u_int32_t kernel_offset, char* ramdisk) { emile_l2_header_t header; int ret; @@ -36,8 +35,6 @@ int emile_second_set_kernel(int fd, char *kernel_image, emile_file_get_size(kernel_image)); } - write_long(&header.kernel_size, buffer_size); - if (ramdisk == NULL) { write_long(&header.ramdisk_offset, 0); diff --git a/tools/emile.c b/tools/emile.c index 36dbe11..8c85cdf 100644 --- a/tools/emile.c +++ b/tools/emile.c @@ -34,7 +34,7 @@ int main(int argc, char **argv) /* set buffer size */ printf("Setting buffer size to %d\n", atoi(argv[4])); - ret = emile_second_set_kernel(fd, NULL, 0, atoi(argv[4]), NULL); + ret = emile_second_set_buffer_size(fd, atoi(argv[4])); /* set cmdline */