Rev 914 | Rev 996 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 914 | Rev 928 | ||
---|---|---|---|
Line 13... | Line 13... | ||
13 | ;; ;; |
13 | ;; ;; |
14 | ;; See file COPYING for details ;; |
14 | ;; See file COPYING for details ;; |
15 | ;; ;; |
15 | ;; ;; |
16 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
16 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
Line 17... | Line 17... | ||
17 | 17 | ||
Line 18... | Line 18... | ||
18 | $Revision: 914 $ |
18 | $Revision: 928 $ |
19 | 19 | ||
20 | 20 | ||
Line 61... | Line 61... | ||
61 | 61 | ||
62 | if TRIDENT |
62 | if TRIDENT |
63 | set_bank: |
63 | set_bank: |
64 | pushfd |
64 | pushfd |
65 | cli |
65 | cli |
66 | cmp al,[BANK_RW] |
66 | cmp al, byte [bank_rw] |
Line 67... | Line 67... | ||
67 | je .retsb |
67 | je .retsb |
68 | 68 | ||
69 | mov [BANK_RW],al |
69 | mov byte [bank_rw],al |
70 | push dx |
70 | push dx |
71 | mov dx,3D8h |
71 | mov dx,3D8h |
72 | out dx,al |
72 | out dx,al |
Line 82... | Line 82... | ||
82 | 82 | ||
83 | if S3_VIDEO |
83 | if S3_VIDEO |
84 | set_bank: |
84 | set_bank: |
85 | pushfd |
85 | pushfd |
86 | cli |
86 | cli |
87 | cmp al,[BANK_RW] |
87 | cmp al, byte [bank_rw] |
Line 88... | Line 88... | ||
88 | je .retsb |
88 | je .retsb |
89 | 89 | ||
90 | mov [BANK_RW],al |
90 | mov byte [bank_rw],al |
91 | push ax |
91 | push ax |
92 | push dx |
92 | push dx |
93 | push cx |
93 | push cx |
Line 170... | Line 170... | ||
170 | 170 | ||
171 | set_bank: |
171 | set_bank: |
172 | pushfd |
172 | pushfd |
Line 173... | Line 173... | ||
173 | cli |
173 | cli |
174 | 174 | ||
Line 175... | Line 175... | ||
175 | cmp al,[BANK_RW] |
175 | cmp al, byte [bank_rw] |
176 | je .retsb |
176 | je .retsb |
177 | 177 | ||
178 | mov [BANK_RW],al |
178 | mov byte [bank_rw],al |
179 | push ax |
179 | push ax |
180 | push dx |
180 | push dx |
Line 204... | Line 204... | ||
204 | else |
204 | else |
205 | set_bank: |
205 | set_bank: |
206 | pushfd |
206 | pushfd |
207 | cli |
207 | cli |
Line 208... | Line 208... | ||
208 | 208 | ||
209 | cmp al,[BANK_RW] |
209 | cmp al, byte [bank_rw] |
Line 210... | Line 210... | ||
210 | je .retsb |
210 | je .retsb |
211 | 211 | ||
212 | mov [BANK_RW],al |
212 | mov byte [bank_rw],al |
213 | push ax |
213 | push ax |
214 | push dx |
214 | push dx |
215 | mov ah,al |
215 | mov ah,al |
Line 334... | Line 334... | ||
334 | mov eax,[BytesPerScanLine] |
334 | mov eax,[BytesPerScanLine] |
335 | mov ebx,edi |
335 | mov ebx,edi |
336 | mul ebx |
336 | mul ebx |
337 | add eax, esi |
337 | add eax, esi |
338 | lea eax, [VGABasePtr+eax+esi*2] |
338 | lea eax, [VGABasePtr+eax+esi*2] |
339 | cmp [ScreenBPP],byte 24 |
339 | cmp byte [ScreenBPP], 24 |
340 | jz v12bgl3 |
340 | jz v12bgl3 |
341 | add eax,esi |
341 | add eax,esi |
Line 342... | Line 342... | ||
342 | 342 | ||
Line 408... | Line 408... | ||
408 | mul ebx |
408 | mul ebx |
409 | pop ecx |
409 | pop ecx |
410 | add eax,ecx ; x |
410 | add eax,ecx ; x |
411 | add eax,ecx |
411 | add eax,ecx |
412 | add eax,ecx |
412 | add eax,ecx |
413 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? - x start |
413 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? - x start |
414 | jz dbpi2412 |
414 | jz dbpi2412 |
415 | add eax,ecx |
415 | add eax,ecx |
Line 416... | Line 416... | ||
416 | 416 | ||
Line 423... | Line 423... | ||
423 | 423 | ||
424 | mov eax,[esp+4] ; [esp+6] |
424 | mov eax,[esp+4] ; [esp+6] |
425 | mov ecx,eax |
425 | mov ecx,eax |
426 | add ecx,eax |
426 | add ecx,eax |
427 | add ecx,eax |
427 | add ecx,eax |
428 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? - x size |
428 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? - x size |
429 | jz dbpi24312 |
429 | jz dbpi24312 |
Line 430... | Line 430... | ||
430 | add ecx,eax |
430 | add ecx,eax |
Line 461... | Line 461... | ||
461 | pop eax |
461 | pop eax |
462 | push dword 1 |
462 | push dword 1 |
Line 463... | Line 463... | ||
463 | 463 | ||
Line 464... | Line 464... | ||
464 | dbcblimitlno12: |
464 | dbcblimitlno12: |
465 | 465 | ||
466 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? |
466 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? |
Line 467... | Line 467... | ||
467 | jz dbpi24bit12 |
467 | jz dbpi24bit12 |
Line 774... | Line 774... | ||
774 | mul dword [BytesPerScanLine] |
774 | mul dword [BytesPerScanLine] |
775 | pop ecx |
775 | pop ecx |
776 | add eax,ecx ; x |
776 | add eax,ecx ; x |
777 | add eax,ecx |
777 | add eax,ecx |
778 | add eax,ecx |
778 | add eax,ecx |
779 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? - x start |
779 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? - x start |
780 | jz pi2412 |
780 | jz pi2412 |
781 | add eax,ecx |
781 | add eax,ecx |
Line 782... | Line 782... | ||
782 | 782 | ||
Line 815... | Line 815... | ||
815 | pop ecx |
815 | pop ecx |
816 | push 1 |
816 | push 1 |
Line 817... | Line 817... | ||
817 | 817 | ||
Line 818... | Line 818... | ||
818 | dbcblimitlno212: |
818 | dbcblimitlno212: |
819 | 819 | ||
Line 820... | Line 820... | ||
820 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? |
820 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? |
Line 821... | Line 821... | ||
821 | jnz pi32bit12 |
821 | jnz pi32bit12 |
Line 972... | Line 972... | ||
972 | 972 | ||
Line 973... | Line 973... | ||
973 | 973 | ||
974 | vesa12_read_screen_pixel: |
974 | vesa12_read_screen_pixel: |
975 | 975 | ||
976 | and eax,0x3FFFFF |
976 | and eax,0x3FFFFF |
977 | cmp [ScreenBPP],byte 24 ; 24 or 32 bpp ? |
977 | cmp byte [ScreenBPP], 24 ; 24 or 32 bpp ? |
978 | jz v12rsp24 |
978 | jz v12rsp24 |
979 | mov edi,eax |
979 | mov edi,eax |