Skip to content

Commit

Permalink
midzeus: MCFG removal and other cleanup (nw)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tedgreen99
tedgreen99 committed Sep 4, 2018
1 parent 502a131 commit 52bb3f7
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 80 deletions.
3 changes: 3 additions & 0 deletions src/devices/video/zeus2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ class zeus2_device : public device_t, public device_video_interface

template <class Object> devcb_base &set_vblank_callback(Object &&cb) { return m_vblank.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_irq.set_callback(std::forward<Object>(cb)); }
auto vblank_callback() { return m_vblank.bind(); }
auto irq_callback() { return m_irq.bind(); }

devcb_write_line m_vblank;
devcb_write_line m_irq;

Expand Down
3 changes: 1 addition & 2 deletions src/mame/drivers/iteagle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ MACHINE_CONFIG_START(iteagle_state::iteagle)

ITEAGLE_PERIPH(config, PCI_ID_PERIPH, 0);
IDE_PCI(config, PCI_ID_IDE, 0, 0x1080C693, 0x00, 0x0)
.irq_handler()
.set_inputline(m_maincpu, MIPS3_IRQ2);
.irq_handler().set_inputline(m_maincpu, MIPS3_IRQ2);

ITEAGLE_FPGA(config, m_fpga, 0, "screen", m_maincpu, MIPS3_IRQ1, MIPS3_IRQ4);
m_fpga->in_callback<iteagle_fpga_device::IO_SW5>().set_ioport("SW5");
Expand Down
103 changes: 35 additions & 68 deletions src/mame/drivers/midzeus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The Grid v1.2 10/18/2000
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "includes/midzeus.h"
#include "machine/midwayic.h"

#include "audio/dcs.h"
#include "machine/nvram.h"

Expand All @@ -41,26 +41,6 @@ The Grid v1.2 10/18/2000

#define CPU_CLOCK XTAL(60'000'000)

#define BEAM_DY 3
#define BEAM_DX 3
#define BEAM_XOFFS 40 /* table in the code indicates an offset of 20 with a beam height of 7 */

static uint32_t gun_control;
static uint8_t gun_irq_state;
static emu_timer * gun_timer[2];
static int32_t gun_x[2], gun_y[2];

static uint8_t crusnexo_leds_select;
static uint8_t keypad_select;
static uint32_t disk_asic[0x10];
static uint32_t disk_asic_jr[0x10];

static uint8_t cmos_protected;


static emu_timer *timer[2];


/*************************************************************************
Driver for Midway Zeus2 games
**************************************************************************/
Expand Down Expand Up @@ -603,9 +583,7 @@ WRITE32_MEMBER(midzeus_state::tms32031_control_w)
CUSTOM_INPUT_MEMBER(midzeus_state::custom_49way_r)
{
static const uint8_t translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x0 };
const char *namex = (const char *)param;
const char *namey = namex + strlen(namex) + 1;
return (translate49[ioport(namey)->read() >> 4] << 4) | translate49[ioport(namex)->read() >> 4];
return (translate49[m_io_49way_y->read() >> 4] << 4) | translate49[m_io_49way_x->read() >> 4];
}


Expand All @@ -618,7 +596,7 @@ WRITE32_MEMBER(midzeus_state::keypad_select_w)

CUSTOM_INPUT_MEMBER(midzeus_state::keypad_r)
{
uint32_t bits = ioport((const char *)param)->read();
uint32_t bits = m_io_keypad->read();
uint8_t select = keypad_select;
while ((select & 1) != 0)
{
Expand All @@ -630,16 +608,16 @@ CUSTOM_INPUT_MEMBER(midzeus_state::keypad_r)

READ32_MEMBER(midzeus_state::grid_keypad_r)
{
uint32_t bits = (ioport("KEYPAD")->read() >> ((offset >> 1) << 2)) & 0xf;
uint32_t bits = (m_io_keypad->read() >> ((offset >> 1) << 2)) & 0xf;
return bits;
}

READ32_MEMBER(midzeus_state::trackball_r)
{
if (offset==0)
return ioport("TRACKY1")->read();
return m_io_tracky->read();
else
return ioport("TRACKX1")->read();
return m_io_trackx->read();
}


Expand All @@ -652,10 +630,9 @@ READ32_MEMBER(midzeus_state::trackball_r)

READ32_MEMBER(midzeus_state::analog_r)
{
static const char * const tags[] = { "ANALOG0", "ANALOG1", "ANALOG2", "ANALOG3" };
if (offset < 8 || offset > 11)
logerror("%06X:analog_r(%X)\n", m_maincpu->pc(), offset);
return ioport(tags[offset & 3])->read();
return m_io_analog[offset & 3]->read();
}


Expand Down Expand Up @@ -716,13 +693,8 @@ WRITE32_MEMBER(midzeus_state::invasn_gun_w)
if (((old_control ^ gun_control) & pmask) != 0 && (gun_control & pmask) == 0)
{
const rectangle &visarea = m_screen->visible_area();
static const char *const names[2][2] =
{
{ "GUNX1", "GUNY1" },
{ "GUNX2", "GUNY2" }
};
gun_x[player] = ioport(names[player][0])->read() * visarea.width() / 255 + visarea.min_x + BEAM_XOFFS;
gun_y[player] = ioport(names[player][1])->read() * visarea.height() / 255 + visarea.min_y;
gun_x[player] = m_io_gun_x[player]->read() * visarea.width() / 255 + visarea.min_x + BEAM_XOFFS;
gun_y[player] = m_io_gun_y[player]->read() * visarea.height() / 255 + visarea.min_y;
gun_timer[player]->adjust(m_screen->time_until_pos(std::max(0, gun_y[player] - BEAM_DY), std::max(0, gun_x[player] - BEAM_DX)), player);
}
}
Expand Down Expand Up @@ -1128,7 +1100,7 @@ static INPUT_PORTS_START( crusnexo )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )

