Use structs instead of hardcoded offsets in x86 boot decompressor.
PATCH v2 1/2 Use structs instead of hardcoded offsets in x86 boot decompressor.
Signed-off-by Kristian Høgsberg <[email protected]>
---
Fixed the missing assignment spotted by Rik. That'll teach me to do drive-by cleanups...
arch/x86/boot/compressed/misc.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-)
arch/x86/boot/compressed/misc.c +12 -15
@@ -30,6 +30,7 @@#include <asm/io.h> #include <asm/page.h> #include <asm/boot.h> +#include <asm/bootparam.h> /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically
@@ -187,13 +188,8 @@ static void gzip_release(void **);/* * This is set up by the setup-routine at boot-time */ -static unsigned char *real_mode;/* Pointer to real-mode data */ - -#define RM_EXT_MEM_K (*(unsigned short *)(real_mode + 0x2)) -#ifndef STANDARD_MEMORY_BIOS_CALL -#define RM_ALT_MEM_K (*(unsigned long *)(real_mode + 0x1e0)) -#endif -#define RM_SCREEN_INFO (*(struct screen_info *)(real_mode+0)) +static struct boot_params *real_mode;/* Pointer to real-mode data */ +static struct screen_info *rm_screen_info;/* Pointer to real-mode data */ extern unsigned char input_data[];extern int input_len;
@@ -276,12 +272,12 @@ static void putstr(const char *s)char c;#ifdef CONFIG_X86_32 -if (RM_SCREEN_INFO .orig_video_mode ==0 && lines ==0 && cols ==0 ) +if (rm_screen_info->orig_video_mode ==0 && lines ==0 && cols ==0 )return ;#endif - x =RM_SCREEN_INFO .orig_x; - y =RM_SCREEN_INFO .orig_y; + x = rm_screen_info->orig_x; + y = rm_screen_info->orig_y;while ((c = *s++) !='\0' ) {if (c =='\n' ) {
@@ -302,8 +298,8 @@ static void putstr(const char *s) } } -RM_SCREEN_INFO .orig_x = x; -RM_SCREEN_INFO .orig_y = y; + rm_screen_info->orig_x = x; + rm_screen_info->orig_y = y; pos = (x + cols * y) *2 ;/* Update cursor position */ outb (14 , vidport);
@@ -429,8 +425,9 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, unsigned char *output) { real_mode = rmode; + rm_screen_info = &real_mode->screen_info; -if (RM_SCREEN_INFO .orig_video_mode ==7 ) { +if (rm_screen_info->orig_video_mode ==7 ) { vidmem = (char *)0xb0000 ; vidport =0x3b4 ; }else {
@@ -438,8 +435,8 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, vidport =0x3d4 ; } - lines =RM_SCREEN_INFO .orig_video_lines; - cols =RM_SCREEN_INFO .orig_video_cols; + lines = rm_screen_info->orig_video_lines; + cols = rm_screen_info->orig_video_cols; window = output;/* Output buffer (Normally at 1M) */ free_mem_ptr = heap;/* Heap */
Signature · 1 line
1.5.5.1