XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

fix mapped io address

Browse Source 
git-svn-id: svn://kolibrios.org@798 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2008-05-06 08:53:46 +00:00
parent bb6bf261e7
commit 8322617480
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/trunk/drivers/ati2d.asm
View File

@ -62,14 +62,16 @@ virtual at 0
CURSOR CURSOR CURSOR CURSOR
end virtual end virtual
CURSOR_SIZE equ 32 CURSOR_SIZE equ 32
OS_BASE equ 0x80000000 OS_BASE equ 0x80000000
SLOT_BASE equ (OS_BASE+0x0080000) SLOT_BASE equ (OS_BASE+0x0080000)
LFB_BASE equ 0xFE000000 LFB_BASE equ 0xFE000000
PG_SW equ 0x003 PG_SW equ 0x003
PG_NOCACHE equ 0x018 PG_NOCACHE equ 0x018
PCI_MEMORY_MASK equ 0xfffffff0
struc IOCTL struc IOCTL
{ .handle dd ? { .handle dd ?
@ -403,6 +405,7 @@ endp
align 4 align 4
proc init_r200 proc init_r200
stdcall PciRead32, [bus], [devfn], dword 0x18 stdcall PciRead32, [bus], [devfn], dword 0x18
and eax, PCI_MEMORY_MASK
stdcall MapIoMem,eax,0x10000,(PG_SW+PG_NOCACHE) stdcall MapIoMem,eax,0x10000,(PG_SW+PG_NOCACHE)
test eax, eax test eax, eax
jz .fail jz .fail
@ -443,6 +446,7 @@ align 4
proc init_r500 proc init_r500
stdcall PciRead32, [bus], [devfn], dword 0x18 stdcall PciRead32, [bus], [devfn], dword 0x18
and eax, PCI_MEMORY_MASK
stdcall MapIoMem,eax,0x10000,(PG_SW+PG_NOCACHE) stdcall MapIoMem,eax,0x10000,(PG_SW+PG_NOCACHE)
test eax, eax test eax, eax
jz .fail jz .fail
@ -505,20 +509,6 @@ proc r500_SetCursor stdcall, hcursor:dword, x:dword, y:dword
mov [edi+0x6414], eax mov [edi+0x6414], eax
or dword [edi+0x6400], 1 or dword [edi+0x6400], 1
if 0
stdcall R5xxSetupForSolidFill, 0x80808080, 3, 0xFFFFFFFF
stdcall R5xxSolidFillRect, 100,100, 100,100
stdcall R5xxSetupForSolidFill, 0xFFFF0000, 3, 0xFFFFFFFF
stdcall R5xxSolidFillRect, 110,110, 80,80
stdcall R5xxSetupForSolidFill, 0xFF00FF00, 3, 0xFFFFFFFF
stdcall R5xxSolidFillRect, 120,120, 60,60
stdcall R5xxSetupForSolidFill, 0xFF0000FF, 3, 0xFFFFFFFF
stdcall R5xxSolidFillRect, 130,130, 40,40
end if
popfd popfd
ret ret
endp endp