--- np2/i386c/ia32/cpu_io.c	2004/02/20 16:09:04	1.4
+++ np2/i386c/ia32/cpu_io.c	2011/12/21 18:02:47	1.11
@@ -1,5 +1,3 @@
-/*	$Id: cpu_io.c,v 1.4 2004/02/20 16:09:04 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,13 +24,16 @@
  */
 
 #include "compiler.h"
+
 #include "cpu.h"
 #include "pccore.h"
 #include "iocore.h"
+#include "memory.h"
 
+static void CPUCALL check_io(UINT port, UINT len);
 
-static void
-check_io(UINT port, UINT len)
+static void CPUCALL
+check_io(UINT port, UINT len) 
 {
 	UINT off;
 	UINT8 bit;
@@ -63,7 +62,7 @@ check_io(UINT port, UINT len)
 	}
 }
 
-UINT8
+UINT8 IOINPCALL
 cpu_in(UINT port)
 {
 
@@ -73,7 +72,7 @@ cpu_in(UINT port)
 	return iocore_inp8(port);
 }
 
-UINT16
+UINT16 IOINPCALL
 cpu_in_w(UINT port)
 {
 
@@ -83,7 +82,7 @@ cpu_in_w(UINT port)
 	return iocore_inp16(port);
 }
 
-UINT32
+UINT32 IOINPCALL
 cpu_in_d(UINT port)
 {
 
@@ -93,7 +92,7 @@ cpu_in_d(UINT port)
 	return iocore_inp32(port);
 }
 
-void
+void IOOUTCALL
 cpu_out(UINT port, UINT8 data)
 {
 
@@ -103,7 +102,7 @@ cpu_out(UINT port, UINT8 data)
 	iocore_out8(port, data);
 }
 
-void
+void IOOUTCALL
 cpu_out_w(UINT port, UINT16 data)
 {
 
@@ -113,7 +112,7 @@ cpu_out_w(UINT port, UINT16 data)
 	iocore_out16(port, data);
 }
 
-void
+void IOOUTCALL
 cpu_out_d(UINT port, UINT32 data)
 {