From 50e7940872a2ad304036a2b7aa421ae004ab1775 Mon Sep 17 00:00:00 2001
From: "Artem Jerdev (art_zh)" <artem@jerdev.co.uk>
Date: Fri, 8 Jan 2010 14:45:53 +0000
Subject: [PATCH] declare mmio_pci_addr in a proper place

git-svn-id: svn://kolibrios.org@1370 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/bus/pci/pci32.inc | 14 ++++++++------
 kernel/trunk/data32.inc        |  2 --
 2 files changed, 8 insertions(+), 8 deletions(-)

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