diff --git a/src/hardware/adlib.cpp b/src/hardware/adlib.cpp index 403b128e..9cdba658 100644 --- a/src/hardware/adlib.cpp +++ b/src/hardware/adlib.cpp @@ -324,7 +324,7 @@ public: OPL(Section* configuration):Module_base(configuration) { Section_prop * section=static_cast(configuration); - Bitu base = section->Get_hex("base"); + Bitu base = section->Get_hex("sbbase"); Bitu rate = section->Get_int("oplrate"); if (OPL2::YM3812Init(2,OPL2_INTERNAL_FREQ,rate)) { E_Exit("Can't create OPL2 Emulator"); diff --git a/src/hardware/gameblaster.cpp b/src/hardware/gameblaster.cpp index db647db6..e4169f4d 100644 --- a/src/hardware/gameblaster.cpp +++ b/src/hardware/gameblaster.cpp @@ -430,7 +430,7 @@ public: Section_prop * section = static_cast(configuration); Bitu sample_rate_temp = section->Get_int("oplrate"); sample_rate = static_cast(sample_rate_temp); - Bitu base = section->Get_hex("base"); + Bitu base = section->Get_hex("sbbase"); WriteHandler.Install(base,write_cms,IO_MB,4); /* Register the Mixer CallBack */ diff --git a/src/hardware/gus.cpp b/src/hardware/gus.cpp index 9cd3cbba..6395325b 100644 --- a/src/hardware/gus.cpp +++ b/src/hardware/gus.cpp @@ -806,9 +806,9 @@ public: memset(&myGUS,0,sizeof(myGUS)); memset(GUSRam,0,1024*1024); - myGUS.rate=section->Get_int("rate"); + myGUS.rate=section->Get_int("gusrate"); - myGUS.portbase = section->Get_hex("base") - 0x200; + 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"); diff --git a/src/hardware/sblaster.cpp b/src/hardware/sblaster.cpp index f05bfdeb..d75278dd 100644 --- a/src/hardware/sblaster.cpp +++ b/src/hardware/sblaster.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: sblaster.cpp,v 1.52 2006-02-09 11:47:49 qbix79 Exp $ */ +/* $Id: sblaster.cpp,v 1.53 2006-03-13 20:01:55 qbix79 Exp $ */ #include #include @@ -1145,7 +1145,7 @@ private: /* Support Functions */ void Find_Type_And_Opl(Section_prop* config,SB_TYPES& type, OPL_Mode& opl_mode){ - const char * sbtype=config->Get_string("type"); + const char * sbtype=config->Get_string("sbtype"); if (!strcasecmp(sbtype,"sb1")) type=SBT_1; else if (!strcasecmp(sbtype,"sb2")) type=SBT_2; else if (!strcasecmp(sbtype,"sbpro1")) type=SBT_PRO1; @@ -1182,7 +1182,7 @@ public: SBLASTER(Section* configuration):Module_base(configuration) { Bitu i; Section_prop * section=static_cast(configuration); - sb.hw.base=section->Get_hex("base"); + sb.hw.base=section->Get_hex("sbbase"); sb.hw.irq=section->Get_int("irq"); sb.hw.dma8=section->Get_int("dma"); sb.hw.dma16=section->Get_int("hdma");