From 96d123b42c87007222bb545878cdef0116b60885 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 24 Apr 2016 15:15:04 +0200 Subject: NULL->nullptr, instead of DEVCB_NULL use always DEVCB_NOOP to prevent confusion (nw) --- src/devices/machine/corvushd.cpp | 2 +- src/devices/machine/cs4031.cpp | 2 +- src/devices/machine/genpc.cpp | 2 +- src/devices/machine/gt64xxx.cpp | 2 +- src/devices/machine/i80130.cpp | 2 +- src/devices/machine/laserdsc.h | 2 +- src/devices/machine/netlist.h | 2 +- src/devices/machine/nvram.h | 4 ++-- src/devices/machine/pdc.cpp | 2 +- src/devices/machine/ram.h | 2 +- src/devices/machine/rtc65271.h | 2 +- src/devices/machine/stvcd.cpp | 4 ++-- src/devices/machine/wd7600.cpp | 2 +- src/devices/machine/z80ctc.h | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/devices/machine') diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp index 08536344849..d1cdfcd1835 100644 --- a/src/devices/machine/corvushd.cpp +++ b/src/devices/machine/corvushd.cpp @@ -1222,7 +1222,7 @@ void corvus_hdc_t::device_timer(emu_timer &timer, device_timer_id id, int param, // Nothing // // Returns: -// NULL if there's no file to attach to +// nullptr if there's no file to attach to // void corvus_hdc_t::device_start() { m_status &= ~(CONTROLLER_DIRECTION | CONTROLLER_BUSY); // Host-to-controller mode, Idle (awaiting command from Host mode) diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index b6d8de1acd8..4331747e506 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -125,7 +125,7 @@ static MACHINE_CONFIG_FRAGMENT( cs4031 ) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(cs4031_device, dma2_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(cs4031_device, dma2_dack3_w)) MCFG_PIC8259_ADD("intc1", WRITELINE(cs4031_device, intc1_int_w), VCC, READ8(cs4031_device, intc1_slave_ack_r)) - MCFG_PIC8259_ADD("intc2", DEVWRITELINE("intc1", pic8259_device, ir2_w), GND, NULL) + MCFG_PIC8259_ADD("intc2", DEVWRITELINE("intc1", pic8259_device, ir2_w), GND, NOOP) MCFG_DEVICE_ADD("ctc", PIT8254, 0) MCFG_PIT8253_CLK0(XTAL_14_31818MHz / 12) diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index a363c0d75aa..978683d7ab5 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -418,7 +418,7 @@ static MACHINE_CONFIG_FRAGMENT( ibm5160_mb_config ) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(ibm5160_mb_device, pc_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(ibm5160_mb_device, pc_dack3_w)) - MCFG_PIC8259_ADD( "pic8259", INPUTLINE(":maincpu", 0), VCC, NULL ) + MCFG_PIC8259_ADD( "pic8259", INPUTLINE(":maincpu", 0), VCC, NOOP) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(ibm5160_mb_device, pc_ppi_porta_r)) diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index 126741f3730..4c096af6a3e 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -34,7 +34,7 @@ gt64xxx_device::gt64xxx_device(const machine_config &mconfig, const char *tag, d const address_space_config *gt64xxx_device::memory_space_config(address_spacenum spacenum) const { - return (spacenum == AS_PROGRAM) ? pci_bridge_device::memory_space_config(spacenum) : (spacenum == AS_DATA) ? &m_mem_config : (spacenum == AS_IO) ? &m_io_config : NULL; + return (spacenum == AS_PROGRAM) ? pci_bridge_device::memory_space_config(spacenum) : (spacenum == AS_DATA) ? &m_mem_config : (spacenum == AS_IO) ? &m_io_config : nullptr; } void gt64xxx_device::device_start() diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp index fb419a06090..fee62312f7e 100644 --- a/src/devices/machine/i80130.cpp +++ b/src/devices/machine/i80130.cpp @@ -98,7 +98,7 @@ const rom_entry *i80130_device::device_rom_region() const //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( i80130 ) - MCFG_PIC8259_ADD("pic", DEVWRITELINE(DEVICE_SELF, i80130_device, irq_w), VCC, NULL) + MCFG_PIC8259_ADD("pic", DEVWRITELINE(DEVICE_SELF, i80130_device, irq_w), VCC, NOOP) MCFG_DEVICE_ADD("pit", PIT8254, 0) MCFG_PIT8253_CLK0(0) diff --git a/src/devices/machine/laserdsc.h b/src/devices/machine/laserdsc.h index c550a9f61aa..7da9dbc94f3 100644 --- a/src/devices/machine/laserdsc.h +++ b/src/devices/machine/laserdsc.h @@ -66,7 +66,7 @@ enum laserdisc_field_code #define MCFG_LASERDISC_OVERLAY_STATIC(_width, _height, _func) \ laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func)); #define MCFG_LASERDISC_OVERLAY_DRIVER(_width, _height, _class, _method) \ - laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, NULL)); + laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, nullptr)); #define MCFG_LASERDISC_OVERLAY_DEVICE(_width, _height, _device, _class, _method) \ laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, _device)); #define MCFG_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \ diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index 00b1e3ad352..a5a71ae2318 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -34,7 +34,7 @@ MCFG_DEVICE_ADD(_basetag ":" _tag, NETLIST_ANALOG_OUTPUT, 0) \ netlist_mame_analog_output_t::static_set_params(*device, _IN, \ netlist_analog_output_delegate(& _class :: _member, \ - # _class "::" # _member, _class_tag, (_class *) 0) ); + # _class "::" # _member, _class_tag, (_class *)nullptr) ); #define MCFG_NETLIST_LOGIC_INPUT(_basetag, _tag, _name, _shift, _mask) \ MCFG_DEVICE_ADD(_basetag ":" _tag, NETLIST_LOGIC_INPUT, 0) \ diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h index c1a733a3953..1d509882cf0 100644 --- a/src/devices/machine/nvram.h +++ b/src/devices/machine/nvram.h @@ -33,7 +33,7 @@ nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_NONE); #define MCFG_NVRAM_ADD_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); + nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); #define MCFG_NVRAM_REPLACE_0FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ @@ -46,7 +46,7 @@ nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); #define MCFG_NVRAM_REPLACE_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); + nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr)); //************************************************************************** diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp index 4a882d12a04..af947a482a9 100644 --- a/src/devices/machine/pdc.cpp +++ b/src/devices/machine/pdc.cpp @@ -280,7 +280,7 @@ static MACHINE_CONFIG_FRAGMENT( pdc ) /* Hard Disk Controller - HDC9224 */ MCFG_DEVICE_ADD(HDC_TAG, HDC9224, 0) - MCFG_MFM_HARDDISK_CONN_ADD("h1", pdc_harddisks, NULL, MFM_BYTE, 3000, 20, MFMHD_GEN_FORMAT) + MCFG_MFM_HARDDISK_CONN_ADD("h1", pdc_harddisks, nullptr, MFM_BYTE, 3000, 20, MFMHD_GEN_FORMAT) MACHINE_CONFIG_END //------------------------------------------------- diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h index 8fbe85cd865..73e7430a6ce 100644 --- a/src/devices/machine/ram.h +++ b/src/devices/machine/ram.h @@ -31,7 +31,7 @@ #define MCFG_RAM_MODIFY(_tag) \ MCFG_DEVICE_MODIFY(_tag) \ - ram_device::static_set_extra_options(*device, NULL); + ram_device::static_set_extra_options(*device, nullptr); #define MCFG_RAM_DEFAULT_SIZE(_default_size) \ ram_device::static_set_default_size(*device, _default_size); diff --git a/src/devices/machine/rtc65271.h b/src/devices/machine/rtc65271.h index 903f5fe9a28..eb97ef6a778 100644 --- a/src/devices/machine/rtc65271.h +++ b/src/devices/machine/rtc65271.h @@ -62,7 +62,7 @@ private: emu_timer *m_SQW_timer; UINT8 m_SQW_internal_state; - /* callback called when interrupt pin state changes (may be NULL) */ + /* callback called when interrupt pin state changes (may be nullptr) */ devcb_write_line m_interrupt_cb; }; diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp index 5ec8fb7c95f..c41f4ad508b 100644 --- a/src/devices/machine/stvcd.cpp +++ b/src/devices/machine/stvcd.cpp @@ -258,7 +258,7 @@ void saturn_state::cd_exec_command( void ) #endif /* reset CD device connection */ - //cddevice = (filterT *)NULL; + //cddevice = (filterT *)nullptr; } hirqreg |= (CMOK|ESEL); @@ -1179,7 +1179,7 @@ void saturn_state::cd_exec_command( void ) //deallocate the src blocks //partitions[src_filter].size -= partitions[src_filter].blocks[i]->size; //cd_free_block(partitions[src_filter].blocks[i]); - //partitions[src_filter].blocks[i] = (blockT *)NULL; + //partitions[src_filter].blocks[i] = (blockT *)nullptr; //partitions[src_filter].bnum[i] = 0xff; } diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index e7ff002ddec..90ed0d9ef73 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -51,7 +51,7 @@ static MACHINE_CONFIG_FRAGMENT( wd7600 ) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(wd7600_device, dma2_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(wd7600_device, dma2_dack3_w)) MCFG_PIC8259_ADD("intc1", WRITELINE(wd7600_device, pic1_int_w), VCC, READ8(wd7600_device, pic1_slave_ack_r)) - MCFG_PIC8259_ADD("intc2", DEVWRITELINE("intc1", pic8259_device, ir2_w), GND, NULL) + MCFG_PIC8259_ADD("intc2", DEVWRITELINE("intc1", pic8259_device, ir2_w), GND, NOOP) MCFG_DEVICE_ADD("ctc", PIT8254, 0) MCFG_PIT8253_CLK0(XTAL_14_31818MHz / 12) diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h index a144ff013d4..87e0011fdfa 100644 --- a/src/devices/machine/z80ctc.h +++ b/src/devices/machine/z80ctc.h @@ -120,7 +120,7 @@ private: devcb_write_line m_zc0_cb; // channel 0 zero crossing callbacks devcb_write_line m_zc1_cb; // channel 1 zero crossing callbacks devcb_write_line m_zc2_cb; // channel 2 zero crossing callbacks - devcb_write_line m_zc3_cb; // channel 3 zero crossing callbacks = NULL ? + devcb_write_line m_zc3_cb; // channel 3 zero crossing callbacks = nullptr ? UINT8 m_vector; // interrupt vector attotime m_period16; // 16/system clock -- cgit v1.2.3-70-g09d2