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

declare mmio_pci_addr in a proper place

Browse Source 
git-svn-id: svn://kolibrios.org@1370 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Artem Jerdev (art_zh) 2010-01-08 14:45:53 +00:00
parent abfe37adc4
commit 50e7940872
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,8 @@ $Revision$
; Description ; Description
; entry point for system PCI calls ; entry point for system PCI calls
;*************************************************************************** ;***************************************************************************
;mmio_pci_addr equ 0x400 ; set actual PCI address here to activate user-MMIO
align 4 align 4
@ -75,7 +77,7 @@ pci_fn_3:
jz pci_write_reg ;dword jz pci_write_reg ;dword
if defined mmio_pci_addr if defined mmio_pci_addr
cmp al,11 ; <<< user-level MMIO functions <<< NEW! cmp al,11 ; user-level MMIO functions
jz pci_mmio_init jz pci_mmio_init
cmp al,12 cmp al,12
jz pci_mmio_map jz pci_mmio_map
@ -375,10 +377,10 @@ pci_write_reg_err:
dec eax dec eax
ret ret
if defined mmio_pci_addr if defined mmio_pci_addr ; must be set above
;*************************************************************************** ;***************************************************************************
; Function ; Function
; pci_mmio_init ; NEW! ; pci_mmio_init
; ;
; Description ; Description
; IN: bx = device's PCI bus address (bbbbbbbbdddddfff) ; IN: bx = device's PCI bus address (bbbbbbbbdddddfff)
@ -389,7 +391,7 @@ if defined mmio_pci_addr
; eax = -3 : user heap initialization failure ; eax = -3 : user heap initialization failure
;*************************************************************************** ;***************************************************************************
pci_mmio_init: pci_mmio_init:
cmp bx, mmio_pci_addr ; must be set in kernel/data32.inc cmp bx, mmio_pci_addr
jz @f jz @f
mov eax,-2 mov eax,-2
ret ret
@ -405,7 +407,7 @@ pci_mmio_init:
;*************************************************************************** ;***************************************************************************
; Function ; Function
; pci_mmio_map ; NEW! ; pci_mmio_map
; ;
; Description ; Description
; maps a block of PCI memory to user-accessible linear address ; maps a block of PCI memory to user-accessible linear address
@ -491,7 +493,7 @@ mmio_map_over:
;*************************************************************************** ;***************************************************************************
; Function ; Function
; pci_mmio_unmap_page ; NEW! ; pci_mmio_unmap_page
; ;
; Description ; Description
; unmaps the linear space previously tied to a PCI memory block ; unmaps the linear space previously tied to a PCI memory block

2
kernel/trunk/data32.inc
View File

@ -46,8 +46,6 @@ keymap_alt:
db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
;mmio_pci_addr equ -1 ; set actual PCI address here to activate user-MMIO
boot_memdetect db 'Determining amount of memory',0 boot_memdetect db 'Determining amount of memory',0
boot_fonts db 'Fonts loaded',0 boot_fonts db 'Fonts loaded',0