WebSVN – Kolibri OS – Diff – /kernel/branches/gfx_kernel/video/vesa12.inc

 ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ; set_bank for Trident videocards, work on Trident 9440
 ; modified by Mario79
 ;set_bank:
 ;cli
-;cmp al,[0xfff2]
+;cmp al,[BANK_RW]
 ;je retsb
-;mov [0xfff2],al
+;mov [BANK_RW],al
 ;push dx
 ;mov dx,3D8h
 ;out  dx,al
 ;pop dx
 ;retsb:
 ; set_bank for S3 videocards, work on S3 ViRGE PCI (325)
 ; modified by kmeaw
 set_bank:
 pushfd
 cli
-cmp al,[0xfff2]
+cmp al,[BANK_RW]
 je retsb
-mov [0xfff2],al
+mov [BANK_RW],al
 push ax
 push dx
 push cx
 mov cl, al
 mov dx, 0x3D4
 ; ********* http://menuetos.hut.ru **************
 ; ************************************************
+;
 ;set_bank:
 ;cli
-;cmp al,[0xfff2]
+;cmp al,[BANK_RW]
 ;je retsb
-;mov [0xfff2],al
+;mov [BANK_RW],al
 ;push ax
 ;push dx
 ;mov dx,3CEh
 ;mov ah,al            ; Save value for later use
 ;mov al,10h           ; Index GR10 (Address Mapping)
 ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}
 ;set_bank:
 ;   cli
-;   cmp al,[0xfff2]
+;   cmp al,[BANK_RW]
 ;   je retsb
-;   mov [0xfff2],al
+;   mov [BANK_RW],al
 ;   push ax
 ;   push dx
 ;   mov ah,al
       v12dp3:
         push  eax
         push  ebx
-        mov   esi,0x300000
+        mov   esi,IMG_BACKGROUND
         push  edx
         imul  eax,dword [WinMapAddress-8]
         xor   edx,edx
-        mov   ecx,[0xfe00]
+        mov   ecx,[ScreenWidth]
         inc   ecx
         div   ecx
         push  eax
         mov   eax,ebx
         imul  eax,dword [WinMapAddress-4]
         xor   edx,edx
-        mov   ecx,[0xfe04]
+        mov   ecx,[ScreenHeight]
         inc   ecx
         mov   esi,eax
         pop   eax
         add   esi,eax
         add   esi,eax
         add   esi,eax
-        add   esi,0x300000
+        add   esi,IMG_BACKGROUND
         pop   ebx
         pop   eax
       v12di4:
         mov   ecx,[esi]
         pusha
         mov   esi,eax
         mov   edi,ebx
-        mov   eax,[0xfe00]
+        mov   eax,[ScreenWidth]
         add   eax,1
         mul   ebx
         add   eax,esi
         add   eax,WinMapAddress
         cmp   [eax],byte 1
         jnz   v12nbgp
-        mov   eax,[0xfe08]
+        mov   eax,[BytesPerScanLine]
         mov   ebx,edi
         mul   ebx
         add   eax,esi
         add   eax,esi
         add   eax,esi
-        cmp   [0xFBF1],byte 24
+        cmp   [ScreenBPP],byte 24
         jz    v12bgl3
         add   eax,esi
       v12bgl3:
         push ebx
         push eax
-        sub  eax,[0xfe80]
+        sub  eax,[LFBAddress]
         shr  eax,16
         call set_bank
         pop  eax
     push edi
     push eax
     push ebx
     push ecx
     push edx
-    mov  ecx,[0x3010]
+    mov  ecx,[TASK_BASE]
     add  eax,[ecx-twdw+WDATA.box.left]
     add  ebx,[ecx-twdw+WDATA.box.top]
     push eax
     mov  eax,ebx         ; y
-    mov  ebx,[0xfe08]
+    mov  ebx,[BytesPerScanLine]
     mul  ebx
     pop  ecx
     add  eax,ecx         ; x
     add  eax,ecx
     add  eax,ecx
-    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ? - x start
+    cmp  [ScreenBPP],byte 24     ; 24 or 32 bpp ? - x start
     jz   dbpi2412
     add  eax,ecx
   dbpi2412:
-    add  eax,[0xfe80]
+    add  eax,[LFBAddress]
     mov  edi,eax
     ; x size
     mov  eax,[esp+4] ; [esp+6]
     mov  ecx,eax
     add  ecx,eax
     add  ecx,eax
     ; check limits ?
     push eax
     push ecx
