np2/x11/ini.c - diff

Return to ini.c CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/ini.c between versions 1.13 and 1.20

version 1.13, 2004/07/05 14:30:39	version 1.20, 2008/03/13 16:27:39
Line 8	Line 8
#include "strres.h"	#include "strres.h"

#include "commng.h"	#include "commng.h"
	#include "joymng.h"
#include "kbdmng.h"	#include "kbdmng.h"
#include "soundmng.h"	#include "soundmng.h"

Line 180 inirdsnddrv(const char *src, const INITB	Line 181 inirdsnddrv(const char *src, const INITB
(UINT8 )ini->value = snddrv_drv2num(src);	(UINT8 )ini->value = snddrv_drv2num(src);
}	}

	static void
	inirdinterp(const char src, const INITBL ini)
	{

	if (!milstr_cmp(src, "NEAREST")) {
	(UINT8 )ini->value = INTERP_NEAREST;
	} else if (!milstr_cmp(src, "TILES")) {
	(UINT8 )ini->value = INTERP_TILES;
	} else if (!milstr_cmp(src, "HYPER")) {
	(UINT8 )ini->value = INTERP_HYPER;
	} else {
	(UINT8 )ini->value = INTERP_BILINEAR;
	}
	}

static void update_iniread_flag(const INITBL *p);	static void update_iniread_flag(const INITBL *p);

static BOOL	static BOOL
Line 264 inireadcb(void arg, const char para, c	Line 280 inireadcb(void arg, const char para, c
inirdsnddrv(work, p);	inirdsnddrv(work, p);
break;	break;

	case INITYPE_INTERP:
	milstr_ncpy(work, data, 512);
	inirdinterp(work, p);
	break;

default:	default:
rv = FALSE;	rv = FALSE;
break;	break;
Line 338 iwss_extend:	Line 359 iwss_extend:
}	}
}	}

	static const char *
	iniwrinterp(UINT8 interp)
	{

	if (interp == INTERP_NEAREST)
	return "NEAREST";
	else if (interp == INTERP_TILES)
	return "TILES";
	else if (interp == INTERP_HYPER)
	return "HYPER";
	else
	return "BILINEAR";
	}

static BOOL read_iniread_flag(const INITBL *p);	static BOOL read_iniread_flag(const INITBL *p);

void	void
Line 436 ini_write(const char path, const char	Line 471 ini_write(const char path, const char
SPRINTF(work, "%s", snddrv_num2drv((UINT8 )p->value));	SPRINTF(work, "%s", snddrv_num2drv((UINT8 )p->value));
break;	break;

	case INITYPE_INTERP:
	SPRINTF(work, "%s", iniwrinterp((UINT8 )p->value));
	break;

default:	default:
set = FAILURE;	set = FAILURE;
break;	break;
Line 483 static const INITBL iniitem[] = {	Line 522 static const INITBL iniitem[] = {
{"hdrvroot", INIRO_STR, np2cfg.hdrvroot, MAX_PATH},	{"hdrvroot", INIRO_STR, np2cfg.hdrvroot, MAX_PATH},
{"hdrv_acc", INIRO_UINT8, &np2cfg.hdrvacc, 0},	{"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_base", INITYPE_UINT32, &np2cfg.baseclock, 0},
{"clk_mult", INITYPE_UINT32, &np2cfg.multiple, 0},	{"clk_mult", INITYPE_UINT32, &np2cfg.multiple, 0},
Line 556 static const INITBL iniitem[] = {	Line 595 static const INITBL iniitem[] = {
{"keyboard", INIRO_KB, &np2oscfg.KEYBOARD, 0},	{"keyboard", INIRO_KB, &np2oscfg.KEYBOARD, 0},
{"F12_COPY", INITYPE_UINT8, &np2oscfg.F12KEY, 0},	{"F12_COPY", INITYPE_UINT8, &np2oscfg.F12KEY, 0},
{"Joystick", INITYPE_BOOL, &np2oscfg.JOYPAD1, 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},	{"confirm_", INITYPE_BOOL, &np2oscfg.confirm, 0},

Line 586 static const INITBL iniitem[] = {	Line 628 static const INITBL iniitem[] = {
{"com3mmdl", INITYPE_STR, np2oscfg.com[2].mdl, 64},	{"com3mmdl", INITYPE_STR, np2oscfg.com[2].mdl, 64},
{"com3mdef", INITYPE_STR, np2oscfg.com[2].def, MAX_PATH},	{"com3mdef", INITYPE_STR, np2oscfg.com[2].def, MAX_PATH},

	#if defined(SUPPORT_RESUME)
{"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0},	{"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0},
	#endif
	#if defined(SUPPORT_STATSAVE)
{"STATSAVE", INIRO_BOOL, &np2oscfg.statsave, 0},	{"STATSAVE", INIRO_BOOL, &np2oscfg.statsave, 0},
	#endif
#if defined(GCC_CPU_ARCH_IA32)	#if defined(GCC_CPU_ARCH_IA32)
{"nousemmx", INITYPE_BOOL, &np2oscfg.disablemmx, 0},	{"nousemmx", INITYPE_BOOL, &np2oscfg.disablemmx, 0},
#endif	#endif
Line 597 static const INITBL iniitem[] = {	Line 643 static const INITBL iniitem[] = {
{"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0},	{"jast_snd", INITYPE_BOOL, &np2oscfg.jastsnd, 0},

{"sounddrv", INITYPE_SNDDRV, &np2oscfg.snddrv, 0},	{"sounddrv", INITYPE_SNDDRV, &np2oscfg.snddrv, 0},
{"audiodev", INITYPE_STR, &np2oscfg.audiodev, MAX_PATH},
{"MIDIOUTd", INITYPE_STR, &np2oscfg.MIDIDEV[0], MAX_PATH},	{"MIDIOUTd", INITYPE_STR, &np2oscfg.MIDIDEV[0], MAX_PATH},
{"MIDIIN_d", INITYPE_STR, &np2oscfg.MIDIDEV[1], MAX_PATH},	{"MIDIIN_d", INITYPE_STR, &np2oscfg.MIDIDEV[1], MAX_PATH},
{"MIDIWAIT", INITYPE_UINT32, &np2oscfg.MIDIWAIT, 0},	{"MIDIWAIT", INITYPE_UINT32, &np2oscfg.MIDIWAIT, 0},

{"sharepix", INIRO_BOOL, &np2oscfg.shared_pixmap,0},	{"dinterp_", INITYPE_INTERP, &np2oscfg.drawinterp, 0},
	{"fullscrn", INITYPE_UINT32, &ignore_fullscreen_mode,0},
{"toolkit_", INIRO_STR, &np2oscfg.toolkit, sizeof(np2oscfg.toolkit)},	{"F11_KEY_", INITYPE_UINT8, &np2oscfg.F11KEY, 0},

{"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0}	{"I286SAVE", INIRO_BOOL, &np2oscfg.I286SAVE, 0},
};	};
#define INIITEMS (sizeof(iniitem) / sizeof(iniitem[0]))	#define INIITEMS (sizeof(iniitem) / sizeof(iniitem[0]))

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.13
changed lines
	Added in v.1.20