summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/flopdrv.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/devices/imagedev/flopdrv.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/imagedev/flopdrv.cpp')
-rw-r--r--src/devices/imagedev/flopdrv.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp
index a9639b3ce9a..4bfa045dae9 100644
--- a/src/devices/imagedev/flopdrv.cpp
+++ b/src/devices/imagedev/flopdrv.cpp
@@ -124,7 +124,7 @@ void legacy_floppy_image_device::floppy_drive_init()
{
/* initialise flags */
m_flags = 0;
- m_index_pulse_callback = NULL;
+ m_index_pulse_callback = nullptr;
m_index_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(legacy_floppy_image_device::floppy_drive_index_callback),this));
m_idx = 0;
@@ -138,7 +138,7 @@ void legacy_floppy_image_device::floppy_drive_init()
/* default RPM */
m_rpm = 300;
- m_controller = NULL;
+ m_controller = nullptr;
m_floppy_drive_type = FLOPPY_TYPE_REGULAR;
}
@@ -425,7 +425,7 @@ int legacy_floppy_image_device::internal_floppy_device_load(int create_format, o
int floppy_flags, i;
const char *extension;
- device_image_interface *image = NULL;
+ device_image_interface *image = nullptr;
interface(image); /* figure out the floppy options */
floppy_options = ((floppy_interface*)static_config())->formats;
@@ -478,7 +478,7 @@ legacy_floppy_image_device *floppy_get_device(running_machine &machine,int drive
case 2 : return machine.device<legacy_floppy_image_device>(FLOPPY_2);
case 3 : return machine.device<legacy_floppy_image_device>(FLOPPY_3);
}
- return NULL;
+ return nullptr;
}
int legacy_floppy_image_device::floppy_get_drive_type()
@@ -504,7 +504,7 @@ legacy_floppy_image_device *floppy_get_device_by_type(running_machine &machine,i
cnt++;
}
}
- return NULL;
+ return nullptr;
}
int floppy_get_drive(device_t *image)
@@ -672,7 +672,7 @@ READ_LINE_MEMBER( legacy_floppy_image_device::floppy_dskchg_r )
/* 2-sided disk */
READ_LINE_MEMBER( legacy_floppy_image_device::floppy_twosid_r )
{
- if (m_floppy == NULL)
+ if (m_floppy == nullptr)
return ASSERT_LINE;
else
return !floppy_get_heads_per_disk(m_floppy);
@@ -709,21 +709,21 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
m_rdy(0),
m_dskchg(0),
m_drive_id(0),
- m_active(0),
- m_config(NULL),
+ m_active(0),
+ m_config(nullptr),
m_flags(0),
m_max_track(0),
m_num_sides(0),
- m_current_track(0),
- m_index_timer(NULL),
- m_index_pulse_callback(NULL),
+ m_current_track(0),
+ m_index_timer(nullptr),
+ m_index_pulse_callback(nullptr),
m_rpm(0.0f),
m_id_index(0),
- m_controller(NULL),
- m_floppy(NULL),
+ m_controller(nullptr),
+ m_floppy(nullptr),
m_track(0),
- m_load_proc(NULL),
- m_unload_proc(NULL),
+ m_load_proc(nullptr),
+ m_unload_proc(nullptr),
m_floppy_drive_type(0)
{
memset(&m_extension_list,0,sizeof(m_extension_list));
@@ -743,21 +743,21 @@ legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mco
m_rdy(0),
m_dskchg(0),
m_drive_id(0),
- m_active(0),
- m_config(NULL),
+ m_active(0),
+ m_config(nullptr),
m_flags(0),
m_max_track(0),
m_num_sides(0),
- m_current_track(0),
- m_index_timer(NULL),
- m_index_pulse_callback(NULL),
+ m_current_track(0),
+ m_index_timer(nullptr),
+ m_index_pulse_callback(nullptr),
m_rpm(0.0f),
m_id_index(0),
- m_controller(NULL),
- m_floppy(NULL),
+ m_controller(nullptr),
+ m_floppy(nullptr),
m_track(0),
- m_load_proc(NULL),
- m_unload_proc(NULL),
+ m_load_proc(nullptr),
+ m_unload_proc(nullptr),
m_floppy_drive_type(0)
{
memset(&m_extension_list,0,sizeof(m_extension_list));
@@ -839,7 +839,7 @@ bool legacy_floppy_image_device::call_create(int format_type, option_resolution
bool legacy_floppy_image_device::call_load()
{
- int retVal = internal_floppy_device_load(-1, NULL);
+ int retVal = internal_floppy_device_load(-1, nullptr);
if (retVal==IMAGE_INIT_PASS) {
/* if we have one of our hacky unload procs, call it */
if (m_load_proc)
@@ -869,7 +869,7 @@ void legacy_floppy_image_device::call_unload()
m_unload_proc(*this);
floppy_close(m_floppy);
- m_floppy = NULL;
+ m_floppy = nullptr;
/* disk changed */
m_dskchg = CLEAR_LINE;