Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

clang-modernize part 2

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-12-04 07:02:00 +01:00
parent 029a300363
commit 68f961927a
331 changed files with 1224 additions and 1224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/a1bus/a1bus.cpp
View File

@ -102,7 +102,7 @@ void a1bus_device::device_start()
m_out_nmi_cb.resolve_safe();
// clear slot
m_device = NULL;
m_device = nullptr;
}
//-------------------------------------------------

2
src/devices/bus/a1bus/a1cffa.cpp
View File

@ -24,7 +24,7 @@
const device_type A1BUS_CFFA = &device_creator<a1bus_cffa_device>;
MACHINE_CONFIG_FRAGMENT( cffa )
MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(CFFA_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
ROM_START( cffa )

6
src/devices/bus/a2bus/a2bus.cpp
View File

@ -170,7 +170,7 @@ void a2bus_device::device_start()
// clear slots
for (int i = 0; i < 8; i++)
{
m_device_list[i] = NULL;
m_device_list[i] = nullptr;
}
m_slot_irq_mask = m_slot_nmi_mask = 0;
@ -188,7 +188,7 @@ device_a2bus_card_interface *a2bus_device::get_a2bus_card(int slot)
{
if (slot < 0)
{
return NULL;
return nullptr;
}
if (m_device_list[slot])
@ -196,7 +196,7 @@ device_a2bus_card_interface *a2bus_device::get_a2bus_card(int slot)
return m_device_list[slot];
}
return NULL;
return nullptr;
}
void a2bus_device::add_a2bus_card(int slot, device_a2bus_card_interface *card)

2
src/devices/bus/a2bus/a2cffa.cpp
View File

@ -34,7 +34,7 @@ const device_type A2BUS_CFFA2_6502 = &device_creator<a2bus_cffa2_6502_device>;
#define CFFA2_ATA_TAG "cffa2_ata"
MACHINE_CONFIG_FRAGMENT( cffa2 )
MCFG_ATA_INTERFACE_ADD(CFFA2_ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(CFFA2_ATA_TAG, ata_devices, "hdd", nullptr, false)
// not yet, the core explodes
// MCFG_SOFTWARE_LIST_ADD("hdd_list", "apple2gs_hdd")

2
src/devices/bus/a2bus/a2eauxslot.cpp
View File

@ -104,7 +104,7 @@ void a2eauxslot_device::device_start()
m_out_nmi_cb.resolve_safe();
// clear slot
m_device = NULL;
m_device = nullptr;
}
//-------------------------------------------------

12
src/devices/bus/a2bus/a2hsscsi.cpp
View File

@ -70,12 +70,12 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_FRAGMENT( hsscsi )
MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG)
MCFG_NSCSI_ADD("scsibus:0", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:1", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:2", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:3", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:4", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:5", hsscsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:0", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:1", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:2", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:3", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:4", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:5", hsscsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", hsscsi_devices, "harddisk", false)
MCFG_NSCSI_ADD("scsibus:7", hsscsi_devices, "ncr5380", true)
MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", ncr5380)

4
src/devices/bus/a2bus/a2mcms.cpp
View File

