--- np2/i386c/ia32/cpu_io.h	2003/12/08 00:55:31	1.1
+++ np2/i386c/ia32/cpu_io.h	2011/12/21 18:02:47	1.5
@@ -1,5 +1,3 @@
-/*	$Id: cpu_io.h,v 1.1 2003/12/08 00:55:31 yui 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
@@ -30,16 +26,18 @@
 #ifndef	IA32_CPU_CPU_IO_H__
 #define	IA32_CPU_CPU_IO_H__
 
+#include "interface.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-BYTE cpu_in(WORD port);
-WORD cpu_in_w(WORD port);
-DWORD cpu_in_d(WORD port);
-void cpu_out(WORD port, BYTE val);
-void cpu_out_w(WORD port, WORD val);
-void cpu_out_d(WORD port, DWORD val);
+UINT8 IOINPCALL cpu_in(UINT port);
+UINT16 IOINPCALL cpu_in_w(UINT port);
+UINT32 IOINPCALL cpu_in_d(UINT port);
+void IOOUTCALL cpu_out(UINT port, UINT8 val);
+void IOOUTCALL cpu_out_w(UINT port, UINT16 val);
+void IOOUTCALL cpu_out_d(UINT port, UINT32 val);
 
 #ifdef __cplusplus
 }