diff options
| author | hpa <hpa> | 2002-06-02 05:12:25 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2002-06-02 05:12:25 +0000 |
| commit | f3d5f4fd208cc58d58e0a000595848bde49b2dbb (patch) | |
| tree | af98774e9c4d27c37c0d2b6eefa570679140ad67 /runkernel.inc | |
| parent | 5823e4914a21a2aecb58345716f851407612d63e (diff) | |
| download | syslinux-f3d5f4fd208cc58d58e0a000595848bde49b2dbb.tar.gz | |
Major rewrite of the very early SYSLINUX code. Generate the "stupid"
version in a different manner. Require NASM 0.98.32 or higher --
thus we don't need the jmpcc macros anymore.
Diffstat (limited to 'runkernel.inc')
| -rw-r--r-- | runkernel.inc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/runkernel.inc b/runkernel.inc index 25e128c9..b87c9210 100644 --- a/runkernel.inc +++ b/runkernel.inc @@ -510,25 +510,18 @@ in_proper_place: jne root_not_floppy mov word [es:bs_rootdev],0200h root_not_floppy: + ; ; Copy the disk table to high memory, then re-initialize the floppy ; controller ; -; This needs to be moved before the copy -; -%if 0 - push ds - push bx - lds si,[fdctab] +%if IS_SYSLINUX + lgs si,[cs:fdctab] mov di,linux_fdctab - mov cx,3 ; 12 bytes - push di - rep movsd - pop di - mov [fdctab1],di ; Save new floppy tab pos - mov [fdctab2],es - pop bx - pop ds + mov cx,6 ; 12 bytes + gs rep movsw + mov [cs:fdctab],word linux_fdctab ; Save new floppy tab pos + mov [cs:fdctab+2],es %endif ; ; Linux wants the floppy motor shut off before starting the kernel, |