@ -223,8 +223,8 @@ void mcms_device::device_start()
{
m_write_irq.resolve();
m_stream = machine().sound().stream_alloc(*this, 0, 2, 31250);
m_timer = timer_alloc(0, NULL);
m_clrtimer = timer_alloc(1, NULL);
m_timer = timer_alloc(0, nullptr);
m_clrtimer = timer_alloc(1, nullptr);
m_enabled = false;
memset(m_vols, 0, sizeof(m_vols));
memset(m_table, 0, sizeof(m_table));

2
src/devices/bus/a2bus/a2pic.cpp
View File

@ -131,7 +131,7 @@ void a2bus_pic_device::device_start()
m_rom = device().machine().root_device().memregion(this->subtag(PIC_ROM_REGION).c_str())->base();
m_timer = timer_alloc(0, NULL);
m_timer = timer_alloc(0, nullptr);
m_timer->adjust(attotime::never);
save_item(NAME(m_ack));

12
src/devices/bus/a2bus/a2scsi.cpp
View File

@ -63,12 +63,12 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_FRAGMENT( scsi )
MCFG_NSCSI_BUS_ADD(SCSI_BUS_TAG)
MCFG_NSCSI_ADD("scsibus:0", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:1", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:2", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:3", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:4", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:5", scsi_devices, 0, false)
MCFG_NSCSI_ADD("scsibus:0", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:1", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:2", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:3", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:4", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:5", scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", scsi_devices, "harddisk", false)
MCFG_NSCSI_ADD("scsibus:7", scsi_devices, "ncr5380", true)
MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5380", ncr5380)

2
src/devices/bus/a2bus/a2ssc.cpp
View File

@ -32,7 +32,7 @@ MACHINE_CONFIG_FRAGMENT( ssc )
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(SSC_RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(SSC_RS232_TAG, default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD(SSC_RS232_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_dcd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_dsr))

2
src/devices/bus/a2bus/a2vulcan.cpp
View File

@ -69,7 +69,7 @@ const device_type A2BUS_VULCANGOLD = &device_creator<a2bus_vulcangold_device>;
#define VULCAN_ATA_TAG "vulcan_ata"
static MACHINE_CONFIG_FRAGMENT( vulcan )
MCFG_ATA_INTERFACE_ADD(VULCAN_ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(VULCAN_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
ROM_START( vulcan )

2
src/devices/bus/a2bus/a2zipdrive.cpp
View File

@ -34,7 +34,7 @@ const device_type A2BUS_ZIPDRIVE = &device_creator<a2bus_zipdrive_device>;
#define ZIPDRIVE_ATA_TAG "zipdrive_ata"
static MACHINE_CONFIG_FRAGMENT( zipdrive )
MCFG_ATA_INTERFACE_ADD(ZIPDRIVE_ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(ZIPDRIVE_ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
ROM_START( zipdrive )

14
src/devices/bus/a2bus/corvfdc01.cpp
View File

@ -151,7 +151,7 @@ void a2bus_corvfdc01_device::device_reset()
{
m_fdc_local_status = 0;
m_fdc_local_command = 0;
m_curfloppy = NULL;
m_curfloppy = nullptr;
}
/*-------------------------------------------------
@ -194,7 +194,7 @@ UINT8 a2bus_corvfdc01_device::read_c0nx(address_space &space, UINT8 offset)
void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
{
int current_drive;
floppy_image_device *floppy = 0;
floppy_image_device *floppy = nullptr;
switch (offset)
{
@ -205,16 +205,16 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT
switch (current_drive)
{
case 0:
floppy = m_con1 ? m_con1->get_device() : 0;
floppy = m_con1 ? m_con1->get_device() : nullptr;
break;
case 1:
floppy = m_con2 ? m_con2->get_device() : 0;
floppy = m_con2 ? m_con2->get_device() : nullptr;
break;
case 2:
floppy = m_con3 ? m_con3->get_device() : 0;
floppy = m_con3 ? m_con3->get_device() : nullptr;
break;
case 3:
floppy = m_con4 ? m_con4->get_device() : 0;
floppy = m_con4 ? m_con4->get_device() : nullptr;
break;
}
@ -223,7 +223,7 @@ void a2bus_corvfdc01_device::write_c0nx(address_space &space, UINT8 offset, UINT
m_wdfdc->set_floppy(floppy);
}
if (m_curfloppy != NULL)
if (m_curfloppy != nullptr)
{
// side select
m_curfloppy->ss_w((data & LC_FLPSD1_mask) != 0);

12
src/devices/bus/a2bus/corvfdc02.cpp
View File

@ -178,7 +178,7 @@ UINT8 a2bus_corvfdc02_device::read_c0nx(address_space &space, UINT8 offset)
void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
{
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
switch (offset)
{
@ -208,16 +208,16 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT
switch (data & 3)
{
case 0:
floppy = m_con1 ? m_con1->get_device() : 0;
floppy = m_con1 ? m_con1->get_device() : nullptr;
break;
case 1:
floppy = m_con2 ? m_con2->get_device() : 0;
floppy = m_con2 ? m_con2->get_device() : nullptr;
break;
case 2:
floppy = m_con3 ? m_con3->get_device() : 0;
floppy = m_con3 ? m_con3->get_device() : nullptr;
break;
case 3:
floppy = m_con4 ? m_con4->get_device() : 0;
floppy = m_con4 ? m_con4->get_device() : nullptr;
break;
}
@ -230,7 +230,7 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT
}
}
if (m_curfloppy != NULL)
if (m_curfloppy != nullptr)
{
// motor control (active low)
m_curfloppy->mon_w((data & 8) ? 1 : 0);

4
src/devices/bus/a2bus/mouse.cpp
View File

@ -211,8 +211,8 @@ void a2bus_mouse_device::device_start()
m_rom = device().machine().root_device().memregion(this->subtag(MOUSE_ROM_REGION).c_str())->base();
// allocate two timers: one for the 68705, one for the quadrature magic
m_timer = timer_alloc(TIMER_68705, NULL);
m_read_timer = timer_alloc(TIMER_QUADRATURE, NULL);
m_timer = timer_alloc(TIMER_68705, nullptr);
m_read_timer = timer_alloc(TIMER_QUADRATURE, nullptr);
m_timer->adjust(attotime::never, TIMER_68705);
m_read_timer->adjust(attotime::never, TIMER_QUADRATURE);

8
src/devices/bus/a7800/a78_slot.cpp
View File

@ -42,7 +42,7 @@ const device_type A78_CART_SLOT = &device_creator<a78_cart_slot_device>;
device_a78_cart_interface::device_a78_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),
m_base_rom(0x8000),
m_bank_mask(0)
@ -64,7 +64,7 @@ device_a78_cart_interface::~device_a78_cart_interface ()
void device_a78_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(A78SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -348,7 +348,7 @@ bool a78_cart_slot_device::call_load()
{
UINT32 len;
if (software_entry() != NULL)
if (software_entry() != nullptr)
{
const char *pcb_name;
bool has_ram = get_software_region("ram") ? TRUE : FALSE;
@ -358,7 +358,7 @@ bool a78_cart_slot_device::call_load()
m_cart->rom_alloc(len, tag());
memcpy(m_cart->get_rom_base(), get_software_region("rom"), len);
if ((pcb_name = get_feature("slot")) != NULL)
if ((pcb_name = get_feature("slot")) != nullptr)
m_type = a78_get_pcb_id(pcb_name);
else
m_type = A78_TYPE0;

4
src/devices/bus/a7800/a78_slot.h
View File

@ -100,7 +100,7 @@ public:
int get_cart_type() { return m_type; };
int identify_cart_type(UINT8 *ROM, UINT32 len);
bool has_cart() { return m_cart != NULL; }
bool has_cart() { return m_cart != nullptr; }
virtual iodevice_t image_type() const { return IO_CARTSLOT; }
virtual bool is_readable() const { return 1; }
@ -108,7 +108,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "a7800_cart"; }
virtual const char *file_extensions() const { return "bin,a78"; }
virtual device_image_partialhash_func get_partial_hash() const { return &a78_partialhash; }

2
src/devices/bus/a7800/hiscore.cpp
View File

@ -28,7 +28,7 @@ a78_hiscore_device::a78_hiscore_device(const machine_config &mconfig, const char
static MACHINE_CONFIG_FRAGMENT( a78_highscore )
MCFG_A78_CARTRIDGE_ADD("hsc_slot", a7800_cart, NULL)
MCFG_A78_CARTRIDGE_ADD("hsc_slot", a7800_cart, nullptr)
MACHINE_CONFIG_END
machine_config_constructor a78_hiscore_device::device_mconfig_additions() const

4
src/devices/bus/a7800/xboard.cpp
View File

@ -107,7 +107,7 @@ void a78_xm_device::device_reset()
static MACHINE_CONFIG_FRAGMENT( a78_xb )
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, NULL)
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
@ -116,7 +116,7 @@ static MACHINE_CONFIG_FRAGMENT( a78_xb )
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( a78_xm )
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, NULL)
MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")

8
src/devices/bus/a800/a800_slot.cpp
View File

@ -40,7 +40,7 @@ const device_type XEGS_CART_SLOT = &device_creator<xegs_cart_slot_device>;
device_a800_cart_interface::device_a800_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),
m_bank_mask(0)
{
@ -61,7 +61,7 @@ device_a800_cart_interface::~device_a800_cart_interface ()
void device_a800_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(A800SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -242,7 +242,7 @@ bool a800_cart_slot_device::call_load()
{
UINT32 len;
if (software_entry() != NULL)
if (software_entry() != nullptr)
{
const char *pcb_name;
len = get_software_region_length("rom");
@ -250,7 +250,7 @@ bool a800_cart_slot_device::call_load()
m_cart->rom_alloc(len, tag());
memcpy(m_cart->get_rom_base(), get_software_region("rom"), len);
if ((pcb_name = get_feature("slot")) != NULL)
if ((pcb_name = get_feature("slot")) != nullptr)
m_type = a800_get_pcb_id(pcb_name);
else
m_type = A800_8K;

4
src/devices/bus/a800/a800_slot.h
View File

@ -100,7 +100,7 @@ public:
int get_cart_type() { return m_type; };
int identify_cart_type(UINT8 *header);
bool has_cart() { return m_cart != NULL; }
bool has_cart() { return m_cart != nullptr; }
virtual iodevice_t image_type() const { return IO_CARTSLOT; }
virtual bool is_readable() const { return 1; }
@ -108,7 +108,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "a8bit_cart"; }
virtual const char *file_extensions() const { return "bin,rom,car"; }

6
src/devices/bus/a800/a8sio.cpp
View File

@ -126,7 +126,7 @@ void a8sio_device::device_start()
m_out_audio_in_cb.resolve_safe();
// clear slot
m_device = NULL;
m_device = nullptr;
}
//-------------------------------------------------
@ -181,8 +181,8 @@ WRITE8_MEMBER( a8sio_device::audio_in_w )
device_a8sio_card_interface::device_a8sio_card_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device)
, m_a8sio(NULL)
, m_a8sio_tag(NULL), m_a8sio_slottag(nullptr)
, m_a8sio(nullptr)
, m_a8sio_tag(nullptr), m_a8sio_slottag(nullptr)
{
}

80
src/devices/bus/abcbus/abc890.cpp
View File

@ -27,13 +27,13 @@ const device_type ABC856 = &device_creator<abc856_t>;
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( abc890 )
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("mem1", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("mem2", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("mem3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("mem1", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("mem2", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("mem3", abcbus_cards, nullptr)
MACHINE_CONFIG_END
@ -54,12 +54,12 @@ machine_config_constructor abc890_t::device_mconfig_additions() const
static MACHINE_CONFIG_FRAGMENT( abc_expansion_unit )
MCFG_ABCBUS_SLOT_ADD("io1", abc80_cards, "abc830")
MCFG_ABCBUS_SLOT_ADD("io2", abc80_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abc80_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io4", abc80_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io2", abc80_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abc80_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abc80_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("mem1", abc80_cards, "memcard")
MCFG_ABCBUS_SLOT_ADD("mem2", abc80_cards, "16k")
MCFG_ABCBUS_SLOT_ADD("mem3", abc80_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("mem3", abc80_cards, nullptr)
MACHINE_CONFIG_END
@ -79,9 +79,9 @@ machine_config_constructor abc_expansion_unit_t::device_mconfig_additions() cons
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( abc894 )
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MACHINE_CONFIG_END
@ -104,11 +104,11 @@ static MACHINE_CONFIG_FRAGMENT( abc850 )
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "ro202")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, nullptr)
MACHINE_CONFIG_END
@ -131,11 +131,11 @@ static MACHINE_CONFIG_FRAGMENT( abc852 )
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "basf6185")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, nullptr)
MACHINE_CONFIG_END
@ -158,11 +158,11 @@ static MACHINE_CONFIG_FRAGMENT( abc856 )
MCFG_ABCBUS_SLOT_ADD("io1", abcbus_cards, "abc850fdd")
MCFG_ABCBUS_SLOT_ADD("io2", abcbus_cards, "xebec")
MCFG_DEVICE_CARD_DEFAULT_BIOS("xebec", "micr1325")
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, NULL)
MCFG_ABCBUS_SLOT_ADD("io3", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io4", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io5", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io6", abcbus_cards, nullptr)
MCFG_ABCBUS_SLOT_ADD("io7", abcbus_cards, nullptr)
MACHINE_CONFIG_END
@ -239,7 +239,7 @@ void abc890_t::device_start()
void abc890_t::device_reset()
{
for (device_t *device = first_subdevice(); device != NULL; device = device->next())
for (device_t *device = first_subdevice(); device != nullptr; device = device->next())
{
device->reset();
}
@ -254,7 +254,7 @@ void abc890_t::abcbus_cs(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->cs_w(data);
}
@ -271,7 +271,7 @@ UINT8 abc890_t::abcbus_inp()
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
data &= slot->inp_r();
}
@ -288,7 +288,7 @@ void abc890_t::abcbus_out(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->out_w(data);
}
@ -305,7 +305,7 @@ UINT8 abc890_t::abcbus_stat()
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
data &= slot->stat_r();
}
@ -322,7 +322,7 @@ void abc890_t::abcbus_c1(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->c1_w(data);
}
@ -337,7 +337,7 @@ void abc890_t::abcbus_c2(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->c2_w(data);
}
@ -352,7 +352,7 @@ void abc890_t::abcbus_c3(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->c3_w(data);
}
@ -367,7 +367,7 @@ void abc890_t::abcbus_c4(UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->c4_w(data);
}
@ -384,7 +384,7 @@ UINT8 abc890_t::abcbus_xmemfl(offs_t offset)
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
data &= slot->xmemfl_r(offset);
}
@ -401,7 +401,7 @@ void abc890_t::abcbus_xmemw(offs_t offset, UINT8 data)
{
abcbus_slot_device_iterator iter(*this);
for (abcbus_slot_t *slot = iter.first(); slot != NULL; slot = iter.next())
for (abcbus_slot_t *slot = iter.first(); slot != nullptr; slot = iter.next())
{
slot->xmemw_w(offset, data);
}

4
src/devices/bus/abcbus/fd2.cpp
View File

@ -188,7 +188,7 @@ WRITE8_MEMBER( abc_fd2_t::pio_pb_w )
*/
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
if (BIT(data, 0)) floppy = m_floppy0->get_device();
if (BIT(data, 1)) floppy = m_floppy1->get_device();
@ -212,7 +212,7 @@ WRITE8_MEMBER( abc_fd2_t::pio_pb_w )
static const z80_daisy_config daisy_chain[] =
{
{ Z80PIO_TAG },
{ NULL }
{ nullptr }
};

2
src/devices/bus/abcbus/hdc.cpp
View File

@ -72,7 +72,7 @@ ADDRESS_MAP_END
static const z80_daisy_config daisy_chain[] =
{
{ NULL }
{ nullptr }
};

4
src/devices/bus/abcbus/lux10828.cpp
View File

@ -290,7 +290,7 @@ WRITE8_MEMBER( luxor_55_10828_device::pio_pb_w )
static const z80_daisy_config daisy_chain[] =
{
{ Z80PIO_TAG },
{ NULL }
{ nullptr }
};
static SLOT_INTERFACE_START( abc_floppies )
@ -592,7 +592,7 @@ WRITE8_MEMBER( luxor_55_10828_device::ctrl_w )
m_sel0 = BIT(data, 0);
m_sel1 = BIT(data, 1);
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
if (BIT(data, 0)) floppy = m_floppy0->get_device();
if (BIT(data, 1)) floppy = m_floppy1->get_device();

6
src/devices/bus/abcbus/lux21046.cpp
View File

@ -276,7 +276,7 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::fdc_intrq_w )
static const z80_daisy_config z80_daisy_chain[] =
{
{ Z80DMA_TAG },
{ NULL }
{ nullptr }
};
@ -340,7 +340,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( abc850, luxor_55_21046 )
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":0", abc_floppies, "525qd", luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, NULL, luxor_55_21046_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1793_TAG":1", abc_floppies, nullptr, luxor_55_21046_device::floppy_formats)
MACHINE_CONFIG_END
@ -1057,7 +1057,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_9b_w )
*/
// drive select
m_floppy = NULL;
m_floppy = nullptr;
if (BIT(data, 0)) m_floppy = m_floppy0->get_device();
if (BIT(data, 1)) m_floppy = m_floppy1->get_device();

2
src/devices/bus/abcbus/lux21056.cpp
View File

@ -166,7 +166,7 @@ ADDRESS_MAP_END
static const z80_daisy_config daisy_chain[] =
{
{ Z80DMA_TAG },
{ NULL }
{ nullptr }
};

2
src/devices/bus/abcbus/turbo.cpp
View File

@ -73,7 +73,7 @@ ADDRESS_MAP_END
static const z80_daisy_config daisy_chain[] =
{
{ NULL }
{ nullptr }
};

4
src/devices/bus/abckb/abckb.cpp
View File

@ -73,7 +73,7 @@ void abc_keyboard_port_device::device_start()
void abc_keyboard_port_device::device_reset()
{
if (m_card != NULL)
if (m_card != nullptr)
get_card_device()->reset();
}
@ -94,7 +94,7 @@ WRITE_LINE_MEMBER( abc_keyboard_port_device::write_rx )
WRITE_LINE_MEMBER( abc_keyboard_port_device::txd_w )
{
if (m_card != NULL)
if (m_card != nullptr)
m_card->txd_w(state);
}

6
src/devices/bus/adam/exp.cpp
View File

@ -92,7 +92,7 @@ bool adam_expansion_slot_device::call_load()
{
size_t size = 0;
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
size = length();
@ -136,7 +136,7 @@ void adam_expansion_slot_device::get_default_card_software(std::string &result)
UINT8 adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->adam_bd_r(space, offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2);
}
@ -151,7 +151,7 @@ UINT8 adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, UINT
void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2)
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->adam_bd_w(space, offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2);
}

2
src/devices/bus/adam/exp.h
View File

@ -84,7 +84,7 @@ protected:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "adam_rom"; }
virtual const char *file_extensions() const { return "bin,rom"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
// slot interface overrides
virtual void get_default_card_software(std::string &result);

2
src/devices/bus/adam/ide.cpp
View File

@ -61,7 +61,7 @@ const rom_entry *powermate_ide_device::device_rom_region() const
// MACHINE_CONFIG_FRAGMENT( adam_ata )
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( adam_ata )
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)

6
src/devices/bus/adamnet/adamnet.cpp
View File

@ -112,7 +112,7 @@ void adamnet_device::device_stop()
void adamnet_device::add_device(device_t *target)
{
daisy_entry *entry = global_alloc(daisy_entry(target));
auto entry = global_alloc(daisy_entry(target));
entry->m_interface->m_bus = this;
@ -125,9 +125,9 @@ void adamnet_device::add_device(device_t *target)
//-------------------------------------------------
adamnet_device::daisy_entry::daisy_entry(device_t *device)
: m_next(NULL),
: m_next(nullptr),
m_device(device),
m_interface(NULL),
m_interface(nullptr),
m_txd(1)
{
device->interface(m_interface);

4
src/devices/bus/adamnet/fdc.cpp
View File

@ -183,7 +183,7 @@ adam_fdc_device::adam_fdc_device(const machine_config &mconfig, const char *tag,
m_maincpu(*this, M6801_TAG),
m_fdc(*this, WD2793_TAG),
m_floppy0(*this, WD2793_TAG":0:525ssdd"),
m_floppy(NULL),
m_floppy(nullptr),
m_ram(*this, "ram"),
m_sw3(*this, "SW3")
{
@ -289,7 +289,7 @@ WRITE8_MEMBER( adam_fdc_device::p1_w )
m_fdc->dden_w(BIT(data, 3));
// drive select
m_floppy = NULL;
m_floppy = nullptr;
if (BIT(data, 5))
{

2
src/devices/bus/adamnet/spi.cpp
View File

@ -80,7 +80,7 @@ static MACHINE_CONFIG_FRAGMENT( adam_spi )
MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL_4_9152MHz)
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")

14
src/devices/bus/amiga/zorro/a2232.cpp
View File

@ -94,43 +94,43 @@ static MACHINE_CONFIG_FRAGMENT( a2232 )
MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(a2232_device, cia_port_b_w))
// rs232 ports
MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(WRITELINE(a2232_device, rs232_1_rxd_w))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_1_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_0", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_1_cts_w))
MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_1", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_2_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_1", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_2_cts_w))
MCFG_RS232_PORT_ADD("rs232_3", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_3", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_2", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_3_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_2", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_3_cts_w))
MCFG_RS232_PORT_ADD("rs232_4", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_4", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_3", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_4_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_3", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_4_cts_w))
MCFG_RS232_PORT_ADD("rs232_5", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_5", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_4", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_5_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_4", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_5_cts_w))
MCFG_RS232_PORT_ADD("rs232_6", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_6", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_5", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_6_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_5", mos6551_device, write_dsr))
MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_6_cts_w))
MCFG_RS232_PORT_ADD("rs232_7", default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD("rs232_7", default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_6", mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_7_dcd_w))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_6", mos6551_device, write_dsr))

4
src/devices/bus/amiga/zorro/buddha.cpp
View File

@ -29,9 +29,9 @@ const device_type BUDDHA = &device_creator<buddha_device>;
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( buddha )
MCFG_ATA_INTERFACE_ADD("ata_0", ata_devices, NULL, NULL, false)
MCFG_ATA_INTERFACE_ADD("ata_0", ata_devices, nullptr, nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(buddha_device, ide_0_interrupt_w))
MCFG_ATA_INTERFACE_ADD("ata_1", ata_devices, NULL, NULL, false)
MCFG_ATA_INTERFACE_ADD("ata_1", ata_devices, nullptr, nullptr, false)
MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(buddha_device, ide_1_interrupt_w))
MACHINE_CONFIG_END

24
src/devices/bus/amiga/zorro/zorro.cpp
View File

@ -24,7 +24,7 @@ const device_type ZORRO_SLOT = &device_creator<zorro_slot_device>;
zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, ZORRO_SLOT, "Zorro slot", tag, owner, clock, "zorro_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_zorro_tag(NULL)
m_zorro_tag(nullptr)
{
}
@ -32,7 +32,7 @@ zorro_slot_device::zorro_slot_device(const machine_config &mconfig, device_type
const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_slot_interface(mconfig, *this),
m_zorro_tag(NULL)
m_zorro_tag(nullptr)
{
}
@ -70,8 +70,8 @@ void zorro_slot_device::device_start()
zorro_device::zorro_device(const machine_config &mconfig, device_type type, const char *name,
const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_space(NULL),
m_cputag(NULL),
m_space(nullptr),
m_cputag(nullptr),
m_ovr_handler(*this),
m_int2_handler(*this),
m_int6_handler(*this)
@ -123,7 +123,7 @@ const device_type EXP_SLOT = &device_creator<exp_slot_device>;
exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
zorro_device(mconfig, EXP_SLOT, "86-pin expansion slot", tag, owner, clock, "exp_slot", __FILE__),
m_ipl_handler(*this),
m_dev(NULL)
m_dev(nullptr)
{
}
@ -131,7 +131,7 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type
const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
zorro_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_ipl_handler(*this),
m_dev(NULL)
m_dev(nullptr)
{
}
@ -192,7 +192,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, const char *tag, dev
m_eint4_handler(*this),
m_eint5_handler(*this),
m_eint7_handler(*this),
m_autoconfig_device(NULL)
m_autoconfig_device(nullptr)
{
}
@ -203,7 +203,7 @@ zorro2_device::zorro2_device(const machine_config &mconfig, device_type type, co
m_eint4_handler(*this),
m_eint5_handler(*this),
m_eint7_handler(*this),
m_autoconfig_device(NULL)
m_autoconfig_device(nullptr)
{
}
@ -295,7 +295,7 @@ void zorro2_device::fc_w(int code)
device_zorro_card_interface::device_zorro_card_interface(const machine_config &mconfig, device_t &device) :
device_slot_card_interface(mconfig, device),
m_zorro(NULL)
m_zorro(nullptr)
{
}
@ -331,7 +331,7 @@ WRITE_LINE_MEMBER( device_zorro_card_interface::cfgin_w )
device_exp_card_interface::device_exp_card_interface(const machine_config &mconfig, device_t &device) :
device_zorro_card_interface(mconfig, device),
m_slot(NULL)
m_slot(nullptr)
{
}
@ -359,8 +359,8 @@ void device_exp_card_interface::set_zorro_device()
device_zorro2_card_interface::device_zorro2_card_interface(const machine_config &mconfig, device_t &device) :
device_zorro_card_interface(mconfig, device),
m_next(NULL),
m_slot(NULL)
m_next(nullptr),
m_slot(nullptr)
{
}

10
src/devices/bus/apf/slot.cpp
View File

@ -27,7 +27,7 @@ const device_type APF_CART_SLOT = &device_creator<apf_cart_slot_device>;
device_apf_cart_interface::device_apf_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_apf_cart_interface::~device_apf_cart_interface()
void device_apf_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(APFSLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -160,7 +160,7 @@ bool apf_cart_slot_device::call_load()
{
if (m_cart)
{
UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x3800)
{
@ -170,12 +170,12 @@ bool apf_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);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
m_type = APF_STD;
// attempt to identify Space Destroyer, which needs 1K of additional RAM

2
src/devices/bus/apf/slot.h
View File

@ -79,7 +79,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "apfm1000_cart"; }
virtual const char *file_extensions() const { return "bin"; }

12
src/devices/bus/apricot/expansion.cpp
View File

@ -60,10 +60,10 @@ const device_type APRICOT_EXPANSION_BUS = &device_creator<apricot_expansion_bus_
apricot_expansion_bus_device::apricot_expansion_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, APRICOT_EXPANSION_BUS, "Apricot Expansion Bus", tag, owner, clock, "apricot_exp_bus", __FILE__),
m_program(NULL),
m_io(NULL),
m_program_iop(NULL),
m_io_iop(NULL),
m_program(nullptr),
m_io(nullptr),
m_program_iop(nullptr),
m_io_iop(nullptr),
m_dma1_handler(*this),
m_dma2_handler(*this),
m_ext1_handler(*this),
@ -173,8 +173,8 @@ void apricot_expansion_bus_device::install_ram(offs_t addrstart, offs_t addrend,
device_apricot_expansion_card_interface::device_apricot_expansion_card_interface(const machine_config &mconfig, device_t &device) :
device_slot_card_interface(mconfig, device),
m_next(NULL),
m_bus(NULL)
m_next(nullptr),
m_bus(nullptr)
{
}

10
src/devices/bus/arcadia/slot.cpp
View File

@ -27,7 +27,7 @@ const device_type EA2001_CART_SLOT = &device_creator<arcadia_cart_slot_device>;
device_arcadia_cart_interface::device_arcadia_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_arcadia_cart_interface::~device_arcadia_cart_interface()
void device_arcadia_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(EA2001SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -150,16 +150,16 @@ bool arcadia_cart_slot_device::call_load()
{
if (m_cart)
{
UINT32 len = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(len, tag());
if (software_entry() == NULL)
if (software_entry() == nullptr)
fread(m_cart->get_rom_base(), len);
else
memcpy(m_cart->get_rom_base(), get_software_region("rom"), len);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
// we need to identify Golf!
m_type = ARCADIA_STD;

2
src/devices/bus/arcadia/slot.h
View File

@ -68,7 +68,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 1; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "arcadia_cart"; }
virtual const char *file_extensions() const { return "bin"; }

10
src/devices/bus/astrocde/slot.cpp
View File

@ -27,7 +27,7 @@ const device_type ASTROCADE_CART_SLOT = &device_creator<astrocade_cart_slot_devi
device_astrocade_cart_interface::device_astrocade_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_astrocade_cart_interface::~device_astrocade_cart_interface()
void device_astrocade_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(ASTROCADESLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -150,15 +150,15 @@ bool astrocade_cart_slot_device::call_load()
{
if (m_cart)
{
UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
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);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
m_type = ASTROCADE_STD;

2
src/devices/bus/astrocde/slot.h
View File

@ -69,7 +69,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "astrocde_cart"; }
virtual const char *file_extensions() const { return "bin"; }

4
src/devices/bus/bml3/bml3bus.cpp
View File

@ -141,7 +141,7 @@ void bml3bus_device::device_start()
// clear slots
for (int i = 0; i < BML3BUS_MAX_SLOTS; i++)
{
m_device_list[i] = NULL;
m_device_list[i] = nullptr;
}
}
@ -157,7 +157,7 @@ device_bml3bus_card_interface *bml3bus_device::get_bml3bus_card(int slot)
{
if (slot < 0)
{
return NULL;
return nullptr;
}
return m_device_list[slot];

2
src/devices/bus/bml3/bml3mp1802.cpp
View File

@ -82,7 +82,7 @@ READ8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_r)
WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w)
{
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
switch (data & 0x03)
{

4
src/devices/bus/bml3/bml3mp1805.cpp
View File

@ -27,7 +27,7 @@ static const floppy_interface bml3_mp1805_floppy_interface =
{
FLOPPY_STANDARD_3_SSDD,
LEGACY_FLOPPY_OPTIONS_NAME(default),
NULL
nullptr
};
WRITE_LINE_MEMBER( bml3bus_mp1805_device::bml3_mc6843_intrq_w )
@ -92,7 +92,7 @@ WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w)
// TODO: MESS UI for flipping disk? Note that D88 images are double-sided, but the physical drive is single-sided
int side = 0;
int motor = BIT(data, 7);
const char *floppy_name = NULL;
const char *floppy_name = nullptr;
switch (drive_select) {
case 1:
drive = 0;

14
src/devices/bus/bw2/exp.cpp
View File

@ -83,7 +83,7 @@ void bw2_expansion_slot_device::device_start()
void bw2_expansion_slot_device::device_reset()
{
if (m_cart != NULL)
if (m_cart != nullptr)
{
m_cart->device().reset();
}
@ -96,7 +96,7 @@ void bw2_expansion_slot_device::device_reset()
UINT8 bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (m_cart != NULL)
if (m_cart != nullptr)
{
data = m_cart->bw2_cd_r(space, offset, data, ram2, ram3, ram4, ram5, ram6);
}
@ -111,7 +111,7 @@ UINT8 bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8
void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6)
{
if (m_cart != NULL)
if (m_cart != nullptr)
{
m_cart->bw2_cd_w(space, offset, data, ram2, ram3, ram4, ram5, ram6);
}
@ -126,7 +126,7 @@ READ8_MEMBER( bw2_expansion_slot_device::slot_r )
{
UINT8 data = 0xff;
if (m_cart != NULL)
if (m_cart != nullptr)
{
data = m_cart->bw2_slot_r(space, offset);
}
@ -141,7 +141,7 @@ READ8_MEMBER( bw2_expansion_slot_device::slot_r )
WRITE8_MEMBER( bw2_expansion_slot_device::slot_w )
{
if (m_cart != NULL)
if (m_cart != nullptr)
{
m_cart->bw2_slot_w(space, offset, data);
}
@ -156,7 +156,7 @@ READ8_MEMBER( bw2_expansion_slot_device::modsel_r )
{
UINT8 data = 0xff;
if (m_cart != NULL)
if (m_cart != nullptr)
{
data = m_cart->bw2_modsel_r(space, offset);
}
@ -171,7 +171,7 @@ READ8_MEMBER( bw2_expansion_slot_device::modsel_r )
WRITE8_MEMBER( bw2_expansion_slot_device::modsel_w )
{
if (m_cart != NULL)
if (m_cart != nullptr)
{
m_cart->bw2_modsel_w(space, offset, data);
}

4
src/devices/bus/c64/16kb.cpp
View File

@ -22,10 +22,10 @@ const device_type C64_16KB = &device_creator<c64_16kb_cartridge_device>;
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_16kb )
MCFG_GENERIC_CARTSLOT_ADD("roml", generic_linear_slot, NULL)
MCFG_GENERIC_CARTSLOT_ADD("roml", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin,80")
MCFG_GENERIC_CARTSLOT_ADD("romh", generic_linear_slot, NULL)
MCFG_GENERIC_CARTSLOT_ADD("romh", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin,a0,e0")
MACHINE_CONFIG_END

8
src/devices/bus/c64/bn1541.cpp
View File

@ -76,11 +76,11 @@ void c64_bn1541_device::device_start()
{
device_iterator iter(machine().root_device());
for (device_t *device = iter.first(); device != NULL; device = iter.next())
for (device_t *device = iter.first(); device != nullptr; device = iter.next())
{
device_iterator subiter(*device);
for (device_t *subdevice = subiter.first(); subdevice != NULL; subdevice = iter.next())
for (device_t *subdevice = subiter.first(); subdevice != nullptr; subdevice = iter.next())
{
if (subdevice->interface(m_other) && subdevice != this)
{
@ -132,7 +132,7 @@ void c64_bn1541_device::parallel_strobe_w(int state)
void c64_bn1541_device::update_output()
{
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_data_w(m_parallel_output);
}
@ -147,7 +147,7 @@ WRITE_LINE_MEMBER(c64_bn1541_device::input_8)
{
if (LOG) logerror("C64 parallel strobe %u\n", state);
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_strobe_w(state);
}

16
src/devices/bus/c64/dela_ep256.cpp
View File

@ -22,21 +22,21 @@ const device_type C64_DELA_EP256 = &device_creator<c64_dela_ep256_cartridge_devi
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_dela_ep256 )
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom8", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom8", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MACHINE_CONFIG_END

4
src/devices/bus/c64/dela_ep64.cpp
View File

@ -22,9 +22,9 @@ const device_type C64_DELA_EP64 = &device_creator<c64_dela_ep64_cartridge_device
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_dela_ep64 )
MCFG_GENERIC_SOCKET_ADD("eprom1", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("eprom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin")
MCFG_GENERIC_SOCKET_ADD("eprom2", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("eprom2", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("rom,bin")
MACHINE_CONFIG_END

14
src/devices/bus/c64/dela_ep7x8.cpp
View File

@ -22,19 +22,19 @@ const device_type C64_DELA_EP7X8 = &device_creator<c64_dela_ep7x8_cartridge_devi
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_dela_ep7x8 )
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MACHINE_CONFIG_END

4
src/devices/bus/c64/dqbb.h
View File

@ -39,8 +39,8 @@ protected:
// device_nvram_interface overrides
virtual void nvram_default() { }
virtual void nvram_read(emu_file &file) { if (m_nvram != NULL) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != NULL) { file.write(m_nvram, m_nvram.bytes()); } }
virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);

18
src/devices/bus/c64/exp.cpp
View File

@ -119,7 +119,7 @@ bool c64_expansion_slot_device::call_load()
{
size_t size = 0;
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
size = length();
@ -155,8 +155,8 @@ bool c64_expansion_slot_device::call_load()
if (cbm_crt_read_header(m_file, &roml_size, &romh_size, &exrom, &game))
{
UINT8 *roml = NULL;
UINT8 *romh = NULL;
UINT8 *roml = nullptr;
UINT8 *romh = nullptr;
m_card->m_roml.allocate(roml_size);
m_card->m_romh.allocate(romh_size);
@ -191,8 +191,8 @@ bool c64_expansion_slot_device::call_load()
load_software_region("romh", m_card->m_romh);
load_software_region("nvram", m_card->m_nvram);
if (get_feature("exrom") != NULL) m_card->m_exrom = atol(get_feature("exrom"));
if (get_feature("game") != NULL) m_card->m_game = atol(get_feature("game"));
if (get_feature("exrom") != nullptr) m_card->m_exrom = atol(get_feature("exrom"));
if (get_feature("game") != nullptr) m_card->m_game = atol(get_feature("game"));
}
}
}
@ -240,7 +240,7 @@ void c64_expansion_slot_device::get_default_card_software(std::string &result)
UINT8 c64_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->c64_cd_r(space, offset, data, sphi2, ba, roml, romh, io1, io2);
}
@ -255,7 +255,7 @@ UINT8 c64_expansion_slot_device::cd_r(address_space &space, offs_t offset, UINT8
void c64_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->c64_cd_w(space, offset, data, sphi2, ba, roml, romh, io1, io2);
}
@ -272,7 +272,7 @@ int c64_expansion_slot_device::game_r(offs_t offset, int sphi2, int ba, int rw,
m_hiram = hiram;
if (m_card != NULL)
if (m_card != nullptr)
{
state = m_card->c64_game_r(offset, sphi2, ba, rw);
}
@ -291,7 +291,7 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int sphi2, int ba, int rw,
m_hiram = hiram;
if (m_card != NULL)
if (m_card != nullptr)
{
state = m_card->c64_exrom_r(offset, sphi2, ba, rw);
}

2
src/devices/bus/c64/exp.h
View File

@ -146,7 +146,7 @@ protected:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "c64_cart,vic10_cart"; }
virtual const char *file_extensions() const { return "80,a0,e0,crt"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
// slot interface overrides
virtual void get_default_card_software(std::string &result);

4
src/devices/bus/c64/fcc.h
View File

@ -46,8 +46,8 @@ protected:
// device_nvram_interface overrides
virtual void nvram_default() { }
virtual void nvram_read(emu_file &file) { if (m_nvram != NULL) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != NULL) { file.write(m_nvram, m_nvram.bytes()); } }
virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);

2
src/devices/bus/c64/ide64.cpp
View File

@ -48,7 +48,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_ide64 )
MCFG_ATMEL_29C010_ADD(AT29C010A_TAG)
MCFG_DS1302_ADD(DS1302_TAG, XTAL_32_768kHz)
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", NULL, false)
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END

2
src/devices/bus/c64/ieee488.cpp
View File

@ -148,7 +148,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_ieee488 )
MCFG_TPI6525_IN_PC_CB(READ8(c64_ieee488_device, tpi_pc_r))
MCFG_TPI6525_OUT_PC_CB(WRITE8(c64_ieee488_device, tpi_pc_w))
MCFG_CBM_IEEE488_ADD(NULL)
MCFG_CBM_IEEE488_ADD(nullptr)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END

4
src/devices/bus/c64/neoram.h
View File

@ -38,8 +38,8 @@ protected:
// device_nvram_interface overrides
virtual void nvram_default() { }
virtual void nvram_read(emu_file &file) { if (m_nvram != NULL) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != NULL) { file.write(m_nvram, m_nvram.bytes()); } }
virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } }
virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } }
// device_c64_expansion_card_interface overrides
virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2);

2
src/devices/bus/c64/reu.cpp
View File

@ -33,7 +33,7 @@ const device_type C64_REU1764 = &device_creator<c64_reu1764_cartridge_device>;
static MACHINE_CONFIG_FRAGMENT( c64_reu )
MCFG_MOS8726_ADD(MOS8726R1_TAG)
MCFG_GENERIC_SOCKET_ADD("rom", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MACHINE_CONFIG_END

16
src/devices/bus/c64/rex_ep256.cpp
View File

@ -22,21 +22,21 @@ const device_type C64_REX_EP256 = &device_creator<c64_rex_ep256_cartridge_device
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( c64_rex_ep256 )
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom1", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom2", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom3", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom4", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom5", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom6", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom7", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MCFG_GENERIC_SOCKET_ADD("rom8", generic_linear_slot, NULL)
MCFG_GENERIC_SOCKET_ADD("rom8", generic_linear_slot, nullptr)
MCFG_GENERIC_EXTENSIONS("bin,rom")
MACHINE_CONFIG_END

2
src/devices/bus/c64/swiftlink.cpp
View File

@ -43,7 +43,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_swiftlink )
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr))

2
src/devices/bus/c64/turbo232.cpp
View File

@ -42,7 +42,7 @@ static MACHINE_CONFIG_FRAGMENT( c64_turbo232 )
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL)
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr))

6
src/devices/bus/cbm2/exp.cpp
View File

@ -107,7 +107,7 @@ bool cbm2_expansion_slot_device::call_load()
if (m_card)
{
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
size = length();
@ -167,7 +167,7 @@ void cbm2_expansion_slot_device::get_default_card_software(std::string &result)
UINT8 cbm2_expansion_slot_device::read(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
{
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->cbm2_bd_r(space, offset, data, csbank1, csbank2, csbank3);
}
@ -182,7 +182,7 @@ UINT8 cbm2_expansion_slot_device::read(address_space &space, offs_t offset, UINT
void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3)
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->cbm2_bd_w(space, offset, data, csbank1, csbank2, csbank3);
}

2
src/devices/bus/cbm2/exp.h
View File

@ -93,7 +93,7 @@ protected:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "cbm2_cart"; }
virtual const char *file_extensions() const { return "20,40,60"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
// slot interface overrides
virtual void get_default_card_software(std::string &result);

18
src/devices/bus/cbm2/user.h
View File

@ -114,17 +114,17 @@ public:
template<class _Object> static devcb_base &set_flag_wr_callback(device_t &device, _Object object) { return downcast<cbm2_user_port_device &>(device).m_write_flag.set_callback(object); }
// computer interface
DECLARE_READ8_MEMBER( d1_r ) { UINT8 data = 0xff; if (m_card != NULL) data = m_card->cbm2_d1_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d1_w ) { if (m_card != NULL) m_card->cbm2_d1_w(space, offset, data); }
DECLARE_READ8_MEMBER( d2_r ) { UINT8 data = 0xff; if (m_card != NULL) data = m_card->cbm2_d2_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d2_w ) { if (m_card != NULL) m_card->cbm2_d2_w(space, offset, data); }
DECLARE_READ8_MEMBER( d1_r ) { UINT8 data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d1_w ) { if (m_card != nullptr) m_card->cbm2_d1_w(space, offset, data); }
DECLARE_READ8_MEMBER( d2_r ) { UINT8 data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(space, offset); return data; }
DECLARE_WRITE8_MEMBER( d2_w ) { if (m_card != nullptr) m_card->cbm2_d2_w(space, offset, data); }
DECLARE_READ_LINE_MEMBER( pb2_r ) { return m_card ? m_card->cbm2_pb2_r() : 1; }
DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != NULL) m_card->cbm2_pb2_w(state); }
DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); }
DECLARE_READ_LINE_MEMBER( pb3_r ) { return m_card ? m_card->cbm2_pb3_r() : 1; }
DECLARE_WRITE_LINE_MEMBER( pb3_w ) { if (m_card != NULL) m_card->cbm2_pb3_w(state); }
DECLARE_WRITE_LINE_MEMBER( pc_w ) { if (m_card != NULL) m_card->cbm2_pc_w(state); }
DECLARE_WRITE_LINE_MEMBER( cnt_w ) { if (m_card != NULL) m_card->cbm2_cnt_w(state); }
DECLARE_WRITE_LINE_MEMBER( sp_w ) { if (m_card != NULL) m_card->cbm2_sp_w(state); }
DECLARE_WRITE_LINE_MEMBER( pb3_w ) { if (m_card != nullptr) m_card->cbm2_pb3_w(state); }
DECLARE_WRITE_LINE_MEMBER( pc_w ) { if (m_card != nullptr) m_card->cbm2_pc_w(state); }
DECLARE_WRITE_LINE_MEMBER( cnt_w ) { if (m_card != nullptr) m_card->cbm2_cnt_w(state); }
DECLARE_WRITE_LINE_MEMBER( sp_w ) { if (m_card != nullptr) m_card->cbm2_sp_w(state); }
// cartridge interface
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }

