--- np2/x11/ini.c	2004/07/05 14:30:39	1.13
+++ np2/x11/ini.c	2007/01/12 16:41:25	1.16
@@ -8,6 +8,7 @@
 #include "strres.h"
 
 #include "commng.h"
+#include "joymng.h"
 #include "kbdmng.h"
 #include "soundmng.h"
 
@@ -483,7 +484,7 @@ static const INITBL iniitem[] = {
 	{"hdrvroot", INIRO_STR,		np2cfg.hdrvroot,	MAX_PATH},
 	{"hdrv_acc", INIRO_UINT8,	&np2cfg.hdrvacc,	0},
 
-	{"pc_model", INITYPE_STR,	&np2cfg.model,		sizeof(np2cfg.model)},
+	{"pc_model", INITYPE_STR,	np2cfg.model,		sizeof(np2cfg.model)},
 
 	{"clk_base", INITYPE_UINT32,	&np2cfg.baseclock,	0},
 	{"clk_mult", INITYPE_UINT32,	&np2cfg.multiple,	0},
@@ -556,7 +557,10 @@ static const INITBL iniitem[] = {
 	{"keyboard", INIRO_KB,		&np2oscfg.KEYBOARD,	0},
 	{"F12_COPY", INITYPE_UINT8,	&np2oscfg.F12KEY,	0},
 	{"Joystick", INITYPE_BOOL,	&np2oscfg.JOYPAD1,	0},
-	{"Joy1_btn", INITYPE_ARGH8,	np2oscfg.JOY1BTN,	4},
+	{"Joy1_btn", INITYPE_ARGH8,	np2oscfg.JOY1BTN,	JOY_NBUTTON},
+	{"Joy1_dev", INITYPE_STR,	&np2oscfg.JOYDEV[0],	MAX_PATH},
+	{"Joy1amap", INITYPE_ARGH8,	np2oscfg.JOYAXISMAP[0],	JOY_NAXIS},
+	{"Joy1bmap", INITYPE_ARGH8,	np2oscfg.JOYBTNMAP[0],	JOY_NBUTTON},
 
 	{"confirm_", INITYPE_BOOL,	&np2oscfg.confirm,	0},
 
@@ -602,10 +606,6 @@ static const INITBL iniitem[] = {
 	{"MIDIIN_d", INITYPE_STR,	&np2oscfg.MIDIDEV[1],	MAX_PATH},
 	{"MIDIWAIT", INITYPE_UINT32,	&np2oscfg.MIDIWAIT,	0},
 
-	{"sharepix", INIRO_BOOL,	&np2oscfg.shared_pixmap,0},
-
-	{"toolkit_", INIRO_STR,		&np2oscfg.toolkit,	sizeof(np2oscfg.toolkit)},
-
 	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0}
 };
 #define	INIITEMS	(sizeof(iniitem) / sizeof(iniitem[0]))