diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-03 08:50:13 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-20 10:20:19 +0100 |
| commit | 8486142cf30499e1d53d7faf3a168c8ed3163ab2 (patch) | |
| tree | d8e4e835da8f577d28f847fdd4a25090cdbf340e /core/include | |
| parent | 373a42433c4bea38d4d93ee749bd4d7f19bded51 (diff) | |
| download | syslinux-8486142cf30499e1d53d7faf3a168c8ed3163ab2.tar.gz | |
elflink: Replace __intcall() with direct function calls
There's no reason to use the COMBOOT API at all now that we can have
any undefined symbols resolved at runtime - we can just access
functions directly.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/bios.h | 1 | ||||
| -rw-r--r-- | core/include/core.h | 14 | ||||
| -rw-r--r-- | core/include/graphics.h | 5 |
3 files changed, 19 insertions, 1 deletions
diff --git a/core/include/bios.h b/core/include/bios.h index 4bf6bc43..42a9768c 100644 --- a/core/include/bios.h +++ b/core/include/bios.h @@ -74,7 +74,6 @@ extern union screen _screensize; #define VidRows _screensize.b.row /* font.c */ -extern uint16_t VGAFontSize; extern void use_font(void); extern void bios_adjust_screen(void); diff --git a/core/include/core.h b/core/include/core.h index 6604a5bc..da94dbf4 100644 --- a/core/include/core.h +++ b/core/include/core.h @@ -25,9 +25,19 @@ extern char ConfigFile[]; extern char syslinux_banner[]; extern char copyright_str[]; extern char StackBuf[]; +extern unsigned int __bcopyxx_len; extern uint8_t KbdMap[256]; +extern const uint16_t IPAppends[]; +extern const char numIPAppends[]; + +extern uint16_t SerialPort; +extern uint16_t BaudDivisor; +extern uint8_t FlowOutput; +extern uint8_t FlowInput; +extern uint8_t FlowIgnore; + /* diskstart.inc isolinux.asm*/ extern void getlinsec(void); @@ -101,16 +111,20 @@ static inline void set_flags(com32sys_t *regs, uint32_t flags) } extern int start_ldlinux(char **argv); +extern int create_args_and_load(char *); extern void write_serial(char data); extern void writestr(char *str); extern void writechr(char data); extern void crlf(void); +extern int pollchar(void); +extern char getchar(char *hi); extern void cleanup_hardware(void); extern void sirq_cleanup(void); extern void adjust_screen(void); extern void execute(const char *cmdline, uint32_t type); +extern void load_kernel(const char *cmdline); #endif /* CORE_H */ diff --git a/core/include/graphics.h b/core/include/graphics.h index 897103e5..814ffe7d 100644 --- a/core/include/graphics.h +++ b/core/include/graphics.h @@ -44,6 +44,11 @@ extern uint16_t VGAPos; extern uint16_t *VGAFilePtr; extern char VGAFileBuf[VGA_FILE_BUF_SIZE]; extern char VGAFileMBuf[]; +extern uint16_t VGAFontSize; + +extern uint8_t UserFont; + +extern __lowmem char fontbuf[8192]; extern void syslinux_force_text_mode(void); extern void vgadisplayfile(FILE *_fd); |