--- np2/i386c/ia32/interface.h 2004/03/25 10:41:13 1.14 +++ np2/i386c/ia32/interface.h 2005/03/12 12:32:54 1.17 @@ -1,4 +1,4 @@ -/* $Id: interface.h,v 1.14 2004/03/25 10:41:13 yui Exp $ */ +/* $Id: interface.h,v 1.17 2005/03/12 12:32:54 monaka Exp $ */ /* * Copyright (c) 2002-2003 NONAKA Kimihiro @@ -12,8 +12,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 @@ -41,7 +39,7 @@ #define CPU_isEI (CPU_FLAG & I_FLAG) #define CPU_isDI (!CPU_isEI) -#define CPU_A20EN(en) CPU_ADRSMASK = (en)?0xffffffff:0x00ffffff; +#define CPU_A20EN(en) CPU_ADRSMASK = (en)?0xffffffff:0x000fffff; #define CPU_INITIALIZE() i386c_initialize() #define CPU_DEINITIALIZE() @@ -52,7 +50,7 @@ #define CPU_EXECV30() ia32() #define CPU_SHUT() ia32shut() #define CPU_SETEXTSIZE(size) ia32_setextsize((UINT32)(size) << 20) -#define CPU_SETEMM(frame, addr) +#define CPU_SETEMM(frame, addr) ia32_setemm(frame, addr) #define cpu_memorywrite(a,v) i286_memorywrite(a,v) #define cpu_memorywrite_b(a,v) i286_memorywrite(a,v)