--- np2/x11/ini.c 2004/01/23 14:35:45 1.9 +++ np2/x11/ini.c 2004/06/16 12:50:49 1.12 @@ -7,6 +7,7 @@ #include "profile.h" #include "strres.h" +#include "commng.h" #include "kbdmng.h" #include "soundmng.h" @@ -530,13 +531,35 @@ 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}, {"keydispl", INITYPE_BOOL, &np2oscfg.keydisp, 0}, + {"soft_kbd", INITYPE_BOOL, &np2oscfg.softkbd, 0}, {"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, {"sounddrv", INITYPE_SNDDRV, &np2oscfg.snddrv, 0},