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.cpp61
1 files changed, 26 insertions, 35 deletions
diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp
index defdd4d025b..34a329b47ef 100644
--- a/src/devices/bus/saturn/sat_slot.cpp
+++ b/src/devices/bus/saturn/sat_slot.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(SATURN_CART_SLOT, sat_cart_slot_device, "sat_cart_slot", "Sat
//-------------------------------------------------
device_sat_cart_interface::device_sat_cart_interface(const machine_config &mconfig, device_t &device, int cart_type) :
- device_slot_card_interface(mconfig, device),
+ device_interface(device, "saturncart"),
m_cart_type(cart_type),
m_rom(nullptr),
m_rom_size(0)
@@ -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,8 +104,9 @@ 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_slot_interface(mconfig, *this), m_cart(nullptr)
+ device_cartrom_image_interface(mconfig, *this),
+ device_single_card_slot_interface<device_sat_cart_interface>(mconfig, *this),
+ m_cart(nullptr)
{
}
@@ -124,7 +125,7 @@ sat_cart_slot_device::~sat_cart_slot_device()
void sat_cart_slot_device::device_start()
{
- m_cart = dynamic_cast<device_sat_cart_interface *>(get_card_device());
+ m_cart = get_card_device();
}
@@ -134,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)
{
@@ -144,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);
@@ -156,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
{
@@ -176,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());
}
@@ -218,34 +209,34 @@ int sat_cart_slot_device::get_cart_type()
read
-------------------------------------------------*/
-READ32_MEMBER(sat_cart_slot_device::read_rom)
+uint32_t sat_cart_slot_device::read_rom(offs_t offset)
{
if (m_cart)
- return m_cart->read_rom(space, offset, mem_mask);
+ return m_cart->read_rom(offset);
else
return 0xffffffff;
}
-READ32_MEMBER(sat_cart_slot_device::read_ext_dram0)
+uint32_t sat_cart_slot_device::read_ext_dram0(offs_t offset)
{
if (m_cart)
- return m_cart->read_ext_dram0(space, offset, mem_mask);
+ return m_cart->read_ext_dram0(offset);
else
return 0xffffffff;
}
-READ32_MEMBER(sat_cart_slot_device::read_ext_dram1)
+uint32_t sat_cart_slot_device::read_ext_dram1(offs_t offset)
{
if (m_cart)
- return m_cart->read_ext_dram1(space, offset, mem_mask);
+ return m_cart->read_ext_dram1(offset);
else
return 0xffffffff;
}
-READ32_MEMBER(sat_cart_slot_device::read_ext_bram)
+uint32_t sat_cart_slot_device::read_ext_bram(offs_t offset)
{
if (m_cart)
- return m_cart->read_ext_bram(space, offset, mem_mask);
+ return m_cart->read_ext_bram(offset);
else
return 0xffffffff;
}
@@ -254,20 +245,20 @@ READ32_MEMBER(sat_cart_slot_device::read_ext_bram)
write
-------------------------------------------------*/
-WRITE32_MEMBER(sat_cart_slot_device::write_ext_dram0)
+void sat_cart_slot_device::write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (m_cart)
- m_cart->write_ext_dram0(space, offset, data, mem_mask);
+ m_cart->write_ext_dram0(offset, data, mem_mask);
}
-WRITE32_MEMBER(sat_cart_slot_device::write_ext_dram1)
+void sat_cart_slot_device::write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (m_cart)
- m_cart->write_ext_dram1(space, offset, data, mem_mask);
+ m_cart->write_ext_dram1(offset, data, mem_mask);
}
-WRITE32_MEMBER(sat_cart_slot_device::write_ext_bram)
+void sat_cart_slot_device::write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (m_cart)
- m_cart->write_ext_bram(space, offset, data, mem_mask);
+ m_cart->write_ext_bram(offset, data, mem_mask);
}