summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/saturn/sat_slot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/saturn/sat_slot.cpp')
-rw-r--r--src/devices/bus/saturn/sat_slot.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp
index 955e3478f3e..34a329b47ef 100644
--- a/src/devices/bus/saturn/sat_slot.cpp
+++ b/src/devices/bus/saturn/sat_slot.cpp
@@ -57,11 +57,11 @@ device_sat_cart_interface::~device_sat_cart_interface()
// rom_alloc - alloc the space for the cart
//-------------------------------------------------
-void device_sat_cart_interface::rom_alloc(uint32_t size, const char *tag)
+void device_sat_cart_interface::rom_alloc(uint32_t size)
{
if (m_rom == nullptr)
{
- m_rom = (uint32_t *)device().machine().memory().region_alloc(std::string(tag).append(SATSLOT_ROM_REGION_TAG).c_str(), size, 4, ENDIANNESS_LITTLE)->base();
+ m_rom = (uint32_t *)device().machine().memory().region_alloc(device().subtag("^cart:rom"), size, 4, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
}
@@ -104,7 +104,7 @@ void device_sat_cart_interface::dram1_alloc(uint32_t size)
//-------------------------------------------------
sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SATURN_CART_SLOT, tag, owner, clock),
- device_image_interface(mconfig, *this),
+ device_cartrom_image_interface(mconfig, *this),
device_single_card_slot_interface<device_sat_cart_interface>(mconfig, *this),
m_cart(nullptr)
{
@@ -135,7 +135,7 @@ void sat_cart_slot_device::device_start()
-------------------------------------------------*/
-image_init_result sat_cart_slot_device::call_load()
+std::pair<std::error_condition, std::string> sat_cart_slot_device::call_load()
{
if (m_cart)
{
@@ -145,10 +145,9 @@ image_init_result sat_cart_slot_device::call_load()
{
// from fullpath, only ROM carts
uint32_t len = loaded_through_softlist() ? get_software_region_length("rom") : length();
- uint32_t *ROM;
- m_cart->rom_alloc(len, tag());
- ROM = m_cart->get_rom_base();
+ m_cart->rom_alloc(len);
+ uint32_t *const ROM = m_cart->get_rom_base();
if (loaded_through_softlist())
memcpy(ROM, get_software_region("rom"), len);
@@ -157,15 +156,7 @@ image_init_result sat_cart_slot_device::call_load()
// fix endianness....
for (int i = 0; i < len/4; i ++)
- ROM[i] = bitswap<32>(ROM[i],7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24);
-// {
-// uint8_t tempa = ROM[i+0];
-// uint8_t tempb = ROM[i+1];
-// ROM[i+1] = ROM[i+2];
-// ROM[i+0] = ROM[i+3];
-// ROM[i+3] = tempa;
-// ROM[i+2] = tempb;
-// }
+ ROM[i] = big_endianize_int32(ROM[i]);
}
else
{
@@ -177,10 +168,9 @@ image_init_result sat_cart_slot_device::call_load()
if (get_software_region("dram1"))
m_cart->dram1_alloc(get_software_region_length("dram1"));
}
- return image_init_result::PASS;
}
- return image_init_result::PASS;
+ return std::make_pair(std::error_condition(), std::string());
}