diff options
| author | sshwarts <sshwarts> | 2008-03-19 22:48:55 +0000 |
|---|---|---|
| committer | sshwarts <sshwarts> | 2008-03-19 22:48:55 +0000 |
| commit | 761dccd1ff5f77727fcab84cf2e2c06c4866af88 (patch) | |
| tree | f008291f47d1ed15dd7b19d3f019e0e7558af9ce /bios | |
| parent | 3786dd03839da4a215fafd03ae733fbba1567996 (diff) | |
Merge SF patch
Diffstat (limited to 'bios')
| -rw-r--r-- | bios/rombios.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bios/rombios.c b/bios/rombios.c index a873c436..f7d7e550 100644 --- a/bios/rombios.c +++ b/bios/rombios.c @@ -4392,7 +4392,7 @@ BX_DEBUG_INT15("case default:\n"); break; } } -#endif +#endif // BX_USE_PS2_MOUSE void set_e820_range(ES, DI, start, end, type) @@ -9906,7 +9906,7 @@ pci_init_end: pop bp pop ds ret -#endif // BX_ROMBIOS32 +#endif // !BX_ROMBIOS32 #endif // BX_PCIBIOS #if BX_ROMBIOS32 @@ -10026,7 +10026,7 @@ rombios32_gdt: dw 0xffff, 0, 0x9300, 0x00cf ; 32 bit flat data segment (0x18) dw 0xffff, 0, 0x9b0f, 0x0000 ; 16 bit code segment base=0xf0000 limit=0xffff dw 0xffff, 0, 0x9300, 0x0000 ; 16 bit data segment base=0x0 limit=0xffff -#endif +#endif // BX_ROMBIOS32 ; parallel port detection: base address in DX, index in BX, timeout in CL |