From 3588c0a8cb7cdf490728024db275d4af0c50fc9c Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 21 Jan 2025 12:36:20 +0100 Subject: misc: set_clock_scale takes a double, not a float --- src/mame/acorn/electron_m.cpp | 32 ++++++++--------- src/mame/capcom/cps2.cpp | 3 +- src/mame/dataeast/backfire.cpp | 2 +- src/mame/dataeast/deco_mlc.cpp | 4 +-- src/mame/hegenerglaser/excalibur.cpp | 11 +++++- src/mame/homebrew/z80clock.cpp | 8 ++--- src/mame/konami/konamigx.cpp | 67 ++++++++++++++++++------------------ src/mame/sega/megacd.cpp | 2 +- src/mame/sega/segas24.cpp | 4 +-- src/mame/tch/littlerb.cpp | 2 +- src/mame/tvgames/spg2xx_wiwi.cpp | 2 +- src/mame/vtech/socrates.cpp | 6 ++-- 12 files changed, 77 insertions(+), 66 deletions(-) diff --git a/src/mame/acorn/electron_m.cpp b/src/mame/acorn/electron_m.cpp index c0b3a83ed37..b4c44f830dd 100644 --- a/src/mame/acorn/electron_m.cpp +++ b/src/mame/acorn/electron_m.cpp @@ -142,7 +142,7 @@ uint8_t electron_state::electron_mem_r(offs_t offset) { case 0x00: /* Normal */ /* The processor will run at 1MHz during an access cycle to the RAM */ - m_maincpu->set_clock_scale(0.5f); + m_maincpu->set_clock_scale(0.5); waitforramsync(); break; @@ -167,7 +167,7 @@ void electron_state::electron_mem_w(offs_t offset, uint8_t data) { case 0x00: /* Normal */ /* The processor will run at 1MHz during an access cycle to the RAM */ - m_maincpu->set_clock_scale(0.5f); + m_maincpu->set_clock_scale(0.5); waitforramsync(); break; @@ -204,7 +204,7 @@ uint8_t electron_state::electron_paged_r(offs_t offset) uint8_t data = 0; /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); switch (m_ula.rompage) { @@ -237,7 +237,7 @@ uint8_t electron_state::electron_paged_r(offs_t offset) void electron_state::electron_paged_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); m_exp->expbus_w(0x8000 + offset, data); } @@ -247,7 +247,7 @@ uint8_t electronsp_state::electron_paged_r(offs_t offset) uint8_t data = 0; /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); if ((m_ula.rompage & 0x0e) == m_rompages->read()) { @@ -280,7 +280,7 @@ uint8_t electronsp_state::electron_paged_r(offs_t offset) void electronsp_state::electron_paged_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); if ((m_ula.rompage & 0x0e) == m_rompages->read()) { @@ -308,7 +308,7 @@ void electronsp_state::electron_paged_w(offs_t offset, uint8_t data) uint8_t electron_state::electron_mos_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); return m_region_mos->base()[0x4000 | offset]; } @@ -316,7 +316,7 @@ uint8_t electron_state::electron_mos_r(offs_t offset) void electron_state::electron_mos_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); logerror("MOS: write %04x %02x\n", offset + 0xc000, data); m_exp->expbus_w(0xc000 + offset, data); @@ -325,7 +325,7 @@ void electron_state::electron_mos_w(offs_t offset, uint8_t data) uint8_t electron_state::electron_fred_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); /* The Issue 4 ULA returns data from OS ROM, whereas Issue 6 ULA will return 0xff */ //logerror("FRED: read fc%02x\n", offset); @@ -335,7 +335,7 @@ uint8_t electron_state::electron_fred_r(offs_t offset) void electron_state::electron_fred_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); /* Master RAM Board */ if (offset == 0x7f) m_mrb_mapped = !(data & 0x80); @@ -349,7 +349,7 @@ uint8_t electronsp_state::electron_fred_r(offs_t offset) uint8_t data = 0; /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); if ((offset & 0xf0) == 0xb0) { @@ -365,7 +365,7 @@ uint8_t electronsp_state::electron_fred_r(offs_t offset) void electronsp_state::electron_fred_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); electron_state::electron_fred_w(offset, data); @@ -382,7 +382,7 @@ void electronsp_state::electron_fred_w(offs_t offset, uint8_t data) uint8_t electron_state::electron_jim_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); /* The Issue 4 ULA returns data from OS ROM, whereas Issue 6 ULA will return 0xff */ //logerror("JIM: read fd%02x\n", offset); @@ -392,7 +392,7 @@ uint8_t electron_state::electron_jim_r(offs_t offset) void electron_state::electron_jim_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); //logerror("JIM: write fd%02x\n", offset); m_exp->expbus_w(0xfd00 + offset, data); @@ -401,7 +401,7 @@ void electron_state::electron_jim_w(offs_t offset, uint8_t data) uint8_t electron_state::electron_sheila_r(offs_t offset) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); /* The Issue 4 ULA returns data from OS ROM, whereas Issue 6 ULA will return 0xfe */ uint8_t data = 0xff; @@ -430,7 +430,7 @@ static const int electron_mode_end[8] = { 255, 255, 255 ,249 ,255, 255, 249, 249 void electron_state::electron_sheila_w(offs_t offset, uint8_t data) { /* The processor will run at 2MHz during an access cycle to the ROM */ - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); m_exp->expbus_w(0xfe00 + offset, data); diff --git a/src/mame/capcom/cps2.cpp b/src/mame/capcom/cps2.cpp index 289e78e7208..4c94caa778a 100644 --- a/src/mame/capcom/cps2.cpp +++ b/src/mame/capcom/cps2.cpp @@ -10975,7 +10975,8 @@ void cps2_state::init_cps2nc() init_digital_volume(); - m_maincpu->set_clock_scale(0.7375f); // RAM access waitstates etc. aren't emulated - slow the CPU to compensate + // HACK: RAM access waitstates etc. aren't emulated - slow the CPU to compensate + m_maincpu->set_clock_scale(0.7375); } void cps2_state::init_pzloop2() diff --git a/src/mame/dataeast/backfire.cpp b/src/mame/dataeast/backfire.cpp index f48ddfd4e79..79715a95eb7 100644 --- a/src/mame/dataeast/backfire.cpp +++ b/src/mame/dataeast/backfire.cpp @@ -593,7 +593,7 @@ void backfire_state::init_backfire() deco56_decrypt_gfx(machine(), "tiles1"); /* 141 */ deco56_decrypt_gfx(machine(), "tiles2"); /* 141 */ deco156_decrypt(machine()); - m_maincpu->set_clock_scale(4.0f); /* core timings aren't accurate */ + m_maincpu->set_clock_scale(4.0); /* core timings aren't accurate */ descramble_sound(); m_maincpu->space(AS_PROGRAM).install_read_handler(0x0170018, 0x017001b, read32smo_delegate(*this, FUNC(backfire_state::backfire_speedup_r))); } diff --git a/src/mame/dataeast/deco_mlc.cpp b/src/mame/dataeast/deco_mlc.cpp index d2ef45e8e83..a881296639a 100644 --- a/src/mame/dataeast/deco_mlc.cpp +++ b/src/mame/dataeast/deco_mlc.cpp @@ -1057,7 +1057,7 @@ void deco_mlc_state::init_mlc() /* The timing in the ARM core isn't as accurate as it should be, so bump up the effective clock rate here to compensate otherwise we have slowdowns in Skull Fang where there probably shouldn't be. */ - m_maincpu->set_clock_scale(2.0f); + m_maincpu->set_clock_scale(2.0); m_irqLevel = ARM_IRQ_LINE; deco156_decrypt(machine()); descramble_sound(); @@ -1065,7 +1065,7 @@ void deco_mlc_state::init_mlc() void deco_mlc_state::init_acchi() // sound ROMs don't appear to be scrambled { - m_maincpu->set_clock_scale(2.0f); // avoids hangs in attract mode / end of round, see init_mlc() + m_maincpu->set_clock_scale(2.0); // avoids hangs in attract mode / end of round, see init_mlc() m_irqLevel = ARM_IRQ_LINE; deco156_decrypt(machine()); } diff --git a/src/mame/hegenerglaser/excalibur.cpp b/src/mame/hegenerglaser/excalibur.cpp index 5c1c2f86278..4a1dce20d76 100644 --- a/src/mame/hegenerglaser/excalibur.cpp +++ b/src/mame/hegenerglaser/excalibur.cpp @@ -83,6 +83,9 @@ public: void excal(machine_config &config); +protected: + virtual void machine_start() override ATTR_COLD; + private: required_device m_maincpu; required_device m_ptm; @@ -97,6 +100,12 @@ private: u8 input_r(offs_t offset); }; +void excal_state::machine_start() +{ + // HACK: slow down CPU to account for suspected wait states + m_maincpu->set_clock_scale(5.0 / 8.0); +} + /******************************************************************************* @@ -191,7 +200,7 @@ INPUT_PORTS_END void excal_state::excal(machine_config &config) { // basic machine hardware - M68000(config, m_maincpu, 16_MHz_XTAL / 3.2); // see driver notes + M68000(config, m_maincpu, 16_MHz_XTAL / 2); m_maincpu->set_addrmap(AS_PROGRAM, &excal_state::excal_mem); PTM6840(config, m_ptm, 16_MHz_XTAL / 20); diff --git a/src/mame/homebrew/z80clock.cpp b/src/mame/homebrew/z80clock.cpp index 9fcb6f37a6c..c8353550d0d 100644 --- a/src/mame/homebrew/z80clock.cpp +++ b/src/mame/homebrew/z80clock.cpp @@ -85,7 +85,7 @@ public: m_speaker->add_route(ALL_OUTPUTS, "mono", 0.25); CLOCK(config, m_ne555, 8589).signal_handler().set(FUNC(z80clock_state::ne555)); - m_ne555->set_clock_scale(0.0f); + m_ne555->set_clock_scale(0.0); m_ne555->set_duty_cycle(2/3.0f); Z80CTC(config, m_ctc, 6_MHz_XTAL); @@ -155,7 +155,7 @@ protected: virtual void machine_reset() override { /// HACK: start the sio clock on first write for speed - m_sio_clock->set_clock_scale(0.0f); + m_sio_clock->set_clock_scale(0.0); } private: @@ -224,7 +224,7 @@ private: void outputs_w(uint8_t data) { - m_ne555->set_clock_scale(BIT(data, 7) ? 1.0f : 0.0f); + m_ne555->set_clock_scale(BIT(data, 7) ? 1.0 : 0.0); } void disp_data_w(uint8_t data) @@ -304,7 +304,7 @@ private: void sio_cd_ba_w(offs_t offset, uint8_t data) { /// HACK: start the sio clock on first write for speed - m_sio_clock->set_clock_scale(1.0f); + m_sio_clock->set_clock_scale(1.0); m_sio->cd_ba_w(offset, data); } diff --git a/src/mame/konami/konamigx.cpp b/src/mame/konami/konamigx.cpp index 3701fb13a86..227877a2ef2 100644 --- a/src/mame/konami/konamigx.cpp +++ b/src/mame/konami/konamigx.cpp @@ -561,7 +561,7 @@ void konamigx_state::control_w(offs_t offset, uint32_t data, uint32_t mem_mask) TIMER_CALLBACK_MEMBER(konamigx_state::boothack_callback) { // Restore main CPU normal operating frequency - m_maincpu->set_clock_scale(1.0f); + m_maincpu->set_clock_scale(1.0); } /* @@ -3890,7 +3890,7 @@ MACHINE_RESET_MEMBER(konamigx_state,konamigx) // waiting for the sound system tests to complete. // To hack around this, we underclock the 68020 for 12 seconds during POST (soccerss requires longest) - m_maincpu->set_clock_scale(0.66f); + m_maincpu->set_clock_scale(2.0 / 3.0); m_boothack_timer->adjust(attotime::from_seconds(12)); } @@ -3925,15 +3925,16 @@ static const GXGameInfoT gameDefs[] = { "le2", 13, 1, BPP4 }, { "le2u", 13, 1, BPP4 }, { "le2j", 13, 1, BPP4 }, - { "gokuparo", 7, 0, BPP5 }, { "fantjour", 7, 9, BPP5 }, { "fantjoura", 7, 9, BPP5 }, + { "gokuparo", 7, 0, BPP5 }, + { "crzcross", 7, 0, BPP5 }, { "puzldama", 7, 0, BPP5 }, - { "mtwinbee", 7, 8, BPP5 }, { "tbyahhoo", 7, 8, BPP5 }, + { "mtwinbee", 7, 8, BPP5 }, { "tkmmpzdm", 7, 2, BPP6 }, - { "dragoonj", 7, 3, BPP4 }, { "dragoona", 7, 3, BPP4 }, + { "dragoonj", 7, 3, BPP4 }, { "sexyparo", 7, 4, BPP5 }, { "sexyparoa", 7, 4, BPP5 }, { "daiskiss", 7, 5, BPP5 }, @@ -3949,10 +3950,10 @@ static const GXGameInfoT gameDefs[] = { "soccerssj", 7, 0, BPP4 }, { "soccerssja",7, 0, BPP4 }, { "vsnetscr", 7, 0, BPP4 }, + { "vsnetscreb",7, 0, BPP4 }, { "vsnetscru", 7, 0, BPP4 }, { "vsnetscrj", 7, 0, BPP4 }, { "vsnetscra", 7, 0, BPP4 }, - { "vsnetscreb",7, 0, BPP4 }, { "rungun2", 7, 0, BPP4 }, { "slamdnk2", 7, 0, BPP4 }, { "rushhero", 7, 0, BPP4 }, @@ -4060,7 +4061,7 @@ void konamigx_state::init_posthack() // year ROM parent machine inp init // dummy parent for the BIOS -GAME( 1994, konamigx, 0, konamigx_bios, common, konamigx_state, init_konamigx, ROT0, "Konami", "System GX", MACHINE_IS_BIOS_ROOT ) +GAME( 1994, konamigx, 0, konamigx_bios, common, konamigx_state, init_konamigx, ROT0, "Konami", "System GX", MACHINE_IS_BIOS_ROOT ) /* -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Type 1: standard with an add-on 53936 on the ROM board, analog inputs, @@ -4080,19 +4081,19 @@ GAME( 1994, ggreats2, opengolf, opengolf, ggreats2, konamigx_state, init_p these games work and are playable with minor graphics glitches --------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ -GAME( 1994, le2, konamigx, le2, le2, konamigx_state, init_konamigx, ROT0, "Konami", "Lethal Enforcers II: Gun Fighters (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, le2u, le2, le2, le2u, konamigx_state, init_konamigx, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers II: Gun Fighters (ver UAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, le2j, le2, le2, le2j, konamigx_state, init_konamigx, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers II: The Western (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, le2, konamigx, le2, le2, konamigx_state, init_konamigx, ROT0, "Konami", "Lethal Enforcers II: Gun Fighters (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, le2u, le2, le2, le2u, konamigx_state, init_konamigx, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers II: Gun Fighters (ver UAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, le2j, le2, le2, le2j, konamigx_state, init_konamigx, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers II: The Western (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, fantjour, konamigx, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Fantastic Journey (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, fantjoura, fantjour, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Fantastic Journey (ver AAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, gokuparo, fantjour, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Gokujou Parodius: Kako no Eikou o Motomete (ver JAD)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, fantjour, konamigx, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Fantastic Journey (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, fantjoura, fantjour, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Fantastic Journey (ver AAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, gokuparo, fantjour, gokuparo, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Gokujou Parodius: Kako no Eikou o Motomete (ver JAD)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, crzcross, konamigx, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Crazy Cross (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, puzldama, crzcross, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Taisen Puzzle-dama (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, crzcross, konamigx, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Crazy Cross (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, puzldama, crzcross, gokuparo, puzldama, konamigx_state, init_posthack, ROT0, "Konami", "Taisen Puzzle-dama (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1995, tbyahhoo, konamigx, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Twin Bee Yahhoo! (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1995, mtwinbee, tbyahhoo, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Magical Twin Bee (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1995, tbyahhoo, konamigx, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Twin Bee Yahhoo! (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1995, mtwinbee, tbyahhoo, tbyahhoo, gokuparo, konamigx_state, init_posthack, ROT0, "Konami", "Magical Twin Bee (ver EAA)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1995, tkmmpzdm, konamigx, konamigx_6bpp, tokkae, konamigx_state, init_konamigx, ROT0, "Konami", "Tokimeki Memorial Taisen Puzzle-dama (ver JAB)", MACHINE_IMPERFECT_GRAPHICS ) @@ -4111,31 +4112,31 @@ GAME( 1996, salmndr2, konamigx, salmndr2, gokuparo, konamigx_state, init_k GAME( 1996, salmndr2a, salmndr2, salmndr2, gokuparo, konamigx_state, init_konamigx, ROT0, "Konami", "Salamander 2 (ver AAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_UNEMULATED_PROTECTION ) // bad sprite colours, part of tilemap gets blanked out when a game starts (might be more protection) -GAME( 1997, winspike, konamigx, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver EAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1997, winspikea, winspike, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver AAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1997, winspikej, winspike, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver JAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1997, winspike, konamigx, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver EAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1997, winspikea, winspike, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver AAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1997, winspikej, winspike, winspike, common, konamigx_state, init_konamigx, ROT0, "Konami", "Winning Spike (ver JAA)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) /* -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Type 3: dual monitor output and 53936 on the ROM board, external palette RAM --------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ -GAME( 1994, soccerss, konamigx, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver EAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes EAA to EEPROM, but should be version EAC according to labels -GAME( 1994, soccerssu, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver UAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes UAA to EEPROM, but should be version UAC according to labels -GAME( 1994, soccerssj, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver JAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes JAB to EEPROM, but should be version JAC according to labels -GAME( 1994, soccerssja,soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1994, soccerssa, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver AAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, soccerss, konamigx, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver EAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes EAA to EEPROM, but should be version EAC according to labels +GAME( 1994, soccerssu, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver UAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes UAA to EEPROM, but should be version UAC according to labels +GAME( 1994, soccerssj, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver JAC)", MACHINE_IMPERFECT_GRAPHICS ) // writes JAB to EEPROM, but should be version JAC according to labels +GAME( 1994, soccerssja,soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1994, soccerssa, soccerss, gxtype3, type3, konamigx_state, init_posthack, ROT0, "Konami", "Soccer Superstars (ver AAA)", MACHINE_IMPERFECT_GRAPHICS ) /* -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Type 4: dual monitor output and 53936 on the ROM board, external palette RAM, DMA protection --------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ -GAME( 1996, vsnetscr, konamigx, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver EAD)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) -GAME( 1996, vsnetscreb,vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver EAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) -GAME( 1996, vsnetscru, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver UAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) -GAME( 1996, vsnetscra, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver AAA)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) -GAME( 1996, vsnetscrj, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver JAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) +GAME( 1996, vsnetscr, konamigx, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver EAD)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) +GAME( 1996, vsnetscreb,vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver EAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) +GAME( 1996, vsnetscru, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver UAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) +GAME( 1996, vsnetscra, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver AAA)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) +GAME( 1996, vsnetscrj, vsnetscr, gxtype4_vsn, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Versus Net Soccer (ver JAB)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND ) -GAME( 1996, rungun2, konamigx, gxtype4sd2, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Run and Gun 2 (ver UAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1996, slamdnk2, rungun2, gxtype4sd2, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Slam Dunk 2 (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1996, rungun2, konamigx, gxtype4sd2, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Run and Gun 2 (ver UAA)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1996, slamdnk2, rungun2, gxtype4sd2, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Slam Dunk 2 (ver JAA)", MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1996, rushhero, konamigx, gxtype4, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Rushing Heroes (ver UAB)", MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1996, rushhero, konamigx, gxtype4, type3, konamigx_state, init_konamigx, ROT0, "Konami", "Rushing Heroes (ver UAB)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/sega/megacd.cpp b/src/mame/sega/megacd.cpp index 80f5a9c6aee..8f288cdcdf8 100644 --- a/src/mame/sega/megacd.cpp +++ b/src/mame/sega/megacd.cpp @@ -1790,7 +1790,7 @@ void sega_segacd_device::device_reset() // time. Changing the CDHock timer to 50hz from 75hz also stops the hang, but then the video is // too slow and has bad sound. -- Investigate! // Update: removed, otherwise megacdj and megacd2j will black screen with no cdrom inserted. - //m_scdcpu->set_clock_scale(1.5000f); + //m_scdcpu->set_clock_scale(1.5); // initialize some stuff on reset diff --git a/src/mame/sega/segas24.cpp b/src/mame/sega/segas24.cpp index 06adcb2205b..9d7409c93d8 100644 --- a/src/mame/sega/segas24.cpp +++ b/src/mame/sega/segas24.cpp @@ -641,7 +641,7 @@ CPUs to worry about. TIMER_CALLBACK_MEMBER(segas24_state::gground_hack_timer_callback) { - m_subcpu->set_clock_scale(1.0f); + m_subcpu->set_clock_scale(1.0); } @@ -660,7 +660,7 @@ void segas24_state::cnt1(int state) //machine().debug_break(); if (m_gground_hack_timer) { - m_subcpu->set_clock_scale(0.7f); // reduce clock speed temporarily so a check passes, see notes above + m_subcpu->set_clock_scale(0.7); // reduce clock speed temporarily so a check passes, see notes above m_gground_hack_timer->adjust(attotime::from_seconds(2)); } } diff --git a/src/mame/tch/littlerb.cpp b/src/mame/tch/littlerb.cpp index 388efe9b54e..98bfae49e21 100644 --- a/src/mame/tch/littlerb.cpp +++ b/src/mame/tch/littlerb.cpp @@ -331,7 +331,7 @@ void littlerb_state::init_littlerb() { /* various scenes flicker to the point of graphics being invisible (eg. the map screen at the very start of a game) unless you overclock the TMS34010 to 120%, possible timing bug in the core? this is a hack */ - m_indervid->subdevice("tms")->set_clock_scale(1.2f); + m_indervid->subdevice("tms")->set_clock_scale(1.2); } } // anonymous namespace diff --git a/src/mame/tvgames/spg2xx_wiwi.cpp b/src/mame/tvgames/spg2xx_wiwi.cpp index 124ced06e74..004e391b772 100644 --- a/src/mame/tvgames/spg2xx_wiwi.cpp +++ b/src/mame/tvgames/spg2xx_wiwi.cpp @@ -156,7 +156,7 @@ void spg2xx_game_marc250_state::machine_start() m_pulse_timer2->adjust(attotime::never); // hack, makes x-racer3 and some others more stable, TODO: find out what is really wrong - m_maincpu->set_clock_scale(2.0000f); + m_maincpu->set_clock_scale(2.0); } diff --git a/src/mame/vtech/socrates.cpp b/src/mame/vtech/socrates.cpp index dc52799dda3..45aea067a43 100644 --- a/src/mame/vtech/socrates.cpp +++ b/src/mame/vtech/socrates.cpp @@ -383,7 +383,7 @@ void socrates_state::init_socrates() /* fill vram with its init powerup bit pattern, so startup has the checkerboard screen */ for (int i = 0; i < 0x10000; i++) m_vram_reg[i] = (((i&0x1)?0x00:0xFF)^((i&0x100)?0x00:0xff)); - m_maincpu->set_clock_scale(0.45f); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate + m_maincpu->set_clock_scale(0.45); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate m_kbmcu_type = 0; } @@ -392,7 +392,7 @@ void socrates_state::init_iqunlimz() /* fill vram with its init powerup bit pattern, so startup has the checkerboard screen... is this even right for the iqunlimz? */ for (int i = 0; i < 0x20000; i++) m_vram_reg[i] = (((i&0x1)?0x00:0xFF)^((i&0x100)?0x00:0xff)); - //m_maincpu->set_clock_scale(0.45f); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate + //m_maincpu->set_clock_scale(0.45); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate m_kbmcu_type = 1; } @@ -401,7 +401,7 @@ void socrates_state::init_vpainter() /* fill vram with its init powerup bit pattern, so startup has the checkerboard screen */ for (int i = 0; i < 0x10000; i++) m_vram_reg[i] = (((i&0x1)?0x00:0xFF)^((i&0x100)?0x00:0xff)); - m_maincpu->set_clock_scale(0.45f); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate + m_maincpu->set_clock_scale(0.45); /// TODO: RAM access waitstates etc. aren't emulated - slow the CPU to compensate m_kbmcu_type = 2; } -- cgit v1.2.3