wok diff linld/stuff/src/COMMON.H @ rev 24013
linld: add quick boot switch
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Feb 18 08:56:43 2021 +0000 (2021-02-18) |
parents | 5c1ce90eb1d6 |
children | 61df94a0fa43 |
line diff
1.1 --- a/linld/stuff/src/COMMON.H Tue Jan 12 07:47:12 2021 +0000 1.2 +++ b/linld/stuff/src/COMMON.H Thu Feb 18 08:56:43 2021 +0000 1.3 @@ -66,21 +66,20 @@ 1.4 #define topmem (cmdnum[2]) 1.5 #define base_himem (cmdnum[3]) 1.6 #define skip_alloc (* (char *) &cmdnum[4]) 1.7 +#ifdef QUICK_BOOT 1.8 +extern u32 cmdnum[7]; 1.9 +#else 1.10 extern u32 cmdnum[5]; 1.11 +#endif 1.12 1.13 -extern _fastcall void memcpy_image(struct image_himem *m); 1.14 +extern _fastcall void memcpy_image_kernel(); 1.15 +extern _fastcall void memcpy_image_initrd(); 1.16 extern _fastcall void storepage(u32 *dst); 1.17 -#ifdef LARGE_IMAGES 1.18 extern _fastcall void reset_bufv(unsigned long *p); 1.19 extern "C" unsigned long* prev_bufv(); 1.20 extern "C" unsigned long* next_bufv(); 1.21 #define next(p) p = next_bufv() 1.22 #define prev(p) p = prev_bufv() 1.23 -#else 1.24 -#define reset_bufv(p) 1.25 -#define next(p) ++p 1.26 -#define prev(p) --p 1.27 -#endif 1.28 extern char vcpi; 1.29 extern char version_string[]; 1.30 // External asm helpers 1.31 @@ -89,7 +88,7 @@ 1.32 #endif 1.33 extern "C" u32 memtop(); 1.34 extern "C" void enable_a20_or_die(); 1.35 -extern "C" void vm2rm(); 1.36 +extern "C" void far vm2rm(); 1.37 extern "C" void hook_int15_88(); 1.38 1.39 // C++ helpers