Skip to content

Commit

Permalink
srcclean and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cuavas committed Dec 21, 2024
1 parent 3336772 commit 780490d
Show file tree
Hide file tree
Showing 29 changed files with 93 additions and 93 deletions.
12 changes: 6 additions & 6 deletions hash/cassvisn_cart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Note on PRG size (from CPU documentation)
Physically, 128 * 15 * 12 = 23,040 bits
Logically, 127 * 15 * 12 = 22,860 bits (as final word of each page is inaccessible by the CPU)
the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 15 * (12+4)
the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 15 * (12+4)
-->

<softwarelist name="cassvisn_cart" description="Epoch Cassette Vision cartridges">
Expand All @@ -43,7 +43,7 @@ the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 1
<part name="cart" interface="cassvisn_cart">
<dataarea name="prg" width="16" endianness="big" size="0xf00">
<rom name="d777c005prog.s01" size="0xf00" crc="f917d2f0" sha1="b26baf2fd9b961b5a0e0475dfac93c18bd54cc4d"/>
</dataarea>
</dataarea>
<dataarea name="pat" size="0x4d0">
<rom name="d777c005_pat.s01" size="0x4d0" crc="bf085553" sha1="321262b6dd67789e03db8f03160cb1819529f43c"/>
</dataarea>
Expand All @@ -65,7 +65,7 @@ the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 1
</dataarea>
</part>
</software>

<!-- PCB is silkscreened 006, ROM here is 007 is there an undumped earlier version? -->
<software name="galaxian" supported="no">
<description>Galaxian</description>
Expand All @@ -76,7 +76,7 @@ the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 1
<part name="cart" interface="cassvisn_cart">
<dataarea name="prg" width="16" endianness="big" size="0xf00">
<rom name="d777c007prog.s01" size="0xf00" crc="538c13d3" sha1="537287e63b311caa281d8c6456f9cbe2eaebb9e7"/>
</dataarea>
</dataarea>
<dataarea name="pat" size="0x4d0">
<rom name="d777c007_pat.s01" size="0x4d0" crc="d343eca4" sha1="e8f0312de0d7f0934a66192c1aaa2c802532b021"/>
</dataarea>
Expand All @@ -92,7 +92,7 @@ the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 1
<part name="cart" interface="cassvisn_cart">
<dataarea name="prg" width="16" endianness="big" size="0xf00">
<rom name="d777c004prog.s01" size="0xf00" crc="030fc0d2" sha1="b1efe8ff1bc51082502253e63721e656ee75edda"/>
</dataarea>
</dataarea>
<dataarea name="pat" size="0x4d0">
<rom name="d777c004_pat.s01" size="0x4d0" crc="7df5eb39" sha1="c59f6febf5f51eebc0cc8d288df6b5319510ecbf"/>
</dataarea>
Expand Down Expand Up @@ -211,5 +211,5 @@ the ROM files below store 12 bit in a 16-bit word with 4 bits unused, so 128 * 1
</dataarea>
</part>
</software>

</softwarelist>
2 changes: 1 addition & 1 deletion hash/megadriv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3019,7 +3019,7 @@ Crashes after EA logo, requires better [VDP] irq handling


<!-- Another, 1.12, version is known to have existed between this and the final version
See: https://www.youtube.com/watch?v=_1uGkfw5ky8 -->
See: https://www.youtube.com/watch?v=_1uGkfw5ky8 -->
<software name="felixjrv10" cloneof="felixjr">
<description>Fix-it Felix Jr. (v1.0)</description>
<year>2013</year>
Expand Down
2 changes: 1 addition & 1 deletion hash/spectrum_cass.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72378,7 +72378,7 @@ Side B - Game 1: The Dragonstar Trilogy Part III (Delta 4 Software)
</dataarea>
</part>
</software>