4
src/devices/bus/cbmiec/c1541.cpp
View File

@ -567,7 +567,7 @@ READ8_MEMBER( c1541_base_t::via0_pa_r )
WRITE8_MEMBER( c1541_base_t::via0_pa_w )
{
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_data_w(data);
}
@ -636,7 +636,7 @@ WRITE8_MEMBER( c1541_base_t::via0_pb_w )
WRITE_LINE_MEMBER( c1541_base_t::via0_ca2_w )
{
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_strobe_w(state);
}

4
src/devices/bus/cbmiec/c1571.cpp
View File

@ -476,7 +476,7 @@ WRITE_LINE_MEMBER( c1571_t::cia_irq_w )
WRITE_LINE_MEMBER( c1571_t::cia_pc_w )
{
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_strobe_w(state);
}
@ -503,7 +503,7 @@ READ8_MEMBER( c1571_t::cia_pb_r )
WRITE8_MEMBER( c1571_t::cia_pb_w )
{
if (m_other != NULL)
if (m_other != nullptr)
{
m_other->parallel_data_w(data);
}

12
src/devices/bus/cbmiec/cbmiec.cpp
View File

@ -258,12 +258,12 @@ cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const ch
void cbm_iec_slot_device::device_start()
{
cbm_iec_device* bus = NULL;
cbm_iec_device* bus = nullptr;
for (device_t *device = owner(); device != NULL; device = device->owner())
for (device_t *device = owner(); device != nullptr; device = device->owner())
{
bus = device->subdevice<cbm_iec_device>(CBM_IEC_TAG);
if (bus != NULL) break;
if (bus != nullptr) break;
}
assert(bus);
@ -339,7 +339,7 @@ void cbm_iec_device::device_stop()
void cbm_iec_device::add_device(cbm_iec_slot_device *slot, device_t *target)
{
daisy_entry *entry = global_alloc(daisy_entry(target));
auto entry = global_alloc(daisy_entry(target));
entry->m_interface->m_slot = slot;
entry->m_interface->m_bus = this;
@ -353,9 +353,9 @@ void cbm_iec_device::add_device(cbm_iec_slot_device *slot, device_t *target)
//-------------------------------------------------
cbm_iec_device::daisy_entry::daisy_entry(device_t *device)
: m_next(NULL),
: m_next(nullptr),
m_device(device),
m_interface(NULL)
m_interface(nullptr)
{
for (int i = 0; i < SIGNAL_COUNT; i++)
{

2
src/devices/bus/cbmiec/interpod.cpp
View File

@ -130,7 +130,7 @@ static MACHINE_CONFIG_FRAGMENT( interpod )
MCFG_DEVICE_ADD(R6532_TAG, MOS6532n, 1000000)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
MCFG_CBM_IEEE488_ADD(NULL)
MCFG_CBM_IEEE488_ADD(nullptr)
MACHINE_CONFIG_END

2
src/devices/bus/centronics/ctronics.cpp
View File

@ -32,7 +32,7 @@ centronics_device::centronics_device(const machine_config &mconfig, const char *
m_fault_handler(*this),
m_init_handler(*this),
m_select_in_handler(*this),
m_dev(NULL)
m_dev(nullptr)
{
}

2
src/devices/bus/centronics/epson_lx810l.cpp
View File

@ -564,7 +564,7 @@ WRITE_LINE_MEMBER( epson_lx810l_t::e05a30_ready )
UINT32 epson_lx810l_t::screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int scrolly = -bitmap_line(9);
copyscrollbitmap(bitmap, m_bitmap, 0, NULL, 1, &scrolly, cliprect);
copyscrollbitmap(bitmap, m_bitmap, 0, nullptr, 1, &scrolly, cliprect);
/* draw "printhead" */
bitmap.plot_box(m_real_cr_pos + CR_OFFSET - 10, PAPER_HEIGHT - 36, 20, 36, 0x888888);

6
src/devices/bus/cgenie/expansion/expansion.cpp
View File

@ -29,9 +29,9 @@ const device_type EXPANSION_SLOT = &device_creator<expansion_slot_device>;
expansion_slot_device::expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, EXPANSION_SLOT, "Expansion Slot", tag, owner, clock, "expansion_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_program(NULL),
m_io(NULL),
m_cart(NULL),
m_program(nullptr),
m_io(nullptr),
m_cart(nullptr),
m_int_handler(*this),
m_nmi_handler(*this),
m_reset_handler(*this)

8
src/devices/bus/cgenie/expansion/floppy.cpp
View File

@ -77,8 +77,8 @@ static MACHINE_CONFIG_FRAGMENT( cgenie_fdc )
MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:1", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:2", cgenie_floppies, NULL, cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:3", cgenie_floppies, NULL, cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:2", cgenie_floppies, nullptr, cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:3", cgenie_floppies, nullptr, cgenie_fdc_device::floppy_formats)
// MCFG_SOFTWARE_LIST_ADD("floppy_list", "cgenie_flop")
@ -112,7 +112,7 @@ cgenie_fdc_device::cgenie_fdc_device(const machine_config &mconfig, const char *
m_floppy2(*this, "fd1793:2"),
m_floppy3(*this, "fd1793:3"),
m_socket(*this, "socket"),
m_floppy(NULL),
m_floppy(nullptr),
m_irq_status(0)
{
}
@ -199,7 +199,7 @@ WRITE8_MEMBER( cgenie_fdc_device::select_w )
if (VERBOSE)
logerror("cgenie_fdc_device::motor_w: 0x%02x\n", data);
m_floppy = NULL;
m_floppy = nullptr;
if (BIT(data, 0)) m_floppy = m_floppy0->get_device();
if (BIT(data, 1)) m_floppy = m_floppy1->get_device();

2
src/devices/bus/cgenie/parallel/parallel.cpp
View File

@ -29,7 +29,7 @@ const device_type PARALLEL_SLOT = &device_creator<parallel_slot_device>;
parallel_slot_device::parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PARALLEL_SLOT, "Parallel Slot", tag, owner, clock, "parallel_slot", __FILE__),
device_slot_interface(mconfig, *this),
m_cart(NULL)
m_cart(nullptr)
{
}

10
src/devices/bus/chanf/slot.cpp
View File

@ -27,7 +27,7 @@ const device_type CHANF_CART_SLOT = &device_creator<channelf_cart_slot_device>;
device_channelf_cart_interface::device_channelf_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_channelf_cart_interface::~device_channelf_cart_interface()
void device_channelf_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(CHANFSLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -163,15 +163,15 @@ bool channelf_cart_slot_device::call_load()
{
if (m_cart)
{
UINT32 len = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT32 len = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_cart->rom_alloc(len, tag());
if (software_entry() == NULL)
if (software_entry() == nullptr)
fread(m_cart->get_rom_base(), len);
else
memcpy(m_cart->get_rom_base(), get_software_region("rom"), len);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
// we default to "chess" slot because some homebrew programs have been written to run
// on PCBs with RAM at $2000-$2800 as Saba Schach!

2
src/devices/bus/chanf/slot.h
View File

@ -82,7 +82,7 @@ public:
virtual bool is_creatable() const { return 0; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 1; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
virtual const char *image_interface() const { return "channelf_cart"; }
virtual const char *file_extensions() const { return "bin,chf"; }

14
src/devices/bus/coco/coco_dwsock.cpp
View File

@ -69,14 +69,14 @@ beckerport_device::beckerport_device(const machine_config &mconfig, const char *
: device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), m_hostname(nullptr),
m_dwconfigport(*this, DRIVEWIRE_PORT_TAG), m_dwtcpport(0)
{
m_pSocket = NULL;
m_pSocket = nullptr;
m_head = 0;
m_rx_pending = 0;
}
beckerport_device::~beckerport_device()
{
if (m_pSocket != NULL)
if (m_pSocket != nullptr)
device_stop();
}
@ -110,11 +110,11 @@ void beckerport_device::device_start(void)
void beckerport_device::device_stop(void)
{
if (m_pSocket != NULL)
if (m_pSocket != nullptr)
{
printf("Closing connection to Drivewire server\n");
osd_close(m_pSocket);
m_pSocket = NULL;
m_pSocket = nullptr;
}
}
@ -136,7 +136,7 @@ READ8_MEMBER(beckerport_device::read)
{
unsigned char data = 0x5a;
if (m_pSocket == NULL)
if (m_pSocket == nullptr)
return data;
switch (offset)
@ -179,7 +179,7 @@ WRITE8_MEMBER(beckerport_device::write)
char d = (char)data;
file_error filerr;
if (m_pSocket == NULL)
if (m_pSocket == nullptr)
return;
switch (offset)
@ -188,7 +188,7 @@ WRITE8_MEMBER(beckerport_device::write)
//printf("beckerport_write: error: write (0x%02x) to status register\n", d);
break;
case DWS_DATA:
filerr = osd_write(m_pSocket, &d, 0, 1, NULL);
filerr = osd_write(m_pSocket, &d, 0, 1, nullptr);
if (filerr != FILERR_NONE)
fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr);
//printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff);

6
src/devices/bus/coco/coco_fdc.cpp
View File

@ -119,8 +119,8 @@ coco_rtc_type_t coco_fdc_device::real_time_clock()
coco_rtc_type_t result = coco_rtc_type_t(read_safe(machine().root_device().ioport("real_time_clock"), RTC_NONE));
/* check to make sure we don't have any invalid values */
if (((result == RTC_DISTO) && (m_disto_msm6242 == NULL))
|| ((result == RTC_CLOUD9) && (m_ds1315 == NULL)))
if (((result == RTC_DISTO) && (m_disto_msm6242 == nullptr))
|| ((result == RTC_CLOUD9) && (m_ds1315 == nullptr)))
{
result = RTC_NONE;
}
@ -525,7 +525,7 @@ void dragon_fdc_device::dskreg_w(UINT8 data)
data);
}
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
switch (data & 0x03)
{

6
src/devices/bus/coco/coco_multi.cpp
View File

@ -104,15 +104,15 @@ WRITE_LINE_MEMBER(coco_multipak_device::multi_halt_w)
}
static MACHINE_CONFIG_FRAGMENT(coco_multi)
MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, coco_cart_slot1_3, NULL)
MCFG_COCO_CARTRIDGE_ADD(SLOT1_TAG, coco_cart_slot1_3, nullptr)
MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_nmi_w))
MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_halt_w))
MCFG_COCO_CARTRIDGE_ADD(SLOT2_TAG, coco_cart_slot1_3, NULL)
MCFG_COCO_CARTRIDGE_ADD(SLOT2_TAG, coco_cart_slot1_3, nullptr)
MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_nmi_w))
MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_halt_w))
MCFG_COCO_CARTRIDGE_ADD(SLOT3_TAG, coco_cart_slot1_3, NULL)
MCFG_COCO_CARTRIDGE_ADD(SLOT3_TAG, coco_cart_slot1_3, nullptr)
MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_nmi_w))
MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_halt_w))

