diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/bus/ti99x/990_hd.cpp | 2 | ||||
-rw-r--r-- | src/emu/device.h | 1 | ||||
-rw-r--r-- | src/mame/drivers/n64.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/atarifdc.cpp | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp index 0bb3b475086..9c2ce32ae51 100644 --- a/src/devices/bus/ti99x/990_hd.cpp +++ b/src/devices/bus/ti99x/990_hd.cpp @@ -241,7 +241,7 @@ DEVICE_IMAGE_LOAD_MEMBER( ti990_hdc_device, ti990_hd ) */ DEVICE_IMAGE_UNLOAD_MEMBER( ti990_hdc_device, ti990_hd ) { - int id = get_id_from_device( image ); + int id = get_id_from_device(&image.device()); hd_unit_t *d; d = &m_d[id]; diff --git a/src/emu/device.h b/src/emu/device.h index 211da59cb38..38b20ba3111 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -635,7 +635,6 @@ public: device_t &device() { return m_device; } const device_t &device() const { return m_device; } operator device_t &() { return m_device; } - operator device_t *() { return &m_device; } // iteration helpers device_interface *interface_next() const { return m_interface_next; } diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 3aac0f61e71..d2786cbb92e 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -341,7 +341,7 @@ DEVICE_IMAGE_LOAD_MEMBER(n64_mess_state,n64_cart) } } - periphs->m_nvram_image = image; + periphs->m_nvram_image = &image.device(); logerror("cart length = %d\n", length); diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp index 0603ebda199..207d9ad5ab1 100644 --- a/src/mame/machine/atarifdc.cpp +++ b/src/mame/machine/atarifdc.cpp @@ -111,7 +111,7 @@ static void _atari_load_proc(device_image_interface &image, bool is_created) void atari_fdc_device::atari_load_proc(device_image_interface &image, bool is_created) { - int id = floppy_get_drive(image); + int id = floppy_get_drive(&image.device()); int size, i; m_drv[id].image = std::make_unique<uint8_t[]>(MAXSIZE); |