From 6ef103c5243974307e4ef5040ebbe7e1634ebd82 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Sat, 23 Mar 2013 10:28:46 +0000 Subject: [PATCH] (MESS) megadriv.c: removed a bunch of useless machine parameters and a few tagmap lookups. nw. --- src/mame/machine/mega32x.c | 10 +++++----- src/mame/machine/mega32x.h | 12 ++++++------ src/mame/machine/megacd.c | 21 ++++++++++----------- src/mame/machine/megacd.h | 8 ++++---- src/mame/machine/megavdp.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c index 20e485b0e6f..3215e4ee7b1 100644 --- a/src/mame/machine/mega32x.c +++ b/src/mame/machine/mega32x.c @@ -796,7 +796,7 @@ TODO: -void sega_32x_device::calculate_pwm_timer(running_machine &machine) +void sega_32x_device::calculate_pwm_timer() { if(m_pwm_tm_reg == 0) { m_pwm_tm_reg = 16; } // zero gives max range if(m_pwm_cycle == 0) { m_pwm_cycle = 4095; } // zero gives max range @@ -815,7 +815,7 @@ void sega_32x_device::calculate_pwm_timer(running_machine &machine) } -void sega_32x_device::handle_pwm_callback(void) +void sega_32x_device::handle_pwm_callback() { if(m_lch_index_r < PWM_FIFO_SIZE) { @@ -887,11 +887,11 @@ WRITE16_MEMBER( sega_32x_device::_32x_pwm_w ) case 0x00/2: m_pwm_ctrl = data & 0xffff; m_pwm_tm_reg = (m_pwm_ctrl & 0xf00) >> 8; - calculate_pwm_timer(space.machine()); + calculate_pwm_timer(); break; case 0x02/2: m_pwm_cycle = m_pwm_cycle_reg = data & 0xfff; - calculate_pwm_timer(space.machine()); + calculate_pwm_timer(); break; case 0x04/2: if(m_lch_index_w < PWM_FIFO_SIZE) @@ -1602,7 +1602,7 @@ int _32x_fifo_available_callback(device_t *device, UINT32 src, UINT32 dst, UINT3 -UINT32* sega_32x_device::_32x_render_videobuffer_to_screenbuffer_helper(running_machine &machine, int scanline) +UINT32* sega_32x_device::_32x_render_videobuffer_to_screenbuffer_helper(int scanline) { int x; diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h index baf9618ecf2..2dd4637e7fb 100644 --- a/src/mame/machine/mega32x.h +++ b/src/mame/machine/mega32x.h @@ -104,7 +104,7 @@ public: DECLARE_WRITE16_MEMBER( _32x_sh2_master_401e_w ); DECLARE_WRITE16_MEMBER( _32x_sh2_slave_401e_w ); - UINT32* _32x_render_videobuffer_to_screenbuffer_helper(running_machine &machine, int scanline); + UINT32* _32x_render_videobuffer_to_screenbuffer_helper(int scanline); int sh2_master_pwmint_enable, sh2_slave_pwmint_enable; void _32x_check_framebuffer_swap(bool enabled); @@ -125,14 +125,14 @@ public: UINT32 m_32x_linerender[320+258]; // tmp buffer (bigger than it needs to be to simplify RLE decode) - void handle_pwm_callback(void); - void calculate_pwm_timer(running_machine &machine); - UINT16 m_pwm_ctrl,m_pwm_cycle,m_pwm_tm_reg; + void handle_pwm_callback(); + void calculate_pwm_timer(); + UINT16 m_pwm_ctrl, m_pwm_cycle, m_pwm_tm_reg; UINT16 m_cur_lch[0x10],m_cur_rch[0x10]; UINT16 m_pwm_cycle_reg; //used for latching UINT8 m_pwm_timer_tick; - UINT8 m_lch_index_r,m_rch_index_r,m_lch_index_w,m_rch_index_w; - UINT16 m_lch_fifo_state,m_rch_fifo_state; + UINT8 m_lch_index_r, m_rch_index_r, m_lch_index_w, m_rch_index_w; + UINT16 m_lch_fifo_state, m_rch_fifo_state; UINT16 get_hposition(void); diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c index 2ae6334fe05..00af0780053 100644 --- a/src/mame/machine/megacd.c +++ b/src/mame/machine/megacd.c @@ -218,7 +218,7 @@ UINT16 sega_segacd_device::segacd_1meg_mode_word_read(int offset, UINT16 mem_mas } -void sega_segacd_device::segacd_1meg_mode_word_write(running_machine& machine, int offset, UINT16 data, UINT16 mem_mask, int use_pm) +void sega_segacd_device::segacd_1meg_mode_word_write(int offset, UINT16 data, UINT16 mem_mask, int use_pm) { offset *= 2; @@ -316,7 +316,6 @@ WRITE16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_w ) { if (m_a12000_halt_reset_reg & 0x0100) { - running_machine& machine = space.machine(); CHECK_SCD_LV2_INTERRUPT } @@ -705,11 +704,11 @@ WRITE16_MEMBER( sega_segacd_device::segacd_main_dataram_part1_w ) // ret bit set by sub cpu determines which half of WorkRAM we have access to? if (scd_rammode&1) { - segacd_1meg_mode_word_write(space.machine(), offset+0x20000/2, data, mem_mask, 0); + segacd_1meg_mode_word_write(offset+0x20000/2, data, mem_mask, 0); } else { - segacd_1meg_mode_word_write(space.machine(), offset+0x00000/2, data, mem_mask, 0); + segacd_1meg_mode_word_write(offset+0x00000/2, data, mem_mask, 0); } } else @@ -1172,11 +1171,11 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_dataram_part1_w ) if (scd_rammode&1) { - segacd_1meg_mode_word_write(space.machine(), offset/2+0x00000/2, data , mem_mask, 1); + segacd_1meg_mode_word_write(offset/2+0x00000/2, data , mem_mask, 1); } else { - segacd_1meg_mode_word_write(space.machine(), offset/2+0x20000/2, data, mem_mask, 1); + segacd_1meg_mode_word_write(offset/2+0x20000/2, data, mem_mask, 1); } // printf("Unspported: segacd_sub_dataram_part1_w in mode 1 (Word RAM Expander - 1 Byte Per Pixel) %04x\n", data); @@ -1220,11 +1219,11 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_dataram_part2_w ) // ret bit set by sub cpu determines which half of WorkRAM we have access to? if (scd_rammode&1) { - segacd_1meg_mode_word_write(space.machine(),offset+0x00000/2, data, mem_mask, 0); + segacd_1meg_mode_word_write(offset+0x00000/2, data, mem_mask, 0); } else { - segacd_1meg_mode_word_write(space.machine(),offset+0x20000/2, data, mem_mask, 0); + segacd_1meg_mode_word_write(offset+0x20000/2, data, mem_mask, 0); } } @@ -1716,7 +1715,7 @@ void sega_segacd_device::SegaCD_CDC_Do_DMA(int &dmacount, UINT8 *CDC_BUFFER, UIN UINT8 *dest; int srcoffset = 0; int dstoffset = 0; - address_space& space = machine().device(":segacd:segacd_68k")->memory().space(AS_PROGRAM); + address_space& space = m_scdcpu->space(AS_PROGRAM); bool PCM_DMA = false; @@ -1779,11 +1778,11 @@ void sega_segacd_device::SegaCD_CDC_Do_DMA(int &dmacount, UINT8 *CDC_BUFFER, UIN if (!(scd_rammode & 1)) { - segacd_1meg_mode_word_write(space.machine(),(dstoffset+0x20000)/2, data, 0xffff, 0); + segacd_1meg_mode_word_write((dstoffset+0x20000)/2, data, 0xffff, 0); } else { - segacd_1meg_mode_word_write(space.machine(),(dstoffset+0x00000)/2, data, 0xffff, 0); + segacd_1meg_mode_word_write((dstoffset+0x00000)/2, data, 0xffff, 0); } } diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h index e46ee10992a..050b60386de 100644 --- a/src/mame/machine/megacd.h +++ b/src/mame/machine/megacd.h @@ -15,20 +15,20 @@ #define CHECK_SCD_LV3_INTERRUPT \ if (lc89510_temp->get_segacd_irq_mask() & 0x08) \ { \ - machine().device(":segacd:segacd_68k")->execute().set_input_line(3, HOLD_LINE); \ + m_scdcpu->set_input_line(3, HOLD_LINE); \ } // from master #define CHECK_SCD_LV2_INTERRUPT \ if (lc89510_temp->get_segacd_irq_mask() & 0x04) \ { \ - machine.device(":segacd:segacd_68k")->execute().set_input_line(2, HOLD_LINE); \ + m_scdcpu->set_input_line(2, HOLD_LINE); \ } // gfx convert #define CHECK_SCD_LV1_INTERRUPT \ if (lc89510_temp->get_segacd_irq_mask() & 0x02) \ { \ - machine().device(":segacd:segacd_68k")->execute().set_input_line(1, HOLD_LINE); \ + m_scdcpu->set_input_line(1, HOLD_LINE); \ } #define SEGACD_IRQ3_TIMER_SPEED (attotime::from_nsec(segacd_irq3_timer_reg*30720)) @@ -253,7 +253,7 @@ public: inline void write_pixel(running_machine& machine, UINT8 pix, int pixeloffset ); UINT16 segacd_1meg_mode_word_read(int offset, UINT16 mem_mask); - void segacd_1meg_mode_word_write(running_machine& machine, int offset, UINT16 data, UINT16 mem_mask, int use_pm); + void segacd_1meg_mode_word_write(int offset, UINT16 data, UINT16 mem_mask, int use_pm); DECLARE_READ16_MEMBER( segacd_dmaaddr_r ); DECLARE_WRITE16_MEMBER( segacd_dmaaddr_w ); diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index dd955b442cb..07f236343ad 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -2513,7 +2513,7 @@ void sega_genesis_vdp_device::genesis_render_videobuffer_to_screenbuffer(running } - if (_32xdev) _32xdev->_32x_render_videobuffer_to_screenbuffer_helper(machine, scanline); + if (_32xdev) _32xdev->_32x_render_videobuffer_to_screenbuffer_helper(scanline);