diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/pc_fdc.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/pc_fdc.cpp')
| -rw-r--r-- | src/devices/machine/pc_fdc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index 5c56a53d3d6..d72db5a0c45 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -78,9 +78,9 @@ void pc_fdc_family_device::device_start() drq_cb.resolve(); for(int i=0; i<4; i++) { - char name[2] = {'0'+i, 0}; + char name[2] = {static_cast<char>('0'+i), 0}; floppy_connector *conn = subdevice<floppy_connector>(name); - floppy[i] = conn ? conn->get_device() : NULL; + floppy[i] = conn ? conn->get_device() : nullptr; } irq = drq = false; @@ -115,7 +115,7 @@ WRITE8_MEMBER( pc_fdc_family_device::dor_w ) if(dor & (0x10 << fid)) fdc->set_floppy(floppy[fid]); else - fdc->set_floppy(NULL); + fdc->set_floppy(nullptr); check_irq(); check_drq(); |
