summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vectrex/slot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/vectrex/slot.cpp')
-rw-r--r--src/devices/bus/vectrex/slot.cpp61
1 files changed, 26 insertions, 35 deletions
diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp
index 15095b5b285..2b5ebd481a1 100644
--- a/src/devices/bus/vectrex/slot.cpp
+++ b/src/devices/bus/vectrex/slot.cpp
@@ -7,7 +7,6 @@
***********************************************************************************************************/
-
#include "emu.h"
#include "slot.h"
@@ -45,11 +44,11 @@ device_vectrex_cart_interface::~device_vectrex_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_vectrex_cart_interface::rom_alloc(uint32_t size, const char *tag)
+void device_vectrex_cart_interface::rom_alloc(uint32_t size)
{
if (m_rom == nullptr)
{
- m_rom = device().machine().memory().region_alloc(std::string(tag).append(VECSLOT_ROM_REGION_TAG).c_str(), size, 1, ENDIANNESS_LITTLE)->base();
+ m_rom = device().machine().memory().region_alloc(device().subtag("^cart:rom"), size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
}
@@ -64,7 +63,7 @@ void device_vectrex_cart_interface::rom_alloc(uint32_t size, const char *tag)
//-------------------------------------------------
vectrex_cart_slot_device::vectrex_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, VECTREX_CART_SLOT, tag, owner, clock),
- device_image_interface(mconfig, *this),
+ device_cartrom_image_interface(mconfig, *this),
device_single_card_slot_interface<device_vectrex_cart_interface>(mconfig, *this),
m_type(VECTREX_STD),
m_vec3d(VEC3D_NONE),
@@ -112,9 +111,9 @@ static const vectrex_slot slot_list[] =
#if 0
static int vectrex_get_pcb_id(const char *slot)
{
- for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
+ for (int i = 0; i < std::size(slot_list); i++)
{
- if (!core_stricmp(slot_list[i].slot_option, slot))
+ if (!strcmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}
@@ -137,21 +136,17 @@ static const char *vectrex_get_slot(int type)
call load
-------------------------------------------------*/
-image_init_result vectrex_cart_slot_device::call_load()
+std::pair<std::error_condition, std::string> vectrex_cart_slot_device::call_load()
{
if (m_cart)
{
- uint32_t size = !loaded_through_softlist() ? length() : get_software_region_length("rom");
- uint8_t *ROM;
+ uint32_t const size = !loaded_through_softlist() ? length() : get_software_region_length("rom");
if (size > 0x10000)
- {
- seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
- return image_init_result::FAIL;
- }
+ return std::make_pair(image_error::INVALIDLENGTH, "Unsupported cartridge size (must be no larger than 64K)");
- m_cart->rom_alloc((size < 0x1000) ? 0x1000 : size, tag());
- ROM = m_cart->get_rom_base();
+ m_cart->rom_alloc((size < 0x1000) ? 0x1000 : size);
+ uint8_t *const ROM = m_cart->get_rom_base();
if (!loaded_through_softlist())
fread(ROM, size);
@@ -160,10 +155,7 @@ image_init_result vectrex_cart_slot_device::call_load()
// Verify the file is accepted by the Vectrex bios
if (memcmp(ROM, "g GCE", 5))
- {
- seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid image");
- return image_init_result::FAIL;
- }
+ return std::make_pair(image_error::INVALIDIMAGE, "Invalid Vectrex ROM");
// determine type
m_type = VECTREX_STD;
@@ -183,11 +175,9 @@ image_init_result vectrex_cart_slot_device::call_load()
if (!memcmp(ROM + 0x11, "3D MINE STORM", 13))
m_vec3d = VEC3D_MINEST;
-
- return image_init_result::PASS;
}
- return image_init_result::PASS;
+ return std::make_pair(std::error_condition(), std::string());
}
@@ -199,19 +189,20 @@ std::string vectrex_cart_slot_device::get_default_card_software(get_default_card
{
if (hook.image_file())
{
- const char *slot_string;
- uint32_t size = hook.image_file()->size();
+ // FIXME: consider oversize files, check for errors, and check for read returning early
+ // it's also really wasteful to read the whole file here when only a small part of it is used for identification
+ std::uint64_t size;
+ hook.image_file()->length(size);
std::vector<uint8_t> rom(size);
- int type = VECTREX_STD;
+ read(*hook.image_file(), &rom[0], size);
- hook.image_file()->read(&rom[0], size);
-
- if (!memcmp(&rom[0x06], "SRAM", 4))
+ int type = VECTREX_STD;
+ if (!memcmp(&rom[0x06], "SRAM", 4)) // FIXME: bounds check!
type = VECTREX_SRAM;
if (size > 0x8000)
type = VECTREX_64K;
- slot_string = vectrex_get_slot(type);
+ char const *const slot_string = vectrex_get_slot(type);
//printf("type: %s\n", slot_string);
@@ -225,10 +216,10 @@ std::string vectrex_cart_slot_device::get_default_card_software(get_default_card
read_rom
-------------------------------------------------*/
-READ8_MEMBER(vectrex_cart_slot_device::read_rom)
+uint8_t vectrex_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset);
+ return m_cart->read_rom(offset);
else
return 0xff;
}
@@ -237,18 +228,18 @@ READ8_MEMBER(vectrex_cart_slot_device::read_rom)
write_ram
-------------------------------------------------*/
-WRITE8_MEMBER(vectrex_cart_slot_device::write_ram)
+void vectrex_cart_slot_device::write_ram(offs_t offset, uint8_t data)
{
if (m_cart)
- m_cart->write_ram(space, offset, data);
+ m_cart->write_ram(offset, data);
}
/*-------------------------------------------------
write_bank
-------------------------------------------------*/
-WRITE8_MEMBER(vectrex_cart_slot_device::write_bank)
+void vectrex_cart_slot_device::write_bank(uint8_t data)
{
if (m_cart)
- m_cart->write_bank(space, offset, data);
+ m_cart->write_bank(data);
}