Remove code obfuscation, please don't revert my changes without discussing it first. [smf]

This commit is contained in:
smf- 2014-01-02 12:03:07 +00:00
parent f704d14ec5
commit aee7317ca2
3 changed files with 5 additions and 15 deletions

View File

@ -959,7 +959,7 @@ static MACHINE_CONFIG_START( mac512ke, mac_state )
MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
MCFG_MACKBD_ADD()
MCFG_DEVICE_ADD(MACKBD_TAG, MACKBD, 0)
#ifdef MAC_USE_EMULATED_KBD
MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac_state, mac_kbd_clk_in))
@ -1017,7 +1017,7 @@ static MACHINE_CONFIG_DERIVED( macse, macplus )
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
MCFG_MACKBD_REMOVE()
MCFG_DEVICE_REMOVE(MACKBD_TAG)
MCFG_MACPDS_BUS_ADD("sepds", "maincpu", macpds_intf)
MCFG_MACPDS_SLOT_ADD("sepds", "pds", mac_sepds_cards, NULL)
@ -1041,7 +1041,7 @@ static MACHINE_CONFIG_DERIVED( macclasc, macplus )
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
MCFG_MACKBD_REMOVE()
MCFG_DEVICE_REMOVE(MACKBD_TAG)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( macprtb, mac_state )

View File

@ -27,6 +27,7 @@
#define MAC_SCREEN_NAME "screen"
#define MAC_539X_1_TAG "scsi:539x_1"
#define MAC_539X_2_TAG "scsi:539x_2"
#define MACKBD_TAG "mackbd"
// uncomment to run i8021 keyboard in orignal Mac/512(e)/Plus
//#define MAC_USE_EMULATED_KBD (1)
@ -200,7 +201,7 @@ public:
m_539x_1(*this, MAC_539X_1_TAG),
m_539x_2(*this, MAC_539X_2_TAG),
m_ncr5380(*this, "scsi:ncr5380"),
m_mackbd(*this, MACKBD_DEFAULT_TAG),
m_mackbd(*this, MACKBD_TAG),
m_rtc(*this,"rtc"),
m_mouse0(*this, "MOUSE0"),
m_mouse1(*this, "MOUSE1"),

View File

@ -11,17 +11,6 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
#define MACKBD_DEFAULT_TAG "mackbd"
#define MCFG_MACKBD_ADD() \
MCFG_DEVICE_ADD(MACKBD_DEFAULT_TAG, MACKBD, 0)
#define MCFG_MACKBD_REPLACE() \
MCFG_DEVICE_REPLACE(MACKBD_DEFAULT_TAG, MACKBD, 0)
#define MCFG_MACKBD_REMOVE() \
MCFG_DEVICE_REMOVE(MACKBD_DEFAULT_TAG)
#define MCFG_MACKBD_CLKOUT_HANDLER(_devcb) \
devcb = &mackbd_device::set_clkout_handler(*device, DEVCB2_##_devcb);