--- np2/macosx/np2.h	2003/10/28 16:44:44	1.6
+++ np2/macosx/np2.h	2004/04/18 16:42:28	1.17
@@ -1,18 +1,44 @@
 
 typedef struct {
+	BYTE	port;
+	BYTE	def_en;
+	BYTE	param;
+	UINT32	speed;
+	char	mout[MAX_PATH];
+	char	min[MAX_PATH];
+	char	mdl[64];
+	char	def[MAX_PATH];
+} COMCFG;
+
+typedef struct {
+	char	titles[256];
+	
+	int		winx;
+	int		winy;
 	BYTE	NOWAIT;
 	BYTE	DRAW_SKIP;
 	BYTE	DISPCLK;
-	BYTE	F12COPY;
+	BYTE	F11KEY;
+	BYTE	F12KEY;
     
 	BYTE	MOUSE_SW;
 	BYTE	JOYPAD1;
     
+	COMCFG	mpu;
+
 	BYTE	comfirm;
 	BYTE	resume;
-	//BYTE	statsave;
     
+	BYTE	toolwin;
+#if defined(SUPPORT_KEYDISP)
+	BYTE	keydisp;
+#endif
+#if defined(SUPPORT_SOFTKBD)
+	BYTE	softkey;
+#endif
+	BYTE	jastsnd;
 	BYTE	I286SAVE;
+	
 } NP2OSCFG;
 
 
@@ -28,5 +54,4 @@ enum {
 extern	WindowPtr	hWndMain;
 extern	BOOL		np2running;
 extern	NP2OSCFG	np2oscfg;
-
-void toggleMenubar(void);
\ No newline at end of file
+extern	BYTE		scrnmode;