diff options
Diffstat (limited to 'src/devices/machine/upd765.cpp')
| -rw-r--r-- | src/devices/machine/upd765.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index e1ce769880e..6587c44d360 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -153,12 +153,12 @@ void upd765_family_device::device_start() floppy_connector *con = subdevice<floppy_connector>(name); if(con) { flopi[i].dev = con->get_device(); - if (flopi[i].dev != NULL) + if (flopi[i].dev != nullptr) flopi[i].dev->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(upd765_family_device::index_callback), this)); } else - flopi[i].dev = NULL; + flopi[i].dev = nullptr; } else - flopi[i].dev = NULL; + flopi[i].dev = nullptr; flopi[i].main_state = IDLE; flopi[i].sub_state = IDLE; @@ -181,13 +181,13 @@ void upd765_family_device::device_start() cur_live.tm = attotime::never; cur_live.state = IDLE; cur_live.next_state = -1; - cur_live.fi = NULL; + cur_live.fi = nullptr; if(ready_polled) { poll_timer = timer_alloc(TIMER_DRIVE_READY_POLLING); poll_timer->adjust(attotime::from_usec(100), 0, attotime::from_usec(1024)); } else - poll_timer = NULL; + poll_timer = nullptr; cur_irq = false; locked = false; @@ -219,12 +219,12 @@ void upd765_family_device::soft_reset() result_pos = 0; if(!locked) fifocfg = FIF_DIS; - cur_live.fi = 0; + cur_live.fi = nullptr; drq = false; cur_live.tm = attotime::never; cur_live.state = IDLE; cur_live.next_state = -1; - cur_live.fi = NULL; + cur_live.fi = nullptr; tc_done = false; st1 = st2 = st3 = 0x00; @@ -260,10 +260,10 @@ bool upd765_family_device::get_ready(int fid) void upd765_family_device::set_floppy(floppy_image_device *flop) { - for(int fid=0; fid<4; fid++) { - if(flopi[fid].dev) - flopi[fid].dev->setup_index_pulse_cb(floppy_image_device::index_pulse_cb()); - flopi[fid].dev = flop; + for(auto & elem : flopi) { + if(elem.dev) + elem.dev->setup_index_pulse_cb(floppy_image_device::index_pulse_cb()); + elem.dev = flop; } if(flop) flop->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(upd765_family_device::index_callback), this)); @@ -626,7 +626,7 @@ void upd765_family_device::live_sync() cur_live.pll.stop_writing(cur_live.fi->dev, cur_live.tm); cur_live.tm = attotime::never; cur_live.fi->live = false; - cur_live.fi = 0; + cur_live.fi = nullptr; } } cur_live.next_state = -1; @@ -644,7 +644,7 @@ void upd765_family_device::live_abort() if(cur_live.fi) { cur_live.pll.stop_writing(cur_live.fi->dev, cur_live.tm); cur_live.fi->live = false; - cur_live.fi = 0; + cur_live.fi = nullptr; } cur_live.tm = attotime::never; @@ -1335,7 +1335,7 @@ void upd765_family_device::start_command(int cmd) main_phase = PHASE_RESULT; int fid; - for(fid=0; fid<4 && !flopi[fid].st0_filled; fid++); + for(fid=0; fid<4 && !flopi[fid].st0_filled; fid++) {}; if(fid == 4) { result[0] = ST0_UNK; result_pos = 1; @@ -2246,8 +2246,8 @@ void upd765_family_device::run_drive_ready_polling() void upd765_family_device::index_callback(floppy_image_device *floppy, int state) { - for(int fid=0; fid<4; fid++) { - floppy_info &fi = flopi[fid]; + for(auto & fi : flopi) { + if(fi.dev != floppy) continue; |
