summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/stv.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/stv.cpp')
-rw-r--r--src/mame/drivers/stv.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index efaa4fbbeae..1fb6df8857a 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -94,7 +94,7 @@ offsets:
READ8_MEMBER(stv_state::stv_ioga_r)
{
- UINT8 res;
+ uint8_t res;
res = 0xff;
if(offset & 0x20 && !space.debugger_access())
@@ -138,7 +138,7 @@ WRITE8_MEMBER(stv_state::stv_ioga_w)
READ8_MEMBER(stv_state::critcrsh_ioga_r)
{
- UINT8 res;
+ uint8_t res;
const char *const lgnames[] = { "LIGHTX", "LIGHTY" };
res = 0xff;
@@ -159,7 +159,7 @@ READ8_MEMBER(stv_state::critcrsh_ioga_r)
READ8_MEMBER(stv_state::magzun_ioga_r)
{
- UINT8 res;
+ uint8_t res;
res = 0xff;
@@ -197,7 +197,7 @@ READ8_MEMBER(stv_state::stvmp_ioga_r)
const char *const mpnames[2][5] = {
{"P1_KEY0", "P1_KEY1", "P1_KEY2", "P1_KEY3", "P1_KEY4"},
{"P2_KEY0", "P2_KEY1", "P2_KEY2", "P2_KEY3", "P2_KEY4"} };
- UINT8 res;
+ uint8_t res;
res = 0xff;
@@ -237,7 +237,7 @@ WRITE8_MEMBER(stv_state::stvmp_ioga_w)
/* remaps with a 8-bit handler because MAME can't install r/w handlers with a different bus parallelism than the CPU native one, shrug ... */
READ32_MEMBER(stv_state::stv_ioga_r32)
{
- UINT32 res;
+ uint32_t res;
res = 0;
if(ACCESSING_BITS_16_23)
@@ -266,7 +266,7 @@ WRITE32_MEMBER(stv_state::stv_ioga_w32)
READ32_MEMBER(stv_state::critcrsh_ioga_r32)
{
- UINT32 res;
+ uint32_t res;
res = 0;
if(ACCESSING_BITS_16_23)
@@ -283,7 +283,7 @@ READ32_MEMBER(stv_state::critcrsh_ioga_r32)
READ32_MEMBER(stv_state::stvmp_ioga_r32)
{
- UINT32 res;
+ uint32_t res;
res = 0;
if(ACCESSING_BITS_16_23)
@@ -312,7 +312,7 @@ WRITE32_MEMBER(stv_state::stvmp_ioga_w32)
READ32_MEMBER(stv_state::magzun_ioga_r32)
{
- UINT32 res;
+ uint32_t res;
res = 0;
if(ACCESSING_BITS_16_23)
@@ -381,10 +381,10 @@ DRIVER_INIT_MEMBER(stv_state,stv)
m_minit_boost_timeslice = attotime::zero;
m_sinit_boost_timeslice = attotime::zero;
- m_scu_regs = std::make_unique<UINT32[]>(0x100/4);
- m_scsp_regs = std::make_unique<UINT16[]>(0x1000/2);
- m_backupram = std::make_unique<UINT8[]>(0x8000);
- memset(m_backupram.get(), 0, sizeof(UINT8) * 0x8000);
+ m_scu_regs = std::make_unique<uint32_t[]>(0x100/4);
+ m_scsp_regs = std::make_unique<uint16_t[]>(0x1000/2);
+ m_backupram = std::make_unique<uint8_t[]>(0x8000);
+ memset(m_backupram.get(), 0, sizeof(uint8_t) * 0x8000);
install_stvbios_speedups();
@@ -454,7 +454,7 @@ DRIVER_INIT_MEMBER(stv_state,magzun)
/* Program ROM patches, don't understand how to avoid these two checks ... */
{
- UINT32 *ROM = (UINT32 *)memregion("cart")->base();
+ uint32_t *ROM = (uint32_t *)memregion("cart")->base();
ROM[0x90054/4] = 0x00e00001; // END error
@@ -1032,12 +1032,12 @@ static MACHINE_CONFIG_DERIVED( stv_5881, stv )
MACHINE_CONFIG_END
-UINT16 stv_state::crypt_read_callback_ch1(UINT32 addr)
+uint16_t stv_state::crypt_read_callback_ch1(uint32_t addr)
{
return m_maincpu->space().read_word(0x02000000 + 0x1000000 + (addr * 2));
}
-UINT16 stv_state::crypt_read_callback_ch2(UINT32 addr)
+uint16_t stv_state::crypt_read_callback_ch2(uint32_t addr)
{
return m_maincpu->space().read_word(0x02000000 + 0x0000000 + (addr * 2));
}
@@ -1064,7 +1064,7 @@ WRITE32_MEMBER( stv_state::batmanfr_sound_comms_w )
READ16_MEMBER( stv_state::adsp_control_r )
{
- UINT16 res = 0;
+ uint16_t res = 0;
switch (offset)
{
@@ -1100,13 +1100,13 @@ WRITE16_MEMBER( stv_state::adsp_control_w )
if (data > 0)
{
- UINT8* adsp_rom = (UINT8*)memregion("adsp")->base();
+ uint8_t* adsp_rom = (uint8_t*)memregion("adsp")->base();
- UINT32 page = (m_adsp_regs.bdma_control >> 8) & 0xff;
- UINT32 dir = (m_adsp_regs.bdma_control >> 2) & 1;
- UINT32 type = m_adsp_regs.bdma_control & 3;
+ uint32_t page = (m_adsp_regs.bdma_control >> 8) & 0xff;
+ uint32_t dir = (m_adsp_regs.bdma_control >> 2) & 1;
+ uint32_t type = m_adsp_regs.bdma_control & 3;
- UINT32 src_addr = (page << 14) | m_adsp_regs.bdma_external_addr;
+ uint32_t src_addr = (page << 14) | m_adsp_regs.bdma_external_addr;
address_space &addr_space = m_adsp->space((type == 0) ? AS_PROGRAM : AS_DATA);
@@ -1116,7 +1116,7 @@ WRITE16_MEMBER( stv_state::adsp_control_w )
{
if (type == 0)
{
- UINT32 src_word =(adsp_rom[src_addr + 0] << 16) |
+ uint32_t src_word =(adsp_rom[src_addr + 0] << 16) |
(adsp_rom[src_addr + 1] << 8) |
(adsp_rom[src_addr + 2]);
@@ -1127,7 +1127,7 @@ WRITE16_MEMBER( stv_state::adsp_control_w )
}
else if (type == 1)
{
- UINT32 src_word =(adsp_rom[src_addr + 0] << 8) | adsp_rom[src_addr + 1];
+ uint32_t src_word =(adsp_rom[src_addr + 0] << 8) | adsp_rom[src_addr + 1];
addr_space.write_dword(m_adsp_regs.bdma_internal_addr * 2, src_word);
@@ -1183,12 +1183,12 @@ MACHINE_RESET_MEMBER(stv_state,batmanfr)
{
MACHINE_RESET_CALL_MEMBER(stv);
- UINT8 *adsp_boot = (UINT8*)memregion("adsp")->base();
+ uint8_t *adsp_boot = (uint8_t*)memregion("adsp")->base();
/* Load 32 program words (96 bytes) via BDMA */
for (int i = 0; i < 32; i ++)
{
- UINT32 word;
+ uint32_t word;
word = adsp_boot[i*3 + 0] << 16;
word |= adsp_boot[i*3 + 1] << 8;
@@ -1277,8 +1277,8 @@ MACHINE_RESET_MEMBER(stv_state,stv)
image_init_result stv_state::load_cart(device_image_interface &image, generic_slot_device *slot)
{
- UINT8 *ROM;
- UINT32 size = slot->common_get_size("rom");
+ uint8_t *ROM;
+ uint32_t size = slot->common_get_size("rom");
if (image.software_entry() == nullptr)
return image_init_result::FAIL;
@@ -1289,7 +1289,7 @@ image_init_result stv_state::load_cart(device_image_interface &image, generic_sl
/* fix endianess */
{
- UINT8 j[4];
+ uint8_t j[4];
for (int i = 0; i < size; i += 4)
{
@@ -1898,7 +1898,7 @@ by Sega titles,and this is a Sunsoft game)It's likely to be a left-over...
DRIVER_INIT_MEMBER(stv_state,sanjeon)
{
- UINT8 *src = memregion("cart")->base();
+ uint8_t *src = memregion("cart")->base();
int x;
for (x=0;x<0x3000000;x++)