WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 3727 $
+$Revision: 3732 $
         shr     ecx, 2
         rep stosd
-; SAVE & CLEAR 0-0xffff
-        xor     esi, esi
-        mov     edi, (BOOT_VAR-OS_BASE)
-        mov     ecx, 0x10000 / 4
+; SAVE & CLEAR 0-0xffff
-        rep movsd
+        mov     edi, 0x1000
+        mov     ecx, 0x8000 / 4
+        rep stosd
-        mov     edi, 0x1000
+        mov     edi, 0xa000
-        mov     ecx, 0xf000 / 4
+        mov     ecx, 0x6000 / 4
         rep stosd
         mov     ecx, application_table_mutex
         call    mutex_init
 ; SAVE REAL MODE VARIABLES
         xor     eax, eax
-        mov     ax, [BOOT_VAR + BOOT_IDE_PI_16]
+        mov     ax, [BOOT_VARS + BOOT_IDE_PI_16]
         mov     [IDEContrProgrammingInterface], ax
-        mov     ax, [BOOT_VAR + BOOT_IDE_BASE_ADDR]
+        mov     ax, [BOOT_VARS + BOOT_IDE_BASE_ADDR]
         mov     [IDEContrRegsBaseAddr], ax
-        mov     ax, [BOOT_VAR + BOOT_IDE_BAR0_16]
+        mov     ax, [BOOT_VARS + BOOT_IDE_BAR0_16]
         mov     [IDE_BAR0_val], ax
         cmp     ax, 0
         and     ax, 0xfff0
         mov     [StandardATABases], ax
         mov     [hd_address_table], eax
         mov     [hd_address_table+8], eax
 @@:
-        mov     ax, [BOOT_VAR + BOOT_IDE_BAR1_16]
+        mov     ax, [BOOT_VARS + BOOT_IDE_BAR1_16]
         mov     [IDE_BAR1_val], ax
-        mov     ax, [BOOT_VAR + BOOT_IDE_BAR2_16]
+        mov     ax, [BOOT_VARS + BOOT_IDE_BAR2_16]
         mov     [IDE_BAR2_val], ax
         cmp     ax, 0
         je      @f
         and     ax, 0xfff0
         mov     [StandardATABases+2], ax
         mov     [hd_address_table+16], eax
         mov     [hd_address_table+24], eax
 @@:
-        mov     ax, [BOOT_VAR + BOOT_IDE_BAR3_16]
+        mov     ax, [BOOT_VARS + BOOT_IDE_BAR3_16]
         mov     [IDE_BAR3_val], ax
 ; --------------- APM ---------------------
 ; init selectors
-        mov     ebx, [BOOT_VAR+BOOT_APM_ENTRY]        ; offset of APM entry point
+        mov     ebx, [BOOT_VARS+BOOT_APM_ENTRY]        ; offset of APM entry point
-        movzx   eax, word [BOOT_VAR+BOOT_APM_CODE_32] ; real-mode segment base address of
+        movzx   eax, word [BOOT_VARS+BOOT_APM_CODE_32] ; real-mode segment base address of
                                                                                 ; protected-mode 32-bit code segment
-        movzx   ecx, word [BOOT_VAR+BOOT_APM_CODE_16]; real-mode segment base address of
+        movzx   ecx, word [BOOT_VARS+BOOT_APM_CODE_16]; real-mode segment base address of
                                                                                 ; protected-mode 16-bit code segment
-        movzx   edx, word [BOOT_VAR+BOOT_APM_DATA_16]; real-mode segment base address of
+        movzx   edx, word [BOOT_VARS+BOOT_APM_DATA_16]; real-mode segment base address of
                                                                                 ; protected-mode 16-bit data segment
         mov     [dword apm_data_16 + 4], dl
         mov     dword[apm_entry], ebx
         mov     word [apm_entry + 4], apm_code_32 - gdts
-        mov     eax, [BOOT_VAR + BOOT_APM_VERSION] ; version & flags
+        mov     eax, [BOOT_VARS + BOOT_APM_VERSION] ; version & flags
         mov     [apm_vf], eax
 ; -----------------------------------------
-        mov     al, [BOOT_VAR+BOOT_DMA]            ; DMA access
+        mov     al, [BOOT_VARS+BOOT_DMA]            ; DMA access
         mov     [allow_dma_access], al
-        movzx   eax, byte [BOOT_VAR+BOOT_BPP]      ; bpp
+        movzx   eax, byte [BOOT_VARS+BOOT_BPP]      ; bpp
         mov     [_display.bpp], eax
         mov     [_display.vrefresh], 60
