diff options
Diffstat (limited to 'src/devices/bus/m5/slot.cpp')
-rw-r--r-- | src/devices/bus/m5/slot.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp index a75599bb807..1be35e6d997 100644 --- a/src/devices/bus/m5/slot.cpp +++ b/src/devices/bus/m5/slot.cpp @@ -48,7 +48,7 @@ void device_m5_cart_interface::rom_alloc(uint32_t size, const char *tag) { if (m_rom == nullptr) { - m_rom = device().machine().memory().region_alloc(std::string(tag).append(M5SLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base(); + m_rom = device().machine().memory().region_alloc(std::string(tag).append(M5SLOT_ROM_REGION_TAG), size, 1, ENDIANNESS_LITTLE)->base(); m_rom_size = size; } } @@ -73,7 +73,7 @@ void device_m5_cart_interface::ram_alloc(uint32_t size) //------------------------------------------------- m5_cart_slot_device::m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, M5_CART_SLOT, tag, owner, clock), - device_image_interface(mconfig, *this), + device_cartrom_image_interface(mconfig, *this), device_single_card_slot_interface(mconfig, *this), m_type(M5_STD), m_cart(nullptr) @@ -145,7 +145,7 @@ static const char *m5_get_slot(int type) call load -------------------------------------------------*/ -image_init_result m5_cart_slot_device::call_load() +std::pair<std::error_condition, std::string> m5_cart_slot_device::call_load() { if (m_cart) { @@ -165,10 +165,7 @@ image_init_result m5_cart_slot_device::call_load() uint32_t size = !loaded_through_softlist() ? length() : get_software_region_length("rom"); if (size > 0x5000 && m_type == M5_STD) - { - seterror(image_error::INVALIDIMAGE, "Image extends beyond the expected size for an M5 cart"); - return image_init_result::FAIL; - } + return std::make_pair(image_error::INVALIDLENGTH, "Image file exceeds the expected size for an M5 cart (20K)"); m_cart->rom_alloc(size, tag()); @@ -182,11 +179,10 @@ image_init_result m5_cart_slot_device::call_load() if (get_software_region("ram")) m_cart->ram_alloc(get_software_region_length("ram")); - //printf("Type: %s\n", m5_get_slot(m_type)); } - return image_init_result::PASS; + return std::make_pair(std::error_condition(), std::string()); } |