<software name="editmano">
<description>Éditeur de Manoir</description>
<year>2012</year>
Expand Down
4 changes: 2 additions & 2 deletions src/devices/bus/rs232/teletex800.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class teletex_800_device : public device_t, public device_rs232_port_interface
m_all_led.resolve();
m_time_led.resolve();
m_date_led.resolve();
m_year_led.resolve();
m_year_led.resolve();
m_rx_digits.resolve();
m_tx_digits.resolve();
}
Expand Down Expand Up @@ -129,7 +129,7 @@ class teletex_800_device : public device_t, public device_rs232_port_interface
{
}

constexpr static const z80_daisy_config z80_daisy_chain[] =
constexpr static const z80_daisy_config z80_daisy_chain[] =
{
{ nullptr }
};
Expand Down
2 changes: 1 addition & 1 deletion src/devices/bus/sg1000_exp/sk1100.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static INPUT_PORTS_START( sk1100_keys )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(u8"\u2193") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) // U+2193 = ↓
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(u8"] \u30E0 } \u300d LIST") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']', 0x30e0) PORT_CHAR('}', 0x300d) // ム 」
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(u8"[ \u309C { \u300c THEN") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[', 0x309c) PORT_CHAR('{', 0x300c) // ゜ 「
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(u8"[ \u309C { \u300c THEN") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[', 0x309c) PORT_CHAR('{', 0x300c) // ゜ 「

PORT_START("PA5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(u8"6 \u30AA & COLOR") PORT_CODE(KEYCODE_6) PORT_CHAR('6', 0x30aa) PORT_CHAR('&', 0x30a9) // オ ォ
Expand Down
14 changes: 7 additions & 7 deletions src/devices/cpu/upd777/upd777.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void upd777_cpu_device::internal_data_map(address_map &map)
// 00 yyyyyyp (y = ypos, p = PRIO)
// 01 xxxxxxx (x = xpos)
// 02 ttttttt (t = pattern)
// 03 YYYRGBS (Y = , RGB = color, S=ySUB)
// 03 YYYRGBS (Y = , RGB = color, S=ySUB)

map(0x00, 0x7f).ram().share("datamem");
}
Expand Down Expand Up @@ -254,7 +254,7 @@ inline void upd777_cpu_device::set_frs(u8 frs) { m_frs = frs & 0x7f; }
inline void upd777_cpu_device::set_fls(u8 fls) { m_fls = fls & 0x7f; }

// MODE is a 7-bit register with the following format
// 6543210
// 6543210
// rbhpRGB (r = reverberate sound effect, b = brightness, h = hue, p = black/prio, RGB = color)
inline void upd777_cpu_device::set_mode(u8 mode) { m_mode = mode & 0x7f; }

Expand Down Expand Up @@ -517,7 +517,7 @@ void upd777_cpu_device::do_op()
{
if (!non)
{
if ((srcreg1 & srcreg2) == 0) // skip if (x·y) makes zero, N->L[2:1]
if ((srcreg1 & srcreg2) == 0) // skip if (x·y) makes zero, N->L[2:1]
m_skip = 1;
}
else
Expand Down Expand Up @@ -569,7 +569,7 @@ void upd777_cpu_device::do_op()
}
else if ((inst & 0b1111'1010'0000) == 0b0011'0010'0000)
{
// 0b0011'0r1R'oonn (where r = reg1, R = reg2, o = optype, and n = next l value)
// 0b0011'0r1R'oonn (where r = reg1, R = reg2, o = optype, and n = next l value)
// 320 AND A1[7:1] and A1[7:1], store to A1[7:1], N->L[2:1]
// 324 Add A1[7:1] and A1[7:1], store to A1[7:1], N->L[2:1]
// 328 OR A1[7:1] and A1[7:1], store to A1[7:1], N->L[2:1]
Expand Down Expand Up @@ -606,7 +606,7 @@ void upd777_cpu_device::do_op()
src1 = src1 + src2;
// not in this case?
//if (src1 & 0x80)
// m_skip = 1;
// m_skip = 1;
break;
}
case 2: // OR
Expand Down Expand Up @@ -719,7 +719,7 @@ void upd777_cpu_device::do_op()
}
else if ((inst & 0b1111'1100'0010) == 0b0100'0100'0000)
{
// 0b0100'01dg'ks0n (where d = DISP, G = GPE, K = KIE, S = SME, n = A11)
// 0b0100'01dg'ks0n (where d = DISP, G = GPE, K = KIE, S = SME, n = A11)
// 440 Set D to DISP, G to GPE, K to KIE, S to SME, N->A[11]
const int d = (inst >> 5) & 0x1;
const int g = (inst >> 4) & 0x1;
Expand Down Expand Up @@ -1172,7 +1172,7 @@ uint32_t upd777_cpu_device::screen_update(screen_device &screen, bitmap_ind16 &b
// 0x68-0x6f are 'Y Repeat' (7x7)
// 0x70-0x77 are 'XY Repeat' (8x7)
// 0x78-0x7f are 'X Repeat' (8x7)
//
//
// NOTE, sprite patterns *7 and *f are unused so documentation expresses these ranges as to 66, 6e etc. rather than 67 6f
//
// it isn't clear how the 'Bent' effect etc. is enabled, as clearly not all patterns in this range should use it?
Expand Down
4 changes: 2 additions & 2 deletions src/devices/cpu/upd777/upd777dasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ offs_t upd777_disassembler::disassemble(std::ostream &stream, offs_t pc, const u
else if (((inst & 0b1111'0000'0000) == 0b0010'0000'0000) && ((inst & 0b0000'0000'1100) != 0b0000'0000'0100))
{
// 0b0010'rrnR'oonn where rr = reg1 (A1, A2, M or H), n = invert condition, R = reg2 (A1 or A2) and oo = optype (only 0,2,3 are valid, no cases here for 1) nn = next l value
//
//
// optype · (AND)
// 200 Skip if (A1[7:1]·A1[7:1]) makes zero, N->L[2:1]
// 220 Skip if (A1[7:1]·A1[7:1]) makes non zero, N->L[2:1]
Expand Down Expand Up @@ -499,6 +499,6 @@ offs_t upd777_disassembler::disassemble(std::ostream &stream, offs_t pc, const u
{
util::stream_format(stream, "%04x <ILLEGAL>", inst);
}

return 1;
}
2 changes: 1 addition & 1 deletion src/devices/video/pc_vga_cirrus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@ uint8_t cirrus_gd5428_vga_device::mem_r(offs_t offset)

// FIXME: workaround crash behaviour in picasso2
// it will otherwise provide an offset of 0x1fxxxx in the gc_locked below
// causing a crash during adapter init
// causing a crash during adapter init
if(svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb24_en)
{
return svga_device::mem_linear_r((offset & 0xffff) + bank * 0x10000);
Expand Down
34 changes: 17 additions & 17 deletions src/emu/layout/teletex800.lay
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ license:CC0-1.0

<element name="button">
<rect>
<color red="0.25" green="0.25" blue="0.25" />
<color red="0.25" green="0.25" blue="0.25" />
</rect>
</element>

<element name="red_led" defstate="0">
<element name="red_led" defstate="0">
<disk state="0">
<color red="0.20" green="0.0" blue="0.0" />
</disk>
<disk state="1">
<color red="0.75" green="0.0" blue="0.0" />
</disk>
</element>
<element name="green_led" defstate="0">

<element name="green_led" defstate="0">
<disk state="0">
<color red="0.0" green="0.20" blue="0.0" />
</disk>
Expand All @@ -38,38 +38,38 @@ license:CC0-1.0
</element>

<element name="time_led" defstate="0">
<text state="0" string="TID">
<text state="0" string="TID">
<color red="0.0" green="0.20" blue="0.0" />
</text>
<text state="1" string="TID">
<text state="1" string="TID">
<color red="0.0" green="0.75" blue="0.0" />
</text>
</element>

<element name="date_led" defstate="0">
<text state="0" string="DAT">
<text state="0" string="DAT">
<color red="0.0" green="0.20" blue="0.0" />
</text>
<text state="1" string="DAT">
<text state="1" string="DAT">
<color red="0.0" green="0.75" blue="0.0" />
</text>
</element>

<element name="year_led" defstate="0">
<text state="0" string="ÅR">
<text state="0" string="ÅR">
<color red="0.0" green="0.20" blue="0.0" />
</text>
<text state="1" string="ÅR">
<text state="1" string="ÅR">
<color red="0.0" green="0.75" blue="0.0" />
</text>
</element>

<view name="Front panel">
<bounds x="0" y="0" width="810" height="473" />
<bounds x="0" y="0" width="810" height="473" />

<element ref="panel">
<bounds x="0" y="0" width="810" height="473" />
</element>
<element ref="panel">
<bounds x="0" y="0" width="810" height="473" />
</element>

<!-- BATTERI DRIFT -->
<element name="bat_led" ref="red_led">
Expand Down Expand Up @@ -151,17 +151,17 @@ license:CC0-1.0

<!-- SKRIV -->
<element ref="button" inputtag="BTN" inputmask="0x01">
<bounds x="275" y="262" width="54" height="54" />
<bounds x="275" y="262" width="54" height="54" />
</element>

<!-- ALLA -->
<element ref="button" inputtag="BTN" inputmask="0x02">
<bounds x="556" y="261" width="54" height="54" />
<bounds x="556" y="261" width="54" height="54" />
</element>

<!-- KLOCK -->
<element ref="button" inputtag="BTN" inputmask="0x04">
<bounds x="648" y="263" width="54" height="54" />
<bounds x="648" y="263" width="54" height="54" />
</element>
</view>
</mamelayout>
12 changes: 6 additions & 6 deletions src/frontend/mame/luaengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1467,12 +1467,12 @@ void lua_engine::initialize()
{
switch (m.phase())
{
case machine_phase::PREINIT: return "preinit";
case machine_phase::INIT: return "init";
case machine_phase::RESET: return "reset";
case machine_phase::RUNNING: return "running";
case machine_phase::EXIT: return "exit";
default: return "";
case machine_phase::PREINIT: return "preinit";
case machine_phase::INIT: return "init";
case machine_phase::RESET: return "reset";
case machine_phase::RUNNING: return "running";
case machine_phase::EXIT: return "exit";
default: return "";
}
});

Expand Down
6 changes: 3 additions & 3 deletions src/mame/amiga/amiga_v.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ void amiga_state::render_scanline(bitmap_rgb32 &bitmap, int scanline)
for (int x = 0; x < (amiga_state::SCREEN_WIDTH / 2) + 10; x++)
{
int sprpix;
const bool out_of_beam = x >= amiga_state::SCREEN_WIDTH / 2;
const bool out_of_beam = x >= amiga_state::SCREEN_WIDTH / 2;

/* time to execute the copper? */
if (x == next_copper_x)
Expand Down Expand Up @@ -602,10 +602,10 @@ void amiga_state::render_scanline(bitmap_rgb32 &bitmap, int scanline)

/* clear the target pixels to the background color as a starting point */
if (dst != nullptr && !out_of_beam)
{
{
dst[x*2+0] =
dst[x*2+1] = m_palette->pen(CUSTOM_REG(REG_COLOR00));
}
}

/* if we hit the first fetch pixel, reset the counters and latch the delays */
if (x == ddf_start_pixel)
Expand Down
2 changes: 1 addition & 1 deletion src/mame/amiga/amigaaga.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ void amiga_state::aga_render_scanline(bitmap_rgb32 &bitmap, int scanline)
for (int x = 0; x < (amiga_state::SCREEN_WIDTH / 2) + offset_hack[bitplane_fmode]; x++)
{
int sprpix;
const bool out_of_beam = x >= amiga_state::SCREEN_WIDTH / 2;
const bool out_of_beam = x >= amiga_state::SCREEN_WIDTH / 2;

/* time to execute the copper? */
if (x == next_copper_x)
Expand Down
4 changes: 2 additions & 2 deletions src/mame/apple/dafb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static INPUT_PORTS_START(monitor_config)
PORT_CONFSETTING(0x02, u8"Mac RGB Display (12\" 512\u00d7384)") // "Rubik" (modified IIgs AppleColor RGB)
PORT_CONFSETTING(0x03, u8"Mac Two-Page Display (B&W 21\" 1152\u00d7870)") // "2 Page"
PORT_CONFSETTING(0x06, u8"Mac Hi-Res Display (12-14\" 640\u00d7480)") // "High Res"
PORT_CONFSETTING(0x07, u8"No monitor, disable internal video") // No monitor connected
PORT_CONFSETTING(0x07, u8"No monitor, disable internal video") // No monitor connected
PORT_CONFSETTING(ext(0, 0, 0), "PAL Encoder (640\u00d7480, 768\u00d7576)")
PORT_CONFSETTING(ext(1, 1, 0), "NTSC Encoder (512\u00d7384, 640\u00d7480)")
PORT_CONFSETTING(ext(1, 1, 3), "640x480 VGA")
Expand All @@ -225,7 +225,7 @@ static INPUT_PORTS_START(monitor_config_noconv)
PORT_CONFSETTING(0x02, u8"Mac RGB Display (12\" 512\u00d7384)") // "Rubik" (modified IIgs AppleColor RGB)
PORT_CONFSETTING(0x03, u8"Mac Two-Page Display (B&W 21\" 1152\u00d7870)") // "2 Page"
PORT_CONFSETTING(0x06, u8"Mac Hi-Res Display (12-14\" 640\u00d7480)") // "High Res"
PORT_CONFSETTING(0x07, u8"No monitor, disable internal video") // No monitor connected
PORT_CONFSETTING(0x07, u8"No monitor, disable internal video") // No monitor connected
PORT_CONFSETTING(ext(1, 1, 3), "640x480 VGA")
PORT_CONFSETTING(ext(2, 3, 1), "832x624 16\" RGB") // "Goldfish" or "16 inch RGB"
PORT_CONFSETTING(ext(3, 2, 2), "1024\u00d7768 19\" RGB");
Expand Down
4 changes: 2 additions & 2 deletions src/mame/dataeast/dec8.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ static INPUT_PORTS_START( ghostb )
PORT_START("DSW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) // Tested on real hardware
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
// 1-2 should be coinage.
// 1-2 should be coinage.
// PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
// PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
// PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
Expand Down Expand Up @@ -1752,7 +1752,7 @@ static const gfx_layout sr_sprites =
{ 16*8, 1+(16*8), 2+(16*8), 3+(16*8), 4+(16*8), 5+(16*8), 6+(16*8), 7+(16*8),
0,1,2,3,4,5,6,7 },
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 ,8*8,9*8,10*8,11*8,12*8,13*8,14*8,15*8 },
// { 0*8, 2*8, 1*8, 3*8, 4*8, 6*8, 5*8, 7*8 ,8*8,10*8,9*8,11*8,12*8,14*8,13*8,15*8 }, bootleg decode
// { 0*8, 2*8, 1*8, 3*8, 4*8, 6*8, 5*8, 7*8 ,8*8,10*8,9*8,11*8,12*8,14*8,13*8,15*8 }, bootleg decode
16*16
};

Expand Down
10 changes: 5 additions & 5 deletions src/mame/dataeast/kchamp_v.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ void kchamp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect,
{
/* sprite format:
Offset Encoding
0 YYYYYYYY
1 TTTTTTTT - tile#
2 FGGTCCCC - y flip, gfx bank, high bit of tile#, color
3 XXXXXXXX
Offset Encoding
0 YYYYYYYY
1 TTTTTTTT - tile#
2 FGGTCCCC - y flip, gfx bank, high bit of tile#, color
3 XXXXXXXX
*/

int attr = m_spriteram[offs + 2];
Expand Down
Loading

0 comments on commit 780490d

Please sign in to comment.