PORT_START("IN2")
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CUSTOM_MEMBER(DEVICE_SELF, midzeus_state, keypad_r, "KEYPAD" )
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CUSTOM_MEMBER(DEVICE_SELF, midzeus_state, keypad_r, nullptr )
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )

PORT_START("KEYPAD")
Expand Down Expand Up @@ -1244,7 +1216,7 @@ static INPUT_PORTS_START( thegrid )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )

PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, midzeus_state,custom_49way_r, "49WAYX\0" "49WAYY")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, midzeus_state, custom_49way_r, nullptr)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )

PORT_START("49WAYX")
Expand Down Expand Up @@ -1286,9 +1258,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midzeus_state::midzeus)

/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", TMS32032, CPU_CLOCK)
MCFG_DEVICE_PROGRAM_MAP(zeus_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus_state, display_irq)
TMS32032(config, m_maincpu, CPU_CLOCK);
m_maincpu->set_addrmap(AS_PROGRAM, &midzeus_state::zeus_map);
m_maincpu->set_vblank_int("screen", FUNC(midzeus_state::display_irq));

MCFG_MACHINE_START_OVERRIDE(midzeus_state,midzeus)
MCFG_MACHINE_RESET_OVERRIDE(midzeus_state,midzeus)
Expand All @@ -1305,34 +1277,31 @@ MACHINE_CONFIG_START(midzeus_state::midzeus)
MCFG_VIDEO_START_OVERRIDE(midzeus_state,midzeus)

/* sound hardware */
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
DCS2_AUDIO_2104(config, "dcs", 0);

MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(94)
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_yearoffs(94);
MACHINE_CONFIG_END

MACHINE_CONFIG_START(midzeus_state::mk4)
midzeus(config);
MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(461/* or 474 */)
MCFG_MIDWAY_IOASIC_SHUFFLE_DEFAULT(1)
m_ioasic->set_upper(461/* or 474 */);
m_ioasic->set_shuffle_default(1);
MACHINE_CONFIG_END

MACHINE_CONFIG_START(midzeus_state::invasn)
midzeus(config);
MCFG_DEVICE_ADD("pic", PIC16C57, 8000000) /* ? */

MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(468/* or 488 */)
PIC16C57(config, "pic", 8000000); /* ? */
m_ioasic->set_upper(468/* or 488 */);
MACHINE_CONFIG_END

MACHINE_CONFIG_START(midzeus2_state::midzeus2)

/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", TMS32032, CPU_CLOCK)
MCFG_DEVICE_PROGRAM_MAP(zeus2_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus2_state, display_irq)
TMS32032(config, m_maincpu, CPU_CLOCK);
m_maincpu->set_addrmap(AS_PROGRAM, &midzeus2_state::zeus2_map);
m_maincpu->set_vblank_int("screen", FUNC(midzeus2_state::display_irq));

MCFG_MACHINE_RESET_OVERRIDE(midzeus2_state,midzeus)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
Expand All @@ -1342,30 +1311,28 @@ MACHINE_CONFIG_START(midzeus2_state::midzeus2)
MCFG_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/4, 666, 0, 512, 438, 0, 400)
MCFG_SCREEN_UPDATE_DEVICE("zeus2", zeus2_device, screen_update)

MCFG_DEVICE_ADD("zeus2", ZEUS2, ZEUS2_VIDEO_CLOCK)
MCFG_ZEUS2_IRQ_CB(WRITELINE(*this, midzeus2_state, zeus_irq))
ZEUS2(config, m_zeus, ZEUS2_VIDEO_CLOCK);
m_zeus->vblank_callback().set(FUNC(midzeus2_state::zeus_irq));

