diff options
author | 2016-04-24 15:15:04 +0200 | |
---|---|---|
committer | 2016-04-24 15:38:49 +0200 | |
commit | 96d123b42c87007222bb545878cdef0116b60885 (patch) | |
tree | a611581b57d4debe784f1134a3de95426a7ba592 /src/devices/bus | |
parent | c2c22570779f69e6921499b7abeb75f6db3d7822 (diff) |
NULL->nullptr, instead of DEVCB_NULL use always DEVCB_NOOP to prevent confusion (nw)
Diffstat (limited to 'src/devices/bus')
38 files changed, 71 insertions, 71 deletions
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp index 881acd496ce..8b378f238b6 100644 --- a/src/devices/bus/a2bus/a2thunderclock.cpp +++ b/src/devices/bus/a2bus/a2thunderclock.cpp @@ -41,7 +41,7 @@ const device_type A2BUS_THUNDERCLOCK = &device_creator<a2bus_thunderclock_device #define THUNDERCLOCK_UPD1990_TAG "thunclk_upd" MACHINE_CONFIG_FRAGMENT( thunderclock ) - MCFG_UPD1990A_ADD(THUNDERCLOCK_UPD1990_TAG, 1021800, DEVWRITELINE(DEVICE_SELF, a2bus_thunderclock_device, upd_dataout_w), NULL) + MCFG_UPD1990A_ADD(THUNDERCLOCK_UPD1990_TAG, 1021800, DEVWRITELINE(DEVICE_SELF, a2bus_thunderclock_device, upd_dataout_w), NOOP) MACHINE_CONFIG_END ROM_START( thunderclock ) diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 17d504472ab..140f3e99a16 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -118,7 +118,7 @@ MACHINE_CONFIG_FRAGMENT( pcxporter ) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(a2bus_pcxporter_device, pc_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(a2bus_pcxporter_device, pc_dack3_w)) - MCFG_PIC8259_ADD( "pic8259", INPUTLINE("v30", 0), VCC, NULL ) + MCFG_PIC8259_ADD( "pic8259", INPUTLINE("v30", 0), VCC, NOOP) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_IN_PORTA_CB(READ8(a2bus_pcxporter_device, pc_ppi_porta_r)) diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index d72a91475be..f380e22e39d 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -58,7 +58,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() \ - MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, 0, c64_expansion_cards, NULL) \ + MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, 0, c64_expansion_cards, nullptr) \ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, irq_w)) \ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, nmi_w)) \ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)) \ diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index 264f6f87f05..cc0b2da9453 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -226,7 +226,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_magic_voice ) MCFG_TPI6525_OUT_PB_CB(WRITE8(c64_magic_voice_cartridge_device, tpi_pb_w)) MCFG_TPI6525_OUT_CA_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_ca_w)) MCFG_TPI6525_OUT_CA_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_cb_w)) - MCFG_40105_ADD(CMOS40105_TAG, DEVWRITELINE(MOS6525_TAG, tpi6525_device, i3_w), NULL) + MCFG_40105_ADD(CMOS40105_TAG, DEVWRITELINE(MOS6525_TAG, tpi6525_device, i3_w), NOOP) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL_640kHz) diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp index af9ea9d2402..422fa7d837d 100644 --- a/src/devices/bus/c64/ps64.cpp +++ b/src/devices/bus/c64/ps64.cpp @@ -65,7 +65,7 @@ const device_type C64_PS64 = &device_creator<c64_ps64_cartridge_device>; /* static struct votrax_sc02_interface votrax_intf = { - DEVCB_NULL + DEVCB_NOOP }; */ diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h index d950a8c19e1..5be1ff5f818 100644 --- a/src/devices/bus/cbmiec/cbmiec.h +++ b/src/devices/bus/cbmiec/cbmiec.h @@ -54,11 +54,11 @@ #define MCFG_CBM_IEC_ADD(_default_drive) \ - MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec4", 4, cbm_iec_devices, nullptr) \ MCFG_CBM_IEC_SLOT_ADD("iec8", 8, cbm_iec_devices, _default_drive) \ - MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, NULL) \ - MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, NULL) \ + MCFG_CBM_IEC_SLOT_ADD("iec9", 9, cbm_iec_devices, nullptr) \ + MCFG_CBM_IEC_SLOT_ADD("iec10", 10, cbm_iec_devices, nullptr) \ + MCFG_CBM_IEC_SLOT_ADD("iec11", 11, cbm_iec_devices, nullptr) \ MCFG_CBM_IEC_BUS_ADD() diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h index c465561d300..a78829ad37b 100644 --- a/src/devices/bus/cgenie/expansion/expansion.h +++ b/src/devices/bus/cgenie/expansion/expansion.h @@ -48,7 +48,7 @@ #define MCFG_EXPANSION_SLOT_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, EXPANSION_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(expansion_slot_carts, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(expansion_slot_carts, nullptr, false) #define MCFG_EXPANSION_SLOT_INT_HANDLER(_devcb) \ devcb = &expansion_slot_device::set_int_handler(*device, DEVCB_##_devcb); diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h index 3c8bd6bf8c0..2c52f54bd2c 100644 --- a/src/devices/bus/cgenie/parallel/parallel.h +++ b/src/devices/bus/cgenie/parallel/parallel.h @@ -33,7 +33,7 @@ #define MCFG_PARALLEL_SLOT_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, PARALLEL_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(parallel_slot_carts, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(parallel_slot_carts, nullptr, false) //************************************************************************** diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp index 5f5dd5f509d..33e2c917024 100644 --- a/src/devices/bus/dmv/k230.cpp +++ b/src/devices/bus/dmv/k230.cpp @@ -74,7 +74,7 @@ static MACHINE_CONFIG_FRAGMENT( dmv_k235 ) MCFG_CPU_IO_MAP(k235_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) - MCFG_PIC8259_ADD("pic8259", INPUTLINE("maincpu", 0), VCC, NULL) + MCFG_PIC8259_ADD("pic8259", INPUTLINE("maincpu", 0), VCC, NOOP) MACHINE_CONFIG_END diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h index 032193baa39..b071e49dde4 100644 --- a/src/devices/bus/generic/slot.h +++ b/src/devices/bus/generic/slot.h @@ -191,11 +191,11 @@ extern const device_type GENERIC_SOCKET; #define MCFG_GENERIC_CARTSLOT_ADD(_tag, _slot_intf, _dev_intf) \ MCFG_DEVICE_ADD(_tag, GENERIC_SOCKET, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) \ MCFG_GENERIC_INTERFACE(_dev_intf) #define MCFG_GENERIC_SOCKET_ADD(_tag, _slot_intf, _dev_intf) \ MCFG_DEVICE_ADD(_tag, GENERIC_SOCKET, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) \ MCFG_GENERIC_INTERFACE(_dev_intf) #define MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT(_tag, _slot_intf, _dev_intf, _default) \ diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index f14189e83d9..61018600ceb 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -64,15 +64,15 @@ #define MCFG_CBM_IEEE488_ADD(_default_drive) \ - MCFG_IEEE488_SLOT_ADD("ieee4", 4, cbm_ieee488_devices, NULL) \ + MCFG_IEEE488_SLOT_ADD("ieee4", 4, cbm_ieee488_devices, nullptr) \ MCFG_IEEE488_SLOT_ADD("ieee8", 8, cbm_ieee488_devices, _default_drive) \ - MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee12", 12, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee13", 13, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee14", 14, cbm_ieee488_devices, NULL) \ - MCFG_IEEE488_SLOT_ADD("ieee15", 15, cbm_ieee488_devices, NULL) \ + MCFG_IEEE488_SLOT_ADD("ieee9", 9, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee10", 10, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee11", 11, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee12", 12, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee13", 13, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee14", 14, cbm_ieee488_devices, nullptr) \ + MCFG_IEEE488_SLOT_ADD("ieee15", 15, cbm_ieee488_devices, nullptr) \ MCFG_IEEE488_BUS_ADD() diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 0536b4aba07..d4e4617a332 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -272,7 +272,7 @@ static MACHINE_CONFIG_FRAGMENT( softbox ) MCFG_HARDDISK_INTERFACE("corvus_hdd") MCFG_HARDDISK_ADD("harddisk4") MCFG_HARDDISK_INTERFACE("corvus_hdd") - //MCFG_IMI7000_BUS_ADD("imi5000h", NULL, NULL, NULL) + //MCFG_IMI7000_BUS_ADD("imi5000h", nullptr, nullptr, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/iq151/minigraf.cpp b/src/devices/bus/iq151/minigraf.cpp index 14cd9515cf7..0eeae3af73b 100644 --- a/src/devices/bus/iq151/minigraf.cpp +++ b/src/devices/bus/iq151/minigraf.cpp @@ -85,7 +85,7 @@ void iq151_minigraf_device::device_stop() static const rgb_t png_palette[] = { rgb_t::white, rgb_t::black }; // save the paper into a png - png_write_bitmap(file, NULL, *m_paper, 2, png_palette); + png_write_bitmap(file, nullptr, *m_paper, 2, png_palette); } #endif } diff --git a/src/devices/bus/iq151/ms151a.cpp b/src/devices/bus/iq151/ms151a.cpp index c3aedf5f07d..f1bde64cf4c 100644 --- a/src/devices/bus/iq151/ms151a.cpp +++ b/src/devices/bus/iq151/ms151a.cpp @@ -84,7 +84,7 @@ void iq151_ms151a_device::device_stop() static const rgb_t png_palette[] = { rgb_t::white, rgb_t::black }; // save the paper into a png - png_write_bitmap(file, NULL, *m_paper, 2, png_palette); + png_write_bitmap(file, nullptr, *m_paper, 2, png_palette); } #endif } diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index 94601de84da..c55414a62e1 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -105,7 +105,7 @@ void isa8_finalchs_device::device_start() //the included setup program allows any port from 0x100 to 0x1F0 to be selected, at increments of 0x10 //picked the following at random until we get dips hooked up m_isa->install_device(0x160, 0x0161, 0, 0, read8_delegate(FUNC(isa8_finalchs_device::finalchs_r), this), write8_delegate(FUNC(isa8_finalchs_device::finalchs_w), this)); -// timer_pulse(machine, ATTOTIME_IN_HZ(1), NULL, 0, cause_M6502_irq); +// timer_pulse(machine, ATTOTIME_IN_HZ(1), nullptr, 0, cause_M6502_irq); } //------------------------------------------------- diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 5e044759603..453cb5a90d4 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -1345,7 +1345,7 @@ void sc499_ctape_image_device::call_unload() { m_ctape_data.resize(0); // TODO: add save tape on exit? - //if (software_entry() == NULL) + //if (software_entry() == nullptr) //{ // fseek(0, SEEK_SET); // fwrite(m_ctape_data, m_ctape_data.size); diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index e7858521437..72959090f7d 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -61,7 +61,7 @@ static MACHINE_CONFIG_FRAGMENT( southbridge ) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(southbridge_device, pc_dack7_w)) MCFG_PIC8259_ADD( "pic8259_master", INPUTLINE(":maincpu", 0), VCC, READ8(southbridge_device, get_slave_ack) ) - MCFG_PIC8259_ADD( "pic8259_slave", DEVWRITELINE("pic8259_master", pic8259_device, ir2_w), GND, NULL ) + MCFG_PIC8259_ADD( "pic8259_slave", DEVWRITELINE("pic8259_master", pic8259_device, ir2_w), GND, NOOP) MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz) MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET)) diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp index 92bda7e5fbd..fdeba61463e 100644 --- a/src/devices/bus/m5/slot.cpp +++ b/src/devices/bus/m5/slot.cpp @@ -27,7 +27,7 @@ const device_type M5_CART_SLOT = &device_creator<m5_cart_slot_device>; device_m5_cart_interface::device_m5_cart_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device), - m_rom(NULL), + m_rom(nullptr), m_rom_size(0) { } @@ -47,7 +47,7 @@ device_m5_cart_interface::~device_m5_cart_interface() void device_m5_cart_interface::rom_alloc(UINT32 size, const char *tag) { - if (m_rom == NULL) + if (m_rom == nullptr) { m_rom = device().machine().memory().region_alloc(std::string(tag).append(M5SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base(); m_rom_size = size; @@ -163,7 +163,7 @@ bool m5_cart_slot_device::call_load() { m_type=M5_STD; - if (software_entry() != NULL) + if (software_entry() != nullptr) { const char *pcb_name = get_feature("slot"); //software_info *name=m_software_info_ptr; @@ -175,7 +175,7 @@ bool m5_cart_slot_device::call_load() if (m_type == M5_STD || m_type>2) //carts with roms { - UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom"); + UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom"); if (size > 0x5000 && m_type == M5_STD) { @@ -185,7 +185,7 @@ bool m5_cart_slot_device::call_load() m_cart->rom_alloc(size, tag()); - if (software_entry() == NULL) + if (software_entry() == nullptr) fread(m_cart->get_rom_base(), size); else memcpy(m_cart->get_rom_base(), get_software_region("rom"), size); diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h index 5f584ea2b82..9c72dc3c32a 100644 --- a/src/devices/bus/m5/slot.h +++ b/src/devices/bus/m5/slot.h @@ -82,7 +82,7 @@ public: virtual bool is_creatable() const override { return 0; } virtual bool must_be_loaded() const override { return 0; } virtual bool is_reset_on_load() const override { return 1; } - virtual const option_guide *create_option_guide() const override { return NULL; } + virtual const option_guide *create_option_guide() const override { return nullptr; } virtual const char *image_interface() const override { return "m5_cart"; } virtual const char *file_extensions() const override { return "bin,rom"; } diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h index ce8303ff3d4..da3c631859e 100644 --- a/src/devices/bus/msx_slot/cartridge.h +++ b/src/devices/bus/msx_slot/cartridge.h @@ -13,7 +13,7 @@ extern const device_type MSX_SLOT_YAMAHA_EXPANSION; #define MCFG_MSX_SLOT_CARTRIDGE_ADD(_tag, _devcb) \ MCFG_DEVICE_ADD(_tag, MSX_SLOT_CARTRIDGE, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(msx_cart, NULL, false) \ + MCFG_DEVICE_SLOT_INTERFACE(msx_cart, nullptr, false) \ devcb = &msx_slot_cartridge_device::set_irq_handler(*device, DEVCB_##_devcb); diff --git a/src/devices/bus/neogeo/neogeo_intf.cpp b/src/devices/bus/neogeo/neogeo_intf.cpp index c173b00e8db..30877b11be8 100644 --- a/src/devices/bus/neogeo/neogeo_intf.cpp +++ b/src/devices/bus/neogeo/neogeo_intf.cpp @@ -12,14 +12,14 @@ device_neogeo_cart_interface::device_neogeo_cart_interface(const machine_config : device_slot_card_interface(mconfig, device), m_sprite_gfx_address_mask(0) /* -m_rom(NULL), -m_fixed(NULL), -m_sprites(NULL), -m_sprites_optimized(NULL), -m_audio(NULL), -m_ym(NULL), -m_ymdelta(NULL), -m_audiocrypt(NULL) +m_rom(nullptr), +m_fixed(nullptr), +m_sprites(nullptr), +m_sprites_optimized(nullptr), +m_audio(nullptr), +m_ym(nullptr), +m_ymdelta(nullptr), +m_audiocrypt(nullptr) */ { } diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index 20786c3cab3..6d2caeba96d 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -79,7 +79,7 @@ extern const device_type NES_ALADDIN_SLOT; #define MCFG_ALADDIN_MINICART_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, NES_ALADDIN_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) //---------------------------------- diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index bda9edfe50e..a2ae7df2753 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -81,7 +81,7 @@ extern const device_type NES_DATACH_SLOT; #define MCFG_DATACH_MINICART_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, NES_DATACH_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) //-------------------------------- diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h index 3a2f0c6d919..8d75e3d555d 100644 --- a/src/devices/bus/nes/karastudio.h +++ b/src/devices/bus/nes/karastudio.h @@ -78,7 +78,7 @@ extern const device_type NES_KSEXPANSION_SLOT; #define MCFG_KSTUDIO_MINICART_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, NES_KSEXPANSION_SLOT, 0) \ -MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) +MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) //----------------------------------------------- diff --git a/src/devices/bus/nes/nes_ines.inc b/src/devices/bus/nes/nes_ines.inc index c8a495c11fc..a3bf0ad803e 100644 --- a/src/devices/bus/nes/nes_ines.inc +++ b/src/devices/bus/nes/nes_ines.inc @@ -307,7 +307,7 @@ int nes_get_mmc_id( running_machine &machine, int mapper ) { const nes_mmc *mmc = nes_mapper_lookup(mapper); - if (mmc == NULL) + if (mmc == nullptr) fatalerror("Unimplemented Mapper %d\n", mapper); return mmc->pcb_id; diff --git a/src/devices/bus/nes/nes_unif.inc b/src/devices/bus/nes/nes_unif.inc index 4379c9d7602..890685bfe76 100644 --- a/src/devices/bus/nes/nes_unif.inc +++ b/src/devices/bus/nes/nes_unif.inc @@ -79,7 +79,7 @@ static const unif unif_list[] = { "UNL-8237", 0, 0, CHRRAM_0, UNL_8237}, { "UNL-SL1632", 0, 0, CHRRAM_0, REXSOFT_SL1632}, { "UNL-SACHEN-74LS374N", 0, 0, CHRRAM_0, SACHEN_74LS374}, - // mapper 243 variant exists! how to distinguish?!? mapper243_l_w, NULL, NULL, NULL, NULL, NULL, NULL (also uses NT_VERT!) + // mapper 243 variant exists! how to distinguish?!? mapper243_l_w, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr (also uses NT_VERT!) { "UNL-TC-U01-1.5M", 0, 0, CHRRAM_0, SACHEN_TCU01}, { "UNL-SACHEN-8259C", 0, 0, CHRRAM_0, SACHEN_8259C}, { "UNL-SA-016-1M", 0, 0, CHRRAM_0, AVE_NINA06}, // actually this is Mapper 146, but works like 79! diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h index 83393719cf7..53dd8eb66a3 100644 --- a/src/devices/bus/nes/sunsoft_dcs.h +++ b/src/devices/bus/nes/sunsoft_dcs.h @@ -74,7 +74,7 @@ extern const device_type NES_NTB_SLOT; #define MCFG_NTB_MINICART_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, NES_NTB_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) //----------------------------------------------- diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index 3595b013f98..8d69029c132 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -60,7 +60,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD() \ - MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, 0, plus4_expansion_cards, NULL) \ + MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, 0, plus4_expansion_cards, nullptr) \ MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, irq_w)) \ MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(DEVREAD8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_r)) \ MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(DEVWRITE8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_w)) \ diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp index efa739c0742..37d10342d4e 100644 --- a/src/devices/bus/s100/wunderbus.cpp +++ b/src/devices/bus/s100/wunderbus.cpp @@ -86,7 +86,7 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( s100_wunderbus ) - MCFG_PIC8259_ADD(I8259A_TAG, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, pic_int_w), VCC, NULL) + MCFG_PIC8259_ADD(I8259A_TAG, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, pic_int_w), VCC, NOOP) MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL_18_432MHz/10) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) @@ -125,7 +125,7 @@ static MACHINE_CONFIG_FRAGMENT( s100_wunderbus ) MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, ri_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, cts_w)) - MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NULL, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w)) + MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w)) MACHINE_CONFIG_END diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h index 0cbeb6eeba3..98c2b8af348 100644 --- a/src/devices/bus/svi3x8/expander/expander.h +++ b/src/devices/bus/svi3x8/expander/expander.h @@ -48,7 +48,7 @@ #define MCFG_SVI_EXPANDER_BUS_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, SVI_EXPANDER, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(svi_expander_modules, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(svi_expander_modules, nullptr, false) #define MCFG_SVI_EXPANDER_INT_HANDLER(_devcb) \ devcb = &svi_expander_device::set_int_handler(*device, DEVCB_##_devcb); diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp index 79538de37ed..6f29b12b6e2 100644 --- a/src/devices/bus/svi3x8/expander/sv601.cpp +++ b/src/devices/bus/svi3x8/expander/sv601.cpp @@ -25,13 +25,13 @@ static MACHINE_CONFIG_FRAGMENT( sv601 ) MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv601_device, int_w)) MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv601_device, romdis_w)) MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(sv601_device, ramdis_w)) - MCFG_SVI_SLOT_ADD("0", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("1", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("2", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("3", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("4", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("5", svi_slot_cards, NULL) - MCFG_SVI_SLOT_ADD("6", svi_slot_cards, NULL) + MCFG_SVI_SLOT_ADD("0", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("1", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("2", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("3", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("4", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("5", svi_slot_cards, nullptr) + MCFG_SVI_SLOT_ADD("6", svi_slot_cards, nullptr) MACHINE_CONFIG_END machine_config_constructor sv601_device::device_mconfig_additions() const diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp index 489a1ed6625..aef20a8e464 100644 --- a/src/devices/bus/svi3x8/expander/sv602.cpp +++ b/src/devices/bus/svi3x8/expander/sv602.cpp @@ -25,7 +25,7 @@ static MACHINE_CONFIG_FRAGMENT( sv602 ) MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv602_device, int_w)) MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv602_device, romdis_w)) MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(sv602_device, ramdis_w)) - MCFG_SVI_SLOT_ADD("0", sv602_slot_cards, NULL) + MCFG_SVI_SLOT_ADD("0", sv602_slot_cards, nullptr) MACHINE_CONFIG_END machine_config_constructor sv602_device::device_mconfig_additions() const diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h index 47095f7d9ce..498d44da8d8 100644 --- a/src/devices/bus/ti99_peb/peribox.h +++ b/src/devices/bus/ti99_peb/peribox.h @@ -247,7 +247,7 @@ protected: #define MCFG_PERIBOX_SLOT_ADD(_tag, _slot_intf) \ MCFG_DEVICE_ADD(_tag, PERIBOX_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, nullptr, false) #define MCFG_PERIBOX_SLOT_ADD_DEF(_tag, _slot_intf, _default) \ MCFG_DEVICE_ADD(_tag, PERIBOX_SLOT, 0) \ diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp index e93bb86d015..dc2b29b8a2d 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.cpp +++ b/src/devices/bus/ti99_peb/ti_rs232.cpp @@ -199,7 +199,7 @@ bool ti_rs232_attached_device::call_load() } // The following line may cause trouble in the init phase - // card->incoming_dtr(devnumber, (m_file!=NULL)? ASSERT_LINE : CLEAR_LINE); + // card->incoming_dtr(devnumber, (m_file!=nullptr)? ASSERT_LINE : CLEAR_LINE); return false; // OK } diff --git a/src/devices/bus/ti99x/990_dk.cpp b/src/devices/bus/ti99x/990_dk.cpp index 16fd5920d7c..7b6c8e9e36e 100644 --- a/src/devices/bus/ti99x/990_dk.cpp +++ b/src/devices/bus/ti99x/990_dk.cpp @@ -178,7 +178,7 @@ int fd800_legacy_device::do_seek(int unit, int cylinder, int head) return TRUE; } - if (m_drv[unit].img == NULL || !m_drv[unit].img->exists()) + if (m_drv[unit].img == nullptr || !m_drv[unit].img->exists()) { m_stat_reg |= status_drv_not_ready; return TRUE; @@ -186,7 +186,7 @@ int fd800_legacy_device::do_seek(int unit, int cylinder, int head) if (m_drv[unit].log_cylinder[head] == -1) { - if (!read_id(unit, head, &m_drv[unit].log_cylinder[head], NULL)) + if (!read_id(unit, head, &m_drv[unit].log_cylinder[head], nullptr)) { m_stat_reg |= status_ID_not_found; return TRUE; @@ -205,7 +205,7 @@ int fd800_legacy_device::do_seek(int unit, int cylinder, int head) if (m_drv[unit].phys_cylinder != -1) m_drv[unit].phys_cylinder += cylinder-m_drv[unit].log_cylinder[head]; - if (!read_id(unit, head, &m_drv[unit].log_cylinder[head], NULL)) + if (!read_id(unit, head, &m_drv[unit].log_cylinder[head], nullptr)) { m_drv[unit].log_cylinder[head] = -1; m_stat_reg |= status_ID_not_found; @@ -852,7 +852,7 @@ WRITE8_MEMBER( fd800_legacy_device::cru_w ) #if 0 LEGACY_FLOPPY_OPTIONS_START(fd800) // SSSD 8" - LEGACY_FLOPPY_OPTION(fd800, "dsk", "TI990 8\" SSSD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fd800, "dsk", "TI990 8\" SSSD disk image", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([1]) TRACKS([77]) SECTORS([26]) @@ -860,7 +860,7 @@ LEGACY_FLOPPY_OPTIONS_START(fd800) FIRST_SECTOR_ID([1])) // DSSD 8" - LEGACY_FLOPPY_OPTION(fd800, "dsk", "TI990 8\" DSSD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, + LEGACY_FLOPPY_OPTION(fd800, "dsk", "TI990 8\" DSSD disk image", basicdsk_identify_default, basicdsk_construct_default, nullptr, HEADS([2]) TRACKS([77]) SECTORS([26]) diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index 15d67b00e53..097cbc994dd 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -57,7 +57,7 @@ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) #define MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD(_tag) \ - MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, 0, vic20_expansion_cards, NULL) \ + MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, 0, vic20_expansion_cards, nullptr) \ MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, irq_w)) \ MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, nmi_w)) \ MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, res_w)) diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index c8ec78042d6..bd98a4aaeb1 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -38,7 +38,7 @@ #define MCFG_IOEXP_SLOT_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, IOEXP_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(ioexp_slot_carts, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(ioexp_slot_carts, nullptr, false) //************************************************************************** diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index 9085c2ce6cb..1026ddb2bba 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -45,7 +45,7 @@ #define MCFG_MEMEXP_SLOT_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, MEMEXP_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(memexp_slot_carts, NULL, false) + MCFG_DEVICE_SLOT_INTERFACE(memexp_slot_carts, nullptr, false) #define MCFG_MEMEXP_SLOT_INT_HANDLER(_devcb) \ devcb = &memexp_device::set_int_handler(*device, DEVCB_##_devcb); |