12
src/devices/bus/coco/cococart.cpp
View File

@ -160,7 +160,7 @@ WRITE8_MEMBER(cococart_slot_device::write)
static const char *line_value_string(cococart_line_value value)
{
const char *s = NULL;
const char *s = nullptr;
switch(value)
{
case COCOCART_LINE_VALUE_CLEAR:
@ -299,9 +299,9 @@ void cococart_slot_device::cart_set_line(cococart_line line, cococart_line_value
UINT8* cococart_slot_device::get_cart_base()
{
if (m_cart != NULL)
if (m_cart != nullptr)
return m_cart->get_cart_base();
return NULL;
return nullptr;
}
@ -312,7 +312,7 @@ UINT8* cococart_slot_device::get_cart_base()
void cococart_slot_device::set_cart_base_update(cococart_base_update_delegate update)
{
if (m_cart != NULL)
if (m_cart != nullptr)
m_cart->set_cart_base_update(update);
}
@ -327,7 +327,7 @@ bool cococart_slot_device::call_load()
if (m_cart)
{
offs_t read_length = 0;
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
read_length = fread(m_cart->get_cart_base(), 0x8000);
}
@ -424,7 +424,7 @@ WRITE8_MEMBER(device_cococart_interface::write)
UINT8* device_cococart_interface::get_cart_base()
{
return NULL;
return nullptr;
}

2
src/devices/bus/coco/cococart.h
View File

@ -99,7 +99,7 @@ public:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "coco_cart"; }
virtual const char *file_extensions() const { return "ccc,rom"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
// slot interface overrides
virtual void get_default_card_software(std::string &result);

2
src/devices/bus/coleco/ctrl.h
View File

@ -80,7 +80,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( common0_w ) { if (exists()) m_device->common0_w(state); }
DECLARE_WRITE_LINE_MEMBER( common1_w ) { if (exists()) m_device->common1_w(state); }
bool exists() { return m_device != NULL; }
bool exists() { return m_device != nullptr; }
void irq_w(int state) { m_write_irq(state); }

10
src/devices/bus/coleco/exp.cpp
View File

@ -28,7 +28,7 @@ const device_type COLECOVISION_CARTRIDGE_SLOT = &device_creator<colecovision_car
device_colecovision_cartridge_interface::device_colecovision_cartridge_interface(const machine_config &mconfig, device_t &device) :
device_slot_card_interface(mconfig, device),
m_rom(NULL),
m_rom(nullptr),
m_rom_size(0)
{
m_slot = dynamic_cast<colecovision_cartridge_slot_device *>(device.owner());
@ -36,7 +36,7 @@ device_colecovision_cartridge_interface::device_colecovision_cartridge_interface
void device_colecovision_cartridge_interface::rom_alloc(size_t size)
{
if (m_rom == NULL)
if (m_rom == nullptr)
{
m_rom = device().machine().memory().region_alloc("coleco_cart:rom", size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -78,10 +78,10 @@ bool colecovision_cartridge_slot_device::call_load()
{
if (m_card)
{
size_t size = (software_entry() == NULL) ? length() : get_software_region_length("rom");
size_t size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
m_card->rom_alloc(size);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
fread(m_card->m_rom, size);
}
@ -133,7 +133,7 @@ void colecovision_cartridge_slot_device::get_default_card_software(std::string &
UINT8 colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000)
{
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->bd_r(space, offset, data, _8000, _a000, _c000, _e000);
}

2
src/devices/bus/coleco/exp.h
View File

@ -90,7 +90,7 @@ protected:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "coleco_cart"; }
virtual const char *file_extensions() const { return "rom,col,bin"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
// slot interface overrides
virtual void get_default_card_software(std::string &result);

14
src/devices/bus/comx35/exp.cpp
View File

@ -71,7 +71,7 @@ UINT8 comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int
{
UINT8 data = 0;
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->comx_mrd_r(space, offset, extrom);
}
@ -86,7 +86,7 @@ UINT8 comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int
void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, UINT8 data)
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->comx_mwr_w(space, offset, data);
}
@ -101,7 +101,7 @@ UINT8 comx_expansion_slot_device::io_r(address_space &space, offs_t offset)
{
UINT8 data = 0;
if (m_card != NULL)
if (m_card != nullptr)
{
data = m_card->comx_io_r(space, offset);
}
@ -116,7 +116,7 @@ UINT8 comx_expansion_slot_device::io_r(address_space &space, offs_t offset)
void comx_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8 data)
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->comx_io_w(space, offset, data);
}
@ -129,7 +129,7 @@ void comx_expansion_slot_device::io_w(address_space &space, offs_t offset, UINT8
WRITE_LINE_MEMBER( comx_expansion_slot_device::ds_w )
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->comx_ds_w(state);
}
@ -142,7 +142,7 @@ WRITE_LINE_MEMBER( comx_expansion_slot_device::ds_w )
WRITE_LINE_MEMBER( comx_expansion_slot_device::q_w )
{
if (m_card != NULL)
if (m_card != nullptr)
{
m_card->comx_q_w(state);
}
@ -152,7 +152,7 @@ READ_LINE_MEMBER( comx_expansion_slot_device::ef4_r )
{
int state = CLEAR_LINE;
if (m_card != NULL)
if (m_card != nullptr)
{
state = m_card->comx_ef4_r();
}

16
src/devices/bus/comx35/expbox.cpp
View File

@ -164,7 +164,7 @@ void comx_eb_device::device_reset()
{
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (m_expansion_slot[slot] != NULL)
if (m_expansion_slot[slot] != nullptr)
{
m_expansion_slot[slot]->device().reset();
m_expansion_slot[slot]->ds_w(0);
@ -183,7 +183,7 @@ int comx_eb_device::comx_ef4_r()
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (m_expansion_slot[slot] != NULL)
if (m_expansion_slot[slot] != nullptr)
{
state |= m_expansion_slot[slot]->ef4_r();
}
@ -201,7 +201,7 @@ void comx_eb_device::comx_q_w(int state)
{
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (m_expansion_slot[slot] != NULL)
if (m_expansion_slot[slot] != nullptr)
{
m_expansion_slot[slot]->q_w(state);
}
@ -230,7 +230,7 @@ UINT8 comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *extro
{
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (BIT(m_select, slot) && m_expansion_slot[slot] != NULL)
if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr)
{
data |= m_expansion_slot[slot]->mrd_r(space, offset, extrom);
}
@ -249,7 +249,7 @@ void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, UINT8 data)
{
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (BIT(m_select, slot) && m_expansion_slot[slot] != NULL)
if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr)
{
m_expansion_slot[slot]->mwr_w(space, offset, data);
}
@ -267,7 +267,7 @@ UINT8 comx_eb_device::comx_io_r(address_space &space, offs_t offset)
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (BIT(m_select, slot) && m_expansion_slot[slot] != NULL)
if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr)
{
data |= m_expansion_slot[slot]->io_r(space, offset);
}
@ -289,7 +289,7 @@ void comx_eb_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (m_expansion_slot[slot] != NULL)
if (m_expansion_slot[slot] != nullptr)
{
m_expansion_slot[slot]->ds_w(BIT(m_select, slot));
}
@ -298,7 +298,7 @@ void comx_eb_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
for (int slot = 0; slot < MAX_EB_SLOTS; slot++)
{
if (BIT(m_select, slot) && m_expansion_slot[slot] != NULL)
if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr)
{
m_expansion_slot[slot]->io_w(space, offset, data);
}

6
src/devices/bus/comx35/fdc.cpp
View File

@ -98,7 +98,7 @@ static MACHINE_CONFIG_FRAGMENT( comx_fd )
MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, NULL, comx_fd_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, nullptr, comx_fd_device::floppy_formats)
MACHINE_CONFIG_END
@ -158,7 +158,7 @@ void comx_fd_device::device_reset()
{
m_fdc->reset();
m_fdc->dden_w(1);
m_fdc->set_floppy(NULL);
m_fdc->set_floppy(nullptr);
m_addr = 0;
m_disb = 1;
@ -266,7 +266,7 @@ void comx_fd_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
m_addr = data & 0x03;
// drive select
floppy_image_device *floppy = NULL;
floppy_image_device *floppy = nullptr;
if (BIT(data, 2)) floppy = m_floppy0->get_device();
if (BIT(data, 3)) floppy = m_floppy1->get_device();

6
src/devices/bus/cpc/cpc_rom.cpp
View File

@ -30,7 +30,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_rom )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
@ -99,7 +99,7 @@ rom_image_device::~rom_image_device()
void rom_image_device::device_start()
{
m_base = NULL;
m_base = nullptr;
}
/*-------------------------------------------------
@ -131,5 +131,5 @@ bool rom_image_device::call_load()
void rom_image_device::call_unload()
{
global_free_array(m_base);
m_base = NULL;
m_base = nullptr;
}

4
src/devices/bus/cpc/cpc_rom.h
View File

@ -37,7 +37,7 @@ public:
virtual bool is_reset_on_load() const { return 1; }
virtual const char *image_interface() const { return "cpc_rom"; }
virtual const char *file_extensions() const { return "rom,bin"; }
virtual const option_guide *create_option_guide() const { return NULL; }
virtual const option_guide *create_option_guide() const { return nullptr; }
UINT8* base() { return m_base; }
@ -70,7 +70,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
UINT8* base(UINT8 slot) { if(slot >=1 && slot <= 8) return m_rom[slot]->base(); else return NULL; }
UINT8* base(UINT8 slot) { if(slot >=1 && slot <= 8) return m_rom[slot]->base(); else return nullptr; }
protected:
// device-level overrides

4
src/devices/bus/cpc/cpc_rs232.cpp
View File

@ -31,7 +31,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_rs232 )
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_RS232_PORT_ADD("rs232",default_rs232_devices,NULL)
MCFG_RS232_PORT_ADD("rs232",default_rs232_devices,nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart",z80dart_device,rxa_w))
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart",z80dart_device,dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart",z80dart_device,ctsa_w))
@ -39,7 +39,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_rs232 )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS

4
src/devices/bus/cpc/cpc_ssa1.cpp
View File

@ -121,7 +121,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_ssa1 )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
@ -137,7 +137,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_dkspeech )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS

2
src/devices/bus/cpc/ddi1.cpp
View File

@ -45,7 +45,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_ddi1 )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS

4
src/devices/bus/cpc/mface2.cpp
View File

@ -20,7 +20,7 @@ const device_type CPC_MFACE2 = &device_creator<cpc_multiface2_device>;
static MACHINE_CONFIG_FRAGMENT( cpc_mface2 )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
@ -74,7 +74,7 @@ DIRECT_UPDATE_MEMBER( cpc_multiface2_device::amstrad_multiface_directoverride )
int cpc_multiface2_device::multiface_hardware_enabled()
{
if (m_multiface_ram!=NULL)
if (m_multiface_ram!=nullptr)
{
if ((ioport("multiface")->read() & 0x01)!=0)
{

2
src/devices/bus/cpc/playcity.cpp
View File

@ -34,7 +34,7 @@ static MACHINE_CONFIG_FRAGMENT( cpc_playcity )
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, NULL, false)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS

2
src/devices/bus/cpc/symbfac2.cpp
View File

@ -28,7 +28,7 @@ const device_type CPC_SYMBIFACE2 = &device_creator<cpc_symbiface2_device>;
// device machine config
static MACHINE_CONFIG_FRAGMENT( cpc_symbiface2 )
MCFG_ATA_INTERFACE_ADD("ide",ata_devices,"hdd",NULL,false)
MCFG_ATA_INTERFACE_ADD("ide",ata_devices,"hdd",nullptr,false)
MCFG_DS12885_ADD("rtc")
MCFG_NVRAM_ADD_1FILL("nvram")
// no pass-through

10
src/devices/bus/crvision/slot.cpp
View File

@ -27,7 +27,7 @@ const device_type CRVISION_CART_SLOT = &device_creator<crvision_cart_slot_device
device_crvision_cart_interface::device_crvision_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_crvision_cart_interface::~device_crvision_cart_interface()
void device_crvision_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(CRVSLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
@ -154,7 +154,7 @@ bool crvision_cart_slot_device::call_load()
{
if (m_cart)
{
UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT32 size = (software_entry() == nullptr) ? length() : get_software_region_length("rom");
if (size > 0x4800)
{
@ -164,12 +164,12 @@ bool crvision_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);
if (software_entry() == NULL)
if (software_entry() == nullptr)
{
m_type = CRV_4K;

Some files were not shown because too many files have changed in this diff Show More