-    mov  eax,[0x3010]
+    mov  eax,[TASK_BASE]
-    mov  ecx,[eax+draw_data-0x3000+RECT.left]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.left]
     cmp  ecx,0
     jnz  dbcblimitlset12
-    mov  ecx,[eax+draw_data-0x3000+RECT.top]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.top]
     cmp  ecx,0
     jnz  dbcblimitlset12
-    mov  ecx,[eax+draw_data-0x3000+RECT.right]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.right]
-    cmp  ecx,[0xfe00]
+    cmp  ecx,[ScreenWidth]
     jnz  dbcblimitlset12
-    mov  ecx,[eax+draw_data-0x3000+RECT.bottom]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.bottom]
-    cmp  ecx,[0xfe04]
+    cmp  ecx,[ScreenHeight]
     jnz  dbcblimitlset12
     pop  ecx
     pop  eax
     pop  eax
     push dword 1
   dbcblimitlno12:
-    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ?
+    cmp  [ScreenBPP],byte 24     ; 24 or 32 bpp ?
     jz   dbpi24bit12
     push edi
     push ecx
       xor  edx,edx
       mov  eax,edi
-      sub  eax,[0xfe80]
+      sub  eax,[LFBAddress]
       mov  ebx,3
       div  ebx
       add  eax,WinMapAddress
-      mov   ebx,[0x3000]
+      mov   ebx,[CURRENT_TASK]
       cld
      dbimp24yes12:
         push edi
         mov  eax,edi
-        sub  eax,[0xfe80]
+        sub  eax,[LFBAddress]
         shr  eax,16
         call set_bank
         and  edi,0xffff
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  eax,[esp+8+3*4+16+4+4]
         stosw
         shr  eax,16
       nodbgl2412:
     pop  ecx
     pop  edi
     pop  ebx
-    add  edi,[0xfe08]
+    add  edi,[BytesPerScanLine]
     dec  ebx
     jz   dbnonewpi12
     jmp  dbnewpi12
     push ebx
     push edi
     push ecx
       mov  eax,edi
-      sub  eax,[0xfe80]
+      sub  eax,[LFBAddress]
       shr  eax,2
       add  eax,WinMapAddress
-      mov   ebx,[0x3000]
+      mov   ebx,[CURRENT_TASK]
       cld
       dbimp32yes12:
         push edi
         mov  eax,edi
-        sub  eax,[0xfe80]
+        sub  eax,[LFBAddress]
         shr  eax,16
         call set_bank
         and  edi,0xffff
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  eax,[esp+8+3*4+16+4+4]
         stosw
         shr  eax,16
       nodbgl3212:
     pop  ecx
     pop  edi
     pop  ebx
-    add  edi,[0xfe08]
+    add  edi,[BytesPerScanLine]
     dec  ebx
     jz   nodbnewpi3212
     jmp  dbnewpi3212
 Vesa12_putpixel24:
         mov  edi,eax ; x
         mov  eax,ebx ; y
         lea  edi,[edi+edi*2]
-        mov  ebx,[0xfe08]
+        mov  ebx,[BytesPerScanLine]
         mul  ebx
         add  edi,eax
         mov  eax,edi
         shr  eax,16
         call set_bank
         and  edi,65535
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  eax,[esp+28]
         stosw
         shr  eax,16
         mov  [edi],al
 Vesa12_putpixel32:
         mov  edi,eax ; x
         mov  eax,ebx ; y
         shl  edi,2
-        mov  ebx,[0xfe08]
+        mov  ebx,[BytesPerScanLine]
         mul  ebx
         add  edi,eax
         mov  eax,edi
         shr  eax,16
         call set_bank
         and  edi,65535
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  ecx,[esp+28]
         mov  [edi],ecx
         sti
 Vesa12_getpixel24:
         mov  edi,eax ; x
         mov  eax,ebx ; y
         lea  edi,[edi+edi*2]
-        mov  ebx,[0xfe08]
+        mov  ebx,[BytesPerScanLine]
         mul  ebx
         add  edi,eax
         mov  eax,edi
         shr  eax,16
         call set_bank
         and  edi,65535
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  ecx,[edi]
         and  ecx,255*256*256+255*256+255
         sti
 Vesa12_getpixel32:
         mov  edi,eax ; x
         mov  eax,ebx ; y
         shl  edi,2
-        mov  ebx,[0xfe08]
+        mov  ebx,[BytesPerScanLine]
         xor  edx,edx
         mul  ebx
         add  edi,eax
         mov  eax,edi
         shr  eax,16
         call set_bank
         and  edi,65535
-        add  edi,0xa0000
+        add  edi,VGABasePtr
         mov  ecx,[edi]
         and  ecx,255*256*256+255*256+255
         sti
