Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

srcclean (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-10-26 10:40:50 +11:00
parent cf3f4b2530
commit 32868b8e2a
62 changed files with 413 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/src/netlist.lua
View File

@ -13,16 +13,16 @@ project "netlist"
uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9" uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9"
kind (LIBTYPE) kind (LIBTYPE)
if _OPTIONS["targetos"]=="windows" then if _OPTIONS["targetos"]=="windows" then
configuration { "mingw* or vs*" } configuration { "mingw* or vs*" }
defines { defines {
"UNICODE", "UNICODE",
"_UNICODE", "_UNICODE",
"_WIN32_WINNT=0x0501", "_WIN32_WINNT=0x0501",
"WIN32_LEAN_AND_MEAN", "WIN32_LEAN_AND_MEAN",
"NOMINMAX", "NOMINMAX",
} }
end end
addprojectflags() addprojectflags()
@ -32,7 +32,7 @@ project "netlist"
includedirs { includedirs {
MAME_DIR .. "src/lib", MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/lib/netlist",
} }
files { files {
@ -47,7 +47,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/nl_parser.h", MAME_DIR .. "src/lib/netlist/nl_parser.h",
MAME_DIR .. "src/lib/netlist/nl_setup.cpp", MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
MAME_DIR .. "src/lib/netlist/nl_setup.h", MAME_DIR .. "src/lib/netlist/nl_setup.h",
MAME_DIR .. "src/lib/netlist/nl_types.h", MAME_DIR .. "src/lib/netlist/nl_types.h",
MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
MAME_DIR .. "src/lib/netlist/plib/palloc.h", MAME_DIR .. "src/lib/netlist/plib/palloc.h",
MAME_DIR .. "src/lib/netlist/plib/pchrono.h", MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
@ -72,9 +72,9 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pstate.h", MAME_DIR .. "src/lib/netlist/plib/pstate.h",
MAME_DIR .. "src/lib/netlist/plib/pstring.cpp", MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstring.h", MAME_DIR .. "src/lib/netlist/plib/pstring.h",
MAME_DIR .. "src/lib/netlist/plib/pstrutil.h", MAME_DIR .. "src/lib/netlist/plib/pstrutil.h",
MAME_DIR .. "src/lib/netlist/plib/pstream.h", MAME_DIR .. "src/lib/netlist/plib/pstream.h",
MAME_DIR .. "src/lib/netlist/plib/ptime.h", MAME_DIR .. "src/lib/netlist/plib/ptime.h",
MAME_DIR .. "src/lib/netlist/plib/ptypes.h", MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
MAME_DIR .. "src/lib/netlist/plib/putil.cpp", MAME_DIR .. "src/lib/netlist/plib/putil.cpp",
MAME_DIR .. "src/lib/netlist/plib/putil.h", MAME_DIR .. "src/lib/netlist/plib/putil.h",
@ -82,9 +82,9 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/tools/nl_convert.h", MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h",
MAME_DIR .. "src/lib/netlist/analog/nld_generic_models.h", MAME_DIR .. "src/lib/netlist/analog/nld_generic_models.h",
MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.cpp", MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.h", MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.h",
MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.cpp", MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.cpp",
MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.h", MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.h",
MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h", MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h",
@ -224,4 +224,4 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h", MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
} }

30
src/devices/bus/isa/mda.cpp
View File

@ -985,7 +985,7 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::crtc_update_row )
/* PCB layouts and assembly years from online pictures and physical unit. /* PCB layouts and assembly years from online pictures and physical unit.
Ericsson - marked SPVT02 8301 60 53-10, assembled in 1985 indicated by chip dates Ericsson - marked SPVT02 8301 60 53-10, assembled in 1985 indicated by chip dates
+--------------------------------------------------------------------------------------+ ___ +--------------------------------------------------------------------------------------+ ___
| IC1 IC2 IC3 IC4 IC5 +-IC15--EPROM-+ IC6 IC7 IC8 S1 || | IC1 IC2 IC3 IC4 IC5 +-IC15--EPROM-+ IC6 IC7 IC8 S1 ||
| |8363 65 14-80| || | |8363 65 14-80| ||
| IC9 IC10 IC11 IC12 IC13 IC14|CG 50821 A64 |+------------------++-IC24 EPROM--+ || | IC9 IC10 IC11 IC12 IC13 IC14|CG 50821 A64 |+------------------++-IC24 EPROM--+ ||
| +-------------+| CRTC HD46505SP-1 ||10-40VP | || | +-------------+| CRTC HD46505SP-1 ||10-40VP | ||
@ -1044,16 +1044,16 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::crtc_update_row )
--------------------------------------------------- ---------------------------------------------------
Ericsson 2 +VS 4 Ericsson Ericsson 2 +VS 4 Ericsson
Monochrome 3 VS return 2 Monochrome HR Monochrome 3 VS return 2 Monochrome HR
HR Graphics 10 +VS 17 Monitors 3111 (Amber) or HR Graphics 10 +VS 17 Monitors 3111 (Amber) or
Board 1070 11 VS return 15 3712/3715 (Black & White) Board 1070 11 VS return 15 3712/3715 (Black & White)
4 VSYNC 6 4 VSYNC 6
12 VSYNC 19 12 VSYNC 19
5 HSYNC 7 5 HSYNC 7
13 HSYNC 20 13 HSYNC 20
6 High intensity 8 6 High intensity 8
14 High intensity 21 14 High intensity 21
7 Video 9 7 Video 9
15 Video 22 15 Video 22
8 GND 11 8 GND 11
This board is normaly used with an Ericsson monitor due to the non standard connector. This board is normaly used with an Ericsson monitor due to the non standard connector.
@ -1296,7 +1296,7 @@ inline int isa8_epc_mda_device::get_yres()
MC6845_UPDATE_ROW(isa8_epc_mda_device::crtc_update_row) MC6845_UPDATE_ROW(isa8_epc_mda_device::crtc_update_row)
{ {
uint32_t *p = &bitmap.pix32(y); uint32_t *p = &bitmap.pix32(y);
uint16_t chr_base = ra; uint16_t chr_base = ra;
int i; int i;
@ -1304,7 +1304,7 @@ MC6845_UPDATE_ROW(isa8_epc_mda_device::crtc_update_row)
if ( y < (16 * 0 + 0x20) && (m_framecnt & 0xff) == 0 ) if ( y < (16 * 0 + 0x20) && (m_framecnt & 0xff) == 0 )
{ {
LOGROW("%11.6f %s\n - y:%d chr_base:%d ra:%d ma:%d x_count:%d\n", machine().time().as_double(), FUNCNAME, LOGROW("%11.6f %s\n - y:%d chr_base:%d ra:%d ma:%d x_count:%d\n", machine().time().as_double(), FUNCNAME,
y, y % 16, ra, ma, x_count); y, y % 16, ra, ma, x_count);
} }
// Video Off handling // Video Off handling
@ -1384,7 +1384,7 @@ MC6845_UPDATE_ROW(isa8_epc_mda_device::crtc_update_row)
// Handle intense background if blinking is disabled // Handle intense background if blinking is disabled
if ((m_mode_control & MR1_BLINK) == 0 && if ((m_mode_control & MR1_BLINK) == 0 &&
(attr & ATTR_BLINK) != 0 && bg == 2) (attr & ATTR_BLINK) != 0 && bg == 2)
{ {
bg = 3; bg = 3;
} }
@ -1400,7 +1400,7 @@ MC6845_UPDATE_ROW(isa8_epc_mda_device::crtc_update_row)
else else
{ {
if ( (m_mode_control & MR1_BLINK) && if ( (m_mode_control & MR1_BLINK) &&
( attr & ATTR_BLINK ) && ( m_framecnt & 0x10 ) ) ( attr & ATTR_BLINK ) && ( m_framecnt & 0x10 ) )
{ {
data = 0x00; data = 0x00;
} }

2
src/devices/cpu/m6805/m68705.cpp
View File

@ -865,7 +865,7 @@ void m6805_mrom_device::internal_map(address_map &map)
* 6805S3 0000-007f 0080-00ff 0100-0eff 0f00-0ff7 0ff8-0fff * 6805S3 0000-007f 0080-00ff 0100-0eff 0f00-0ff7 0ff8-0fff
* 6805U2 0000-007f 0080-00ff 07c0-0f37 0f38-0ff7 0ff8-0fff * 6805U2 0000-007f 0080-00ff 07c0-0f37 0f38-0ff7 0ff8-0fff
* 6805U3 0000-007f 0080-0f37 0f38-0ff7 0ff8-0fff * 6805U3 0000-007f 0080-0f37 0f38-0ff7 0ff8-0fff
* 6805U1 0000-007f 0080-00ff 0800-0f7f 0f80-0ff7 0ff8-0fff * 6805U1 0000-007f 0080-00ff 0800-0f7f 0f80-0ff7 0ff8-0fff
* *
* This code assumes that dumps are captured contiguously from address 0 to * This code assumes that dumps are captured contiguously from address 0 to
* the end of the address range, and are not split by range. Register, RAM * the end of the address range, and are not split by range. Register, RAM

2
src/devices/cpu/tms34010/34010ops.hxx
View File

@ -2112,7 +2112,7 @@ void tms340x0_device::clip(uint16_t op)
XY wend = WEND_XY(); XY wend = WEND_XY();
XY dydx = DYDX_XY(); XY dydx = DYDX_XY();
// logerror("020:clip PC=0x%08x: WSTART=(%dx%d) WEND=(%dx%d) DADDR=(%dx%d) DYDX=(%dx%d)\n", // logerror("020:clip PC=0x%08x: WSTART=(%dx%d) WEND=(%dx%d) DADDR=(%dx%d) DYDX=(%dx%d)\n",
// m_pc, wstart.x, wstart.y, wend.x, wend.y, daddr.x, daddr.y, dydx.x, dydx.y); // m_pc, wstart.x, wstart.y, wend.x, wend.y, daddr.x, daddr.y, dydx.x, dydx.y);
// Check whether array intersects with window... // Check whether array intersects with window...
bool is_l = wstart.x < (daddr.x + dydx.x); bool is_l = wstart.x < (daddr.x + dydx.x);

2
src/devices/machine/spg110_video.cpp
View File

@ -413,7 +413,7 @@ WRITE16_MEMBER(spg110_video_device::dma_len_trigger_w)
/* /*
if (m_dma_unk_2061 != 0x0000) if (m_dma_unk_2061 != 0x0000)
{ {
logerror("unknown DMA params are not zero!\n"); logerror("unknown DMA params are not zero!\n");
} }
*/ */

