Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

another global variable removed + cleanup. nw.

Browse Source
This commit is contained in:
Fabio Priuli 2013-03-22 08:28:41 +00:00
parent 02abb6625d
commit 41c9b9bb6a
2 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mame/machine/megacd.c
View File

@ -4,32 +4,27 @@
#include "sound/rf5c68.h"
// not in the state because the IRQ_CALLBACK needs it, and that can't be a member function?
UINT16 a12000_halt_reset_reg = 0x0000;
/* Callback when the genesis enters interrupt code */
// needs to be a member
IRQ_CALLBACK_MEMBER(sega_segacd_device::segacd_sub_int_callback)
{
if (irqline==2)
{
// clear this bit
a12000_halt_reset_reg &= ~0x0100;
device.machine().device(":segacd:segacd_68k")->execute().set_input_line(2, CLEAR_LINE);
m_a12000_halt_reset_reg &= ~0x0100;
m_scdcpu->set_input_line(2, CLEAR_LINE);
}
return (0x60+irqline*4)/4; // vector address
}
const device_type SEGA_SEGACD_US = &device_creator<sega_segacd_us_device>;
const device_type SEGA_SEGACD_JAPAN = &device_creator<sega_segacd_japan_device>;
const device_type SEGA_SEGACD_EUROPE = &device_creator<sega_segacd_europe_device>;
sega_segacd_device::sega_segacd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type)
: device_t(mconfig, type, "sega_segacd_device", tag, owner, clock)
: device_t(mconfig, type, "sega_segacd_device", tag, owner, clock),
m_scdcpu(*this, "segacd_68k")
{
}
@ -137,11 +132,9 @@ static MACHINE_CONFIG_FRAGMENT( segacd_fragment )
MCFG_TIMER_DRIVER_ADD("scd_dma_timer", sega_segacd_device, scd_dma_timer_callback)
MCFG_DEFAULT_LAYOUT( layout_megacd )
MCFG_RF5C68_ADD("rfsnd", SEGACD_CLOCK) // RF5C164!
MCFG_SOUND_ROUTE( 0, ":lspeaker", 0.50 )
MCFG_SOUND_ROUTE( 1, ":rspeaker", 0.50 )
@ -165,10 +158,6 @@ machine_config_constructor sega_segacd_device::device_mconfig_additions() const
inline void sega_segacd_device::write_pixel(running_machine& machine, UINT8 pix, int pixeloffset )
{
int shift = 12-(4*(pixeloffset&0x3));
@ -292,49 +281,49 @@ void sega_segacd_device::segacd_1meg_mode_word_write(running_machine& machine, i
WRITE16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_w )
{
UINT16 old_halt = a12000_halt_reset_reg;
UINT16 old_halt = m_a12000_halt_reset_reg;
COMBINE_DATA(&a12000_halt_reset_reg);
COMBINE_DATA(&m_a12000_halt_reset_reg);
if (ACCESSING_BITS_0_7)
{
// reset line
if (a12000_halt_reset_reg&0x0001)
if (m_a12000_halt_reset_reg & 0x0001)
{
space.machine().device(":segacd:segacd_68k")->execute().set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
m_scdcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
if (!(old_halt&0x0001)) printf("clear reset slave\n");
}
else
{
space.machine().device(":segacd:segacd_68k")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
m_scdcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
if ((old_halt&0x0001)) printf("assert reset slave\n");
}
// request BUS
if (a12000_halt_reset_reg&0x0002)
if (m_a12000_halt_reset_reg & 0x0002)
{
space.machine().device(":segacd:segacd_68k")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
m_scdcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
if (!(old_halt&0x0002)) printf("halt slave\n");
}
else
{
space.machine().device(":segacd:segacd_68k")->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
m_scdcpu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
if ((old_halt&0x0002)) printf("resume slave\n");
}
}
if (ACCESSING_BITS_8_15)
{
if (a12000_halt_reset_reg&0x0100)
if (m_a12000_halt_reset_reg & 0x0100)
{
running_machine& machine = space.machine();
CHECK_SCD_LV2_INTERRUPT
}
if (a12000_halt_reset_reg&0x8000)
if (m_a12000_halt_reset_reg & 0x8000)
{
// not writable.. but can read irq mask here?
//printf("a12000_halt_reset_reg & 0x8000 set\n"); // irq2 mask?
//printf("m_a12000_halt_reset_reg & 0x8000 set\n"); // irq2 mask?
}
@ -343,7 +332,7 @@ WRITE16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_w )
READ16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_r )
{
return a12000_halt_reset_reg;
return m_a12000_halt_reset_reg;
}
@ -1562,8 +1551,6 @@ READ16_MEMBER( sega_segacd_device::segacd_font_converted_r )
void sega_segacd_device::device_start()
{
_segacd_68k_cpu = machine().device<cpu_device>(":segacd:segacd_68k");
segacd_gfx_conversion_timer = machine().device<timer_device>(":segacd:stamp_timer");
segacd_irq3_timer = machine().device<timer_device>(":segacd:irq3_timer");
scd_dma_timer = machine().device<timer_device>(":segacd:scd_dma_timer");
@ -1603,7 +1590,7 @@ void sega_segacd_device::device_start()
machine().device(":segacd:segacd_68k")->execute().set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(sega_segacd_device::segacd_sub_int_callback),this));
m_scdcpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(sega_segacd_device::segacd_sub_int_callback),this));
space.install_read_handler (0x0000070, 0x0000073, read16_delegate(FUNC(sega_segacd_device::scd_hint_vector_r),this) );
@ -1650,12 +1637,12 @@ WRITE16_MEMBER( sega_segacd_device::segacd_dmaaddr_w )
void sega_segacd_device::device_reset()
{
_segacd_68k_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
_segacd_68k_cpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
m_scdcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
m_scdcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
segacd_hint_register = 0xffff; // -1
m_a12000_halt_reset_reg = 0x0000;
scd_rammode = 0;
scd_mode_dmna_ret_flags = 0x5421;
@ -1675,7 +1662,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!
_segacd_68k_cpu->set_clock_scale(1.5000f);
m_scdcpu->set_clock_scale(1.5000f);
// initialize some stuff on reset

10
src/mame/machine/megacd.h
View File

@ -193,12 +193,6 @@ _32x32_START
_32x32_SEQUENCE_1_FLIP
_32x32_END
extern UINT16 a12000_halt_reset_reg;
class sega_segacd_device : public device_t
@ -206,7 +200,7 @@ class sega_segacd_device : public device_t
public:
sega_segacd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type);
cpu_device *_segacd_68k_cpu;
required_device<cpu_device> m_scdcpu;
lc89510_temp_device *lc89510_temp;
UINT16 *segacd_backupram;
@ -265,7 +259,7 @@ public:
DECLARE_WRITE16_MEMBER( segacd_dmaaddr_w );
UINT16 m_dmaaddr;
UINT16 m_a12000_halt_reset_reg;
void segacd_mark_tiles_dirty(running_machine& machine, int offset);
int segacd_get_active_stampmap_tilemap(void);