Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8115 → Rev 8117

/kernel/trunk/bootloader/extended_primary_loader/fat32/Tupfile.lua
1,3 → 1,3
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("bootsect.asm", "fasm %f %o", "bootsect.bin")
tup.rule("kordldr.f32.asm", "fasm %f %o", "kordldr.f32.bin")
tup.rule("kordldr.f32.asm", "fasm %f %o", "kordldr.f32")
/kernel/trunk/core/apic.inc
55,6 → 55,8
cmp [acpi_lapic_base], 0
jz .no_apic
 
; non-UEFI loaders don't load DEVICES.DAT and don't initialize [acpi_dev_size]
if defined UEFI
cmp [acpi_dev_size], 0
jz @f
stdcall map_io_mem, [acpi_dev_data], [acpi_dev_size], PG_SWR
61,6 → 63,7
mov [acpi_dev_data], eax
jmp .loaded
@@:
end if
 
stdcall load_file, dev_data_path
test eax, eax