WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/video/vesa20.inc

 ;;                                                              ;;
 ;;  See file COPYING for details                                ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3626 $
+$Revision: 4288 $
-; If you're planning to write your own video driver I suggest
-; you replace the VESA12.INC file and see those instructions.
-;Screen_Max_X             equ     0xfe00
-;Screen_Max_Y            equ     0xfe04
-;BytesPerScanLine        equ     0xfe08
 ;LFBAddress              equ     0xfe80
-;ScreenBPP               equ     0xfbf1
+; If you're planning to write your own video driver I suggest
 ; you replace the VESA12.INC file and see those instructions.
 ;     lea     eax, [eax + eax * 2]
         call    esi
         add     eax, [putimg.arg_0]
         mov     [putimg.line_increment], eax
 ; winmap new line increment
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        inc     eax
         sub     eax, [putimg.real_sx]
         mov     [putimg.winmap_newline], eax
 ; screen new line increment
         mov     eax, [_display.pitch]
         mov     ebx, [_display.bpp]
 ;        shr     ebx, 3
         imul    eax, ebx
         add     edx, eax
 ; pointer to pixel map
         mov     eax, [putimg.abs_cy]
-;        imul    eax, [Screen_Max_X]
-;        add     eax, [putimg.abs_cy]
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [putimg.abs_cx]
         add     eax, [_WinMapAddress]
 ; ecx = ?? RR GG BB    ; 0x01000000 negation
                        ; 0x02000000 used for draw_rectangle without top line
                        ;            for example drawwindow_III and drawwindow_IV
 ; edi = 0x00000001 force
 ;;;        mov  [novesachecksum], dword 0
         pushad
-        cmp     [Screen_Max_X], eax
+        cmp     eax, [_display.width]
-        jb      .exit
+        jae     .exit
-        cmp     [Screen_Max_Y], ebx
+        cmp     ebx, [_display.height]
-        jb      .exit
+        jae     .exit
         test    edi, 1           ; force ?
         jnz     .forced
         mov     [LFB_BASE+edi], eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
 calculate_edi:
-;        mov     edi, ebx
-;        imul    edi, [Screen_Max_X]
-;        add     edi, ebx
         mov     edi, [d_width_calc_area + ebx*4]
         add     edi, eax
         ret
 ;-----------------------------------------------------------------------------
 ; DRAWLINE
 ;--------------------------------------
 align 4
 .end_y:
         mov     [drbar.real_sy], ebx
 ; line_inc_map
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
         sub     eax, [drbar.real_sx]
-        inc     eax
         mov     [drbar.line_inc_map], eax
 ; line_inc_scr
         mov     eax, [drbar.real_sx]
         mov     ebx, [_display.bpp]
         shr     ebx, 3
         mov     eax, [drbar.abs_cx]
         imul    eax, ebx
         add     edx, eax
 ; pointer to pixel map
         mov     eax, [drbar.abs_cy]
-;        imul    eax, [Screen_Max_X]
-;        add     eax, [drbar.abs_cy]
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [drbar.abs_cx]
         add     eax, [_WinMapAddress]
 ;------------------------------------------------------------------------------
 align 4
 vesa20_drawbackground_stretch:
         pushad
 ; Helper variables
-; calculate 2^32*(BgrDataWidth-1) mod (ScreenWidth-1)
+; calculate 2^32*(BgrDataWidth) mod (ScreenWidth)
         mov     eax, [BgrDataWidth]
-        dec     eax
         xor     edx, edx
-        div     dword [Screen_Max_X]
+        div     dword [_display.width]
         push    eax     ; high
         xor     eax, eax
-        div     dword [Screen_Max_X]
+        div     dword [_display.width]
         push    eax     ; low
 ; the same for height
         mov     eax, [BgrDataHeight]
-        dec     eax
         xor     edx, edx
-        div     dword [Screen_Max_Y]
+        div     dword [_display.height]
         push    eax     ; high
         xor     eax, eax
-        div     dword [Screen_Max_Y]
+        div     dword [_display.height]
         push    eax     ; low
 ; External loop for all y from start to end
         mov     ebx, [draw_data+32+RECT.top]    ; y start
         mov     ebp, [draw_data+32+RECT.left]   ; x start
 ; 1) Calculate pointers in WinMapAddress (does pixel belong to OS thread?) [ebp]
         cmp     ebx, [draw_data+32+RECT.bottom]
         ja      sdpdone
 ; advance edi, ebp to next scan line
         sub     eax, [draw_data+32+RECT.left]
         sub     ebp, eax
-        add     ebp, [Screen_Max_X]
+        add     ebp, [_display.width]
-        add     ebp, 1
         sub     edi, eax
         sub     edi, eax
         sub     edi, eax
         cmp     byte [_display.bpp], 24
         jz      @f
         cmp     ebx, -1
         jnz     bgr_resmooth0
         push    edi
         mov     esi, bgr_next_line
         mov     edi, bgr_cur_line
-        mov     ecx, [Screen_Max_X]
+        mov     ecx, [_display.width]
         inc     ecx
         rep movsd
         jmp     bgr_resmooth1
 ;--------------------------------------
 align 4

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/video/vesa20.inc – Rev 3626 → 4288