--- np2/x11/ini.c	2004/01/13 16:28:18	1.7
+++ np2/x11/ini.c	2004/05/22 16:35:08	1.11
@@ -7,6 +7,7 @@
 #include "profile.h"
 #include "strres.h"
 
+#include "commng.h"
 #include "kbdmng.h"
 #include "soundmng.h"
 
@@ -429,6 +430,7 @@ static const char ini_title[] = "NekoPro
 enum {
 	INIRO_STR	= INIFLAG_RO | INITYPE_STR,
 	INIRO_BOOL	= INIFLAG_RO | INITYPE_BOOL,
+	INIRO_UINT8	= INIFLAG_RO | INITYPE_UINT8,
 	INIMAX_UINT8	= INIFLAG_MAX | INITYPE_UINT8,
 	INIAND_UINT8	= INIFLAG_AND | INITYPE_UINT8,
 	INIROMAX_SINT32	= INIFLAG_RO | INIFLAG_MAX | INITYPE_SINT32,
@@ -448,6 +450,8 @@ static const INITBL iniitem[] = {
 	{"bmap_Dir", INITYPE_STR,	bmpfilefolder,		MAX_PATH},
 	{"fontfile", INITYPE_STR,	np2cfg.fontfile,	MAX_PATH},
 	{"biospath", INITYPE_STR,	np2cfg.biospath,	MAX_PATH},
+	{"hdrvroot", INIRO_STR,		np2cfg.hdrvroot,	MAX_PATH},
+	{"hdrv_acc", INIRO_UINT8,	&np2cfg.hdrvacc,	0},
 
 	{"pc_model", INITYPE_STR,	&np2cfg.model,		sizeof(np2cfg.model)},
 
@@ -459,8 +463,8 @@ static const INITBL iniitem[] = {
 	{"ExMemory", INIMAX_UINT8,	&np2cfg.EXTMEM,		13},
 	{"ITF_WORK", INIRO_BOOL,	&np2cfg.ITF_WORK,	0},
 
-	{"HDD1FILE", INITYPE_STR,	np2cfg.hddfile[0],	MAX_PATH},
-	{"HDD2FILE", INITYPE_STR,	np2cfg.hddfile[1],	MAX_PATH},
+	{"HDD1FILE", INITYPE_STR,	np2cfg.sasihdd[0],	MAX_PATH},
+	{"HDD2FILE", INITYPE_STR,	np2cfg.sasihdd[1],	MAX_PATH},
 
 	{"SampleHz", INITYPE_UINT16,	&np2cfg.samplingrate,	0},
 	{"Latencys", INITYPE_UINT16,	&np2cfg.delayms,	0},
@@ -527,9 +531,30 @@ static const INITBL iniitem[] = {
 	{"mpu98mdl", INITYPE_STR,	np2oscfg.mpu.mdl,	64},
 	{"mpu98def", INITYPE_STR,	np2oscfg.mpu.def,	MAX_PATH},
 
+	{"com1port", INIMAX_UINT8,	&np2oscfg.com[0].port,	COMPORT_MIDI},
+	{"com1para", INITYPE_UINT8,	&np2oscfg.com[0].param,	0},
+	{"com1_bps", INITYPE_UINT32,	&np2oscfg.com[0].speed,	0},
+	{"com1mmap", INITYPE_STR,	np2oscfg.com[0].mout,	MAX_PATH},
+	{"com1mmdl", INITYPE_STR,	np2oscfg.com[0].mdl,	64},
+	{"com1mdef", INITYPE_STR,	np2oscfg.com[0].def,	MAX_PATH},
+
+	{"com2port", INIMAX_UINT8,	&np2oscfg.com[1].port,	COMPORT_MIDI},
+	{"com2para", INITYPE_UINT8,	&np2oscfg.com[1].param,	0},
+	{"com2_bps", INITYPE_UINT32,	&np2oscfg.com[1].speed,	0},
+	{"com2mmap", INITYPE_STR,	np2oscfg.com[1].mout,	MAX_PATH},
+	{"com2mmdl", INITYPE_STR,	np2oscfg.com[1].mdl,	64},
+	{"com2mdef", INITYPE_STR,	np2oscfg.com[1].def,	MAX_PATH},
+
+	{"com3port", INIMAX_UINT8,	&np2oscfg.com[2].port,	COMPORT_MIDI},
+	{"com3para", INITYPE_UINT8,	&np2oscfg.com[2].param,	0},
+	{"com3_bps", INITYPE_UINT32,	&np2oscfg.com[2].speed,	0},
+	{"com3mmap", INITYPE_STR,	np2oscfg.com[2].mout,	MAX_PATH},
+	{"com3mmdl", INITYPE_STR,	np2oscfg.com[2].mdl,	64},
+	{"com3mdef", INITYPE_STR,	np2oscfg.com[2].def,	MAX_PATH},
+
 	{"e_resume", INITYPE_BOOL,	&np2oscfg.resume,	0},
 	{"STATSAVE", INIRO_BOOL,	&np2oscfg.statsave,	0},
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	{"nousemmx", INITYPE_BOOL,	&np2oscfg.disablemmx,	0},
 #endif
 	{"toolwind", INITYPE_BOOL,	&np2oscfg.toolwin,	0},