Subversion Repositories Kolibri OS

Rev

Rev 860 | Rev 862 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 860 Rev 861
Line 56... Line 56...
56 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 56 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
57 
 
 57 
 
Line 58... Line 58...
58 
include 'macros.inc'
 58 
include 'macros.inc'
Line 59... Line 59...
59 
 
 59 
 
Line 60... Line 60...
60 
$Revision: 860 $
 60 
$Revision: 861 $
Line 61... Line 61...
61 
 
 61 
 
Line 397... Line 397...
397 
           xor esi, esi
 397 
           xor esi, esi
398 
           mov   edi,BOOT_VAR
 398 
           mov   edi,BOOT_VAR
399 
           mov   ecx,0x10000 / 4
 399 
           mov   ecx,0x10000 / 4
400 
           rep   movsd
 400 
           rep   movsd
401 
           xor edi, edi
 401 
 
- 
 
 402 
           xor edi, edi
402 
           xor eax, eax
 403 
           xor eax, eax
403 
           mov   ecx,0x10000 / 4
 404 
           mov   ecx,0x10000 / 4
404 
           rep   stosd
 405 
           rep   stosd
405 
 
 406 
 
Line 406... Line 407...
406 
           mov edi, SLOT_BASE
 407 
           mov edi, 0x40000
407 
           mov   ecx,0x10000 / 4
 408 
           mov ecx, (0x90000-0x40000)/4
408 
           rep   stosd
 409 
           rep stosd
Line 409... Line 410...
409 
 
 410 
 
410 
           mov dword [_sys_pdbr], eax
 411 
           mov dword [_sys_pdbr], eax
411 
           mov dword [_sys_pdbr+4], eax
 412 
           mov dword [_sys_pdbr+4], eax
Line 847... Line 848...
847 
 
 848 
 
Line 848... Line 849...
848 
;protect io permission map
 849 
;protect io permission map
Line 849... Line 850...
849 
 
 850 
 
850 
	   mov esi, [default_io_map]
 851 
	   mov esi, [default_io_map]
851 
	   stdcall map_page,esi,(tss._io_map_0-OS_BASE), PG_MAP
 852 
         ;  stdcall map_page,esi,(tss._io_map_0-OS_BASE), PG_MAP
852 
	   add esi, 0x1000
 853 
         ;  add esi, 0x1000
Line 853... Line 854...
853 
	   stdcall map_page,esi,(tss._io_map_1-OS_BASE), PG_MAP
 854 
         ;  stdcall map_page,esi,(tss._io_map_1-OS_BASE), PG_MAP
854 
 
 855 
 
855 
         ;  stdcall map_page,tss._io_map_0,\
 856 
         ;  stdcall map_page,tss._io_map_0,\
856 
         ;          (tss._io_map_0-OS_BASE), PG_MAP
 857 
         ;          (tss._io_map_0-OS_BASE), PG_MAP
Line 2318... Line 2319...
2318 
  nosb1:
 2319 
nosb1:
Line 2319... Line 2320...
2319 
 
 2320 
 
2320 
    cmp   ebx,2 			   ; SET PIXEL
 2321 
    cmp   ebx,2 			   ; SET PIXEL
2321 
    jnz   nosb2
 2322 
    jnz   nosb2
- 
 
 2323 
    mov ebx, [mem_BACKGROUND]
- 
 
 2324 
    add ebx, 4095
- 
 
 2325 
    and ebx, -4096
- 
 
 2326 
    sub ebx, 4
2322 
    cmp   ecx,[mem_BACKGROUND]
 2327 
    cmp   ecx, ebx
- 
 
 2328 
    ja   @F
2323 
    jae   nosb2
 2329 
 
2324 
    mov   eax,[img_background]
 2330 
    mov   eax,[img_background]
2325 
    mov   ebx,[eax+ecx]
 2331 
    mov   ebx,[eax+ecx]
2326 
    and   ebx,0xFF000000 ;255*256*256*256
 2332 
    and   ebx,0xFF000000 ;255*256*256*256
2327 
    and   edx,0x00FFFFFF ;255*256*256+255*256+255
 2333 
    and   edx,0x00FFFFFF ;255*256*256+255*256+255
2328 
    add   edx,ebx
 2334 
    add   edx,ebx
2329 
    mov   [eax+ecx],edx
 2335 
    mov   [eax+ecx],edx
2330 
;    mov   [bgrchanged],1
 2336 
@@:
- 
 
 2337 
    ret
2331 
    ret
 2338 
 
Line 2332... Line 2339...
2332 
  nosb2:
 2339 
nosb2:
2333 
 
 2340 
 
2334 
    cmp   ebx,3 			   ; DRAW BACKGROUND
 2341 
    cmp   ebx,3 			   ; DRAW BACKGROUND
Line 2472... Line 2479...
2472 
    shl   eax,16
 2479 
    shl   eax,16
2473 
    mov   ax,[BgrDataHeight]
 2480 
    mov   ax,[BgrDataHeight]
2474 
    mov   [esp+36],eax
 2481 
    mov   [esp+36],eax
2475 
    ret
 2482 
    ret
2476 
  nogb1:
 2483 
 
- 
 
 2484 
nogb1:
2477 
 
 2485 
 
Line 2478... Line 2486...
2478 
    cmp   eax,2 				 ; PIXEL
 2486 
    cmp   eax,2 				 ; PIXEL
2479 
    jnz   nogb2
 2487 
    jnz   nogb2
2480 
;    mov   edx,0x160000-16
 2488 
    mov ecx, [mem_BACKGROUND]
2481 
;    cmp   edx,ebx
 2489 
    add ecx, 4095
- 
 
 2490 
    and ecx, -4096
2482 
;    jbe   nogb2
 2491 
    sub ecx, 4
2483 
;    mov   eax, [ebx+IMG_BACKGROUND]
 2492 
    cmp ebx, ecx
- 
 
 2493 
    ja  @F
- 
 
 2494 
 
2484 
    mov   eax,[img_background]
 2495 
    mov   eax,[img_background]
2485 
    mov   eax,[ebx+eax]
 2496 
    mov   eax,[ebx+eax]
Line 2486... Line 2497...
2486 
 
 2497 
 
2487 
    and   eax, 0xFFFFFF
 2498 
    and   eax, 0xFFFFFF
- 
 
 2499 
    mov   [esp+36],eax
2488 
    mov   [esp+36],eax
 2500 
@@:
2489 
    ret
 2501 
    ret
Line 2490... Line 2502...
2490 
  nogb2:
 2502 
  nogb2:
2491 
 
 2503