+        ret
+vesa12_putimage:
+; ebx = pointer to image
-        ret
+; ecx = size [x|y]
 ; edx = coordinates [x|y]
 ; ebp = pointer to 'get' function
     push  ebx
     push  ecx
     push  edx
     movzx eax,word [esp+2]
     movzx ebx,word [esp+0]
-    mov   ecx,[0x3010]
+    mov   ecx,[TASK_BASE]
     add   eax,[ecx-twdw+WDATA.box.left]
     add   ebx,[ecx-twdw+WDATA.box.top]
     push  eax
     mov   eax,ebx         ; y
-    mov   ebx,[0xfe08]
+    mul   dword [BytesPerScanLine]
-    mul   ebx
     pop   ecx
     add   eax,ecx         ; x
     add   eax,ecx
     add   eax,ecx
-    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ? - x start
+    cmp  [ScreenBPP],byte 24     ; 24 or 32 bpp ? - x start
     jz   pi2412
     add  eax,ecx
   pi2412:
-    add  eax,[0xfe80]
+    add  eax,[LFBAddress]
     mov  edi,eax
-    ; x size
-    movzx eax,word [esp+6]
-    mov   ecx,eax
-    add   ecx,eax
-    add   ecx,eax
-    cmp   [0xfbf1],byte 24     ; 24 or 32 bpp ? - x size
     jz    pi24312
-    add   ecx,eax
+    ; x size
-  pi24312:
     movzx ecx,word [esp+6]
-    mov   esi,[esp+8]
-    movzx ebx,word [esp+4]
+    mov   esi,[esp+8]
-    ; check limits while draw ?
+    movzx ebx,word [esp+4]
-    push  eax
-    push  ecx
+    ; check limits while draw ?
-    mov  eax,[0x3010]
-    mov  ecx,[eax+draw_data-0x3000+RECT.left]
+    push  ecx
-    cmp  ecx,0
+    mov  eax,[TASK_BASE]
-    jnz  dbcblimitlset212
+    cmp  dword [eax+draw_data-CURRENT_TASK+RECT.left], 0
-    mov  ecx,[eax+draw_data-0x3000+RECT.top]
+    jnz  dbcblimitlset212
-    cmp  ecx,0
+    cmp  dword [eax+draw_data-CURRENT_TASK+RECT.top], 0
     jnz  dbcblimitlset212
-    mov  ecx,[eax+draw_data-0x3000+RECT.right]
-    cmp  ecx,[0xfe00]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.right]
-    jnz  dbcblimitlset212
+    cmp  ecx,[ScreenWidth]
-    mov  ecx,[eax+draw_data-0x3000+RECT.bottom]
+    jnz  dbcblimitlset212
-    cmp  ecx,[0xfe04]
+    mov  ecx,[eax+draw_data-CURRENT_TASK+RECT.bottom]
-    jnz  dbcblimitlset212
-    pop  ecx
+    cmp  ecx,[ScreenHeight]
-    pop  eax
+    jnz  dbcblimitlset212
-    push dword 0
+    pop  ecx
-    jmp  dbcblimitlno212
+    push 0
-  dbcblimitlset212:
+    jmp  dbcblimitlno212
-    pop  ecx
-    pop  eax
-    push dword 1
-  dbcblimitlno212:
-    cmp  [0xfbf1],byte 24     ; 24 or 32 bpp ?
-    jz   pi24bit12
-    jmp  pi32bit12
-  pi24bit12:
     cld
-    push  eax
+  dbcblimitlset212:
-    push  ebx
     push  edx
-    xor   edx,edx
+    pop  ecx
-    mov   eax,ecx
-    mov   ebx,3
+    push 1
-    div   ebx
-    mov   ecx,eax
+  dbcblimitlno212:
     pop   edx
-    pop   ebx
+    cmp  [ScreenBPP],byte 24     ; 24 or 32 bpp ?
-    pop   eax
+    jnz  pi32bit12
-  newpi12:
+  pi24bit12:
-    push edi
+  newpi12:
-    push esi
+    push edi
+    push ecx
-    push ecx
+    push ebx
-    push ebx
       mov  edx,edi
-      xor  edx,edx
+      sub  edx,[LFBAddress]
-      mov  eax,edi
+      mov  ebx,3
-      sub  eax,[0xfe80]
-      mov  ebx,3
+      div  ebx
+      add  edx,WinMapAddress
-      div  ebx
+      mov  ebx,[CURRENT_TASK]
-      add  eax,WinMapAddress
+      mov  bh,[esp+4*3]
       mov  ebx,[0x3000]
