reduce GUS parameters, disable gravis ultrasound by default (for testing)
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3259
This commit is contained in:
Sebastian Strohhäcker
parent
6b65170fbd
commit
4e8f79fd9e
2 changed files with 38 additions and 37 deletions
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: dosbox.cpp,v 1.139 2009-01-13 17:32:09 c2woody Exp $ */
|
||||
/* $Id: dosbox.cpp,v 1.140 2009-01-14 20:50:22 c2woody Exp $ */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -318,10 +318,11 @@ void DOSBOX_Init(void) {
|
|||
// Some frequently used option sets
|
||||
const char *rates[] = { "22050", "44100", "48000", "32000", "16000", "11025", "8000", 0 };
|
||||
const char *ios[] = { "220", "240", "260", "280", "2a0", "2c0", "2e0", "300", 0 };
|
||||
const char *irqs[] = { "3", "5", "7", "9", "10", "11", "12", 0 };
|
||||
const char *dmas[] = { "0", "1", "3", "5", "6", "7", 0 };
|
||||
const char *irqssb[] = { "7", "5", "3", "9", "10", "11", "12", 0 };
|
||||
const char *dmassb[] = { "1", "5", "0", "3", "6", "7", 0 };
|
||||
const char *iosgus[] = { "240", "220", "260", "280", "2a0", "2c0", "2e0", "300", 0 };
|
||||
const char *irqsgus[] = { "5", "3", "7", "9", "10", "11", "12", 0 };
|
||||
const char *dmasgus[] = { "3", "0", "1", "5", "6", "7", 0 };
|
||||
|
||||
|
||||
/* Setup all the different modules making up DOSBox */
|
||||
|
|
@ -512,7 +513,7 @@ void DOSBOX_Init(void) {
|
|||
|
||||
|
||||
secprop=control->AddSection_prop("gus",&GUS_Init,true); //done
|
||||
Pbool = secprop->Add_bool("gus",Property::Changeable::WhenIdle,true);
|
||||
Pbool = secprop->Add_bool("gus",Property::Changeable::WhenIdle,false);
|
||||
Pbool->Set_help("Enable the Gravis Ultrasound emulation.");
|
||||
|
||||
Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,22050);
|
||||
|
|
@ -520,24 +521,16 @@ void DOSBOX_Init(void) {
|
|||
Pint->Set_help("Sample rate of Ultrasound emulation.");
|
||||
|
||||
Phex = secprop->Add_hex("gusbase",Property::Changeable::WhenIdle,0x240);
|
||||
Phex->Set_values(ios);
|
||||
Phex->Set_help("The IO addresses of the Gravis Ultrasound.");
|
||||
Phex->Set_values(iosgus);
|
||||
Phex->Set_help("The IO base address of the Gravis Ultrasound.");
|
||||
|
||||
Pint = secprop->Add_int("irq1",Property::Changeable::WhenIdle,5);
|
||||
Pint->Set_values(irqs);
|
||||
Pint->Set_help("The first IRQ number of the Gravis Ultrasound. (Same IRQs are OK.)");
|
||||
Pint = secprop->Add_int("gusirq",Property::Changeable::WhenIdle,5);
|
||||
Pint->Set_values(irqsgus);
|
||||
Pint->Set_help("The IRQ number of the Gravis Ultrasound.");
|
||||
|
||||
Pint = secprop->Add_int("irq2",Property::Changeable::WhenIdle,5);
|
||||
Pint->Set_values(irqs);
|
||||
Pint->Set_help("The second IRQ number of the Gravis Ultrasound. (Same IRQs are OK.)");
|
||||
|
||||
Pint = secprop->Add_int("dma1",Property::Changeable::WhenIdle,3);
|
||||
Pint->Set_values(dmas);
|
||||
Pint->Set_help("The first DMA addresses of the Gravis Ultrasound. (Same DMAs are OK.)");
|
||||
|
||||
Pint = secprop->Add_int("dma2",Property::Changeable::WhenIdle,3);
|
||||
Pint->Set_values(dmas);
|
||||
Pint->Set_help("The second DMA addresses of the Gravis Ultrasound. (Same DMAs are OK.)");
|
||||
Pint = secprop->Add_int("gusdma",Property::Changeable::WhenIdle,3);
|
||||
Pint->Set_values(dmasgus);
|
||||
Pint->Set_help("The DMA channel of the Gravis Ultrasound.");
|
||||
|
||||
Pstring = secprop->Add_string("ultradir",Property::Changeable::WhenIdle,"C:\\ULTRASND");
|
||||
Pstring->Set_help(
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2002-2007 The DOSBox Team
|
||||
* Copyright (C) 2002-2009 The DOSBox Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -16,6 +16,8 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: gus.cpp,v 1.33 2009-01-14 20:50:23 c2woody Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
|
@ -85,11 +87,11 @@ struct GFGus {
|
|||
} timers[2];
|
||||
Bit32u rate;
|
||||
Bitu portbase;
|
||||
Bitu dma1;
|
||||
Bitu dma2;
|
||||
Bit8u dma1;
|
||||
Bit8u dma2;
|
||||
|
||||
Bitu irq1;
|
||||
Bitu irq2;
|
||||
Bit8u irq1;
|
||||
Bit8u irq2;
|
||||
|
||||
char ultradir[512];
|
||||
bool irqenabled;
|
||||
|
|
@ -376,7 +378,7 @@ static void CheckVoiceIrq(void) {
|
|||
if (myGUS.RampIRQ) myGUS.IRQStatus|=0x40;
|
||||
if (myGUS.WaveIRQ) myGUS.IRQStatus|=0x20;
|
||||
GUS_CheckIRQ();
|
||||
while (1) {
|
||||
for (;;) {
|
||||
Bit32u check=(1 << myGUS.IRQChan);
|
||||
if (totalmask & check) return;
|
||||
myGUS.IRQChan++;
|
||||
|
|
@ -801,10 +803,15 @@ public:
|
|||
myGUS.rate=section->Get_int("gusrate");
|
||||
|
||||
myGUS.portbase = section->Get_hex("gusbase") - 0x200;
|
||||
myGUS.dma1 = section->Get_int("dma1");
|
||||
myGUS.dma2 = section->Get_int("dma2");
|
||||
myGUS.irq1 = section->Get_int("irq1");
|
||||
myGUS.irq2 = section->Get_int("irq2");
|
||||
int dma_val = section->Get_int("gusdma");
|
||||
if ((dma_val<0) || (dma_val>255)) dma_val = 3; // sensible default
|
||||
int irq_val = section->Get_int("gusirq");
|
||||
if ((irq_val<0) || (irq_val>255)) irq_val = 5; // sensible default
|
||||
myGUS.dma1 = (Bit8u)dma_val;
|
||||
myGUS.dma2 = (Bit8u)dma_val;
|
||||
myGUS.irq1 = (Bit8u)irq_val;
|
||||
myGUS.irq2 = (Bit8u)irq_val;
|
||||
|
||||
strcpy(&myGUS.ultradir[0], section->Get_string("ultradir"));
|
||||
|
||||
// We'll leave the MIDI interface to the MPU-401
|
||||
|
|
@ -842,9 +849,8 @@ public:
|
|||
|
||||
MakeTables();
|
||||
|
||||
int i;
|
||||
for(i=0;i<32;i++) {
|
||||
guschan[i] = new GUSChannels(i);
|
||||
for (Bit8u chan_ct=0; chan_ct<32; chan_ct++) {
|
||||
guschan[chan_ct] = new GUSChannels(chan_ct);
|
||||
}
|
||||
// Register the Mixer CallBack
|
||||
gus_chan=MixerChan.Install(GUS_CallBack,GUS_RATE,"GUS");
|
||||
|
|
@ -852,12 +858,14 @@ public:
|
|||
GUSReset();
|
||||
myGUS.gRegData=0x0;
|
||||
int portat = 0x200+GUS_BASE;
|
||||
|
||||
// ULTRASND=Port,DMA1,DMA2,IRQ1,IRQ2
|
||||
// Create autoexec.bat lines
|
||||
// [GUS port], [GUS DMA (recording)], [GUS DMA (playback)], [GUS IRQ (playback)], [GUS IRQ (MIDI)]
|
||||
ostringstream temp;
|
||||
temp << "SET ULTRASND=" << hex << setw(3) << portat << ","
|
||||
<< dec << myGUS.dma1 << "," << myGUS.dma2 << ","
|
||||
<< myGUS.irq1 << "," << myGUS.irq2 << ends;
|
||||
<< dec << (Bitu)myGUS.dma1 << "," << (Bitu)myGUS.dma2 << ","
|
||||
<< (Bitu)myGUS.irq1 << "," << (Bitu)myGUS.irq2 << ends;
|
||||
// Create autoexec.bat lines
|
||||
autoexecline[0].Install(temp.str());
|
||||
autoexecline[1].Install(std::string("SET ULTRADIR=")+ myGUS.ultradir);
|
||||
}
|
||||
|
|
@ -883,7 +891,7 @@ public:
|
|||
|
||||
static GUS* test;
|
||||
|
||||
void GUS_ShutDown(Section* sec) {
|
||||
void GUS_ShutDown(Section* /*sec*/) {
|
||||
delete test;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue