From b7c84d5aff739260270cba2bcdaeac77e128fc93 Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Tue, 14 Oct 2003 23:42:55 +0000 Subject: [PATCH] Added config file help lines to here and changed some config file options. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1337 --- src/dosbox.cpp | 101 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 18 deletions(-) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 77f1ebce..09311a5a 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -158,7 +158,7 @@ void DOSBOX_RunMachine(void){ static void DOSBOX_RealInit(Section * sec) { Section_prop * section=static_cast(sec); /* Initialize some dosbox internals */ - MSG_Add("DOSBOX_CONFIGFILE_HELP","General Dosbox settings\n"); + RemainTicks=0;LastTicks=GetTicks(); DOSBOX_SetLoop(&Normal_Loop); MSG_Init(section); @@ -166,7 +166,6 @@ static void DOSBOX_RealInit(Section * sec) { void DOSBOX_Init(void) { -// Section * sec; Section_prop * secprop; Section_line * secline; @@ -180,7 +179,7 @@ void DOSBOX_Init(void) { secprop->AddInitFunction(&IO_Init); secprop->AddInitFunction(&PAGING_Init); secprop->AddInitFunction(&MEM_Init); - secprop->Add_int("memsize",8); //We Default to 8 mb seems okay for now + secprop->Add_int("memsize",16); secprop->AddInitFunction(&CALLBACK_Init); secprop->AddInitFunction(&PIC_Init); secprop->AddInitFunction(&PROGRAMS_Init); @@ -188,13 +187,28 @@ void DOSBOX_Init(void) { secprop->AddInitFunction(&CMOS_Init); secprop->AddInitFunction(&SERIAL_Init); + MSG_Add("DOSBOX_CONFIGFILE_HELP", + "language -- Select another language file.\n" + "memsize -- Amount of memory dosbox has in megabytes.\n" + ); + secprop=control->AddSection_prop("render",&RENDER_Init); secprop->Add_int("frameskip",0); - secprop->Add_string("snapshots","snaps"); + secprop->Add_string("snapdir","snaps"); secprop->Add_string("scaler","normal2x"); + MSG_Add("RENDER_CONFIGFILE_HELP", + "frameskip -- How many frames dosbox skips before drawing one.\n" + "snapdir -- Directory where screenshots get saved.\n" + "scaler -- Scaler used to enlarge/enhance low resolution modes.\n" + " Supported are none,normal2x,advmame2x\n" + ); secprop=control->AddSection_prop("cpu",&CPU_Init); secprop->Add_int("cycles",1800); + MSG_Add("CPU_CONFIGFILE_HELP", + "cycles -- Amount of instructions dosbox tries to emulate each millsecond.\n" + " Setting this higher than your machine can handle is bad!\n" + ); #if C_FPU secprop->AddInitFunction(&FPU_Init); #endif @@ -210,39 +224,73 @@ void DOSBOX_Init(void) { secprop->Add_int("blocksize",2048); secprop->Add_string("wavedir","waves"); + MSG_Add("MIXER_CONFIGFILE_HELP", + "nosound -- Enable silent mode, sound is still emulated though.\n" + "rate -- Mixer sample rate, setting any devices higher than this will\n" + " probably lower their sound quality.\n" + "blocksize -- Mixer block size, larger blocks might help sound stuttering\n" + " but sound will also be more lagged.\n" + "wavedir -- Directory where saved sound output goes when you use the\n" + " sound record key-combination, check README file.\n" + ); + secprop=control->AddSection_prop("midi",&MIDI_Init); secprop->AddInitFunction(&MPU401_Init); secprop->Add_bool("mpu401",true); secprop->Add_string("device","default"); secprop->Add_string("config",""); + MSG_Add("MIDI_CONFIGFILE_HELP", + "mpu401 -- Enable MPU-401 Emulation.\n" + "device -- Device that will receive the MIDI data from MPU-401.\n" + " This can be default,alsa,oss,win32,coreaudio,none.\n" + "config -- Special configuration options for the device.\n" + ); + #if C_DEBUG secprop=control->AddSection_prop("debug",&DEBUG_Init); #endif secprop=control->AddSection_prop("sblaster",&SBLASTER_Init); + secprop->Add_bool("sblaster",true); secprop->Add_hex("base",0x220); secprop->Add_int("irq",7); secprop->Add_int("dma",1); - secprop->Add_int("hdma",5); +// secprop->Add_int("hdma",5); secprop->Add_int("sbrate",22050); - secprop->Add_bool("enabled",true); - secprop->AddInitFunction(&ADLIB_Init); secprop->Add_bool("adlib",true); + secprop->Add_int("adlibrate",22050); secprop->AddInitFunction(&CMS_Init); secprop->Add_bool("cms",false); secprop->Add_int("cmsrate",22050); - secprop=control->AddSection_prop("disney",&DISNEY_Init); - secprop->Add_bool("enabled",true); + MSG_Add("SBLASTER_CONFIGFILE_HELP", + "sblaster -- Enable the soundblaster emulation.\n" + "base,irq,dma -- The IO/IRQ/DMA address of the soundblaster.\n" + "sbrate -- Sample rate of soundblaster emulation.\n" + "adlib -- Enable the adlib emulation.\n" + "adlibrate -- Sample rate of adlib emulation.\n" + "cms -- Enable the Creative Music System/Gameblaster emulation.\n" + " Enabling both the adlib and cms might give conflicts!\n" + "cmsrate -- Sample rate of cms emulation.\n" + ); secprop=control->AddSection_prop("speaker",&PCSPEAKER_Init); - secprop->Add_bool("enabled",true); + secprop->Add_bool("pcspeaker",true); secprop->Add_int("pcrate",22050); secprop->AddInitFunction(&TANDYSOUND_Init); - secprop->Add_bool("tandy",false); + secprop->Add_bool("tandy",true); secprop->Add_int("tandyrate",22050); + secprop->AddInitFunction(&DISNEY_Init); + secprop->Add_bool("disney",true); + MSG_Add("SPEAKER_CONFIGFILE_HELP", + "pcspeaker -- Enable PC-Speaker emulation.\n" + "pcrate -- Sample rate of the PC-Speaker sound generation.\n" + "tandy -- Enable Tandy 3-Voice emulation.\n" + "tandyrate -- Sample rate of the Tandy 3-Voice generation.\n" + "disney -- Enable Disney Sound Source emulation.\n" + ); secprop=control->AddSection_prop("bios",&BIOS_Init); secprop->AddInitFunction(&INT10_Init); @@ -256,18 +304,35 @@ void DOSBOX_Init(void) { secprop->AddInitFunction(&DPMI_Init); secprop->Add_bool("dpmi",true); -#if C_MODEM - secprop=control->AddSection_prop("modem",&MODEM_Init); - secprop->Add_bool("enabled",true); - secprop->Add_hex("comport",2); - secprop->Add_int("listenport",23); -#endif - + MSG_Add("DOS_CONFIGFILE_HELP", + "xms -- Enable XMS support.\n" + "ems -- Enable EMS support.\n" + "dpmi -- Enable builtin DPMI host support.\n" + " This might help in getting some games to work, but might crash others.\n" + " So be sure to try both settings.\n" + ); // Mscdex secprop->AddInitFunction(&MSCDEX_Init); +#if C_MODEM + secprop=control->AddSection_prop("modem",&MODEM_Init); + secprop->Add_bool("modem",true); + secprop->Add_hex("comport",2); + secprop->Add_int("listenport",23); + + MSG_Add("MODEM_CONFIGFILE_HELP", + "modem -- Enable virtual modem emulation.\n" + "comport -- COM Port modem is connected to.\n" + "listenport -- TCP Port the momdem listens on for incoming connections.\n" + ); +#endif + secline=control->AddSection_line("autoexec",&AUTOEXEC_Init); + MSG_Add("AUTOEXEC_CONFIGFILE_HELP", + "Lines in this section will be run at startup.\n" + ); + control->SetStartUp(&SHELL_Init); }