WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 2437 $
+$Revision: 2439 $
         mov     ebx, cr4
         or      ebx, CR4_PGE
         mov     cr4, ebx
+@@:
+        mov     esi, [LAPIC_BASE]
-@@:
+        xor     ebp, ebp
+.1:
+        mov ebx, [esi+0x20]               ;apic_id
+        shr ebx, 24
-.1:
+        shl ebx, 6+2
-        mov ebx, LFB_BASE
+        add ebx, LFB_BASE
-        mov edx, 128
+        mov edx, 32
 .2:
-        mov ecx, 128
+        mov ecx, 32
         mov edi, ebx
         mov eax, [_display.width]
         lea ebx, [ebx+eax*4]
-        mov eax, 0xFF808080
+        mov eax, ebp
         rep stosd
         dec edx
+        jnz .2
-        jnz .2
+        dec ebp
         jmp .1
 @@:
         mov     eax, [_display.width]
         mul     [_display.height]
         mov     [_WinMapSize], eax
+        call    calculate_fast_getting_offset_for_WinMapAddress
         mov     esi, BOOT_VAR+0x9080
         movzx   ecx, byte [esi-1]
         mov     [NumBiosDisks], ecx
         mov     edi, BiosDisksData
         cmp     [SCR_MODE], word 0100000000000000b
         jge     setvesa20
         cmp     [SCR_MODE], word 0x13  ; EGA 320*200 256 colors
         je      v20ga32
         jmp     v20ga24
-;        mov     [PUTPIXEL], dword Vesa12_putpixel24 ; Vesa 1.2
-;        mov     [GETPIXEL], dword Vesa12_getpixel24
-;        cmp     [ScreenBPP], byte 24
-;        jz      ga24
-;        mov     [PUTPIXEL], dword Vesa12_putpixel32
-;        mov     [GETPIXEL], dword Vesa12_getpixel32
-;      ga24:
-;        jmp     v20ga24
 setvesa20:
         mov     [PUTPIXEL], dword Vesa20_putpixel24 ; Vesa 2.0
         mov     [GETPIXEL], dword Vesa20_getpixel24
         cmp     [ScreenBPP], byte 24
         jz      v20ga24
 ; Try to Initialize APIC
         call    APIC_init
+        call    LAPIC_init
+        mov     eax, 1
-        call    LAPIC_init
+        call    start_ap
 ; Enable timer IRQ (IRQ0) and hard drives IRQs (IRQ14, IRQ15)
 ; they are used: when partitions are scanned, hd_read relies on timer
         call    unmask_timer
         cmp     [_display.select_cursor], 0
         je      @f
 ; restore default cursor before killing
         pusha
         mov     ecx, [current_slot]
-        mov     eax, [def_cursor]
-        mov     [ecx+APPDATA.cursor], eax
-        movzx   eax, word [MOUSE_Y]
-        movzx   ebx, word [MOUSE_X]
-        mov     ecx, [Screen_Max_X]
-        inc     ecx
-        mul     ecx
-        add     eax, [_WinMapAddress]
-        movzx   edx, byte [ebx+eax]
-        shl     edx, 8
-        mov     esi, [edx+SLOT_BASE+APPDATA.cursor]
-        push    esi
-        call    [_display.select_cursor]
+        call    restore_default_cursor_before_killing
-        mov     [current_cursor], esi
         popa
 @@:
 ;--------------------------------------
         mov     ecx, [current_slot]
         mov     eax, [ecx+APPDATA.tls_base]
     waitterm:            ; wait here for termination
         mov     ebx, 100
         call    delay_hs
+        jmp     waitterm
+;------------------------------------------------------------------------------
+restore_default_cursor_before_killing:
+        mov     eax, [def_cursor]
+        mov     [ecx+APPDATA.cursor], eax
+        movzx   eax, word [MOUSE_Y]
+        movzx   ebx, word [MOUSE_X]
+        mov     ecx, [Screen_Max_X]
+        inc     ecx
+        mul     ecx
+        add     eax, [_WinMapAddress]
+        movzx   edx, byte [ebx+eax]
+        shl     edx, 8
+        mov     esi, [edx+SLOT_BASE+APPDATA.cursor]
+        push    esi
+        call    [_display.select_cursor]
+        mov     [current_cursor], esi
-        jmp     waitterm
+        ret
 ;------------------------------------------------------------------------------
 iglobal
 align 4
 sys_system_table:
         je      @f
 ; restore default cursor before killing
         pusha
         mov     ecx, [esp+32]
         shl     ecx, 8
-        mov     eax, [def_cursor]
-        mov     [ecx+SLOT_BASE+APPDATA.cursor], eax
-        movzx   eax, word [MOUSE_Y]
-        movzx   ebx, word [MOUSE_X]
-        mov     ecx, [Screen_Max_X]
+        add     ecx, SLOT_BASE
-        inc     ecx
-        mul     ecx
-        add     eax, [_WinMapAddress]
-        movzx   edx, byte [ebx+eax]
-        shl     edx, 8
-        mov     esi, [edx+SLOT_BASE+APPDATA.cursor]
-        push    esi
-        call    [_display.select_cursor]
+        call    restore_default_cursor_before_killing
-        mov     [current_cursor], esi
         popa
 @@:
         add     esp, 4
 ;--------------------------------------
      ;call MEM_Heap_Lock      ;guarantee that process isn't working with heap
         ret
+paleholder:
+        ret
+;------------------------------------------------------------------------------
+align 4
+calculate_fast_getting_offset_for_WinMapAddress:
+; calculate data area for fast getting offset to _WinMapAddress
+        mov     eax, [_display.width]
+        mov     ecx, [_display.height]
+        inc     ecx
-paleholder:
+        mov     edi, d_width_calc_area
+        cld
+@@:
+        stosd
+        add     eax, [_display.width]
+        dec     ecx
+        jnz     @r
         ret
 ;------------------------------------------------------------------------------
 align 4
 set_screen:
         stdcall kernel_alloc, eax
         mov     [_WinMapAddress], eax
         test    eax, eax
         jz      .epic_fail
+        call    calculate_fast_getting_offset_for_WinMapAddress
         popad
         call    repos_windows

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm @ 6251 – Rev 2437 → 2439