From 7dd43bc27ec7d9cac93d5b593533866dd29ddcdb Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Sun, 24 Feb 2019 10:56:21 +0100 Subject: [PATCH 1/8] -newport: Added a few more command configs, nw --- src/mame/video/newport.cpp | 54 +++++++++++++++++++++----------------- src/mame/video/newport.h | 16 +++++------ 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index f1dd9cb004b..72715b628db 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -40,7 +40,7 @@ #define LOG_REJECTS (1 << 8) #define LOG_ALL (LOG_UNKNOWN | LOG_VC2 | LOG_CMAP0 | LOG_CMAP1 | LOG_XMAP0 | LOG_XMAP1 | LOG_REX3) -#define VERBOSE (0)//(LOG_UNKNOWN | LOG_VC2 | LOG_XMAP0 | LOG_CMAP0 | LOG_REX3 | LOG_COMMANDS | LOG_REJECTS) +#define VERBOSE (0)//(LOG_UNKNOWN | LOG_REX3 | LOG_COMMANDS | LOG_REJECTS) #include "logmacro.h" DEFINE_DEVICE_TYPE(NEWPORT_VIDEO, newport_video_device, "newport_video", "SGI Newport graphics board") @@ -1459,7 +1459,7 @@ void newport_video_device::do_v_iline(uint8_t color, bool skip_last, bool shade) y1 += incy; if (shade) - m_rex3.m_color_red += m_rex3.m_slope_red; + m_rex3.m_color_red += (m_rex3.m_slope_red << 8) >> 8; } while (y1 != y2); if (!skip_last) @@ -1492,7 +1492,7 @@ void newport_video_device::do_h_iline(uint8_t color, bool skip_last, bool shade) x1 += incx; if (shade) - m_rex3.m_color_red += m_rex3.m_slope_red; + m_rex3.m_color_red += (m_rex3.m_slope_red << 8) >> 8; } while (x1 != x2); if (!skip_last) { @@ -1577,7 +1577,7 @@ void newport_video_device::do_iline(uint8_t color, bool skip_last, bool shade) x1++; if (shade) - m_rex3.m_color_red += m_rex3.m_slope_red; + m_rex3.m_color_red += (m_rex3.m_slope_red << 8) >> 8; } while (x1 != x2); if (!skip_last) @@ -1609,7 +1609,7 @@ void newport_video_device::do_iline(uint8_t color, bool skip_last, bool shade) x1++; if (shade) - m_rex3.m_color_red += m_rex3.m_slope_red; + m_rex3.m_color_red += (m_rex3.m_slope_red << 8) >> 8; } while (x1 != x2); if (!skip_last) @@ -1743,33 +1743,38 @@ void newport_video_device::do_rex3_command() m_rex3.m_read_active = true; break; } + case 0x00000022: // DoSetup, Span, Draw case 0x00000102: // StopOnX, Span, Draw case 0x00000122: // StopOnX, DoSetup, Span, Draw case 0x00022102: // LSOpaque, EnLSPattern, StopOnX, Span, Draw case 0x00080122: // LROnly, StopOnX, DoSetup, Span, Draw - case 0x000c0122: // Shade, LROnly, StopOnX, DoSetup, Span, Draw + case 0x000c0122: // LROnly, Shade, StopOnX, DoSetup, Span, Draw + case 0x000c9102: // LROnly, Shade, Length32, EnZPattern, StopOnX, Span, Draw { if (BIT(mode0, 19) && dx < 0) // LROnly break; + if (!BIT(mode0, 8)) + end_x = start_x; + end_x += dx; end_y += dy; - //bool shade = BIT(mode0, 18); + bool shade = BIT(mode0, 18); uint32_t color = m_rex3.m_color_i & 0xff; LOGMASKED(LOG_COMMANDS, "%04x, %04x to %04x, %04x = %08x\n", start_x, start_y, end_x, end_y, color); for (; start_x != end_x; start_x += dx) { - //if (shade) - //{ - // write_pixel(start_x, start_y, (uint8_t)(m_rex3.m_color_red >> 11)); - // m_rex3.m_color_red += m_rex3.m_slope_red; - //} - //else - //{ + if (shade) + { + write_pixel(start_x, start_y, (uint8_t)(m_rex3.m_color_red >> 11)); + m_rex3.m_color_red += (m_rex3.m_slope_red << 8) >> 8; + } + else + { write_pixel(start_x, start_y, color); - //} + } } start_y++; @@ -1823,6 +1828,7 @@ void newport_video_device::do_rex3_command() case 0x00000b2a: // SkipLast, StopOnX, StopOnY, DoSetup, I_Line, Draw case 0x0000232e: // EnLSPattern, StopOnX, StopOnY, DoSetup, F_Line, Draw case 0x0004232e: // Shade, EnLSPattern, StopOnX, StopOnY, DoSetup, F_Line, Draw + case 0x00442332: // EndFilter, Shade, EnLSPattern, StopOnX, StopOnY, DoSetp, A_Line, Draw { const bool skip_last = BIT(mode0, 11); const bool shade = BIT(mode0, 18); @@ -2427,25 +2433,25 @@ WRITE64_MEMBER(newport_video_device::rex3_w) if (ACCESSING_BITS_32_63) { LOGMASKED(LOG_REX3, "REX3 Red/CI Full State Write: %08x\n", (uint32_t)(data >> 32)); - m_rex3.m_color_red = (uint32_t)((data >> 32) & 0xffffff); - m_rex3.m_color_i = (m_rex3.m_color_red >> 11) & 0x000000ff; + m_rex3.m_color_red = (int32_t)((data >> 32) & 0xffffff); + m_rex3.m_color_i = (uint32_t)(m_rex3.m_color_red >> 11) & 0x000000ff; } if (ACCESSING_BITS_0_31) { LOGMASKED(LOG_REX3, "REX3 Alpha Full State Write: %08x\n", (uint32_t)data); - m_rex3.m_color_alpha = data & 0xfffff; + m_rex3.m_color_alpha = (int32_t)(data & 0xfffff); } break; case 0x0208/8: if (ACCESSING_BITS_32_63) { LOGMASKED(LOG_REX3, "REX3 Green Full State Write: %08x\n", (uint32_t)(data >> 32)); - m_rex3.m_color_green = (uint32_t)((data >> 32) & 0xfffff); + m_rex3.m_color_green = (int32_t)((data >> 32) & 0xfffff); } if (ACCESSING_BITS_0_31) { LOGMASKED(LOG_REX3, "REX3 Blue Full State Write: %08x\n", (uint32_t)data); - m_rex3.m_color_blue = data & 0xfffff; + m_rex3.m_color_blue = (int32_t)(data & 0xfffff); } break; case 0x0210/8: @@ -2455,7 +2461,7 @@ WRITE64_MEMBER(newport_video_device::rex3_w) uint32_t data32 = (uint32_t)(data >> 32); LOGMASKED(LOG_REX3, "REX3 Red/CI Slope Write: %08x\n", data32); data32 &= 0x807fffff; - uint32_t temp = 0; + int32_t temp = 0; if (BIT(data32, 31)) { temp = 0x00800000 - (data32 & 0x7fffff); @@ -2471,7 +2477,7 @@ WRITE64_MEMBER(newport_video_device::rex3_w) { LOGMASKED(LOG_REX3, "REX3 Alpha Slope Write: %08x\n", (uint32_t)data); data &= 0x8007ffff; - uint32_t temp = 0; + int32_t temp = 0; if (BIT(data, 31)) { temp = 0x00080000 - (data & 0x7ffff); @@ -2492,7 +2498,7 @@ WRITE64_MEMBER(newport_video_device::rex3_w) uint32_t data32 = (uint32_t)(data >> 32); LOGMASKED(LOG_REX3, "REX3 Green Slope Write: %08x\n", data32); data32 &= 0x8007ffff; - uint32_t temp = 0; + int32_t temp = 0; if (BIT(data32, 31)) { temp = 0x00080000 - (data32 & 0x7ffff); @@ -2508,7 +2514,7 @@ WRITE64_MEMBER(newport_video_device::rex3_w) { LOGMASKED(LOG_REX3, "REX3 Blue Slope Write: %08x\n", (uint32_t)data); data &= 0x8007ffff; - uint32_t temp = 0; + int32_t temp = 0; if (BIT(data, 31)) { temp = 0x00080000 - (data & 0x7ffff); diff --git a/src/mame/video/newport.h b/src/mame/video/newport.h index 4d87237d0e2..8e050eeff5b 100644 --- a/src/mame/video/newport.h +++ b/src/mame/video/newport.h @@ -131,14 +131,14 @@ private: int16_t m_x_end_i; int16_t m_y_end_i; uint32_t m_x_start_end_i; - uint32_t m_color_red; - uint32_t m_color_alpha; - uint32_t m_color_green; - uint32_t m_color_blue; - uint32_t m_slope_red; - uint32_t m_slope_alpha; - uint32_t m_slope_green; - uint32_t m_slope_blue; + int32_t m_color_red; + int32_t m_color_alpha; + int32_t m_color_green; + int32_t m_color_blue; + int32_t m_slope_red; + int32_t m_slope_alpha; + int32_t m_slope_green; + int32_t m_slope_blue; uint32_t m_write_mask; uint32_t m_color_i; uint32_t m_zero_overflow; From 3df192e5a3f7cffbe61db675a63bf65e614fe9ef Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 24 Feb 2019 13:29:18 +0100 Subject: [PATCH 2/8] internal layout for fepriv (nw) --- src/mame/layout/fidel_eas_priv.lay | 440 +++++++++++++++-------------- 1 file changed, 227 insertions(+), 213 deletions(-) diff --git a/src/mame/layout/fidel_eas_priv.lay b/src/mame/layout/fidel_eas_priv.lay index 57bc6dc6f89..bef26febedf 100644 --- a/src/mame/layout/fidel_eas_priv.lay +++ b/src/mame/layout/fidel_eas_priv.lay @@ -31,76 +31,29 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -122,39 +75,16 @@ - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -199,81 +129,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -347,77 +203,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - - - - - + + + + + + + + + - - - + + + + + + - - - - - - + + + - - - - - - - - + + + + + + + + + - - - - - - - - + + - + - + - + - + - + - + From 1c022cb315917c780e8a06b4a0c8b836f04deb86 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 24 Feb 2019 17:45:10 +0100 Subject: [PATCH 3/8] NOTE: release branch-only - fidel* fix recent regression, french/spanish language flags were swapped (nw) --- src/mame/drivers/fidel_csc.cpp | 8 ++++---- src/mame/drivers/fidel_elite.cpp | 28 ++++++++++++++-------------- src/mame/drivers/fidel_vcc.cpp | 8 ++++---- src/mame/drivers/fidel_vsc.cpp | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp index 0a6eccc8066..f996fa10c79 100644 --- a/src/mame/drivers/fidel_csc.cpp +++ b/src/mame/drivers/fidel_csc.cpp @@ -684,12 +684,12 @@ ROM_END // YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS CONS( 1981, csc, 0, 0, csc, csc, csc_state, init_language<0>, "Fidelity Electronics", "Champion Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) CONS( 1981, cscg, csc, 0, csc, csc, csc_state, init_language<1>, "Fidelity Electronics", "Champion Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1981, cscsp, csc, 0, csc, csc, csc_state, init_language<2>, "Fidelity Electronics", "Champion Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1981, cscfr, csc, 0, csc, csc, csc_state, init_language<3>, "Fidelity Electronics", "Champion Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1981, cscsp, csc, 0, csc, csc, csc_state, init_language<3>, "Fidelity Electronics", "Champion Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1981, cscfr, csc, 0, csc, csc, csc_state, init_language<2>, "Fidelity Electronics", "Champion Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) CONS( 1983, super9cc, 0, 0, su9, su9, su9_state, init_language<0>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) CONS( 1983, super9ccg, super9cc, 0, su9, su9, su9_state, init_language<1>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1983, super9ccsp, super9cc, 0, su9, su9, su9_state, init_language<2>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1983, super9ccfr, super9cc, 0, su9, su9, su9_state, init_language<3>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1983, super9ccsp, super9cc, 0, su9, su9, su9_state, init_language<3>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1983, super9ccfr, super9cc, 0, su9, su9, su9_state, init_language<2>, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) CONS( 1981, reversic, 0, 0, rsc, rsc, csc_state, empty_init, "Fidelity Electronics", "Reversi Sensory Challenger (green version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp index d1ebaa6506d..e37fe32ec5b 100644 --- a/src/mame/drivers/fidel_elite.cpp +++ b/src/mame/drivers/fidel_elite.cpp @@ -822,31 +822,31 @@ ROM_END // YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS CONS( 1983, feasbu, 0, 0, eas, eas, elite_state, init_language<0>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1983, feasbug, feasbu, 0, eas, eas, elite_state, init_language<1>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1983, feasbusp, feasbu, 0, eas, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1983, feasbufr, feasbu, 0, eas, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1983, feasbusp, feasbu, 0, eas, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1983, feasbufr, feasbu, 0, eas, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1984, feasgla, feasbu, 0, eas, eas, elite_state, init_language<0>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1984, feasglag, feasbu, 0, eas, eas, elite_state, init_language<1>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1984, feasglasp, feasbu, 0, eas, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1984, feasglafr, feasbu, 0, eas, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1984, feasglasp, feasbu, 0, eas, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1984, feasglafr, feasbu, 0, eas, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1984, fepriv, feasbu, 0, eas_priv, eas, elite_state, init_language<0>, "Fidelity Electronics", "Elite Private Line (red version, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // by Fidelity West Germany CONS( 1984, feprivg, feasbu, 0, eas_priv, eas, elite_state, init_language<1>, "Fidelity Electronics", "Elite Private Line (red version, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // " -CONS( 1984, feprivsp, feasbu, 0, eas_priv, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite Private Line (red version, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // " -CONS( 1984, feprivfr, feasbu, 0, eas_priv, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite Private Line (red version, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // " +CONS( 1984, feprivsp, feasbu, 0, eas_priv, eas, elite_state, init_language<3>, "Fidelity Electronics", "Elite Private Line (red version, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // " +CONS( 1984, feprivfr, feasbu, 0, eas_priv, eas, elite_state, init_language<2>, "Fidelity Electronics", "Elite Private Line (red version, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) // " CONS( 1982, fpres, 0, 0, pc, eas, elite_state, init_language<0>, "Fidelity Electronics", "Prestige Challenger (original program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1982, fpresg, fpres, 0, pc, eas, elite_state, init_language<1>, "Fidelity Electronics", "Prestige Challenger (original program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1982, fpressp, fpres, 0, pc, eas, elite_state, init_language<2>, "Fidelity Electronics", "Prestige Challenger (original program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1982, fpresfr, fpres, 0, pc, eas, elite_state, init_language<3>, "Fidelity Electronics", "Prestige Challenger (original program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1982, fpressp, fpres, 0, pc, eas, elite_state, init_language<3>, "Fidelity Electronics", "Prestige Challenger (original program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1982, fpresfr, fpres, 0, pc, eas, elite_state, init_language<2>, "Fidelity Electronics", "Prestige Challenger (original program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1983, fpresbu, fpres, 0, pc, eas, elite_state, init_language<0>, "Fidelity Electronics", "Prestige Challenger (Budapest program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1983, fpresbug, fpres, 0, pc, eas, elite_state, init_language<1>, "Fidelity Electronics", "Prestige Challenger (Budapest program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1983, fpresbusp, fpres, 0, pc, eas, elite_state, init_language<2>, "Fidelity Electronics", "Prestige Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1983, fpresbufr, fpres, 0, pc, eas, elite_state, init_language<3>, "Fidelity Electronics", "Prestige Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1983, fpresbusp, fpres, 0, pc, eas, elite_state, init_language<3>, "Fidelity Electronics", "Prestige Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1983, fpresbufr, fpres, 0, pc, eas, elite_state, init_language<2>, "Fidelity Electronics", "Prestige Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1986, feag2100, 0, 0, eag2100, eag, elite_state, init_eag<0>, "Fidelity Electronics", "Elite Avant Garde 2100 (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1986, feag2100g, feag2100, 0, eag2100, eag, elite_state, init_eag<1>, "Fidelity Electronics", "Elite Avant Garde 2100 (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1986, feag2100sp, feag2100, 0, eag2100, eag, elite_state, init_eag<2>, "Fidelity Electronics", "Elite Avant Garde 2100 (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1986, feag2100fr, feag2100, 0, eag2100, eag, elite_state, init_eag<3>, "Fidelity Electronics", "Elite Avant Garde 2100 (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1986, feag2100sp, feag2100, 0, eag2100, eag, elite_state, init_eag<3>, "Fidelity Electronics", "Elite Avant Garde 2100 (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1986, feag2100fr, feag2100, 0, eag2100, eag, elite_state, init_eag<2>, "Fidelity Electronics", "Elite Avant Garde 2100 (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1986, feag, feag2100, 0, eag, eag, elite_state, init_language<0>, "Fidelity Electronics", "Elite Avant Garde (model 6081, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) CONS( 1986, feagg, feag2100, 0, eag, eag, elite_state, init_language<1>, "Fidelity Electronics", "Elite Avant Garde (model 6081, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1986, feagsp, feag2100, 0, eag, eag, elite_state, init_language<2>, "Fidelity Electronics", "Elite Avant Garde (model 6081, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) -CONS( 1986, feagfr, feag2100, 0, eag, eag, elite_state, init_language<3>, "Fidelity Electronics", "Elite Avant Garde (model 6081, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1986, feagsp, feag2100, 0, eag, eag, elite_state, init_language<3>, "Fidelity Electronics", "Elite Avant Garde (model 6081, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) +CONS( 1986, feagfr, feag2100, 0, eag, eag, elite_state, init_language<2>, "Fidelity Electronics", "Elite Avant Garde (model 6081, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS | MACHINE_IMPERFECT_TIMING ) diff --git a/src/mame/drivers/fidel_vcc.cpp b/src/mame/drivers/fidel_vcc.cpp index b73f64e9db0..8431ff879ad 100644 --- a/src/mame/drivers/fidel_vcc.cpp +++ b/src/mame/drivers/fidel_vcc.cpp @@ -409,9 +409,9 @@ ROM_END // YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS CONS( 1979, vcc, 0, 0, vcc, vcc, vcc_state, init_language<0>, "Fidelity Electronics", "Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) CONS( 1979, vccg, vcc, 0, vcc, vcc, vcc_state, init_language<1>, "Fidelity Electronics", "Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) -CONS( 1979, vccsp, vcc, 0, vcc, vcc, vcc_state, init_language<2>, "Fidelity Electronics", "Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) -CONS( 1979, vccfr, vcc, 0, vcc, vcc, vcc_state, init_language<4>, "Fidelity Electronics", "Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +CONS( 1979, vccsp, vcc, 0, vcc, vcc, vcc_state, init_language<4>, "Fidelity Electronics", "Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +CONS( 1979, vccfr, vcc, 0, vcc, vcc, vcc_state, init_language<2>, "Fidelity Electronics", "Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) CONS( 1980, uvc, vcc, 0, vcc, vcc, vcc_state, init_language<0>, "Fidelity Electronics", "Advanced Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) CONS( 1980, uvcg, vcc, 0, vcc, vcc, vcc_state, init_language<1>, "Fidelity Electronics", "Advanced Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) -CONS( 1980, uvcsp, vcc, 0, vcc, vcc, vcc_state, init_language<2>, "Fidelity Electronics", "Advanced Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) -CONS( 1980, uvcfr, vcc, 0, vcc, vcc, vcc_state, init_language<4>, "Fidelity Electronics", "Advanced Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +CONS( 1980, uvcsp, vcc, 0, vcc, vcc, vcc_state, init_language<4>, "Fidelity Electronics", "Advanced Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +CONS( 1980, uvcfr, vcc, 0, vcc, vcc, vcc_state, init_language<2>, "Fidelity Electronics", "Advanced Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp index 335b1e7cc8c..7b74729a1cc 100644 --- a/src/mame/drivers/fidel_vsc.cpp +++ b/src/mame/drivers/fidel_vsc.cpp @@ -443,5 +443,5 @@ ROM_END // YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS CONS( 1980, vsc, 0, 0, vsc, vsc, vsc_state, init_language<0>, "Fidelity Electronics", "Voice Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) CONS( 1980, vscg, vsc, 0, vsc, vsc, vsc_state, init_language<1>, "Fidelity Electronics", "Voice Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1980, vscsp, vsc, 0, vsc, vsc, vsc_state, init_language<2>, "Fidelity Electronics", "Voice Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) -CONS( 1980, vscfr, vsc, 0, vsc, vsc, vsc_state, init_language<3>, "Fidelity Electronics", "Voice Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1980, vscsp, vsc, 0, vsc, vsc, vsc_state, init_language<3>, "Fidelity Electronics", "Voice Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) +CONS( 1980, vscfr, vsc, 0, vsc, vsc, vsc_state, init_language<2>, "Fidelity Electronics", "Voice Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_CONTROLS ) From b4c5c85fa4515976c6b83d9eb031530f231c7bbb Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Feb 2019 13:54:11 +1100 Subject: [PATCH 4/8] (nw) mark Jumping Popira carts as unsupported as we don't emulate the compatible base, and they're attached to another system as a placeholder --- hash/jpopira_jp.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hash/jpopira_jp.xml b/hash/jpopira_jp.xml index 90c0b1b18f8..e37e8b367c2 100644 --- a/hash/jpopira_jp.xml +++ b/hash/jpopira_jp.xml @@ -18,7 +18,7 @@ --> - + JP-01 (Japan) 2004 Takara @@ -30,7 +30,7 @@ - + JP-02 (Japan) 2004 Takara From 81dbf80ebea3af30e41fc3e1c9458b7b4220d296 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Feb 2019 14:05:03 +1100 Subject: [PATCH 5/8] (nw) it was always mini-moni on all lowercase with a hyphen when written in Romaji --- hash/ekara_japan_g.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hash/ekara_japan_g.xml b/hash/ekara_japan_g.xml index 9d2aa468479..aaf8b73851b 100644 --- a/hash/ekara_japan_g.xml +++ b/hash/ekara_japan_g.xml @@ -18,13 +18,13 @@ G-5 GC0005-TPJ TV Pop Volume 1 G-6 *GC0006-BHT BHT Volume 3 (Best Artists?) G-7 *GC0007-BAT BAT Volume 3 (Artist Selection?) - G-8 *GC0008-MIN? untranslated (no volume) + G-8 *GC0008-MIN mini-moni Volume 1 G-9 GC0009-TPJ TV Pop Volume 3 (Volume 2 is 'P-2' in 'P' series) G-10 *GC0010-BAT BAT Volume 4 (Artist Selection?) G-11 GC0011-TPJ TV Pop Volume 4 G-12 GC0012-BHT BHT Volume 5 (Best Artists?) (Volume 4 is 'P-1' in 'P' series) G-13 GC0013- (unknown) Volume 6 - G-14 *GC0014-MIN? (unknown) Volume 2 + G-14 *GC0014-MIN mini-moni Volume 2 G-15 *GC0015-BAT BAT Volume 5 (Artist Selection?) G-16 *GC0016-TPJ TV Pop Volume 5 G-17 *GC0017-TPJ TV Pop Volume 6 @@ -101,7 +101,7 @@ - Mini Moni Volume 1 (Japan) (GC0008-MIN) (set 1) + mini-moni Volume 1 (Japan) (GC0008-MIN) (set 1) 2001 Takara @@ -112,7 +112,7 @@ - MIN Volume 1 (Japan) (GC0008-MIN) (set 2) + mini-moni Volume 1 (Japan) (GC0008-MIN) (set 2) 2001 Takara @@ -148,7 +148,7 @@ - Mini Moni Volume 2 (GC0014-MIN) + mini-moni Volume 2 (GC0014-MIN) 2002 Takara From ad0cc74d0ef66e2d243b645124650dae7e2caf00 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Feb 2019 15:55:35 +1100 Subject: [PATCH 6/8] (nw) flag non-working software in the software list to match the commit message --- hash/apricot_flop.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/hash/apricot_flop.xml b/hash/apricot_flop.xml index 306d49e6b3a..7c2cac180bb 100644 --- a/hash/apricot_flop.xml +++ b/hash/apricot_flop.xml @@ -130,7 +130,7 @@ - + Lotus 123 (Release 1A) 1985 Lotus Development Corporation @@ -177,7 +177,7 @@ - + MSD 2.7.0 (Winchester Test) 1986 ACT @@ -189,7 +189,7 @@ - + apricot Networks VR1.3 F-Series 1985 ACT @@ -226,7 +226,7 @@ - + apricot Networks VB1.3 F-Series (Beta Release) 1985 ACT @@ -263,7 +263,7 @@ - + POINT 32 Network Diagnostics 1985 ACT @@ -292,7 +292,7 @@ - + apricot Networks VR1.3 PC/Xi 1985 ACT @@ -329,7 +329,7 @@ - + apricot Networks VB1.3 PC/Xi (Beta Release) 1985 ACT @@ -366,7 +366,7 @@ - + POINT 32 VR1.1 1984 ACT @@ -397,7 +397,7 @@ - + POINT 32 VR1.2 1985 ACT @@ -434,7 +434,7 @@ - + POINT 32 VB1.2 (Beta Release) 1985 ACT @@ -544,7 +544,7 @@ - + Winchester Factory Formatter 2.1 (TES004) 1985 ACT @@ -556,7 +556,7 @@ - + Winchester Data Integrity Test 4.0 (TES002) 1985 ACT @@ -568,7 +568,7 @@ - + Winchester Data Integrity Check 1.1 1984 ACT From f009e4910fd8db0e4dec54afddb38b46faf0d0ff Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Feb 2019 16:30:29 +1100 Subject: [PATCH 7/8] (nw) fill in some e-kara titles --- hash/ekara_japan.xml | 4 ++-- hash/ekara_japan_s.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hash/ekara_japan.xml b/hash/ekara_japan.xml index 97e45dd3337..c6235841dac 100644 --- a/hash/ekara_japan.xml +++ b/hash/ekara_japan.xml @@ -143,7 +143,7 @@ 74 *EC0074-JPM J-Pop Mix Volume 37 75 *EC0075-JPM J-Pop Mix Volume 38 76 *EC0076-JPM J-Pop Mix Volume 39 - 77 *EC0077-ATS Artist Selection Volume 15 - unknown artist (should be Vol 15? sales sheet lists 5?) + 77 *EC0077-ATS Artist Selection Volume 15 - Keisuke Kuwata (should be Vol 15? sales sheet lists 5?) 78 *EC0078-JPM J-Pop Mix Volume 40 79 *EC0079-ETZ ETZ 2 (custom presentation etc.) 80 *EC0080-JPM J-Pop Mix Volume 41 @@ -890,7 +890,7 @@ - Artist Selection Volume 15 - unknown artist (Japan) (EC0077-ATS) + Artist Selection Volume 15 - Keisuke Kuwata (Japan) (EC0077-ATS) 2001 Takara diff --git a/hash/ekara_japan_s.xml b/hash/ekara_japan_s.xml index 38640f6e99d..7f5b4ea833d 100644 --- a/hash/ekara_japan_s.xml +++ b/hash/ekara_japan_s.xml @@ -12,7 +12,7 @@ S-1 SC0001- Hello Kitty Special S-2 SC0002-SAI SAI (series 3) Volume 1 - S-3 *SC0003- unknown(1) Volume 1 + S-3 *SC0003- Kids' Challenge Volume 1 S-4 *SC0004-SAI SAI (series 1) Volume 1 S-5 *SC0005-SAI SAI (series 2) Volume 1 (same series as 6,9,19,21,22) S-6 *SC0006-SAI SAI (series 2) Volume 2 (same series as 5,9,19,21,22) @@ -27,7 +27,7 @@ S-15 SC0015- unknown(2) Volume 2 S-16 SC0016-SAI SAI (series 2) Volume 5 S-17 SC0017- unknown(1) Volume 2 - S-18 *SC0018-SAI (unknown) Volume 1 + S-18 *SC0018-SAI Challenge Artist Volume 1 S-19 *SC0019-SAI SAI (series 2) Volume 6 (same series as 5,6,9,21,22) S-20 SC0020- SAI (series 3) Volume 5 S-21 *SC0021-SAI SAI (series 2) Volume 7 (same series as 5,6,9,19,22) @@ -41,7 +41,7 @@ - unknown(1) Volume 1 (Japan) (SC0003-xxx) + Kids' Challenge Volume 1 (Japan) (SC0003-xxx) 2001 Takara @@ -118,7 +118,7 @@ - (unknown) Volume 1 (SC0018-SAI) + Challenge Artist Volume 1 (Japan) (SC0018-SAI) 2002 Takara From 40fc33967c9200cc00a4f50224fe4e85063b4a64 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 27 Feb 2019 00:40:05 +1100 Subject: [PATCH 8/8] version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index aa668b45f59..f450c57b31a 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 1895eeffcfc..71a5b6b1e5c 100644 --- a/makefile +++ b/makefile @@ -1625,14 +1625,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.206"' > $@ + @echo '#define BARE_BUILD_VERSION "0.207"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.206" > $@ + @echo #define BARE_BUILD_VERSION "0.207" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@