--- np2/win9x/ini.cpp	2003/11/14 07:37:29	1.13
+++ np2/win9x/ini.cpp	2004/02/13 08:33:48	1.24
@@ -2,6 +2,7 @@
 #include	<windowsx.h>
 #include	<io.h>
 #include	"strres.h"
+#include	"profile.h"
 #include	"np2.h"
 #include	"np2arg.h"
 #include	"dosio.h"
@@ -179,7 +180,7 @@ const INITBL	*pterm;
 			case INITYPE_UINT8:
 				val = (BYTE)GetPrivateProfileInt(title, p->item,
 												*(BYTE *)p->value, path);
-				*(BYTE *)p->value = (BYTE)val;
+				*(UINT8 *)p->value = (UINT8)val;
 				break;
 
 			case INITYPE_SINT16:
@@ -201,7 +202,7 @@ const INITBL	*pterm;
 				GetPrivateProfileString(title, p->item, work,
 												work, sizeof(work), path);
 				val = (BYTE)milstr_solveHEX(work);
-				*(BYTE *)p->value = (BYTE)val;
+				*(UINT8 *)p->value = (UINT8)val;
 				break;
 
 			case INITYPE_HEX16:
@@ -226,6 +227,13 @@ const INITBL	*pterm;
 				inirdbyte3(work, p);
 				break;
 
+			case INITYPE_USERKEY:
+				GetPrivateProfileString(title, p->item, str_null,
+												work, sizeof(work), path);
+				((NKEYM)p->value)->keys = (UINT8)profile_setkeys(work,
+												((NKEYM)p->value)->key, 15);
+				break;
+
 			case INITYPE_KB:
 				GetPrivateProfileString(title, p->item, str_null,
 												work, sizeof(work), path);
@@ -264,7 +272,7 @@ const char		*set;
 					break;
 
 				case INITYPE_SINT8:
-					SPRINTF(work, str_d, *((char *)p->value));
+					SPRINTF(work, str_d, *((SINT8 *)p->value));
 					break;
 
 				case INITYPE_SINT16:
@@ -276,7 +284,7 @@ const char		*set;
 					break;
 
 				case INITYPE_UINT8:
-					SPRINTF(work, str_u, *((BYTE *)p->value));
+					SPRINTF(work, str_u, *((UINT8 *)p->value));
 					break;
 
 				case INITYPE_UINT16:
@@ -288,7 +296,7 @@ const char		*set;
 					break;
 
 				case INITYPE_HEX8:
-					SPRINTF(work, str_x, *((BYTE *)p->value));
+					SPRINTF(work, str_x, *((UINT8 *)p->value));
 					break;
 
 				case INITYPE_HEX16:
@@ -299,6 +307,11 @@ const char		*set;
 					SPRINTF(work, str_x, *((UINT32 *)p->value));
 					break;
 
+				case INITYPE_USERKEY:
+					profile_getkeys(work, sizeof(work),
+							((NKEYM)p->value)->key, ((NKEYM)p->value)->keys);
+					break;
+
 				default:
 					set = NULL;
 					break;
@@ -319,6 +332,7 @@ static const char ini_title[] = "NekoPro
 enum {
 	INIRO_STR			= INITYPE_STR + INIFLAG_RO,
 	INIRO_BOOL			= INITYPE_BOOL + INIFLAG_RO,
+	INIRO_UINT8			= INITYPE_UINT8 + INIFLAG_RO,
 	INIMAX_UINT8		= INITYPE_UINT8 + INIFLAG_MAX,
 	INIAND_UINT8		= INITYPE_UINT8 + INIFLAG_AND,
 	INIROMAX_SINT32		= INITYPE_SINT32 + INIFLAG_RO + INIFLAG_MAX,
@@ -342,19 +356,28 @@ static const INITBL iniitem[] = {
 	{"HDfolder", INITYPE_STR,		hddfolder,				MAX_PATH},
 	{"bmap_Dir", INITYPE_STR,		bmpfilefolder,			MAX_PATH},
 	{"fontfile", INITYPE_STR,		np2cfg.fontfile,		MAX_PATH},
+	{"biospath", INIRO_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)},
 	{"clk_base", INITYPE_UINT32,	&np2cfg.baseclock,		0},
 	{"clk_mult", INITYPE_UINT32,	&np2cfg.multiple,		0},
-	{"pc_model", INITYPE_UINT8,		&np2cfg.model,			0},
 
 	{"DIPswtch", INITYPE_ARGH8,		np2cfg.dipsw,			3},
 	{"MEMswtch", INITYPE_ARGH8,		np2cfg.memsw,			8},
 	{"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},
-//	{"Removabl", INI_EX|1,	0,		&np2cfg.REMOVEHD,		0},
+	{"HDD1FILE", INITYPE_STR,		np2cfg.sasihdd[0],		MAX_PATH},
+	{"HDD2FILE", INITYPE_STR,		np2cfg.sasihdd[1],		MAX_PATH},
+#if defined(SUPPORT_SCSI)
+	{"SCSIHDD0", INITYPE_STR,		np2cfg.scsihdd[0],		MAX_PATH},
+	{"SCSIHDD1", INITYPE_STR,		np2cfg.scsihdd[1],		MAX_PATH},
+	{"SCSIHDD2", INITYPE_STR,		np2cfg.scsihdd[2],		MAX_PATH},
+	{"SCSIHDD3", INITYPE_STR,		np2cfg.scsihdd[3],		MAX_PATH},
+#endif
 
 	{"SampleHz", INITYPE_UINT16,	&np2cfg.samplingrate,	0},
 	{"Latencys", INITYPE_UINT16,	&np2cfg.delayms,		0},
@@ -409,6 +432,9 @@ static const INITBL iniitem[] = {
 
 	{"calendar", INITYPE_BOOL,		&np2cfg.calendar,		0},
 	{"USE144FD", INITYPE_BOOL,		&np2cfg.usefd144,		0},
+	{"userkey1", INITYPE_USERKEY,	np2cfg.userkey+0,		0},
+	{"userkey2", INITYPE_USERKEY,	np2cfg.userkey+1,		0},
+
 
 	// OS°Í¸¡©
 	{"keyboard", INIRO_KB,			&np2oscfg.KEYBOARD,		0},
@@ -452,13 +478,15 @@ static const INITBL iniitem[] = {
 	{"com3mmdl", INITYPE_STR,		np2oscfg.com3.mdl,		64},
 	{"com3mdef", INITYPE_STR,		np2oscfg.com3.def,		MAX_PATH},
 
-	{"force400", INITYPE_BOOL,		&np2oscfg.force400,		0},
+	{"force400", INIRO_BOOL,		&np2oscfg.force400,		0},
 	{"e_resume", INITYPE_BOOL,		&np2oscfg.resume,		0},
 	{"STATSAVE", INIRO_BOOL,		&np2oscfg.statsave,		0},
 	{"nousemmx", INITYPE_BOOL,		&np2oscfg.disablemmx,	0},		// ver0.36
 	{"windtype", INITYPE_UINT8,		&np2oscfg.wintype,		0},
 	{"toolwind", INITYPE_BOOL,		&np2oscfg.toolwin,		0},		// ver0.38
 	{"keydispl", INITYPE_BOOL,		&np2oscfg.keydisp,		0},
+	{"jast_snd", INITYPE_BOOL,		&np2oscfg.jastsnd,		0},		// ver0.73
+	{"useromeo", INITYPE_BOOL,		&np2oscfg.useromeo,		0},		// ver0.74
 	{"I286SAVE", INIRO_BOOL,		&np2oscfg.I286SAVE,		0}};