summaryrefslogtreecommitdiff
path: root/core/init.inc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-14 20:17:43 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-14 20:17:43 -0700
commit4519c2a7adde441ef01bdd66864269419d703af8 (patch)
treedc780c8e0fb610704b5417edf13e0c9a88f8a250 /core/init.inc
parent1fef0a581bf584223ad87bdaf729ccb986abb49f (diff)
downloadsyslinux-4519c2a7adde441ef01bdd66864269419d703af8.tar.gz
core: make the COMBOOT API available to in-kernel PM code
Make it possible to call the COMBOOT API from in-kernel PM code, simply by setting up the COMBOOT API earlier and only tearing it down during final shutdown. WARNING: the COMBOOT API is quite possibly probably not reentrant; I haven't checked it... Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/init.inc')
-rw-r--r--core/init.inc14
1 files changed, 10 insertions, 4 deletions
diff --git a/core/init.inc b/core/init.inc
index 90c607ee..7f65ffa6 100644
--- a/core/init.inc
+++ b/core/init.inc
@@ -43,9 +43,6 @@ common_init:
mov cx,__uibss_dwords
rep stosd
- ; Now set up screen parameters
- call adjust_screen
-
;
; Initialize configuration information
;
@@ -63,4 +60,13 @@ common_init:
add ax,PKTBUF_SIZE
loop .setbufptr
%endif
- section .text16 ; This is an inline file...
+
+;
+; Set up the COMBOOT APIs
+;
+ call comboot_setup_api
+
+;
+; Now set up screen parameters
+;
+ call adjust_screen