wok diff linld/stuff/src/COMMON.H @ rev 21576
Update some websites
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun May 19 13:14:32 2019 +0200 (2019-05-19) |
parents | f0d71e920c5a |
children | 93f070d4d2d7 |
line diff
1.1 --- a/linld/stuff/src/COMMON.H Fri Nov 09 16:37:55 2018 +0100 1.2 +++ b/linld/stuff/src/COMMON.H Sun May 19 13:14:32 2019 +0200 1.3 @@ -52,14 +52,15 @@ 1.4 } imgs[2]; 1.5 #define pm (imgs[0]) 1.6 #define initrd (imgs[1]) 1.7 +#define pm2initrd(p) (p+1) 1.8 1.9 extern int skip_alloc; 1.10 extern u32 base_himem; 1.11 1.12 -extern pascal void memcpy_image(struct image_himem *m); 1.13 -extern pascal void storepage(u32 *dst, u16 src); 1.14 +extern _fastcall void memcpy_image(struct image_himem *m); 1.15 +extern _fastcall void storepage(u32 *dst); 1.16 #ifdef LARGE_IMAGES 1.17 -extern pascal void reset_bufv(unsigned long *p); 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 @@ -76,7 +77,7 @@ 1.23 extern u32 root_dev; 1.24 extern u32 vid_mode; 1.25 // External asm helpers 1.26 -extern pascal void xmm_alloc(struct image_himem *m); 1.27 +extern _fastcall void xmm_alloc(struct image_himem *m); 1.28 extern u32 topmem; 1.29 extern "C" u32 memtop(); 1.30 extern "C" void enable_a20_or_die(); 1.31 @@ -89,8 +90,8 @@ 1.32 #endif 1.33 1.34 void load_image(struct image_himem *m); 1.35 -extern pascal void open_image(const char *name, struct image_himem *m); 1.36 -extern pascal int read_image(struct image_himem *m, void* data, int sz); 1.37 +extern _fastcall void open_image(const char *name, struct image_himem *m); 1.38 +extern _fastcall int read_image(struct image_himem *m); 1.39 char* load_kernel(); 1.40 void load_initrd(); 1.41 extern "C" void boot_kernel();