summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/strata.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/devices/machine/strata.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/devices/machine/strata.cpp')
-rw-r--r--src/devices/machine/strata.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp
index 01651eb90bd..4f7006f4d99 100644
--- a/src/devices/machine/strata.cpp
+++ b/src/devices/machine/strata.cpp
@@ -59,7 +59,7 @@ strataflash_device::strataflash_device(const machine_config &mconfig, const char
void strataflash_device::nvram_default()
{
- memset(m_flashmemory, 0, COMPLETE_SIZE);
+ memset(m_flashmemory.get(), 0, COMPLETE_SIZE);
}
//-------------------------------------------------
@@ -69,7 +69,7 @@ void strataflash_device::nvram_default()
void strataflash_device::nvram_read(emu_file &file)
{
- file.read(m_flashmemory, COMPLETE_SIZE);
+ file.read(m_flashmemory.get(), COMPLETE_SIZE);
// TODO
@@ -173,7 +173,7 @@ void strataflash_device::nvram_write(emu_file &file)
return 0;
*/
- file.write(m_flashmemory, COMPLETE_SIZE);
+ file.write(m_flashmemory.get(), COMPLETE_SIZE);
}
//-------------------------------------------------
@@ -184,15 +184,15 @@ void strataflash_device::device_start(void)
m_mode = FM_NORMAL;
m_status = 0x80;
m_master_lock = 0;
- m_flashmemory = auto_alloc_array(machine(), UINT8, COMPLETE_SIZE);
+ m_flashmemory = std::make_unique<UINT8[]>(COMPLETE_SIZE);
- m_wrbuf = m_flashmemory + FEEPROM_SIZE;
+ m_wrbuf = m_flashmemory.get() + FEEPROM_SIZE;
m_prot_regs = m_wrbuf + WRBUF_SIZE;
m_blocklock = m_prot_regs + PROT_REGS_SIZE;
// clear various FEEPROM areas
memset(m_prot_regs, 0xff, 18);
- memset(m_flashmemory, 0xff, FEEPROM_SIZE);
+ memset(m_flashmemory.get(), 0xff, FEEPROM_SIZE);
memset(m_blocklock, 0x00, BLOCKLOCK_SIZE);
// set-up factory-programmed protection register segment
@@ -234,7 +234,7 @@ UINT16 strataflash_device::read8_16(address_space& space, offs_t offset, bus_wid
case bw_8:
return m_flashmemory[BYTE_XOR_LE(offset)];
case bw_16:
- return *(UINT16*)(m_flashmemory+offset);
+ return *(UINT16*)(m_flashmemory.get()+offset);
}
break;
case FM_READSTATUS:
@@ -562,7 +562,7 @@ void strataflash_device::write8_16(address_space& space, offs_t offset, UINT16 d
m_flashmemory[BYTE_XOR_LE(offset)] &= data;
break;
case bw_16:
- *(UINT16*)(m_flashmemory+offset) &= data;
+ *(UINT16*)(m_flashmemory.get()+offset) &= data;
break;
}
}