KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

Fixed sys_pcibios

Browse Source 
git-svn-id: svn://kolibrios.org@594 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Evgeny Grechnikov (Diamond) 2007-07-28 12:21:18 +00:00
parent 92f657f440
commit c2cb1b6183
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
$Revision$
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
@ -21,8 +22,6 @@
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
$Revision$
;*************************************************************************** ;***************************************************************************
; Function ; Function
@ -375,21 +374,21 @@ pci_emu_dat: times 30*10 db 0
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
align 4 align 4
sys_pcibios: sys_pcibios:
cmp [pci_access_enabled], 1
jne .unsupported_func
mov edi, [pci_bios_entry]
test edi, edi
jz .emulate_bios
xchg ebx, eax xchg ebx, eax
xchg ecx, eax xchg ecx, eax
xchg edx, eax xchg edx, eax
xchg esi, eax xchg esi, eax
mov edi, eax xchg edi, eax
cmp [pci_access_enabled], 1
jne .unsupported_func
cmp [pci_bios_entry], 0
jz .emulate_bios
push ds push ds
mov ax, pci_data_sel mov ax, pci_data_sel
mov ds, ax mov ds, ax
mov eax, ebp mov eax, ebp
mov ah, 0B1h
call pword [cs:pci_bios_entry] call pword [cs:pci_bios_entry]
pop ds pop ds
@ -399,85 +398,86 @@ sys_pcibios:
cmp ebp, 1 ; PCI_FUNCTION_ID cmp ebp, 1 ; PCI_FUNCTION_ID
jnz .not_PCI_BIOS_PRESENT jnz .not_PCI_BIOS_PRESENT
mov edx, 'PCI ' mov edx, 'PCI '
xor ah, ah
mov al, [OS_BASE+0x2F0000 + 0x9020] mov al, [OS_BASE+0x2F0000 + 0x9020]
mov bx, [OS_BASE+0x2F0000 + 0x9022] mov bx, [OS_BASE+0x2F0000 + 0x9022]
mov cl, [OS_BASE+0x2F0000 + 0x9021] mov cl, [OS_BASE+0x2F0000 + 0x9021]
jmp .return xor ah, ah
jmp .return_abcd
.not_PCI_BIOS_PRESENT: .not_PCI_BIOS_PRESENT:
cmp ebp, 2 ; FIND_PCI_DEVICE cmp ebp, 2 ; FIND_PCI_DEVICE
jne .not_FIND_PCI_DEVICE jne .not_FIND_PCI_DEVICE
mov esi, pci_emu_dat mov ebx, pci_emu_dat
..nxt: cmp [esi], cx ..nxt: cmp [ebx], dx
jne ..no jne ..no
cmp [esi + 2], bx cmp [ebx + 2], cx
jne ..no jne ..no
dec dx dec si
jns ..no jns ..no
mov bx, [esi + 4] mov bx, [ebx + 4]
xor ah, ah xor ah, ah
jmp .return jmp .return_ab
..no: cmp word[esi], 0 ..no: cmp word[ebx], 0
je ..dev_not_found je ..dev_not_found
add esi, 10 add ebx, 10
jmp ..nxt jmp ..nxt
..dev_not_found: ..dev_not_found:
mov ah, 0x86 ; DEVICE_NOT_FOUND mov ah, 0x86 ; DEVICE_NOT_FOUND
jmp .return jmp .return_a
.not_FIND_PCI_DEVICE: .not_FIND_PCI_DEVICE:
cmp ebp, 3 ; FIND_PCI_CLASS_CODE cmp ebp, 3 ; FIND_PCI_CLASS_CODE
jne .not_FIND_PCI_CLASS_CODE jne .not_FIND_PCI_CLASS_CODE
mov esi, pci_emu_dat mov esi, pci_emu_dat
shl ebx, 8 shl ecx, 8
..nxt2: cmp [esi], ebx ..nxt2: cmp [esi], ecx
jne ..no2 jne ..no2
mov bx, [esi] mov bx, [esi]
xor ah, ah xor ah, ah
jmp .return jmp .return_ab
..no2: cmp dword[esi], 0 ..no2: cmp dword[esi], 0
je ..dev_not_found2 je ..dev_not_found
add esi, 10 add esi, 10
jmp ..nxt2 jmp ..nxt2
..dev_not_found2:
mov ah, 0x86 ; DEVICE_NOT_FOUND
jmp .return
.not_FIND_PCI_CLASS_CODE: .not_FIND_PCI_CLASS_CODE:
cmp ebp, 8 ; READ_CONFIG_* cmp ebp, 8 ; READ_CONFIG_*
jb .not_READ_CONFIG jb .not_READ_CONFIG
cmp ebp, 0x0A cmp ebp, 0x0A
ja .not_READ_CONFIG ja .not_READ_CONFIG
mov ebx, esi mov eax, ebp
mov bh, al mov ah, bh
mov edx, ebp mov edx, edi
mov al, dl mov bh, bl
mov bl, dl
call pci_read_reg call pci_read_reg
mov ecx, eax mov ecx, eax
xor ah, ah ; SUCCESSFUL xor ah, ah ; SUCCESSFUL
jmp .return jmp .return_abc
.not_READ_CONFIG: .not_READ_CONFIG:
cmp ebp, 0x0B ; WRITE_CONFIG_* cmp ebp, 0x0B ; WRITE_CONFIG_*
jb .not_WRITE_CONFIG jb .not_WRITE_CONFIG
cmp ebp, 0x0D cmp ebp, 0x0D
ja .not_WRITE_CONFIG ja .not_WRITE_CONFIG
mov ecx, ebx lea eax, [ebp+1]
mov ebx, esi mov ah, bh
mov bh, al mov edx, edi
mov edx, ebp mov bh, bl
inc edx mov bl, dl
mov al, dl
call pci_write_reg call pci_write_reg
xor ah, ah ; SUCCESSFUL xor ah, ah ; SUCCESSFUL
jmp .return jmp .return_abc
.not_WRITE_CONFIG: .not_WRITE_CONFIG:
.unsupported_func: .unsupported_func:
mov ah, 0x81 ; FUNC_NOT_SUPPORTED mov ah, 0x81 ; FUNC_NOT_SUPPORTED
.return:mov dword[esp + 8 ], edi .return:mov dword[esp + 8 ], edi
mov dword[esp + 12], esi mov dword[esp + 12], esi
mov dword[esp + 24], ebx .return_abcd:
mov dword[esp + 28], edx mov dword[esp + 28], edx
.return_abc:
mov dword[esp + 32], ecx mov dword[esp + 32], ecx
.return_ab:
mov dword[esp + 24], ebx
.return_a:
mov dword[esp + 36], eax mov dword[esp + 36], eax
ret ret