/* sound hardware */
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
DCS2_AUDIO_2104(config, "dcs", 0);

MCFG_DEVICE_ADD("m48t35", M48T35, 0)
M48T35(config, m_m48t35, 0);

MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(99)
MCFG_MIDWAY_IOASIC_UPPER(474)
MIDWAY_IOASIC(config, m_ioasic, 0);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_yearoffs(99);
m_ioasic->set_upper(474);
MACHINE_CONFIG_END

MACHINE_CONFIG_START(midzeus2_state::crusnexo)
midzeus2(config);
MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(472/* or 476,477,478,110 */)
m_ioasic->set_upper(472/* or 476,477,478,110 */);
MACHINE_CONFIG_END

MACHINE_CONFIG_START(midzeus2_state::thegrid)
midzeus2(config);
MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(474/* or 491 */)
m_ioasic->set_upper(474/* or 491 */);
MACHINE_CONFIG_END


Expand Down
56 changes: 46 additions & 10 deletions src/mame/includes/midzeus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
**************************************************************************/

#define MIDZEUS_VIDEO_CLOCK XTAL(66'666'700)

#include "machine/timekpr.h"
#include "emupal.h"
#include "screen.h"
#include "machine/midwayic.h"

class midzeus_state : public driver_device
{
Expand All @@ -21,25 +20,34 @@ class midzeus_state : public driver_device
m_ram_base(*this, "ram_base"),
m_firewire(*this, "firewire"),
m_tms32031_control(*this, "tms32031_ctl"),
m_zeusbase(*this, "zeusbase") ,
m_zeusbase(*this, "zeusbase"),
m_m48t35(*this, "m48t35"),
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_ioasic(*this, "ioasic"),
m_io_analog(*this, "ANALOG%u", 0U),
m_io_gun_x(*this, "GUNX%u", 1U),
m_io_gun_y(*this, "GUNY%u", 1U),
m_io_trackx(*this, "TRACKX1"),
m_io_tracky(*this, "TRACKY1"),
m_io_49way_x(*this, "49WAYX"),
m_io_49way_y(*this, "49WAYY"),
m_io_keypad(*this, "KEYPAD"),
m_digits(*this, "digit%u", 0U)
{ }
{ }

//static constexpr XTAL CPU_CLOCK = XTAL(60'000'000);
static constexpr XTAL MIDZEUS_VIDEO_CLOCK = XTAL(66'666'700);
static constexpr int BEAM_DY = 3;
static constexpr int BEAM_DX = 3;
static constexpr int BEAM_XOFFS = 40; // table in the code indicates an offset of 20 with a beam height of 7

required_shared_ptr<uint32_t> m_nvram;
required_shared_ptr<uint32_t> m_ram_base;
optional_shared_ptr<uint32_t> m_firewire;
required_shared_ptr<uint32_t> m_tms32031_control;
optional_shared_ptr<uint32_t> m_zeusbase;
optional_device<timekeeper_device> m_m48t35;
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
optional_device<palette_device> m_palette;
output_finder<7> m_digits;
emu_timer *m_display_irq_off_timer;

DECLARE_WRITE32_MEMBER(cmos_w);
DECLARE_READ32_MEMBER(cmos_r);
Expand Down Expand Up @@ -78,7 +86,35 @@ class midzeus_state : public driver_device
void invasn(machine_config &config);
void mk4(machine_config &config);
void zeus_map(address_map &map);
protected:
optional_device<timekeeper_device> m_m48t35;
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
optional_device<palette_device> m_palette;
required_device<midway_ioasic_device> m_ioasic;
optional_ioport_array<4> m_io_analog;
optional_ioport_array<2> m_io_gun_x;
optional_ioport_array<2> m_io_gun_y;
optional_ioport m_io_trackx;
optional_ioport m_io_tracky;
optional_ioport m_io_49way_x;
optional_ioport m_io_49way_y;
optional_ioport m_io_keypad;
output_finder<7> m_digits;
emu_timer *m_display_irq_off_timer;
uint8_t crusnexo_leds_select;
uint32_t disk_asic[0x10];
uint32_t disk_asic_jr[0x10];

uint8_t cmos_protected;

emu_timer *timer[2];
private:
uint32_t gun_control;
uint8_t gun_irq_state;
emu_timer * gun_timer[2];
int32_t gun_x[2], gun_y[2];
uint8_t keypad_select;
void exit_handler();
void zeus_pointer_w(uint32_t which, uint32_t data, bool logit);
void zeus_register16_w(offs_t offset, uint16_t data, bool logit);
Expand Down

0 comments on commit 52bb3f7

Please sign in to comment.