Emulation/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-05-31 18:37:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous cleanup:

Browse source 
* ctvboy.xml: "Chitaikuu" (surface-to-air) is one word.
* misc/sttechno.cpp: Unsigned integers can't be less than zero.
* bus/nubus/thunder4gx.cpp: More const, less c_str.
This commit is contained in:
Vas Crabb 2024-01-19 06:08:31 +11:00
parent 42072e8e72
commit da69082534
4 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hash/ctvboy.xml
View file

@ -10,7 +10,7 @@ All known officially released games are dumped, 6 total.
<softwarelist name="ctvboy" description="Gakken Compact Vision TV Boy cartridges">
<software name="chitaikuu">
<description>Chi Taikuu Daisakusen</description>
<description>Chitaikuu Daisakusen</description>
<year>1983</year>
<publisher>Gakken</publisher>
<info name="alt_title" value="地対空大作戦"/>

45
src/devices/bus/nubus/thunder4gx.cpp
View file

@ -155,12 +155,12 @@ ioport_constructor nubus_thunder4gx_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
nubus_thunder4gx_device::nubus_thunder4gx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
nubus_thunder4gx_device::nubus_thunder4gx_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
nubus_thunder4gx_device(mconfig, NUBUS_THUNDERIVGX, tag, owner, clock)
{
}
nubus_thunder4gx_device::nubus_thunder4gx_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
nubus_thunder4gx_device::nubus_thunder4gx_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) :
device_t(mconfig, type, tag, owner, clock),
device_nubus_card_interface(mconfig, *this),
m_screen(*this, "screen"),
@ -214,9 +214,9 @@ void nubus_thunder4gx_device::device_reset()
m_display_enable = 0;
}
uint32_t nubus_thunder4gx_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
u32 nubus_thunder4gx_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
auto const vram8 = util::big_endian_cast<uint8_t const>(&m_vram[0]);
auto const vram8 = util::big_endian_cast<u8 const>(&m_vram[0]);
const pen_t *pens = m_palette->pens();
if ((m_display_enable != 0xffff) || (m_hres == 0) || (m_vres == 0))
@ -414,21 +414,21 @@ void nubus_thunder4gx_device::registers_w(offs_t offset, u32 data, u32 mem_mask)
break;
default:
LOGMASKED(LOG_GENERAL, "%s Write @ C4xxxx: %x to reg %x (mask %x)\n", machine().describe_context().c_str(), data & mem_mask, offset, mem_mask);
LOGMASKED(LOG_GENERAL, "%s Write @ C4xxxx: %x to reg %x (mask %x)\n", machine().describe_context(), data & mem_mask, offset, mem_mask);
break;
}
}
u32 nubus_thunder4gx_device::ramdac_r(offs_t offset, u32 mem_mask)
{
LOGMASKED(LOG_RAMDAC, "%s: Read DAC @ %08x (mask %08x)\n", machine().describe_context().c_str(), offset, mem_mask);
LOGMASKED(LOG_RAMDAC, "%s: Read DAC @ %08x (mask %08x)\n", machine().describe_context(), offset, mem_mask);
return 0;
}
void nubus_thunder4gx_device::ramdac_w(offs_t offset, u32 data, u32 mem_mask)
{
LOGMASKED(LOG_RAMDAC, "%s: %x to DAC at %x\n", machine().describe_context().c_str(), data & mem_mask, offset);
LOGMASKED(LOG_RAMDAC, "%s: %x to DAC at %x\n", machine().describe_context(), data & mem_mask, offset);
switch (offset)
{
case 0:
@ -571,7 +571,7 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
const u16 width = m_blitter_param1 & 0xffff;
const u16 height = m_blitter_param1 >> 16;
u8 *vram8 = (u8 *)&m_vram[0];
const u8 *pattern8 = (u8 *)&m_blitter_small_pattern;
u8 const *const pattern8 = (u8 *)&m_blitter_small_pattern; // FIXME: endianness
for (int y = 0; y < height; y++)
{
@ -590,7 +590,7 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
const u16 width = m_blitter_param1 & 0xffff;
const u16 height = m_blitter_param1 >> 16;
u16 *vram16 = (u16 *)&m_vram[0];
const u16 *pattern16 = (u16 *)&m_blitter_small_pattern;
u16 const *const pattern16 = (u16 *)&m_blitter_small_pattern; // FIXME: endianness
for (int y = 0; y < height; y++)
{
@ -606,8 +606,8 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
case 6: // 32 bpp
{
u32 vram_offs = (m_blitter_dest_address & 0x7fffff) >> 2;
u16 width = m_blitter_param1 & 0xffff;
u16 height = m_blitter_param1 >> 16;
const u16 width = m_blitter_param1 & 0xffff;
const u16 height = m_blitter_param1 >> 16;
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
@ -632,7 +632,7 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
u16 pat_width = (m_blitter_param2 & 0xff);
u16 pat_height = (m_blitter_param2 >> 8) & 0xff;
u8 *vram8 = (u8 *)&m_vram[0];
const u8 *pattern8 = (u8 *)&m_blitter_medium_pattern;
u8 const *const pattern8 = (u8 *)&m_blitter_medium_pattern; // FIXME: endianness
if (pat_width == 0)
{
@ -651,10 +651,9 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
}
LOGMASKED(LOG_BLITTER, "Medium pattern fill 8: offs %08x width %d height %d pat width %d pat height %d\n", vram_offs, width, height, pat_width, pat_height);
int pat_offs = 0;
for (int y = 0; y < height; y++)
{
pat_offs = ((y % pat_height) * pat_width);
const int pat_offs = (y % pat_height) * pat_width;
LOGMASKED(LOG_BLITTER, "Line %d vram offs %08x pattern offs %d\n", y, vram_offs, pat_offs % (16 * 4));
for (int x = 0; x < width; x++)
{
@ -673,13 +672,12 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
const u16 pat_width = (m_blitter_param2 & 0xff);
const u16 pat_height = (m_blitter_param2 >> 8) & 0xff;
u16 *vram16 = (u16 *)&m_vram[0];
const u16 *pattern16 = (u16 *)&m_blitter_medium_pattern;
u16 const *const pattern16 = (u16 *)&m_blitter_medium_pattern; // FIXME: endianness
LOGMASKED(LOG_BLITTER, "Medium pattern fill 16: offs %08x width %d height %d pat width %d pat height %d\n", vram_offs, width, height, pat_width, pat_height);
int pat_offs = 0;
for (int y = 0; y < height; y++)
{
pat_offs = ((y % pat_height) * pat_width);
const int pat_offs = (y % pat_height) * pat_width;
LOGMASKED(LOG_BLITTER, "Line %d vram offs %08x pattern offs %d\n", y, vram_offs, pat_offs % (16 * 2));
for (int x = 0; x < width; x++)
{
@ -693,15 +691,14 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
case 6: // 32 bpp
{
u32 vram_offs = (m_blitter_dest_address & 0x7fffff) >> 2; // convert address to offset in 32-bit words
u16 width = (m_blitter_param1 & 0xffff) >> 2;
u16 height = m_blitter_param1 >> 16;
u16 pat_width = (m_blitter_param2 & 0xff) >> 2;
u16 pat_height = (m_blitter_param2 >> 8) & 0xff;
const u16 width = (m_blitter_param1 & 0xffff) >> 2;
const u16 height = m_blitter_param1 >> 16;
const u16 pat_width = (m_blitter_param2 & 0xff) >> 2;
const u16 pat_height = (m_blitter_param2 >> 8) & 0xff;
LOGMASKED(LOG_BLITTER, "Medium pattern fill 32: offs %08x width %d height %d pat width %d pat height %d\n", vram_offs, width, height, pat_width, pat_height);
int pat_offs = 0;
for (int y = 0; y < height; y++)
{
pat_offs = ((y % pat_height) * pat_width);
const int pat_offs = (y % pat_height) * pat_width;
LOGMASKED(LOG_BLITTER, "Line %d vram offs %08x pattern offs %d\n", y, vram_offs, pat_offs);
for (int x = 0; x < width; x++)
{
@ -765,7 +762,7 @@ void nubus_thunder4gx_device::accel_w(offs_t offset, u32 data, u32 mem_mask)
break;
default:
LOGMASKED(LOG_BLITTER, "%s: %08x to blitter @ %08x (mask %08x)\n", machine().describe_context().c_str(), data, offset, mem_mask);
LOGMASKED(LOG_BLITTER, "%s: %08x to blitter @ %08x (mask %08x)\n", machine().describe_context(), data, offset, mem_mask);
break;
}

10
src/mame/misc/sttechno.cpp
View file

@ -331,8 +331,8 @@ void sttechno_state::bank_write_enable_w(uint16_t data)
void sttechno_state::data_w(offs_t offset, uint16_t data)
{
if (m_bank >= 0 && m_bank <= 2) {
const offs_t offs = offset + (0x100000 * m_bank);
if (m_bank <= 2) {
const offs_t offs = offset + (0x10'0000 * m_bank);
if (offs < 0x100 / 2)
m_sound->write(offs, data);
else
@ -348,8 +348,8 @@ void sttechno_state::data_w(offs_t offset, uint16_t data)
uint16_t sttechno_state::data_r( offs_t offset)
{
if (m_bank >= 0 && m_bank <= 2) {
const offs_t offs = offset + (0x100000 * m_bank);
if (m_bank <= 2) {
const offs_t offs = offset + (0x10'0000 * m_bank);
if (offs < 0x100 / 2)
return m_sound->read(offs);
else
@ -466,7 +466,7 @@ uint16_t sttechno_state::sttga1_video_flash_r(offs_t offset)
void sttechno_state::sttga1_video_flash_write_enable_w(offs_t offset, uint16_t data)
{
// If it's set to 1 then 0xa00000 addresses flash, and if it's 0 then it addresses RAM?
// If it's set to 1 then 0xa0'0000 addresses flash, and if it's 0 then it addresses RAM?
m_sttga1_video_flash_write_enable = data != 0;
}

1
src/mame/yamaha/ymmu90.cpp
View file

@ -245,6 +245,7 @@ ROM_START( mu90 )
ROM_LOAD32_WORD( "xs518a0.ic22", 0x0000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) )
ROM_LOAD32_WORD( "xs743a0.ic23", 0x0000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) )
ROM_END
} // anonymous namespace