From 4ff7b35e578b124d9700c07246ba63a5077c6746 Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 29 Apr 2015 20:36:12 +0200 Subject: [PATCH] changed some rand_r to unknown_r --- src/mame/drivers/24cdjuke.c | 4 ++-- src/mame/drivers/bingoc.c | 14 +++++++------- src/mame/drivers/centiped.c | 8 ++++---- src/mame/drivers/magictg.c | 6 +++--- src/mame/drivers/ssv.c | 7 ++++--- src/mame/includes/centiped.h | 2 +- src/mame/includes/ssv.h | 2 +- src/mess/drivers/fidelz80.c | 4 ++-- src/mess/includes/fidelz80.h | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/mame/drivers/24cdjuke.c b/src/mame/drivers/24cdjuke.c index b77e86606b9..3dd1d34237d 100644 --- a/src/mame/drivers/24cdjuke.c +++ b/src/mame/drivers/24cdjuke.c @@ -84,7 +84,7 @@ public: DECLARE_WRITE8_MEMBER(kb_col_w); DECLARE_WRITE8_MEMBER(digit_w); - DECLARE_READ8_MEMBER(rand_r){ return machine().rand(); } + DECLARE_READ8_MEMBER(unknown_r) { return machine().rand(); } private: UINT8 m_kb_col; @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( midcoin24cdjuke_io, AS_IO, 8, midcoin24cdjuke_state ) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ic11", i8255_device, read, write) AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ic25", i8255_device, read, write) AM_RANGE(0x0c, 0x0c) AM_WRITENOP - AM_RANGE(0x10, 0x1f) AM_READ(rand_r) + AM_RANGE(0x10, 0x1f) AM_READ(unknown_r) ADDRESS_MAP_END static INPUT_PORTS_START( midcoin24cdjuke ) diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 9212a1fac60..fad26e49fc5 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -46,10 +46,10 @@ public: m_upd7759(*this, "upd") { } UINT8 m_x; - DECLARE_READ16_MEMBER(bingoc_rand_r); + DECLARE_READ16_MEMBER(unknown_r); DECLARE_READ8_MEMBER(sound_test_r); DECLARE_WRITE16_MEMBER(main_sound_latch_w); - DECLARE_WRITE8_MEMBER(bingoc_play_w); + DECLARE_WRITE8_MEMBER(sound_play_w); virtual void video_start(); UINT32 screen_update_bingoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; @@ -69,7 +69,7 @@ UINT32 bingoc_state::screen_update_bingoc(screen_device &screen, bitmap_ind16 &b return 0; } -READ16_MEMBER(bingoc_state::bingoc_rand_r) +READ16_MEMBER(bingoc_state::unknown_r) { return 0xffff; } @@ -103,7 +103,7 @@ WRITE16_MEMBER(bingoc_state::main_sound_latch_w) } #endif -WRITE8_MEMBER(bingoc_state::bingoc_play_w) +WRITE8_MEMBER(bingoc_state::sound_play_w) { /* ---- --x- sound rom banking @@ -117,8 +117,8 @@ WRITE8_MEMBER(bingoc_state::bingoc_play_w) static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, bingoc_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10007f) AM_READ(bingoc_rand_r) //comms? lamps? - AM_RANGE(0x180000, 0x18007f) AM_READ(bingoc_rand_r) //comms? lamps? + AM_RANGE(0x100000, 0x10007f) AM_READ(unknown_r) //comms? lamps? + AM_RANGE(0x180000, 0x18007f) AM_READ(unknown_r) //comms? lamps? #if !SOUND_TEST AM_RANGE(0x180010, 0x180011) AM_WRITE(main_sound_latch_w) //WRONG there... #endif @@ -133,7 +133,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io, AS_IO, 8, bingoc_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) - AM_RANGE(0x40, 0x40) AM_WRITE(bingoc_play_w) + AM_RANGE(0x40, 0x40) AM_WRITE(sound_play_w) AM_RANGE(0x80, 0x80) AM_DEVWRITE("upd", upd7759_device, port_w) #if !SOUND_TEST AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_byte_r) //soundlatch diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 88801490976..ad4d93de403 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -619,7 +619,7 @@ WRITE8_MEMBER(centiped_state::led_w) } -READ8_MEMBER(centiped_state::caterplr_rand_r) +READ8_MEMBER(centiped_state::caterplr_unknown_r) { return machine().rand() % 0xff; } @@ -712,7 +712,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( caterplr_map, AS_PROGRAM, 8, centiped_state ) AM_IMPORT_FROM(centiped_base_map) - AM_RANGE(0x1780, 0x1780) AM_READ(caterplr_rand_r) + AM_RANGE(0x1780, 0x1780) AM_READ(caterplr_unknown_r) AM_RANGE(0x1000, 0x100f) AM_READWRITE(caterplr_AY8910_r, caterplr_AY8910_w) ADDRESS_MAP_END @@ -1743,7 +1743,7 @@ static MACHINE_CONFIG_DERIVED( centipdb, centiped ) /* sound hardware */ MCFG_SOUND_REPLACE("pokey", AY8910, 12096000/8) - MCFG_AY8910_PORT_A_READ_CB(READ8(centiped_state, caterplr_rand_r)) + MCFG_AY8910_PORT_A_READ_CB(READ8(centiped_state, caterplr_unknown_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_CONFIG_END @@ -1759,7 +1759,7 @@ static MACHINE_CONFIG_DERIVED( magworm, centiped_base ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("pokey", AY8910, 12096000/8) - MCFG_AY8910_PORT_A_READ_CB(READ8(centiped_state, caterplr_rand_r)) + MCFG_AY8910_PORT_A_READ_CB(READ8(centiped_state, caterplr_unknown_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index 3214736ad09..4742e8ac4ae 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -192,7 +192,7 @@ public: DECLARE_WRITE32_MEMBER( f0_w ); DECLARE_READ32_MEMBER( unk_r ); - DECLARE_READ32_MEMBER( rand_r ); + DECLARE_READ32_MEMBER( unk2_r ); DECLARE_READ32_MEMBER( serial_r ); DECLARE_WRITE32_MEMBER( serial_w ); @@ -523,7 +523,7 @@ READ32_MEMBER( magictg_state::unk_r ) return 0x6000; } -READ32_MEMBER( magictg_state::rand_r ) +READ32_MEMBER( magictg_state::unk2_r ) { return 0xffffffff; } @@ -833,7 +833,7 @@ static ADDRESS_MAP_START( magictg_map, AS_PROGRAM, 32, magictg_state ) AM_RANGE(0x1b001024, 0x1b001027) AM_READ(adsp_status_r) AM_RANGE(0x1b001108, 0x1b00110b) AM_READ(unk_r) AM_RANGE(0x1e000000, 0x1e002fff) AM_RAM // NVRAM? - AM_RANGE(0x1e800000, 0x1e800007) AM_READWRITE(rand_r, serial_w) + AM_RANGE(0x1e800000, 0x1e800007) AM_READWRITE(unk2_r, serial_w) AM_RANGE(0x1fc00000, 0x1fffffff) AM_ROM AM_REGION("mips", 0) ADDRESS_MAP_END diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 8ebeae48d5a..adb43fc2c89 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -411,11 +411,12 @@ READ16_MEMBER(ssv_state::fake_r){ return ssv_scroll[offset]; } AM_RANGE(0x260000, 0x260001) AM_WRITE(irq_enable_w) /* IRQ En */ \ AM_RANGE(0x300000, 0x30007f) AM_DEVREADWRITE8("ensoniq", es5506_device, read, write, 0x00ff) /* Sound */ \ AM_RANGE(_ROM, 0xffffff) AM_ROM AM_REGION("maincpu", 0) /* ROM */ + /*************************************************************************** Drift Out '94 ***************************************************************************/ -READ16_MEMBER(ssv_state::drifto94_rand_r) +READ16_MEMBER(ssv_state::drifto94_unknown_r) { return machine().rand() & 0xffff; } @@ -427,8 +428,8 @@ static ADDRESS_MAP_START( drifto94_map, AS_PROGRAM, 16, ssv_state ) AM_RANGE(0x482000, 0x482fff) AM_READWRITE(dsp_r, dsp_w) AM_RANGE(0x483000, 0x485fff) AM_WRITENOP // ? AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ?? - AM_RANGE(0x510000, 0x510001) AM_READ(drifto94_rand_r ) // ?? - AM_RANGE(0x520000, 0x520001) AM_READ(drifto94_rand_r ) // ?? + AM_RANGE(0x510000, 0x510001) AM_READ(drifto94_unknown_r) // ?? + AM_RANGE(0x520000, 0x520001) AM_READ(drifto94_unknown_r) // ?? AM_RANGE(0x580000, 0x5807ff) AM_RAM AM_SHARE("nvram") // NVRAM SSV_MAP( 0xc00000 ) ADDRESS_MAP_END diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 9c547ec847c..6184ad604aa 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -53,7 +53,7 @@ public: DECLARE_WRITE8_MEMBER(led_w); DECLARE_WRITE8_MEMBER(coin_count_w); DECLARE_WRITE8_MEMBER(bullsdrt_coin_count_w); - DECLARE_READ8_MEMBER(caterplr_rand_r); + DECLARE_READ8_MEMBER(caterplr_unknown_r); DECLARE_WRITE8_MEMBER(caterplr_AY8910_w); DECLARE_READ8_MEMBER(caterplr_AY8910_r); DECLARE_READ8_MEMBER(multiped_eeprom_r); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 0627c79a39d..55e500ebc16 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -76,7 +76,7 @@ public: DECLARE_READ16_MEMBER(dsp_r); DECLARE_WRITE16_MEMBER(dsp_w); DECLARE_READ16_MEMBER(fake_r); - DECLARE_READ16_MEMBER(drifto94_rand_r); + DECLARE_READ16_MEMBER(drifto94_unknown_r); DECLARE_READ16_MEMBER(gdfs_gfxram_r); DECLARE_WRITE16_MEMBER(gdfs_gfxram_w); DECLARE_READ16_MEMBER(gdfs_blitram_r); diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c index 4b26ce0b4a8..32acdd01919 100644 --- a/src/mess/drivers/fidelz80.c +++ b/src/mess/drivers/fidelz80.c @@ -898,7 +898,7 @@ READ8_MEMBER(fidelz80_state::unknown_r) return 0; } -READ8_MEMBER(fidelz80_state::rand_r) +READ8_MEMBER(fidelz80_state::unknown2_r) { return machine().rand(); } @@ -1040,7 +1040,7 @@ static ADDRESS_MAP_START(bridgec_mcu_io, AS_IO, 8, fidelz80_state) // related to the card scanner, probably clock and data optical AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(unknown_r) - AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(rand_r) + AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(unknown2_r) ADDRESS_MAP_END /****************************************************************************** diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h index c5457137108..1052607ecf6 100644 --- a/src/mess/includes/fidelz80.h +++ b/src/mess/includes/fidelz80.h @@ -53,9 +53,9 @@ public: DECLARE_WRITE8_MEMBER(bridgec_speech_w ); DECLARE_WRITE8_MEMBER(kp_matrix_w); DECLARE_READ8_MEMBER(unknown_r); + DECLARE_READ8_MEMBER(unknown2_r); DECLARE_READ8_MEMBER(exp_i8243_p2_r); DECLARE_WRITE8_MEMBER(exp_i8243_p2_w); - DECLARE_READ8_MEMBER(rand_r); DECLARE_WRITE8_MEMBER(mcu_data_w); DECLARE_WRITE8_MEMBER(mcu_command_w); DECLARE_READ8_MEMBER(mcu_data_r);