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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.
+;; Copyright (C) KolibriOS team 2004-2015. All rights reserved.
 ;; PROGRAMMING:
 ;; Ivan Poddubny
 ;; Marat Zakiyanov (Mario79)
 ;; VaStaNi
 ;; Trans
 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 5201 $
+$Revision: 5565 $
         mov     ds, bx
         mov     es, bx
         mov     fs, cx
         mov     gs, bx
+        xor     eax, eax
+        mov     ebx, 0xFFFFF000+PG_SHARED+PG_NOCACHE+PG_UWR
+        bt      [cpu_caps], CAPS_PAT
+        setc    al
+        shl     eax, 7
+        or      ebx, eax
         mov     eax, PG_GLOBAL
         bt      [cpu_caps], CAPS_PGE
         jnc     @F
+        or      [sys_proc+PROC.pdt_0+(OS_BASE shr 20)], eax
-        or      dword [sys_proc+PROC.pdt_0+(OS_BASE shr 20)], PG_GLOBAL
+        or      ebx, eax
-        mov     ebx, cr4
+        mov     eax, cr4
+        or      eax, CR4_PGE
+        mov     cr4, eax
-        or      ebx, CR4_PGE
+@@:
-        mov     cr4, ebx
+        mov     [pte_valid_mask], ebx
 @@:
         xor     eax, eax
         mov     [launcher_start], al
         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_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_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
         je      @f
         cmp     [SCR_MODE], word 0x12               ; VGA 640x480
         je      @f
         movzx   eax, word[BOOT_VARS+BOOT_PITCH]      ; for other modes
 @@:
-        mov     [_display.pitch], eax
+        mov     [_display.lfb_pitch], eax
         mov     eax, [_display.width]
         mul     [_display.height]
-        mov     [_WinMapSize], eax
+        mov     [_display.win_map_size], eax
         call    calculate_fast_getting_offset_for_WinMapAddress
 ; for Qemu or non standart video cards
 ; Unfortunately [BytesPerScanLine] does not always
         mov     ecx, MSR_AMD_STAR
         wrmsr
 .noSYSCALL:
 ; -----------------------------------------
         stdcall alloc_page
-        stdcall map_page, tss-0xF80, eax, PG_SW
+        stdcall map_page, tss-0xF80, eax, PG_SWR
         stdcall alloc_page
-        stdcall map_page, tss+0x80, eax, PG_SW
+        stdcall map_page, tss+0x80, eax, PG_SWR
         stdcall alloc_page
-        stdcall map_page, tss+0x1080, eax, PG_SW
+        stdcall map_page, tss+0x1080, eax, PG_SWR
 ; LOAD IDT
         mov     [graph_data_l+2], ax
         shr     eax, 16
         mov     [graph_data_l+4], al
         mov     [graph_data_l+7], ah
-        stdcall kernel_alloc, [_WinMapSize]
+        stdcall kernel_alloc, [_display.win_map_size]
-        mov     [_WinMapAddress], eax
+        mov     [_display.win_map], eax
         xor     eax, eax
         mov     [cr4_ap+OS_BASE], eax
         mov     esi, OS_BASE + ap_init16
         mov     edi, OS_BASE + 8000h
         mov     ecx, (ap_init16_size + 3) / 4
         rep movsd
-        stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_SW+PG_NOCACHE
+        stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_GLOBAL+PG_NOCACHE+PG_SWR
         mov     [LAPIC_BASE], eax
         lea     edi, [eax+300h]
         mov     esi, smpt+4
         dec     ebx
 .wake_cpus_loop:
         call    load_default_skin
 ;protect io permission map
         mov     esi, [default_io_map]
-        stdcall map_page, esi, [SLOT_BASE+256+APPDATA.io_map], PG_MAP
+        stdcall map_page, esi, [SLOT_BASE+256+APPDATA.io_map], PG_READ
         add     esi, 0x1000
