wok diff ipxe/stuff/bootloader.S @ rev 24456
updated gnustep-base and gnustep-base-dev (1.26.0 -> 1.28.0)
author | Hans-G?nter Theisgen |
---|---|
date | Wed Feb 16 09:21:33 2022 +0100 (2022-02-16) |
parents | ccdba9b27403 |
children | d1f31f5f6401 |
line diff
1.1 --- a/ipxe/stuff/bootloader.S Mon Feb 26 19:03:16 2018 +0100 1.2 +++ b/ipxe/stuff/bootloader.S Wed Feb 16 09:21:33 2022 +0100 1.3 @@ -31,7 +31,7 @@ 1.4 //#define NO_DOTS show progression dots ? -5 1.5 #ifndef BZIMAGE 1.6 //#define TINY_ZIMAGE system < 64Kb ? -11 1.7 -//#defime NO_MINSETUP default setup (dos only) ? -4 1.8 +//#define NO_MINSETUP default setup (dos only) ? -4 1.9 //#define NO_CURSOR_DEFINITION -8 1.10 #endif 1.11 1.12 @@ -300,7 +300,7 @@ 1.13 xorw %si, %si 1.14 xorw %di, %di 1.15 cmpw %ax, %bx 1.16 - jc forward 1.17 + jnc forward 1.18 decw %si 1.19 decw %di 1.20 std 1.21 @@ -313,8 +313,8 @@ 1.22 #else 1.23 subw %ax, %bx 1.24 jnc forward 1.25 + //movw $0x8FFF, %ax 1.26 movb $0x90, %ah 1.27 - ;decw %ax 1.28 forward: 1.29 movw %ax, %es 1.30 movw %ax, %di 1.31 @@ -467,7 +467,9 @@ 1.32 # Assume no error on first track. 1.33 1.34 #ifdef FLOPPY_1440K_ONLY 1.35 +#ifndef FLOPPY_HAS_2_SIDES 1.36 #define FLOPPY_HAS_2_SIDES hardcore heads count to 2 1.37 +#endif 1.38 #define FLOPPY_SECTORS 18 /* 18 sectors */ 1.39 #else 1.40 #define FLOPPY_HEADS 2 /* 2 heads minimum */