22
src/devices/video/mc6845.cpp
View File

@ -54,9 +54,9 @@
#include "logmacro.h" #include "logmacro.h"
#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__)
#define LOGREGS(...) LOGMASKED(LOG_REGS, __VA_ARGS__) #define LOGREGS(...) LOGMASKED(LOG_REGS, __VA_ARGS__)
#define LOGCONF(...) LOGMASKED(LOG_CONF, __VA_ARGS__) #define LOGCONF(...) LOGMASKED(LOG_CONF, __VA_ARGS__)
DEFINE_DEVICE_TYPE(MC6845, mc6845_device, "mc6845", "Motorola MC6845 CRTC") DEFINE_DEVICE_TYPE(MC6845, mc6845_device, "mc6845", "Motorola MC6845 CRTC")
DEFINE_DEVICE_TYPE(MC6845_1, mc6845_1_device, "mc6845_1", "Motorola MC6845-1 CRTC") DEFINE_DEVICE_TYPE(MC6845_1, mc6845_1_device, "mc6845_1", "Motorola MC6845-1 CRTC")
@ -223,15 +223,15 @@ void mc6845_device::register_w(uint8_t data)
/* Omits LOGSETUP logs of cursor registers as they tend to be spammy */ /* Omits LOGSETUP logs of cursor registers as they tend to be spammy */
if (m_register_address_latch < 0x0e && if (m_register_address_latch < 0x0e &&
m_register_address_latch != 0x0a && m_register_address_latch != 0x0a &&
m_register_address_latch != 0x0b) LOGSETUP(" * %02x <= %3u [%02x] %s\n", m_register_address_latch, m_register_address_latch != 0x0b) LOGSETUP(" * %02x <= %3u [%02x] %s\n", m_register_address_latch,
data, data, std::array<char const *, 16> data, data, std::array<char const *, 16>
{{ "R0 - Horizontal Total", "R1 - Horizontal Displayed", "R2 - Horizontal Sync Position", {{ "R0 - Horizontal Total", "R1 - Horizontal Displayed", "R2 - Horizontal Sync Position",
"R3 - Sync Width", "R4 - Vertical Total", "R5 - Vertical Total Adjust", "R3 - Sync Width", "R4 - Vertical Total", "R5 - Vertical Total Adjust",
"R6 - Vertical Displayed", "R7 - Vertical Sync Position", "R8 - Interlace & Skew", "R6 - Vertical Displayed", "R7 - Vertical Sync Position", "R8 - Interlace & Skew",
"R9 - Maximum Raster Address", "R10 - Cursor Start Address", "R11 - Cursor End Address", "R9 - Maximum Raster Address", "R10 - Cursor Start Address", "R11 - Cursor End Address",
"R12 - Start Address (H)", "R13 - Start Address (L)", "R14 - Cursor (H)", "R12 - Start Address (H)", "R13 - Start Address (L)", "R14 - Cursor (H)",
"R15 - Cursor (L)" }}[(m_register_address_latch & 0x0f)]); "R15 - Cursor (L)" }}[(m_register_address_latch & 0x0f)]);
switch (m_register_address_latch) switch (m_register_address_latch)
{ {

20
src/devices/video/snes_ppu.cpp
View File

@ -734,7 +734,7 @@ inline uint32_t snes_ppu_device::get_tile( uint8_t layer_idx, uint32_t hoffset,
if (tilex & 0x20) offset += screenx; if (tilex & 0x20) offset += screenx;
if (tiley & 0x20) offset += screeny; if (tiley & 0x20) offset += screeny;
uint32_t addr = ((self.tilemap + offset) & 0x7fff) << 1; uint32_t addr = ((self.tilemap + offset) & 0x7fff) << 1;
return m_vram[addr] | (m_vram[addr + 1] << 8); return m_vram[addr] | (m_vram[addr + 1] << 8);
} }
/********************************************* /*********************************************
@ -770,11 +770,11 @@ inline void snes_ppu_device::update_line( uint16_t curline, uint8_t layer_idx, u
{ {
layer_t &layer = m_layer[layer_idx]; layer_t &layer = m_layer[layer_idx];
if (layer.tile_mode == SNES_COLOR_DEPTH_NONE) return; if (layer.tile_mode == SNES_COLOR_DEPTH_NONE) return;
#if SNES_LAYER_DEBUG #if SNES_LAYER_DEBUG
if (m_debug_options.bg_disabled[layer_idx]) if (m_debug_options.bg_disabled[layer_idx])
return; return;
#endif /* SNES_LAYER_DEBUG */ #endif /* SNES_LAYER_DEBUG */
m_scanlines[SNES_MAINSCREEN].enable = layer.main_bg_enabled; m_scanlines[SNES_MAINSCREEN].enable = layer.main_bg_enabled;
@ -819,10 +819,10 @@ inline void snes_ppu_device::update_line( uint16_t curline, uint8_t layer_idx, u
uint32_t mosaic_priority = 0; uint32_t mosaic_priority = 0;
uint32_t mosaic_color = 0; uint32_t mosaic_color = 0;
int x = 0 - (hscroll & 7); int x = 0 - (hscroll & 7);
while (x < width) while (x < width)
{ {
uint32_t hoffset = x + hscroll; uint32_t hoffset = x + hscroll;
uint32_t voffset = y + vscroll; uint32_t voffset = y + vscroll;
if (opt_mode) if (opt_mode)
{ {
@ -886,7 +886,7 @@ inline void snes_ppu_device::update_line( uint16_t curline, uint8_t layer_idx, u
data |= (uint64_t)m_vram[address + 48] << 48; data |= (uint64_t)m_vram[address + 48] << 48;
data |= (uint64_t)m_vram[address + 49] << 56; data |= (uint64_t)m_vram[address + 49] << 56;
for (uint32_t tilex = 0; tilex < 8; tilex++, x++) for (uint32_t tilex = 0; tilex < 8; tilex++, x++)
{ {
if (x & width) continue; if (x & width) continue;
if (!layer.mosaic_enabled || --mosaic_counter == 0) if (!layer.mosaic_enabled || --mosaic_counter == 0)
@ -925,7 +925,7 @@ inline void snes_ppu_device::update_line( uint16_t curline, uint8_t layer_idx, u
if (!hires) if (!hires)
{ {
if (layer.main_bg_enabled && mosaic_priority > m_scanlines[SNES_MAINSCREEN].priority[x]) if (layer.main_bg_enabled && mosaic_priority > m_scanlines[SNES_MAINSCREEN].priority[x])
{ {
if (!m_scanlines[SNES_MAINSCREEN].clip || m_clipmasks[layer_idx][x]) if (!m_scanlines[SNES_MAINSCREEN].clip || m_clipmasks[layer_idx][x])
{ {
@ -2303,8 +2303,8 @@ uint16_t snes_ppu_device::direct_color(uint16_t palette, uint16_t group)
//group = -------- -----bgr //group = -------- -----bgr
//output = 0BBb00GG Gg0RRRr0 //output = 0BBb00GG Gg0RRRr0
return (palette << 7 & 0x6000) + (group << 10 & 0x1000) return (palette << 7 & 0x6000) + (group << 10 & 0x1000)
+ (palette << 4 & 0x0380) + (group << 5 & 0x0040) + (palette << 4 & 0x0380) + (group << 5 & 0x0040)
+ (palette << 2 & 0x001c) + (group << 1 & 0x0002); + (palette << 2 & 0x001c) + (group << 1 & 0x0002);
} }
void snes_ppu_device::cache_background() void snes_ppu_device::cache_background()

2
src/emu/render.h
View File

@ -218,7 +218,7 @@ struct render_texinfo
u64 unique_id; // unique identifier to pass to osd u64 unique_id; // unique identifier to pass to osd
u64 old_id; // previously allocated id, if applicable u64 old_id; // previously allocated id, if applicable
const rgb_t * palette; // palette for PALETTE16 textures, bcg lookup table for RGB32/YUY16 const rgb_t * palette; // palette for PALETTE16 textures, bcg lookup table for RGB32/YUY16
u32 palette_length; u32 palette_length;
}; };

4
src/emu/screen.h
View File

@ -486,13 +486,13 @@ private:
int m_width; // current width (HTOTAL) int m_width; // current width (HTOTAL)
int m_height; // current height (VTOTAL) int m_height; // current height (VTOTAL)
rectangle m_visarea; // current visible area (HBLANK end/start, VBLANK end/start) rectangle m_visarea; // current visible area (HBLANK end/start, VBLANK end/start)
std::vector<int> m_scan_widths; // current width, in samples, of each individual scanline std::vector<int> m_scan_widths; // current width, in samples, of each individual scanline
// textures and bitmaps // textures and bitmaps
texture_format m_texformat; // texture format texture_format m_texformat; // texture format
render_texture * m_texture[2]; // 2x textures for the screen bitmap render_texture * m_texture[2]; // 2x textures for the screen bitmap
screen_bitmap m_bitmap[2]; // 2x bitmaps for rendering screen_bitmap m_bitmap[2]; // 2x bitmaps for rendering
std::vector<bitmap_t *> m_scan_bitmaps[2]; // 2x bitmaps for each individual scanline std::vector<bitmap_t *> m_scan_bitmaps[2]; // 2x bitmaps for each individual scanline
bitmap_ind8 m_priority; // priority bitmap bitmap_ind8 m_priority; // priority bitmap
bitmap_ind64 m_burnin; // burn-in bitmap bitmap_ind64 m_burnin; // burn-in bitmap
u8 m_curbitmap; // current bitmap index u8 m_curbitmap; // current bitmap index

2
src/lib/netlist/macro/nlm_ttl74xx.h
View File

@ -281,7 +281,7 @@
NET_REGISTER_DEV(TTL_74279_DIP, name) NET_REGISTER_DEV(TTL_74279_DIP, name)
#define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7) \ #define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7) \
NET_REGISTER_DEV(DM9312, name) \ NET_REGISTER_DEV(DM9312, name) \
NET_CONNECT(name, VCC, VCC) \ NET_CONNECT(name, VCC, VCC) \
NET_CONNECT(name, GND, GND) \ NET_CONNECT(name, GND, GND) \
NET_CONNECT(name, A, cA) \ NET_CONNECT(name, A, cA) \

2
src/lib/netlist/nl_setup.h
View File

@ -325,7 +325,7 @@ namespace netlist
private: private:
plib::ppreprocessor::defines_map_type m_defines; plib::ppreprocessor::defines_map_type m_defines;
plib::psource_collection_t<> m_includes; plib::psource_collection_t<> m_includes;
setup_t &m_setup; setup_t &m_setup;
log_type &m_log; log_type &m_log;

4
src/lib/netlist/plib/mat_cr.h
View File

@ -469,7 +469,7 @@ namespace plib
for (index_type k = 0; k < base::size(); k++) for (index_type k = 0; k < base::size(); k++)
m_ge_par[levGE[k]].push_back(k); m_ge_par[levGE[k]].push_back(k);
//for (std::size_t k = 0; k < m_ge_par.size(); k++) //for (std::size_t k = 0; k < m_ge_par.size(); k++)
// printf("%d %d\n", (int) k, (int) m_ge_par[k].size()); // printf("%d %d\n", (int) k, (int) m_ge_par[k].size());
} }
// contains elimination rows below the diagonal // contains elimination rows below the diagonal
std::vector<std::vector<index_type>> m_ge_par; // parallel execution support for Gauss std::vector<std::vector<index_type>> m_ge_par; // parallel execution support for Gauss
@ -560,7 +560,7 @@ namespace plib
const auto p_i_end = base::row_idx[i + 1]; const auto p_i_end = base::row_idx[i + 1];
// loop over all columns k left of diag in row i // loop over all columns k left of diag in row i
//if (row_idx[i] < diag[i]) //if (row_idx[i] < diag[i])
// printf("occ %d\n", (int)i); // printf("occ %d\n", (int)i);
for (auto i_k = base::row_idx[i]; i_k < base::diag[i]; i_k++) for (auto i_k = base::row_idx[i]; i_k < base::diag[i]; i_k++)
{ {
const auto k(base::col_idx[i_k]); const auto k(base::col_idx[i_k]);

4
src/lib/netlist/plib/plists.h
View File

@ -391,9 +391,9 @@ namespace plib {
using mutex_type = pspin_mutex<TS>; using mutex_type = pspin_mutex<TS>;
using lock_guard_type = std::lock_guard<mutex_type>; using lock_guard_type = std::lock_guard<mutex_type>;
mutex_type m_lock; mutex_type m_lock;
PALIGNAS_CACHELINE() PALIGNAS_CACHELINE()
T * m_end; T * m_end;
aligned_vector<T> m_list; aligned_vector<T> m_list;
public: public:

4
src/lib/netlist/plib/pparser.cpp
View File

@ -327,8 +327,8 @@ void ppreprocessor::error(const pstring &err)
#define CHECKTOK2(p_op, p_prio) \ #define CHECKTOK2(p_op, p_prio) \
else if (tok == # p_op) \ else if (tok == # p_op) \
{ \ { \
if (!has_val) \ if (!has_val) \
{ error("parsing error!"); return 1;} \ { error("parsing error!"); return 1;} \
if (prio < (p_prio)) \ if (prio < (p_prio)) \
return val; \ return val; \
start++; \ start++; \

2
src/lib/netlist/prg/nlwav.cpp
View File

@ -76,7 +76,7 @@ private:
struct riff_chunk_t struct riff_chunk_t
{ {
std::array<uint8_t, 4> group_id = {{'R','I','F','F'}}; std::array<uint8_t, 4> group_id = {{'R','I','F','F'}};
uint32_t filelen = 0; uint32_t filelen = 0;
std::array<uint8_t, 4> rifftype = {{'W','A','V','E'}}; std::array<uint8_t, 4> rifftype = {{'W','A','V','E'}};
}; };

2
src/mame/audio/nl_kidniki.cpp
View File

@ -60,7 +60,7 @@
* *
*/ */
#define J4 (1) #define J4 (1)
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* Library section header START * Library section header START

10
src/mame/drivers/alpha68k_i.cpp
View File

@ -4,12 +4,12 @@
SNK/Alpha 68000 I board based games SNK/Alpha 68000 I board based games
derived from alpha68k.cpp derived from alpha68k.cpp
TODO: TODO:
- Both POST screens are X offset by a large margin, - Both POST screens are X offset by a large margin,
i.e. Paddle Mania draws a middle line there, which isn't shown on real HW. i.e. Paddle Mania draws a middle line there, which isn't shown on real HW.
- Paddle Mania: ranking screen is unreadable, maybe - Paddle Mania: ranking screen is unreadable, maybe
***************************************************************************/ ***************************************************************************/

10
src/mame/drivers/alpha68k_n.cpp
View File

@ -4,13 +4,13 @@
SNK/Alpha 68000 N based board games SNK/Alpha 68000 N based board games
derived from alpha68k.cpp derived from alpha68k.cpp
TODO: TODO:
- Super Stingray MCU irq controls timer speed. The MCU has been - Super Stingray MCU irq controls timer speed. The MCU has been
hooked up but the clock is almost certainly wrong. hooked up but the clock is almost certainly wrong.
- GFX region can eventually overflow in jongbou, and in general all three - GFX region can eventually overflow in jongbou, and in general all three
games can probably be run with the same gfx_layout structs games can probably be run with the same gfx_layout structs
============================================================================ ============================================================================

2
src/mame/drivers/cdi.cpp
View File

@ -48,7 +48,7 @@ TODO:
#define LOG_SERVO (1 << 0) #define LOG_SERVO (1 << 0)
#define LOG_SLAVE (1 << 1) #define LOG_SLAVE (1 << 1)
#define LOG_ALL (LOG_SERVO | LOG_SLAVE) #define LOG_ALL (LOG_SERVO | LOG_SLAVE)
#define VERBOSE (LOG_ALL) #define VERBOSE (LOG_ALL)
#include "logmacro.h" #include "logmacro.h"

8
src/mame/drivers/fidel_phantom.cpp
View File

@ -155,10 +155,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(phantom_state::motors_timer)
if (m_motors_ctrl & 0x0c) m_hmotor_sensor0_ff = true; if (m_motors_ctrl & 0x0c) m_hmotor_sensor0_ff = true;
if (m_motors_ctrl & 0x04) m_hmotor_sensor1_ff = true; if (m_motors_ctrl & 0x04) m_hmotor_sensor1_ff = true;
if ((m_motors_ctrl & 0x01) && m_vmotor_pos > 0x00) m_vmotor_pos--; if ((m_motors_ctrl & 0x01) && m_vmotor_pos > 0x00) m_vmotor_pos--;
if ((m_motors_ctrl & 0x02) && m_vmotor_pos < 0xff) m_vmotor_pos++; if ((m_motors_ctrl & 0x02) && m_vmotor_pos < 0xff) m_vmotor_pos++;
if ((m_motors_ctrl & 0x04) && m_hmotor_pos > 0x00) m_hmotor_pos--; if ((m_motors_ctrl & 0x04) && m_hmotor_pos > 0x00) m_hmotor_pos--;
if ((m_motors_ctrl & 0x08) && m_hmotor_pos < 0xff) m_hmotor_pos++; if ((m_motors_ctrl & 0x08) && m_hmotor_pos < 0xff) m_hmotor_pos++;
} }
void phantom_state::update_pieces_position(int state) void phantom_state::update_pieces_position(int state)

2
src/mame/drivers/firetrap.cpp
View File

@ -243,7 +243,7 @@ void firetrap_state::mcu_p3_w(uint8_t data)
if (BIT(m_mcu_p3, 1) == 1 && BIT(data, 1) == 0) if (BIT(m_mcu_p3, 1) == 1 && BIT(data, 1) == 0)
m_mcu->set_input_line(MCS51_INT0_LINE, CLEAR_LINE); m_mcu->set_input_line(MCS51_INT0_LINE, CLEAR_LINE);
// if (BIT(m_mcu_p3, 4) == 1 && BIT(data, 4) == 0) // if (BIT(m_mcu_p3, 4) == 1 && BIT(data, 4) == 0)
m_mcu_p3 = data; m_mcu_p3 = data;
} }

6
src/mame/drivers/fp1100.cpp
View File

@ -378,15 +378,15 @@ void fp1100_state::handle_int_to_main()
{ {
m_maincpu->set_input_line(0, HOLD_LINE); m_maincpu->set_input_line(0, HOLD_LINE);
LOG("%s: Main IRQ asserted\n",machine().describe_context()); LOG("%s: Main IRQ asserted\n",machine().describe_context());
// m_main_irq_status = true; // m_main_irq_status = true;
} }
} }
else else
{ {
if (m_main_irq_status) if (m_main_irq_status)
{ {
// m_maincpu->set_input_line(0, CLEAR_LINE); // m_maincpu->set_input_line(0, CLEAR_LINE);
// LOG("%s: Main IRQ cleared\n",machine().describe_context()); // LOG("%s: Main IRQ cleared\n",machine().describe_context());
m_main_irq_status = false; m_main_irq_status = false;
} }
} }

2
src/mame/drivers/h01x.cpp
View File

@ -130,7 +130,7 @@ static INPUT_PORTS_START( h01b )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e')
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c')
// PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Clear") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) // PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Clear") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)

14
src/mame/drivers/sidepckt.cpp
View File

@ -382,13 +382,13 @@ void sidepckt_state::sidepckt(machine_config &config)
Ports to be corrected once MCU is dumped Ports to be corrected once MCU is dumped
I8751(config, m_mcu, 8_MHz_XTAL); // 8.0MHz OSC on PCB I8751(config, m_mcu, 8_MHz_XTAL); // 8.0MHz OSC on PCB
m_mcu->port_in_cb<0>().set([this](){ return m_mcu_p0; }); m_mcu->port_in_cb<0>().set([this](){ return m_mcu_p0; });
m_mcu->port_out_cb<0>().set([this](u8 data){ m_mcu_p0 = data; }); m_mcu->port_out_cb<0>().set([this](u8 data){ m_mcu_p0 = data; });
m_mcu->port_in_cb<1>().set([this](){ return m_mcu_p1; }); m_mcu->port_in_cb<1>().set([this](){ return m_mcu_p1; });
m_mcu->port_out_cb<1>().set([this](u8 data){ m_mcu_p1 = data; }); m_mcu->port_out_cb<1>().set([this](u8 data){ m_mcu_p1 = data; });
m_mcu->port_out_cb<2>().set(FUNC(karnov_state::mcu_p2_w)); m_mcu->port_out_cb<2>().set(FUNC(karnov_state::mcu_p2_w));
m_mcu->port_in_cb<3>().set_ioport("COIN"); m_mcu->port_in_cb<3>().set_ioport("COIN");
*/ */
/* video hardware */ /* video hardware */

2
src/mame/drivers/spartanxtec.cpp
View File

@ -444,7 +444,7 @@ ROM_START( spartanxtec )
ROM_REGION( 0x00228, "plds", 0 ) ROM_REGION( 0x00228, "plds", 0 )
ROM_LOAD( "pal16r8acn.ic12", 0x0000, 0x0114, NO_DUMP ) ROM_LOAD( "pal16r8acn.ic12", 0x0000, 0x0114, NO_DUMP )
ROM_LOAD( "pal16r6acn.ic33", 0x0114, 0x0114, NO_DUMP ) ROM_LOAD( "pal16r6acn.ic33", 0x0114, 0x0114, NO_DUMP )
ROM_END ROM_END

76
src/mame/drivers/spdheat.cpp
View File

@ -354,64 +354,64 @@ WRITE8_MEMBER(spdheat_state::sub_nmi_w)
/* /*
YM2203 IC62 YM2203 IC62
=========== ===========
PORT A PORT A
.... xxxx PGA[3:0] .... xxxx PGA[3:0]
xxxx .... PC010SA IC58 'VR' xxxx .... PC010SA IC58 'VR'
PORT B PORT B
.... xxxx PC010SA IC58 'BASS' .... xxxx PC010SA IC58 'BASS'
xxxx .... PC010SA IC58 TREBL xxxx .... PC010SA IC58 TREBL
PSG OUTPUT -> PC010SA IC58 (PSGA) PSG OUTPUT -> PC010SA IC58 (PSGA)
YM2203 IC61 YM2203 IC61
=========== ===========
PORT A PORT A
.... xxxx PGB[3:0] .... xxxx PGB[3:0]
xxxx .... PC010SA IC59 'VR' xxxx .... PC010SA IC59 'VR'
PORT B PORT B
.... xxxx PC010SA IC59 'BASS' .... xxxx PC010SA IC59 'BASS'
xxxx .... PC010SA IC59 TREBL xxxx .... PC010SA IC59 TREBL
PSG OUTPUT -> PC010SA IC59 (PSGB) PSG OUTPUT -> PC010SA IC59 (PSGB)
YM2149 IC57 YM2149 IC57
=========== ===========
PORT A PORT A
.... xxxx PGC[3:0] .... xxxx PGC[3:0]
xxxx .... PC010SA IC54 'VR' xxxx .... PC010SA IC54 'VR'
PORT B PORT B
.... xxxx PC010SA IC54 'BASS' .... xxxx PC010SA IC54 'BASS'
xxxx .... PC010SA IC54 TREBL xxxx .... PC010SA IC54 TREBL
PSG OUTPUT -> PC010SA IC54 (PSGC) PSG OUTPUT -> PC010SA IC54 (PSGC)
YM2149 IC56 YM2149 IC56
=========== ===========
PORT A PORT A
.... xxxx PGD[3:0] .... xxxx PGD[3:0]
xxxx .... PC010SA IC55 'VR' xxxx .... PC010SA IC55 'VR'
PORT B PORT B
.... xxxx PC010SA IC55 'BASS' .... xxxx PC010SA IC55 'BASS'
xxxx .... PC010SA IC55 TREBL xxxx .... PC010SA IC55 TREBL
PSG OUTPUT -> PC010SA IC55 (PSGD) PSG OUTPUT -> PC010SA IC55 (PSGD)
PGC[3:0], PGD[3:0] = FMB BAL1 PGC[3:0], PGD[3:0] = FMB BAL1
PGA[3:0], PGB[3:0] = FMB VR1 PGA[3:0], PGB[3:0] = FMB VR1
*/ */
WRITE8_MEMBER(spdheat_state::ym1_port_a_w) WRITE8_MEMBER(spdheat_state::ym1_port_a_w)

10
src/mame/drivers/spg110.cpp
View File

@ -11,12 +11,12 @@
JAKKS Spiderman 5-in-1 (original release) JAKKS Spiderman 5-in-1 (original release)
Conny TV Virtual Tennis Conny TV Virtual Tennis
assumed: assumed:
JAKKS EA Sports (NHL 95 + Madden 95) (US) JAKKS EA Sports (NHL 95 + Madden 95) (US)
JAKKS EA Sports (NHL 95 + Fifa 96) (US) JAKKS EA Sports (NHL 95 + Fifa 96) (US)
JAKKS Bob the Builder JAKKS Bob the Builder
Conny Ping Pong Conny Ping Pong
JAKKS Disney (original release) JAKKS Disney (original release)
*******************************************************************************/ *******************************************************************************/

36
src/mame/drivers/supracan.cpp
View File

@ -92,25 +92,25 @@ DEBUG TRICKS:
#define DEBUG_PRIORITY (0) #define DEBUG_PRIORITY (0)
#define DEBUG_PRIORITY_INDEX (0) // 0-3 #define DEBUG_PRIORITY_INDEX (0) // 0-3
#define LOG_UNKNOWNS (1 << 0) #define LOG_UNKNOWNS (1 << 0)
#define LOG_DMA (1 << 1) #define LOG_DMA (1 << 1)
#define LOG_SPRDMA (1 << 2) #define LOG_SPRDMA (1 << 2)
#define LOG_SPRITES (1 << 3) #define LOG_SPRITES (1 << 3)
#define LOG_TILEMAP0 (1 << 4) #define LOG_TILEMAP0 (1 << 4)
#define LOG_TILEMAP1 (1 << 5) #define LOG_TILEMAP1 (1 << 5)
#define LOG_TILEMAP2 (1 << 6) #define LOG_TILEMAP2 (1 << 6)
#define LOG_ROZ (1 << 7) #define LOG_ROZ (1 << 7)
#define LOG_HFVIDEO (1 << 8) #define LOG_HFVIDEO (1 << 8)
#define LOG_IRQS (1 << 9) #define LOG_IRQS (1 << 9)
#define LOG_SOUND (1 << 10) #define LOG_SOUND (1 << 10)
#define LOG_HFUNKNOWNS (1 << 11) #define LOG_HFUNKNOWNS (1 << 11)
#define LOG_68K_SOUND (1 << 12) #define LOG_68K_SOUND (1 << 12)
#define LOG_CONTROLS (1 << 13) #define LOG_CONTROLS (1 << 13)
#define LOG_VIDEO (LOG_SPRDMA | LOG_SPRITES | LOG_TILEMAP0 | LOG_TILEMAP1 | LOG_TILEMAP2 | LOG_ROZ) #define LOG_VIDEO (LOG_SPRDMA | LOG_SPRITES | LOG_TILEMAP0 | LOG_TILEMAP1 | LOG_TILEMAP2 | LOG_ROZ)
#define LOG_ALL (LOG_UNKNOWNS | LOG_HFUNKNOWNS | LOG_DMA | LOG_VIDEO | LOG_HFVIDEO | LOG_IRQS | LOG_SOUND | LOG_68K_SOUND | LOG_CONTROLS) #define LOG_ALL (LOG_UNKNOWNS | LOG_HFUNKNOWNS | LOG_DMA | LOG_VIDEO | LOG_HFVIDEO | LOG_IRQS | LOG_SOUND | LOG_68K_SOUND | LOG_CONTROLS)
#define LOG_DEFAULT (LOG_ALL & ~(LOG_HFVIDEO | LOG_HFUNKNOWNS)) #define LOG_DEFAULT (LOG_ALL & ~(LOG_HFVIDEO | LOG_HFUNKNOWNS))
#define VERBOSE (0) #define VERBOSE (0)
#include "logmacro.h" #include "logmacro.h"
class supracan_state : public driver_device class supracan_state : public driver_device

18
src/mame/drivers/tk635.cpp
View File

@ -7,21 +7,21 @@
Hardware: Hardware:
- AMD N80C188-25 - AMD N80C188-25
- TERMTEK TKA-200 - TERMTEK TKA-200
- 128k + 32k RAM - 128k + 32k RAM
- 256 KB flash memory - 256 KB flash memory
Features: Features:
- 31.5khz or 48.1khz horizontal - 31.5khz or 48.1khz horizontal
- 70/72 hz vertical - 70/72 hz vertical
- 16 background/foreground/border colors - 16 background/foreground/border colors
- 24x80/132, 25x80/132, 42x80/132, 43x80/132 - 24x80/132, 25x80/132, 42x80/132, 43x80/132
- Standard PC/AT keyboard - Standard PC/AT keyboard
Notes: Notes:
- Identical to the Qume QVT-72 Plus? - Identical to the Qume QVT-72 Plus?
TODO: TODO:
- Everything - Everything
****************************************************************************/ ****************************************************************************/
@ -83,9 +83,9 @@ void tk635_state::io_map(address_map &map)
map(0x04, 0x04).w(FUNC(tk635_state::voffset_lsb_w)); map(0x04, 0x04).w(FUNC(tk635_state::voffset_lsb_w));
map(0x05, 0x05).w(FUNC(tk635_state::voffset_msb_w)); map(0x05, 0x05).w(FUNC(tk635_state::voffset_msb_w));
map(0x11, 0x11).r(FUNC(tk635_state::unk_11_r)); map(0x11, 0x11).r(FUNC(tk635_state::unk_11_r));
// map(0x13, 0x13).ram(); // host port // map(0x13, 0x13).ram(); // host port
map(0x19, 0x19).r(FUNC(tk635_state::unk_19_r)); map(0x19, 0x19).r(FUNC(tk635_state::unk_19_r));
// map(0x1b, 0x1b).ram(); // aux port // map(0x1b, 0x1b).ram(); // aux port
map(0xf0, 0xf0).w(FUNC(tk635_state::unk_f0_w)); map(0xf0, 0xf0).w(FUNC(tk635_state::unk_f0_w));
} }

42
src/mame/drivers/vii.cpp
View File

@ -101,14 +101,14 @@
Game seems unhappy with NVRAM, clears contents on each boot. Game seems unhappy with NVRAM, clears contents on each boot.
jak_pooh: jak_pooh:
In the 'Light Tag' minigame (select the rock) the game usually softlocks when you find a friend (with or without DRC) In the 'Light Tag' minigame (select the rock) the game usually softlocks when you find a friend (with or without DRC)
jak_care: jak_care:
All but one mini-game waits on RAM address 0x0165 changing from 0x00f9 to 0x00f8 All but one mini-game waits on RAM address 0x0165 changing from 0x00f9 to 0x00f8
The bottom left game "Wish Bear's Wishing Tree" appears to fail for more complex reasons. The bottom left game "Wish Bear's Wishing Tree" appears to fail for more complex reasons.
jak_disf: jak_disf:
Shows corrupt logo on first boot with no valid nvram (possibly hardware does too - verify if possible to invalidate EEPROM on device) Shows corrupt logo on first boot with no valid nvram (possibly hardware does too - verify if possible to invalidate EEPROM on device)
lexizeus: lexizeus:
Some corrupt sound effects and a few corrupt ground tiles a few minutes in. (checksum is good, and a video recorded Some corrupt sound effects and a few corrupt ground tiles a few minutes in. (checksum is good, and a video recorded
from one of these doesn't exhibit these problems, so either emulation issue or alt revision?) from one of these doesn't exhibit these problems, so either emulation issue or alt revision?)
vii: vii:
When loading a cart from file manager, sometimes MAME will crash. When loading a cart from file manager, sometimes MAME will crash.
@ -128,18 +128,18 @@
Disney Friends, MS Pacman, WallE, Batman (and some other HotGen GameKeys) for test mode, hold UP, Disney Friends, MS Pacman, WallE, Batman (and some other HotGen GameKeys) for test mode, hold UP,
press A, press DOWN during startup press A, press DOWN during startup
Capcom test (same access as other Hotgen games) mode looks like this (tested on PAL unit, same ROM as dumped one) Capcom test (same access as other Hotgen games) mode looks like this (tested on PAL unit, same ROM as dumped one)
RAM OK 2800 RAM OK 2800
111111 111111
5432109876543210 5432109876543210
IOA ............111. (values go from . to 1 when inputs are moved, never 0 as in MAME!, core bug?) IOA ............111. (values go from . to 1 when inputs are moved, never 0 as in MAME!, core bug?)
GAMEKEY E0 GAMEKEY E0
IOB0 IOB0
IOC XXX.........X... IOC XXX.........X...
SPRITES SPRITES
Care Bears : Hold analog stck up, rotate stick 360 degress back to up, press 'A' while still holding up Care Bears : Hold analog stck up, rotate stick 360 degress back to up, press 'A' while still holding up
TODO: TODO:
Work out how to access the hidden TEST menus for all games (most JAKKS games should have one at least) Work out how to access the hidden TEST menus for all games (most JAKKS games should have one at least)
@ -2491,7 +2491,7 @@ void spg2xx_game_state::rad_skatp(machine_config &config)
rad_skat(config); rad_skat(config);
m_maincpu->set_pal(true); m_maincpu->set_pal(true);
m_screen->set_refresh_hz(50); m_screen->set_refresh_hz(50);
// m_screen->set_size(320, 312); // m_screen->set_size(320, 312);
} }
void spg2xx_game_state::rad_sktv(machine_config &config) void spg2xx_game_state::rad_sktv(machine_config &config)
@ -2556,11 +2556,11 @@ void spg2xx_game_state::taikeegr(machine_config &config)
spg2xx_base(config); spg2xx_base(config);
m_screen->set_refresh_hz(50); m_screen->set_refresh_hz(50);
// m_screen->set_size(320, 312); // m_screen->set_size(320, 312);
m_maincpu->porta_in().set_ioport("P1"); m_maincpu->porta_in().set_ioport("P1");
// m_maincpu->portb_in().set_ioport("P2"); // m_maincpu->portb_in().set_ioport("P2");
// m_maincpu->portc_in().set_ioport("P3"); // m_maincpu->portc_in().set_ioport("P3");
NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_1); NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_1);
} }
@ -2934,7 +2934,7 @@ CONS( 2009, zone40, 0, 0, non_spg_base, wirels60, spg2xx_game_st
// Similar, SPG260?, scrambled // Similar, SPG260?, scrambled
CONS( 200?, lexizeus, 0, 0, lexizeus, lexizeus, spg2xx_game_state, init_zeus, "Lexibook", "Zeus IG900 20-in-1 (US?)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) CONS( 200?, lexizeus, 0, 0, lexizeus, lexizeus, spg2xx_game_state, init_zeus, "Lexibook", "Zeus IG900 20-in-1 (US?)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
// there are other regions of this, including a Finnish version "Haluatko miljonääriksi?" (see https://millionaire.fandom.com/wiki/Haluatko_miljon%C3%A4%C3%A4riksi%3F_(Play_Vision_game) ) // there are other regions of this, including a Finnish version "Haluatko miljonääriksi?" (see https://millionaire.fandom.com/wiki/Haluatko_miljon%C3%A4%C3%A4riksi%3F_(Play_Vision_game) )
CONS( 2006, pvmil, 0, 0, pvmil, pvmil, spg2xx_game_state, empty_init, "Play Vision", "Who Wants to Be a Millionaire (Play Vision, Plug and Play, UK)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // p4 inputs need mapping CONS( 2006, pvmil, 0, 0, pvmil, pvmil, spg2xx_game_state, empty_init, "Play Vision", "Who Wants to Be a Millionaire (Play Vision, Plug and Play, UK)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // p4 inputs need mapping
// there are multiple versions of this with different songs, was also sold by dreamGEAR as 'Shredmaster Jr.' (different title screen) // there are multiple versions of this with different songs, was also sold by dreamGEAR as 'Shredmaster Jr.' (different title screen)

36
src/mame/video/alpha68k_palette.cpp
View File

@ -2,26 +2,26 @@
// copyright-holders:Angelo Salese // copyright-holders:Angelo Salese
/****************************************************************************** /******************************************************************************
Alpha Denshi "NeoGeo" palette devices Alpha Denshi "NeoGeo" palette devices
Notes: Notes:
- URL reference: https://wiki.neogeodev.org/index.php?title=Palettes - URL reference: https://wiki.neogeodev.org/index.php?title=Palettes
TODO: TODO:
- Make mods to support NeoGeo HW (palette bank, shadows); - Make mods to support NeoGeo HW (palette bank, shadows);
- Are alpha68k.cpp/snk68.cpp with or without shadows? - Are alpha68k.cpp/snk68.cpp with or without shadows?
- Reference color, research exact consequences about this wiki claim: - Reference color, research exact consequences about this wiki claim:
"It always has to be pure black ($8000)(*) otherwise monitors won't "It always has to be pure black ($8000)(*) otherwise monitors won't
be happy and other colors won't be displayed correctly." be happy and other colors won't be displayed correctly."
(*) tested nam1975/skyadvnt, they actually setup $0000. (*) tested nam1975/skyadvnt, they actually setup $0000.
Update: Gold Medalist actually setup $0fff when starter pistol is shot Update: Gold Medalist actually setup $0fff when starter pistol is shot
on dash events, according to a reference video it causes generally darker on dash events, according to a reference video it causes generally darker
colors on playfield and a color overflow in the border area. colors on playfield and a color overflow in the border area.
We currently just dim the palette to simulate the effect, it's totally We currently just dim the palette to simulate the effect, it's totally
possible that the side effects are different depending on type of monitor possible that the side effects are different depending on type of monitor
used, and maybe the dimming is caused by the capture card uncapable of used, and maybe the dimming is caused by the capture card uncapable of
catching up the actual signal and intended behaviour is actually a bright catching up the actual signal and intended behaviour is actually a bright
flash (without palette clamp?). flash (without palette clamp?).
******************************************************************************/ ******************************************************************************/

2
src/mame/video/alpha68k_palette.h
View File

@ -2,7 +2,7 @@
// copyright-holders:Angelo Salese // copyright-holders:Angelo Salese
/*************************************************************************** /***************************************************************************
Alpha Denshi "NeoGeo" palette devices Alpha Denshi "NeoGeo" palette devices
***************************************************************************/ ***************************************************************************/

42
src/mame/video/nmk16spr.cpp
View File

@ -2,32 +2,32 @@
// copyright-holders:Mirko Buffoni,Nicola Salmoria,Bryan McPhail,David Haywood,R. Belmont,Alex Marshall,Angelo Salese,Luca Elia // copyright-holders:Mirko Buffoni,Nicola Salmoria,Bryan McPhail,David Haywood,R. Belmont,Alex Marshall,Angelo Salese,Luca Elia
// thanks-to:Richard Bush // thanks-to:Richard Bush
/* /*
NMK 16 bit sprite hardware NMK 16 bit sprite hardware
Configured in NMK008 + one or more NMK009s or TTL logics or FPGA Configured in NMK008 + one or more NMK009s or TTL logics or FPGA
From hardware manual : http://upl-gravedigger.boo.jp/pcb_info/pcb_manual_7.jpg From hardware manual : http://upl-gravedigger.boo.jp/pcb_info/pcb_manual_7.jpg
used by: used by:
nmk16.cpp nmk16.cpp
powerins.cpp powerins.cpp
Sprite format (16 byte per each sprite): Sprite format (16 byte per each sprite):
Offset Bits Description Offset Bits Description
fedcba98 76543210 fedcba98 76543210
00 -------- -------s Visible 00 -------- -------s Visible
02 ---x---- -------- Flip X (powerins) 02 ---x---- -------- Flip X (powerins)
------x- -------- Flip Y (manybloc) ------x- -------- Flip Y (manybloc)
-------x -------- Flip X (manybloc) or Code hi bits (powerins) -------x -------- Flip X (manybloc) or Code hi bits (powerins)
-------- xxxx---- Number of tiles along Y, minus 1 (1-16) -------- xxxx---- Number of tiles along Y, minus 1 (1-16)
-------- ----xxxx Number of tiles along X, minus 1 (1-16) -------- ----xxxx Number of tiles along X, minus 1 (1-16)
04 -------- -------- Unused 04 -------- -------- Unused
06 xxxxxxxx xxxxxxxx Code (low 15 bit for powerins) 06 xxxxxxxx xxxxxxxx Code (low 15 bit for powerins)
08 ------xx xxxxxxxx X (10 bit for powerins, 9 bit for others) 08 ------xx xxxxxxxx X (10 bit for powerins, 9 bit for others)
0a -------- -------- Unused 0a -------- -------- Unused
0c ------xx xxxxxxxx Y (10 bit for powerins, 9 bit for others) 0c ------xx xxxxxxxx Y (10 bit for powerins, 9 bit for others)
0e -------- --xxxxxx Palette select (differ bits per game (4/5/6 bits)) 0e -------- --xxxxxx Palette select (differ bits per game (4/5/6 bits))
*/ */

4
src/mame/video/tmap038.cpp
View File

@ -70,14 +70,14 @@
---- ---- ---4 ---- Layer Disable ---- ---- ---4 ---- Layer Disable
---- ---- ---- 3210 Varies* ---- ---- ---- 3210 Varies*
*color bank for mcatadv or Layer-Layer priority for cave *color bank for mcatadv or Layer-Layer priority for cave
There are more! There are more!
*************************************************************************** ***************************************************************************
TODO: TODO:
de-fragmentation and merge drawing behavior into tmap038.cpp de-fragmentation and merge drawing behavior into tmap038.cpp
*************************************************************************** ***************************************************************************

2
src/osd/modules/render/bgfx/chain.h
View File

@ -55,7 +55,7 @@ private:
std::map<std::string, bgfx_target*> m_target_map; std::map<std::string, bgfx_target*> m_target_map;
int64_t m_current_time; int64_t m_current_time;
uint32_t m_screen_index; uint32_t m_screen_index;
bool m_has_converter; bool m_has_converter;
}; };
#endif // __DRAWBGFX_CHAIN__ #endif // __DRAWBGFX_CHAIN__

6
src/osd/modules/render/bgfx/chainmanager.h
View File

@ -144,10 +144,10 @@ private:
std::vector<ui::menu_item> m_selection_sliders; std::vector<ui::menu_item> m_selection_sliders;
std::vector<std::unique_ptr<slider_state>> m_core_sliders; std::vector<std::unique_ptr<slider_state>> m_core_sliders;
std::vector<int32_t> m_current_chain; std::vector<int32_t> m_current_chain;
std::vector<bgfx_texture*> m_screen_textures; std::vector<bgfx_texture*> m_screen_textures;
std::vector<bgfx_texture*> m_screen_palettes; std::vector<bgfx_texture*> m_screen_palettes;
std::vector<bgfx_effect*> m_converters; std::vector<bgfx_effect*> m_converters;
std::vector<screen_prim> m_screen_prims; std::vector<screen_prim> m_screen_prims;
std::vector<uint8_t> m_palette_temp; std::vector<uint8_t> m_palette_temp;
static const uint32_t CHAIN_NONE; static const uint32_t CHAIN_NONE;

6
src/osd/modules/render/bgfx/inputpair.cpp
View File

@ -50,10 +50,10 @@ void bgfx_input_pair::bind(bgfx_effect *effect, const int32_t screen) const
std::string name = m_texture + std::to_string(screen); std::string name = m_texture + std::to_string(screen);
bgfx_texture_handle_provider* provider = chains().textures().provider(name); bgfx_texture_handle_provider* provider = chains().textures().provider(name);
if (!provider) if (!provider)
return; return;
bgfx_uniform *tex_size = effect->uniform("u_tex_size" + std::to_string(m_index)); bgfx_uniform *tex_size = effect->uniform("u_tex_size" + std::to_string(m_index));
if (tex_size && provider) if (tex_size && provider)
{ {
float values[2] = { float(provider->width()), float(provider->height()) }; float values[2] = { float(provider->width()), float(provider->height()) };

44
src/osd/modules/render/bgfxutil.cpp
View File

@ -41,28 +41,28 @@ const bgfx::Memory* bgfx_util::mame_texture_data_to_bgfx_texture_data(bgfx::Text
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {
switch (format) switch (format)
{ {
case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16): case PRIMFLAG_TEXFORMAT(TEXFORMAT_PALETTE16):
copy_util::copyline_palette16(dst, src16, width, palette); copy_util::copyline_palette16(dst, src16, width, palette);
src16 += rowpixels; src16 += rowpixels;
break; break;
case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16): case PRIMFLAG_TEXFORMAT(TEXFORMAT_YUY16):
copy_util::copyline_yuy16_to_argb(dst, src16, width, palette, 1); copy_util::copyline_yuy16_to_argb(dst, src16, width, palette, 1);
src16 += rowpixels; src16 += rowpixels;
break; break;
case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32): case PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32):
copy_util::copyline_argb32(dst, src32, width, palette); copy_util::copyline_argb32(dst, src32, width, palette);
src32 += rowpixels; src32 += rowpixels;
break; break;
case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32): case PRIMFLAG_TEXFORMAT(TEXFORMAT_RGB32):
copy_util::copyline_rgb32(dst, src32, width, palette); copy_util::copyline_rgb32(dst, src32, width, palette);
src32 += rowpixels; src32 += rowpixels;
break; break;
default: default:
break; break;
} }
dst += width; dst += width;
} }
return mem;*/ return mem;*/
} }

2
src/tools/imgtool/modules/ti990hd.cpp
View File

@ -227,7 +227,7 @@ struct ti990_fdr
UINT32BE eom; /* end of medium record number */ UINT32BE eom; /* end of medium record number */
UINT32BE bkm; /* end of medium block number */ UINT32BE bkm; /* end of medium block number */
UINT16BE ofm; /* end of medium offset / */ UINT16BE ofm; /* end of medium offset / */
/* prelog number for KIF */ /* prelog number for KIF */
UINT32BE fbq; /* free block queue head */ UINT32BE fbq; /* free block queue head */
UINT16BE btr; /* B-tree roots block # */ UINT16BE btr; /* B-tree roots block # */
UINT32BE ebq; /* empty block queue head */ UINT32BE ebq; /* empty block queue head */