diff options
Diffstat (limited to 'src/devices/bus/cgenie/expansion/floppy.cpp')
-rw-r--r-- | src/devices/bus/cgenie/expansion/floppy.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index ee914179d10..a52b39a9ea5 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -14,7 +14,7 @@ #include "floppy.h" #include "formats/cgenie_dsk.h" #include "bus/generic/carts.h" -#include "softlist.h" +#include "softlist_dev.h" //************************************************************************** // CONSTANTS/MACROS @@ -177,21 +177,18 @@ TIMER_DEVICE_CALLBACK_MEMBER( cgenie_fdc_device::timer_callback ) DEVICE_IMAGE_LOAD_MEMBER( cgenie_fdc_device::socket_load ) { - uint32_t size = m_socket->common_get_size("rom"); + uint32_t const size = m_socket->common_get_size("rom"); if (size > 0x1000) - { - image.seterror(image_error::INVALIDIMAGE, "Unsupported ROM size"); - return image_init_result::FAIL; - } + return std::make_pair(image_error::INVALIDLENGTH, "Unsupported ROM size (must be no more than 4K)"); m_socket->rom_alloc(0x1000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_socket->common_load_rom(m_socket->get_rom_base(), size, "rom"); - return image_init_result::PASS; + return std::make_pair(std::error_condition(), std::string()); } -WRITE_LINE_MEMBER( cgenie_fdc_device::intrq_w ) +void cgenie_fdc_device::intrq_w(int state) { if (VERBOSE) logerror("cgenie_fdc_device::intrq_w: %d\n", state); |