diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-04 07:03:38 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-04 07:03:38 +0100 |
commit | 41681c1703244abe68cbcf3096ca259bd061cc08 (patch) | |
tree | 85d24789ff864e1b0f35fb87f0c58bad5925e27d /src/mame/drivers/apple2e.cpp | |
parent | 0c56ac848dd0eba359500d444ecbb51f215ff5b9 (diff) |
clang-modernize part 4
Diffstat (limited to 'src/mame/drivers/apple2e.cpp')
-rw-r--r-- | src/mame/drivers/apple2e.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 3938d375848..a295c1a7cb1 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -593,7 +593,7 @@ void apple2e_state::machine_start() else // no expansion { m_exp_addrmask = 0; - m_exp_ram = NULL; + m_exp_ram = nullptr; } // precalculate joystick time constants @@ -607,8 +607,8 @@ void apple2e_state::machine_start() } // and aux slot device if any - m_aux_ptr = NULL; - m_aux_bank_ptr = NULL; + m_aux_ptr = nullptr; + m_aux_bank_ptr = nullptr; if (m_a2eauxslot) { m_auxslotdevice = m_a2eauxslot->get_a2eauxslot_card(); @@ -620,7 +620,7 @@ void apple2e_state::machine_start() } else // IIc has 128K right on the motherboard { - m_auxslotdevice = NULL; + m_auxslotdevice = nullptr; if (m_ram_size >= (128*1024)) { @@ -1853,7 +1853,7 @@ READ8_MEMBER(apple2e_state::c080_r) } else { - if (m_slotdevice[slot] != NULL) + if (m_slotdevice[slot] != nullptr) { return m_slotdevice[slot]->read_c0nx(space, offset % 0x10); } @@ -1876,7 +1876,7 @@ WRITE8_MEMBER(apple2e_state::c080_w) } else { - if (m_slotdevice[slot] != NULL) + if (m_slotdevice[slot] != nullptr) { m_slotdevice[slot]->write_c0nx(space, offset % 0x10, data); } @@ -1887,7 +1887,7 @@ UINT8 apple2e_state::read_slot_rom(address_space &space, int slotbias, int offse { int slotnum = ((offset>>8) & 0xf) + slotbias; - if (m_slotdevice[slotnum] != NULL) + if (m_slotdevice[slotnum] != nullptr) { if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!space.debugger_access())) { @@ -1905,7 +1905,7 @@ void apple2e_state::write_slot_rom(address_space &space, int slotbias, int offse { int slotnum = ((offset>>8) & 0xf) + slotbias; - if (m_slotdevice[slotnum] != NULL) + if (m_slotdevice[slotnum] != nullptr) { if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!space.debugger_access())) { @@ -1955,7 +1955,7 @@ READ8_MEMBER(apple2e_state::c800_r) return 0xff; } - if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != NULL)) + if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr)) { return m_slotdevice[m_cnxx_slot]->read_c800(space, offset&0xfff); } @@ -1978,7 +1978,7 @@ WRITE8_MEMBER(apple2e_state::c800_w) return; } - if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != NULL)) + if ((m_cnxx_slot > 0) && (m_slotdevice[m_cnxx_slot] != nullptr)) { m_slotdevice[m_cnxx_slot]->write_c800(space, offset&0xfff, data); } @@ -3174,13 +3174,13 @@ static MACHINE_CONFIG_START( apple2e, apple2e_state ) MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(apple2e_state, a2bus_irq_w)) MCFG_A2BUS_OUT_NMI_CB(WRITELINE(apple2e_state, a2bus_nmi_w)) MCFG_A2BUS_OUT_INH_CB(WRITELINE(apple2e_state, a2bus_inh_w)) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, nullptr) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, nullptr) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, nullptr) MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, "mockingboard") - MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, nullptr) MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, "diskiing") - MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, nullptr) MCFG_DEVICE_ADD(A2_AUXSLOT_TAG, A2EAUXSLOT, 0) MCFG_A2EAUXSLOT_CPU("maincpu") @@ -3241,13 +3241,13 @@ static MACHINE_CONFIG_DERIVED( apple2c, apple2ee ) MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // matches SSC so modem software is compatible MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd)) - MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_rxd)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dcd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dsr)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_cts)) - MCFG_RS232_PORT_ADD(MODEM_PORT_TAG, default_rs232_devices, NULL) + MCFG_RS232_PORT_ADD(MODEM_PORT_TAG, default_rs232_devices, nullptr) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_rxd)) MCFG_RS232_DCD_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dcd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dsr)) @@ -3335,9 +3335,9 @@ static MACHINE_CONFIG_DERIVED( laser128, apple2c ) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl2", A2BUS_LASER128, NULL) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LASER128, NULL) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl4", A2BUS_LASER128, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, nullptr) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_LASER128, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, nullptr) MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("128K") |