From 5cf2d8f9a0028499356ef25fd07eda794b85edc3 Mon Sep 17 00:00:00 2001
From: root <root@bt.foo.org>
Date: Mon, 20 Jun 2011 18:48:09 +0200
Subject: [PATCH] ...

---
 drivers/net/mmnif.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c
index 2171c480..2af1ee38 100644
--- a/drivers/net/mmnif.c
+++ b/drivers/net/mmnif.c
@@ -55,6 +55,8 @@ extern HANDLE hProc;
 #include <asm/iRCCE.h>
 #include <asm/iRCCE_lib.h>
 
+#include <asm/SCC_API.h>
+
 
 #endif
 
@@ -231,7 +233,7 @@ __inline int get_my_core_no(void)
   /* Determine the local IP address from the core number in the 
    * tile ID register 
    */
-  tmp = inportl((void*)(local_crb + RCK_TILEID));
+  tmp = ReadConfigReg(local_crb + RCK_TILEID));
   x = (tmp>>3) & 0x0f; /* bits 06:03 */
   y = (tmp>>7) & 0x0f; /* bits 10:07 */
   z = (tmp   ) & 0x07; /* bits 02:00 */
@@ -413,22 +415,22 @@ __inline int mmnif_trigger_irq(dest_ip)
 	else		   irq_address += RCK_GLCFG1;
 
 	/**/
-	value = inportl((void*)irq_address);
+	value = ReadConfigReg((void*)irq_address);
 
 	if ((!pulse_irq) && (value & RCK_INTR_MASK))
 	{
 		value &= (~(RCK_INTR_MASK|RCK_NMI_MASK));
-		outportl((void*)irq_address,value);
+		WriteConfigReg((void*)irq_address,value);
 	}
 
 	value |= RCK_INTR_MASK;
-	outportl((void*) irq_address,value);
+	WriteConfigReg((void*) irq_address,value);
 
 	/**/
 	if (pulse_irq)
 	{
 		value &= (~(RCK_INTR_MASK|RCK_NMI_MASK));
-		outportl((void*)irq_address,value);
+		ReadConfigReg((void*)irq_address,value);
 	}
 
 #endif
@@ -1175,7 +1177,6 @@ int mmnif_open()
 	 * Note: core 1 is the router core
 	 */
 	IP4_ADDR(&gw, 0,0,0,0);
-	DEBUGPRINTF("BBBBBBBB INIT BBBBBBB");
 	IP4_ADDR(&ipaddr, 192,168,0,get_my_core_no() +1);
 	IP4_ADDR(&netmask, 255,0,0,0);