-      mov  bh,[esp+4*4]
+      np2412:
         cmp  bl,[edx]
-      np2412:
+        jnz  imp24no12
+;        mov  eax,[esi]
-        cmp  bl,[eax]
+        push    dword [esp+4*3+20]
-        jnz  imp24no12
+        call    ebp
-        mov  edx,[esi]
-        cmp  bh,0
+;        cmp  bh,0
-        jz   imp24yes12
-;        call dbcplimit
+;        jz   imp24yes12
-;        jnz  imp24no12
+;        call dbcplimit
+;        jnz  imp24no12
      imp24yes12:
      imp24yes12:
         push eax
         push edi
-        mov  eax,edi
+        push eax
-        sub  eax,[0xfe80]
+        mov  eax,edi
-        shr  eax,16
-        call set_bank
+        sub  eax,[LFBAddress]
-        and  edi,0xffff
+        shr  eax,16
-        add  edi,0xa0000
-        mov  [edi],edx
-        shr  edx,2
-        mov  [edi+2],dl
+        call set_bank
-        sti
+        pop  eax
-        pop  edi
-        pop  eax
+        and  edi,0xffff
         add  edi,VGABasePtr
-     imp24no12:
+        mov  [edi],ax
+        shr  eax,16
-        inc  eax
+        mov  [edi+2],al
-        add  esi,3
+        pop  edi
-        add  edi,3
-        dec  ecx
-        jnz  np2412
-      np24d12:
+     imp24no12:
      pop  ebx
-     pop  ecx
+        inc  edx
-     pop  esi
+;        add  esi,3
-     pop  edi
+        add  edi,3
+        dec  ecx
-    add  edi,[0xfe08]
+        jnz  np2412
-    xor  eax,eax
-    mov  ax,[esp+4+2+4]
+      np24d12:
     lea  eax,[eax+eax*2]
-    add  esi,eax
+     pop  ebx
-    dec  ebx
+     pop  ecx
-    jz   nonewpi12
+     pop  edi
+    add  edi,[BytesPerScanLine]
-    jmp  newpi12
+    add  esi,[esp+32]
+    dec  ebx
-  nonewpi12:
+    jnz  newpi12
-    add  esp,7*4
+  nonewpi12:
-    mov  eax,0
     ret
+        pop     eax edx ecx ebx eax edi esi
         xor     eax, eax
+        ret
   pi32bit12:
+  pi32bit12:
     cld
-    shr  ecx,2
+   newpi3212:
-   newpi3212:
-    push edi
-    push esi
+    push edi
     push ecx
     push ebx
-      mov  eax,edi
+      mov  edx,edi
-      sub  eax,[0xfe80]
+      sub  edx,[LFBAddress]
-      shr  eax,2
+      shr  edx,2
-      add  eax,WinMapAddress
+      add  edx,WinMapAddress
-      mov   ebx,[0x3000]
+      mov   ebx,[CURRENT_TASK]
-      mov   bh,[esp+4*4]
       mov   bh,[esp+4*3]
-      np3212:
-        cmp  bl,[eax]
-        jnz  imp32no12
-        mov  edx,[esi]
+      np3212:
-        cmp  bh,0
-        jz   imp32yes12
-;        call dbcplimit
+        cmp  bl,[edx]
-;        jnz  imp32no12
+        jnz  imp32no12
+;        mov  eax,[esi]
-      imp32yes12:
+        push    dword [esp+4*3+20]
         call    ebp
-        push eax
+;        cmp  bh,0
-        push edi
+;        jz   imp32yes12
-        mov  eax,edi
+;        call dbcplimit
-        sub  eax,[0xfe80]
+;        jnz  imp32no12
         shr  eax,16
-        call set_bank
+      imp32yes12:
         and  edi,0xffff
-        add  edi,0xa0000
+        push edi
-        mov  [edi],edx
+        push eax
-        sti
+        mov  eax,edi
-        pop  edi
+        sub  eax,[LFBAddress]
-        pop  eax
+        shr  eax,16
         call set_bank
-      imp32no12:
+        pop  eax
         and  edi,0xffff
-        inc  eax
+        mov  [edi+VGABasePtr],eax
-        add  esi,3
+        pop  edi
         add  edi,4
-        dec  ecx
+      imp32no12:
-        jnz  np3212
         inc  edx
-      np32d12:
+;        add  esi,3
         add  edi,4

Subversion Repositories Kolibri OS

(root)/kernel/branches/gfx_kernel/video/vesa12.inc – Rev 129 → 384