summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-08-22 08:09:29 +1000
committer Vas Crabb <vas@vastheman.com>2021-08-22 08:12:22 +1000
commit94664102484edb96ac81f8613b096cb11cdeb6ab (patch)
tree5a848bdc14b732820c42bdb85ef80b5500cf64e8
parentad2f2f168d30755af9b47b5e09000a39d07b95d7 (diff)
srcclean for upcoming release
-rw-r--r--hash/cd32.xml20
-rw-r--r--hash/fm7_cass.xml10
-rw-r--r--hash/ibm5170_cdrom.xml4
-rw-r--r--hash/nes.xml32
-rw-r--r--hash/pc98.xml2
-rw-r--r--hash/specpls3_flop.xml2
-rw-r--r--hash/spectrum_cass.xml6
-rw-r--r--hash/timex_cass.xml4
-rw-r--r--makefile2
-rw-r--r--src/devices/bus/apricot/video/mono.cpp8
-rw-r--r--src/devices/bus/apricot/video/video.cpp2
-rw-r--r--src/devices/bus/nes/mmc3_clones.cpp242
-rw-r--r--src/devices/bus/nes/mmc3_clones.h26
-rw-r--r--src/devices/bus/nes/multigame.cpp2
-rw-r--r--src/devices/bus/nes/multigame.h2
-rw-r--r--src/devices/bus/nes/nes_slot.h8
-rw-r--r--src/devices/bus/nes/sachen.cpp2
-rw-r--r--src/devices/cpu/f2mc16/f2mc16.cpp2
-rw-r--r--src/devices/cpu/rsp/rsp.cpp48
-rw-r--r--src/mame/audio/wiping.cpp10
-rw-r--r--src/mame/drivers/apxen.cpp30
-rw-r--r--src/mame/drivers/clshroad.cpp6
-rw-r--r--src/mame/drivers/gfamily.cpp2
-rw-r--r--src/mame/drivers/miniguay.cpp2
-rw-r--r--src/mame/drivers/missbamby.cpp4
-rw-r--r--src/mame/drivers/pwp14.cpp24
-rw-r--r--src/mame/drivers/taitopjc.cpp8
-rw-r--r--src/mame/drivers/vsmileb.cpp22
-rw-r--r--src/mame/includes/gp32.h2
-rw-r--r--src/mame/machine/apple2common.cpp2
-rw-r--r--src/mame/video/n64.cpp26
-rw-r--r--src/mame/video/n64types.h2
-rw-r--r--src/mame/video/pc9801.cpp6
-rw-r--r--src/osd/modules/debugger/debugimgui.cpp4
34 files changed, 288 insertions, 286 deletions
diff --git a/hash/cd32.xml b/hash/cd32.xml
index 1e021600bab..8db63de2626 100644
--- a/hash/cd32.xml
+++ b/hash/cd32.xml
@@ -1753,16 +1753,16 @@ license:CC0
<!-- http://redump.org/disc/3366/ -->
<!-- Listed as possible bad dump on redump.org -->
<software name="suprfrog1" supported="no">
- <description>Superfrog (Rev 1)</description>
- <year>1999</year>
- <publisher>Islona</publisher>
- <info name="barcode" value="5 022358 170384" />
- <info name="disc_matrix" value="FD7989 THAMESDOWN 01793 421300 ZFS1" />
- <part name="cdrom" interface="cd32_cdrom">
- <diskarea name="cdrom">
- <disk name="superfrog (europe) (rev 1)" sha1="4295e7e97d90f3709cad9361841942a3f09866c8" status="baddump"/>
- </diskarea>
- </part>
+ <description>Superfrog (Rev 1)</description>
+ <year>1999</year>
+ <publisher>Islona</publisher>
+ <info name="barcode" value="5 022358 170384" />
+ <info name="disc_matrix" value="FD7989 THAMESDOWN 01793 421300 ZFS1" />
+ <part name="cdrom" interface="cd32_cdrom">
+ <diskarea name="cdrom">
+ <disk name="superfrog (europe) (rev 1)" sha1="4295e7e97d90f3709cad9361841942a3f09866c8" status="baddump"/>
+ </diskarea>
+ </part>
</software>
<!-- http://redump.org/disc/3434/ -->
diff --git a/hash/fm7_cass.xml b/hash/fm7_cass.xml
index 9e0f48bf684..d00b0488762 100644
--- a/hash/fm7_cass.xml
+++ b/hash/fm7_cass.xml
@@ -142,7 +142,7 @@ Titles, serial #s, publishers and release dates taken from:
</dataarea>
</part>
</software>
-
+
<software name="biotek">
<description>Biotek</description>
<year>1983</year>
@@ -156,7 +156,7 @@ Titles, serial #s, publishers and release dates taken from:
</dataarea>
</part>
</software>
-
+
<software name="blckonyx">
<description>The Black Onyx</description>
<year>1985</year>
@@ -604,7 +604,7 @@ Titles, serial #s, publishers and release dates taken from:
</dataarea>
</part>
</software>
-
+
<software name="elevgame">
<description>Elevator Game</description>
<year>19??</year>
@@ -616,7 +616,7 @@ Titles, serial #s, publishers and release dates taken from:
</dataarea>
</part>
</software>
-
+
<software name="enterprs">
<description>Enterprise</description>
<year>1983</year>
@@ -2480,7 +2480,7 @@ Titles, serial #s, publishers and release dates taken from:
</dataarea>
</part>
</software>
-
+
<software name="zaiko">
<description>Zaiko Kanri</description>
<year>1981</year>
diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
index 4981a589b8f..f5d48a16cfe 100644
--- a/hash/ibm5170_cdrom.xml
+++ b/hash/ibm5170_cdrom.xml
@@ -2121,7 +2121,7 @@ license:CC0
</diskarea>
</part>
</software>
-
+
<!-- DOS -->
<!-- Created from original media. size="1239040" crc="A9510DC8" sha1="609D186B01197D971D0C1A20DC8954F79DAC80D9" -->
<!-- Originally released on two 5.25" floppies. Reprinted on CD by GT Interactive as a standalone release, -->
@@ -2445,7 +2445,7 @@ license:CC0
</diskarea>
</part>
</software>
-
+
<!-- DOS -->
<!-- Created from an ISO. size="6352896" crc="DCEEEB82" sha1="EA7BE8CB7E91FB97C590D23AEDFA371DC98CF5C0" -->
<!-- Originally released on 3.5" and 5.25" floppies. Reprinted on CD by GT Interactive and included in -->
diff --git a/hash/nes.xml b/hash/nes.xml
index 69c2e9de303..1ffd1a9574d 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -54081,22 +54081,22 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</software>
<!-- Dump not available. Game is also in 9in1cal.
- <software name="supergun">
- <description>Super Gun (Asia)</description>
- <year>1992</year>
- <publisher>Caltron</publisher>
- <info name="serial" value="CN-12"/>
- <part name="cart" interface="nes_cart">
- <feature name="slot" value="ntdec_n715021" />
- <feature name="mirroring" value="horizontal" />
- <dataarea name="prg" size="65536">
- <rom name="prg.u1" size="65536" crc="" sha1="" status="nodump" />
- </dataarea>
- <dataarea name="chr" size="32768">
- <rom name="chr.u2" size="32768" crc="" sha1="" status="nodump" />
- </dataarea>
- </part>
- </software>
+ <software name="supergun">
+ <description>Super Gun (Asia)</description>
+ <year>1992</year>
+ <publisher>Caltron</publisher>
+ <info name="serial" value="CN-12"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="ntdec_n715021" />
+ <feature name="mirroring" value="horizontal" />
+ <dataarea name="prg" size="65536">
+ <rom name="prg.u1" size="65536" crc="" sha1="" status="nodump" />
+ </dataarea>
+ <dataarea name="chr" size="32768">
+ <rom name="chr.u2" size="32768" crc="" sha1="" status="nodump" />
+ </dataarea>
+ </part>
+ </software>
-->
<software name="destroyr">
diff --git a/hash/pc98.xml b/hash/pc98.xml
index 25348af6363..b60a7dba185 100644
--- a/hash/pc98.xml
+++ b/hash/pc98.xml
@@ -31867,7 +31867,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
<part name="flop1" interface="floppy_5_25">
<!--
<dataarea name="flop" size="1281968">
- <rom name="morita.d88" size="1281968" crc="7cce82c7" sha1="73bfd089cff665af607ed8c4d3bbc2c9793318ec" offset="0" />
+ <rom name="morita.d88" size="1281968" crc="7cce82c7" sha1="73bfd089cff665af607ed8c4d3bbc2c9793318ec" offset="0" />
</dataarea>
-->
<dataarea name="flop" size="4016040">
diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml
index 6ae9993b3bf..1eef473cd0d 100644
--- a/hash/specpls3_flop.xml
+++ b/hash/specpls3_flop.xml
@@ -11,7 +11,7 @@ license:CC0
<!--
SPS / CAPS Releases
- http://www.softpres.org/_media/files:datafiles.zip?id=download&cache=cache
+ http://www.softpres.org/_media/files:datafiles.zip?id=download&cache=cache
Known missing IPF dumps:
3585 LED Storm: Lazer Enhanced Destruction
diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index 0811cf68e4f..46e8bc8d74b 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -12868,7 +12868,7 @@ license:CC0
</dataarea>
</part>
</software>
-
+
<software name="horctowra" cloneof="horctowr">
<description>Horace Goes To The Tower (TAP tape image)</description>
<year>2011</year>
@@ -47359,7 +47359,7 @@ license:CC0
</dataarea>
</part>
</software>
-
+
<software name="bombjack2a" cloneof="bombjack2">
<description>Bomb Jack II (pre-production)</description>
<year>1987</year>
@@ -88553,7 +88553,7 @@ license:CC0
</dataarea>
</part>
</software>
-
+
<software name="lasersqexp">
<description>Laser Squad - Expansion Kit One</description>
<year>1988</year>
diff --git a/hash/timex_cass.xml b/hash/timex_cass.xml
index e9e3b030f60..cbd7e8e0114 100644
--- a/hash/timex_cass.xml
+++ b/hash/timex_cass.xml
@@ -17,8 +17,8 @@ license:CC0
Known software without a TZX or TAP dump:
Geovideo 4 (198x)(Paulo Sergio Coelho) -> https://spectrumcomputing.co.uk/entry/4000104
- Interface RS232 (Portugal) -> https://spectrumcomputing.co.uk/entry/25400
-
+ Interface RS232 (Portugal) -> https://spectrumcomputing.co.uk/entry/25400
+
Current bad dumps:
Cozinheiro (198x)(TMX Portugal Ltda)
Fórmula 1 (198x)(TMX Portugal Ltda)
diff --git a/makefile b/makefile
index 37118020777..62d72e8c459 100644
--- a/makefile
+++ b/makefile
@@ -1816,6 +1816,7 @@ ifeq (posix,$(SHELLTYPE))
$(SILENT) find hash -name \*.xml -exec ./srcclean {} \; >&2
$(SILENT) find bgfx -name \*.json -exec ./srcclean {} \; >&2
$(SILENT) find plugins -name \*.lua -exec ./srcclean {} \; >&2
+ $(SILENT) find plugins -name \*.json -exec ./srcclean {} \; >&2
$(SILENT) find scripts -name \*.lua -exec ./srcclean {} \; >&2
else
$(shell for /r src %%i in (*.c) do srcclean %%i >&2 )
@@ -1832,6 +1833,7 @@ else
$(shell for /r hash %%i in (*.xml) do srcclean %%i >&2 )
$(shell for /r bgfx %%i in (*.json) do srcclean %%i >&2 )
$(shell for /r plugins %%i in (*.lua) do srcclean %%i >&2 )
+ $(shell for /r plugins %%i in (*.json) do srcclean %%i >&2 )
$(shell for /r scripts %%i in (*.lua) do srcclean %%i >&2 )
endif
diff --git a/src/devices/bus/apricot/video/mono.cpp b/src/devices/bus/apricot/video/mono.cpp
index 7254962193c..424df94cea8 100644
--- a/src/devices/bus/apricot/video/mono.cpp
+++ b/src/devices/bus/apricot/video/mono.cpp
@@ -4,8 +4,8 @@
ACT Apricot XEN Monochrome Display Option
- TODO:
- - Support monitor selection
+ TODO:
+ - Support monitor selection
***************************************************************************/
@@ -203,7 +203,7 @@ void apricot_mono_display_device::portb_w(uint8_t data)
// -------0 crtc reset
m_portb = data;
-
+
if (BIT(m_portb, 0) == 0)
m_crtc->reset();
}
@@ -217,7 +217,7 @@ void apricot_mono_display_device::portx_w(uint8_t data)
// -------0 mode (compatible or xen)
m_portx = data;
-
+
// forward mode to host
m_slot->apvid_w(BIT(m_portx, 0));
}
diff --git a/src/devices/bus/apricot/video/video.cpp b/src/devices/bus/apricot/video/video.cpp
index fbb33ba83bf..13e91b04a58 100644
--- a/src/devices/bus/apricot/video/video.cpp
+++ b/src/devices/bus/apricot/video/video.cpp
@@ -86,7 +86,7 @@ bool apricot_video_slot_device::io_w(offs_t offset, uint16_t data, uint16_t mem_
{
if (m_card)
return m_card->io_w(offset, data, mem_mask);
-
+
return false;
}
diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp
index 7f230744bc7..f0ab5ddea47 100644
--- a/src/devices/bus/nes/mmc3_clones.cpp
+++ b/src/devices/bus/nes/mmc3_clones.cpp
@@ -380,22 +380,22 @@ void nes_sglionk_device::pcb_reset()
/*
void nes_sgboog_device::device_start()
{
- mmc3_start();
- save_item(NAME(m_reg));
- save_item(NAME(m_mode));
+ mmc3_start();
+ save_item(NAME(m_reg));
+ save_item(NAME(m_mode));
}
void nes_sgboog_device::pcb_reset()
{
- m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM;
+ m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM;
- m_mode = 0x04;
- m_reg[0] = 0x00;
- m_reg[1] = 0xff;
- m_reg[2] = 0;
- mmc3_common_initialize(0x1f, 0xff, 0);
- set_prg(m_prg_base, m_prg_mask);
- set_chr(m_chr_source, m_chr_base, m_chr_mask);
+ m_mode = 0x04;
+ m_reg[0] = 0x00;
+ m_reg[1] = 0xff;
+ m_reg[2] = 0;
+ mmc3_common_initialize(0x1f, 0xff, 0);
+ set_prg(m_prg_base, m_prg_mask);
+ set_chr(m_chr_source, m_chr_base, m_chr_mask);
}
*/
@@ -1142,139 +1142,139 @@ void nes_sglionk_device::write_h(offs_t offset, u8 data)
/*
void nes_sgboog_device::prg_cb(int start, int bank)
{
- if (!(m_reg[0] & 0x80)) // if this is != 0 we should never even arrive here
- {
- if (m_reg[1] & 0x08)
- bank = (bank & 0x1f) | 0x20;
- else
- bank = (bank & 0x0f) | (m_reg[1] & 0x10);
+ if (!(m_reg[0] & 0x80)) // if this is != 0 we should never even arrive here
+ {
+ if (m_reg[1] & 0x08)
+ bank = (bank & 0x1f) | 0x20;
+ else
+ bank = (bank & 0x0f) | (m_reg[1] & 0x10);
- prg8_x(start, bank);
- }
+ prg8_x(start, bank);
+ }
}
void nes_sgboog_device::chr_cb(int start, int bank, int source)
{
- if ((m_reg[1] & 0x04))
- bank |= 0x100;
- else
- bank = (bank & 0x7f) | ((m_reg[1] & 0x10) << 3);
+ if ((m_reg[1] & 0x04))
+ bank |= 0x100;
+ else
+ bank = (bank & 0x7f) | ((m_reg[1] & 0x10) << 3);
- chr1_x(start, bank, source);
+ chr1_x(start, bank, source);
}
void nes_sgboog_device::set_prg(int prg_base, int prg_mask)
{
- if (m_reg[0] & 0x80)
- {
- prg16_89ab((m_reg[0] & 0xf0) | (m_reg[1] & 0x10));
- prg16_cdef((m_reg[0] & 0xf0) | (m_reg[1] & 0x10));
- }
- else
- {
- // here standard MMC3 bankswitch
- uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
+ if (m_reg[0] & 0x80)
+ {
+ prg16_89ab((m_reg[0] & 0xf0) | (m_reg[1] & 0x10));
+ prg16_cdef((m_reg[0] & 0xf0) | (m_reg[1] & 0x10));
+ }
+ else
+ {
+ // here standard MMC3 bankswitch
+ uint8_t prg_flip = (m_latch & 0x40) ? 2 : 0;
- prg_cb(0, prg_base | (m_mmc_prg_bank[0 ^ prg_flip] & prg_mask));
- prg_cb(1, prg_base | (m_mmc_prg_bank[1] & prg_mask));
- prg_cb(2, prg_base | (m_mmc_prg_bank[2 ^ prg_flip] & prg_mask));
- prg_cb(3, prg_base | (m_mmc_prg_bank[3] & prg_mask));
- }
+ prg_cb(0, prg_base | (m_mmc_prg_bank[0 ^ prg_flip] & prg_mask));
+ prg_cb(1, prg_base | (m_mmc_prg_bank[1] & prg_mask));
+ prg_cb(2, prg_base | (m_mmc_prg_bank[2 ^ prg_flip] & prg_mask));
+ prg_cb(3, prg_base | (m_mmc_prg_bank[3] & prg_mask));
+ }
}
void nes_sgboog_device::write_l(offs_t offset, uint8_t data)
{
- LOG_MMC(("sgboog write_l, offset: %04x, data: %02x\n", offset, data));
- offset += 0x100;
-
- if (offset == 0x1000)
- {
- m_reg[0] = data;
- set_prg(m_prg_base, m_prg_mask);
- }
- else if (offset == 0x1001)
- {
- m_reg[1] = data;
- set_chr(m_chr_source, m_chr_base, m_chr_mask);
- }
- else if (offset == 0x1007)
- {
- m_latch = 0;
- m_mode = data;
- set_prg(m_prg_base, m_prg_mask);
- set_chr(m_chr_source, m_chr_base, m_chr_mask);
- }
+ LOG_MMC(("sgboog write_l, offset: %04x, data: %02x\n", offset, data));
+ offset += 0x100;
+
+ if (offset == 0x1000)
+ {
+ m_reg[0] = data;
+ set_prg(m_prg_base, m_prg_mask);
+ }
+ else if (offset == 0x1001)
+ {
+ m_reg[1] = data;
+ set_chr(m_chr_source, m_chr_base, m_chr_mask);
+ }
+ else if (offset == 0x1007)
+ {
+ m_latch = 0;
+ m_mode = data;
+ set_prg(m_prg_base, m_prg_mask);
+ set_chr(m_chr_source, m_chr_base, m_chr_mask);
+ }
}
void nes_sgboog_device::write_m(offs_t offset, uint8_t data)
{
- LOG_MMC(("sgboog write_m, offset: %04x, data: %02x\n", offset, data));
-
- if (offset == 0x0000)
- {
- m_reg[0] = data;
- set_prg(m_prg_base, m_prg_mask);
- }
- else if (offset == 0x0001)
- {
- m_reg[1] = data;
- set_chr(m_chr_source, m_chr_base, m_chr_mask);
- }
- else if (offset == 0x0007)
- {
- m_latch = 0;
- m_mode = data;
- set_prg(m_prg_base, m_prg_mask);
- set_chr(m_chr_source, m_chr_base, m_chr_mask);
- }
+ LOG_MMC(("sgboog write_m, offset: %04x, data: %02x\n", offset, data));
+
+ if (offset == 0x0000)
+ {
+ m_reg[0] = data;
+ set_prg(m_prg_base, m_prg_mask);
+ }
+ else if (offset == 0x0001)
+ {
+ m_reg[1] = data;
+ set_chr(m_chr_source, m_chr_base, m_chr_mask);
+ }
+ else if (offset == 0x0007)
+ {
+ m_latch = 0;
+ m_mode = data;
+ set_prg(m_prg_base, m_prg_mask);
+ set_chr(m_chr_source, m_chr_base, m_chr_mask);
+ }
}
void nes_sgboog_device::write_h(offs_t offset, uint8_t data)
{
- static const uint8_t conv_table[8] = {0,2,5,3,6,1,7,4};
- LOG_MMC(("sgboog write_h, offset: %04x, data: %02x\n", offset, data));
-
- if (m_mode)
- {
- switch (offset & 0x6001)
- {
- case 0x0000:
- break;
-
- case 0x0001:
- if (m_reg[2] && ((m_reg[0] & 0x80) == 0 || (m_latch & 0x07) < 6)) // if we use the prg16 banks and cmd=6,7 DON'T enter!
- {
- m_reg[2] = 0;
- txrom_write(0x0001, data);
- }
- break;
-
- case 0x2000:
- data = (data & 0xc0) | conv_table[data & 0x07];
- m_reg[2] = 1;
- txrom_write(0x0000, data);
- break;
-
- case 0x4000:
- set_nt_mirroring(((data >> 7) | data) & 0x01 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
- break;
-
- case 0x4001:
- txrom_write(0x6001, data);
- break;
-
- case 0x6001:
- txrom_write(0x4000, data);
- txrom_write(0x4001, data);
- break;
-
- default:
- txrom_write(offset, data);
- break;
- }
- }
- else
- txrom_write(offset, data);
+ static const uint8_t conv_table[8] = {0,2,5,3,6,1,7,4};
+ LOG_MMC(("sgboog write_h, offset: %04x, data: %02x\n", offset, data));
+
+ if (m_mode)
+ {
+ switch (offset & 0x6001)
+ {
+ case 0x0000:
+ break;
+
+ case 0x0001:
+ if (m_reg[2] && ((m_reg[0] & 0x80) == 0 || (m_latch & 0x07) < 6)) // if we use the prg16 banks and cmd=6,7 DON'T enter!
+ {
+ m_reg[2] = 0;
+ txrom_write(0x0001, data);
+ }
+ break;
+
+ case 0x2000:
+ data = (data & 0xc0) | conv_table[data & 0x07];
+ m_reg[2] = 1;
+ txrom_write(0x0000, data);
+ break;
+
+ case 0x4000:
+ set_nt_mirroring(((data >> 7) | data) & 0x01 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
+ break;
+
+ case 0x4001:
+ txrom_write(0x6001, data);
+ break;
+
+ case 0x6001:
+ txrom_write(0x4000, data);
+ txrom_write(0x4001, data);
+ break;
+
+ default:
+ txrom_write(offset, data);
+ break;
+ }
+ }
+ else
+ txrom_write(offset, data);
}
*/
diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h
index 662262a4313..30989bd6559 100644
--- a/src/devices/bus/nes/mmc3_clones.h
+++ b/src/devices/bus/nes/mmc3_clones.h
@@ -166,25 +166,25 @@ public:
class nes_sgboog_device : public nes_txrom_device
{
public:
- // construction/destruction
- nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // construction/destruction
+ nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual void write_l(offs_t offset, uint8_t data) override;
- virtual void write_m(offs_t offset, uint8_t data) override;
- virtual void write_h(offs_t offset, uint8_t data) override;
- virtual void prg_cb(int start, int bank) override;
- virtual void chr_cb(int start, int bank, int source) override;
+ virtual void write_l(offs_t offset, uint8_t data) override;
+ virtual void write_m(offs_t offset, uint8_t data) override;
+ virtual void write_h(offs_t offset, uint8_t data) override;
+ virtual void prg_cb(int start, int bank) override;
+ virtual void chr_cb(int start, int bank, int source) override;
- virtual void pcb_reset() override;
+ virtual void pcb_reset() override;
protected:
- // device-level overrides
- virtual void device_start() override;
+ // device-level overrides
+ virtual void device_start() override;
private:
- virtual void set_prg(int prg_base, int prg_mask) override;
- uint8_t m_reg[3];
- uint8_t m_mode;
+ virtual void set_prg(int prg_base, int prg_mask) override;
+ uint8_t m_reg[3];
+ uint8_t m_mode;
};
*/
diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp
index c0771641b1b..ac9452893e0 100644
--- a/src/devices/bus/nes/multigame.cpp
+++ b/src/devices/bus/nes/multigame.cpp
@@ -418,7 +418,7 @@ nes_bmc_lc160_device::nes_bmc_lc160_device(const machine_config &mconfig, const
}
nes_vram_protect_device::nes_vram_protect_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
- : nes_nrom_device(mconfig, type, tag, owner, clock), m_vram_protect(false)
+ : nes_nrom_device(mconfig, type, tag, owner, clock), m_vram_protect(false)
{
}
diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h
index 63728ea60dc..74342513ff6 100644
--- a/src/devices/bus/nes/multigame.h
+++ b/src/devices/bus/nes/multigame.h
@@ -893,7 +893,7 @@ public:
virtual void write_l(offs_t offset, u8 data) override;
virtual void write_h(offs_t offset, u8 data) override;
-// virtual void pcb_reset() override;
+// virtual void pcb_reset() override;
protected:
// device-level overrides
diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h
index c18e4153b22..7aca5e27fad 100644
--- a/src/devices/bus/nes/nes_slot.h
+++ b/src/devices/bus/nes/nes_slot.h
@@ -115,13 +115,13 @@ enum
// Bootleg boards
BTL_0353, BTL_09034A, BTL_AISENSHINICOL, BTL_BATMANFS,
BTL_CONTRAJ, BTL_DRAGONNINJA, BTL_MARIOBABY, BTL_PALTHENA,
- BTL_PIKACHUY2K, BTL_SBROS11, BTL_SMB2JA, BTL_SMB2JB,
+ BTL_PIKACHUY2K, BTL_SBROS11, BTL_SMB2JA, BTL_SMB2JB,
BTL_SMB3, BTL_SHUIGUAN, BTL_TOBIDASE, BTL_YUNG08,
// Kaiser
KAISER_KS106C, KAISER_KS202, KAISER_KS7010, KAISER_KS7012,
- KAISER_KS7013B, KAISER_KS7016, KAISER_KS7016B, KAISER_KS7017,
- KAISER_KS7021A, KAISER_KS7022, KAISER_KS7030, KAISER_KS7031,
- KAISER_KS7032, KAISER_KS7037, KAISER_KS7057, KAISER_KS7058,
+ KAISER_KS7013B, KAISER_KS7016, KAISER_KS7016B, KAISER_KS7017,
+ KAISER_KS7021A, KAISER_KS7022, KAISER_KS7030, KAISER_KS7031,
+ KAISER_KS7032, KAISER_KS7037, KAISER_KS7057, KAISER_KS7058,
// Whirlwind Manu
UNL_DH08, UNL_LE05, UNL_LG25, UNL_LH10, UNL_LH28_LH54,
UNL_LH31, UNL_LH32, UNL_LH51, UNL_LH53,
diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp
index f30dd2529b2..816ca04ffd1 100644
--- a/src/devices/bus/nes/sachen.cpp
+++ b/src/devices/bus/nes/sachen.cpp
@@ -503,7 +503,7 @@ uint8_t nes_sachen_tcu02_device::read_l(offs_t offset)
u8 nes_sachen_3013_device::read_h(offs_t offset)
{
- return (offset < 0x4000) ? 0x3a : hi_access_rom(offset);
+ return (offset < 0x4000) ? 0x3a : hi_access_rom(offset);
}
/*-------------------------------------------------
diff --git a/src/devices/cpu/f2mc16/f2mc16.cpp b/src/devices/cpu/f2mc16/f2mc16.cpp
index a55193b5737..e9ff60a04c8 100644
--- a/src/devices/cpu/f2mc16/f2mc16.cpp
+++ b/src/devices/cpu/f2mc16/f2mc16.cpp
@@ -2840,7 +2840,7 @@ void f2mc16_device::opcodes_ea73(u8 operand)
case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
m_tmp8 = read_8((m_pcb<<16) | (m_pc+2));
m_tmp16 = read_rwX(operand & 7) + (s8)m_tmp8;
- m_tmpea = getRWbank(operand & 7, m_tmp16);
+ m_tmpea = getRWbank(operand & 7, m_tmp16);
m_tmp16 = doDEC_16(read_16(m_tmpea));
write_16(m_tmpea, m_tmp16);
m_pc += 3;
diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp
index 5fac263418f..ec924250d6d 100644
--- a/src/devices/cpu/rsp/rsp.cpp
+++ b/src/devices/cpu/rsp/rsp.cpp
@@ -64,10 +64,10 @@ DEFINE_DEVICE_TYPE(RSP, rsp_device, "rsp", "Nintendo & SGI Reality Signal Proces
#define ZERO 3
#define CLIP2 4
-#define SLICE_H 3
-#define SLICE_M 2
-#define SLICE_L 1
-#define SLICE_LL 0
+#define SLICE_H 3
+#define SLICE_M 2
+#define SLICE_L 1
+#define SLICE_LL 0
#define WRITEBACK_RESULT() memcpy(m_v[VDREG].s, vres, sizeof(uint16_t) * 8);
@@ -2802,25 +2802,25 @@ void rsp_device::update_scalar_op_deduction()
{
/*if (m_paired_busy)
{
- m_scalar_busy = false;
- m_vector_busy = false;
- m_paired_busy = false;
- m_ideduct = 1;
+ m_scalar_busy = false;
+ m_vector_busy = false;
+ m_paired_busy = false;
+ m_ideduct = 1;
}
else if (m_vector_busy)
{
- m_scalar_busy = true;
- m_paired_busy = true;
- m_ideduct = 0;
+ m_scalar_busy = true;
+ m_paired_busy = true;
+ m_ideduct = 0;
}
else if (m_scalar_busy)
{
- m_ideduct = 1;
+ m_ideduct = 1;
}
else
{
- m_scalar_busy = true;
- m_ideduct = 0;
+ m_scalar_busy = true;
+ m_ideduct = 0;
}*/
}
@@ -2828,25 +2828,25 @@ void rsp_device::update_vector_op_deduction()
{
/*if (m_paired_busy)
{
- m_scalar_busy = false;
- m_vector_busy = false;
- m_paired_busy = false;
- m_ideduct = 1;
+ m_scalar_busy = false;
+ m_vector_busy = false;
+ m_paired_busy = false;
+ m_ideduct = 1;
}
else if (m_scalar_busy)
{
- m_vector_busy = true;
- m_paired_busy = true;
- m_ideduct = 0;
+ m_vector_busy = true;
+ m_paired_busy = true;
+ m_ideduct = 0;
}
else if (m_vector_busy)
{
- m_ideduct = 1;
+ m_ideduct = 1;
}
else
{
- m_vector_busy = true;
- m_ideduct = 0;
+ m_vector_busy = true;
+ m_ideduct = 0;
}*/
}
diff --git a/src/mame/audio/wiping.cpp b/src/mame/audio/wiping.cpp
index 1a9d487410e..e16ea5c95e8 100644
--- a/src/mame/audio/wiping.cpp
+++ b/src/mame/audio/wiping.cpp
@@ -4,13 +4,13 @@
Wiping sound driver
- Nichibutsu / Woodplace Inc. custom part?
-
+ Nichibutsu / Woodplace Inc. custom part?
+
used by wiping.cpp and clshroad.cpp
- TODO:
- - Identify actual part, sound device was originally based off
- Namco customs (on which involvement seems pretty thin here);
+ TODO:
+ - Identify actual part, sound device was originally based off
+ Namco customs (on which involvement seems pretty thin here);
***************************************************************************/
diff --git a/src/mame/drivers/apxen.cpp b/src/mame/drivers/apxen.cpp
index 7b963e5ab3d..e39bc568dbd 100644
--- a/src/mame/drivers/apxen.cpp
+++ b/src/mame/drivers/apxen.cpp
@@ -13,15 +13,15 @@
- XEN WS (1 MB RAM, no drives)
TODO:
- - Boot ROM disable, wrap around mode
+ - Boot ROM disable, wrap around mode
- Floppy
- - DMA
- - Harddisk
- - Keyboard
- - RS232
- - Printer
- - Colour graphics board
- - Make xen_daisy_device generic?
+ - DMA
+ - Harddisk
+ - Keyboard
+ - RS232
+ - Printer
+ - Colour graphics board
+ - Make xen_daisy_device generic?
Notes:
- Two graphics cards: Mono and colour boards
@@ -260,15 +260,15 @@ uint16_t apxen_state::mem_r(offs_t offset, uint16_t mem_mask)
// pc/xi compatible mode vram
if ((offset << 1) < 0x10000 && !m_apvid)
m_video->mem_r(offset & (0xffff >> 1), data, mem_mask);
-
+
// pc/xi video pointer mirror
else if ((offset << 1) >= 0xf0000 && (offset << 1) <= 0xf0fff && !m_apvid)
m_video->mem_r((offset & (0xffff >> 1)) | (0x0e000 >> 1), data, mem_mask);
-
+
// xen mode vram
else if ((offset << 1) >= 0xe0000 && (offset << 1) <= 0xeffff && m_apvid)
m_video->mem_r(offset & (0xffff >> 1), data, mem_mask);
-
+
// normal access
else
data &= m_mem->read16(offset, mem_mask);
@@ -281,15 +281,15 @@ void apxen_state::mem_w(offs_t offset, uint16_t data, uint16_t mem_mask)
// pc/xi compatible mode vram
if ((offset << 1) < 0x10000 && !m_apvid)
m_video->mem_w(offset & (0xffff >> 1), data, mem_mask);
-
+
// pc/xi video pointer mirror
else if ((offset << 1) >= 0xf0000 && (offset << 1) <= 0xf0fff && !m_apvid)
m_video->mem_w((offset & (0xffff >> 1)) | (0x0e000 >> 1), data, mem_mask);
-
+
// xen mode vram
else if ((offset << 1) >= 0xe0000 && (offset << 1) <= 0xeffff && m_apvid)
m_video->mem_w(offset & (0xffff >> 1), data, mem_mask);
-
+
// normal access
else
m_mem->write16(offset, data, mem_mask);
@@ -382,7 +382,7 @@ void apxen_state::cpu_control_w(uint8_t data)
void apxen_state::cpu_reset_w(uint8_t data)
{
logerror("cpu_reset_w: %02x\n", data);
-
+
// data written doesn't matter
m_maincpu->reset();
}
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index 596fca585df..75cb73b6845 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -20,12 +20,12 @@ TODO:
- clshroad: erratic gameplay/sound speed.
Being pretty logical that CPUs runs at master clock / 6 then we also need to
halve the vblank irq rate so that opponents won't pop up in the middle of the
- screen. Main CPU would also overrun the sound CPU way too much otherwise.
+ screen. Main CPU would also overrun the sound CPU way too much otherwise.
We also need to hand tune the sound frequencies compared to the other games
so that it won't cut off BGMs abruptly during playback.
TL;DR needs verification of all clocks with a PCB;
- firebatl: video (https://tmblr.co/ZgJvzv2E2C_z-) shows transparency for the
- text layer is not correctly emulated, fixed by initializing VRAM to 0xf0?
+ text layer is not correctly emulated, fixed by initializing VRAM to 0xf0?
(that layer seems unused by this game);
- firebatl: bad sprite colors, most notably player ship (should be way darker);
- firebatl: remove ROM patch;
@@ -35,7 +35,7 @@ TODO:
- $6100 is actually OR-ed with the coinage work RAM buffer setting at $8022;
- $6124 is shifted right once at PC=0x5df and stored to $82e6, which is later
checked at PC=0x187 and must be $01 otherwise game goes into an infinite
- loop after dying (without ROM patch);
+ loop after dying (without ROM patch);
- (more ...)
*******************************************************************************/
diff --git a/src/mame/drivers/gfamily.cpp b/src/mame/drivers/gfamily.cpp
index 82bbf562818..5b04a611696 100644
--- a/src/mame/drivers/gfamily.cpp
+++ b/src/mame/drivers/gfamily.cpp
@@ -106,7 +106,7 @@ ROM_START( gmfamily )
ROMX_LOAD("686_amibios_ay36_8897.bin", 0x00000, 0x80000, CRC(e04c5750) SHA1(240ca6b270bdebf129e4ce43e79275aa067b6ada), ROM_BIOS(0))
/* CPU: Pentium 4 2.40GHz/512/533 SL6DV
- RAM: 512MB
+ RAM: 512MB
PCB: ECS (Elitegroup) 651-M v2.4. Seems like a later low-cost version of the consumer v2.0 motherboard. */
ROM_SYSTEM_BIOS(1, "sy_sis651", "05/13/2005-SiS-651-6A6IXE19C-00")
ROMX_LOAD("award_i6a6ixe19.bin", 0x00000, 0x40000, CRC(95fa392c) SHA1(40f557339649c47e6c3d941670604e0559edf8db), ROM_BIOS(1)) // Winbond W49F002UP12N
diff --git a/src/mame/drivers/miniguay.cpp b/src/mame/drivers/miniguay.cpp
index 7750fde70ba..065d36d9f99 100644
--- a/src/mame/drivers/miniguay.cpp
+++ b/src/mame/drivers/miniguay.cpp
@@ -61,7 +61,7 @@
The dumped version (Mini Guay VD) uses plastic displays with light bulbs, but there's a different
one (undumped) called "Mini Guay VR" (VR stands for "Version Rodillos") or just "Mini Guay" with
- reels instead, with an additional PCB for reels control (8031 + 2764 EPROM).
+ reels instead, with an additional PCB for reels control (8031 + 2764 EPROM).
*/
#include "emu.h"
diff --git a/src/mame/drivers/missbamby.cpp b/src/mame/drivers/missbamby.cpp
index a7a7a73ab44..46d72f2c5b8 100644
--- a/src/mame/drivers/missbamby.cpp
+++ b/src/mame/drivers/missbamby.cpp
@@ -146,7 +146,7 @@ void missbamby_state::igoabasket(machine_config &config)
missbamby(config);
// Two 8155 on the Basket PCB
- I8155(config, "i8155b", 6_MHz_XTAL/2); // NEC D8155HC, guessed divisor
+ I8155(config, "i8155b", 6_MHz_XTAL/2); // NEC D8155HC, guessed divisor
}
@@ -284,7 +284,7 @@ ROM_END
| |_____________| |_________________| __|
| _____________ _________________ __|
| | EMPTY | | NEC D8155HC | __|
- | |_____________| |_________________| __|
+ | |_____________| |_________________| __|
| _____________ _______ _________ ________ __|
| | EPROM | |DM7417N SN74LS373N |ULN2003R| __|
| |_____________| _________________ ________ __|
diff --git a/src/mame/drivers/pwp14.cpp b/src/mame/drivers/pwp14.cpp
index 13001c9c1be..b3e299ce59b 100644
--- a/src/mame/drivers/pwp14.cpp
+++ b/src/mame/drivers/pwp14.cpp
@@ -7,17 +7,17 @@
08/08/2021 Skeleton driver.
- https://twitter.com/FozzTexx/status/1424043157264617478
+ https://twitter.com/FozzTexx/status/1424043157264617478
- XTAL : 7.938 MHz
+ XTAL : 7.938 MHz
14.364 MHz
- 6.000 MHz
-
- FDC - WD2793A
- 2 * AM9128 (2048x8 SRAM)
- NEC D4364 (8192x8 SRAM)
- 2 * MT4067-12 (64Kx4 DRAM)
- CRT5037 - SMC 8621
+ 6.000 MHz
+
+ FDC - WD2793A
+ 2 * AM9128 (2048x8 SRAM)
+ NEC D4364 (8192x8 SRAM)
+ 2 * MT4067-12 (64Kx4 DRAM)
+ CRT5037 - SMC 8621
****************************************************************************/
@@ -57,7 +57,7 @@ private:
virtual void machine_reset() override;
virtual void machine_start() override;
uint32_t screen_update_pwp14(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
+
void pwp14_io(address_map &map);
void pwp14_mem(address_map &map);
void bankswitch_w(offs_t offset, uint8_t data);
@@ -74,7 +74,7 @@ private:
required_region_ptr<u8> m_rom;
required_device<crt5037_device> m_crtc;
required_device<palette_device> m_palette;
- required_region_ptr<uint8_t> m_chargen;
+ required_region_ptr<uint8_t> m_chargen;
required_device<wd2793_device> m_fdc;
uint8_t m_bank_reg;
};
@@ -183,7 +183,7 @@ uint32_t pwp14_state::screen_update_pwp14(screen_device &screen, bitmap_ind16 &b
uint8_t data = m_chargen[(chr << 3) | ra];
//if (cursor.contains(x * 8, y * 8))
- // data ^= 0xff;
+ // data ^= 0xff;
// draw 8 pixels of the char
for (int i = 0; i < 8; i++)
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index 7aa192b26cc..857bf9399c5 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -275,7 +275,7 @@ uint32_t taitopjc_state::screen_update_taitopjc(screen_device &screen, bitmap_in
m_tilemap[0]->set_scrollx(m_scroll_x);
m_tilemap[0]->set_scrolly(m_scroll_y);
-
+
m_tilemap[0]->draw(screen, bitmap, cliprect, 0);
m_tilemap[1]->draw(screen, bitmap, cliprect, 0);
@@ -311,7 +311,7 @@ void taitopjc_state::videochip_w(offs_t address, uint32_t data)
m_screen_ram[addr] = data;
if (address >= 0x1003f000 && address < 0x1003f800)
- {
+ {
uint32_t a = address - 0x1003f000;
m_tilemap[0]->mark_tile_dirty((a * 2));
m_tilemap[0]->mark_tile_dirty((a * 2) + 1);
@@ -563,7 +563,7 @@ void taitopjc_state::dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask)
void taitopjc_state::ppc603e_mem(address_map &map)
{
- map(0x00000000, 0x003fffff).ram().share(m_main_ram); // Work RAM
+ map(0x00000000, 0x003fffff).ram().share(m_main_ram); // Work RAM
map(0x40000000, 0x4000000f).rw(FUNC(taitopjc_state::video_r), FUNC(taitopjc_state::video_w));
map(0x80000000, 0x80003fff).rw(FUNC(taitopjc_state::dsp_r), FUNC(taitopjc_state::dsp_w));
map(0xc0000000, 0xc0003fff).rw(FUNC(taitopjc_state::ppc_common_r), FUNC(taitopjc_state::ppc_common_w));
@@ -748,7 +748,7 @@ void taitopjc_state::tms_io_map(address_map &map)
map(0x0058, 0x0058).w(m_tc0780fpa, FUNC(tc0780fpa_device::poly_fifo_w));
map(0x005a, 0x005a).w(m_tc0780fpa, FUNC(tc0780fpa_device::tex_w));
map(0x005b, 0x005b).rw(m_tc0780fpa, FUNC(tc0780fpa_device::tex_addr_r), FUNC(tc0780fpa_device::tex_addr_w));
- map(0x005e, 0x005e).noprw(); // ?? 0x0001 written every frame
+ map(0x005e, 0x005e).noprw(); // ?? 0x0001 written every frame
map(0x005f, 0x005f).r(FUNC(taitopjc_state::dsp_rom_r));
}
diff --git a/src/mame/drivers/vsmileb.cpp b/src/mame/drivers/vsmileb.cpp
index a02d265063c..b95684fd770 100644
--- a/src/mame/drivers/vsmileb.cpp
+++ b/src/mame/drivers/vsmileb.cpp
@@ -5,20 +5,20 @@
V-Tech V.Smile Baby console emulation
System is currently marked as not-working due to severe audio issues, as
- narration-related voice clips are all cut off too early in every game.
+ narration-related voice clips are all cut off too early in every game.
- The issue appears to be due to improper handling of the "Fast Rampdown"
- feature in the SPG2xx audio device, but due to the poor quality of SunPlus
- developer documentation, it's unclear as to what part of the implementation
- is wrong.
+ The issue appears to be due to improper handling of the "Fast Rampdown"
+ feature in the SPG2xx audio device, but due to the poor quality of SunPlus
+ developer documentation, it's unclear as to what part of the implementation
+ is wrong.
- If the Fast Rampdown feature is disabled in the audio device entirely,
- voice clips play out without issue.
+ If the Fast Rampdown feature is disabled in the audio device entirely,
+ voice clips play out without issue.
- Although bad audio is not usually a reason for marking a driver as
- non-working, due to the nature of the V.Smile Baby and its target users,
- having properly-narrated voices is critical to the overall experience of
- the system.
+ Although bad audio is not usually a reason for marking a driver as
+ non-working, due to the nature of the V.Smile Baby and its target users,
+ having properly-narrated voices is critical to the overall experience of
+ the system.
*******************************************************************************/
diff --git a/src/mame/includes/gp32.h b/src/mame/includes/gp32.h
index 105567636e0..7f61a27403b 100644
--- a/src/mame/includes/gp32.h
+++ b/src/mame/includes/gp32.h
@@ -106,7 +106,7 @@ public:
m_io_in1(*this, "IN1"),
m_screen(*this, "screen"),
m_palette(*this, "palette")
- {
+ {
std::fill(std::begin(m_s3c240x_lcd_regs), std::end(m_s3c240x_lcd_regs), 0);
std::fill(std::begin(m_s3c240x_uart_0_regs), std::end(m_s3c240x_uart_0_regs), 0);
std::fill(std::begin(m_s3c240x_uart_1_regs), std::end(m_s3c240x_uart_1_regs), 0);
diff --git a/src/mame/machine/apple2common.cpp b/src/mame/machine/apple2common.cpp
index 8d89fc2081d..6ac4845dd00 100644
--- a/src/mame/machine/apple2common.cpp
+++ b/src/mame/machine/apple2common.cpp
@@ -809,7 +809,7 @@ offs_t apple2_common_device::dasm_override_GS(std::ostream &stream, offs_t pc, c
return 10 | util::disasm_interface::SUPPORTED | util::disasm_interface::STEP_OVER;
}
item++;
- }
+ }
}
offs_t rv = com_long_op(stream, pc, opcodes, "jsl");
diff --git a/src/mame/video/n64.cpp b/src/mame/video/n64.cpp
index ea42b9786c9..bf41992555c 100644
--- a/src/mame/video/n64.cpp
+++ b/src/mame/video/n64.cpp
@@ -33,8 +33,8 @@ TODO:
#include <algorithm>
#define LOG_RDP_EXECUTION 0
-#define DEBUG_RDP_PIXEL 0
-#define DRAW_FRAME_COUNTER 0
+#define DEBUG_RDP_PIXEL 0
+#define DRAW_FRAME_COUNTER 0
#if DEBUG_RDP_PIXEL
static bool s_debug_drawing = false;
@@ -2549,16 +2549,16 @@ void n64_rdp::cmd_load_block(uint64_t *cmd_buf)
/*uint16_t tl_masked = tl & 0x3ff;
int32_t load_edge_walker_data[10] = {
- ((cmd_buf[0] >> 32) & 0xff000000) | (0x10 << 19) | (tilenum << 16) | ((tl_masked << 2) | 3),
- (((tl_masked << 2) | 3) << 16) | (tl_masked << 2),
- sh << 16,
- sl << 16,
- sh << 16,
- ((sl << 3) << 16) | (tl << 3),
- (dxt & 0xff) << 8,
- ((0x80 >> wstate->ti_size) << 16) | (dxt >> 8),
- 0x20,
- 0x20
+ ((cmd_buf[0] >> 32) & 0xff000000) | (0x10 << 19) | (tilenum << 16) | ((tl_masked << 2) | 3),
+ (((tl_masked << 2) | 3) << 16) | (tl_masked << 2),
+ sh << 16,
+ sl << 16,
+ sh << 16,
+ ((sl << 3) << 16) | (tl << 3),
+ (dxt & 0xff) << 8,
+ ((0x80 >> wstate->ti_size) << 16) | (dxt >> 8),
+ 0x20,
+ 0x20
};
do_load_edge_walker(load_edge_walker_data);*/
@@ -3016,7 +3016,7 @@ void n64_rdp::cmd_set_combine(uint64_t *cmd_buf)
/*static const char *s_suba_rgb[16] = { "Combined", "TEX0C", "TEX1C", "PRIMC", "SHADEC", "ENVC", "ONE", "NOISE", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO" };
static const char *s_subb_rgb[16] = { "Combined", "TEX0C", "TEX1C", "PRIMC", "SHADEC", "ENVC", "KEYC", "K4", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO" };
static const char *s_mul_rgb[32] = { "Combined", "TEX0C", "TEX1C", "PRIMC", "SHADEC", "ENVC", "KEYS", "CombinedA", "TEX0A", "TEX1A", "PRIMA", "SHADEA", "ENVA", "LODF", "PLODF", "K5",
- "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO" };
+ "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO", "ZERO" };
static const char *s_add_rgb[8] = { "Combined", "TEX0C", "TEX1C", "PRIMC", "SHADEC", "ENVC", "ONE", "ZERO" };
static const char *s_sub_a[16] = { "CombinedA", "TEX0A", "TEX1A", "PRIMA", "SHADEA", "ENVA", "ONE", "ZERO" };
static const char *s_mul_a[16] = { "LODF", "TEX0A", "TEX1A", "PRIMA", "SHADEA", "ENVA", "PLODF", "ZERO" };
diff --git a/src/mame/video/n64types.h b/src/mame/video/n64types.h
index 0f16eec4176..4fd845593f1 100644
--- a/src/mame/video/n64types.h
+++ b/src/mame/video/n64types.h
@@ -306,7 +306,7 @@ struct rdp_span_aux
uint8_t* m_tmem; /* pointer to texture cache for this polygon */
bool m_start_span;
rgbaint_t m_clamp_diff[8];
- combine_modes_t m_combine;
+ combine_modes_t m_combine;
};
struct z_decompress_entry_t
diff --git a/src/mame/video/pc9801.cpp b/src/mame/video/pc9801.cpp
index 11fe98b7d60..2e75f54db96 100644
--- a/src/mame/video/pc9801.cpp
+++ b/src/mame/video/pc9801.cpp
@@ -744,9 +744,9 @@ uint16_t pc9801_state::egc_blit_r(uint32_t offset, uint16_t mem_mask)
//TODO: this needs another look
/*if(m_egc.first && !m_egc.init)
{
- m_egc.leftover[0] = m_egc.leftover[1] = m_egc.leftover[2] = m_egc.leftover[3] = 0;
- if(((m_egc.regs[6] >> 4) & 0xf) >= (m_egc.regs[6] & 0xf)) // check if we have enough bits
- m_egc.init = true;
+ m_egc.leftover[0] = m_egc.leftover[1] = m_egc.leftover[2] = m_egc.leftover[3] = 0;
+ if(((m_egc.regs[6] >> 4) & 0xf) >= (m_egc.regs[6] & 0xf)) // check if we have enough bits
+ m_egc.init = true;
}*/
m_egc.init = true;
for(int i = 0; i < 4; i++)
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
index 8fe382a8d72..8c161792f9d 100644
--- a/src/osd/modules/debugger/debugimgui.cpp
+++ b/src/osd/modules/debugger/debugimgui.cpp
@@ -1109,8 +1109,8 @@ void debug_imgui::draw_mount_dialog(const char* label)
m_filelist_refresh = true;
ImGui::Separator();
- ImVec2 listbox_size;
- listbox_size.x = 0.0f;
+ ImVec2 listbox_size;
+ listbox_size.x = 0.0f;
listbox_size.y = ImGui::GetTextLineHeightWithSpacing() * 15.25f;
if(ImGui::BeginListBox("##filelist",listbox_size))