Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

r4599

Browse Source 
git-svn-id: svn://kolibrios.org@4599 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2014-02-27 18:31:15 +00:00
parent 42f5c5294a
commit 8efb57fc9b
1 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
kernel/trunk/bus/pci/pci32.inc
View File

@ -165,10 +165,7 @@ pci_read_reg:
call pci_make_config_cmd call pci_make_config_cmd
mov ebx, eax mov ebx, eax
; get current state
mov dx, 0xcf8 mov dx, 0xcf8
in eax, dx
push eax
; set up addressing to config data ; set up addressing to config data
mov eax, ebx mov eax, ebx
and al, 0xfc; make address dword-aligned and al, 0xfc; make address dword-aligned
@ -194,14 +191,7 @@ pci_read_word1:
jmp pci_fin_read1 jmp pci_fin_read1
pci_read_dword1: pci_read_dword1:
in eax, dx in eax, dx
jmp pci_fin_read1
pci_fin_read1: pci_fin_read1:
; restore configuration control
xchg eax, [esp]
mov dx, 0xcf8
out dx, eax
pop eax
pop esi ebx pop esi ebx
ret ret
pci_read_reg_2: pci_read_reg_2:
@ -212,15 +202,8 @@ pci_read_reg_2:
mov esi, eax ; save register size into ESI mov esi, eax ; save register size into ESI
and esi, 3 and esi, 3
push eax mov dx, 0xcfa
;store current state of config space
mov dx, 0xcf8
in al, dx
mov ah, al
mov dl, 0xfa
in al, dx
xchg eax, [esp]
; out 0xcfa,bus ; out 0xcfa,bus
mov al, ah mov al, ah
out dx, al out dx, al
@ -249,18 +232,8 @@ pci_read_word2:
jmp pci_fin_read2 jmp pci_fin_read2
pci_read_dword2: pci_read_dword2:
in eax, dx in eax, dx
; jmp pci_fin_read2
pci_fin_read2: pci_fin_read2:
; restore configuration space
xchg eax, [esp]
mov dx, 0xcfa
out dx, al
mov dl, 0xf8
mov al, ah
out dx, al
pop eax
pop esi ebx pop esi ebx
ret ret
@ -296,10 +269,7 @@ pci_write_reg:
call pci_make_config_cmd call pci_make_config_cmd
mov ebx, eax mov ebx, eax
; get current state into ecx
mov dx, 0xcf8 mov dx, 0xcf8
in eax, dx
push eax
; set up addressing to config data ; set up addressing to config data
mov eax, ebx mov eax, ebx
and al, 0xfc; make address dword-aligned and al, 0xfc; make address dword-aligned
@ -326,14 +296,8 @@ pci_write_word1:
jmp pci_fin_write1 jmp pci_fin_write1
pci_write_dword1: pci_write_dword1:
out dx, eax out dx, eax
jmp pci_fin_write1
pci_fin_write1: pci_fin_write1:
; restore configuration control
pop eax
mov dl, 0xf8
out dx, eax
xor eax, eax xor eax, eax
pop ebx esi pop ebx esi
@ -347,14 +311,7 @@ pci_write_reg_2:
mov esi, eax ; save register size into ESI mov esi, eax ; save register size into ESI
and esi, 3 and esi, 3
push eax mov dx, 0xcfa
;store current state of config space
mov dx, 0xcf8
in al, dx
mov ah, al
mov dl, 0xfa
in al, dx
xchg eax, [esp]
; out 0xcfa,bus ; out 0xcfa,bus
mov al, ah mov al, ah
out dx, al out dx, al
@ -385,15 +342,7 @@ pci_write_word2:
jmp pci_fin_write2 jmp pci_fin_write2
pci_write_dword2: pci_write_dword2:
out dx, eax out dx, eax
jmp pci_fin_write2
pci_fin_write2: pci_fin_write2:
; restore configuration space
pop eax
mov dx, 0xcfa
out dx, al
mov dl, 0xf8
mov al, ah
out dx, al
xor eax, eax xor eax, eax
pop ebx esi pop ebx esi