--- np2/macosx/ini.cpp 2003/11/14 07:37:29 1.8 +++ np2/macosx/ini.cpp 2004/03/02 23:23:06 1.18 @@ -334,18 +334,31 @@ static const char inifile[] = "np2.cfg"; static const INITBL iniitem[] = { {"np2title", INITYPE_STR, np2oscfg.titles, sizeof(np2oscfg.titles)}, + {"WindposX", INITYPE_SINT32, &np2oscfg.winx, 0}, + {"WindposY", INITYPE_SINT32, &np2oscfg.winy, 0}, + + {"pc_model", INITYPE_STR, &np2cfg.model, + sizeof(np2cfg.model)}, {"clk_base", INITYPE_SINT32, &np2cfg.baseclock, 0}, {"clk_mult", INITYPE_SINT32, &np2cfg.multiple, 0}, - {"pc_model", INITYPE_UINT8, &np2cfg.model, 0}, {"DIPswtch", INITYPE_BYTEARG, np2cfg.dipsw, 3}, {"MEMswtch", INITYPE_BYTEARG, np2cfg.memsw, 8}, {"ExMemory", INITYPE_UINT8, &np2cfg.EXTMEM, 0}, {"ITF_WORK", INITYPE_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}, +#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 {"fontfile", INITYPE_STR, np2cfg.fontfile, MAX_PATH}, + {"biospath", INITYPE_STR, np2cfg.biospath, MAX_PATH}, + {"hdrvroot", INITYPE_STR, np2cfg.hdrvroot, MAX_PATH}, + {"hdrv_acc", INITYPE_UINT8, &np2cfg.hdrvacc, 0}, {"SampleHz", INITYPE_UINT16, &np2cfg.samplingrate, 0}, {"Latencys", INITYPE_UINT16, &np2cfg.delayms, 0}, @@ -372,7 +385,8 @@ static const INITBL iniitem[] = { {"Seek_Snd", INITYPE_BOOL, &np2cfg.MOTOR, 0}, {"Seek_Vol", INITYPE_UINT8, &np2cfg.MOTORVOL, 0}, - {"F12_COPY", INITYPE_UINT8, &np2oscfg.F12COPY, 0}, + {"F11_bind", INITYPE_UINT8, &np2oscfg.F11KEY, 0}, + {"F12_bind", INITYPE_UINT8, &np2oscfg.F12KEY, 0}, {"btnRAPID", INITYPE_BOOL, &np2cfg.BTN_RAPID, 0}, {"btn_MODE", INITYPE_BOOL, &np2cfg.BTN_MODE, 0}, {"MS_RAPID", INITYPE_BOOL, &np2cfg.MOUSERAPID, 0}, @@ -399,8 +413,15 @@ static const INITBL iniitem[] = { {"USE144FD", INITYPE_BOOL, &np2cfg.usefd144, 0}, {"Mouse_sw", INITYPE_BOOL, &np2oscfg.MOUSE_SW, 0}, {"comfirm_", INITYPE_BOOL, &np2oscfg.comfirm, 0}, + + {"mpu98map", INITYPE_STR, np2oscfg.mpu.mout, MAX_PATH}, + {"mpu98min", INITYPE_STR, np2oscfg.mpu.min, MAX_PATH}, + {"mpu98mdl", INITYPE_STR, np2oscfg.mpu.mdl, 64}, + {"mpu98def", INITYPE_STR, np2oscfg.mpu.def, MAX_PATH}, + {"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0}, // ver0.30 {"toolwind", INITYPE_BOOL, &np2oscfg.toolwin, 0}, // ver0.38 + {"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0}, // ver0.73 {"I286SAVE", INITYPE_BOOL, &np2oscfg.I286SAVE, 0}}; #define INIITEMS (sizeof(iniitem) / sizeof(INITBL))