Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1940 → Rev 1941

/kernel/branches/Kolibri-A/trunk/kernel.asm
118,7 → 118,7
 
version db 'Kolibri OS version 0.7.7.0+ ',13,10,13,10,0
 
include "boot/bootstr.inc" ; language-independent boot messages
;include "boot/bootstr.inc" ; language-independent boot messages
include "boot/preboot.inc"
 
include "boot/booteng.inc" ; english system boot messages
559,7 → 559,7
; READ RAMDISK IMAGE FROM HD
 
;!!!!!!!!!!!!!!!!!!!!!!!
include 'boot/rdload.inc'
;include 'boot/rdload.inc'
;!!!!!!!!!!!!!!!!!!!!!!!
; mov [dma_hdd],1
; CALCULATE FAT CHAIN FOR RAMDISK
752,11 → 752,6
stdcall map_page,tss._io_map_1,\
[SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
 
mov ax,[OS_BASE+0x10000+bx_from_load]
cmp ax,'r1' ; if not rused ram disk - load network configuration from files {SPraid.simba}
je no_st_network
call set_network_conf
no_st_network:
 
call init_userDMA ; <<<<<<<<< ============== core/memory.inc =================
mov esi, boot_uDMA_ok