Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8088 → Rev 8089

/kernel/trunk/boot/bootcode.inc
287,13 → 287,13
; \end{diamond}[02.12.2005]
 
; if bootloader sets cx = 'HA' and dx = 'RD', then bx contains identifier of source disk
; (see comment to BOOT_LO.bx_from_load and loader_doc.txt)
mov word [es:BOOT_LO.bx_from_load], 'r1' ; default value: /rd/1
; (see comment to BOOT_LO.sys_disk and loader_doc.txt)
mov word [es:BOOT_LO.sys_disk], 'r1' ; default value: /rd/1
cmp cx, 'HA'
jnz no_hd_load
cmp dx, 'RD'
jnz no_hd_load
mov [es:BOOT_LO.bx_from_load], bx
mov [es:BOOT_LO.sys_disk], bx
no_hd_load:
 
; set up stack
971,7 → 971,7
 
mov al, [preboot_device]
dec al
mov [es:BOOT_LO.dev], al
mov [es:BOOT_LO.rd_load_from], al
 
; GET MEMORY MAP
include '../detect/biosmem.inc'
978,7 → 978,7
 
; READ DISKETTE TO MEMORY
 
cmp byte [es:BOOT_LO.dev], 0
cmp byte [es:BOOT_LO.rd_load_from], RD_LOAD_FROM_FLOPPY
jne no_sys_on_floppy
mov si, diskload
call print
1305,7 → 1305,7
out dx, al
 
if defined extended_primary_loader
cmp [es:BOOT_LO.dev], 1
cmp [es:BOOT_LO.rd_load_from], RD_LOAD_FROM_HD
jne no_sys_from_primary
; load kolibri.img using callback from primary loader
and word [movedesc + 24 + 2], 0
/kernel/trunk/boot/preboot.inc
26,9 → 26,9
preboot_debug db 0 ; load kernel in debug mode? (1-yes, 2-no)
preboot_launcher db 0 ; start launcher after kernel is loaded? (1-yes, 2-no)
preboot_dma db 0 ; use DMA for access to HDD (1-always, 2-only for read, 3-never)
preboot_device db 0 ; boot device
; (1-floppy 2-harddisk 3-kernel restart 4-format ram disk)
;!!!! 0 - autodetect !!!!
preboot_device db 0 ; device to load ramdisk from
; 0-floppy 1-harddisk 2-kernel restart
; 3-format ram disk 4-don't use ramdisk
preboot_biosdisk db 0 ; use V86 to access disks through BIOS (1-yes, 2-no)
if defined extended_primary_loader
; timeout in 1/18th of second for config settings screen
/kernel/trunk/boot/rdload.inc
11,7 → 11,7
read_ramdisk:
; READ RAMDISK IMAGE FROM HD (only for IDE0, IDE1, IDE2, IDE3)
 
cmp byte [BOOT.dev], 1
cmp byte [BOOT.rd_load_from], RD_LOAD_FROM_HD
jne no_sys_on_hd.1
 
xor ebp, ebp
112,7 → 112,7
DEBUGF 1, "K : RD not found\n"
.1:
; test_to_format_ram_disk (need if not using ram disk)
cmp byte [BOOT.dev], 3
cmp byte [BOOT.rd_load_from], RD_LOAD_FROM_FORMAT
jne not_format_ram_disk
; format_ram_disk
mov edi, RAMDISK
/kernel/trunk/boot/uefi4kos.asm
232,7 → 232,7
mov word[esi + BOOT_LO.apm_code_16], 0
mov word[esi + BOOT_LO.apm_data_16], 0
mov byte[esi + BOOT_LO.bios_hd_cnt], 0
mov word[esi + BOOT_LO.bx_from_load], 'r1' ; boot from /rd/1
mov word[esi + BOOT_LO.sys_disk], 'r1' ; boot from /rd/1
 
 
lgdt [cs:GDTR]