From 3f03a80e3e792f6429d0d450d9e71edfbe57c9bd Mon Sep 17 00:00:00 2001 From: "Alexey Teplov (" Date: Mon, 11 Jan 2010 17:11:43 +0000 Subject: [PATCH] some little changes git-svn-id: svn://kolibrios.org@1375 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/bus/pci/pci32.inc | 24 ++++++++++-------------- kernel/trunk/core/syscall.inc | 4 ++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/kernel/trunk/bus/pci/pci32.inc b/kernel/trunk/bus/pci/pci32.inc index 3594a7df4b..718b94f142 100644 --- a/kernel/trunk/bus/pci/pci32.inc +++ b/kernel/trunk/bus/pci/pci32.inc @@ -87,7 +87,7 @@ end if no_pci_access_for_applications: - mov eax,-1 + or eax,-1 ret @@ -513,18 +513,14 @@ pci_mmio_unmap: end if ;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - +uglobal +align 4 ; VendID (2), DevID (2), Revision = 0 (1), Class Code (3), FNum (1), Bus (1) pci_emu_dat: times 30*10 db 0 - +endg ;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= align 4 sys_pcibios: - xchg ebx, eax - xchg ecx, eax - xchg edx, eax - xchg esi, eax - xchg edi, eax cmp [pci_access_enabled], 1 jne .unsupported_func cmp [pci_bios_entry], 0 @@ -616,14 +612,14 @@ sys_pcibios: .not_WRITE_CONFIG: .unsupported_func: mov ah, 0x81 ; FUNC_NOT_SUPPORTED -.return:mov dword[esp + 8 ], edi - mov dword[esp + 12], esi +.return:mov dword[esp + 4 ], edi + mov dword[esp + 8], esi .return_abcd: - mov dword[esp + 28], edx + mov dword[esp + 24], edx .return_abc: - mov dword[esp + 32], ecx + mov dword[esp + 28], ecx .return_ab: - mov dword[esp + 24], ebx + mov dword[esp + 20], ebx .return_a: - mov dword[esp + 36], eax + mov dword[esp + 32], eax ret diff --git a/kernel/trunk/core/syscall.inc b/kernel/trunk/core/syscall.inc index b350817a8c..6dbe1184d7 100644 --- a/kernel/trunk/core/syscall.inc +++ b/kernel/trunk/core/syscall.inc @@ -159,7 +159,7 @@ iglobal dd 0 dd sound_interface ; 55-Sound interface dd 0 - dd sys_pcibios ; 57-PCI BIOS32 + dd 0 dd file_system ; 58-Common file system interface dd 0 dd sys_IPC ; 60-Inter Process Communication @@ -237,7 +237,7 @@ iglobal dd undefined_syscall ; 54-reserved dd cross_order ; 55-Sound interface dd undefined_syscall ; 56-reserved - dd cross_order ; 57-PCI BIOS32 + dd sys_pcibios ; 57-PCI BIOS32 dd cross_order ; 58-Common file system interface dd undefined_syscall ; 59-reserved dd cross_order ; 60-Inter Process Communication