-        stdcall map_page, esi, [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
+        stdcall map_page, esi, [SLOT_BASE+256+APPDATA.io_map+4], PG_READ
         stdcall map_page, tss._io_map_0, \
-                [SLOT_BASE+256+APPDATA.io_map], PG_MAP
+                [SLOT_BASE+256+APPDATA.io_map], PG_READ
         stdcall map_page, tss._io_map_1, \
-                [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
+                [SLOT_BASE+256+APPDATA.io_map+4], PG_READ
         movzx   eax, word [MOUSE_Y]
         movzx   ebx, word [MOUSE_X]
         mov     eax, [d_width_calc_area + eax*4]
-        add     eax, [_WinMapAddress]
+        add     eax, [_display.win_map]
         movzx   edx, byte [ebx+eax]
         shl     edx, 8
 ; removed here by
 ;     call  mouse_centered
 ;* mouse centered - start code- Mario79
 ;mouse_centered:
 ;        push  eax
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
         shr     eax, 1
         mov     [MOUSE_X], ax
-        mov     eax, [Screen_Max_Y]
+        mov     eax, [_display.height]
         shr     eax, 1
         mov     [MOUSE_Y], ax
         call    wakeup_osloop
 ;        ret
 ;* mouse centered - end code- Mario79
         ret
  .set_pointer_position:
 ;     cmp  ecx,4  ; set mouse pointer position
         dec     ecx
         jnz     .set_mouse_button
-        cmp     dx, word[Screen_Max_Y]
+        cmp     dx, word[_display.height]
-        ja      .end
+        jae     .end
         rol     edx, 16
-        cmp     dx, word[Screen_Max_X]
+        cmp     dx, word[_display.width]
-        ja      .end
+        jae     .end
         mov     [MOUSE_X], edx
         mov     [mouse_active], 1
         call    wakeup_osloop
         ret
  .set_mouse_button:
         ja      .exit
         pushfd
         cli
         mov     eax, ecx
-        mov     ecx, [_display.pitch]
+        mov     ecx, [_display.lfb_pitch]
         mov     [_display.width], eax
         dec     eax
         mov     [_display.height], edx
         dec     edx
         call    free_page
 ;--------------------------------------
 align 4
 @@:
         mov     eax, [page_tabs+esi*4]
-        or      al, PG_UW
+        or      al, PG_UWR
         mov     [page_tabs+ebx*4], eax
         mov     eax, ebx
         shl     eax, 12
         invlpg  [eax]
         inc     ebx
 nosb8:
         cmp     ebx, 9
         jnz     nosb9
 ; ecx = [left]*65536 + [right]
 ; edx = [top]*65536 + [bottom]
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        mov     ebx, [Screen_Max_Y]
+        mov     ebx, [_display.height]
+        dec     eax
+        dec     ebx
 ; check [right]
         cmp     cx, ax
         ja      .exit
 ; check [left]
         ror     ecx, 16
 align 4
 force_redraw_background:
         and     [draw_data+32 + RECT.left], 0
         and     [draw_data+32 + RECT.top], 0
         push    eax ebx
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        mov     ebx, [Screen_Max_Y]
+        mov     ebx, [_display.height]
+        dec     eax
+        dec     ebx
         mov     [draw_data+32 + RECT.right], eax
         mov     [draw_data+32 + RECT.bottom], ebx
         pop     ebx eax
         inc     byte[REDRAW_BACKGROUND]
         call    wakeup_osloop
         mov     edx, [TASK_BASE]      ; return whole screen draw area for this app
         add     edx, draw_data - CURRENT_TASK
         mov     [edx + RECT.left], 0
         mov     [edx + RECT.top], 0
+        mov     eax, [_display.width]
-        mov     eax, [Screen_Max_X]
+        dec     eax
         mov     [edx + RECT.right], eax
+        mov     eax, [_display.height]
-        mov     eax, [Screen_Max_Y]
+        dec     eax
         mov     [edx + RECT.bottom], eax
 ;--------------------------------------
 align 4
 .start_x:
         add     eax, ecx
         mov     ebp, [d_width_calc_area + ebx*4]
-        add     ebp, [_WinMapAddress]
+        add     ebp, [_display.win_map]
         movzx   ebp, byte[eax+ebp] ; get value for current point
         cmp     ebp, edi
         jne     @f
         popad
         ret
 ;-----------------------------------------------------------------------------
 align 4
 calculatebackground:   ; background
-        mov     edi, [_WinMapAddress]              ; set os to use all pixels
+        mov     edi, [_display.win_map]              ; set os to use all pixels
         mov     eax, 0x01010101
-        mov     ecx, [_WinMapSize]
+        mov     ecx, [_display.win_map_size]
         shr     ecx, 2
         rep stosd
         mov     byte[REDRAW_BACKGROUND], 0            ; do not draw background!
         add     word [msg_board_pos+2], 6
         cmp     bl, 10
         jnz     @f
         mov     word [msg_board_pos+2], (42*6)
         add     word [msg_board_pos], 10
-        mov     ax, word [Screen_Max_Y]
+        mov     ax, word [_display.width]
         cmp     word [msg_board_pos], ax
-        jbe     @f
+        jb      @f
         mov     word [msg_board_pos], 10
 @@:
 ; // end if
         or      [esp+32], dword -1
         ret
 .1:                             ; resolution
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        shl     eax, 16
-        mov     ax, word [Screen_Max_Y]
+        shl     eax, 16
-        add     eax, 0x00010001
+        mov     ax, word [_display.height]
         mov     [esp+32], eax
         ret
 .2:                             ; bits per pixel
         mov     eax, [_display.bits_per_pixel]
         mov     [esp+32], eax
         ret
 .3:                             ; bytes per scanline
-        mov     eax, [_display.pitch]
+        mov     eax, [_display.lfb_pitch]
         mov     [esp+32], eax
 .drectr:
         ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
+        mov     ax, word [_display.width]
-        mov     ax, word [Screen_Max_X]
+        dec     ax
         shl     eax, 16
+        mov     ax, word [_display.height]
-        mov     ax, word [Screen_Max_Y]
+        dec     ax
         mov     [esp + 32], eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
         and     [cd_status], 0
         ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_getpixel_WinMap:                       ; GetPixel WinMap
-        cmp     ebx, [Screen_Max_X]
+        cmp     ebx, [_display.width]
-        jbe     @f
+        jb      @f
-        cmp     ecx, [Screen_Max_Y]
+        cmp     ecx, [_display.height]
-        jbe     @f
+        jb      @f
         xor     eax, eax
         jmp     .store
 ;--------------------------------------
 align 4
 @@:
         mov     eax, [d_width_calc_area + ecx*4]
-        add     eax, [_WinMapAddress]
+        add     eax, [_display.win_map]
         movzx   eax, byte[eax+ebx]        ; get value for current point
 ;--------------------------------------
 align 4
 .store:
         mov     [esp + 32], eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_getpixel:                       ; GetPixel
-        mov     ecx, [Screen_Max_X]
+        mov     ecx, [_display.width]
-        inc     ecx
         xor     edx, edx
         mov     eax, ebx
         div     ecx
         mov     ebx, edx
         xchg    eax, ebx
         xor     cl, cl
         ror     ecx, 8
         pushad
         mov     edx, [d_width_calc_area + ebx*4]
-        add     edx, [_WinMapAddress]
+        add     edx, [_display.win_map]
         movzx   edx, byte [eax+edx]
         cmp     dl, byte 1
         jne     @f
         mov     ecx, [_display.height]
         mov     edi, BPSLine_calc_area
         cld
 @@:
         stosd
-        add     eax, [_display.pitch]
+        add     eax, [_display.lfb_pitch]
         dec     ecx
         jnz     @r
         ret
 ;------------------------------------------------------------------------------
 align 4
 ; edx - new Screen_Max_Y
         pushfd
-        cli
-        mov     [Screen_Max_X], eax
+        cli
         mov     [Screen_Max_Y], edx
-        mov     [_display.pitch], ecx
+        mov     [_display.lfb_pitch], ecx
         pushad
         cmp     [do_not_touch_winmap], 1
         je      @f
-        stdcall kernel_free, [_WinMapAddress]
+        stdcall kernel_free, [_display.win_map]
         mov     eax, [_display.width]
         mul     [_display.height]
-        mov     [_WinMapSize], eax
+        mov     [_display.win_map_size], eax
         stdcall kernel_alloc, eax
-        mov     [_WinMapAddress], eax
+        mov     [_display.win_map], eax
         test    eax, eax
         popad
         call    repos_windows
         xor     eax, eax
         xor     ebx, ebx
-        mov     ecx, [Screen_Max_X]
+        mov     ecx, [_display.width]
+        mov     edx, [_display.height]
+        dec     ecx
-        mov     edx, [Screen_Max_Y]
+        dec     edx
         call    calculatescreen
         pop     edi
         pop     esi
         call    scan_rsdp
         jc      no_acpi_power_off
 .rsdp_found:
         mov     esi, [eax+16]   ; esi contains physical address of the RSDT
         mov     ebp, [ipc_tmp]
-        stdcall map_page, ebp, esi, PG_MAP
+        stdcall map_page, ebp, esi, PG_READ
         lea     eax, [esi+1000h]
         lea     edx, [ebp+1000h]
-        stdcall map_page, edx, eax, PG_MAP
+        stdcall map_page, edx, eax, PG_READ
         and     esi, 0xFFF
         add     esi, ebp
         cmp     dword [esi], 'RSDT'
         jnz     no_acpi_power_off
         mov     ecx, [esi+4]
         add     esi, 24h
 .scan_fadt:
         lodsd
         mov     ebx, eax
         lea     eax, [ebp+2000h]
-        stdcall map_page, eax, ebx, PG_MAP
+        stdcall map_page, eax, ebx, PG_READ
         lea     eax, [ebp+3000h]
         add     ebx, 0x1000
-        stdcall map_page, eax, ebx, PG_MAP
+        stdcall map_page, eax, ebx, PG_READ
         and     ebx, 0xFFF
         lea     ebx, [ebx+ebp+2000h]
         cmp     dword [ebx], 'FACP'
         jz      .fadt_found
         loop    .scan_fadt
         jmp     no_acpi_power_off
 .fadt_found:
 ; ebx is linear address of FADT
         mov     edi, [ebx+40] ; physical address of the DSDT
         lea     eax, [ebp+4000h]
-        stdcall map_page, eax, edi, PG_MAP
+        stdcall map_page, eax, edi, PG_READ
         lea     eax, [ebp+5000h]
         lea     esi, [edi+0x1000]
-        stdcall map_page, eax, esi, PG_MAP
+        stdcall map_page, eax, esi, PG_READ
         and     esi, 0xFFF
         sub     edi, esi
         cmp     dword [esi+ebp+4000h], 'DSDT'
         jnz     no_acpi_power_off
         mov     eax, [esi+ebp+4004h] ; DSDT length
         jb      @f
         sub     esi, 0x1000
         add     edi, 0x1000
         push    eax
         lea     eax, [ebp+4000h]
-        stdcall map_page, eax, edi, PG_MAP
+        stdcall map_page, eax, edi, PG_READ
-        push    PG_MAP
+        push    PG_READ
         lea     eax, [edi+1000h]
         push    eax
         lea     eax, [ebp+5000h]
         push    eax
         stdcall map_page

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm – Rev 5201 → 5565