Fix the write string ABI call.

diff --git a/NEWS b/NEWS
index b18f1c5..df3093f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Changes in 2.01:
          versions, and be able to generate disk images with DOSEMU
          headers (controlled by the -d option).
        * Fix the COM32 sample program.
+       * PXELINUX, ISOLINUX: Fix come COMBOOT API calls.
 
 Changes in 2.00:
        * ALL: Add support for "COM32" (32-bit COMBOOT) images.

diff --git a/isolinux.asm b/isolinux.asm
index 71f1c58..0cb7eff 100644 (file)
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -1307,6 +1307,10 @@ strcpy:          push ax
 ;              since some PXE BIOSes seem to interfere regular console I/O.
 ;
 writechr_full:
+               push ds
+               push cs
+               pop ds
+               mov ax,cs
                call write_serial       ; write to serial port if needed
                pushfd
                pushad
@@ -1340,6 +1344,7 @@ writechr_full:
                int 10h                 
 .ret:          popad
                popfd
+               pop ds
                ret
 .scroll:       dec dh
                mov bh,[TextPage]

diff --git a/pxelinux.asm b/pxelinux.asm
index fd00340..c51b764 100644 (file)
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -1316,6 +1316,9 @@ strcpy:           push ax
 ;              since some PXE BIOSes seem to interfere regular console I/O.
 ;
 writechr:
+               push ds
+               push cs
+               pop ds
                call write_serial       ; write to serial port if needed
                pushfd
                pushad
@@ -1349,6 +1352,7 @@ writechr:
                int 10h                 
 .ret:          popad
                popfd
+               pop ds
                ret
 .scroll:       dec dh
                mov bh,[TextPage]