Skip to content

Commit

Permalink
-arcadia, binbug, cd2650, cvs, dm7000, dolphunk, galaxia, hp48, instr…
Browse files Browse the repository at this point in the history 
…uct, konamim2, laserbat, phunsy, pipbug, quasar,

 quizshow, ravens, subhuntr, taitopjc, tx0, vc4000, zac_1, zac_2: Removed MACHINE_CONFIG. [Ryan Holtz]

-bus/arcadia/slot, bus/vc4000/slot, tx0, ppc, s2650, saturn: Removed MCFG macros. [Ryan Holtz]
  • Loading branch information
@MooglyGuy
MooglyGuy committed Dec 15, 2018
1 parent f41b6e8 commit b865623
Show file tree
Hide file tree
Showing 46 changed files with 814 additions and 881 deletions.
26 changes: 10 additions & 16 deletions src/devices/bus/arcadia/slot.h
View file
Expand Up @@ -5,20 +5,19 @@

#include "softlist_dev.h"

#define EA2001SLOT_ROM_REGION_TAG ":cart:rom"

/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/


/* PCB */
enum
{
ARCADIA_STD = 0,
ARCADIA_GOLF
};


// ======================> device_arcadia_cart_interface

class device_arcadia_cart_interface : public device_slot_card_interface
Expand Down Expand Up @@ -51,6 +50,15 @@ class arcadia_cart_slot_device : public device_t,
{
public:
// construction/destruction
template <typename T>
arcadia_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
: arcadia_cart_slot_device(mconfig, tag, owner, (uint32_t)0)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
arcadia_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~arcadia_cart_slot_device();

Expand Down Expand Up @@ -85,20 +93,6 @@ class arcadia_cart_slot_device : public device_t,
device_arcadia_cart_interface* m_cart;
};



// device type definition
DECLARE_DEVICE_TYPE(EA2001_CART_SLOT, arcadia_cart_slot_device)


/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/

#define EA2001SLOT_ROM_REGION_TAG ":cart:rom"

#define MCFG_ARCADIA_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \
MCFG_DEVICE_ADD(_tag, EA2001_CART_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)

#endif // MAME_BUS_ARCADIA_SLOT_H
38 changes: 19 additions & 19 deletions src/devices/bus/vc4000/slot.h
View file
Expand Up @@ -6,10 +6,7 @@
#include "softlist_dev.h"


/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/

#define VC4000SLOT_ROM_REGION_TAG ":cart:rom"

/* PCB */
enum
Expand Down Expand Up @@ -62,6 +59,15 @@ class vc4000_cart_slot_device : public device_t,
{
public:
// construction/destruction
template <typename T>
vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, char const *dflt)
: vc4000_cart_slot_device(mconfig, tag, owner, (uint32_t)0)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
vc4000_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~vc4000_cart_slot_device();

Expand Down Expand Up @@ -111,6 +117,15 @@ class h21_cart_slot_device : public vc4000_cart_slot_device
{
public:
// construction/destruction
template <typename T>
h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, char const *dflt)
: h21_cart_slot_device(mconfig, tag, owner, (uint32_t)0)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~h21_cart_slot_device();

Expand All @@ -121,19 +136,4 @@ class h21_cart_slot_device : public vc4000_cart_slot_device
DECLARE_DEVICE_TYPE(VC4000_CART_SLOT, vc4000_cart_slot_device)
DECLARE_DEVICE_TYPE(H21_CART_SLOT, h21_cart_slot_device)


/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/

#define VC4000SLOT_ROM_REGION_TAG ":cart:rom"

#define MCFG_VC4000_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \
MCFG_DEVICE_ADD(_tag, VC4000_CART_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)

#define MCFG_H21_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \
MCFG_DEVICE_ADD(_tag, H21_CART_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)

#endif // MAME_BUS_VC4000_SLOT_H
33 changes: 10 additions & 23 deletions src/devices/cpu/pdp1/tx0.h
View file
Expand Up @@ -21,33 +21,20 @@ enum
};


