--- np2/x11/np2.c	2004/02/18 06:52:34	1.13
+++ np2/x11/np2.c	2004/06/17 14:36:33	1.19
@@ -37,6 +37,8 @@
 #include "kdispwin.h"
 #include "toolwin.h"
 #include "viewer.h"
+#include "debugwin.h"
+#include "skbdwin.h"
 
 #include "commng.h"
 #include "joymng.h"
@@ -72,6 +74,11 @@ NP2OSCFG np2oscfg = {
 	{ 0, 0, 0, 0 },		/* JOY1BTN */
 
 	{ COMPORT_MIDI, 0, 0x3e, 19200, "", "", "", "" },	/* mpu */
+	{
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com1 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com2 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com3 */
+	},
 
 	0,			/* confirm */
 
@@ -80,6 +87,7 @@ NP2OSCFG np2oscfg = {
 	0,			/* statsave */
 	0,			/* toolwin */
 	0,			/* keydisp */
+	0,			/* softkbd */
 	0,			/* hostdrv_write */
 	0,			/* jastsnd */
 	0,			/* I286SAVE */
@@ -273,6 +281,8 @@ framereset(UINT cnt)
 	framecnt = 0;
 	scrnmng_dispclock();
 	kdispwin_draw((BYTE)cnt);
+	skbdwin_process();
+	debugwin_process();
 	toolwin_draw((BYTE)cnt);
 	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
@@ -361,7 +371,7 @@ mainloop(void *p)
 	return TRUE;
 }
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 int mmxflag;
 
 int
@@ -392,4 +402,4 @@ havemmx(void)
 
 	return rv;
 }
-#endif
+#endif /* GCC_CPU_ARCH_IA32 */