-        movzx   eax, word [BOOT_VAR+BOOT_X_RES]; X max
+        movzx   eax, word [BOOT_VARS+BOOT_X_RES]; X max
         mov     [_display.width], eax
         mov     [display_width_standard], eax
         dec     eax
         mov     [Screen_Max_X], eax
         mov     [screen_workarea.right], eax
-        movzx   eax, word [BOOT_VAR+BOOT_Y_RES]; Y max
+        movzx   eax, word [BOOT_VARS+BOOT_Y_RES]; Y max
         mov     [_display.height], eax
         mov     [display_height_standard], eax
         dec     eax
         mov     [Screen_Max_Y], eax
         mov     [screen_workarea.bottom], eax
-        movzx   eax, word [BOOT_VAR+BOOT_VESA_MODE] ; screen mode
+        movzx   eax, word [BOOT_VARS+BOOT_VESA_MODE] ; screen mode
         mov     dword [SCR_MODE], eax
 ;        mov     eax, [BOOT_VAR+0x9014]             ; Vesa 1.2 bnk sw add
 ;        mov     [BANK_SWITCH], eax
         mov     eax, 640 *4                         ; Bytes PerScanLine
         cmp     [SCR_MODE], word 0x13               ; 320x200
         je      @f
         cmp     [SCR_MODE], word 0x12               ; VGA 640x480
         je      @f
-        movzx   eax, word[BOOT_VAR+BOOT_PITCH]      ; for other modes
+        movzx   eax, word[BOOT_VARS+BOOT_PITCH]      ; for other modes
 @@:
         mov     [_display.pitch], eax
 ; for Qemu or non standart video cards
 ; Unfortunately [BytesPerScanLine] does not always
 ;                             equal to [_display.width] * [ScreenBPP] / 8
         call    calculate_fast_getting_offset_for_LFB
-        mov     esi, BOOT_VAR+0x9080
+        mov     esi, BOOT_VARS+0x9080
         movzx   ecx, byte [esi-1]
         mov     [NumBiosDisks], ecx
         mov     edi, BiosDisksData
         rep movsd
 ; GRAPHICS ADDRESSES
-        mov     eax, [BOOT_VAR+BOOT_LFB]
+        mov     eax, [BOOT_VARS+BOOT_LFB]
         mov     [LFBAddress], eax
                 [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
 ; LOAD FIRST APPLICATION
-        cli
-;        cmp   byte [BOOT_VAR+0x9030],1
-;        jne   no_load_vrr_m
-;        mov     ebp, vrr_m
-;        call    fs_execute_from_sysdir
-;
-;;        cmp   eax,2                  ; if vrr_m app found (PID=2)
-;       sub   eax,2
-;        jz    first_app_found
-;
-;no_load_vrr_m:
+        cli
-        mov     ebp, firstapp
-        call    fs_execute_from_sysdir
         mov     ebp, firstapp
-;        cmp   eax,2                  ; continue if a process has been loaded
+        call    fs_execute_from_sysdir
         test    eax, eax
         jns     first_app_found
 .fl60:
         in      al, 0x60
         loop    .fl60
         push    eax
-        mov     ax, [BOOT_VAR+BOOT_Y_RES]
+        mov     ax, [BOOT_VARS+BOOT_Y_RES]
         shr     ax, 1
         shl     eax, 16
-        mov     ax, [BOOT_VAR+BOOT_X_RES]
+        mov     ax, [BOOT_VARS+BOOT_X_RES]
         shr     ax, 1
         mov     [MOUSE_X], eax
         call    wakeup_osloop
 sysfn_shutdown:          ; 18.9 = system shutdown
         cmp     ecx, 1
         jl      exit_for_anyone
         cmp     ecx, 4
         jg      exit_for_anyone
-        mov     [BOOT_VAR+0x9030], cl
+        mov     [BOOT_VARS+0x9030], cl
         mov     eax, [TASK_COUNT]
         mov     [SYS_SHUTDOWN], al
         mov     [shutdown_processes], eax
         ret
 align 4
 system_shutdown:          ; shut down the system
-        cmp     byte [BOOT_VAR+0x9030], 1
+        cmp     byte [BOOT_VARS+0x9030], 1
         jne     @F
         ret
 @@:
         mov     edi, OS_BASE+0x40000
         mov     ecx, 1000
         rep movsb
 end if
-        mov     esi, BOOT_VAR    ; restore 0x0 - 0xffff
+;        mov     esi, BOOT_VAR    ; restore 0x0 - 0xffff
-        mov     edi, OS_BASE
+;        mov     edi, OS_BASE
-        mov     ecx, 0x10000/4
+;        mov     ecx, 0x10000/4
-        cld
+;        cld
-        rep movsd
+;        rep movsd

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 3727 → 3732