#define MCFG_TX0_CONFIG(_cpy_devcb, _r1l_devcb, _dis_devcb, _r3l_devcb, _prt_devcb, _rsv_devcb, _p6h_devcb, _p7h_devcb, _sel_devcb, _res_devcb) \
downcast<tx0_device &>(*device).set_cpy_cb(DEVCB_##_cpy_devcb); \
downcast<tx0_device &>(*device).set_r1l_cb(DEVCB_##_r1l_devcb); \
downcast<tx0_device &>(*device).set_dis_cb(DEVCB_##_dis_devcb); \
downcast<tx0_device &>(*device).set_r3l_cb(DEVCB_##_r3l_devcb); \
downcast<tx0_device &>(*device).set_prt_cb(DEVCB_##_prt_devcb); \
downcast<tx0_device &>(*device).set_rsv_cb(DEVCB_##_rsv_devcb); \
downcast<tx0_device &>(*device).set_p6h_cb(DEVCB_##_p6h_devcb); \
downcast<tx0_device &>(*device).set_p7h_cb(DEVCB_##_p7h_devcb); \
downcast<tx0_device &>(*device).set_sel_cb(DEVCB_##_sel_devcb); \
downcast<tx0_device &>(*device).set_res_cb(DEVCB_##_res_devcb);


class tx0_device : public cpu_device
{
public:
// configuration helpers
template <class Object> devcb_base &set_cpy_cb(Object &&cb) { return m_cpy_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_r1l_cb(Object &&cb) { return m_r1l_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_dis_cb(Object &&cb) { return m_dis_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_r3l_cb(Object &&cb) { return m_r3l_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_prt_cb(Object &&cb) { return m_prt_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_rsv_cb(Object &&cb) { return m_rsv_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_p6h_cb(Object &&cb) { return m_p6h_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_p7h_cb(Object &&cb) { return m_p7h_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_sel_cb(Object &&cb) { return m_sel_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_res_cb(Object &&cb) { return m_io_reset_callback.set_callback(std::forward<Object>(cb)); }
auto cpy() { return m_cpy_handler.bind(); }
auto r1l() { return m_r1l_handler.bind(); }
auto dis() { return m_dis_handler.bind(); }
auto r3l() { return m_r3l_handler.bind(); }
auto prt() { return m_prt_handler.bind(); }
auto rsv() { return m_rsv_handler.bind(); }
auto p6h() { return m_p6h_handler.bind(); }
auto p7h() { return m_p7h_handler.bind(); }
auto sel() { return m_sel_handler.bind(); }
auto res() { return m_io_reset_callback.bind(); }

void pulse_reset();
void io_complete();
Expand Down
4 changes: 0 additions & 4 deletions src/devices/cpu/powerpc/ppc.h
View file
Expand Up @@ -164,10 +164,6 @@ enum
PUBLIC FUNCTIONS
***************************************************************************/

#define MCFG_PPC_BUS_FREQUENCY(_frequency) \
downcast<ppc_device &>(*device).set_bus_frequency(_frequency);


class ppc_device : public cpu_device, public device_vtlb_interface
{
protected:
Expand Down
11 changes: 0 additions & 11 deletions src/devices/cpu/s2650/s2650.h
View file
Expand Up @@ -23,19 +23,8 @@ enum
S2650_DATA_PORT = 1
};


DECLARE_DEVICE_TYPE(S2650, s2650_device)


#define MCFG_S2650_SENSE_INPUT(_devcb) \
downcast<s2650_device &>(*device).set_sense_handler(DEVCB_##_devcb);

#define MCFG_S2650_FLAG_OUTPUT(_devcb) \
downcast<s2650_device &>(*device).set_flag_handler(DEVCB_##_devcb);

#define MCFG_S2650_INTACK_HANDLER(_devcb) \
downcast<s2650_device &>(*device).set_intack_handler(DEVCB_##_devcb);

class s2650_device : public cpu_device, public s2650_disassembler::config
{
public:
Expand Down
27 changes: 8 additions & 19 deletions src/devices/cpu/saturn/saturn.h
View file
Expand Up @@ -62,32 +62,21 @@ enum
#define SATURN_WAKEUP_LINE 2


#define MCFG_SATURN_CONFIG(_out, _in, _reset, _config, _unconfig, _id, _crc, _rsi) \
downcast<saturn_device &>(*device).set_out_func(DEVCB_##_out); \
downcast<saturn_device &>(*device).set_in_func(DEVCB_##_in); \
downcast<saturn_device &>(*device).set_reset_func(DEVCB_##_reset); \
downcast<saturn_device &>(*device).set_config_func(DEVCB_##_config); \
downcast<saturn_device &>(*device).set_unconfig_func(DEVCB_##_unconfig); \
downcast<saturn_device &>(*device).set_id_func(DEVCB_##_id); \
downcast<saturn_device &>(*device).set_crc_func(DEVCB_##_crc); \
downcast<saturn_device &>(*device).set_rsi_func(DEVCB_##_rsi);


class saturn_device : public cpu_device, public saturn_disassembler::config
{
public:
// construction/destruction
saturn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

// configuration helpers
template <class Object> devcb_base &set_out_func(Object &&cb) { return m_out_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_in_func(Object &&cb) { return m_in_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_reset_func(Object &&cb) { return m_reset_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_config_func(Object &&cb) { return m_config_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_unconfig_func(Object &&cb) { return m_unconfig_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_id_func(Object &&cb) { return m_id_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_crc_func(Object &&cb) { return m_crc_func.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_rsi_func(Object &&cb) { return m_rsi_func.set_callback(std::forward<Object>(cb)); }
auto out_func() { return m_out_func.bind(); }
auto in_func() { return m_in_func.bind(); }
auto reset_func() { return m_reset_func.bind(); }
auto config_func() { return m_config_func.bind(); }
auto unconfig_func() { return m_unconfig_func.bind(); }
auto id_func() { return m_id_func.bind(); }
auto crc_func() { return m_crc_func.bind(); }
auto rsi_func() { return m_rsi_func.bind(); }

protected:
// device-level overrides
Expand Down
9 changes: 0 additions & 9 deletions src/devices/cpu/scmp/scmp.h
View file
Expand Up @@ -6,15 +6,6 @@
#pragma once


#define MCFG_SCMP_CONFIG(_flag_out_devcb, _sout_devcb, _sin_devcb, _sensea_devcb, _senseb_devcb, _halt_devcb) \
downcast<scmp_device &>(*device).set_flag_out_cb(DEVCB_##_flag_out_devcb); \
downcast<scmp_device &>(*device).set_sout_cb(DEVCB_##_sout_devcb); \
downcast<scmp_device &>(*device).set_sin_cb(DEVCB_##_sin_devcb); \
downcast<scmp_device &>(*device).set_sensea_cb( DEVCB_##_sensea_devcb); \
downcast<scmp_device &>(*device).set_senseb_cb(DEVCB_##_senseb_devcb); \
downcast<scmp_device &>(*device).set_halt_cb(DEVCB_##_halt_devcb);


class scmp_device : public cpu_device
{
public:
Expand Down
2 changes: 2 additions & 0 deletions src/devices/video/dm9368.h
View file
Expand Up @@ -47,6 +47,8 @@ class dm9368_device : public device_t
public:
template <typename Obj> devcb_base &set_update_callback(Obj &&cb) { return m_update_cb.set_callback(std::forward<Obj>(cb)); }
template <typename Obj> devcb_base &set_rbo_callback(Obj &&cb) { return m_rbo_cb.set_callback(std::forward<Obj>(cb)); }
auto update_cb() { return m_update_cb.bind(); }
auto rbo_cb() { return m_rbo_cb.bind(); }

// construction/destruction
dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
Expand Down
12 changes: 6 additions & 6 deletions src/emu/drivers/testcpu.cpp
View file
Expand Up @@ -190,13 +190,13 @@ void testcpu_state::ppc_mem(address_map &map)
// MACHINE DRIVERS
//**************************************************************************

MACHINE_CONFIG_START(testcpu_state::testcpu)

void testcpu_state::testcpu(machine_config &config)
{
// CPUs
MCFG_DEVICE_ADD("maincpu", PPC603E, 66000000)
MCFG_PPC_BUS_FREQUENCY(66000000) // Multiplier 1, Bus = 66MHz, Core = 66MHz
MCFG_DEVICE_PROGRAM_MAP(ppc_mem)
MACHINE_CONFIG_END
PPC603E(config, m_cpu, 66000000);
m_cpu->set_bus_frequency(66000000); // Multiplier 1, Bus = 66MHz, Core = 66MHz
m_cpu->set_addrmap(AS_PROGRAM, &testcpu_state::ppc_mem);
}



Expand Down
48 changes: 25 additions & 23 deletions src/mame/drivers/arcadia.cpp
View file
Expand Up @@ -471,39 +471,41 @@ static void arcadia_cart(device_slot_interface &device)
}


MACHINE_CONFIG_START(arcadia_state::arcadia)
void arcadia_state::arcadia(machine_config &config)
{
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", S2650, 3580000/4) /* 0.895 MHz */
MCFG_DEVICE_PROGRAM_MAP(arcadia_mem)
MCFG_S2650_SENSE_INPUT(READLINE(*this, arcadia_state, vsync_r))
MCFG_DEVICE_PERIODIC_INT_DRIVER(arcadia_state, video_line, 262*60)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
S2650(config, m_maincpu, 3580000/4); /* 0.895 MHz */
m_maincpu->set_addrmap(AS_PROGRAM, &arcadia_state::arcadia_mem);
m_maincpu->sense_handler().set(FUNC(arcadia_state::vsync_r));
m_maincpu->set_periodic_int(FUNC(arcadia_state::video_line), attotime::from_hz(262*60));

config.m_minimum_quantum = attotime::from_hz(60);

/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(128+2*XPOS, 262)
MCFG_SCREEN_VISIBLE_AREA(0, 2*XPOS+128-1, 0, 262-1)
MCFG_SCREEN_UPDATE_DRIVER(arcadia_state, screen_update_arcadia)
MCFG_SCREEN_PALETTE("palette")

MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arcadia)
MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(arcadia_palette))
MCFG_PALETTE_INDIRECT_ENTRIES(8)
MCFG_PALETTE_INIT_OWNER(arcadia_state, arcadia)
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_refresh_hz(60);
m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
m_screen->set_size(128+2*XPOS, 262);
m_screen->set_visarea(0, 2*XPOS+128-1, 0, 262-1);
m_screen->set_screen_update(FUNC(arcadia_state::screen_update_arcadia));
m_screen->set_palette(m_palette);

GFXDECODE(config, m_gfxdecode, m_palette, gfx_arcadia);
PALETTE(config, m_palette, ARRAY_LENGTH(arcadia_palette));
m_palette->set_indirect_entries(8);
m_palette->set_init(FUNC(arcadia_state::palette_init_arcadia));

/* sound hardware */
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("custom", ARCADIA_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
ARCADIA_SOUND(config, m_custom);
m_custom->add_route(ALL_OUTPUTS, "mono", 1.00);

/* cartridge */
MCFG_ARCADIA_CARTRIDGE_ADD("cartslot", arcadia_cart, nullptr)
EA2001_CART_SLOT(config, "cartslot", arcadia_cart, nullptr);

/* Software lists */
MCFG_SOFTWARE_LIST_ADD("cart_list","arcadia")
MACHINE_CONFIG_END
SOFTWARE_LIST(config, "cart_list").set_original("arcadia");
}


ROM_START(advsnha)
Expand Down

0 comments on commit b865623

Please sign in to comment.