summaryrefslogtreecommitdiff
path: root/core/comboot.inc
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-12-06 10:13:41 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-12-06 10:47:31 +0000
commitddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (patch)
treeb9f0cbe427b4a4d8441857990fd4410ee4635676 /core/comboot.inc
parente4b3ce2dd82ce2da85c37fd3f332ec2eb802b734 (diff)
downloadsyslinux-ddb10ce99c327888ade4d2ba3e4c50ad12aaa059.tar.gz
Delete 16-bit COMBOOT supportsyslinux-5.00
16-bit COMBOOT files are no longer supported by Syslinux in 5.00 so delete all references and change any 32-bit COMBOOT image references to mention ELF instead. Some of the COMBOOT stuff is still used internally so we can't nuke core/comboot.inc yet, but that will disappear in a future release. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/comboot.inc')
-rw-r--r--core/comboot.inc47
1 files changed, 2 insertions, 45 deletions
diff --git a/core/comboot.inc b/core/comboot.inc
index b11ae18d..e5afbe25 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -114,7 +114,7 @@ DOSSaveVectors resd 32
comboot_vectors:
dw comboot_return ; INT 20 = exit
- dw comboot_int21 ; INT 21 = DOS-compatible system calls
+ dw comboot_err(21h) ; INT 21 = DOS-compatible system calls
dw comboot_int22 ; INT 22 = native system calls
dw comboot_err(23h) ; INT 23 = DOS Ctrl-C handler
dw comboot_err(24h) ; INT 24 = DOS critical error handler
@@ -148,31 +148,6 @@ comboot_vectors:
section .text16
-; INT 21h: generic DOS system call
-comboot_int21: sti
- push ds
- push es
- push fs
- push gs
- pushad
- cld
- mov bp,cs
- mov ds,bp
- mov es,bp
- mov bp,sp ; Set up stack frame
-
- pm_call pm_adjust_screen ; The COMBOOT program might hav changed the screen
-
- mov cx,int21_count
- mov si,int21_table
-.again: lodsb
- cmp al,P_AH
- lodsw
- loopne .again
- ; The last function in the list is the
- ; "no such function" function
- clc
- call ax ; Call the invoked function
comboot_resume:
mov bp,sp ; In case the function clobbers BP
setc P_FLAGSL ; Propagate CF->error
@@ -212,7 +187,7 @@ comboot_bogus_tail:
jmp kaboom
; Proper return vector
-; Note: this gets invoked both via INT 21h and directly via INT 20h.
+; Note: this gets invoked directly via INT 20h.
; We don't need to cld explicitly here, because comboot_exit does that
; when invoking RESET_STACK_AND_SEGS.
comboot_return:
@@ -457,24 +432,6 @@ comapi_initadv:
section .data16
-%macro int21 2
- db %1
- dw %2
-%endmacro
-
-int21_table:
- int21 00h, comboot_return
- int21 01h, comboot_getkey
- int21 02h, comboot_writechr
- int21 04h, comboot_writeserial
- int21 08h, comboot_getkeynoecho
- int21 09h, comboot_writestr
- int21 0Bh, comboot_checkkey
- int21 30h, comboot_checkver
- int21 4Ch, comboot_return
- int21 -1, comboot_bad_int21
-int21_count equ ($-int21_table)/3
-
alignz 2
int22_table:
dw comapi_err ; 0000 unimplemented syscall