diff options
author | Vas Crabb <vas@vastheman.com> | 2016-08-01 18:46:56 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-08-01 18:47:22 +1000 |
commit | 15e7be7ac8e4127e9fc0f9b5c248f4a73ba85703 (patch) | |
tree | 71346f2c2d1ac08e0e9c9f4dea8f2537af380143 /src/mame | |
parent | c4c05c9735a5b956de128d6017027658b6c61a8e (diff) |
Turn image init/validate into scoped enums to avoid accidental casts to/from integer and boolean types
The image error should also be turned into a scoped enum - the menus were assuming it was the same thing as an init result
Diffstat (limited to 'src/mame')
140 files changed, 472 insertions, 474 deletions
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index e4d5100e777..5537cb21126 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -506,7 +506,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac ) space.write_byte(HEAD + 1, head >> 8); if (LOG) logerror("HEAD %04x\n",address); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index 3e4ff2022f4..00018157e05 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -145,14 +145,14 @@ INPUT_PORTS_END MACHINE DRIVERS ***************************************************************************/ -int aim65_state::load_cart(device_image_interface &image, generic_slot_device *slot, const char *slot_tag) +image_init_result aim65_state::load_cart(device_image_interface &image, generic_slot_device *slot, const char *slot_tag) { UINT32 size = slot->common_get_size(slot_tag); if (size > 0x1000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (image.software_entry() != nullptr && image.get_software_region(slot_tag) == nullptr) @@ -161,13 +161,13 @@ int aim65_state::load_cart(device_image_interface &image, generic_slot_device *s "Attempted to load file with wrong extension\nSocket '%s' only accepts files with '.%s' extension", slot_tag, slot_tag); image.seterror(IMAGE_ERROR_UNSPECIFIED, errmsg.c_str()); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); slot->common_load_rom(slot->get_rom_base(), size, slot_tag); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp index 60dc683c006..94c43ac759f 100644 --- a/src/mame/drivers/altair.cpp +++ b/src/mame/drivers/altair.cpp @@ -81,12 +81,12 @@ QUICKLOAD_LOAD_MEMBER( altair_state,altair) int read_; quick_length = image.length(); if (quick_length >= 0xfd00) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; read_ = image.fread(m_ram, quick_length); if (read_ != quick_length) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } WRITE_LINE_MEMBER(altair_state::write_acia_clock) diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp index 2dac4620982..4987c7343fc 100644 --- a/src/mame/drivers/apexc.cpp +++ b/src/mame/drivers/apexc.cpp @@ -86,7 +86,7 @@ public: virtual bool is_reset_on_load() const override { return 1; } virtual const char *file_extensions() const override { return "apc"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -107,7 +107,7 @@ apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &m /* Open cylinder image and read RAM */ -bool apexc_cylinder_image_device::call_load() +image_init_result apexc_cylinder_image_device::call_load() { /* load RAM contents */ m_writable = !is_readonly(); @@ -122,7 +122,7 @@ bool apexc_cylinder_image_device::call_load() } #endif - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index d2858672814..da0ce7ac41d 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -178,26 +178,26 @@ SNAPSHOT_LOAD_MEMBER( apple1_state, apple1 ) if (snapsize < 12) { logerror("Snapshot is too short\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if ((snapsize - 12) > 65535) { logerror("Snapshot is too long\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } data = (UINT8 *)image.ptr(); if (!data) { logerror("Internal error loading snapshot\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if ((memcmp(hd1, data, 5)) || (memcmp(hd2, &data[7], 5))) { logerror("Snapshot is invalid\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } start = (data[5]<<8) | data[6]; @@ -208,7 +208,7 @@ SNAPSHOT_LOAD_MEMBER( apple1_state, apple1 ) if (((start < 0xe000) && (end > (m_ram_size - 1))) || (end > 0xefff)) { logerror("Snapshot can't fit in RAM\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (start < 0xe000) @@ -222,10 +222,10 @@ SNAPSHOT_LOAD_MEMBER( apple1_state, apple1 ) else { logerror("Snapshot has invalid load address %04x\n", start); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void apple1_state::poll_keyboard() diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp index f2842135532..58ab2e96033 100644 --- a/src/mame/drivers/atom.cpp +++ b/src/mame/drivers/atom.cpp @@ -170,7 +170,7 @@ QUICKLOAD_LOAD_MEMBER( atom_state, atom_atm ) m_maincpu->set_pc(run_address); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /*************************************************************************** @@ -675,20 +675,20 @@ void atomeb_state::machine_start() MACHINE DRIVERS ***************************************************************************/ -int atom_state::load_cart(device_image_interface &image, generic_slot_device *slot) +image_init_result atom_state::load_cart(device_image_interface &image, generic_slot_device *slot) { UINT32 size = slot->common_get_size("rom"); if (size > 0x1000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); slot->common_load_rom(slot->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static SLOT_INTERFACE_START(atom_floppies) diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index 2d27c700203..7d3c3c0677d 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -729,10 +729,10 @@ QUICKLOAD_LOAD_MEMBER( avigo_state,avigo) m_warm_start = 1; m_maincpu->reset(); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } void avigo_state::nvram_init(nvram_device &nvram, void *base, size_t size) diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index 024a42d5c69..f9b946f4cd0 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -289,13 +289,13 @@ DEVICE_IMAGE_LOAD_MEMBER( beta_state, beta_eprom ) if (size != 0x800) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_eprom->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_eprom->common_load_rom(m_eprom->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } DEVICE_IMAGE_UNLOAD_MEMBER( beta_state, beta_eprom ) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index 8abd74a23cd..b0fb117513c 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -226,7 +226,7 @@ QUICKLOAD_LOAD_MEMBER( binbug_state, binbug ) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); if (quick_length < 0x0444) @@ -273,7 +273,7 @@ QUICKLOAD_LOAD_MEMBER( binbug_state, binbug ) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index d01b81163a2..f9c67268fe8 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -498,7 +498,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart ) DST[i + 3] = tempb; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( casloopy, casloopy_state ) diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index f537259fd42..1fc89f3da77 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -164,13 +164,13 @@ DEVICE_IMAGE_LOAD_MEMBER(cc40_state, cc40_cartridge) if (size > 0x20000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(0x20000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // allocate a larger ROM region to have 4x32K banks m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index ac844445d72..9e72052234a 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -195,7 +195,8 @@ WRITE8_MEMBER( cd2650_state::kbd_put ) QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 ) { - int i, result = IMAGE_INIT_FAIL; + int i; + image_init_result result = image_init_result::FAIL; int quick_length = image.length(); if (quick_length < 0x1500) @@ -253,7 +254,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 ) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp index b7c12e5e6d1..dd4cec79202 100644 --- a/src/mame/drivers/coleco.cpp +++ b/src/mame/drivers/coleco.cpp @@ -352,15 +352,15 @@ void coleco_state::machine_reset() m_last_nmi_state = 0; } -//static bool coleco_cart_verify(const UINT8 *cartdata, size_t size) +//static image_verify_result coleco_cart_verify(const UINT8 *cartdata, size_t size) //{ -// int retval = false; +// int retval = image_verify_result::FAIL; // // /* Verify the file is in Colecovision format */ // if ((cartdata[0] == 0xAA) && (cartdata[1] == 0x55)) /* Production Cartridge */ -// retval = true; +// retval = image_verify_result::PASS; // if ((cartdata[0] == 0x55) && (cartdata[1] == 0xAA)) /* "Test" Cartridge. Some games use this method to skip ColecoVision title screen and delay */ -// retval = true; +// retval = image_verify_result::PASS; // // return retval; //} diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 557825a3cd4..7a6c2cb4a54 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -58,14 +58,14 @@ QUICKLOAD_LOAD_MEMBER( comx35_state, comx35_comx ) if (size > m_ram->size()) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread( header, 5); if (header[1] != 'C' || header[2] != 'O' || header[3] != 'M' || header[4] != 'X' ) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } switch (header[0]) @@ -192,7 +192,7 @@ QUICKLOAD_LOAD_MEMBER( comx35_state, comx35_comx ) break; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } //************************************************************************** diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index 3c066b72626..96d29ff341f 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -495,7 +495,7 @@ QUICKLOAD_LOAD_MEMBER( cosmicos_state, cosmicos ) /* load image to RAM */ image.fread(ptr, size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* Machine Driver */ diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index bf7e382819e..090aa7706a1 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -285,11 +285,11 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload ) } else { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( cp1, cp1_state ) diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index ef69ab8eec5..8440b6aa783 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -346,7 +346,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); quick_data.resize(quick_length); @@ -371,7 +371,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 ) else m_maincpu->set_pc(exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } return result; diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index f21896f9f69..e4fdc6a2ce4 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -221,12 +221,12 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf ) if (size > m_ram->size()) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread(m_ram->pointer(), size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( elf2, elf2_state ) diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp index 6f55f3fc43d..e84f149805c 100644 --- a/src/mame/drivers/eti660.cpp +++ b/src/mame/drivers/eti660.cpp @@ -269,7 +269,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); quick_data.resize(quick_length); @@ -291,7 +291,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 ) else image.message(" Quickload: size=%04X : start=%04X : end=%04X : Press 8 to start",quick_length,quick_addr,quick_addr+quick_length); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } return result; diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index c4cfde1b3f6..76f47be781d 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -740,13 +740,13 @@ DEVICE_IMAGE_LOAD_MEMBER(fidelz80base_state, scc_cartridge) if (size > 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 6a7cc1a172a..08151b2127b 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -125,65 +125,62 @@ class force68k_state : public driver_device { public: -force68k_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device (mconfig, type, tag), - m_maincpu (*this, "maincpu"), - m_rtc (*this, "rtc"), - m_pit (*this, "pit"), - m_aciahost (*this, "aciahost"), - m_aciaterm (*this, "aciaterm"), - m_aciaremt (*this, "aciaremt"), - m_centronics (*this, "centronics") - , m_centronics_ack (0) - , m_centronics_busy (0) - , m_centronics_perror (0) - , m_centronics_select (0) - ,m_cart(*this, "exp_rom1") -{ -} - -DECLARE_READ16_MEMBER (bootvect_r); -DECLARE_READ16_MEMBER (vme_a24_r); -DECLARE_WRITE16_MEMBER (vme_a24_w); -DECLARE_READ16_MEMBER (vme_a16_r); -DECLARE_WRITE16_MEMBER (vme_a16_w); -virtual void machine_start () override; -// clocks -DECLARE_WRITE_LINE_MEMBER (write_aciahost_clock); -DECLARE_WRITE_LINE_MEMBER (write_aciaterm_clock); -DECLARE_WRITE_LINE_MEMBER (write_aciaremt_clock); -// centronics printer interface -DECLARE_WRITE_LINE_MEMBER (centronics_ack_w); -DECLARE_WRITE_LINE_MEMBER (centronics_busy_w); -DECLARE_WRITE_LINE_MEMBER (centronics_perror_w); -DECLARE_WRITE_LINE_MEMBER (centronics_select_w); -// User EPROM/SRAM slot(s) -int force68k_load_cart(device_image_interface &image, generic_slot_device *slot); -DECLARE_DEVICE_IMAGE_LOAD_MEMBER (exp1_load) { return force68k_load_cart(image, m_cart); } -DECLARE_READ16_MEMBER (read16_rom); - -protected: + force68k_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_rtc(*this, "rtc") + , m_pit(*this, "pit") + , m_aciahost(*this, "aciahost") + , m_aciaterm(*this, "aciaterm") + , m_aciaremt(*this, "aciaremt") + , m_centronics(*this, "centronics") + , m_centronics_ack(0) + , m_centronics_busy(0) + , m_centronics_perror(0) + , m_centronics_select(0) + , m_cart(*this, "exp_rom1") + { + } + + DECLARE_READ16_MEMBER (bootvect_r); + DECLARE_READ16_MEMBER (vme_a24_r); + DECLARE_WRITE16_MEMBER (vme_a24_w); + DECLARE_READ16_MEMBER (vme_a16_r); + DECLARE_WRITE16_MEMBER (vme_a16_w); + virtual void machine_start () override; + // clocks + DECLARE_WRITE_LINE_MEMBER (write_aciahost_clock); + DECLARE_WRITE_LINE_MEMBER (write_aciaterm_clock); + DECLARE_WRITE_LINE_MEMBER (write_aciaremt_clock); + // centronics printer interface + DECLARE_WRITE_LINE_MEMBER (centronics_ack_w); + DECLARE_WRITE_LINE_MEMBER (centronics_busy_w); + DECLARE_WRITE_LINE_MEMBER (centronics_perror_w); + DECLARE_WRITE_LINE_MEMBER (centronics_select_w); + // User EPROM/SRAM slot(s) + image_init_result force68k_load_cart(device_image_interface &image, generic_slot_device *slot); + DECLARE_DEVICE_IMAGE_LOAD_MEMBER (exp1_load) { return force68k_load_cart(image, m_cart); } + DECLARE_READ16_MEMBER (read16_rom); private: -required_device<cpu_device> m_maincpu; -required_device<mm58167_device> m_rtc; -required_device<pit68230_device> m_pit; -required_device<acia6850_device> m_aciahost; -required_device<acia6850_device> m_aciaterm; -required_device<acia6850_device> m_aciaremt; -optional_device<centronics_device> m_centronics; - -INT32 m_centronics_ack; -INT32 m_centronics_busy; -INT32 m_centronics_perror; -INT32 m_centronics_select; - -// Pointer to System ROMs needed by bootvect_r -UINT16 *m_sysrom; -UINT16 *m_usrrom; - -required_device<generic_slot_device> m_cart; - + required_device<cpu_device> m_maincpu; + required_device<mm58167_device> m_rtc; + required_device<pit68230_device> m_pit; + required_device<acia6850_device> m_aciahost; + required_device<acia6850_device> m_aciaterm; + required_device<acia6850_device> m_aciaremt; + optional_device<centronics_device> m_centronics; + + INT32 m_centronics_ack; + INT32 m_centronics_busy; + INT32 m_centronics_perror; + INT32 m_centronics_select; + + // Pointer to System ROMs needed by bootvect_r + UINT16 *m_sysrom; + UINT16 *m_usrrom; + + required_device<generic_slot_device> m_cart; }; static ADDRESS_MAP_START (force68k_mem, AS_PROGRAM, 16, force68k_state) @@ -403,7 +400,7 @@ MACHINE_CONFIG_END /*************************** Rom loading functions ****************************/ -int force68k_state::force68k_load_cart(device_image_interface &image, generic_slot_device *slot) +image_init_result force68k_state::force68k_load_cart(device_image_interface &image, generic_slot_device *slot) { UINT32 size = slot->common_get_size("rom"); @@ -411,13 +408,13 @@ int force68k_state::force68k_load_cart(device_image_interface &image, generic_sl { LOG( printf("Cartridge size exceeding max size (128Kb): %d\n", size) ); image.seterror(IMAGE_ERROR_UNSPECIFIED, "Cartridge size exceeding max size (128Kb)"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_BIG); slot->common_load_rom(slot->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index 96366b2bf02..0a5755c96d1 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -234,13 +234,13 @@ DEVICE_IMAGE_LOAD_MEMBER( gameking_state, gameking_cart ) if (size > 0x80000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void gameking_state::machine_start() diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index dbfd894b9e5..95a038ea0bd 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -782,7 +782,7 @@ DEVICE_IMAGE_LOAD_MEMBER(geniusiq_state,iq128_cart) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } DEVICE_IMAGE_UNLOAD_MEMBER(geniusiq_state,iq128_cart) diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 66bb22675db..975f15ddd95 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -664,7 +664,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Cannot read the file"); image.message(" Cannot read the file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fseek(0x100, SEEK_SET); @@ -673,7 +673,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Invalid header"); image.message(" Invalid header"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } while((ch = image.fgetc())) @@ -682,7 +682,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "File name too long"); image.message(" File name too long"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } pgmname[i] = ch; /* build program name */ @@ -695,7 +695,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Unexpected EOF while getting file size"); image.message(" Unexpected EOF while getting file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } quick_addr = little_endianize_int16(args[0]); @@ -706,7 +706,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "File too large"); image.message(" File too large"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /* display a message about the loaded quickload */ @@ -721,12 +721,12 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab) snprintf(message, ARRAY_LENGTH(message), "%s: Unexpected EOF while writing byte to %04X", pgmname, (unsigned) j); image.seterror(IMAGE_ERROR_INVALIDIMAGE, message); image.message("%s: Unexpected EOF while writing byte to %04X", pgmname, (unsigned) j); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } space.write_byte(j, ch); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* Machine driver */ diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index 378c585cf64..15336953b9c 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -282,7 +282,7 @@ DEVICE_IMAGE_LOAD_MEMBER( i7000_state, i7000_card ) m_card->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_BIG); m_card->common_load_rom(m_card->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static const gfx_layout i7000_charlayout = diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index 878b6ff29dd..2bc58e7113d 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -66,7 +66,7 @@ public: DECLARE_WRITE8_MEMBER(pcjx_port_1ff_w); void pcjx_set_bank(int unk1, int unk2, int unk3); - int load_cart(device_image_interface &image, generic_slot_device *slot); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pcjr_cart1) { return load_cart(image, m_cart1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pcjr_cart2) { return load_cart(image, m_cart2); } void pc_speaker_set_spkrdata(UINT8 data); @@ -436,7 +436,7 @@ READ8_MEMBER(pcjr_state::pcjx_port_1ff_r) return 0x60; // expansion? } -int pcjr_state::load_cart(device_image_interface &image, generic_slot_device *slot) +image_init_result pcjr_state::load_cart(device_image_interface &image, generic_slot_device *slot) { UINT32 size = slot->common_get_size("rom"); bool imagic_hack = false; @@ -456,7 +456,7 @@ int pcjr_state::load_cart(device_image_interface &image, generic_slot_device *sl break; default: image.seterror(IMAGE_ERROR_UNSUPPORTED, "Invalid header size" ); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (size - header_size == 0xa000) { @@ -487,7 +487,7 @@ int pcjr_state::load_cart(device_image_interface &image, generic_slot_device *sl memcpy(ROM + 0x4000, ROM, 0x2000); memcpy(ROM + 0x2000, ROM, 0x2000); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 469203c59cc..e51774efaf5 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -323,7 +323,7 @@ void instruct_state::machine_reset() QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) { UINT16 i, exec_addr, quick_length, read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); if (quick_length < 0x0100) @@ -393,7 +393,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) // Start the quickload - JP exec_addr m_maincpu->set_state_int(S2650_PC, 0); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index 448d92b1526..f9fa040576f 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -1979,7 +1979,7 @@ QUICKLOAD_LOAD_MEMBER( jaguar_state, jaguar ) return quickload(image, file_type, quickload_size); } -int jaguar_state::quickload(device_image_interface &image, const char *file_type, int quickload_size) +image_init_result jaguar_state::quickload(device_image_interface &image, const char *file_type, int quickload_size) { offs_t quickload_begin = 0x4000, start = quickload_begin, skip = 0; @@ -2044,7 +2044,7 @@ int jaguar_state::quickload(device_image_interface &image, const char *file_type /* Transfer control to image */ m_maincpu->set_pc(quickload_begin); m_shared_ram[1]=quickload_begin; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void jaguar_state::cart_start() @@ -2089,7 +2089,7 @@ DEVICE_IMAGE_LOAD_MEMBER( jaguar_state, jaguar_cart ) /* Transfer control to the bios */ m_maincpu->set_pc(m_rom_base[1]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /************************************* diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index a8934dace89..200deba0c35 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -321,19 +321,19 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100) int read_; quick_length = image.length(); if (quick_length >= 0xffff) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; read_ = image.fread(buf, quick_length); if (read_ != quick_length) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; if (buf[0]!=0x50 || buf[1]!=0x52 || buf[2]!=0x4F || buf[3]!=0x47) { // this is not PRG - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } int pos = 4; if (readByLittleEndian(buf,pos)!=1) { // not version 1 of PRG file - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } pos += 4; UINT32 len =readByLittleEndian(buf,pos); pos+= 4; @@ -359,7 +359,7 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100) m_ram[13] = ((end_address + 3) & 0xFF); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( jr100, jr100_state ) diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 2809fcc0daa..987a27dc0c8 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -169,7 +169,7 @@ SNAPSHOT_LOAD_MEMBER( ace_state, ace ) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "At least 16KB RAM expansion required"); image.message("At least 16KB RAM expansion required"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } logerror("Loading file %s.\r\n", image.filename()); @@ -206,7 +206,7 @@ SNAPSHOT_LOAD_MEMBER( ace_state, ace ) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "EOF marker not found"); image.message("EOF marker not found"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } // patch CPU registers @@ -244,7 +244,7 @@ SNAPSHOT_LOAD_MEMBER( ace_state, ace ) for (ace_index = 0x2000; ace_index < 0x8000; ace_index++) space.write_byte(ace_index, RAM[ace_index]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } //************************************************************************** diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp index b46d07e385b..47e36349c13 100644 --- a/src/mame/drivers/leapster.cpp +++ b/src/mame/drivers/leapster.cpp @@ -266,7 +266,7 @@ DEVICE_IMAGE_LOAD_MEMBER( leapster_state, leapster_cart ) m_cart->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void leapster_state::machine_start() diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index 1c866a91cfc..d878481b464 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -159,11 +159,11 @@ QUICKLOAD_LOAD_MEMBER( lynx_state, lynx ) int i; if (image.fread( header, sizeof(header)) != sizeof(header)) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; /* Check the image */ - if (!lynx_verify_cart((char*)header, LYNX_QUICKLOAD)) - return IMAGE_INIT_FAIL; + if (lynx_verify_cart((char*)header, LYNX_QUICKLOAD) != image_verify_result::PASS) + return image_init_result::FAIL; start = header[3] | (header[2]<<8); //! big endian format in file format for little endian cpu length = header[5] | (header[4]<<8); @@ -173,7 +173,7 @@ QUICKLOAD_LOAD_MEMBER( lynx_state, lynx ) if (image.fread( &data[0], length) != length) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } for (i = 0; i < length; i++) @@ -186,7 +186,7 @@ QUICKLOAD_LOAD_MEMBER( lynx_state, lynx ) m_maincpu->set_pc(start); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /*************************************************************************** diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp index ce255d3bd69..e31c5e939d5 100644 --- a/src/mame/drivers/megadriv.cpp +++ b/src/mame/drivers/megadriv.cpp @@ -559,7 +559,7 @@ DEVICE_IMAGE_LOAD_MEMBER( md_cons_state, _32x_cart ) for (i = 0x00; i < length; i += 2) ROM16[i / 2] = pick_integer_be(&temp_copy[0], i, 2); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index 59c769c7125..eabc98fbe22 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -125,7 +125,7 @@ public: DECLARE_DRIVER_INIT(mt_slot); DECLARE_MACHINE_RESET(megatech); - int load_cart(device_image_interface &image, generic_slot_device *slot, int gameno); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, int gameno); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mt_cart1 ) { return load_cart(image, m_cart1, 0); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mt_cart2 ) { return load_cart(image, m_cart2, 1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mt_cart3 ) { return load_cart(image, m_cart3, 2); } @@ -718,21 +718,21 @@ static MACHINE_CONFIG_START( megatech, mtech_state ) MACHINE_CONFIG_END -int mtech_state::load_cart(device_image_interface &image, generic_slot_device *slot, int gameno) +image_init_result mtech_state::load_cart(device_image_interface &image, generic_slot_device *slot, int gameno) { UINT8 *ROM; const char *pcb_name; UINT32 size = slot->common_get_size("rom"); if (image.software_entry() == nullptr) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); ROM = slot->get_rom_base(); memcpy(ROM, image.get_software_region("rom"), size); if ((pcb_name = image.get_feature("pcb_type")) == nullptr) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; else { if (!core_stricmp("genesis", pcb_name)) @@ -749,7 +749,7 @@ int mtech_state::load_cart(device_image_interface &image, generic_slot_device *s osd_printf_debug("cart%d is invalid\n", gameno + 1); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } #define MCFG_MEGATECH_CARTSLOT_ADD(_tag, _load) \ diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 3e35ea23fff..f4f08addf85 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -312,7 +312,7 @@ QUICKLOAD_LOAD_MEMBER( mekd2_state, mekd2_quik ) if (memcmp(buff, magic, sizeof (buff))) { logerror("mekd2 rom load: magic '%s' not found\n", magic); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread(&addr, 2); addr = little_endianize_int16(addr); @@ -323,7 +323,7 @@ QUICKLOAD_LOAD_MEMBER( mekd2_state, mekd2_quik ) while (size-- > 0) image.fread(&RAM[addr++], 1); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } TIMER_DEVICE_CALLBACK_MEMBER(mekd2_state::mekd2_c) diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index 33f0795ff1a..b39abc3891f 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -524,7 +524,7 @@ DEVICE_IMAGE_LOAD_MEMBER(microvision_state, microvsn_cart) if ( file_size != 1024 && file_size != 2048 ) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid rom file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /* Read cartridge */ @@ -533,7 +533,7 @@ DEVICE_IMAGE_LOAD_MEMBER(microvision_state, microvsn_cart) if (image.fread(rom1, file_size) != file_size) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unable to fully read from file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } else @@ -614,7 +614,7 @@ DEVICE_IMAGE_LOAD_MEMBER(microvision_state, microvsn_cart) m_cpu_type = microvision_state::CPU_TYPE_TMS1100; break; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp index 2d30a206519..81977c9d608 100644 --- a/src/mame/drivers/myvision.cpp +++ b/src/mame/drivers/myvision.cpp @@ -147,13 +147,13 @@ DEVICE_IMAGE_LOAD_MEMBER( myvision_state, cart ) if (size != 0x4000 && size != 0x6000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 3f2038e9e14..45d10179295 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -31,7 +31,7 @@ public: INTERRUPT_GEN_MEMBER(n64_reset_poll); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(n64_cart); void mempak_format(UINT8* pak); - int disk_load(device_image_interface &image); + image_init_result disk_load(device_image_interface &image); void disk_unload(device_image_interface &image); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( n64dd ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( n64dd ); @@ -364,7 +364,7 @@ DEVICE_IMAGE_LOAD_MEMBER(n64_mess_state,n64_cart) mempak_format(periphs->m_save_data.mempak[1]); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } MACHINE_START_MEMBER(n64_mess_state,n64dd) @@ -396,12 +396,12 @@ DEVICE_IMAGE_UNLOAD_MEMBER(n64_mess_state,n64dd) disk_unload(image); } -int n64_mess_state::disk_load(device_image_interface &image) +image_init_result n64_mess_state::disk_load(device_image_interface &image) { image.fseek(0, SEEK_SET); image.fread(memregion("disk")->base(), image.length()); machine().device<n64_periphs>("rcp")->disk_present = true; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void n64_mess_state::disk_unload(device_image_interface &image) diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index ffe9b3b55e6..9633a388d76 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -116,7 +116,7 @@ public: DECLARE_DRIVER_INIT(nascom2c); UINT32 screen_update_nascom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - int load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket1_load) { return load_cart(image, m_socket1, 1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket2_load) { return load_cart(image, m_socket2, 2); } @@ -211,10 +211,10 @@ DEVICE_IMAGE_LOAD_MEMBER( nascom_state, nascom1_cassette ) m_tape_image = (UINT8*)image.ptr(); if (!m_tape_image) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; m_tape_index = 0; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } DEVICE_IMAGE_UNLOAD_MEMBER( nascom_state, nascom1_cassette ) @@ -250,7 +250,7 @@ SNAPSHOT_LOAD_MEMBER( nascom_state, nascom1 ) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } @@ -258,7 +258,7 @@ SNAPSHOT_LOAD_MEMBER( nascom_state, nascom1 ) // SOCKETS //************************************************************************** -int nascom2_state::load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id) +image_init_result nascom2_state::load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id) { // loading directly from file if (image.software_entry() == nullptr) @@ -266,7 +266,7 @@ int nascom2_state::load_cart(device_image_interface &image, generic_slot_device if (slot->length() > 0x1000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(slot->length(), GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); @@ -310,7 +310,7 @@ int nascom2_state::load_cart(device_image_interface &image, generic_slot_device } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index eb8ffe0867c..639c980d3bc 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -746,7 +746,7 @@ DEVICE_IMAGE_LOAD_MEMBER( ngp_state, ngp_cart ) if (size != 0x8000 && size != 0x80000 && size != 0x100000 && size != 0x200000 && size != 0x400000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } // alloc 0x400000 ROM to simplify mapping in the address map @@ -782,7 +782,7 @@ DEVICE_IMAGE_LOAD_MEMBER( ngp_state, ngp_cart ) m_flash_chip[1].state = F_READ; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp index ae5218ded57..2facdc1194b 100644 --- a/src/mame/drivers/patinho_feio.cpp +++ b/src/mame/drivers/patinho_feio.cpp @@ -191,7 +191,7 @@ DEVICE_IMAGE_LOAD_MEMBER( patinho_feio_state, patinho_tape ) paper_tape_address = 0; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void patinho_feio_state::machine_start(){ diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index 8d34c4feda2..773b60f3c6d 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -821,7 +821,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart ) m_cart->rom_alloc(0x40000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( pc2000, pc2000_state ) diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index d1da0c11fb5..ab18705b760 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -679,7 +679,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "tap,rim"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -712,7 +712,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "tap,rim"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -746,7 +746,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "typ"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -779,7 +779,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "drm"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -798,7 +798,7 @@ pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mco /* Open a perforated tape image */ -bool pdp1_readtape_image_device::call_load() +image_init_result pdp1_readtape_image_device::call_load() { pdp1_state *state = machine().driver_data<pdp1_state>(); @@ -825,7 +825,7 @@ bool pdp1_readtape_image_device::call_load() } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pdp1_readtape_image_device::call_unload() @@ -1032,14 +1032,14 @@ static void iot_rrb(device_t *device, int op2, int nac, int mb, int *io, int ac) } -bool pdp1_punchtape_image_device::call_load() +image_init_result pdp1_punchtape_image_device::call_load() { pdp1_state *state = machine().driver_data<pdp1_state>(); /* punch unit */ state->m_tape_puncher.fd = this; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pdp1_punchtape_image_device::call_unload() @@ -1143,7 +1143,7 @@ static void iot_ppb(device_t *device, int op2, int nac, int mb, int *io, int ac) /* Open a file for typewriter output */ -bool pdp1_printer_image_device::call_load() +image_init_result pdp1_printer_image_device::call_load() { pdp1_state *state = machine().driver_data<pdp1_state>(); /* open file */ @@ -1151,7 +1151,7 @@ bool pdp1_printer_image_device::call_load() state->m_io_status |= io_st_tyo; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pdp1_printer_image_device::call_unload() @@ -1479,13 +1479,13 @@ void pdp1_state::parallel_drum_init(pdp1_state *state) /* Open a file for drum */ -bool pdp1_cylinder_image_device::call_load() +image_init_result pdp1_cylinder_image_device::call_load() { pdp1_state *state = machine().driver_data<pdp1_state>(); /* open file */ state->m_parallel_drum.fd = this; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pdp1_cylinder_image_device::call_unload() diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 034ae2ef0d4..e3af28d9586 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -78,7 +78,7 @@ public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(pegasus); TIMER_DEVICE_CALLBACK_MEMBER(pegasus_firq); - int load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp00_load) { return load_cart(image, m_exp_00, "0000"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp01_load) { return load_cart(image, m_exp_01, "1000"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp02_load) { return load_cart(image, m_exp_02, "2000"); } @@ -413,7 +413,7 @@ void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) } } -int pegasus_state::load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag) +image_init_result pegasus_state::load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag) { UINT32 size = slot->common_get_size(reg_tag); bool any_socket = false; @@ -421,7 +421,7 @@ int pegasus_state::load_cart(device_image_interface &image, generic_slot_device if (size > 0x1000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (image.software_entry() != nullptr && size == 0) @@ -437,7 +437,7 @@ int pegasus_state::load_cart(device_image_interface &image, generic_slot_device "Attempted to load a file that does not work in this socket.\n" "Please check \"Usage\" field in the software list for the correct socket(s) to use."); image.seterror(IMAGE_ERROR_UNSPECIFIED, errmsg.c_str()); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } @@ -447,7 +447,7 @@ int pegasus_state::load_cart(device_image_interface &image, generic_slot_device // raw images have to be decrypted (in particular the ones from softlist) pegasus_decrypt_rom(slot->get_rom_base()); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pegasus_state::machine_start() diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index ec1b28f31e1..2146472f4e2 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -57,7 +57,7 @@ public: DECLARE_READ8_MEMBER(memory_read_byte); DECLARE_WRITE8_MEMBER(memory_write_byte); DECLARE_FLOPPY_FORMATS( floppy_formats ); - int floppy_load(floppy_image_device *dev); + image_init_result floppy_load(floppy_image_device *dev); void floppy_unload(floppy_image_device *dev); UINT8 m_dma0pg; @@ -157,10 +157,10 @@ WRITE8_MEMBER(peoplepc_state::memory_write_byte) prog_space.write_byte(offset | (m_dma0pg << 16), data); } -int peoplepc_state::floppy_load(floppy_image_device *dev) +image_init_result peoplepc_state::floppy_load(floppy_image_device *dev) { dev->mon_w(0); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void peoplepc_state::floppy_unload(floppy_image_device *dev) diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp index b701d7d468e..d4693194ee6 100644 --- a/src/mame/drivers/phunsy.cpp +++ b/src/mame/drivers/phunsy.cpp @@ -283,7 +283,7 @@ QUICKLOAD_LOAD_MEMBER( phunsy_state, phunsy ) UINT16 i; UINT16 quick_addr = 0x1800; dynamic_buffer quick_data; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; int quick_length = image.length(); if (quick_length > 0x4000) { @@ -310,7 +310,7 @@ QUICKLOAD_LOAD_MEMBER( phunsy_state, phunsy ) m_maincpu->set_state_int(S2650_R3, 0x83); m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } return result; diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp index 40bc9788483..fd2bd2748fd 100644 --- a/src/mame/drivers/pipbug.cpp +++ b/src/mame/drivers/pipbug.cpp @@ -98,7 +98,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); if (quick_length < 0x0444) @@ -145,7 +145,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug ) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp index 206756cee69..2dfc476046e 100644 --- a/src/mame/drivers/pockchal.cpp +++ b/src/mame/drivers/pockchal.cpp @@ -53,7 +53,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pockchalv1_state, pockchalv1_cart ) m_cart->rom_alloc(m_rom_size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), m_rom_size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void pockchalv1_state::video_start() { diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index 5c90dcc56d0..937452cf688 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -962,20 +962,20 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash ) UINT32 size = image.length(); if (size != 0x20f40) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; image.fread(cart_id, 0xf40); for (int i = 0; i < strlen(gme_id); i++) { if (cart_id[i] != gme_id[i]) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(0x20000, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE); image.fread(m_cart->get_rom_base(), 0x20000); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( pockstat, pockstat_state ) diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index 5476eb3e4af..c58c0ad7131 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -684,7 +684,7 @@ WRITE_LINE_MEMBER( portfolio_state::eint_w ) DEVICE_IMAGE_LOAD_MEMBER( portfolio_state, portfolio_cart ) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 09299dc79d5..86d971a34a8 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -1506,20 +1506,20 @@ DEVICE_IMAGE_LOAD_MEMBER( pokemini_state, pokemini_cart ) if (size <= 0x2100) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM image: ROM image is too small"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /* Verify that the image is not too big */ if (size > 0x1fffff) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM image: ROM image is too big"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp index ca6f85d7c50..92cfe103fd8 100644 --- a/src/mame/drivers/pv1000.cpp +++ b/src/mame/drivers/pv1000.cpp @@ -310,13 +310,13 @@ DEVICE_IMAGE_LOAD_MEMBER( pv1000_state, pv1000_cart ) if (size != 0x2000 && size != 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp index 080e6f707e8..d58ece15780 100644 --- a/src/mame/drivers/pv2000.cpp +++ b/src/mame/drivers/pv2000.cpp @@ -367,13 +367,13 @@ DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart ) if (size != 0x2000 && size != 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* Machine Drivers */ diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 67709f34675..4d9f9ecfb9c 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -269,7 +269,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens ) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); if (quick_length < 0x0900) @@ -316,7 +316,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens ) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index df3e7118928..1c4553f2e40 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -708,7 +708,7 @@ QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000) image.fread(&data[0], image.length()); if(strncmp((const char*)&data[0], magic, 21)) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; img_start = strlen((const char*)&data[0]) + 5; img_start += 0xa0; //skip the icon (40x32 pixel) @@ -716,7 +716,7 @@ QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000) for (UINT32 i=0; i<image.length() - img_start ;i++) m_flash0b->write_raw(i, data[img_start + i]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } int oz750_state::oz_wzd_extract_tag(const dynamic_buffer &data, const char *tag, char *dest_buf) @@ -764,7 +764,7 @@ QUICKLOAD_LOAD_MEMBER(oz750_state,oz750) oz_wzd_extract_tag(data, "<DATA TYPE>", data_type); if (strcmp(data_type, "MY PROGRAMS")) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; oz_wzd_extract_tag(data, "<TITLE>", app_name); oz_wzd_extract_tag(data, "<DATA>", file_name); @@ -774,7 +774,7 @@ QUICKLOAD_LOAD_MEMBER(oz750_state,oz750) UINT32 img_start = oz_wzd_extract_tag(data, "<BIN>", nullptr); if (img_start == 0) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; UINT16 icon_size = data[img_start++]; @@ -814,7 +814,7 @@ QUICKLOAD_LOAD_MEMBER(oz750_state,oz750) for (int i=img_start; i<image.length(); i++) flash->write_byte(pos++, data[i]); // data - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 3f7818c3e30..cabc14f649c 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -421,13 +421,13 @@ DEVICE_IMAGE_LOAD_MEMBER( rx78_state, rx78_cart ) if (size != 0x2000 && size != 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* F4 Character Displayer */ diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index 6cbcbe96642..4bf71cbce22 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -665,13 +665,13 @@ DEVICE_IMAGE_LOAD_MEMBER(spectrum_state, spectrum_cart) if (size != 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } MACHINE_CONFIG_START( spectrum_common, spectrum_state ) diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 9975e247834..fa1cd13ee8e 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -595,13 +595,13 @@ DEVICE_IMAGE_LOAD_MEMBER( squale_state, squale_cart ) if ( ! size || size > 0x10000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } TIMER_DEVICE_CALLBACK_MEMBER( squale_state::squale_scanline ) diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index 65f81ab2214..b9b82319932 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -606,7 +606,7 @@ QUICKLOAD_LOAD_MEMBER(ssem_state, ssem_store) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /****************************************************\ diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index b1b27d475bc..fac2de99592 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -544,7 +544,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (image.length() <= 0x100) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread(&header, 0x100); @@ -553,7 +553,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (strncmp((const char *)header, "RCA2", 4)) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Not an .ST2 file"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } blocks = header[4]; @@ -583,7 +583,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) if (size > 0x400) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } else image.fread(m_cart->get_rom_base(), size); @@ -603,7 +603,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load ) memcpy(m_cart->get_rom_base() + 0xa00, image.get_software_region("rom_e00"), image.get_software_region_length("rom_e00")); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 55aa6b9873b..5e340f3e051 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -1272,13 +1272,13 @@ MACHINE_RESET_MEMBER(stv_state,stv) m_vdp2.old_tvmd = -1; } -int stv_state::load_cart(device_image_interface &image, generic_slot_device *slot) +image_init_result stv_state::load_cart(device_image_interface &image, generic_slot_device *slot) { UINT8 *ROM; UINT32 size = slot->common_get_size("rom"); if (image.software_entry() == nullptr) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; slot->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_BIG); ROM = slot->get_rom_base(); @@ -1301,7 +1301,7 @@ int stv_state::load_cart(device_image_interface &image, generic_slot_device *slo } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index db4b07c5a1c..3e4c00d964f 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -1748,13 +1748,13 @@ DEVICE_IMAGE_LOAD_MEMBER( supracan_state, supracan_cart ) if (size > 0x400000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_BIG); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp index 03efe6a6015..6baf78e2896 100644 --- a/src/mame/drivers/sv8000.cpp +++ b/src/mame/drivers/sv8000.cpp @@ -201,13 +201,13 @@ DEVICE_IMAGE_LOAD_MEMBER( sv8000_state, cart ) if (size != 0x1000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Incorrect or not support cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp index 70ea137a26b..5dfc0fee2f3 100644 --- a/src/mame/drivers/svi318.cpp +++ b/src/mame/drivers/svi318.cpp @@ -505,7 +505,7 @@ DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge ) m_cart_rom->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart_rom->common_load_rom(m_cart_rom->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index 5779b8811c6..b6ff3ec2618 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -459,13 +459,13 @@ DEVICE_IMAGE_LOAD_MEMBER( svision_state, svision_cart ) if (size > 0x20000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void svision_state::machine_start() diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 47775fcdd8b..aa0acb2c533 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -292,7 +292,7 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu ) vmufat_write_word(flash, 253, 0x1a, 0x0001); // offset of header (in blocks) from file start } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp index 1f757426de0..cce5f176663 100644 --- a/src/mame/drivers/ti74.cpp +++ b/src/mame/drivers/ti74.cpp @@ -132,13 +132,13 @@ DEVICE_IMAGE_LOAD_MEMBER(ti74_state, ti74_cartridge) if (size > 0x8000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp index e90e38a008e..5fd75e50487 100644 --- a/src/mame/drivers/timex.cpp +++ b/src/mame/drivers/timex.cpp @@ -612,12 +612,12 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) if (size % 0x2000 != 9) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "File corrupted"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (image.software_entry() != nullptr) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Loading from softlist is not supported yet"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_dock->rom_alloc(0x10000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); @@ -632,7 +632,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) if (chunks_in_file * 0x2000 + 0x09 != size) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "File corrupted"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } switch (header[0]) @@ -656,7 +656,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) default: image.seterror(IMAGE_ERROR_UNSPECIFIED, "Cart type not supported"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } logerror ("Cart loaded [Chunks %02x]\n", m_ram_chunks); @@ -667,7 +667,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart ) memcpy(m_dock->get_rom_base(), image.get_software_region("rom"), size); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 292f755c5ac..9de5eb427b6 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -509,13 +509,13 @@ DEVICE_IMAGE_LOAD_MEMBER(tispeak_state, tispeak_cartridge) if (size > m_cart_max_size) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index c4bf55120a2..c924b89ddf8 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -443,7 +443,7 @@ public: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -480,14 +480,14 @@ void tm990_189_rs232_image_device::device_timer(emu_timer &timer, device_timer_i } } -bool tm990_189_rs232_image_device::call_load() +image_init_result tm990_189_rs232_image_device::call_load() { tm990189_state *state = machine().driver_data<tm990189_state>(); tms9902_device* tms9902 = static_cast<tms9902_device*>(machine().device("tms9902")); tms9902->rcv_dsr(ASSERT_LINE); state->m_rs232_input_timer = timer_alloc(); state->m_rs232_input_timer->adjust(attotime::zero, 0, attotime::from_msec(10)); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp index 3b3133f090f..1b6c5b4e155 100644 --- a/src/mame/drivers/tmc1800.cpp +++ b/src/mame/drivers/tmc1800.cpp @@ -702,12 +702,12 @@ QUICKLOAD_LOAD_MEMBER( tmc1800_base_state, tmc1800 ) if (size > m_ram->size()) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread( ptr, size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } static MACHINE_CONFIG_START( tmc1800, tmc1800_state ) diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 052fb4a6824..370ae4b6e47 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -355,7 +355,7 @@ DEVICE_IMAGE_LOAD_MEMBER( tourvision_state, tourvision_cart ) } #endif - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* note from system11 - this system actually supports 2 players */ diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 6550c4b3866..f9cffa8ee09 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -742,11 +742,11 @@ QUICKLOAD_LOAD_MEMBER( tvc_state, tvc64) { image.fseek(0x90, SEEK_SET); image.fread(m_ram->pointer() + 0x19ef, image.length() - 0x90); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } else { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index 19d4bbc3802..92c120adde2 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -369,7 +369,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "tap,rim"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -402,7 +402,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "tap,rim"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -436,7 +436,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "typ"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -469,7 +469,7 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "tap"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; protected: // device-level overrides @@ -490,7 +490,7 @@ tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig unit 0 is reader (read-only), unit 1 is puncher (write-only) */ -bool tx0_readtape_image_device::call_load() +image_init_result tx0_readtape_image_device::call_load() { tx0_state *state = machine().driver_data<tx0_state>(); @@ -518,7 +518,7 @@ bool tx0_readtape_image_device::call_load() } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void tx0_readtape_image_device::call_unload() @@ -626,14 +626,14 @@ TIMER_CALLBACK_MEMBER(tx0_state::reader_callback) /* timer callback to generate punch completion pulse */ -bool tx0_punchtape_image_device::call_load() +image_init_result tx0_punchtape_image_device::call_load() { tx0_state *state = machine().driver_data<tx0_state>(); /* punch unit */ state->m_tape_puncher.fd = this; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void tx0_punchtape_image_device::call_unload() @@ -706,13 +706,13 @@ WRITE_LINE_MEMBER( tx0_state::tx0_io_p7h ) /* Open a file for typewriter output */ -bool tx0_printer_image_device::call_load() +image_init_result tx0_printer_image_device::call_load() { tx0_state *state = machine().driver_data<tx0_state>(); /* open file */ state->m_typewriter.fd = this; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void tx0_printer_image_device::call_unload() @@ -846,7 +846,7 @@ void tx0_magtape_image_device::device_start() /* Open a magnetic tape image */ -bool tx0_magtape_image_device::call_load() +image_init_result tx0_magtape_image_device::call_load() { tx0_state *state = machine().driver_data<tx0_state>(); state->m_magtape.img = this; @@ -863,7 +863,7 @@ bool tx0_magtape_image_device::call_load() state->schedule_select(); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void tx0_magtape_image_device::call_unload() diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp index 424f530e8e4..6e64f590e0b 100644 --- a/src/mame/drivers/uzebox.cpp +++ b/src/mame/drivers/uzebox.cpp @@ -260,7 +260,7 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart) else memcpy(m_cart->get_rom_base(), image.get_software_region("rom"), size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index 1b645e8ecf4..66f1886b584 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -402,7 +402,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000) int quick_length; dynamic_buffer quick_data; int read_; - int result = IMAGE_INIT_FAIL; + image_init_result result = image_init_result::FAIL; quick_length = image.length(); quick_data.resize(quick_length); @@ -450,7 +450,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } @@ -508,7 +508,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000) // Start the quickload m_maincpu->set_state_int(S2650_PC, exec_addr); - result = IMAGE_INIT_PASS; + result = image_init_result::PASS; } } } diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index 3afdad57bcb..4854f350e6f 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -969,7 +969,7 @@ DEVICE_IMAGE_LOAD_MEMBER( vii_state, vii_cart ) if (size < 0x800000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_LITTLE); @@ -977,7 +977,7 @@ DEVICE_IMAGE_LOAD_MEMBER( vii_state, vii_cart ) test_centered(m_cart->get_rom_base()); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } DEVICE_IMAGE_LOAD_MEMBER( vii_state, vsmile_cart ) @@ -987,7 +987,7 @@ DEVICE_IMAGE_LOAD_MEMBER( vii_state, vsmile_cart ) m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_LITTLE); m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index 6179d3d5b9c..2ccab30464c 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -682,7 +682,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip ) if ((size + chip8_size) > m_ram->size()) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (chip8_size > 0) @@ -694,7 +694,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip ) /* load image to RAM */ image.fread(ram + chip8_size, size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp index 01ea9d775bb..fcd816afc55 100644 --- a/src/mame/drivers/vtech1.cpp +++ b/src/mame/drivers/vtech1.cpp @@ -136,7 +136,7 @@ SNAPSHOT_LOAD_MEMBER( vtech1_state, vtech1 ) image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Insufficient RAM to load snapshot"); image.message("Insufficient RAM to load snapshot (%d bytes needed) [%s]", size, pgmname); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } @@ -165,10 +165,10 @@ SNAPSHOT_LOAD_MEMBER( vtech1_state, vtech1 ) default: image.seterror(IMAGE_ERROR_UNSUPPORTED, "Snapshot format not supported."); image.message("Snapshot format not supported."); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index d1893f2c99d..59b7adf40f1 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -1025,11 +1025,11 @@ void wangpc_state::machine_reset() // on_disk0_change - //------------------------------------------------- -int wangpc_state::on_disk0_load(floppy_image_device *image) +image_init_result wangpc_state::on_disk0_load(floppy_image_device *image) { on_disk0_unload(image); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void wangpc_state::on_disk0_unload(floppy_image_device *image) @@ -1045,11 +1045,11 @@ void wangpc_state::on_disk0_unload(floppy_image_device *image) // on_disk1_change - //------------------------------------------------- -int wangpc_state::on_disk1_load(floppy_image_device *image) +image_init_result wangpc_state::on_disk1_load(floppy_image_device *image) { on_disk1_unload(image); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void wangpc_state::on_disk1_unload(floppy_image_device *image) diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index 6716c3b60c8..cc56896b589 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1059,7 +1059,7 @@ DEVICE_IMAGE_LOAD_MEMBER( x07_state, x07_card ) if (strcmp(card_type, "xp140")) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported card type"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } @@ -1068,7 +1068,7 @@ DEVICE_IMAGE_LOAD_MEMBER( x07_state, x07_card ) m_card->ram_alloc(0x1000); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } PALETTE_INIT_MEMBER(x07_state, x07) diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index 9b2703c0863..55448209726 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1442,10 +1442,10 @@ void x68k_state::floppy_load_unload(bool load, floppy_image_device *dev) } } -int x68k_state::floppy_load(floppy_image_device *dev) +image_init_result x68k_state::floppy_load(floppy_image_device *dev) { floppy_load_unload(true, dev); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void x68k_state::floppy_unload(floppy_image_device *dev) diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index 160b2744960..2fb8f850e85 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -326,7 +326,7 @@ SNAPSHOT_LOAD_MEMBER( z1013_state, z1013 ) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Not a Z1013 image"); image.message(" Not a Z1013 image"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } memcpy (m_maincpu->space(AS_PROGRAM).get_read_ptr(startaddr), @@ -340,7 +340,7 @@ SNAPSHOT_LOAD_MEMBER( z1013_state, z1013 ) image.message(" Loaded but cannot run"); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /* F4 Character Displayer */ diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h index 8ef3a8e98c2..c85f3c6078e 100644 --- a/src/mame/includes/aim65.h +++ b/src/mame/includes/aim65.h @@ -86,7 +86,7 @@ public: void dl1416_update(dl1416_device *device, int index); - int load_cart(device_image_interface &image, generic_slot_device *slot, const char *slot_tag); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, const char *slot_tag); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z24_load) { return load_cart(image, m_z24, "z24"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z25_load) { return load_cart(image, m_z25, "z25"); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(z26_load) { return load_cart(image, m_z26, "z26"); } diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index 7b7b4df2239..a654c8e4644 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -369,8 +369,8 @@ public: DECLARE_READ16_MEMBER(read); // image-level overrides - virtual bool call_load() override; - virtual bool call_create(int format_type, util::option_resolution *format_options) override; + virtual image_init_result call_load() override; + virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; virtual void call_unload() override; void set_node_id_from_disk(); diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index af9ecff57cf..ce918299c71 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -112,7 +112,7 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); TIMER_DEVICE_CALLBACK_MEMBER(cassette_output_tick); - int load_cart(device_image_interface &image, generic_slot_device *slot); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, m_cart); } DECLARE_QUICKLOAD_LOAD_MEMBER(atom_atm); }; diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index b8f217c7ee6..f408a190f54 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -199,13 +199,13 @@ public: void bbc_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size); void bbcm_setup_banks(memory_bank *membank, int banks, UINT32 shift, UINT32 size); - int bbc_load_rom(device_image_interface &image, generic_slot_device *slot); + image_init_result bbc_load_rom(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp1_load) { return bbc_load_rom(image, m_exp1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp2_load) { return bbc_load_rom(image, m_exp2); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp3_load) { return bbc_load_rom(image, m_exp3); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp4_load) { return bbc_load_rom(image, m_exp4); } - int bbcm_load_cart(device_image_interface &image, generic_slot_device *slot); + image_init_result bbcm_load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(bbcm_exp1_load) { return bbcm_load_cart(image, m_exp1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER(bbcm_exp2_load) { return bbcm_load_cart(image, m_exp2); } diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h index 7ab0843b225..89492f6c90b 100644 --- a/src/mame/includes/gamecom.h +++ b/src/mame/includes/gamecom.h @@ -274,7 +274,7 @@ private: void handle_stylus_press(int column); void recompute_lcd_params(); void handle_input_press(UINT16 mux_data); - int common_load(device_image_interface &image, generic_slot_device *slot); + image_init_result common_load(device_image_interface &image, generic_slot_device *slot); virtual void machine_reset() override; virtual void video_start() override; required_shared_ptr<UINT8> m_p_videoram; diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index ca5c0687e76..67aa83b2ae0 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -192,9 +192,9 @@ public: virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "crd"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; - virtual bool call_create(int format_type, util::option_resolution *format_options) override; + virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; protected: // device-level overrides virtual void device_config_complete() override; diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index 8744a63d5be..0caef91aa9d 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -243,7 +243,7 @@ public: DECLARE_WRITE_LINE_MEMBER( dsp_cpu_int ); DECLARE_WRITE_LINE_MEMBER( external_int ); - int quickload(device_image_interface &image, const char *file_type, int quickload_size); + image_init_result quickload(device_image_interface &image, const char *file_type, int quickload_size); void cart_start(); IRQ_CALLBACK_MEMBER(jaguar_irq_callback); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( jaguar_cart ); diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index 3a50e491732..728fc1d4236 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -57,7 +57,7 @@ public: void lviv_update_memory (); void lviv_setup_snapshot (UINT8 * data); void dump_registers(); - bool lviv_verify_snapshot (UINT8 * data, UINT32 size); + image_verify_result lviv_verify_snapshot(UINT8 * data, UINT32 size); DECLARE_SNAPSHOT_LOAD_MEMBER( lviv ); DECLARE_INPUT_CHANGED_MEMBER(lviv_reset); }; diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h index 6f3fcf779fa..890f9d0b1f2 100644 --- a/src/mame/includes/lynx.h +++ b/src/mame/includes/lynx.h @@ -181,7 +181,7 @@ public: void lynx_timer_count_down(int which); UINT32 lynx_time_factor(int val); void lynx_uart_reset(); - bool lynx_verify_cart (char *header, int kind); + image_verify_result lynx_verify_cart(char *header, int kind); DECLARE_QUICKLOAD_LOAD_MEMBER( lynx ); protected: diff --git a/src/mame/includes/microtan.h b/src/mame/includes/microtan.h index 1ab63792b4a..7513cf42f75 100644 --- a/src/mame/includes/microtan.h +++ b/src/mame/includes/microtan.h @@ -88,9 +88,9 @@ public: UINT8 read_dsw(); void microtan_set_irq_line(); void store_key(int key); - bool microtan_verify_snapshot(UINT8 *data, int size); - int parse_intel_hex(UINT8 *snapshot_buff, char *src); - int parse_zillion_hex(UINT8 *snapshot_buff, char *src); + image_verify_result microtan_verify_snapshot(UINT8 *data, int size); + image_init_result parse_intel_hex(UINT8 *snapshot_buff, char *src); + image_init_result parse_zillion_hex(UINT8 *snapshot_buff, char *src); void microtan_set_cpu_regs(const UINT8 *snapshot_buff, int base); void microtan_snapshot_copy(UINT8 *snapshot_buff, int snapshot_size); DECLARE_SNAPSHOT_LOAD_MEMBER( microtan ); diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 284d722b3f0..befa2c7a569 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -80,7 +80,7 @@ public: DECLARE_READ32_MEMBER(magzun_hef_hack_r); DECLARE_READ32_MEMBER(magzun_rx_hack_r); - int load_cart(device_image_interface &image, generic_slot_device *slot); + image_init_result load_cart(device_image_interface &image, generic_slot_device *slot); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( stv_cart1 ) { return load_cart(image, m_cart1); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER( stv_cart2 ) { return load_cart(image, m_cart2); } DECLARE_DEVICE_IMAGE_LOAD_MEMBER( stv_cart3 ) { return load_cart(image, m_cart3); } diff --git a/src/mame/includes/wangpc.h b/src/mame/includes/wangpc.h index 05278e32671..8ea1d5a2332 100644 --- a/src/mame/includes/wangpc.h +++ b/src/mame/includes/wangpc.h @@ -168,9 +168,9 @@ public: DECLARE_WRITE_LINE_MEMBER( fdc_irq ); DECLARE_WRITE_LINE_MEMBER( fdc_drq ); - int on_disk0_load(floppy_image_device *image); + image_init_result on_disk0_load(floppy_image_device *image); void on_disk0_unload(floppy_image_device *image); - int on_disk1_load(floppy_image_device *image); + image_init_result on_disk1_load(floppy_image_device *image); void on_disk1_unload(floppy_image_device *image); UINT8 m_dma_page[4]; diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 0d7cfa18664..70273daf938 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -118,7 +118,7 @@ public: bitmap_ind16 m_special; void floppy_load_unload(bool load, floppy_image_device *dev); - int floppy_load(floppy_image_device *dev); + image_init_result floppy_load(floppy_image_device *dev); void floppy_unload(floppy_image_device *dev); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp index a26ebcbc07d..72aa763864c 100644 --- a/src/mame/machine/amstrad.cpp +++ b/src/mame/machine/amstrad.cpp @@ -3266,7 +3266,7 @@ SNAPSHOT_LOAD_MEMBER( amstrad_state,amstrad) /* get file size */ if (snapshot_size < 8) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; snapshot.resize(snapshot_size); @@ -3275,11 +3275,11 @@ SNAPSHOT_LOAD_MEMBER( amstrad_state,amstrad) if (memcmp(&snapshot[0], "MV - SNA", 8)) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } amstrad_handle_snapshot(&snapshot[0]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } @@ -3322,7 +3322,7 @@ DEVICE_IMAGE_LOAD_MEMBER(amstrad_state, amstrad_plus_cartridge) if (size % 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Attempt to load a raw binary with some block smaller than 16kB in size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } else image.fread(m_cart->get_rom_base(), size); @@ -3353,7 +3353,7 @@ DEVICE_IMAGE_LOAD_MEMBER(amstrad_state, amstrad_plus_cartridge) if (strncmp((char*)(header + 8), "AMS!", 4) != 0) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Not an Amstrad CPC cartridge image (despite RIFF header)"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } bytes_to_read = header[4] + (header[5] << 8) + (header[6] << 16)+ (header[7] << 24); @@ -3405,5 +3405,5 @@ DEVICE_IMAGE_LOAD_MEMBER(amstrad_state, amstrad_plus_cartridge) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp index e28dc6e9c23..f7af91cd4b4 100644 --- a/src/mame/machine/apollo.cpp +++ b/src/mame/machine/apollo.cpp @@ -967,7 +967,7 @@ READ16_MEMBER(apollo_ni::read) /*------------------------------------------------- DEVICE_IMAGE_LOAD( rom ) -------------------------------------------------*/ -bool apollo_ni::call_load() +image_init_result apollo_ni::call_load() { CLOG1(("apollo_ni::call_load: %s", filename())); @@ -990,17 +990,17 @@ bool apollo_ni::call_load() { m_node_id = (((data[2] << 8) | data[4]) << 8) | (data[6]); CLOG1(("apollo_ni::call_load: node ID is %x", m_node_id)); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } } - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /*------------------------------------------------- DEVICE_IMAGE_CREATE( rom ) -------------------------------------------------*/ -bool apollo_ni::call_create(int format_type, util::option_resolution *format_options) +image_init_result apollo_ni::call_create(int format_type, util::option_resolution *format_options) { CLOG1(("apollo_ni::call_create:")); @@ -1027,10 +1027,10 @@ bool apollo_ni::call_create(int format_type, util::option_resolution *format_opt fwrite(data, sizeof(data)); CLOG(("apollo_ni::call_create: created %s with node ID %x", filename(), node_id)); set_node_id(node_id); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } } - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /*------------------------------------------------- diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp index 7a9317feeb3..abde109215c 100644 --- a/src/mame/machine/bbc.cpp +++ b/src/mame/machine/bbc.cpp @@ -1598,7 +1598,7 @@ WRITE8_MEMBER(bbc_state::bbcm_wd1772l_write) BBC B Rom loading functions ***************************************/ -int bbc_state::bbc_load_rom(device_image_interface &image, generic_slot_device *slot) +image_init_result bbc_state::bbc_load_rom(device_image_interface &image, generic_slot_device *slot) { UINT32 size = slot->common_get_size("rom"); @@ -1606,20 +1606,20 @@ int bbc_state::bbc_load_rom(device_image_interface &image, generic_slot_device * if (size != 0x2000 && size != 0x4000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported ROM size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); slot->common_load_rom(slot->get_rom_base(), size, "rom"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /************************************** BBC Master Rom loading functions ***************************************/ -int bbc_state::bbcm_load_cart(device_image_interface &image, generic_slot_device *slot) +image_init_result bbc_state::bbcm_load_cart(device_image_interface &image, generic_slot_device *slot) { if (image.software_entry() == nullptr) { @@ -1628,12 +1628,12 @@ int bbc_state::bbcm_load_cart(device_image_interface &image, generic_slot_device if (filesize != 0x8000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(filesize, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); image.fread(slot->get_rom_base(), filesize); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } else { @@ -1643,7 +1643,7 @@ int bbc_state::bbcm_load_cart(device_image_interface &image, generic_slot_device if (size_lo + size_hi != 0x8000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } slot->rom_alloc(size_lo + size_hi, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); @@ -1651,7 +1651,7 @@ int bbc_state::bbcm_load_cart(device_image_interface &image, generic_slot_device memcpy(slot->get_rom_base() + size_hi, image.get_software_region("lorom"), size_lo); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/cbm_snqk.cpp b/src/mame/machine/cbm_snqk.cpp index 348f252432f..f8a481a6143 100644 --- a/src/mame/machine/cbm_snqk.cpp +++ b/src/mame/machine/cbm_snqk.cpp @@ -24,7 +24,7 @@ * 0x001c data */ -int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, +image_init_result general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, UINT16 hiaddress) ) { char buffer[7]; @@ -81,10 +81,10 @@ int general_cbm_loadsnap( device_image_interface &image, const char *file_type, space.write_byte(address + i + offset, data[i]); cbm_sethiaddress(space, address + snapshot_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; error: - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } void cbm_quick_sethiaddress( address_space &space, UINT16 hiaddress ) diff --git a/src/mame/machine/cbm_snqk.h b/src/mame/machine/cbm_snqk.h index 3abfbf36309..74ed76a134e 100644 --- a/src/mame/machine/cbm_snqk.h +++ b/src/mame/machine/cbm_snqk.h @@ -13,7 +13,7 @@ #define CBM_QUICKLOAD_DELAY_SECONDS 3 -int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, +image_init_result general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, UINT16 hiaddress) ); void cbm_quick_sethiaddress( address_space &space, UINT16 hiaddress ); diff --git a/src/mame/machine/coco_vhd.cpp b/src/mame/machine/coco_vhd.cpp index 9965b3c0fe3..1a0c7e680da 100644 --- a/src/mame/machine/coco_vhd.cpp +++ b/src/mame/machine/coco_vhd.cpp @@ -116,12 +116,12 @@ void coco_vhd_image_device::device_start() // call_load //------------------------------------------------- -bool coco_vhd_image_device::call_load() +image_init_result coco_vhd_image_device::call_load() { m_status = VHDSTATUS_POWER_ON_STATE; m_logical_record_number = 0; m_buffer_address = 0; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/coco_vhd.h b/src/mame/machine/coco_vhd.h index c1b5b9bac90..02c6ef1574e 100644 --- a/src/mame/machine/coco_vhd.h +++ b/src/mame/machine/coco_vhd.h @@ -27,7 +27,7 @@ public: virtual ~coco_vhd_image_device(); // image-level overrides - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual iodevice_t image_type() const override { return IO_HARDDISK; } diff --git a/src/mame/machine/cybiko.cpp b/src/mame/machine/cybiko.cpp index 010d0dc3e71..c4ce31ec36c 100644 --- a/src/mame/machine/cybiko.cpp +++ b/src/mame/machine/cybiko.cpp @@ -40,7 +40,7 @@ QUICKLOAD_LOAD_MEMBER( cybiko_state, cybiko ) { image.fread(m_flash1->get_ptr(), std::min(image.length(), UINT64(0x84000))); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } QUICKLOAD_LOAD_MEMBER( cybiko_state, cybikoxt ) @@ -53,7 +53,7 @@ QUICKLOAD_LOAD_MEMBER( cybiko_state, cybikoxt ) for (int byte = 0; byte < size; byte++) dest.write_byte(0x400000 + byte, buffer[byte]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /////////////////// diff --git a/src/mame/machine/electron.cpp b/src/mame/machine/electron.cpp index e3d847ae835..ab6cbda4b80 100644 --- a/src/mame/machine/electron.cpp +++ b/src/mame/machine/electron.cpp @@ -413,12 +413,12 @@ DEVICE_IMAGE_LOAD_MEMBER( electron_state, electron_cart ) if (filesize != 16384) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid size: Only size 16384 is supported"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(filesize, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); image.fread(m_cart->get_rom_base(), filesize); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } else { @@ -428,13 +428,13 @@ DEVICE_IMAGE_LOAD_MEMBER( electron_state, electron_cart ) if (upsize != 16384 && upsize != 0) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid size for uprom"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (losize != 16384 && losize != 0) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid size for lorom"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } m_cart->rom_alloc(upsize + losize, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); @@ -445,6 +445,6 @@ DEVICE_IMAGE_LOAD_MEMBER( electron_state, electron_cart ) if (losize) memcpy(m_cart->get_rom_base() + upsize, image.get_software_region("lorom"), losize); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } } diff --git a/src/mame/machine/galaxy.cpp b/src/mame/machine/galaxy.cpp index 2356a193b7e..681eaffb16c 100644 --- a/src/mame/machine/galaxy.cpp +++ b/src/mame/machine/galaxy.cpp @@ -133,14 +133,14 @@ SNAPSHOT_LOAD_MEMBER( galaxy_state, galaxy ) snapshot_data = auto_alloc_array(machine(), UINT8, snapshot_size); break; default: - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } image.fread( snapshot_data, snapshot_size); galaxy_setup_snapshot(snapshot_data, snapshot_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/gamecom.cpp b/src/mame/machine/gamecom.cpp index 60242cb7f85..03cf2786152 100644 --- a/src/mame/machine/gamecom.cpp +++ b/src/mame/machine/gamecom.cpp @@ -633,7 +633,7 @@ DRIVER_INIT_MEMBER(gamecom_state,gamecom) m_p_ram = m_region_maincpu->base(); // required here because pio_w gets called before machine_reset } -int gamecom_state::common_load(device_image_interface &image, generic_slot_device *slot) +image_init_result gamecom_state::common_load(device_image_interface &image, generic_slot_device *slot) { UINT32 size = slot->common_get_size("rom"); UINT32 load_offset = 0; @@ -642,7 +642,7 @@ int gamecom_state::common_load(device_image_interface &image, generic_slot_devic && size != 0x100000 && size != 0x1c0000 && size != 0x200000) { image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (size == 0x1c0000) @@ -661,7 +661,7 @@ int gamecom_state::common_load(device_image_interface &image, generic_slot_devic if (size < 0x100000) { memcpy(crt + 0x080000, crt, 0x080000); } /* ->1MB */ if (size < 0x1c0000) { memcpy(crt + 0x100000, crt, 0x100000); } /* -> >=1.8MB */ - return IMAGE_INIT_PASS; + return image_init_result::PASS; } DEVICE_IMAGE_LOAD_MEMBER( gamecom_state, gamecom_cart1 ) diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp index 3b7643e4dd9..106e6a5f01b 100644 --- a/src/mame/machine/hp48.cpp +++ b/src/mame/machine/hp48.cpp @@ -945,7 +945,7 @@ void hp48_port_image_device::hp48_unfill_port() } -bool hp48_port_image_device::call_load() +image_init_result hp48_port_image_device::call_load() { hp48_state *state = machine().driver_data<hp48_state>(); int size = length(); @@ -956,7 +956,7 @@ bool hp48_port_image_device::call_load() if ( (size < 32*1024) || (size > m_max_size) || (size & (size-1)) ) { logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag(), 32*1024, m_max_size ); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } state->m_port_size[m_port] = size; @@ -964,10 +964,10 @@ bool hp48_port_image_device::call_load() hp48_fill_port( ); fread(state->m_port_data[m_port].get(), state->m_port_size[m_port] ); state->hp48_decode_nibble( state->m_port_data[m_port].get(), state->m_port_data[m_port].get(), state->m_port_size[m_port] ); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } -bool hp48_port_image_device::call_create(int format_type, util::option_resolution *format_options) +image_init_result hp48_port_image_device::call_create(int format_type, util::option_resolution *format_options) { hp48_state *state = machine().driver_data<hp48_state>(); int size = m_max_size; @@ -979,13 +979,13 @@ bool hp48_port_image_device::call_create(int format_type, util::option_resolutio if ( (size < 32*1024) || (size > m_max_size) || (size & (size-1)) ) { logerror( "hp48: image size for %s should be a power of two between %i and %i\n", tag(), 32*1024, m_max_size ); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } state->m_port_size[m_port] = size; state->m_port_write[m_port] = 1; hp48_fill_port(); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void hp48_port_image_device::call_unload() diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp index 8c914d01750..d396f7c6803 100644 --- a/src/mame/machine/kaypro.cpp +++ b/src/mame/machine/kaypro.cpp @@ -278,7 +278,7 @@ QUICKLOAD_LOAD_MEMBER( kaypro_state, kaypro ) /* Load image to the TPA (Transient Program Area) */ for (i = 0; i < quickload_size; i++) { - if (image.fread( &data, 1) != 1) return IMAGE_INIT_FAIL; + if (image.fread( &data, 1) != 1) return image_init_result::FAIL; RAM[i+0x100] = data; } @@ -288,5 +288,5 @@ QUICKLOAD_LOAD_MEMBER( kaypro_state, kaypro ) RAM[0x80]=0; // clear out command tail RAM[0x81]=0; m_maincpu->set_pc(0x100); // start program - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/kc.cpp b/src/mame/machine/kc.cpp index 92e379b0eb4..a097690cc75 100644 --- a/src/mame/machine/kc.cpp +++ b/src/mame/machine/kc.cpp @@ -38,7 +38,7 @@ QUICKLOAD_LOAD_MEMBER( kc_state,kc) UINT64 size = image.length(); if (size == 0) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; dynamic_buffer data(size); image.fread( &data[0], size); @@ -67,7 +67,7 @@ QUICKLOAD_LOAD_MEMBER( kc_state,kc) logerror("Snapshot loaded at: 0x%04x-0x%04x, execution address: 0x%04x\n", addr, addr + datasize - 1, execution_address); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/lviv.cpp b/src/mame/machine/lviv.cpp index 44f307b7164..54d48c39058 100644 --- a/src/mame/machine/lviv.cpp +++ b/src/mame/machine/lviv.cpp @@ -281,24 +281,24 @@ void lviv_state::dump_registers() logerror("HL = %04x\n", (unsigned) m_maincpu->state_int(I8085_HL)); } -bool lviv_state::lviv_verify_snapshot (UINT8 * data, UINT32 size) +image_verify_result lviv_state::lviv_verify_snapshot(UINT8 * data, UINT32 size) { const char* tag = "LVOV/DUMP/2.0/"; - if( strncmp( tag, (char*)data, strlen(tag) ) ) + if (strncmp(tag, (char*)data, strlen(tag))) { logerror("Not a Lviv snapshot\n"); - return false; + return image_verify_result::FAIL; } if (size != LVIV_SNAPSHOT_SIZE) { logerror ("Incomplete snapshot file\n"); - return false; + return image_verify_result::FAIL; } logerror("returning ID_OK\n"); - return true; + return image_verify_result::PASS; } SNAPSHOT_LOAD_MEMBER( lviv_state, lviv ) @@ -307,9 +307,9 @@ SNAPSHOT_LOAD_MEMBER( lviv_state, lviv ) image.fread( &lviv_snapshot_data[0], LVIV_SNAPSHOT_SIZE); - if(!lviv_verify_snapshot(&lviv_snapshot_data[0], snapshot_size)) + if (lviv_verify_snapshot(&lviv_snapshot_data[0], snapshot_size) != image_verify_result::PASS) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } lviv_setup_snapshot (&lviv_snapshot_data[0]); @@ -317,5 +317,5 @@ SNAPSHOT_LOAD_MEMBER( lviv_state, lviv ) dump_registers(); logerror("Snapshot file loaded\n"); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/lynx.cpp b/src/mame/machine/lynx.cpp index e7a83692d4a..c4280708303 100644 --- a/src/mame/machine/lynx.cpp +++ b/src/mame/machine/lynx.cpp @@ -2030,14 +2030,14 @@ void lynx_state::machine_start() ****************************************/ -bool lynx_state::lynx_verify_cart (char *header, int kind) +image_verify_result lynx_state::lynx_verify_cart(char *header, int kind) { if (kind) { if (strncmp("BS93", &header[6], 4)) { logerror("This is not a valid Lynx image\n"); - return false; + return image_verify_result::FAIL; } } else @@ -2051,11 +2051,11 @@ bool lynx_state::lynx_verify_cart (char *header, int kind) } else logerror("This is not a valid Lynx image\n"); - return false; + return image_verify_result::FAIL; } } - return true; + return image_verify_result::PASS; } DEVICE_IMAGE_LOAD_MEMBER( lynx_state, lynx_cart ) @@ -2081,8 +2081,8 @@ DEVICE_IMAGE_LOAD_MEMBER( lynx_state, lynx_cart ) image.fread(header, 0x40); // Check the image - if (!lynx_verify_cart((char*)header, LYNX_CART)) - return IMAGE_INIT_FAIL; + if (lynx_verify_cart((char*)header, LYNX_CART) != image_verify_result::PASS) + return image_init_result::FAIL; /* 2008-10 FP: According to Handy source these should be page_size_bank0. Are we using it correctly in MESS? Moreover, the next two values should be page_size_bank1. We should @@ -2138,5 +2138,5 @@ DEVICE_IMAGE_LOAD_MEMBER( lynx_state, lynx_cart ) } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp index 70c22e71384..778d16c026d 100644 --- a/src/mame/machine/mbee.cpp +++ b/src/mame/machine/mbee.cpp @@ -637,7 +637,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) if (image.fread(&data, 1) != 1) { image.message("Unexpected EOF"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if ((j < m_size) || (j > 0xefff)) @@ -645,7 +645,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) else { image.message("Not enough memory in this microbee"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } @@ -667,7 +667,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) if (image.fread(&data, 1) != 1) { image.message("Unexpected EOF"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if ((j < m_size) || (j > 0xefff)) @@ -675,7 +675,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) else { image.message("Not enough memory in this microbee"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } @@ -691,7 +691,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) if (image.fread(&data, 1) != 1) { image.message("Unexpected EOF"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if ((j < m_size) || (j > 0xefff)) @@ -699,14 +699,14 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee ) else { image.message("Not enough memory in this microbee"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } if (sw) m_maincpu->set_pc(0x900); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } @@ -721,8 +721,8 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee_z80bin ) address_space &space = m_maincpu->space(AS_PROGRAM); /* load the binary into memory */ - if (z80bin_load_file(&image, space, file_type, &execute_address, &start_addr, &end_addr) == IMAGE_INIT_FAIL) - return IMAGE_INIT_FAIL; + if (z80bin_load_file(&image, space, file_type, &execute_address, &start_addr, &end_addr) != image_init_result::PASS) + return image_init_result::FAIL; /* is this file executable? */ if (execute_address != 0xffff) @@ -743,5 +743,5 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee_z80bin ) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/microdrv.cpp b/src/mame/machine/microdrv.cpp index 36406bd1bdf..3edc60ea527 100644 --- a/src/mame/machine/microdrv.cpp +++ b/src/mame/machine/microdrv.cpp @@ -90,10 +90,10 @@ void microdrive_image_device::device_start() m_comms_out = 0; } -bool microdrive_image_device::call_load() +image_init_result microdrive_image_device::call_load() { if (length() != MDV_IMAGE_LENGTH) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; for (int i = 0; i < MDV_IMAGE_LENGTH / 2; i++) { @@ -104,7 +104,7 @@ bool microdrive_image_device::call_load() m_bit_offset = 0; m_byte_offset = 0; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void microdrive_image_device::call_unload() diff --git a/src/mame/machine/microdrv.h b/src/mame/machine/microdrv.h index 0b7b69fcd90..5e1547b9dc5 100644 --- a/src/mame/machine/microdrv.h +++ b/src/mame/machine/microdrv.h @@ -48,7 +48,7 @@ public: template<class _Object> static devcb_base &set_comms_out_wr_callback(device_t &device, _Object object) { return downcast<microdrive_image_device &>(device).m_write_comms_out.set_callback(object); } // image-level overrides - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); } diff --git a/src/mame/machine/microtan.cpp b/src/mame/machine/microtan.cpp index 422e79e16aa..a4d1503aa35 100644 --- a/src/mame/machine/microtan.cpp +++ b/src/mame/machine/microtan.cpp @@ -522,26 +522,26 @@ void microtan_state::machine_reset() output().set_led_value(1, (m_keyrows[3] & 0x80) ? 0 : 1); } -bool microtan_state::microtan_verify_snapshot(UINT8 *data, int size) +image_verify_result microtan_state::microtan_verify_snapshot(UINT8 *data, int size) { if (size == 8263) { logerror("microtan_snapshot_id: magic size %d found\n", size); - return true; + return image_verify_result::PASS; } else { if (4 + data[2] + 256 * data[3] + 1 + 16 + 16 + 16 + 1 + 1 + 16 + 16 + 64 + 7 == size) { logerror("microtan_snapshot_id: header RAM size + structures matches filesize %d\n", size); - return true; + return image_verify_result::PASS; } } - return false; + return image_verify_result::FAIL; } -int microtan_state::parse_intel_hex(UINT8 *snapshot_buff, char *src) +image_init_result microtan_state::parse_intel_hex(UINT8 *snapshot_buff, char *src) { char line[128]; int /*row = 0,*/ column = 0, last_addr = 0, last_size = 0; @@ -619,10 +619,10 @@ int microtan_state::parse_intel_hex(UINT8 *snapshot_buff, char *src) logerror("parse_intel_hex: registers (?) at %04X\n", last_addr); memcpy(&snapshot_buff[8192+64], &snapshot_buff[last_addr], last_size); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } -int microtan_state::parse_zillion_hex(UINT8 *snapshot_buff, char *src) +image_init_result microtan_state::parse_zillion_hex(UINT8 *snapshot_buff, char *src) { char line[128]; int parsing = 0, /*row = 0,*/ column = 0; @@ -702,7 +702,7 @@ int microtan_state::parse_zillion_hex(UINT8 *snapshot_buff, char *src) } src++; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void microtan_state::microtan_set_cpu_regs(const UINT8 *snapshot_buff, int base) @@ -825,13 +825,13 @@ SNAPSHOT_LOAD_MEMBER( microtan_state, microtan ) snapshot_buff = (UINT8*)image.ptr(); if (!snapshot_buff) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; - if (!microtan_verify_snapshot(snapshot_buff, snapshot_size)) - return IMAGE_INIT_FAIL; + if (microtan_verify_snapshot(snapshot_buff, snapshot_size) != image_verify_result::PASS) + return image_init_result::FAIL; microtan_snapshot_copy(snapshot_buff, snapshot_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } QUICKLOAD_LOAD_MEMBER( microtan_state, microtan ) @@ -839,7 +839,7 @@ QUICKLOAD_LOAD_MEMBER( microtan_state, microtan ) int snapshot_size = 8263; /* magic size */ dynamic_buffer snapshot_buff(snapshot_size, 0); std::vector<char> buff(quickload_size + 1); - int rc; + image_init_result rc; image.fread(&buff[0], quickload_size); @@ -849,7 +849,7 @@ QUICKLOAD_LOAD_MEMBER( microtan_state, microtan ) rc = parse_intel_hex(&snapshot_buff[0], &buff[0]); else rc = parse_zillion_hex(&snapshot_buff[0], &buff[0]); - if (rc == IMAGE_INIT_PASS) + if (rc == image_init_result::PASS) microtan_snapshot_copy(&snapshot_buff[0], snapshot_size); return rc; } diff --git a/src/mame/machine/mtx.cpp b/src/mame/machine/mtx.cpp index 26a0ae6876a..6f6fb8acc17 100644 --- a/src/mame/machine/mtx.cpp +++ b/src/mame/machine/mtx.cpp @@ -348,7 +348,7 @@ SNAPSHOT_LOAD_MEMBER( mtx_state, mtx ) if (header[0] != 0xff) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, nullptr); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } // get tape name @@ -385,7 +385,7 @@ SNAPSHOT_LOAD_MEMBER( mtx_state, mtx ) logerror("snapshot name = '%s', system_size = 0x%04x, data_size = 0x%04x\n", tape_name, system_variables_size, data_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /*************************************************************************** diff --git a/src/mame/machine/nc.cpp b/src/mame/machine/nc.cpp index 07041c5c787..3f5ba19fbce 100644 --- a/src/mame/machine/nc.cpp +++ b/src/mame/machine/nc.cpp @@ -56,7 +56,7 @@ DEVICE_IMAGE_LOAD_MEMBER( nc_state, nc_pcmcia_card ) set_card_present_state(1); m_membank_card_ram_mask = card_calculate_mask(size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/ng_memcard.cpp b/src/mame/machine/ng_memcard.cpp index 17b2c3178f5..f9c1ea10843 100644 --- a/src/mame/machine/ng_memcard.cpp +++ b/src/mame/machine/ng_memcard.cpp @@ -53,17 +53,17 @@ void ng_memcard_device::device_start() with the given index -------------------------------------------------*/ -bool ng_memcard_device::call_load() +image_init_result ng_memcard_device::call_load() { if(length() != 0x800) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; fseek(0, SEEK_SET); size_t ret = fread(m_memcard_data, 0x800); if(ret != 0x800) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void ng_memcard_device::call_unload() @@ -72,15 +72,15 @@ void ng_memcard_device::call_unload() fwrite(m_memcard_data, 0x800); } -bool ng_memcard_device::call_create(int format_type, util::option_resolution *format_options) +image_init_result ng_memcard_device::call_create(int format_type, util::option_resolution *format_options) { memset(m_memcard_data, 0, 0x800); size_t ret = fwrite(m_memcard_data, 0x800); if(ret != 0x800) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h index e81cfb03c79..62b602fc1b0 100644 --- a/src/mame/machine/ng_memcard.h +++ b/src/mame/machine/ng_memcard.h @@ -42,9 +42,9 @@ public: virtual bool is_reset_on_load() const override { return false; } virtual const char *file_extensions() const override { return "neo"; } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; - virtual bool call_create(int format_type, util::option_resolution *format_options) override; + virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; // device-level overrides virtual void device_start() override; diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp index b4fc31c0a6c..6cd59aaa4bd 100644 --- a/src/mame/machine/pce220_ser.cpp +++ b/src/mame/machine/pce220_ser.cpp @@ -224,7 +224,7 @@ void pce220_serial_device::device_timer(emu_timer &timer, device_timer_id id, in DEVICE_IMAGE_LOAD( pce220_serial ) -------------------------------------------------*/ -bool pce220_serial_device::call_load() +image_init_result pce220_serial_device::call_load() { m_state = SIO_WAIT; m_bytes_count = 0; @@ -233,21 +233,21 @@ bool pce220_serial_device::call_load() //read the first byte fread(&m_current_byte, 1); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /*------------------------------------------------- DEVICE_IMAGE_CREATE( pce220_serial ) -------------------------------------------------*/ -bool pce220_serial_device::call_create(int format_type, util::option_resolution *format_options) +image_init_result pce220_serial_device::call_create(int format_type, util::option_resolution *format_options) { m_state = SIO_WAIT; m_bytes_count = 0; m_current_byte = 0; m_receive_timer->adjust(attotime::from_hz(SIO_BAUD_RATE), 0, attotime::from_hz(SIO_BAUD_RATE)); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h index 1e7874feadd..27cc66cbcd8 100644 --- a/src/mame/machine/pce220_ser.h +++ b/src/mame/machine/pce220_ser.h @@ -27,9 +27,9 @@ public: virtual ~pce220_serial_device(); // image-level overrides - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; - virtual bool call_create(int format_type, util::option_resolution *format_options) override; + virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; virtual iodevice_t image_type() const override { return IO_SERIAL; } diff --git a/src/mame/machine/poly88.cpp b/src/mame/machine/poly88.cpp index 47db0168f92..c158b648efc 100644 --- a/src/mame/machine/poly88.cpp +++ b/src/mame/machine/poly88.cpp @@ -328,5 +328,5 @@ SNAPSHOT_LOAD_MEMBER( poly88_state, poly88 ) pos+=recordLen; } machine().device("uart")->reset(); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/primo.cpp b/src/mame/machine/primo.cpp index 1295fe14b8d..a7dbf859fc6 100644 --- a/src/mame/machine/primo.cpp +++ b/src/mame/machine/primo.cpp @@ -307,17 +307,17 @@ SNAPSHOT_LOAD_MEMBER( primo_state, primo ) if (image.fread(&snapshot_data[0], snapshot_size) != snapshot_size) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (strncmp((char *)&snapshot_data[0], "PS01", 4)) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } primo_setup_pss(&snapshot_data[0], snapshot_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } /******************************************************************************* @@ -349,10 +349,10 @@ QUICKLOAD_LOAD_MEMBER( primo_state, primo ) if (image.fread(&quickload_data[0], quickload_size) != quickload_size) { - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } primo_setup_pp(&quickload_data[0], quickload_size); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/psion_pack.cpp b/src/mame/machine/psion_pack.cpp index 070e477d0c8..d95124372ad 100644 --- a/src/mame/machine/psion_pack.cpp +++ b/src/mame/machine/psion_pack.cpp @@ -256,7 +256,7 @@ void datapack_device::control_w(UINT8 data) DEVICE_IMAGE_LOAD( datapack ) -------------------------------------------------*/ -bool datapack_device::call_load() +image_init_result datapack_device::call_load() { UINT8 data[0x10]; @@ -264,13 +264,13 @@ bool datapack_device::call_load() // check the OPK head if(strncmp((const char*)data, "OPK", 3)) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; // get datapack ID and size m_id = data[OPK_HEAD_SIZE + 0]; m_size = data[OPK_HEAD_SIZE + 1]; - return IMAGE_INIT_PASS; + return image_init_result::PASS; } @@ -278,7 +278,7 @@ bool datapack_device::call_load() DEVICE_IMAGE_CREATE( datapack ) -------------------------------------------------*/ -bool datapack_device::call_create(int format_type, util::option_resolution *create_args) +image_init_result datapack_device::call_create(int format_type, util::option_resolution *create_args) { static const UINT8 opk_head[6] = {'O', 'P', 'K', 0x00, 0x00, 0x00}; @@ -303,7 +303,7 @@ bool datapack_device::call_create(int format_type, util::option_resolution *crea fwrite(&m_id, 1); fwrite(&m_size, 1); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/psion_pack.h b/src/mame/machine/psion_pack.h index 9347b950c11..1c0cd8189d8 100644 --- a/src/mame/machine/psion_pack.h +++ b/src/mame/machine/psion_pack.h @@ -25,9 +25,9 @@ public: virtual ~datapack_device(); // image-level overrides - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; - virtual bool call_create(int format_type, util::option_resolution *create_args) override; + virtual image_init_result call_create(int format_type, util::option_resolution *create_args) override; virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); } virtual iodevice_t image_type() const override { return IO_CARTSLOT; } diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp index 069e9f224f1..320c5624c31 100644 --- a/src/mame/machine/psxcd.cpp +++ b/src/mame/machine/psxcd.cpp @@ -192,11 +192,11 @@ void psxcd_device::device_reset() curpos.w = 0; } -bool psxcd_device::call_load() +image_init_result psxcd_device::call_load() { - bool ret = cdrom_image_device::call_load(); + image_init_result ret = cdrom_image_device::call_load(); open = true; - if(ret == IMAGE_INIT_PASS) + if(ret == image_init_result::PASS) add_system_event(event_change_disk, m_sysclock, nullptr); // 1 sec to spin up the disk return ret; } diff --git a/src/mame/machine/psxcd.h b/src/mame/machine/psxcd.h index 4bcf9ee5696..1c6c57d0295 100644 --- a/src/mame/machine/psxcd.h +++ b/src/mame/machine/psxcd.h @@ -25,7 +25,7 @@ public: // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxcd_device &>(device).m_irq_handler.set_callback(object); } - virtual bool call_load() override; + virtual image_init_result call_load() override; virtual void call_unload() override; DECLARE_WRITE8_MEMBER( write ); diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp index b64c86eae9a..eb7b971c49c 100644 --- a/src/mame/machine/sorcerer.cpp +++ b/src/mame/machine/sorcerer.cpp @@ -302,7 +302,7 @@ SNAPSHOT_LOAD_MEMBER( sorcerer_state,sorcerer) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Snapshot must be 65564 bytes"); image.message("Snapshot must be 65564 bytes"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /* get the header */ @@ -335,7 +335,7 @@ SNAPSHOT_LOAD_MEMBER( sorcerer_state,sorcerer) m_maincpu->set_state_int(Z80_IM, header[25]); m_maincpu->set_pc(header[26] | (header[27] << 8)); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void sorcerer_state::machine_start() @@ -423,8 +423,8 @@ QUICKLOAD_LOAD_MEMBER( sorcerer_state, sorcerer ) address_space &space = m_maincpu->space(AS_PROGRAM); /* load the binary into memory */ - if (z80bin_load_file(&image, space, file_type, &execute_address, &start_address, &end_address) == IMAGE_INIT_FAIL) - return IMAGE_INIT_FAIL; + if (z80bin_load_file(&image, space, file_type, &execute_address, &start_address, &end_address) != image_init_result::PASS) + return image_init_result::FAIL; /* is this file executable? */ if (execute_address != 0xffff) @@ -433,7 +433,7 @@ QUICKLOAD_LOAD_MEMBER( sorcerer_state, sorcerer ) autorun = m_iop_config->read() & 1; if ((execute_address >= 0xc000) && (execute_address <= 0xdfff) && (space.read_byte(0xdffa) != 0xc3)) - return IMAGE_INIT_FAIL; /* can't run a program if the cartridge isn't in */ + return image_init_result::FAIL; /* can't run a program if the cartridge isn't in */ /* Since Exidy Basic is by Microsoft, it needs some preprocessing before it can be run. 1. A start address of 01D5 indicates a basic program which needs its pointers fixed up. @@ -476,5 +476,5 @@ QUICKLOAD_LOAD_MEMBER( sorcerer_state, sorcerer ) } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/spec_snqk.cpp b/src/mame/machine/spec_snqk.cpp index 1c445087a27..f95165c2c55 100644 --- a/src/mame/machine/spec_snqk.cpp +++ b/src/mame/machine/spec_snqk.cpp @@ -235,10 +235,10 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum) spectrum_setup_z80(machine(), &snapshot_data[0], snapshot_size); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; error: - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /******************************************************************* @@ -2473,10 +2473,10 @@ QUICKLOAD_LOAD_MEMBER( spectrum_state,spectrum) spectrum_setup_raw(machine(), &quickload_data[0], quickload_size); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; error: - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } /******************************************************************* diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp index c08288c89a8..88b3055ee25 100644 --- a/src/mame/machine/super80.cpp +++ b/src/mame/machine/super80.cpp @@ -241,8 +241,8 @@ QUICKLOAD_LOAD_MEMBER( super80_state, super80 ) UINT16 exec_addr, start_addr, end_addr; /* load the binary into memory */ - if (z80bin_load_file(&image, m_maincpu->space(AS_PROGRAM), file_type, &exec_addr, &start_addr, &end_addr) == IMAGE_INIT_FAIL) - return IMAGE_INIT_FAIL; + if (z80bin_load_file(&image, m_maincpu->space(AS_PROGRAM), file_type, &exec_addr, &start_addr, &end_addr) != image_init_result::PASS) + return image_init_result::FAIL; /* is this file executable? */ if (exec_addr != 0xffff) @@ -250,5 +250,5 @@ QUICKLOAD_LOAD_MEMBER( super80_state, super80 ) if BIT(m_io_config->read(), 0) m_maincpu->set_pc(exec_addr); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp index b75448df490..938b3952c13 100644 --- a/src/mame/machine/thomson.cpp +++ b/src/mame/machine/thomson.cpp @@ -380,7 +380,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, to7_cartridge ) else { image.seterror(IMAGE_ERROR_UNSUPPORTED, string_format("Invalid cartridge size %u", size).c_str()); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (image.software_entry() == nullptr) @@ -388,7 +388,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, to7_cartridge ) if ( image.fread( pos, size ) != size ) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Read error"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } else @@ -411,7 +411,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, to7_cartridge ) PRINT (( "to7_cartridge_load: cartridge \"%s\" banks=%i, size=%i\n", name, m_thom_cart_nb_banks, size )); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } @@ -1511,7 +1511,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge ) else { image.seterror(IMAGE_ERROR_UNSUPPORTED, string_format("Invalid cartridge size %d", size).c_str()); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (image.software_entry() == nullptr) @@ -1519,7 +1519,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge ) if ( image.fread(pos, size ) != size ) { image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Read error"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } } else @@ -1542,7 +1542,7 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge ) PRINT (( "mo5_cartridge_load: cartridge \"%s\" banks=%i, size=%u\n", name, m_thom_cart_nb_banks, (unsigned) size )); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp index c63bdc26776..08eddb1db02 100644 --- a/src/mame/machine/ti85.cpp +++ b/src/mame/machine/ti85.cpp @@ -1176,7 +1176,7 @@ SNAPSHOT_LOAD_MEMBER( ti85_state, ti8x ) if (snapshot_size != expected_snapshot_size) { logerror ("Incomplete snapshot file\n"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } ti8x_snapshot_data.resize(snapshot_size); @@ -1188,5 +1188,5 @@ SNAPSHOT_LOAD_MEMBER( ti85_state, ti8x ) else if (!strncmp(machine().system().name, "ti86", 4)) ti86_setup_snapshot(&ti8x_snapshot_data[0]); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 30c1afc76fe..7a3c8b3bedf 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -931,5 +931,5 @@ QUICKLOAD_LOAD_MEMBER( trs80_state, trs80_cmd ) } } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp index 6b7ec9db758..19f989890fa 100644 --- a/src/mame/machine/victor9k_fdc.cpp +++ b/src/mame/machine/victor9k_fdc.cpp @@ -124,12 +124,12 @@ ADDRESS_MAP_END // SLOT_INTERFACE( victor9k_floppies ) //------------------------------------------------- -int victor_9000_fdc_t::load0_cb(floppy_image_device *device) +image_init_result victor_9000_fdc_t::load0_cb(floppy_image_device *device) { // DOOR OPEN 0 m_via4->write_ca1(0); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void victor_9000_fdc_t::unload0_cb(floppy_image_device *device) @@ -138,12 +138,12 @@ void victor_9000_fdc_t::unload0_cb(floppy_image_device *device) m_via4->write_ca1(1); } -int victor_9000_fdc_t::load1_cb(floppy_image_device *device) +image_init_result victor_9000_fdc_t::load1_cb(floppy_image_device *device) { // DOOR OPEN 1 m_via4->write_cb1(0); - return IMAGE_INIT_PASS; + return image_init_result::PASS; } void victor_9000_fdc_t::unload1_cb(floppy_image_device *device) diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h index 9fae7c1e812..b3613af3bb8 100644 --- a/src/mame/machine/victor9k_fdc.h +++ b/src/mame/machine/victor9k_fdc.h @@ -168,10 +168,10 @@ private: void set_rdy0(int state); void set_rdy1(int state); - int load0_cb(floppy_image_device *device); + image_init_result load0_cb(floppy_image_device *device); void unload0_cb(floppy_image_device *device); - int load1_cb(floppy_image_device *device); + image_init_result load1_cb(floppy_image_device *device); void unload1_cb(floppy_image_device *device); UINT8 m_p2; diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp index 35cda8b65ec..57baeaf1f5a 100644 --- a/src/mame/machine/x68k_hdc.cpp +++ b/src/mame/machine/x68k_hdc.cpp @@ -47,7 +47,7 @@ void x68k_hdc_image_device::device_start() m_phase = SASI_PHASE_BUSFREE; } -bool x68k_hdc_image_device::call_create(int format_type, util::option_resolution *format_options) +image_init_result x68k_hdc_image_device::call_create(int format_type, util::option_resolution *format_options) { // create 20MB HD int x; @@ -59,10 +59,10 @@ bool x68k_hdc_image_device::call_create(int format_type, util::option_resolution { ret = fwrite(sectordata,256); if(ret < 256) - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } WRITE16_MEMBER( x68k_hdc_image_device::hdc_w ) diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h index 3b41b8b0924..f8aa541d7e8 100644 --- a/src/mame/machine/x68k_hdc.h +++ b/src/mame/machine/x68k_hdc.h @@ -93,7 +93,7 @@ public: virtual bool must_be_loaded() const override { return 0; } virtual bool is_reset_on_load() const override { return 0; } virtual const char *file_extensions() const override { return "hdf"; } - virtual bool call_create(int format_type, util::option_resolution *format_options) override; + virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; DECLARE_WRITE16_MEMBER( hdc_w ); DECLARE_READ16_MEMBER( hdc_r ); diff --git a/src/mame/machine/z80bin.cpp b/src/mame/machine/z80bin.cpp index 7a5bb3d24c3..e2b263aab45 100644 --- a/src/mame/machine/z80bin.cpp +++ b/src/mame/machine/z80bin.cpp @@ -8,7 +8,7 @@ memory -------------------------------------------------*/ -bool z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, UINT16 *exec_addr, UINT16 *start_addr, UINT16 *end_addr ) +image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, UINT16 *exec_addr, UINT16 *start_addr, UINT16 *end_addr ) { int ch; UINT16 args[3]; @@ -25,7 +25,7 @@ bool z80bin_load_file(device_image_interface *image, address_space &space, const { image->seterror(IMAGE_ERROR_INVALIDIMAGE, "Unexpected EOF while getting file name"); image->message(" Unexpected EOF while getting file name"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } if (ch != '\0') @@ -34,7 +34,7 @@ bool z80bin_load_file(device_image_interface *image, address_space &space, const { image->seterror(IMAGE_ERROR_INVALIDIMAGE, "File name too long"); image->message(" File name too long"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } pgmname[i] = ch; /* build program name */ @@ -48,7 +48,7 @@ bool z80bin_load_file(device_image_interface *image, address_space &space, const { image->seterror(IMAGE_ERROR_INVALIDIMAGE, "Unexpected EOF while getting file size"); image->message(" Unexpected EOF while getting file size"); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } exec_addr[0] = little_endianize_int16(args[0]); @@ -68,10 +68,10 @@ bool z80bin_load_file(device_image_interface *image, address_space &space, const snprintf(message, ARRAY_LENGTH(message), "%s: Unexpected EOF while writing byte to %04X", pgmname, (unsigned) j); image->seterror(IMAGE_ERROR_INVALIDIMAGE, message); image->message("%s: Unexpected EOF while writing byte to %04X", pgmname, (unsigned) j); - return IMAGE_INIT_FAIL; + return image_init_result::FAIL; } space.write_byte(j, data); } - return IMAGE_INIT_PASS; + return image_init_result::PASS; } diff --git a/src/mame/machine/z80bin.h b/src/mame/machine/z80bin.h index 7a839466506..e1951358c5f 100644 --- a/src/mame/machine/z80bin.h +++ b/src/mame/machine/z80bin.h @@ -13,6 +13,6 @@ #ifndef __Z80_BIN__ #define __Z80_BIN__ -bool z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, UINT16 *exec_addr, UINT16 *start_addr, UINT16 *end_addr ); +image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, UINT16 *exec_addr, UINT16 *start_addr, UINT16 *end_addr ); #endif |