diff options
| author | 2019-01-27 14:22:20 +1100 | |
|---|---|---|
| committer | 2019-01-27 14:22:20 +1100 | |
| commit | 76323eb770cca3655f40d400fe5f34fbaa573d6c (patch) | |
| tree | 9a2f8773d3b3e05755d24ecd2b4dba19afcd1374 /src | |
| parent | 212f26f75973b840d400f4d57fe227a98de89981 (diff) | |
srcclean and cleanup (nw)
Diffstat (limited to 'src')
160 files changed, 1006 insertions, 998 deletions
diff --git a/src/devices/bus/bbc/rom/dfs.cpp b/src/devices/bus/bbc/rom/dfs.cpp index a1f1908dca4..d8e48f91e8b 100644 --- a/src/devices/bus/bbc/rom/dfs.cpp +++ b/src/devices/bus/bbc/rom/dfs.cpp @@ -60,4 +60,4 @@ READ8_MEMBER(bbc_mrme00_device::read) WRITE8_MEMBER(bbc_mrme00_device::write) { get_ram_base()[offset & (get_ram_size() - 1)] = data; -}
\ No newline at end of file +} diff --git a/src/devices/bus/ekara/rom.cpp b/src/devices/bus/ekara/rom.cpp index 7ba557b0917..cf244a5c4f0 100644 --- a/src/devices/bus/ekara/rom.cpp +++ b/src/devices/bus/ekara/rom.cpp @@ -122,5 +122,5 @@ void ekara_cart(device_slot_interface &device) { device.option_add_internal("plain", EKARA_ROM_PLAIN); device.option_add_internal("rom_24lc04", EKARA_ROM_I2C_24LC04); - device.option_add_internal("rom_24lc02", EKARA_ROM_I2C_24LC02); + device.option_add_internal("rom_24lc02", EKARA_ROM_I2C_24LC02); } diff --git a/src/devices/bus/electron/romboxp.cpp b/src/devices/bus/electron/romboxp.cpp index e2c5784eac8..5e4a7880c83 100644 --- a/src/devices/bus/electron/romboxp.cpp +++ b/src/devices/bus/electron/romboxp.cpp @@ -104,10 +104,10 @@ void electron_romboxp_device::device_add_mconfig(machine_config &config) /* cartridges */ ELECTRON_CARTSLOT(config, m_cart[0], DERIVED_CLOCK(1, 1), electron_cart, nullptr); // ROM SLOT 0/1 - m_cart[0]->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w)); + m_cart[0]->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w)); m_cart[0]->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::nmi_w)); ELECTRON_CARTSLOT(config, m_cart[1], DERIVED_CLOCK(1, 1), electron_cart, nullptr); // ROM SLOT 2/3 - m_cart[1]->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w)); + m_cart[1]->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w)); m_cart[1]->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::nmi_w)); } diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index f391a1b6658..ecdac5a9956 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -29,6 +29,9 @@ #include "nubus_specpdq.h" #include "screen.h" +//#define VERBOSE 1 +#include "logmacro.h" + #define SPECPDQ_SCREEN_NAME "specpdq_screen" #define SPECPDQ_ROM_REGION "specpdq_rom" @@ -242,7 +245,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) switch (offset) { case 0xc0054: // mode 1 - logerror("%x to mode1\n", data); + LOG("%x to mode1\n", data); break; case 0xc005c: // interrupt control @@ -261,7 +264,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) break; case 0xc007a: - logerror("%x to mode2\n", data); + LOG("%x to mode2\n", data); switch (data) { @@ -278,11 +281,11 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) break; } - logerror("m_mode = %d\n", m_mode); + LOG("m_mode = %d\n", m_mode); break; case 0x120000: // DAC address - logerror("%08x to DAC control %s\n", data,machine().describe_context()); + LOG("%08x to DAC control %s\n", data,machine().describe_context()); m_clutoffs = ((data>>8)&0xff)^0xff; break; @@ -291,7 +294,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) if (m_count == 3) { - logerror("RAMDAC: color %d = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); + LOG("RAMDAC: color %d = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette->set_pen_color(m_clutoffs, rgb_t(m_colors[0], m_colors[1], m_colors[2])); m_palette_val[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; @@ -370,7 +373,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) case 0x18103f: if(offset == 0x181000) { machine().debug_break(); - logerror("Pattern %08x @ %x\n", data ^ 0xffffffff, offset); + LOG("Pattern %08x @ %x\n", data ^ 0xffffffff, offset); } m_fillbytes[((offset&0x3f)*4)] = ((data>>24) & 0xff) ^ 0xff; m_fillbytes[((offset&0x3f)*4)+1] = ((data>>16) & 0xff) ^ 0xff; @@ -380,40 +383,40 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) // blitter control case 0x182006: - logerror("%08x (%d) to blitter ctrl 1 %s rectangle\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); + LOG("%08x (%d) to blitter ctrl 1 %s rectangle\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); break; case 0x182008: - logerror("%08x (%d) to blitter ctrl 2 %s rectangle\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); + LOG("%08x (%d) to blitter ctrl 2 %s rectangle\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_patofsx = (data ^ 0xffffffff) & 7; m_patofsy = ((data ^ 0xffffffff)>>3) & 7; break; case 0x18200e: - logerror("%08x (%d) to blitter ctrl 3 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); + LOG("%08x (%d) to blitter ctrl 3 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_width = data ^ 0xffffffff; break; case 0x18200b: - logerror("%08x (%d) to blitter ctrl 4 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); + LOG("%08x (%d) to blitter ctrl 4 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_height = (data ^ 0xffffffff) & 0xffff; break; case 0x18200a: data ^= 0xffffffff; - logerror("%08x to blitter ctrl 5 %s\n", data, machine().describe_context()); + LOG("%08x to blitter ctrl 5 %s\n", data, machine().describe_context()); m_vram_src = data>>2; break; case 0x182009: data ^= 0xffffffff; - logerror("%08x to blitter ctrl 6 %s\n", data, machine().describe_context()); + LOG("%08x to blitter ctrl 6 %s\n", data, machine().describe_context()); m_vram_addr = data>>2; break; case 0x182007: data ^= 0xffffffff; - logerror("%08x to blitter ctrl 7 %s\n", data, machine().describe_context()); + LOG("%08x to blitter ctrl 7 %s\n", data, machine().describe_context()); // fill rectangle if (data == 2) @@ -423,7 +426,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) int ddx = m_vram_addr & 3; - logerror("Fill rectangle with %02x %02x %02x %02x, adr %x (%d, %d) width %d height %d delta %d %d\n", m_fillbytes[0], m_fillbytes[1], m_fillbytes[2], m_fillbytes[3], m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_width, m_height, m_patofsx, m_patofsy); + LOG("Fill rectangle with %02x %02x %02x %02x, adr %x (%d, %d) width %d height %d delta %d %d\n", m_fillbytes[0], m_fillbytes[1], m_fillbytes[2], m_fillbytes[3], m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_width, m_height, m_patofsx, m_patofsy); for (y = 0; y <= m_height; y++) { @@ -442,7 +445,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) int sdx = m_vram_src & 3; int ddx = m_vram_addr & 3; - logerror("Copy rectangle forwards, width %d height %d dst %x (%d, %d) src %x (%d, %d)\n", m_width, m_height, m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_vram_src, m_vram_src % 1152, m_vram_src / 1152); + LOG("Copy rectangle forwards, width %d height %d dst %x (%d, %d) src %x (%d, %d)\n", m_width, m_height, m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_vram_src, m_vram_src % 1152, m_vram_src / 1152); for (y = 0; y <= m_height; y++) { @@ -462,7 +465,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) int sdx = m_vram_src & 3; int ddx = m_vram_addr & 3; - logerror("Copy rectangle backwards, width %d height %d dst %x (%d, %d) src %x (%d, %d)\n", m_width, m_height, m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_vram_src, m_vram_src % 1152, m_vram_src / 1152); + LOG("Copy rectangle backwards, width %d height %d dst %x (%d, %d) src %x (%d, %d)\n", m_width, m_height, m_vram_addr, m_vram_addr % 1152, m_vram_addr / 1152, m_vram_src, m_vram_src % 1152, m_vram_src / 1152); for (y = 0; y < m_height; y++) { @@ -475,12 +478,12 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) } else { - logerror("Unknown blitter command %08x\n", data); + LOG("Unknown blitter command %08x\n", data); } break; default: - logerror("specpdq_w: %08x @ %x (mask %08x %s)\n", data^0xffffffff, offset, mem_mask, machine().describe_context()); + LOG("specpdq_w: %08x @ %x (mask %08x %s)\n", data^0xffffffff, offset, mem_mask, machine().describe_context()); break; } } diff --git a/src/devices/bus/vsmile/vsmile_slot.h b/src/devices/bus/vsmile/vsmile_slot.h index a7f5d4dec32..b50af088027 100644 --- a/src/devices/bus/vsmile/vsmile_slot.h +++ b/src/devices/bus/vsmile/vsmile_slot.h @@ -52,8 +52,8 @@ protected: device_vsmile_cart_interface(const machine_config &mconfig, device_t &device); // internal state - uint16_t *m_rom; // this points to the cart rom region - uint32_t m_rom_size; // this is the actual game size, not the rom region size! + uint16_t *m_rom; // this points to the cart rom region + uint32_t m_rom_size; // this is the actual game size, not the rom region size! std::vector<uint16_t> m_nvram; }; diff --git a/src/devices/cpu/alpha/alpha.cpp b/src/devices/cpu/alpha/alpha.cpp index f4181060128..1dc11ca7292 100644 --- a/src/devices/cpu/alpha/alpha.cpp +++ b/src/devices/cpu/alpha/alpha.cpp @@ -14,10 +14,12 @@ */ #include "emu.h" -#include "debugger.h" #include "alpha.h" #include "alphad.h" +#include "debugger.h" + + #define LOG_GENERAL (1U << 0) #define LOG_EXCEPTION (1U << 1) #define LOG_SYSCALLS (1U << 2) diff --git a/src/devices/cpu/dspp/dspp.h b/src/devices/cpu/dspp/dspp.h index 9ebf08f6f6e..302d141db13 100644 --- a/src/devices/cpu/dspp/dspp.h +++ b/src/devices/cpu/dspp/dspp.h @@ -67,10 +67,10 @@ public: DECLARE_READ16_MEMBER( noise_r ); void update_fifo_dma(); - void print_sums() { printf("%04x: %04x\n", (uint16_t)m_core->m_arg0, (uint16_t)m_core->m_arg1); } - void print_branches() { printf("Branch: %d %d %d %d %d\n", m_core->m_arg0 ? 1 : 0, m_core->m_arg1 ? 1 : 0, m_core->m_arg2 ? 1 : 0, m_core->m_arg3 ? 1 : 0, m_core->m_arg4 ? 1 : 0); } - void print_value() { printf("Value is %08x\n", m_core->m_arg0); } - void print_addr() { printf("New value is %08x from %08x\n", m_core->m_arg0, m_core->m_arg1); } + void print_sums() { printf("%04x: %04x\n", (uint16_t)m_core->m_arg0, (uint16_t)m_core->m_arg1); } + void print_branches() { printf("Branch: %d %d %d %d %d\n", m_core->m_arg0 ? 1 : 0, m_core->m_arg1 ? 1 : 0, m_core->m_arg2 ? 1 : 0, m_core->m_arg3 ? 1 : 0, m_core->m_arg4 ? 1 : 0); } + void print_value() { printf("Value is %08x\n", m_core->m_arg0); } + void print_addr() { printf("New value is %08x from %08x\n", m_core->m_arg0, m_core->m_arg1); } protected: // device-level overrides @@ -232,10 +232,10 @@ private: const char *m_format; uint32_t m_arg0; - uint32_t m_arg1; - uint32_t m_arg2; - uint32_t m_arg3; - uint32_t m_arg4; + uint32_t m_arg1; + uint32_t m_arg2; + uint32_t m_arg3; + uint32_t m_arg4; struct { @@ -316,7 +316,7 @@ private: uint32_t cycles; /* accumulated cycles */ uint8_t checkints; /* need to check interrupts before next instruction */ uint8_t checksoftints; /* need to check software interrupts before next instruction */ - uml::code_label abortlabel; /* label to abort execution of this block */ + uml::code_label abortlabel; /* label to abort execution of this block */ uml::code_label labelnum; /* index for local labels */ }; diff --git a/src/devices/cpu/dspp/dsppdrc.cpp b/src/devices/cpu/dspp/dsppdrc.cpp index aefa9b9999c..68b0c3cb741 100644 --- a/src/devices/cpu/dspp/dsppdrc.cpp +++ b/src/devices/cpu/dspp/dsppdrc.cpp @@ -22,7 +22,7 @@ using namespace uml; // map variables #define MAPVAR_PC M0 -#define MAPVAR_CYCLES M1 +#define MAPVAR_CYCLES M1 // exit codes #define EXECUTE_OUT_OF_CYCLES 0 @@ -244,12 +244,12 @@ void dspp_device::compile_block(offs_t pc) if (seqhead->flags & OPFLAG_IS_BRANCH_TARGET) UML_LABEL(block, seqhead->pc | 0x80000000); // label seqhead->pc - compiler.abortlabel = compiler.labelnum++; + compiler.abortlabel = compiler.labelnum++; /* iterate over instructions in the sequence and compile them */ for (curdesc = seqhead; curdesc != seqlast->next(); curdesc = curdesc->next()) generate_sequence_instruction(block, &compiler, curdesc); - UML_LABEL(block, compiler.abortlabel); + UML_LABEL(block, compiler.abortlabel); /* if we need to return to the start, do it */ if (seqlast->flags & OPFLAG_RETURN_TO_START) @@ -293,11 +293,11 @@ void dspp_device::generate_checksum_block(drcuml_block &block, compiler_state *c uint32_t sum = seqhead->opptr.w[0]; uint32_t addr = seqhead->physpc; const void *base = m_codeptr(addr); - UML_MOV(block, I0, 0); + UML_MOV(block, I0, 0); UML_LOAD(block, I0, base, 0, SIZE_WORD, SCALE_x2); // load i0,base,0,word - UML_CMP(block, I0, sum); // cmp i0,opptr[0] - UML_EXHc(block, COND_NE, *m_nocode, seqhead->pc); // exne nocode,seqhead->pc + UML_CMP(block, I0, sum); // cmp i0,opptr[0] + UML_EXHc(block, COND_NE, *m_nocode, seqhead->pc); // exne nocode,seqhead->pc } } @@ -307,7 +307,7 @@ void dspp_device::generate_checksum_block(drcuml_block &block, compiler_state *c uint32_t sum = 0; uint32_t addr = seqhead->physpc; const void *base = m_codeptr(addr); - UML_LOAD(block, I0, base, 0, SIZE_WORD, SCALE_x2); // load i0,base,0,dword + UML_LOAD(block, I0, base, 0, SIZE_WORD, SCALE_x2); // load i0,base,0,dword sum += seqhead->opptr.w[0]; for (curdesc = seqhead->next(); curdesc != seqlast->next(); curdesc = curdesc->next()) if (!(curdesc->flags & OPFLAG_VIRTUAL_NOOP)) @@ -315,12 +315,12 @@ void dspp_device::generate_checksum_block(drcuml_block &block, compiler_state *c addr = curdesc->physpc; base = m_codeptr(addr); assert(base != nullptr); - UML_LOAD(block, I1, base, 0, SIZE_WORD, SCALE_x2); // load i1,base,dword - UML_ADD(block, I0, I0, I1); // add i0,i0,i1 + UML_LOAD(block, I1, base, 0, SIZE_WORD, SCALE_x2); // load i1,base,dword + UML_ADD(block, I0, I0, I1); // add i0,i0,i1 sum += curdesc->opptr.w[0]; } - UML_CMP(block, I0, sum); // cmp i0,sum - UML_EXHc(block, COND_NE, *m_nocode, epc(seqhead)); // exne nocode,seqhead->pc + UML_CMP(block, I0, sum); // cmp i0,sum + UML_EXHc(block, COND_NE, *m_nocode, epc(seqhead)); // exne nocode,seqhead->pc } } @@ -373,12 +373,12 @@ void dspp_device::static_generate_nocode_handler() /* generate a hash jump via the current mode and PC */ alloc_handle(m_drcuml.get(), &m_nocode, "nocode"); - UML_HANDLE(block, *m_nocode); // handle nocode - UML_GETEXP(block, I0); // getexp i0 + UML_HANDLE(block, *m_nocode); // handle nocode + UML_GETEXP(block, I0); // getexp i0 - UML_MOV(block, mem(&m_core->m_pc), I0); // mov [pc],i0 - //save_fast_iregs(block); // <save fastregs> - UML_EXIT(block, EXECUTE_MISSING_CODE); // exit EXECUTE_MISSING_CODE + UML_MOV(block, mem(&m_core->m_pc), I0); // mov [pc],i0 + //save_fast_iregs(block); // <save fastregs> + UML_EXIT(block, EXECUTE_MISSING_CODE); // exit EXECUTE_MISSING_CODE block.end(); } @@ -390,11 +390,11 @@ void dspp_device::static_generate_out_of_cycles() /* generate a hash jump via the current mode and PC */ alloc_handle(m_drcuml.get(), &m_out_of_cycles, "out_of_cycles"); - UML_HANDLE(block, *m_out_of_cycles); // handle out_of_cycles - UML_GETEXP(block, I0); // getexp i0 - UML_MOV(block, mem(&m_core->m_pc), I0); // mov <pc>,i0 - //save_fast_iregs(block); // <save fastregs> - UML_EXIT(block, EXECUTE_OUT_OF_CYCLES); // exit EXECUTE_OUT_OF_CYCLES + UML_HANDLE(block, *m_out_of_cycles); // handle out_of_cycles + UML_GETEXP(block, I0); // getexp i0 + UML_MOV(block, mem(&m_core->m_pc), I0); // mov <pc>,i0 + //save_fast_iregs(block); // <save fastregs> + UML_EXIT(block, EXECUTE_OUT_OF_CYCLES); // exit EXECUTE_OUT_OF_CYCLES block.end(); } @@ -402,28 +402,28 @@ void dspp_device::static_generate_out_of_cycles() void dspp_device::generate_sequence_instruction(drcuml_block &block, compiler_state *compiler, const opcode_desc *desc) { /* set the PC map variable */ - UML_MAPVAR(block, MAPVAR_PC, desc->pc); // mapvar PC,desc->pc + UML_MAPVAR(block, MAPVAR_PC, desc->pc); // mapvar PC,desc->pc /* accumulate total cycles */ compiler->cycles += desc->cycles; /* update the icount map variable */ - UML_MAPVAR(block, MAPVAR_CYCLES, compiler->cycles); // mapvar CYCLES,compiler->cycles + UML_MAPVAR(block, MAPVAR_CYCLES, compiler->cycles); // mapvar CYCLES,compiler->cycles /* if we are debugging, call the debugger */ if ((machine().debug_flags & DEBUG_FLAG_ENABLED) != 0) { - UML_MOV(block, mem(&m_core->m_pc), desc->pc); // mov [pc],desc->pc - //save_fast_iregs(block); // <save fastregs> - UML_DEBUG(block, desc->pc); // debug desc->pc + UML_MOV(block, mem(&m_core->m_pc), desc->pc); // mov [pc],desc->pc + //save_fast_iregs(block); // <save fastregs> + UML_DEBUG(block, desc->pc); // debug desc->pc } /* if we hit an unmapped address, fatal error */ if (desc->flags & OPFLAG_COMPILER_UNMAPPED) { - UML_MOV(block, mem(&m_core->m_pc), desc->pc); // mov [pc],desc->pc - save_fast_iregs(block); // <save fastregs> - UML_EXIT(block, EXECUTE_UNMAPPED_CODE); // exit EXECUTE_UNMAPPED_CODE + UML_MOV(block, mem(&m_core->m_pc), desc->pc); // mov [pc],desc->pc + save_fast_iregs(block); // <save fastregs> + UML_EXIT(block, EXECUTE_UNMAPPED_CODE); // exit EXECUTE_UNMAPPED_CODE } /* unless this is a virtual no-op, it's a regular instruction */ @@ -438,9 +438,9 @@ void dspp_device::generate_update_cycles(drcuml_block &block, compiler_state *co /* account for cycles */ if (compiler->cycles > 0) { - UML_SUB(block, mem(&m_core->m_icount), mem(&m_core->m_icount), MAPVAR_CYCLES); // sub icount,icount,cycles - UML_MAPVAR(block, MAPVAR_CYCLES, 0); // mapvar cycles,0 - UML_EXHc(block, COND_S, *m_out_of_cycles, param); // exh out_of_cycles,nextpc + UML_SUB(block, mem(&m_core->m_icount), mem(&m_core->m_icount), MAPVAR_CYCLES); // sub icount,icount,cycles + UML_MAPVAR(block, MAPVAR_CYCLES, 0); // mapvar cycles,0 + UML_EXHc(block, COND_S, *m_out_of_cycles, param); // exh out_of_cycles,nextpc } compiler->cycles = 0; } @@ -458,8 +458,8 @@ void dspp_device::generate_opcode(drcuml_block &block, compiler_state *compiler, code_label skip = compiler->labelnum++; UML_TEST(block, mem(&m_core->m_dspx_control), DSPX_CONTROL_GWILLING); UML_JMPc(block, COND_Z, compiler->abortlabel); - //UML_TEST(block, mem(&m_core->m_flag_sleep), 1); - //UML_JMPc(block, COND_NZ, compiler->abortlabel); + //UML_TEST(block, mem(&m_core->m_flag_sleep), 1); + //UML_JMPc(block, COND_NZ, compiler->abortlabel); //UML_MOV(block, mem(&m_core->m_arg0), desc->physpc); //UML_MOV(block, mem(&m_core->m_arg1), op); @@ -522,7 +522,7 @@ void dspp_device::generate_super_special(drcuml_block &block, compiler_state *co { if (m_drcuml.get()->logging()) block.append_comment("BAC"); - UML_SHR(block, mem(&m_core->m_jmpdest), mem(&m_core->m_acc), 4); // m_core->m_pc = m_core->m_acc >> 4; + UML_SHR(block, mem(&m_core->m_jmpdest), mem(&m_core->m_acc), 4); // m_core->m_pc = m_core->m_acc >> 4; generate_branch(block, compiler, desc); break; } @@ -549,8 +549,8 @@ void dspp_device::generate_super_special(drcuml_block &block, compiler_state *co // TODO: How does sleep work? if (m_drcuml.get()->logging()) block.append_comment("SLEEP"); - UML_SUB(block, mem(&m_core->m_pc), mem(&m_core->m_pc), 1); // --m_core->m_pc; - UML_MOV(block, mem(&m_core->m_flag_sleep), 1); // m_core->m_flag_sleep = 1; + UML_SUB(block, mem(&m_core->m_pc), mem(&m_core->m_pc), 1); // --m_core->m_pc; + UML_MOV(block, mem(&m_core->m_flag_sleep), 1); // m_core->m_flag_sleep = 1; break; } @@ -609,7 +609,7 @@ void dspp_device::generate_special_opcode(drcuml_block &block, compiler_state *c // Indirect if (regdi & 0x0010) { - UML_CALLH(block, *m_dm_read16); // addr = read_data(addr); + UML_CALLH(block, *m_dm_read16); // addr = read_data(addr); UML_MOV(block, I2, I0); } else @@ -621,7 +621,7 @@ void dspp_device::generate_special_opcode(drcuml_block &block, compiler_state *c generate_read_next_operand(block, compiler, desc); UML_MOV(block, I0, I1); UML_MOV(block, I1, I2); - UML_CALLH(block, *m_dm_write16); // write_data(addr, read_next_operand()); + UML_CALLH(block, *m_dm_write16); // write_data(addr, read_next_operand()); break; } case 5: // RBASE @@ -639,7 +639,7 @@ void dspp_device::generate_special_opcode(drcuml_block &block, compiler_state *c generate_read_next_operand(block, compiler, desc); UML_MOV(block, I0, I1); UML_MOV(block, I1, op & 0x3ff); - UML_CALLH(block, *m_dm_write16); // write_data(op & 0x3ff, read_next_operand()); + UML_CALLH(block, *m_dm_write16); // write_data(op & 0x3ff, read_next_operand()); break; } case 7: // MOVEI @@ -648,12 +648,12 @@ void dspp_device::generate_special_opcode(drcuml_block &block, compiler_state *c block.append_comment("MOVEI"); generate_parse_operands(block, compiler, desc, 1); UML_MOV(block, I1, op & 0x3ff); - UML_CALLH(block, *m_dm_read16); // uint32_t addr = read_data(op & 0x3ff); + UML_CALLH(block, *m_dm_read16); // uint32_t addr = read_data(op & 0x3ff); UML_MOV(block, I2, I1); generate_read_next_operand(block, compiler, desc); UML_MOV(block, I0, I1); UML_MOV(block, I1, I2); - UML_CALLH(block, *m_dm_write16); // write_data(addr, read_next_operand()); + UML_CALLH(block, *m_dm_write16); // write_data(addr, read_next_operand()); break; } @@ -669,23 +669,23 @@ void dspp_device::generate_branch(drcuml_block &block, compiler_state *compiler, /* update the cycles and jump through the hash table to the target */ if (desc->targetpc != BRANCH_TARGET_DYNAMIC) { - generate_update_cycles(block, &compiler_temp, desc->targetpc); // <subtract cycles> + generate_update_cycles(block, &compiler_temp, desc->targetpc); // <subtract cycles> if (desc->flags & OPFLAG_INTRABLOCK_BRANCH) - UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc | 0x80000000 + UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc | 0x80000000 else - UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode + UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode } else { - generate_update_cycles(block, &compiler_temp, uml::mem(&m_core->m_jmpdest)); // <subtract cycles> - UML_HASHJMP(block, 0, mem(&m_core->m_jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode + generate_update_cycles(block, &compiler_temp, uml::mem(&m_core->m_jmpdest)); // <subtract cycles> + UML_HASHJMP(block, 0, mem(&m_core->m_jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode } /* update the label */ compiler->labelnum = compiler_temp.labelnum; /* reset the mapvar to the current cycles */ - UML_MAPVAR(block, MAPVAR_CYCLES, compiler->cycles); // mapvar CYCLES,compiler.cycles + UML_MAPVAR(block, MAPVAR_CYCLES, compiler->cycles); // mapvar CYCLES,compiler.cycles } void dspp_device::generate_branch_opcode(drcuml_block &block, compiler_state *compiler, const opcode_desc *desc) @@ -718,10 +718,10 @@ void dspp_device::generate_branch_opcode(drcuml_block &block, compiler_state *co UML_OR(block, I0, I0, mask0); UML_OR(block, I1, I1, mask1); - UML_AND(block, I0, I0, I1); // bool branch = (flag0 || mask0) && (flag1 || mask1); + UML_AND(block, I0, I0, I1); // bool branch = (flag0 || mask0) && (flag1 || mask1); - if (mode == 2) // if (mode == 2) - UML_SUB(block, I0, 1, I0); // branch = !branch; + if (mode == 2) // if (mode == 2) + UML_SUB(block, I0, 1, I0); // branch = !branch; //UML_MOV(block, mem(&m_core->m_arg0), I0); //UML_MOV(block, mem(&m_core->m_arg2), 1-mask0); @@ -729,9 +729,9 @@ void dspp_device::generate_branch_opcode(drcuml_block &block, compiler_state *co //UML_CALLC(block, cfunc_print_branches, this); code_label skip = compiler->labelnum++; - UML_TEST(block, I0, 1); // if (branch) + UML_TEST(block, I0, 1); // if (branch) UML_JMPc(block, COND_Z, skip); - UML_MOV(block, mem(&m_core->m_jmpdest), op & 0x3ff); // m_core->m_pc = op & 0x3ff; + UML_MOV(block, mem(&m_core->m_jmpdest), op & 0x3ff); // m_core->m_pc = op & 0x3ff; generate_branch(block, compiler, desc); UML_LABEL(block, skip); } @@ -745,19 +745,19 @@ void dspp_device::generate_complex_branch_opcode(drcuml_block &block, compiler_s case 0: // BLT if (m_drcuml.get()->logging()) block.append_comment("BLT"); - UML_XOR(block, I0, mem(&m_core->m_flag_neg), mem(&m_core->m_flag_over)); // branch = (n && !v) || (!n && v); + UML_XOR(block, I0, mem(&m_core->m_flag_neg), mem(&m_core->m_flag_over)); // branch = (n && !v) || (!n && v); break; case 1: // BLE if (m_drcuml.get()->logging()) block.append_comment("BLE"); UML_XOR(block, I0, mem(&m_core->m_flag_neg), mem(&m_core->m_flag_over)); - UML_OR(block, I0, I0, mem(&m_core->m_flag_zero)); // branch = ((n && !v) || (!n && v)) || z; + UML_OR(block, I0, I0, mem(&m_core->m_flag_zero)); // branch = ((n && !v) || (!n && v)) || z; break; case 2: // BGE if (m_drcuml.get()->logging()) block.append_comment("BGE"); UML_XOR(block, I0, mem(&m_core->m_flag_neg), mem(&m_core->m_flag_over)); - UML_SUB(block, I0, 1, I0); // branch = ((n && v) || (!n && !v)); + UML_SUB(block, I0, 1, I0); // branch = ((n && v) || (!n && !v)); break; case 3: // BGT if (m_drcuml.get()->logging()) @@ -765,36 +765,36 @@ void dspp_device::generate_complex_branch_opcode(drcuml_block &block, compiler_s UML_AND(block, I0, mem(&m_core->m_flag_neg), mem(&m_core->m_flag_over)); UML_SUB(block, I0, 1, I0); UML_SUB(block, I1, 1, mem(&m_core->m_flag_zero)); - UML_AND(block, I0, I0, I1); // branch = ((n && v) || (!n && !v)) && !z; + UML_AND(block, I0, I0, I1); // branch = ((n && v) || (!n && !v)) && !z; break; case 4: // BHI if (m_drcuml.get()->logging()) block.append_comment("BHI"); UML_SUB(block, I0, 1, mem(&m_core->m_flag_zero)); - UML_AND(block, I0, I0, mem(&m_core->m_flag_carry)); // branch = c && !z; + UML_AND(block, I0, I0, mem(&m_core->m_flag_carry)); // branch = c && !z; break; case 5: // BLS if (m_drcuml.get()->logging()) block.append_comment("BLS"); UML_SUB(block, I0, 1, mem(&m_core->m_flag_carry)); - UML_OR(block, I0, I0, mem(&m_core->m_flag_zero)); // branch = !c || z; + UML_OR(block, I0, I0, mem(&m_core->m_flag_zero)); // branch = !c || z; break; case 6: // BXS if (m_drcuml.get()->logging()) block.append_comment("BXS"); - UML_MOV(block, I0, mem(&m_core->m_flag_exact)); // branch = x; + UML_MOV(block, I0, mem(&m_core->m_flag_exact)); // branch = x; break; case 7: // BXC if (m_drcuml.get()->logging()) block.append_comment("BXC"); - UML_SUB(block, I0, 1, mem(&m_core->m_flag_exact)); // branch = !x; + UML_SUB(block, I0, 1, mem(&m_core->m_flag_exact)); // branch = !x; break; } code_label skip = compiler->labelnum++; - UML_TEST(block, I0, 1); // if (branch) + UML_TEST(block, I0, 1); // if (branch) UML_JMPc(block, COND_Z, skip); - UML_MOV(block, mem(&m_core->m_jmpdest), op & 0x3ff); // m_core->m_pc = op & 0x3ff; + UML_MOV(block, mem(&m_core->m_jmpdest), op & 0x3ff); // m_core->m_pc = op & 0x3ff; generate_branch(block, compiler, desc); UML_LABEL(block, skip); } @@ -941,8 +941,8 @@ void dspp_device::generate_read_next_operand(drcuml_block &block, compiler_state UML_LOAD(block, I0, (void *)&m_core->m_operands[0].value, mem(&m_core->m_opidx), SIZE_DWORD, SCALE_x8); //if (op == 0x46a0) //{ - // UML_MOV(block, mem(&m_core->m_arg0), I0); - // UML_CALLC(block, cfunc_print_value, this); + // UML_MOV(block, mem(&m_core->m_arg0), I0); + // UML_CALLC(block, cfunc_print_value, this); //} UML_TEST(block, I0, 0x80000000U); @@ -950,13 +950,13 @@ void dspp_device::generate_read_next_operand(drcuml_block &block, compiler_state UML_LOAD(block, I1, (void *)&m_core->m_operands[0].addr, mem(&m_core->m_opidx), SIZE_DWORD, SCALE_x8); //if (op == 0x46a0) //{ - // UML_MOV(block, mem(&m_core->m_arg1), I1); + // UML_MOV(block, mem(&m_core->m_arg1), I1); //} UML_CALLH(block, *m_dm_read16); //if (op == 0x46a0) //{ - // UML_MOV(block, mem(&m_core->m_arg0), I0); - // UML_CALLC(block, cfunc_print_addr, this); + // UML_MOV(block, mem(&m_core->m_arg0), I0); + // UML_CALLC(block, cfunc_print_addr, this); //} UML_LABEL(block, no_load); @@ -1071,16 +1071,16 @@ void dspp_device::generate_arithmetic_opcode(drcuml_block &block, compiler_state if (m_drcuml.get()->logging()) block.append_comment("_TRA"); UML_MOV(block, I0, I2); // alu_res = alu_a; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 1: // _NEG if (m_drcuml.get()->logging()) block.append_comment("_NEG"); UML_SUB(block, I0, 0, I3); // alu_res = -alu_b; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 2: // _+ @@ -1092,175 +1092,175 @@ void dspp_device::generate_arithmetic_opcode(drcuml_block &block, compiler_state UML_XOR(block, I3, I2, I3); UML_TEST(block, I3, 0x80000); - UML_JMPc(block, COND_NZ, skip_over); // if ((alu_a & 0x80000) == (alu_b & 0x80000) && + UML_JMPc(block, COND_NZ, skip_over); // if ((alu_a & 0x80000) == (alu_b & 0x80000) && UML_XOR(block, I3, I2, I0); - UML_TEST(block, I3, 0x80000); // (alu_a & 0x80000) != (alu_res & 0x80000)) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); // m_core->m_flag_over = 1; + UML_TEST(block, I3, 0x80000); // (alu_a & 0x80000) != (alu_res & 0x80000)) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); // m_core->m_flag_over = 1; UML_LABEL(block, skip_over); - UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; + UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; // else - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 3: // _+C if (m_drcuml.get()->logging()) block.append_comment("_+C"); UML_SHL(block, I3, mem(&m_core->m_flag_carry), 4); - UML_ADD(block, I0, I2, I3); // alu_res = alu_a + (m_core->m_flag_carry << 4); + UML_ADD(block, I0, I2, I3); // alu_res = alu_a + (m_core->m_flag_carry << 4); - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; + UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; // else - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 4: // _- if (m_drcuml.get()->logging()) block.append_comment("_-"); - UML_SUB(block, I0, I2, I3); // alu_res = alu_a - alu_b; + UML_SUB(block, I0, I2, I3); // alu_res = alu_a - alu_b; UML_MOV(block, mem(&m_core->m_flag_over), 0); UML_XOR(block, I3, I3, 0xffffffffU); UML_XOR(block, I3, I2, I3); UML_TEST(block, I3, 0x80000); - UML_JMPc(block, COND_NZ, skip_over); // if ((alu_a & 0x80000) == (~alu_b & 0x80000) && + UML_JMPc(block, COND_NZ, skip_over); // if ((alu_a & 0x80000) == (~alu_b & 0x80000) && UML_XOR(block, I3, I2, I0); - UML_TEST(block, I3, 0x80000); // (alu_a & 0x80000) != (alu_res & 0x80000)) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); // m_core->m_flag_over = 1; + UML_TEST(block, I3, 0x80000); // (alu_a & 0x80000) != (alu_res & 0x80000)) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); // m_core->m_flag_over = 1; UML_LABEL(block, skip_over); - UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; + UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; // else - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 5: // _-B if (m_drcuml.get()->logging()) block.append_comment("_-B"); UML_SHL(block, I3, mem(&m_core->m_flag_carry), 4); - UML_SUB(block, I0, I2, I3); // alu_res = alu_a - (m_core->m_flag_carry << 4); + UML_SUB(block, I0, I2, I3); // alu_res = alu_a - (m_core->m_flag_carry << 4); - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; + UML_TEST(block, I0, 0x00100000); // if (alu_res & 0x00100000) + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_carry), 1); // m_core->m_flag_carry = 1; // else - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 6: // _++ if (m_drcuml.get()->logging()) block.append_comment("_++"); - UML_ADD(block, I0, I2, 1); // alu_res = alu_a + 1; + UML_ADD(block, I0, I2, 1); // alu_res = alu_a + 1; UML_XOR(block, I3, I2, 0x80000); UML_AND(block, I3, I3, I0); UML_TEST(block, I3, 0x80000); UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = !(alu_a & 0x80000) && (alu_res & 0x80000); + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = !(alu_a & 0x80000) && (alu_res & 0x80000); - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 7: // _-- if (m_drcuml.get()->logging()) block.append_comment("_--"); - UML_SUB(block, I0, I2, 1); // alu_res = alu_a - 1; + UML_SUB(block, I0, I2, 1); // alu_res = alu_a - 1; UML_XOR(block, I3, I0, 0x80000); UML_AND(block, I3, I3, I2); UML_TEST(block, I3, 0x80000); UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_over), 1); - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = (alu_a & 0x80000) && !(alu_res & 0x80000); + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = (alu_a & 0x80000) && !(alu_res & 0x80000); - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 8: // _TRL if (m_drcuml.get()->logging()) block.append_comment("_TRL"); - UML_MOV(block, I0, I2); // alu_res = alu_a; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_MOV(block, I0, I2); // alu_res = alu_a; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 9: // _NOT if (m_drcuml.get()->logging()) block.append_comment("_NOT"); - UML_XOR(block, I0, I2, 0xffffffff); // alu_res = ~alu_a; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_XOR(block, I0, I2, 0xffffffff); // alu_res = ~alu_a; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 10: // _AND if (m_drcuml.get()->logging()) block.append_comment("_AND"); - UML_AND(block, I0, I2, I3); // alu_res = alu_a & alu_b; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_AND(block, I0, I2, I3); // alu_res = alu_a & alu_b; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 11: // _NAND if (m_drcuml.get()->logging()) block.append_comment("_NAND"); UML_AND(block, I0, I2, I3); - UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a & alu_b); - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a & alu_b); + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 12: // _OR if (m_drcuml.get()->logging()) block.append_comment("_OR"); - UML_OR(block, I0, I2, I3); // alu_res = alu_a | alu_b; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_OR(block, I0, I2, I3); // alu_res = alu_a | alu_b; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 13: // _NOR if (m_drcuml.get()->logging()) block.append_comment("_NOR"); UML_OR(block, I0, I2, I3); - UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a | alu_b); - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a | alu_b); + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 14: // _XOR if (m_drcuml.get()->logging()) block.append_comment("_XOR"); - UML_XOR(block, I0, I2, I3); // alu_res = alu_a ^ alu_b; - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_XOR(block, I0, I2, I3); // alu_res = alu_a ^ alu_b; + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; case 15: // _XNOR if (m_drcuml.get()->logging()) block.append_comment("_XNOR"); UML_XOR(block, I0, I2, I3); - UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a ^ alu_b); - UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; - UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; + UML_XOR(block, I0, I0, 0xffffffff); // alu_res = ~(alu_a ^ alu_b); + UML_MOV(block, mem(&m_core->m_flag_over), 0); // m_core->m_flag_over = 0; + UML_MOV(block, mem(&m_core->m_flag_carry), 0); // m_core->m_flag_carry = 0; break; } UML_TEST(block, I0, 0x00080000); UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_neg), 1); - UML_MOVc(block, COND_Z, mem(&m_core->m_flag_neg), 0); // m_core->m_flag_neg = (alu_res & 0x00080000) != 0; + UML_MOVc(block, COND_Z, mem(&m_core->m_flag_neg), 0); // m_core->m_flag_neg = (alu_res & 0x00080000) != 0; UML_TEST(block, I0, 0x000ffff0); UML_MOVc(block, COND_Z, mem(&m_core->m_flag_zero), 1); - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_zero), 0); // m_core->m_flag_zero = (alu_res & 0x000ffff0) == 0; + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_zero), 0); // m_core->m_flag_zero = (alu_res & 0x000ffff0) == 0; UML_TEST(block, I0, 0x0000000f); UML_MOVc(block, COND_Z, mem(&m_core->m_flag_exact), 1); - UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_exact), 0); // m_core->m_flag_exact = (alu_res & 0x0000000f) == 0; + UML_MOVc(block, COND_NZ, mem(&m_core->m_flag_exact), 0); // m_core->m_flag_exact = (alu_res & 0x0000000f) == 0; // ALU_RES = I3 UML_MOV(block, I3, I0); @@ -1269,9 +1269,9 @@ void dspp_device::generate_arithmetic_opcode(drcuml_block &block, compiler_state static const int32_t shifts[8] = { 0, 1, 2, 3, 4, 5, 8, 16 }; if (barrel_code == 8) - generate_read_next_operand(block, compiler, desc); // I0 = barrel_code; + generate_read_next_operand(block, compiler, desc); // I0 = barrel_code; else - UML_MOV(block, I0, barrel_code); // I0 = barrel_code; + UML_MOV(block, I0, barrel_code); // I0 = barrel_code; code_label left_shift = compiler->labelnum++; code_label done_shift = compiler->labelnum++; @@ -1279,57 +1279,57 @@ void dspp_device::generate_arithmetic_opcode(drcuml_block &block, compiler_state code_label no_clip = compiler->labelnum++; code_label no_writeback = compiler->labelnum++; code_label done = compiler->labelnum++; - UML_TEST(block, I0, 8); // if (barrel_code & 8) - UML_JMPc(block, COND_Z, left_shift); // { + UML_TEST(block, I0, 8); // if (barrel_code & 8) + UML_JMPc(block, COND_Z, left_shift); // { UML_XOR(block, I0, I0, 0xffffffffU); UML_ADD(block, I0, I0, 1); UML_AND(block, I0, I0, 7); - UML_LOAD(block, I0, (void *)shifts, I0, SIZE_DWORD, SCALE_x8); // uint32_t shift = shifts[(~barrel_code + 1) & 7]; - if (alu_op < 8) // if (alu_op < 8) - { // { + UML_LOAD(block, I0, (void *)shifts, I0, SIZE_DWORD, SCALE_x8); // uint32_t shift = shifts[(~barrel_code + 1) & 7]; + if (alu_op < 8) // if (alu_op < 8) + { // { UML_SHL(block, I3, I3, 12); - UML_SAR(block, I3, I3, 12); // // Arithmetic - UML_SAR(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = sign_extend20(alu_res) >> shift; - } // } - else // else - { // { - UML_AND(block, I3, I3, 0x000fffff); // // Logical - UML_SHR(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = (alu_res & 0xfffff) >> shift; - } // } - UML_JMP(block, done_shift); // } - UML_LABEL(block, left_shift); // else + UML_SAR(block, I3, I3, 12); // // Arithmetic + UML_SAR(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = sign_extend20(alu_res) >> shift; + } // } + else // else + { // { + UML_AND(block, I3, I3, 0x000fffff); // // Logical + UML_SHR(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = (alu_res & 0xfffff) >> shift; + } // } + UML_JMP(block, done_shift); // } + UML_LABEL(block, left_shift); // else // { - UML_LOAD(block, I0, (void *)shifts, I0, SIZE_DWORD, SCALE_x8); // uint32_t shift = shifts[barrel_code]; - UML_CMP(block, I0, 16); // if (shift != 16) - UML_JMPc(block, COND_E, no_shift); // { + UML_LOAD(block, I0, (void *)shifts, I0, SIZE_DWORD, SCALE_x8); // uint32_t shift = shifts[barrel_code]; + UML_CMP(block, I0, 16); // if (shift != 16) + UML_JMPc(block, COND_E, no_shift); // { UML_SHL(block, I3, I3, 12); UML_SAR(block, I3, I3, 12); - UML_SHL(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = sign_extend20(alu_res) << shift; - UML_JMP(block, done_shift); // } + UML_SHL(block, mem(&m_core->m_acc), I3, I0); // m_core->m_acc = sign_extend20(alu_res) << shift; + UML_JMP(block, done_shift); // } // else - UML_LABEL(block, no_shift); // { - UML_TEST(block, mem(&m_core->m_flag_over), 1); // // Clip and saturate - UML_JMPc(block, COND_Z, no_clip); // if (m_core->m_flag_over) + UML_LABEL(block, no_shift); // { + UML_TEST(block, mem(&m_core->m_flag_over), 1); // // Clip and saturate + UML_JMPc(block, COND_Z, no_clip); // if (m_core->m_flag_over) UML_TEST(block, mem(&m_core->m_flag_neg), 1); - UML_MOVc(block, COND_NZ, mem(&m_core->m_acc), 0x7ffff); // m_core->m_acc = m_core->m_flag_neg ? 0x7ffff : 0xfff80000; + UML_MOVc(block, COND_NZ, mem(&m_core->m_acc), 0x7ffff); // m_core->m_acc = m_core->m_flag_neg ? 0x7ffff : 0xfff80000; UML_MOVc(block, COND_Z, mem(&m_core->m_acc), 0xfff80000); - UML_JMP(block, done_shift); // else + UML_JMP(block, done_shift); // else UML_LABEL(block, no_clip); - UML_SHL(block, I3, I3, 12); // sign_extend20(alu_res); - UML_SAR(block, mem(&m_core->m_acc), I3, 12); // } - UML_LABEL(block, done_shift); // } + UML_SHL(block, I3, I3, 12); // sign_extend20(alu_res); + UML_SAR(block, mem(&m_core->m_acc), I3, 12); // } + UML_LABEL(block, done_shift); // } - UML_CMP(block, mem(&m_core->m_writeback), 0); // if (m_core->m_writeback >= 0) - UML_JMPc(block, COND_L, no_writeback); // { + UML_CMP(block, mem(&m_core->m_writeback), 0); // if (m_core->m_writeback >= 0) + UML_JMPc(block, COND_L, no_writeback); // { UML_SHR(block, I0, mem(&m_core->m_acc), 4); UML_MOV(block, I1, mem(&m_core->m_writeback)); - UML_CALLH(block, *m_dm_write16); // write_data(m_core->m_writeback, m_core->m_acc >> 4); - UML_MOV(block, mem(&m_core->m_writeback), 0xffffffffU); // m_core->m_writeback = -1; - UML_JMP(block, done); // } + UML_CALLH(block, *m_dm_write16); // write_data(m_core->m_writeback, m_core->m_acc >> 4); + UML_MOV(block, mem(&m_core->m_writeback), 0xffffffffU); // m_core->m_writeback = -1; + UML_JMP(block, done); // } UML_LABEL(block, no_writeback); - UML_CMP(block, mem(&m_core->m_opidx), numops); // else if (m_core->m_opidx < numops) - UML_JMPc(block, COND_GE, done); // { - generate_write_next_operand(block, compiler); // write_next_operand(m_core->m_acc >> 4); - UML_LABEL(block, done); // } + UML_CMP(block, mem(&m_core->m_opidx), numops); // else if (m_core->m_opidx < numops) + UML_JMPc(block, COND_GE, done); // { + generate_write_next_operand(block, compiler); // write_next_operand(m_core->m_acc >> 4); + UML_LABEL(block, done); // } } diff --git a/src/devices/cpu/m6502/xavix2000.cpp b/src/devices/cpu/m6502/xavix2000.cpp index fdd5b8a2dfb..94b56308e0d 100644 --- a/src/devices/cpu/m6502/xavix2000.cpp +++ b/src/devices/cpu/m6502/xavix2000.cpp @@ -7,7 +7,7 @@ The dies for these are marked SSD 2000 NEC 85605-621 - + SSD 2002 NEC 85054-611 6502 with custom opcodes @@ -17,12 +17,12 @@ see xavix.cpp for basic notes - the 2000 chip has more opcodes than the 97/98 chips in xavix.cpp, and - is a similar die structure to the 2002 chip, but doesn't seem to have any - additional capabilities. + the 2000 chip has more opcodes than the 97/98 chips in xavix.cpp, and + is a similar die structure to the 2002 chip, but doesn't seem to have any + additional capabilities. - the 2002 chip seems to be the one that was officially dubbed 'SuperXaviX' - and has additional video capabilities on top of the extended opcodes. + the 2002 chip seems to be the one that was officially dubbed 'SuperXaviX' + and has additional video capabilities on top of the extended opcodes. ***************************************************************************/ diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp index 3f7d2b779e5..df9ff7f96ba 100644 --- a/src/devices/cpu/mips/mips3.cpp +++ b/src/devices/cpu/mips/mips3.cpp @@ -16,10 +16,10 @@ #include "ps2vu.h" #include <cmath> -#define ENABLE_OVERFLOWS (0) -#define ENABLE_EE_ELF_LOADER (0) -#define ENABLE_EE_DECI2 (0) -#define DELAY_SLOT_EXCEPTION_HACK (0) +#define ENABLE_OVERFLOWS (0) +#define ENABLE_EE_ELF_LOADER (0) +#define ENABLE_EE_DECI2 (0) +#define DELAY_SLOT_EXCEPTION_HACK (0) /*************************************************************************** HELPER MACROS diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index c43fd843730..0afa4ef610b 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -437,7 +437,7 @@ protected: bool m_bigendian; uint32_t m_byte_xor; uint32_t m_word_xor; - uint32_t m_dword_xor; + uint32_t m_dword_xor; data_accessors m_memory; /* cache memory */ diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp index 91b38941734..02439727608 100644 --- a/src/devices/cpu/mips/mips3drc.cpp +++ b/src/devices/cpu/mips/mips3drc.cpp @@ -333,7 +333,7 @@ void mips3_device::code_compile_block(uint8_t mode, offs_t pc) else { UML_LABEL(block, seqhead->pc | 0x80000000); // label seqhead->pc | 0x80000000 - UML_HASHJMP(block, m_core->mode, seqhead->pc, *m_nocode); // hashjmp <mode>,seqhead->pc,nocode + UML_HASHJMP(block, m_core->mode, seqhead->pc, *m_nocode); // hashjmp <mode>,seqhead->pc,nocode continue; } @@ -367,11 +367,11 @@ void mips3_device::code_compile_block(uint8_t mode, offs_t pc) /* if the last instruction can change modes, use a variable mode; otherwise, assume the same mode */ if (seqlast->flags & OPFLAG_CAN_CHANGE_MODES) { - UML_HASHJMP(block, mem(&m_core->mode), nextpc, *m_nocode); // hashjmp <mode>,nextpc,nocode + UML_HASHJMP(block, mem(&m_core->mode), nextpc, *m_nocode); // hashjmp <mode>,nextpc,nocode } else if (seqlast->next() == nullptr || seqlast->next()->pc != nextpc) { - UML_HASHJMP(block, m_core->mode, nextpc, *m_nocode); // hashjmp <mode>,nextpc,nocode + UML_HASHJMP(block, m_core->mode, nextpc, *m_nocode); // hashjmp <mode>,nextpc,nocode } } @@ -1308,13 +1308,13 @@ void mips3_device::generate_delay_slot_and_branch(drcuml_block &block, compiler_ } else { - UML_HASHJMP(block, m_core->mode, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode + UML_HASHJMP(block, m_core->mode, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode } } else { generate_update_cycles(block, compiler_temp, uml::mem(&m_core->jmpdest), true); // <subtract cycles> - UML_HASHJMP(block, m_core->mode, mem(&m_core->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode + UML_HASHJMP(block, m_core->mode, mem(&m_core->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode } /* update the label */ diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h index 0186cee8869..460198451fa 100644 --- a/src/devices/cpu/unsp/unsp.h +++ b/src/devices/cpu/unsp/unsp.h @@ -26,15 +26,15 @@ ***************************************************************************/ /* map variables */ -#define MAPVAR_PC M0 -#define MAPVAR_CYCLES M1 +#define MAPVAR_PC M0 +#define MAPVAR_CYCLES M1 -#define SINGLE_INSTRUCTION_MODE (0) +#define SINGLE_INSTRUCTION_MODE (0) -#define ENABLE_UNSP_DRC (1) +#define ENABLE_UNSP_DRC (1) -#define UNSP_LOG_OPCODES (0) -#define UNSP_LOG_REGS (0) +#define UNSP_LOG_OPCODES (0) +#define UNSP_LOG_REGS (0) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/cpu/unsp/unspdefs.h b/src/devices/cpu/unsp/unspdefs.h index 89e4e98e246..382e25a0dac 100644 --- a/src/devices/cpu/unsp/unspdefs.h +++ b/src/devices/cpu/unsp/unspdefs.h @@ -14,9 +14,9 @@ #define UNSP_S 0x0080 #define UNSP_C 0x0040 -#define UNSP_N_SHIFT 9 -#define UNSP_Z_SHIFT 8 -#define UNSP_S_SHIFT 7 -#define UNSP_C_SHIFT 6 +#define UNSP_N_SHIFT 9 +#define UNSP_Z_SHIFT 8 +#define UNSP_S_SHIFT 7 +#define UNSP_C_SHIFT 6 -#endif // MAME_CPU_UNSP_UNSPDEFS_H
\ No newline at end of file +#endif // MAME_CPU_UNSP_UNSPDEFS_H diff --git a/src/devices/cpu/unsp/unspdrc.cpp b/src/devices/cpu/unsp/unspdrc.cpp index e1e972b7f9b..3ee90c8c1c9 100644 --- a/src/devices/cpu/unsp/unspdrc.cpp +++ b/src/devices/cpu/unsp/unspdrc.cpp @@ -113,13 +113,13 @@ void unsp_device::code_flush_cache() /* generate the entry point and out-of-cycles handlers */ static_generate_entry_point(); static_generate_nocode_handler(); - static_generate_out_of_cycles(); + static_generate_out_of_cycles(); - static_generate_memory_accessor(false, "read", m_mem_read); - static_generate_memory_accessor(true, "write", m_mem_write); - static_generate_trigger_fiq(); - static_generate_trigger_irq(); - static_generate_check_interrupts(); + static_generate_memory_accessor(false, "read", m_mem_read); + static_generate_memory_accessor(true, "write", m_mem_write); + static_generate_trigger_fiq(); + static_generate_trigger_irq(); + static_generate_check_interrupts(); } catch (drcuml_block::abort_compilation &) diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index 0284f331af4..6eed2448ef1 100644 --- a/src/devices/machine/nsc810.h +++ b/src/devices/machine/nsc810.h @@ -29,7 +29,7 @@ public: set_timer0_clock(clk0.value()); set_timer1_clock(clk1.value()); } - + nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto portA_read_callback() { return m_portA_r.bind(); } diff --git a/src/devices/machine/smc91c9x.cpp b/src/devices/machine/smc91c9x.cpp index 21fcb11d1f7..1a2c527b56c 100644 --- a/src/devices/machine/smc91c9x.cpp +++ b/src/devices/machine/smc91c9x.cpp @@ -21,7 +21,7 @@ #define LOG_PACKETS (1U << 1) #define LOG_TX (1U << 2) #define LOG_RX (1U << 3) -#define LOG_FILTER (1U << 4) +#define LOG_FILTER (1U << 4) //#define VERBOSE (LOG_GENERAL | LOG_PACKETS | LOG_TX | LOG_RX | LOG_FILTER) #include "logmacro.h" @@ -89,7 +89,7 @@ void smc91c9x_device::device_start() // These registers don't get cleared on reset m_reg[B1_CONFIG] = 0x0030; m_regmask[B1_CONFIG] = 0x17c6; - m_reg[B1_BASE] = 0x1866; m_regmask[B1_BASE] = 0xfffe; + m_reg[B1_BASE] = 0x1866; m_regmask[B1_BASE] = 0xfffe; m_reg[B1_IA0_1] = 0x0000; m_regmask[B1_IA0_1] = 0xffff; m_reg[B1_IA2_3] = 0x0000; m_regmask[B1_IA2_3] = 0xffff; @@ -370,8 +370,8 @@ int smc91c9x_device::address_filter(u8 *buf) /*------------------------------------------------- recv_start_cb - Start receiving packet - A return value of 0 will stop rx processing in dinetwork device - Any other value will be sent to the recv_complete_cb + A return value of 0 will stop rx processing in dinetwork device + Any other value will be sent to the recv_complete_cb -------------------------------------------------*/ int smc91c9x_device::recv_start_cb(u8 *buf, int length) @@ -415,7 +415,7 @@ int smc91c9x_device::recv_start_cb(u8 *buf, int length) /*------------------------------------------------- receive - Receive data into buffer - Returns the buffer packet number + 1 if successful + Returns the buffer packet number + 1 if successful -------------------------------------------------*/ int smc91c9x_device::receive(u8 *buf, int length) @@ -889,16 +889,16 @@ WRITE16_MEMBER( smc91c9x_device::write ) } if (VERBOSE & LOG_GENERAL) { - if (data & FDSE) LOG(" FDSE\n"); - if (data & EPH_LOOP) LOG(" EPH LOOP\n"); - if (data & STP_SQET) LOG(" STP SQET\n"); - if (data & FDUPLX) LOG(" FDUPLX\n"); - if (data & MON_CSN) LOG(" MON_CSN\n"); - if (data & NOCRC) LOG(" NOCRC\n"); - if (data & PAD_EN) LOG(" PAD_EN\n"); - if (data & FORCOL) LOG(" FORCOL\n"); - if (data & LOOP) LOG(" LOOP\n"); - if (data & TXENA) LOG(" TXENA\n"); + if (data & FDSE) LOG(" FDSE\n"); + if (data & EPH_LOOP) LOG(" EPH LOOP\n"); + if (data & STP_SQET) LOG(" STP SQET\n"); + if (data & FDUPLX) LOG(" FDUPLX\n"); + if (data & MON_CSN) LOG(" MON_CSN\n"); + if (data & NOCRC) LOG(" NOCRC\n"); + if (data & PAD_EN) LOG(" PAD_EN\n"); + if (data & FORCOL) LOG(" FORCOL\n"); + if (data & LOOP) LOG(" LOOP\n"); + if (data & TXENA) LOG(" TXENA\n"); } break; @@ -921,13 +921,13 @@ WRITE16_MEMBER( smc91c9x_device::write ) if (VERBOSE & LOG_GENERAL) { - if (data & SOFT_RST) LOG(" SOFT RST\n"); - if (data & FILT_CAR) LOG(" FILT_CAR\n"); - if (data & STRIP_CRC) LOG(" STRIP CRC\n"); - if (data & RXEN) LOG(" RXEN\n"); - if (data & ALMUL) LOG(" ALMUL\n"); - if (data & PRMS) LOG(" PRMS\n"); - if (data & RX_ABORT) LOG(" RX_ABORT\n"); + if (data & SOFT_RST) LOG(" SOFT RST\n"); + if (data & FILT_CAR) LOG(" FILT_CAR\n"); + if (data & STRIP_CRC) LOG(" STRIP CRC\n"); + if (data & RXEN) LOG(" RXEN\n"); + if (data & ALMUL) LOG(" ALMUL\n"); + if (data & PRMS) LOG(" PRMS\n"); + if (data & RX_ABORT) LOG(" RX_ABORT\n"); } break; @@ -972,16 +972,16 @@ WRITE16_MEMBER( smc91c9x_device::write ) } if (VERBOSE & LOG_GENERAL) { - if (data & RCV_BAD) LOG(" RCV_BAD\n"); - if (data & PWRDN) LOG(" PWRDN\n"); - if (data & WAKEUP_EN) LOG(" WAKEUP ENABLE\n"); - if (data & AUTO_RELEASE) LOG(" AUTO RELEASE\n"); - if (data & LE_ENABLE) LOG(" LE ENABLE\n"); - if (data & CR_ENABLE) LOG(" CR ENABLE\n"); - if (data & TE_ENABLE) LOG(" TE ENABLE\n"); - if (data & EEPROM_SEL) LOG(" EEPROM SELECT\n"); - if (data & RELOAD) LOG(" RELOAD\n"); - if (data & STORE) LOG(" STORE\n"); + if (data & RCV_BAD) LOG(" RCV_BAD\n"); + if (data & PWRDN) LOG(" PWRDN\n"); + if (data & WAKEUP_EN) LOG(" WAKEUP ENABLE\n"); + if (data & AUTO_RELEASE) LOG(" AUTO RELEASE\n"); + if (data & LE_ENABLE) LOG(" LE ENABLE\n"); + if (data & CR_ENABLE) LOG(" CR ENABLE\n"); + if (data & TE_ENABLE) LOG(" TE ENABLE\n"); + if (data & EEPROM_SEL) LOG(" EEPROM SELECT\n"); + if (data & RELOAD) LOG(" RELOAD\n"); + if (data & STORE) LOG(" STORE\n"); } break; diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h index 51b520fe971..b84f6070ef7 100644 --- a/src/devices/machine/smc91c9x.h +++ b/src/devices/machine/smc91c9x.h @@ -135,7 +135,7 @@ private: enum control_mask : u8 { EBUF_RX_ALWAYS = 0x40, // Always set on receive buffer control byte EBUF_ODD = 0x20, // Odd number of data payload bytes - EBUF_CRC = 0x10 // Tx add CRC + EBUF_CRC = 0x10 // Tx add CRC }; // Receive buffer status @@ -165,7 +165,7 @@ private: LTX_MULT = 0x0008, // Last transmit frame was a multicast MULCOL = 0x0004, // Multiple collisions detected SNGLCOL = 0x0002, // Single collision detected - TX_SUC = 0x0001 // Last transmit frame was successful + TX_SUC = 0x0001 // Last transmit frame was successful }; // CTR register bits @@ -179,7 +179,7 @@ private: TE_ENABLE = 0x0020, // Transmit Error enable EEPROM_SEL = 0x0004, // EEPROM address RELOAD = 0x0002, // Reload config from EEPROM - STORE = 0x0001 // Store config to EEPROM + STORE = 0x0001 // Store config to EEPROM }; // Transmit Control Register bits diff --git a/src/devices/machine/spg110.cpp b/src/devices/machine/spg110.cpp index dd40a3457fe..726a66a5af2 100644 --- a/src/devices/machine/spg110.cpp +++ b/src/devices/machine/spg110.cpp @@ -5,7 +5,7 @@ SunPlus SPG110-series SoC peripheral emulation It is possible this shares some video features with spg110 and - can be made a derived device + can be made a derived device **********************************************************************/ @@ -60,12 +60,12 @@ void spg110_device::map(address_map &map) /* TIMER_CALLBACK_MEMBER(spg110_device::test_timer) { - // + // } */ void spg110_device::device_start() { -// m_test_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(spg110_device::test_timer), this)); +// m_test_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(spg110_device::test_timer), this)); } void spg110_device::device_reset() @@ -83,7 +83,7 @@ WRITE_LINE_MEMBER(spg110_device::vblank) if (!state) { m_cpu->set_state_unsynced(UNSP_IRQ0_LINE, ASSERT_LINE); - // m_test_timer->adjust(attotime::from_usec(100), 0); + // m_test_timer->adjust(attotime::from_usec(100), 0); } return; diff --git a/src/devices/machine/spg2xx.cpp b/src/devices/machine/spg2xx.cpp index 3b9d4ae3dd6..9fd4c864936 100644 --- a/src/devices/machine/spg2xx.cpp +++ b/src/devices/machine/spg2xx.cpp @@ -41,10 +41,10 @@ DEFINE_DEVICE_TYPE(SPG28X, spg28x_device, "spg28x", "SPG280-series System-on-a-C #define LOG_PPU_READS (1U << 22) #define LOG_PPU_WRITES (1U << 23) #define LOG_UNKNOWN_PPU (1U << 24) -#define LOG_FIQ (1U << 25) +#define LOG_FIQ (1U << 25) #define LOG_SIO (1U << 26) -#define LOG_EXT_MEM (1U << 27) -#define LOG_EXTINT (1U << 28) +#define LOG_EXT_MEM (1U << 27) +#define LOG_EXTINT (1U << 28) #define LOG_IO (LOG_IO_READS | LOG_IO_WRITES | LOG_IRQS | LOG_GPIO | LOG_UART | LOG_I2C | LOG_DMA | LOG_TIMERS | LOG_UNKNOWN_IO) #define LOG_CHANNELS (LOG_CHANNEL_READS | LOG_CHANNEL_WRITES) #define LOG_SPU (LOG_SPU_READS | LOG_SPU_WRITES | LOG_UNKNOWN_SPU | LOG_CHANNEL_READS | LOG_CHANNEL_WRITES \ @@ -116,8 +116,8 @@ void spg2xx_device::device_start() for (uint16_t i = 0; i < 0x8000; i++) { m_rgb555_to_rgb888[i] = (m_rgb5_to_rgb8[(i >> 10) & 0x1f] << 16) | - (m_rgb5_to_rgb8[(i >> 5) & 0x1f] << 8) | - (m_rgb5_to_rgb8[(i >> 0) & 0x1f] << 0); + (m_rgb5_to_rgb8[(i >> 5) & 0x1f] << 8) | + (m_rgb5_to_rgb8[(i >> 0) & 0x1f] << 0); } m_porta_out.resolve_safe(); m_portb_out.resolve_safe(); @@ -324,13 +324,13 @@ void spg2xx_device::blit(const rectangle &cliprect, uint32_t line, uint32_t xoff if (yy >= 0x01c0) yy -= 0x0200; - if (yy > 240 || yy < 0) - return; + if (yy > 240 || yy < 0) + return; - if (SPG_DEBUG_VIDEO && m_debug_blit) + if (SPG_DEBUG_VIDEO && m_debug_blit) printf("%3d:\n", yy); - int y_index = yy * 320; + int y_index = yy * 320; for (int32_t x = FlipX ? (w - 1) : 0; FlipX ? x >= 0 : x < w; FlipX ? x-- : x++) { @@ -377,8 +377,8 @@ void spg2xx_device::blit(const rectangle &cliprect, uint32_t line, uint32_t xoff if (SPG_DEBUG_VIDEO && m_debug_blit) printf("M\n"); m_screenbuf[pix_index] = (mix_channel((uint8_t)(m_screenbuf[pix_index] >> 16), m_rgb5_to_rgb8[(rgb >> 10) & 0x1f]) << 16) | - (mix_channel((uint8_t)(m_screenbuf[pix_index] >> 8), m_rgb5_to_rgb8[(rgb >> 5) & 0x1f]) << 8) | - (mix_channel((uint8_t)(m_screenbuf[pix_index] >> 0), m_rgb5_to_rgb8[rgb & 0x1f])); + (mix_channel((uint8_t)(m_screenbuf[pix_index] >> 8), m_rgb5_to_rgb8[(rgb >> 5) & 0x1f]) << 8) | + (mix_channel((uint8_t)(m_screenbuf[pix_index] >> 0), m_rgb5_to_rgb8[rgb & 0x1f])); } else { @@ -627,8 +627,8 @@ void spg2xx_device::apply_saturation(const rectangle &cliprect) const int integer_g = (int)floor(adjusted_g * 255.0f); const int integer_b = (int)floor(adjusted_b * 255.0f); *src++ = (integer_r > 255 ? 0xff0000 : (integer_r < 0 ? 0 : ((uint8_t)integer_r << 16))) | - (integer_g > 255 ? 0x00ff00 : (integer_g < 0 ? 0 : ((uint8_t)integer_g << 8))) | - (integer_b > 255 ? 0x0000ff : (integer_b < 0 ? 0 : (uint8_t)integer_b)); + (integer_g > 255 ? 0x00ff00 : (integer_g < 0 ? 0 : ((uint8_t)integer_g << 8))) | + (integer_b > 255 ? 0x0000ff : (integer_b < 0 ? 0 : (uint8_t)integer_b)); } } } @@ -649,8 +649,8 @@ void spg2xx_device::apply_fade(const rectangle &cliprect) const uint8_t g = src_g - fade_offset; const uint8_t b = src_b - fade_offset; *src++ = (r > src_r ? 0 : (r << 16)) | - (g > src_g ? 0 : (g << 8)) | - (b > src_b ? 0 : (b << 0)); + (g > src_g ? 0 : (g << 8)) | + (b > src_b ? 0 : (b << 0)); } } } diff --git a/src/devices/machine/wd33c9x.cpp b/src/devices/machine/wd33c9x.cpp index fdd0c8500e3..cc16e57d9fa 100644 --- a/src/devices/machine/wd33c9x.cpp +++ b/src/devices/machine/wd33c9x.cpp @@ -869,10 +869,10 @@ void wd33c9x_base_device::step(bool timeout) case DISC_SEL_ARBITRATION: m_xfr_phase = xfr_phase; break; - + case INIT_XFR_WAIT_REQ: break; - + default: if (m_xfr_phase != xfr_phase) { fatalerror("%s: Unexpected phase change during state.\n", shortname()); @@ -888,7 +888,7 @@ void wd33c9x_base_device::step(bool timeout) set_scsi_state(FINISHED); m_regs[COMMAND_PHASE] = COMMAND_PHASE_DISCONNECTED; break; - + case COMMAND_PHASE_COMMAND_COMPLETE: if (m_regs[CONTROL] & CONTROL_EDI) { set_scsi_state(FINISHED); @@ -898,7 +898,7 @@ void wd33c9x_base_device::step(bool timeout) m_regs[CONTROL] |= CONTROL_EDI; } break; - + default: fatalerror("%s: Unhandled command phase during Select-and-Transfer disconnect.\n", shortname()); break; diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index 7316a05fc56..09d9bf5b999 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -32,7 +32,7 @@ fixedfreq_device::fixedfreq_device(const machine_config &mconfig, device_type ty device_video_interface(mconfig, *this, false), m_htotal(0), m_vtotal(0), - m_hscale(1), // FIXME: this should be modified by static initialization + m_hscale(1), // FIXME: this should be modified by static initialization m_sync_signal(0), m_last_x(0), m_last_y(0), diff --git a/src/emu/devfind.cpp b/src/emu/devfind.cpp index c7d6520875b..d66c59a3f6f 100644 --- a/src/emu/devfind.cpp +++ b/src/emu/devfind.cpp @@ -318,7 +318,7 @@ bool finder_base::report_missing(bool found, const char *objname, bool required) { osd_printf_error("Tag not defined for required %s\n", objname); return false; - } + } // just pass through in the found case if (found) diff --git a/src/frontend/mame/ui/icorender.cpp b/src/frontend/mame/ui/icorender.cpp index 6f50d63f076..bea85f9dd60 100644 --- a/src/frontend/mame/ui/icorender.cpp +++ b/src/frontend/mame/ui/icorender.cpp @@ -10,8 +10,8 @@ http://vitiy.info/Code/ico.cpp TODO: - * Add variant that loads all images from the file - * Allow size hint for choosing best candidate + * Add variant that loads all images from the file + * Allow size hint for choosing best candidate * Allow selecting amongst candidates based on colour depth ***************************************************************************/ diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp index a83439a92cf..bbdb1f55d50 100644 --- a/src/frontend/mame/ui/selgame.cpp +++ b/src/frontend/mame/ui/selgame.cpp @@ -40,14 +40,17 @@ #include <mutex> #include <thread> -namespace { - constexpr uint32_t FLAGS_UI = ui::menu::FLAG_LEFT_ARROW | ui::menu::FLAG_RIGHT_ARROW; -} // anonymous namespace extern const char UI_VERSION_TAG[]; namespace ui { +namespace { + +constexpr uint32_t FLAGS_UI = ui::menu::FLAG_LEFT_ARROW | ui::menu::FLAG_RIGHT_ARROW; + +} // anonymous namespace + class menu_select_game::persistent_data { public: diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index b3ef37b1f97..3ab864b67e1 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -93,7 +93,7 @@ namespace netlist ENTRYX_N(7497_dip) ENTRYX_N(74107) ENTRYX_N(74107_dip) - ENTRYX_N(74107A) // FIXME: implement missing DIP + ENTRYX_N(74107A) // FIXME: implement missing DIP ENTRYX(74123, TTL_74123, "") ENTRYX(74123_dip, TTL_74123_DIP, "") ENTRYX_N(74153) diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp index 6a45f6ca4e8..2bb1fadc2b8 100644 --- a/src/lib/netlist/devices/nld_74107.cpp +++ b/src/lib/netlist/devices/nld_74107.cpp @@ -137,9 +137,9 @@ namespace netlist m_clk.activate_hl(); } - NETLIB_DEVICE_IMPL(74107, "TTL_74107", "+CLK,+J,+K,+CLRQ") - NETLIB_DEVICE_IMPL(74107A, "TTL_74107A", "+CLK,+J,+K,+CLRQ") - NETLIB_DEVICE_IMPL(74107_dip, "TTL_74107_DIP", "") + NETLIB_DEVICE_IMPL(74107, "TTL_74107", "+CLK,+J,+K,+CLRQ") + NETLIB_DEVICE_IMPL(74107A, "TTL_74107A", "+CLK,+J,+K,+CLRQ") + NETLIB_DEVICE_IMPL(74107_dip, "TTL_74107_DIP", "") } //namespace devices } // namespace netlist diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp index 9663040260b..791ead0139f 100644 --- a/src/lib/netlist/devices/nld_7450.cpp +++ b/src/lib/netlist/devices/nld_7450.cpp @@ -95,8 +95,8 @@ namespace netlist m_Q.push(res, times[1 - res]);// ? 22000 : 15000); } - NETLIB_DEVICE_IMPL(7450, "TTL_7450_ANDORINVERT", "+A,+B,+C,+D") - NETLIB_DEVICE_IMPL(7450_dip, "TTL_7450_DIP", "") + NETLIB_DEVICE_IMPL(7450, "TTL_7450_ANDORINVERT", "+A,+B,+C,+D") + NETLIB_DEVICE_IMPL(7450_dip, "TTL_7450_DIP", "") } //namespace devices } // namespace netlist diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp index ccd839d83e9..7c710a8b941 100644 --- a/src/lib/netlist/devices/nld_7490.cpp +++ b/src/lib/netlist/devices/nld_7490.cpp @@ -126,8 +126,8 @@ namespace netlist m_Q[i].push((m_cnt >> i) & 1, delay[i]); } - NETLIB_DEVICE_IMPL(7490, "TTL_7490", "+A,+B,+R1,+R2,+R91,+R92") - NETLIB_DEVICE_IMPL(7490_dip, "TTL_7490_DIP", "") + NETLIB_DEVICE_IMPL(7490, "TTL_7490", "+A,+B,+R1,+R2,+R91,+R92") + NETLIB_DEVICE_IMPL(7490_dip, "TTL_7490_DIP", "") } //namespace devices } // namespace netlist diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp index f25be0fd226..261fe4ff927 100644 --- a/src/lib/netlist/devices/nld_7493.cpp +++ b/src/lib/netlist/devices/nld_7493.cpp @@ -127,7 +127,7 @@ namespace netlist } } - NETLIB_DEVICE_IMPL(7493, "TTL_7493", "+CLKA,+CLKB,+R1,+R2") + NETLIB_DEVICE_IMPL(7493, "TTL_7493", "+CLKA,+CLKB,+R1,+R2") NETLIB_DEVICE_IMPL(7493_dip, "TTL_7493_DIP", "") } //namespace devices diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp index 9b515c1a8eb..42974fe8e68 100644 --- a/src/lib/netlist/devices/nld_7497.cpp +++ b/src/lib/netlist/devices/nld_7497.cpp @@ -167,7 +167,7 @@ namespace netlist }; - NETLIB_DEVICE_IMPL(7497, "TTL_7497", "+CLK,+STRBQ,+ENQ,+UNITYQ,+CLR,+B0,+B1,+B2,+B3,+B4,+B5") + NETLIB_DEVICE_IMPL(7497, "TTL_7497", "+CLK,+STRBQ,+ENQ,+UNITYQ,+CLR,+B0,+B1,+B2,+B3,+B4,+B5") NETLIB_DEVICE_IMPL(7497_dip, "TTL_7497_DIP", "") } //namespace devices diff --git a/src/lib/netlist/devices/nld_7497.h b/src/lib/netlist/devices/nld_7497.h index 6db9a4d3538..70ab06f6c59 100644 --- a/src/lib/netlist/devices/nld_7497.h +++ b/src/lib/netlist/devices/nld_7497.h @@ -22,8 +22,8 @@ * * When the rate input is binary 0 (all rate inputs low), Z remains high [and Y low]. * - * The unity/cascade input, when connected to the clock input, passes - * clock frequency (inverted) to the Y output when the rate input/decoding + * The unity/cascade input, when connected to the clock input, passes + * clock frequency (inverted) to the Y output when the rate input/decoding * gates are inhibited by the strobe. * * When CLR is H, states of CLK and STRB can affect Y and Z. Default are diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index d06e5352025..bd4c8d77b41 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -275,7 +275,7 @@ netlist_state_t::netlist_state_t(const pstring &aname, : m_params(nullptr) , m_name(aname) , m_state() -, m_callbacks(std::move(callbacks)) // Order is important here +, m_callbacks(std::move(callbacks)) // Order is important here , m_log(*m_callbacks) , m_setup(std::move(setup)) { diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index f50f45b12de..4029ba2f99b 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -1346,13 +1346,13 @@ namespace netlist pstring m_name; std::unique_ptr<plib::dynlib> m_lib; // external lib needs to be loaded as long as netlist exists plib::state_manager_t m_state; - std::unique_ptr<callbacks_t> m_callbacks; - log_type m_log; + std::unique_ptr<callbacks_t> m_callbacks; + log_type m_log; std::unique_ptr<setup_t> m_setup; - nets_collection_type m_nets; + nets_collection_type m_nets; /* sole use is to manage lifetime of net objects */ - devices_collection_type m_devices; + devices_collection_type m_devices; }; @@ -1405,7 +1405,7 @@ namespace netlist void print_stats() const; private: - std::unique_ptr<netlist_state_t> m_state; + std::unique_ptr<netlist_state_t> m_state; /* mostly rw */ netlist_time m_time; diff --git a/src/lib/netlist/nl_errstr.h b/src/lib/netlist/nl_errstr.h index d3f62f9e790..ee3c47f3339 100644 --- a/src/lib/netlist/nl_errstr.h +++ b/src/lib/netlist/nl_errstr.h @@ -59,7 +59,7 @@ #define MF_1_UNABLE_TO_PARSE_MODEL_1 "Unable to parse model: {1}" #define MF_1_MODEL_ALREADY_EXISTS_1 "Model already exists: {1}" #define MF_1_DEVICE_ALREADY_EXISTS_1 "Device already exists: {1}" -#define MF_1_ADDING_ALI1_TO_ALIAS_LIST "Error adding alias {1} to alias list" +#define MF_1_ADDING_ALI1_TO_ALIAS_LIST "Error adding alias {1} to alias list" #define MF_1_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1 "You must pass an equal number of pins to DIPPINS {1}" #define MF_1_UNKNOWN_OBJECT_TYPE_1 "Unknown object type {1}" #define MF_2_INVALID_NUMBER_CONVERSION_1_2 "Invalid number conversion {1} : {2}" diff --git a/src/lib/netlist/nl_lists.h b/src/lib/netlist/nl_lists.h index 105f8deac48..116af2d5cd0 100644 --- a/src/lib/netlist/nl_lists.h +++ b/src/lib/netlist/nl_lists.h @@ -189,9 +189,9 @@ namespace netlist using mutex_type = pspin_mutex<TS>; using lock_guard_type = std::lock_guard<mutex_type>; - mutex_type m_lock; - T * m_end; - std::vector<T> m_list; + mutex_type m_lock; + T * m_end; + std::vector<T> m_list; public: // profiling diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h index 53efe523bcc..174147af01c 100644 --- a/src/lib/netlist/nl_setup.h +++ b/src/lib/netlist/nl_setup.h @@ -333,7 +333,7 @@ namespace netlist devices::nld_base_proxy *get_d_a_proxy(detail::core_terminal_t &out); devices::nld_base_proxy *get_a_d_proxy(detail::core_terminal_t &inp); - netlist_t &m_netlist; + netlist_t &m_netlist; std::unordered_map<pstring, param_ref_t> m_params; std::vector<link_t> m_links; factory::list_t m_factory; diff --git a/src/lib/netlist/plib/parray.h b/src/lib/netlist/plib/parray.h index b40fd7f712f..df3f85ea927 100644 --- a/src/lib/netlist/plib/parray.h +++ b/src/lib/netlist/plib/parray.h @@ -53,7 +53,7 @@ namespace plib { struct parray { public: - static constexpr std::size_t SIZEABS() { return sizeabs<FT, SIZE>::ABS(); } + static constexpr std::size_t SIZEABS() { return sizeabs<FT, SIZE>::ABS(); } typedef typename sizeabs<FT, SIZE>::container base_type; typedef typename base_type::size_type size_type; @@ -84,29 +84,29 @@ namespace plib { throw plib::pexception("parray: size error"); } - inline size_type size() const noexcept { return SIZE <= 0 ? m_size : SIZEABS(); } + inline size_type size() const noexcept { return SIZE <= 0 ? m_size : SIZEABS(); } - constexpr size_type max_size() const noexcept { return base_type::max_size(); } + constexpr size_type max_size() const noexcept { return base_type::max_size(); } - bool empty() const noexcept { return size() == 0; } + bool empty() const noexcept { return size() == 0; } #if 0 - reference operator[](size_type i) /*noexcept*/ - { - if (i >= m_size) throw plib::pexception("limits error " + to_string(i) + ">=" + to_string(m_size)); - return m_a[i]; - } - const_reference operator[](size_type i) const /*noexcept*/ - { - if (i >= m_size) throw plib::pexception("limits error " + to_string(i) + ">=" + to_string(m_size)); - return m_a[i]; - } + reference operator[](size_type i) /*noexcept*/ + { + if (i >= m_size) throw plib::pexception("limits error " + to_string(i) + ">=" + to_string(m_size)); + return m_a[i]; + } + const_reference operator[](size_type i) const /*noexcept*/ + { + if (i >= m_size) throw plib::pexception("limits error " + to_string(i) + ">=" + to_string(m_size)); + return m_a[i]; + } #else - reference operator[](size_type i) noexcept { return m_a[i]; } - constexpr const_reference operator[](size_type i) const noexcept { return m_a[i]; } + reference operator[](size_type i) noexcept { return m_a[i]; } + constexpr const_reference operator[](size_type i) const noexcept { return m_a[i]; } #endif - FT * data() noexcept { return m_a.data(); } - const FT * data() const noexcept { return m_a.data(); } + FT * data() noexcept { return m_a.data(); } + const FT * data() const noexcept { return m_a.data(); } private: base_type m_a; diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 8cfc2b20cec..48e29570b4c 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -318,14 +318,14 @@ pstream::size_type ppreprocessor::vread(value_type *buf, const pstream::size_typ } #define CHECKTOK2(p_op, p_prio) \ - else if (tok == # p_op) \ - { \ - if (prio < p_prio) \ - return val; \ - start++; \ - const auto v2 = expr(sexpr, start, p_prio); \ - val = (val p_op v2); \ - } \ + else if (tok == # p_op) \ + { \ + if (prio < p_prio) \ + return val; \ + start++; \ + const auto v2 = expr(sexpr, start, p_prio); \ + val = (val p_op v2); \ + } \ // Operator precedence see https://en.cppreference.com/w/cpp/language/operator_precedence diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h index 515bbe70a57..6d7301ee003 100644 --- a/src/lib/netlist/plib/pstring.h +++ b/src/lib/netlist/plib/pstring.h @@ -24,7 +24,7 @@ // enable this to use std::string instead of pstring globally. -#define PSTRING_USE_STD_STRING (0) +#define PSTRING_USE_STD_STRING (0) template <typename T> class pstring_const_iterator final diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index 6f68ea18135..39a19f21897 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -23,7 +23,7 @@ public: tool_app_t() : plib::app(), opt_grp1(*this, "General options", "The following options apply to all commands."), - opt_cmd (*this, "c", "cmd", 0, std::vector<pstring>({"run","convert","listdevices","static","header","docheader"}), "run|convert|listdevices|static|header|docheader"), + opt_cmd (*this, "c", "cmd", 0, std::vector<pstring>({"run","convert","listdevices","static","header","docheader"}), "run|convert|listdevices|static|header|docheader"), opt_file(*this, "f", "file", "-", "file to process (default is stdin)"), opt_defines(*this, "D", "define", "predefine value as macro, e.g. -Dname=value. If '=value' is omitted predefine it as 1. This option may be specified repeatedly."), opt_rfolders(*this, "r", "rom", "where to look for data files"), diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp index badf31594ac..8116e48111a 100644 --- a/src/lib/netlist/prg/nlwav.cpp +++ b/src/lib/netlist/prg/nlwav.cpp @@ -318,7 +318,7 @@ public: std::size_t i = 0; for (auto ch : channels) { - // $var real 64 N1X1 N1X1 $end + // $var real 64 N1X1 N1X1 $end if (format == ANALOG) write(pstring("$var real 64 ") + m_ids[i++] + " " + ch + " $end\n"); else if (format == DIGITAL) @@ -380,7 +380,7 @@ class nlwav_app : public plib::app public: nlwav_app() : plib::app(), - opt_fmt(*this, "f", "format", 0, std::vector<pstring>({"wav","vcda","vcdd"}), + opt_fmt(*this, "f", "format", 0, std::vector<pstring>({"wav","vcda","vcdd"}), "output format. Available options are wav|vcda|vcdd.\n" "wav : multichannel wav output\n" "vcda : analog VCD output\n" @@ -390,11 +390,11 @@ public: opt_out(*this, "o", "output", "-", "output file"), opt_rate(*this, "r", "rate", 48000, "sample rate of output file"), opt_amp(*this, "a", "amp", 10000.0, "amplification after mean correction (wav only)"), - opt_high(*this, "u", "high", 2.0, "minimum input for high level (vcdd only)"), - opt_low(*this, "l", "low", 1.0, "maximum input for low level (vcdd only)"), + opt_high(*this, "u", "high", 2.0, "minimum input for high level (vcdd only)"), + opt_low(*this, "l", "low", 1.0, "maximum input for low level (vcdd only)"), opt_verb(*this, "v", "verbose", "be verbose - this produces lots of output"), opt_quiet(*this,"q", "quiet", "be quiet - no warnings"), - opt_args(*this, "input file(s)"), + opt_args(*this, "input file(s)"), opt_version(*this, "", "version", "display version and exit"), opt_help(*this, "h", "help", "display help and exit"), opt_ex1(*this, "./nlwav -f vcdd -o x.vcd log_V*", @@ -411,7 +411,7 @@ public: plib::option_num<double> opt_low; plib::option_bool opt_verb; plib::option_bool opt_quiet; - plib::option_args opt_args; + plib::option_args opt_args; plib::option_bool opt_version; plib::option_bool opt_help; plib::option_example opt_ex1; diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index cb2c1b86a47..e6ba72d9717 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -66,7 +66,7 @@ public: for (std::size_t i = 0; i < railstart; i++) { - *tcr[i] -= m_go[i]; + *tcr[i] -= m_go[i]; gtot_t += m_gt[i]; RHS_t += m_Idr[i]; } diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h index 0b08d995fd3..8ff4b1c7d33 100644 --- a/src/lib/netlist/solver/nld_ms_gmres.h +++ b/src/lib/netlist/solver/nld_ms_gmres.h @@ -84,11 +84,11 @@ private: plib::mat_cr_t<float_type, SIZE> m_LU; - float_type m_c[restart_N + 1]; /* mr + 1 */ - float_type m_g[restart_N + 1]; /* mr + 1 */ + float_type m_c[restart_N + 1]; /* mr + 1 */ + float_type m_g[restart_N + 1]; /* mr + 1 */ float_type m_ht[restart_N + 1][restart_N]; /* (mr + 1), mr */ - float_type m_s[restart_N + 1]; /* mr + 1 */ - float_type m_y[restart_N + 1]; /* mr + 1 */ + float_type m_s[restart_N + 1]; /* mr + 1 */ + float_type m_y[restart_N + 1]; /* mr + 1 */ //plib::parray<float_type, SIZE> m_v[restart_N + 1]; /* mr + 1, n */ float_type m_v[restart_N + 1][storage_N]; /* mr + 1, n */ @@ -177,7 +177,7 @@ unsigned matrix_solver_GMRES_t<FT, SIZE>::vsolve_non_dynamic(const bool newton_r } //if (newton_raphson) - // printf("%e %e\n", this->delta(this->m_new_V), this->m_params.m_accuracy); + // printf("%e %e\n", this->delta(this->m_new_V), this->m_params.m_accuracy); const float_type err = (newton_raphson ? this->delta(this->m_new_V) : 0.0); this->store(this->m_new_V); diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index 82097ed930b..0e7a0a28db4 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -583,12 +583,12 @@ uint32_t _5clown_state::screen_update_fclown(screen_device &screen, bitmap_ind16 void _5clown_state::_5clown_palette(palette_device &palette) const { /* - 7654 3210 - ---- ---x RED component. - ---- --x- GREEN component. - ---- -x-- BLUE component. - ---- x--- background killer. - xxxx ---- unused. + 7654 3210 + ---- ---x RED component. + ---- --x- GREEN component. + ---- -x-- BLUE component. + ---- x--- background killer. + xxxx ---- unused. */ /* 0000KBGR */ diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 62e85461888..0639b91322b 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -1861,7 +1861,7 @@ void aerofgt_state::turbofrc(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(61.31); /* verified on pcb */ + screen.set_refresh_hz(61.31); /* verified on pcb */ screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(64*8, 32*8); screen.set_visarea(0*8, 44*8-1, 0*8, 30*8-1); diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index eaf4568be35..f3b47b777bc 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -323,7 +323,7 @@ MACHINE_CONFIG_START(alg_state::alg_r1) m_laserdisc->set_overlay(512*2, 262, FUNC(amiga_state::screen_update_amiga)); m_laserdisc->set_overlay_clip((129-8)*2, (449+8-1)*2, 44-8, 244+8-1); m_laserdisc->set_overlay_palette(m_palette); - + PALETTE(config, m_palette, FUNC(alg_state::amiga_palette), 4097); diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp index 682dd01889d..66137ac1f8c 100644 --- a/src/mame/drivers/argus.cpp +++ b/src/mame/drivers/argus.cpp @@ -528,7 +528,7 @@ void argus_state::argus(machine_config &config) void argus_state::valtric(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 5000000); /* 5 MHz */ + Z80(config, m_maincpu, 5000000); /* 5 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &argus_state::valtric_map); TIMER(config, "scantimer").configure_scanline(FUNC(argus_state::scanline), "screen", 0, 1); @@ -576,7 +576,7 @@ void argus_state::valtric(machine_config &config) void argus_state::butasan(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 5000000); /* 5 MHz */ + Z80(config, m_maincpu, 5000000); /* 5 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &argus_state::butasan_map); TIMER(config, "scantimer").configure_scanline(FUNC(argus_state::butasan_scanline), "screen", 0, 1); diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp index b1d9b9767f3..76fef67df81 100644 --- a/src/mame/drivers/avt.cpp +++ b/src/mame/drivers/avt.cpp @@ -568,12 +568,12 @@ uint32_t avt_state::screen_update_avt(screen_device &screen, bitmap_ind16 &bitma void avt_state::avt_palette(palette_device &palette) const { /* prom bits - 7654 3210 - ---- ---x Intensity?. - ---- --x- Red component. - ---- -x-- Green component. - ---- x--- Blue component. - xxxx ---- Unused. + 7654 3210 + ---- ---x Intensity?. + ---- --x- Red component. + ---- -x-- Green component. + ---- x--- Blue component. + xxxx ---- Unused. */ /* 0000BGRI */ diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp index 0b0ba86ee43..018aa01f1f4 100644 --- a/src/mame/drivers/battlane.cpp +++ b/src/mame/drivers/battlane.cpp @@ -274,11 +274,11 @@ void battlane_state::machine_reset() void battlane_state::battlane(machine_config &config) { /* basic machine hardware */ - M6809(config, m_maincpu, 1500000); /* 1.5 MHz ? */ + M6809(config, m_maincpu, 1500000); /* 1.5 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &battlane_state::battlane_map); m_maincpu->set_vblank_int("screen", FUNC(battlane_state::battlane_cpu1_interrupt)); - M6809(config, m_subcpu, 1500000); /* 1.5 MHz ? */ + M6809(config, m_subcpu, 1500000); /* 1.5 MHz ? */ m_subcpu->set_addrmap(AS_PROGRAM, &battlane_state::battlane_map); config.m_minimum_quantum = attotime::from_hz(6000); diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp index abd4c2f179f..b406c8a5247 100644 --- a/src/mame/drivers/bigevglf.cpp +++ b/src/mame/drivers/bigevglf.cpp @@ -394,7 +394,7 @@ void bigevglf_state::bigevglf(machine_config &config) m_audiocpu->set_periodic_int(FUNC(bigevglf_state::irq0_line_hold), attotime::from_hz(2*60)); /* IRQ generated by ???; 2 irqs/frame give good music tempo but also SOUND ERROR in test mode, 4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */ - /* Clearly, then, there should be some sort of IRQ acknowledge mechanism, duh. -R */ + /* Clearly, then, there should be some sort of IRQ acknowledge mechanism, duh. -R */ GENERIC_LATCH_8(config, m_soundlatch[0]); m_soundlatch[0]->data_pending_callback().set("soundnmi", FUNC(input_merger_device::in_w<0>)); diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index 65828878eb4..d5cc4cc9d31 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -292,12 +292,12 @@ void blktiger_state::machine_reset() void blktiger_state::blktiger(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(24'000'000)/4); /* verified on pcb */ + Z80(config, m_maincpu, XTAL(24'000'000)/4); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &blktiger_state::blktiger_map); m_maincpu->set_addrmap(AS_IO, &blktiger_state::blktiger_io_map); m_maincpu->set_vblank_int("screen", FUNC(blktiger_state::irq0_line_hold)); - Z80(config, m_audiocpu, XTAL(3'579'545)); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(3'579'545)); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &blktiger_state::blktiger_sound_map); I8751(config, m_mcu, XTAL(24'000'000)/4); /* ??? */ diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 5d91c6bfaef..7b6494cb511 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -460,10 +460,10 @@ WRITE_LINE_MEMBER(brkthru_state::vblank_irq) void brkthru_state::brkthru(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MASTER_CLOCK/8); /* 1.5 MHz ? */ + MC6809E(config, m_maincpu, MASTER_CLOCK/8); /* 1.5 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &brkthru_state::brkthru_map); - MC6809(config, m_audiocpu, MASTER_CLOCK/2); /* 1.5 MHz ? */ + MC6809(config, m_audiocpu, MASTER_CLOCK/2); /* 1.5 MHz ? */ m_audiocpu->set_addrmap(AS_PROGRAM, &brkthru_state::sound_map); /* video hardware */ @@ -497,10 +497,10 @@ void brkthru_state::brkthru(machine_config &config) void brkthru_state::darwin(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MASTER_CLOCK/8); /* 1.5 MHz ? */ + MC6809E(config, m_maincpu, MASTER_CLOCK/8); /* 1.5 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &brkthru_state::darwin_map); - MC6809(config, m_audiocpu, MASTER_CLOCK/2); /* 1.5 MHz ? */ + MC6809(config, m_audiocpu, MASTER_CLOCK/2); /* 1.5 MHz ? */ m_audiocpu->set_addrmap(AS_PROGRAM, &brkthru_state::sound_map); /* video hardware */ diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp index cee77a87de1..a01a688822c 100644 --- a/src/mame/drivers/chinagat.cpp +++ b/src/mame/drivers/chinagat.cpp @@ -574,11 +574,11 @@ void chinagat_state::machine_reset() void chinagat_state::chinagat(machine_config &config) { /* basic machine hardware */ - HD6309(config, m_maincpu, MAIN_CLOCK / 2); /* 1.5 MHz (12MHz oscillator / 4 internally) */ + HD6309(config, m_maincpu, MAIN_CLOCK / 2); /* 1.5 MHz (12MHz oscillator / 4 internally) */ m_maincpu->set_addrmap(AS_PROGRAM, &chinagat_state::main_map); TIMER(config, "scantimer").configure_scanline(FUNC(chinagat_state::chinagat_scanline), "screen", 0, 1); - HD6309(config, m_subcpu, MAIN_CLOCK / 2); /* 1.5 MHz (12MHz oscillator / 4 internally) */ + HD6309(config, m_subcpu, MAIN_CLOCK / 2); /* 1.5 MHz (12MHz oscillator / 4 internally) */ m_subcpu->set_addrmap(AS_PROGRAM, &chinagat_state::sub_map); Z80(config, m_soundcpu, XTAL(3'579'545)); /* 3.579545 MHz */ @@ -613,14 +613,14 @@ void chinagat_state::chinagat(machine_config &config) void chinagat_state::saiyugoub1(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 68B09EP 1.5 MHz (12MHz oscillator) */ + MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 68B09EP 1.5 MHz (12MHz oscillator) */ m_maincpu->set_addrmap(AS_PROGRAM, &chinagat_state::main_map); TIMER(config, "scantimer").configure_scanline(FUNC(chinagat_state::chinagat_scanline), "screen", 0, 1); - MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 68B09EP 1.5 MHz (12MHz oscillator) */ + MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 68B09EP 1.5 MHz (12MHz oscillator) */ m_subcpu->set_addrmap(AS_PROGRAM, &chinagat_state::sub_map); - Z80(config, m_soundcpu, XTAL(3'579'545)); /* 3.579545 MHz oscillator */ + Z80(config, m_soundcpu, XTAL(3'579'545)); /* 3.579545 MHz oscillator */ m_soundcpu->set_addrmap(AS_PROGRAM, &chinagat_state::saiyugoub1_sound_map); i8748_device &mcu(I8748(config, "mcu", 9263750)); /* 9.263750 MHz oscillator, divided by 3*5 internally */ @@ -655,21 +655,21 @@ void chinagat_state::saiyugoub1(machine_config &config) MSM5205(config, m_adpcm, 9263750 / 24); m_adpcm->vck_legacy_callback().set(FUNC(chinagat_state::saiyugoub1_m5205_irq_w)); /* Interrupt function */ - m_adpcm->set_prescaler_selector(msm5205_device::S64_4B); /* vclk input mode (6030Hz, 4-bit) */ + m_adpcm->set_prescaler_selector(msm5205_device::S64_4B); /* vclk input mode (6030Hz, 4-bit) */ m_adpcm->add_route(ALL_OUTPUTS, "mono", 0.60); } void chinagat_state::saiyugoub2(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 1.5 MHz (12MHz oscillator) */ + MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 1.5 MHz (12MHz oscillator) */ m_maincpu->set_addrmap(AS_PROGRAM, &chinagat_state::main_map); TIMER(config, "scantimer").configure_scanline(FUNC(chinagat_state::chinagat_scanline), "screen", 0, 1); - MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 1.5 MHz (12MHz oscillator) */ + MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 1.5 MHz (12MHz oscillator) */ m_subcpu->set_addrmap(AS_PROGRAM, &chinagat_state::sub_map); - Z80(config, m_soundcpu, XTAL(3'579'545)); /* 3.579545 MHz oscillator */ + Z80(config, m_soundcpu, XTAL(3'579'545)); /* 3.579545 MHz oscillator */ m_soundcpu->set_addrmap(AS_PROGRAM, &chinagat_state::ym2203c_sound_map); config.m_minimum_quantum = attotime::from_hz(6000); /* heavy interleaving to sync up sprite<->main cpu's */ diff --git a/src/mame/drivers/clickstart.cpp b/src/mame/drivers/clickstart.cpp index 6d27a5ba248..c03fb706eea 100644 --- a/src/mame/drivers/clickstart.cpp +++ b/src/mame/drivers/clickstart.cpp @@ -4,21 +4,21 @@ Leapfrog Clickstart Emulation - die markings show - "SunPlus QL8041C" ( known as Sunplus SPG2?? ) + die markings show + "SunPlus QL8041C" ( known as Sunplus SPG2?? ) Status: - Some games have Checksums listed in the header area that appear to be - like the byte checksums on the Radica games in vii.cpp, however the - calculation doesn't add up correctly. There is also a checksum in - a footer area at the end of every ROM that does add up correctly in - all cases. + Some games have Checksums listed in the header area that appear to be + like the byte checksums on the Radica games in vii.cpp, however the + calculation doesn't add up correctly. There is also a checksum in + a footer area at the end of every ROM that does add up correctly in + all cases. - The ROM carts are marked for 4MByte ROMs at least so the sizes - should be correct. + The ROM carts are marked for 4MByte ROMs at least so the sizes + should be correct. - What type of SPG is this? + What type of SPG is this? *******************************************************************************/ diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index 5b3acce684b..6ccbbb186b1 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -702,7 +702,7 @@ void dacholer_state::dacholer(machine_config &config) AY8910(config, "ay3", XTAL(19'968'000)/16).add_route(ALL_OUTPUTS, "mono", 0.15); MSM5205(config, m_msm, XTAL(384'000)); - m_msm->vck_legacy_callback().set(FUNC(dacholer_state::adpcm_int)); /* interrupt function */ + m_msm->vck_legacy_callback().set(FUNC(dacholer_state::adpcm_int)); /* interrupt function */ m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 1 / 96 = 3906.25Hz playback - guess */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.30); } diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp index 192bd3140a3..8eb85f3951d 100644 --- a/src/mame/drivers/ddragon.cpp +++ b/src/mame/drivers/ddragon.cpp @@ -944,14 +944,14 @@ GFXDECODE_END void ddragon_state::ddragon(machine_config &config) { /* basic machine hardware */ - HD6309E(config, m_maincpu, MAIN_CLOCK / 4); /* HD63C09EP, 3 MHz */ + HD6309E(config, m_maincpu, MAIN_CLOCK / 4); /* HD63C09EP, 3 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &ddragon_state::ddragon_map); TIMER(config, "scantimer").configure_scanline(FUNC(ddragon_state::ddragon_scanline), "screen", 0, 1); - HD63701(config, m_subcpu, MAIN_CLOCK / 2); /* HD63701YOP, 6 MHz / 4 internally */ + HD63701(config, m_subcpu, MAIN_CLOCK / 2); /* HD63701YOP, 6 MHz / 4 internally */ m_subcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sub_map); - MC6809(config, m_soundcpu, MAIN_CLOCK / 2); /* HD68A09P, 6 MHz / 4 internally */ + MC6809(config, m_soundcpu, MAIN_CLOCK / 2); /* HD68A09P, 6 MHz / 4 internally */ m_soundcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sound_map); config.m_minimum_quantum = attotime::from_hz(60000); /* heavy interleaving to sync up sprite<->main CPUs */ @@ -1015,14 +1015,14 @@ void ddragon_state::ddragonba(machine_config &config) void ddragon_state::ddragon6809(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 1.5 MHz */ + MC6809E(config, m_maincpu, MAIN_CLOCK / 8); /* 1.5 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &ddragon_state::ddragon_map); TIMER(config, "scantimer").configure_scanline(FUNC(ddragon_state::ddragon_scanline), "screen", 0, 1); - MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 1.5 Mhz */ + MC6809E(config, m_subcpu, MAIN_CLOCK / 8); /* 1.5 Mhz */ m_subcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sub_map); - MC6809E(config, m_soundcpu, MAIN_CLOCK / 8); /* 1.5 MHz */ + MC6809E(config, m_soundcpu, MAIN_CLOCK / 8); /* 1.5 MHz */ m_soundcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sound_map); config.m_minimum_quantum = attotime::from_hz(60000); /* heavy interleaving to sync up sprite<->main CPUs */ @@ -1066,11 +1066,11 @@ void ddragon_state::ddragon6809(machine_config &config) void ddragon_state::ddragon2(machine_config &config) { /* basic machine hardware */ - HD6309E(config, m_maincpu, MAIN_CLOCK / 4); /* HD63C09EP, 3 MHz */ + HD6309E(config, m_maincpu, MAIN_CLOCK / 4); /* HD63C09EP, 3 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &ddragon_state::dd2_map); TIMER(config, "scantimer").configure_scanline(FUNC(ddragon_state::ddragon_scanline), "screen", 0, 1); - Z80(config, m_subcpu, MAIN_CLOCK / 3); /* 4 MHz */ + Z80(config, m_subcpu, MAIN_CLOCK / 3); /* 4 MHz */ m_subcpu->set_addrmap(AS_PROGRAM, &ddragon_state::dd2_sub_map); Z80(config, m_soundcpu, 3579545); diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp index 7823f6ccc77..d03c39074ee 100644 --- a/src/mame/drivers/deniam.cpp +++ b/src/mame/drivers/deniam.cpp @@ -253,11 +253,11 @@ void deniam_state::machine_reset() void deniam_state::deniam16b(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(25'000'000)/2); /* 12.5Mhz verified */ + M68000(config, m_maincpu, XTAL(25'000'000)/2); /* 12.5Mhz verified */ m_maincpu->set_addrmap(AS_PROGRAM, &deniam_state::deniam16b_map); m_maincpu->set_vblank_int("screen", FUNC(deniam_state::irq4_line_assert)); - Z80(config, m_audiocpu, XTAL(25'000'000)/4); /* 6.25Mhz verified */ + Z80(config, m_audiocpu, XTAL(25'000'000)/4); /* 6.25Mhz verified */ m_audiocpu->set_addrmap(AS_PROGRAM, &deniam_state::sound_map); m_audiocpu->set_addrmap(AS_IO, &deniam_state::sound_io_map); @@ -291,7 +291,7 @@ void deniam_state::deniam16b(machine_config &config) void deniam_state::deniam16c(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(25'000'000)/2); /* 12.5Mhz verified */ + M68000(config, m_maincpu, XTAL(25'000'000)/2); /* 12.5Mhz verified */ m_maincpu->set_addrmap(AS_PROGRAM, &deniam_state::deniam16c_map); m_maincpu->set_vblank_int("screen", FUNC(deniam_state::irq4_line_assert)); diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index 0889d68ae3e..c351b4cc56c 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -459,7 +459,7 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int) void discoboy_state::discoboy(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000)/2); /* 6 MHz? */ + Z80(config, m_maincpu, XTAL(12'000'000)/2); /* 6 MHz? */ m_maincpu->set_addrmap(AS_PROGRAM, &discoboy_state::discoboy_map); m_maincpu->set_addrmap(AS_IO, &discoboy_state::io_map); m_maincpu->set_vblank_int("screen", FUNC(discoboy_state::irq0_line_hold)); diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp index a6fd1a3cf13..529ec424694 100644 --- a/src/mame/drivers/drmicro.cpp +++ b/src/mame/drivers/drmicro.cpp @@ -270,7 +270,7 @@ void drmicro_state::drmicro(machine_config &config) SN76496(config, "sn3", MCLK/4).add_route(ALL_OUTPUTS, "mono", 0.50); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(drmicro_state::pcm_w)); /* IRQ handler */ + m_msm->vck_legacy_callback().set(FUNC(drmicro_state::pcm_w)); /* IRQ handler */ m_msm->set_prescaler_selector(msm5205_device::S64_4B); /* 6 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.75); } diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 310832aadba..a8195352825 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -4247,7 +4247,7 @@ void dynax_state::cdracula(machine_config &config) void dynax_state::hanamai(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ + Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &dynax_state::sprtmtch_mem_map); m_maincpu->set_addrmap(AS_IO, &dynax_state::hanamai_io_map); m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus @@ -4303,8 +4303,8 @@ void dynax_state::hanamai(machine_config &config) ym2203.add_route(3, "mono", 0.50); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -4317,7 +4317,7 @@ void dynax_state::hanamai(machine_config &config) void dynax_state::hnoridur(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(22'000'000) / 4); /* 5.5MHz */ + Z80(config, m_maincpu, XTAL(22'000'000) / 4); /* 5.5MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &dynax_state::hnoridur_mem_map); m_maincpu->set_addrmap(AS_IO, &dynax_state::hnoridur_io_map); m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus @@ -4371,8 +4371,8 @@ void dynax_state::hnoridur(machine_config &config) YM2413(config, "ym2413", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 1.0); MSM5205(config, m_msm, XTAL(384'000)); - m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -4387,7 +4387,7 @@ void dynax_state::hjingi(machine_config &config) Z80(config, m_maincpu, XTAL(22'000'000) / 4); m_maincpu->set_addrmap(AS_PROGRAM, &dynax_state::hjingi_mem_map); m_maincpu->set_addrmap(AS_IO, &dynax_state::hjingi_io_map); - m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus + m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus MCFG_MACHINE_START_OVERRIDE(dynax_state,hjingi) MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) @@ -4440,8 +4440,8 @@ void dynax_state::hjingi(machine_config &config) YM2413(config, "ym2413", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 1.0); MSM5205(config, m_msm, XTAL(384'000)); - m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } @@ -4453,10 +4453,10 @@ void dynax_state::hjingi(machine_config &config) void dynax_state::sprtmtch(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ + Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &dynax_state::sprtmtch_mem_map); m_maincpu->set_addrmap(AS_IO, &dynax_state::sprtmtch_io_map); - m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus + m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai) MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) @@ -4662,15 +4662,15 @@ MACHINE_START_MEMBER(dynax_state,jantouki) void dynax_state::jantouki(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ + Z80(config, m_maincpu, 22000000 / 4); /* 5.5MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &dynax_state::jantouki_mem_map); m_maincpu->set_addrmap(AS_IO, &dynax_state::jantouki_io_map); - m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus + m_maincpu->set_irq_acknowledge_callback("mainirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus - Z80(config, m_soundcpu, 22000000 / 4); /* 5.5MHz */ + Z80(config, m_soundcpu, 22000000 / 4); /* 5.5MHz */ m_soundcpu->set_addrmap(AS_PROGRAM, &dynax_state::jantouki_sound_mem_map); m_soundcpu->set_addrmap(AS_IO, &dynax_state::jantouki_sound_io_map); - m_soundcpu->set_irq_acknowledge_callback("soundirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus + m_soundcpu->set_irq_acknowledge_callback("soundirq", FUNC(rst_pos_buffer_device::inta_cb)); // IM 0 needs an opcode on the data bus MCFG_MACHINE_START_OVERRIDE(dynax_state,jantouki) MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax) @@ -4739,8 +4739,8 @@ void dynax_state::jantouki(machine_config &config) ym2203.add_route(3, "mono", 0.50); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int_cpu1)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(dynax_state::adpcm_int_cpu1)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); /* devices */ diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp index 771a3c8a043..cea46babd46 100644 --- a/src/mame/drivers/fantland.cpp +++ b/src/mame/drivers/fantland.cpp @@ -934,10 +934,10 @@ void borntofi_state::machine_reset() void borntofi_state::borntofi(machine_config &config) { /* basic machine hardware */ - V20(config, m_maincpu, 16000000/2); // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] + V20(config, m_maincpu, 16000000/2); // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] m_maincpu->set_addrmap(AS_PROGRAM, &borntofi_state::main_map); - I8088(config, m_audiocpu, 18432000/3); // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] + I8088(config, m_audiocpu, 18432000/3); // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] m_audiocpu->set_addrmap(AS_PROGRAM, &borntofi_state::sound_map); /* video hardware */ @@ -983,10 +983,10 @@ void borntofi_state::borntofi(machine_config &config) void fantland_state::wheelrun(machine_config &config) { /* basic machine hardware */ - V20(config, m_maincpu, XTAL(18'000'000)/2); // D701080C-8 (V20) + V20(config, m_maincpu, XTAL(18'000'000)/2); // D701080C-8 (V20) m_maincpu->set_addrmap(AS_PROGRAM, &fantland_state::wheelrun_map); - Z80(config, m_audiocpu, XTAL(18'000'000)/2); // Z8400BB1 (Z80B) + Z80(config, m_audiocpu, XTAL(18'000'000)/2); // Z8400BB1 (Z80B) m_audiocpu->set_addrmap(AS_PROGRAM, &fantland_state::wheelrun_sound_map); // IRQ by YM3526, NMI when soundlatch is written diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp index c551b14ef94..9359eed0511 100644 --- a/src/mame/drivers/fcrash.cpp +++ b/src/mame/drivers/fcrash.cpp @@ -1763,14 +1763,14 @@ void cps_state::fcrash(machine_config &config) ym2.add_route(2, "mono", 0.10); ym2.add_route(3, "mono", 1.0); - MSM5205(config, m_msm_1, 24000000/64); /* ? */ + MSM5205(config, m_msm_1, 24000000/64); /* ? */ m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int1)); /* interrupt function */ - m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_1->add_route(ALL_OUTPUTS, "mono", 0.25); - MSM5205(config, m_msm_2, 24000000/64); /* ? */ + MSM5205(config, m_msm_2, 24000000/64); /* ? */ m_msm_2->vck_legacy_callback().set(FUNC(cps_state::m5205_int2)); /* interrupt function */ - m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_2->add_route(ALL_OUTPUTS, "mono", 0.25); } @@ -1899,14 +1899,14 @@ void cps_state::sf2mdt(machine_config &config) YM2151(config, "2151", XTAL(3'579'545)).add_route(0, "mono", 0.35).add_route(1, "mono", 0.35); /* has 2x MSM5205 instead of OKI6295 */ - MSM5205(config, m_msm_1, 24000000/64); /* ? */ - m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int1)); /* interrupt function */ - m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + MSM5205(config, m_msm_1, 24000000/64); /* ? */ + m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int1)); /* interrupt function */ + m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_1->add_route(ALL_OUTPUTS, "mono", 0.25); - MSM5205(config, m_msm_2, 24000000/64); /* ? */ - m_msm_2->vck_legacy_callback().set(FUNC(cps_state::m5205_int2)); /* interrupt function */ - m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + MSM5205(config, m_msm_2, 24000000/64); /* ? */ + m_msm_2->vck_legacy_callback().set(FUNC(cps_state::m5205_int2)); /* interrupt function */ + m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_2->add_route(ALL_OUTPUTS, "mono", 0.25); } @@ -1953,14 +1953,14 @@ void cps_state::knightsb(machine_config &config) ym2151.add_route(1, "mono", 0.35); /* has 2x MSM5205 instead of OKI6295 */ - MSM5205(config, m_msm_1, 24000000/64); /* ? */ - m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int1)); /* interrupt function */ - m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + MSM5205(config, m_msm_1, 24000000/64); /* ? */ + m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int1)); /* interrupt function */ + m_msm_1->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_1->add_route(ALL_OUTPUTS, "mono", 0.25); - MSM5205(config, m_msm_2, 24000000/64); /* ? */ - m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int2)); /* interrupt function */ - m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + MSM5205(config, m_msm_2, 24000000/64); /* ? */ + m_msm_1->vck_legacy_callback().set(FUNC(cps_state::m5205_int2)); /* interrupt function */ + m_msm_2->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm_2->add_route(ALL_OUTPUTS, "mono", 0.25); } diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index ae95c7d1d5c..bdf1a5eeb8b 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -618,11 +618,11 @@ void firetrap_state::machine_reset() void firetrap_state::firetrap(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz + Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz m_maincpu->set_addrmap(AS_PROGRAM, &firetrap_state::firetrap_map); m_maincpu->set_vblank_int("screen", FUNC(firetrap_state::firetrap_irq)); - M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz + M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz m_audiocpu->set_addrmap(AS_PROGRAM, &firetrap_state::sound_map); /* IRQs are caused by the ADPCM chip */ /* NMIs are caused by the main CPU */ @@ -655,20 +655,20 @@ void firetrap_state::firetrap(machine_config &config) LS157(config, m_adpcm_select, 0); m_adpcm_select->out_callback().set("msm", FUNC(msm5205_device::data_w)); - MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz + MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz m_msm->vck_callback().set(FUNC(firetrap_state::firetrap_adpcm_int)); - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.30); } void firetrap_state::firetrapbl(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz + Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz m_maincpu->set_addrmap(AS_PROGRAM, &firetrap_state::firetrap_bootleg_map); m_maincpu->set_vblank_int("screen", FUNC(firetrap_state::firetrap_irq)); - M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz + M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz m_audiocpu->set_addrmap(AS_PROGRAM, &firetrap_state::sound_map); /* IRQs are caused by the ADPCM chip */ /* NMIs are caused by the main CPU */ @@ -693,15 +693,15 @@ void firetrap_state::firetrapbl(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); - ym3526_device &ymsnd(YM3526(config, "ymsnd", FIRETRAP_XTAL/4)); // 3 MHz + ym3526_device &ymsnd(YM3526(config, "ymsnd", FIRETRAP_XTAL/4)); // 3 MHz ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0); LS157(config, m_adpcm_select, 0); m_adpcm_select->out_callback().set("msm", FUNC(msm5205_device::data_w)); - MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz + MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz m_msm->vck_callback().set(FUNC(firetrap_state::firetrap_adpcm_int)); - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.30); } diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp index 66f04e81a1c..184a0416983 100644 --- a/src/mame/drivers/fromance.cpp +++ b/src/mame/drivers/fromance.cpp @@ -903,11 +903,11 @@ MACHINE_RESET_MEMBER(fromance_state,fromance) void fromance_state::nekkyoku(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12000000/2); /* 6.00 Mhz ? */ + Z80(config, m_maincpu, 12000000/2); /* 6.00 Mhz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &fromance_state::nekkyoku_main_map); m_maincpu->set_vblank_int("screen", FUNC(fromance_state::irq0_line_hold)); - Z80(config, m_subcpu, 12000000/2); /* 6.00 Mhz ? */ + Z80(config, m_subcpu, 12000000/2); /* 6.00 Mhz ? */ m_subcpu->set_addrmap(AS_PROGRAM, &fromance_state::nekkyoku_sub_map); m_subcpu->set_addrmap(AS_IO, &fromance_state::nekkyoku_sub_io_map); @@ -940,18 +940,18 @@ void fromance_state::nekkyoku(machine_config &config) MSM5205(config, m_msm, 384000); m_msm->vck_legacy_callback().set(FUNC(fromance_state::fromance_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.80); } void fromance_state::idolmj(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ + Z80(config, m_maincpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &fromance_state::fromance_main_map); m_maincpu->set_vblank_int("screen", FUNC(fromance_state::irq0_line_hold)); - Z80(config, m_subcpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ + Z80(config, m_subcpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ m_subcpu->set_addrmap(AS_PROGRAM, &fromance_state::fromance_sub_map); m_subcpu->set_addrmap(AS_IO, &fromance_state::idolmj_sub_io_map); @@ -984,7 +984,7 @@ void fromance_state::idolmj(machine_config &config) MSM5205(config, m_msm, 384000); m_msm->vck_legacy_callback().set(FUNC(fromance_state::fromance_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.80); } @@ -992,11 +992,11 @@ void fromance_state::idolmj(machine_config &config) void fromance_state::fromance(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ + Z80(config, m_maincpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &fromance_state::fromance_main_map); m_maincpu->set_vblank_int("screen", FUNC(fromance_state::irq0_line_hold)); - Z80(config, m_subcpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ + Z80(config, m_subcpu, XTAL(12'000'000) / 2); /* 6.00 Mhz ? */ m_subcpu->set_addrmap(AS_PROGRAM, &fromance_state::fromance_sub_map); m_subcpu->set_addrmap(AS_IO, &fromance_state::fromance_sub_io_map); @@ -1029,7 +1029,7 @@ void fromance_state::fromance(machine_config &config) MSM5205(config, m_msm, 384000); m_msm->vck_legacy_callback().set(FUNC(fromance_state::fromance_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.10); } diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp index eb94eda7e41..c30d173c010 100644 --- a/src/mame/drivers/fuukifg2.cpp +++ b/src/mame/drivers/fuukifg2.cpp @@ -448,10 +448,10 @@ void fuuki16_state::machine_reset() void fuuki16_state::fuuki16(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(32'000'000) / 2); /* 16 MHz */ + M68000(config, m_maincpu, XTAL(32'000'000) / 2); /* 16 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &fuuki16_state::fuuki16_map); - Z80(config, m_audiocpu, XTAL(12'000'000) / 2); /* 6 MHz */ + Z80(config, m_audiocpu, XTAL(12'000'000) / 2); /* 6 MHz */ m_audiocpu->set_addrmap(AS_PROGRAM, &fuuki16_state::fuuki16_sound_map); m_audiocpu->set_addrmap(AS_IO, &fuuki16_state::fuuki16_sound_io_map); diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp index 1e487fed8b8..c730fb3d311 100644 --- a/src/mame/drivers/gaiden.cpp +++ b/src/mame/drivers/gaiden.cpp @@ -758,7 +758,7 @@ void gaiden_state::shadoww(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(gaiden_state::irq5_line_assert)); Z80(config, m_audiocpu, 4000000); /* 4 MHz */ - m_audiocpu->set_addrmap(AS_PROGRAM, &gaiden_state::sound_map); /* IRQs are triggered by the YM2203 */ + m_audiocpu->set_addrmap(AS_PROGRAM, &gaiden_state::sound_map); /* IRQs are triggered by the YM2203 */ WATCHDOG_TIMER(config, "watchdog"); diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp index 5fda8a45d87..266975edcf0 100644 --- a/src/mame/drivers/galspnbl.cpp +++ b/src/mame/drivers/galspnbl.cpp @@ -217,12 +217,12 @@ void galspnbl_state::machine_start() void galspnbl_state::galspnbl(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(12'000'000)); /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */ + M68000(config, m_maincpu, XTAL(12'000'000)); /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */ m_maincpu->set_addrmap(AS_PROGRAM, &galspnbl_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(galspnbl_state::irq3_line_hold)); /* also has vector for 6, but it does nothing */ - Z80(config, m_audiocpu, XTAL(4'000'000)); /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */ - m_audiocpu->set_addrmap(AS_PROGRAM, &galspnbl_state::audio_map); /* NMI is caused by the main CPU */ + Z80(config, m_audiocpu, XTAL(4'000'000)); /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */ + m_audiocpu->set_addrmap(AS_PROGRAM, &galspnbl_state::audio_map); /* NMI is caused by the main CPU */ /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index 0a7e0fb86f8..a641ea11a38 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -941,17 +941,17 @@ GFXDECODE_END void ppking_state::ppking(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12_MHz_XTAL/2); /* verified on pcb */ + Z80(config, m_maincpu, 12_MHz_XTAL/2); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &ppking_state::ppking_cpu1_map); m_maincpu->set_addrmap(AS_IO, &ppking_state::ppking_cpu1_io); m_maincpu->set_vblank_int("screen", FUNC(ppking_state::irq0_line_hold)); - Z80(config, m_subcpu, 12_MHz_XTAL/4); /* verified on pcb */ + Z80(config, m_subcpu, 12_MHz_XTAL/4); /* verified on pcb */ m_subcpu->set_addrmap(AS_PROGRAM, &ppking_state::cpu2_map); m_subcpu->set_addrmap(AS_IO, &ppking_state::ppking_cpu2_io); m_subcpu->set_periodic_int(FUNC(ppking_state::irq0_line_assert), attotime::from_hz(60)); - MC6809(config, m_audiocpu, 12_MHz_XTAL/4); /* verified on pcb */ + MC6809(config, m_audiocpu, 12_MHz_XTAL/4); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &ppking_state::ppking_cpu3_map); config.m_minimum_quantum = attotime::from_hz(6000); @@ -999,23 +999,23 @@ void ppking_state::ppking(machine_config &config) ymsnd.add_route(3, "mono", 0.50); MSM5205(config, m_msm, 455_kHz_XTAL); /* verified on pcb */ - m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* vclk input mode */ + m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* vclk input mode */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.60); } void gladiatr_state::gladiatr(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12_MHz_XTAL/2); /* verified on pcb */ + Z80(config, m_maincpu, 12_MHz_XTAL/2); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &gladiatr_state::gladiatr_cpu1_map); m_maincpu->set_addrmap(AS_IO, &gladiatr_state::gladiatr_cpu1_io); m_maincpu->set_vblank_int("screen", FUNC(gladiatr_state::irq0_line_hold)); - Z80(config, m_subcpu, 12_MHz_XTAL/4); /* verified on pcb */ + Z80(config, m_subcpu, 12_MHz_XTAL/4); /* verified on pcb */ m_subcpu->set_addrmap(AS_PROGRAM, &gladiatr_state::cpu2_map); m_subcpu->set_addrmap(AS_IO, &gladiatr_state::gladiatr_cpu2_io); - MC6809(config, m_audiocpu, 12_MHz_XTAL/4); /* verified on pcb */ + MC6809(config, m_audiocpu, 12_MHz_XTAL/4); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &gladiatr_state::gladiatr_cpu3_map); MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator) @@ -1089,8 +1089,8 @@ void gladiatr_state::gladiatr(machine_config &config) ymsnd.add_route(2, "mono", 0.60); ymsnd.add_route(3, "mono", 0.50); - MSM5205(config, m_msm, 455_kHz_XTAL); /* verified on pcb */ - m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* vclk input mode */ + MSM5205(config, m_msm, 455_kHz_XTAL); /* verified on pcb */ + m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* vclk input mode */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.60); LS259(config, "filtlatch", 0); // 9R - filters on sound output diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp index 3d1477d42d7..11828b83cf4 100644 --- a/src/mame/drivers/goal92.cpp +++ b/src/mame/drivers/goal92.cpp @@ -304,7 +304,7 @@ void goal92_state::goal92(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(goal92_state::irq6_line_hold)); /* VBL */ Z80(config, m_audiocpu, 2500000); - m_audiocpu->set_addrmap(AS_PROGRAM, &goal92_state::sound_cpu); /* IRQs are triggered by the main CPU */ + m_audiocpu->set_addrmap(AS_PROGRAM, &goal92_state::sound_cpu); /* IRQs are triggered by the main CPU */ /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp index 4403e40d75a..6f48586dde5 100644 --- a/src/mame/drivers/gsword.cpp +++ b/src/mame/drivers/gsword.cpp @@ -917,17 +917,17 @@ GFXDECODE_END void gsword_state::gsword(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(18'000'000)/6); /* verified on pcb */ + Z80(config, m_maincpu, XTAL(18'000'000)/6); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &gsword_state::cpu1_map); m_maincpu->set_addrmap(AS_IO, &gsword_state::cpu1_io_map); m_maincpu->set_vblank_int("screen", FUNC(gsword_state::irq0_line_hold)); - Z80(config, m_subcpu, XTAL(18'000'000)/6); /* verified on pcb */ + Z80(config, m_subcpu, XTAL(18'000'000)/6); /* verified on pcb */ m_subcpu->set_addrmap(AS_PROGRAM, &gsword_state::cpu2_map); m_subcpu->set_addrmap(AS_IO, &gsword_state::cpu2_io_map); m_subcpu->set_periodic_int(FUNC(gsword_state::sound_interrupt), attotime::from_hz(4*60)); - Z80(config, m_audiocpu, XTAL(18'000'000)/6); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(18'000'000)/6); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &gsword_state::cpu3_map); upi41_cpu_device &mcu1(I8041(config, "mcu1", 12'000'000/2)); // clock unknown, using value from gladiatr @@ -988,12 +988,12 @@ void gsword_state::gsword(machine_config &config) void josvolly_state::josvolly(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 18000000/4); /* ? */ + Z80(config, m_maincpu, 18000000/4); /* ? */ m_maincpu->set_addrmap(AS_PROGRAM, &josvolly_state::cpu1_map); m_maincpu->set_addrmap(AS_IO, &josvolly_state::josvolly_cpu1_io_map); m_maincpu->set_periodic_int(FUNC(josvolly_state::irq0_line_hold), attotime::from_hz(2*60)); - Z80(config, m_audiocpu, 12000000/4); /* ? */ + Z80(config, m_audiocpu, 12000000/4); /* ? */ m_audiocpu->set_addrmap(AS_PROGRAM, &josvolly_state::josvolly_cpu2_map); m_audiocpu->set_addrmap(AS_IO, &josvolly_state::josvolly_cpu2_io_map); m_audiocpu->set_vblank_int("screen", FUNC(josvolly_state::irq0_line_assert)); diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp index eaa03fc3925..6941b922ac0 100644 --- a/src/mame/drivers/hnayayoi.cpp +++ b/src/mame/drivers/hnayayoi.cpp @@ -545,7 +545,7 @@ void hnayayoi_state::machine_reset() void hnayayoi_state::hnayayoi(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 20000000/4); /* 5 MHz ???? */ + Z80(config, m_maincpu, 20000000/4); /* 5 MHz ???? */ m_maincpu->set_addrmap(AS_PROGRAM, &hnayayoi_state::hnayayoi_map); m_maincpu->set_addrmap(AS_IO, &hnayayoi_state::hnayayoi_io_map); diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index 895337778cd..bc8bb0922a9 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -753,7 +753,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc_base) mm58167_device &rtc(MM58167(config, "rtc", 32.768_kHz_XTAL)); rtc.irq().set(FUNC(hp_ipc_state::irq_1)); -// rtc.standby_irq().set(FUNC(hp_ipc_state::irq_6)); +// rtc.standby_irq().set(FUNC(hp_ipc_state::irq_6)); hp_hil_mlc_device &mlc(HP_HIL_MLC(config, "mlc", XTAL(15'920'000)/2)); mlc.int_callback().set(FUNC(hp_ipc_state::irq_2)); diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index 855cb323eb3..02648340c83 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -295,10 +295,10 @@ WRITE_LINE_MEMBER(hyperspt_state::vblank_irq) void hyperspt_state::hyperspt(machine_config &config) { /* basic machine hardware */ - KONAMI1(config, m_maincpu, XTAL(18'432'000)/12); /* verified on pcb */ + KONAMI1(config, m_maincpu, XTAL(18'432'000)/12); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &hyperspt_state::hyperspt_map); - Z80(config, m_audiocpu, XTAL(14'318'181)/4); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(14'318'181)/4); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &hyperspt_state::hyperspt_sound_map); ls259_device &mainlatch(LS259(config, "mainlatch")); // F2 @@ -340,10 +340,10 @@ void hyperspt_state::hyperspt(machine_config &config) vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT); - SN76496(config, m_sn, XTAL(14'318'181)/8); /* verified on pcb */ + SN76496(config, m_sn, XTAL(14'318'181)/8); /* verified on pcb */ m_sn->add_route(ALL_OUTPUTS, "speaker", 1.0); - VLM5030(config, m_vlm, XTAL(3'579'545)); /* verified on pcb */ + VLM5030(config, m_vlm, XTAL(3'579'545)); /* verified on pcb */ m_vlm->add_route(ALL_OUTPUTS, "speaker", 1.0); } @@ -377,7 +377,7 @@ void hyperspt_state::hypersptb(machine_config &config) m_audiocpu->set_addrmap(AS_PROGRAM, address_map_constructor(&std::remove_pointer_t<decltype(this)>::soundb_map, tag(), this)); - M6802(config, "adpcm", XTAL(14'318'181)/8) /* unknown clock */ + M6802(config, "adpcm", XTAL(14'318'181)/8) /* unknown clock */ .set_addrmap(AS_PROGRAM, &hyperspt_state::hyprolyb_adpcm_map); GENERIC_LATCH_8(config, "soundlatch2"); @@ -385,8 +385,8 @@ void hyperspt_state::hypersptb(machine_config &config) HYPROLYB_ADPCM(config, "hyprolyb_adpcm", 0); msm5205_device &msm(MSM5205(config, "msm", 384000)); - msm.vck_legacy_callback().set("hyprolyb_adpcm", FUNC(hyprolyb_adpcm_device::vck_callback)); /* VCK function */ - msm.set_prescaler_selector(msm5205_device::S96_4B); /* 4 kHz */ + msm.vck_legacy_callback().set("hyprolyb_adpcm", FUNC(hyprolyb_adpcm_device::vck_callback)); /* VCK function */ + msm.set_prescaler_selector(msm5205_device::S96_4B); /* 4 kHz */ msm.add_route(ALL_OUTPUTS, "speaker", 0.5); } diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index 37b461d7792..bd75c7c3a5b 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -186,9 +186,9 @@ INPUT_PORTS_END //static void cdrom_config(device_t *device) //{ -// cdda_device *cdda = device->subdevice<cdda_device>("cdda"); -// cdda->add_route(0, ":hpc3:lspeaker", 1.0); -// cdda->add_route(1, ":hpc3:rspeaker", 1.0); +// cdda_device *cdda = device->subdevice<cdda_device>("cdda"); +// cdda->add_route(0, ":hpc3:lspeaker", 1.0); +// cdda->add_route(1, ":hpc3:rspeaker", 1.0); //} void ip22_state::wd33c93(device_t *device) @@ -223,15 +223,15 @@ void ip22_state::ip22_base(machine_config &config) SGI_MC(config, m_mem_ctrl, m_maincpu, ":hpc3:eeprom"); NSCSI_BUS(config, "scsibus", 0); - NSCSI_CONNECTOR(config, "scsibus:0").option_set("wd33c93", WD33C93B) - .machine_config([this](device_t *device) { wd33c93(device); }); - NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk", false); + NSCSI_CONNECTOR(config, "scsibus:0").option_set("wd33c93", WD33C93B) + .machine_config([this](device_t *device) { wd33c93(device); }); + NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk", false); NSCSI_CONNECTOR(config, "scsibus:2", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:3", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:4", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:5", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:6", scsi_devices, "cdrom", false); - NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, nullptr, false); + NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, nullptr, false); } void ip22_state::ip225015(machine_config &config) @@ -275,15 +275,15 @@ void ip24_state::ip244415(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &ip24_state::ip22_map); NSCSI_BUS(config, "scsibus2", 0); - NSCSI_CONNECTOR(config, "scsibus2:0").option_set("wd33c93", WD33C93B) - .machine_config([this](device_t *device) { wd33c93_2(device); }); - NSCSI_CONNECTOR(config, "scsibus2:1", scsi_devices, nullptr, false); + NSCSI_CONNECTOR(config, "scsibus2:0").option_set("wd33c93", WD33C93B) + .machine_config([this](device_t *device) { wd33c93_2(device); }); + NSCSI_CONNECTOR(config, "scsibus2:1", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus2:2", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus2:3", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus2:4", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus2:5", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus2:6", scsi_devices, nullptr, false); - NSCSI_CONNECTOR(config, "scsibus2:7", scsi_devices, nullptr, false); + NSCSI_CONNECTOR(config, "scsibus2:7", scsi_devices, nullptr, false); SGI_HPC3(config, m_hpc3, m_maincpu, m_scsi_ctrl, m_scsi_ctrl2); } diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp index 0836e82942a..cb058bed589 100644 --- a/src/mame/drivers/karnov.cpp +++ b/src/mame/drivers/karnov.cpp @@ -769,10 +769,10 @@ void karnov_state::machine_reset() void karnov_state::karnov(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 10000000); /* 10 MHz */ + M68000(config, m_maincpu, 10000000); /* 10 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_map); - M6502(config, m_audiocpu, 1500000); /* Accurate */ + M6502(config, m_audiocpu, 1500000); /* Accurate */ m_audiocpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_sound_map); /* video hardware */ diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp index 0c77e7368f4..f72b8137b07 100644 --- a/src/mame/drivers/kchamp.cpp +++ b/src/mame/drivers/kchamp.cpp @@ -407,12 +407,12 @@ void kchamp_state::machine_reset() void kchamp_state::kchampvs(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000)/4); /* verified on pcb */ + Z80(config, m_maincpu, XTAL(12'000'000)/4); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &kchamp_state::kchampvs_map); m_maincpu->set_addrmap(AS_IO, &kchamp_state::kchampvs_io_map); m_maincpu->set_addrmap(AS_OPCODES, &kchamp_state::decrypted_opcodes_map); - Z80(config, m_audiocpu, XTAL(12'000'000)/4); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(12'000'000)/4); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &kchamp_state::kchampvs_sound_map); m_audiocpu->set_addrmap(AS_IO, &kchamp_state::kchampvs_sound_io_map); /* IRQs triggered from main CPU */ @@ -451,8 +451,8 @@ void kchamp_state::kchampvs(machine_config &config) m_adpcm_select->out_callback().set("msm", FUNC(msm5205_device::data_w)); MSM5205(config, m_msm, 375000); /* verified on pcb, discrete circuit clock */ - m_msm->vck_callback().set(FUNC(kchamp_state::msmint)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 1 / 96 = 3906.25Hz playback */ + m_msm->vck_callback().set(FUNC(kchamp_state::msmint)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 1 / 96 = 3906.25Hz playback */ m_msm->add_route(ALL_OUTPUTS, "speaker", 1.0); } @@ -463,11 +463,11 @@ void kchamp_state::kchampvs(machine_config &config) void kchamp_state::kchamp(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000)/4); /* 12MHz / 4 = 3.0 MHz */ + Z80(config, m_maincpu, XTAL(12'000'000)/4); /* 12MHz / 4 = 3.0 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &kchamp_state::kchamp_map); m_maincpu->set_addrmap(AS_IO, &kchamp_state::kchamp_io_map); - Z80(config, m_audiocpu, XTAL(12'000'000)/4); /* 12MHz / 4 = 3.0 MHz */ + Z80(config, m_audiocpu, XTAL(12'000'000)/4); /* 12MHz / 4 = 3.0 MHz */ m_audiocpu->set_addrmap(AS_PROGRAM, &kchamp_state::kchamp_sound_map); m_audiocpu->set_addrmap(AS_IO, &kchamp_state::kchamp_sound_io_map); m_audiocpu->set_periodic_int(FUNC(kchamp_state::sound_int), attotime::from_hz(125)); /* Hz */ diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index f561406483f..bec9aec2143 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -249,9 +249,9 @@ void klax_state::klax2bl(machine_config &config) // guess, probably something like this // 2 x msm at least on bootleg set 2 (ic18 and ic19) - MSM5205(config, "msm", 375000); /* ? */ -// msm.vck_legacy_callback().set(FUNC(klax_state::m5205_int1)); /* interrupt function */ -// msm.set_prescaler_selector(msm5205_device::MSM5205_S96_4B); /* 4KHz 4-bit */ + MSM5205(config, "msm", 375000); /* ? */ +// msm.vck_legacy_callback().set(FUNC(klax_state::m5205_int1)); /* interrupt function */ +// msm.set_prescaler_selector(msm5205_device::MSM5205_S96_4B); /* 4KHz 4-bit */ // msm.add_route(ALL_OUTPUTS, "mono", 0.25); } diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp index fee5bee182f..19160af76cf 100644 --- a/src/mame/drivers/konamim2.cpp +++ b/src/mame/drivers/konamim2.cpp @@ -1203,7 +1203,7 @@ void konamim2_state::set_arcres(machine_config &config) void konamim2_state::add_ymz280b(machine_config &config) { - // TODO: The YMZ280B outputs are actually routed to a speaker in each gun + // TODO: The YMZ280B outputs are actually routed to a speaker in each gun YMZ280B(config, m_ymz280b, XTAL(16'934'400)); m_ymz280b->add_route(0, "lspeaker", 0.5); m_ymz280b->add_route(1, "rspeaker", 0.5); diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index d9522e30966..66ab23b5ca4 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -299,9 +299,9 @@ void kungfur_state::machine_reset() void kungfur_state::kungfur(machine_config &config) { /* basic machine hardware */ - M6809(config, m_maincpu, 8000000/2); // 4MHz? + M6809(config, m_maincpu, 8000000/2); // 4MHz? m_maincpu->set_addrmap(AS_PROGRAM, &kungfur_state::kungfur_map); - m_maincpu->set_periodic_int(FUNC(kungfur_state::kungfur_irq), attotime::from_hz(975)); // close approximation + m_maincpu->set_periodic_int(FUNC(kungfur_state::kungfur_irq), attotime::from_hz(975)); // close approximation i8255_device &ppi0(I8255A(config, "ppi8255_0")); // $4008 - always $83 (PPI mode 0, ports B & lower C as input) @@ -321,12 +321,12 @@ void kungfur_state::kungfur(machine_config &config) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MSM5205(config, m_adpcm1, XTAL(384'000)); // clock verified with recording + MSM5205(config, m_adpcm1, XTAL(384'000)); // clock verified with recording m_adpcm1->vck_legacy_callback().set(FUNC(kungfur_state::kfr_adpcm1_int)); m_adpcm1->set_prescaler_selector(msm5205_device::S48_4B); m_adpcm1->add_route(ALL_OUTPUTS, "lspeaker", 1.0); - MSM5205(config, m_adpcm2, XTAL(384'000)); // clock verified with recording + MSM5205(config, m_adpcm2, XTAL(384'000)); // clock verified with recording m_adpcm2->vck_legacy_callback().set(FUNC(kungfur_state::kfr_adpcm2_int)); m_adpcm2->set_prescaler_selector(msm5205_device::S48_4B); m_adpcm2->add_route(ALL_OUTPUTS, "rspeaker", 1.0); diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index a8e79993b55..64435e50fe0 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -881,7 +881,7 @@ void kurukuru_state::kurukuru(machine_config &config) MSM5205(config, m_adpcm, M5205_CLOCK); m_adpcm->vck_legacy_callback().set(FUNC(kurukuru_state::kurukuru_msm5205_vck)); - m_adpcm->set_prescaler_selector(msm5205_device::S48_4B); /* changed on the fly */ + m_adpcm->set_prescaler_selector(msm5205_device::S48_4B); /* changed on the fly */ m_adpcm->add_route(ALL_OUTPUTS, "mono", 0.80); } diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp index 9c98ce24ecc..923e61eb107 100644 --- a/src/mame/drivers/lkage.cpp +++ b/src/mame/drivers/lkage.cpp @@ -497,7 +497,7 @@ void lkage_state::lkage(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(lkage_state::irq0_line_hold)); Z80(config, m_audiocpu, SOUND_CPU_CLOCK); - m_audiocpu->set_addrmap(AS_PROGRAM, &lkage_state::lkage_sound_map); /* IRQs are triggered by the YM2203 */ + m_audiocpu->set_addrmap(AS_PROGRAM, &lkage_state::lkage_sound_map); /* IRQs are triggered by the YM2203 */ TAITO68705_MCU(config, m_bmcu, MCU_CLOCK); diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp index eb6cf033ab2..a7de3196370 100644 --- a/src/mame/drivers/lucky74.cpp +++ b/src/mame/drivers/lucky74.cpp @@ -1466,10 +1466,10 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int) void lucky74_state::lucky74(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, C_06B49P_CLKOUT_03); /* 3 MHz. */ + Z80(config, m_maincpu, C_06B49P_CLKOUT_03); /* 3 MHz. */ m_maincpu->set_addrmap(AS_PROGRAM, &lucky74_state::lucky74_map); m_maincpu->set_addrmap(AS_IO, &lucky74_state::lucky74_portmap); - m_maincpu->set_vblank_int("screen", FUNC(lucky74_state::nmi_interrupt)); /* 60 Hz. measured */ + m_maincpu->set_vblank_int("screen", FUNC(lucky74_state::nmi_interrupt)); /* 60 Hz. measured */ NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -1509,9 +1509,9 @@ void lucky74_state::lucky74(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - SN76489(config, "sn1", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ - SN76489(config, "sn2", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ - SN76489(config, "sn3", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ + SN76489(config, "sn1", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ + SN76489(config, "sn2", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ + SN76489(config, "sn3", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3 MHz. */ ay8910_device &aysnd(AY8910(config, "aysnd", C_06B49P_CLKOUT_04)); /* 1.5 MHz. */ aysnd.port_a_read_callback().set_ioport("IN3"); @@ -1519,9 +1519,9 @@ void lucky74_state::lucky74(machine_config &config) aysnd.port_b_write_callback().set(FUNC(lucky74_state::ym2149_portb_w)); aysnd.add_route(ALL_OUTPUTS, "mono", 0.00); /* not routed to audio hardware */ - MSM5205(config, m_msm, C_06B49P_CLKOUT_06); /* 375 kHz. */ - m_msm->vck_legacy_callback().set(FUNC(lucky74_state::lucky74_adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ + MSM5205(config, m_msm, C_06B49P_CLKOUT_06); /* 375 kHz. */ + m_msm->vck_legacy_callback().set(FUNC(lucky74_state::lucky74_adpcm_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.70); } diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 06272cced6c..f96736b6c7e 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -934,11 +934,11 @@ void lwings_state::machine_reset() void lwings_state::lwings(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(12'000'000)/2); /* verified on PCB */ + Z80(config, m_maincpu, XTAL(12'000'000)/2); /* verified on PCB */ m_maincpu->set_addrmap(AS_PROGRAM, &lwings_state::lwings_map); m_maincpu->set_vblank_int("screen", FUNC(lwings_state::lwings_interrupt)); - Z80(config, m_soundcpu, XTAL(12'000'000)/4); /* verified on PCB */ + Z80(config, m_soundcpu, XTAL(12'000'000)/4); /* verified on PCB */ m_soundcpu->set_addrmap(AS_PROGRAM, &lwings_state::lwings_sound_map); m_soundcpu->set_periodic_int(FUNC(lwings_state::irq0_line_hold), attotime::from_hz(222)); // above frequency is an approximation from PCB music recording - where is the frequency actually derived from? @@ -965,13 +965,13 @@ void lwings_state::lwings(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); - ym2203_device &ym2203a(YM2203(config, "2203a", XTAL(12'000'000)/8)); /* verified on PCB */ + ym2203_device &ym2203a(YM2203(config, "2203a", XTAL(12'000'000)/8)); /* verified on PCB */ ym2203a.add_route(0, "mono", 0.20); ym2203a.add_route(1, "mono", 0.20); ym2203a.add_route(2, "mono", 0.20); ym2203a.add_route(3, "mono", 0.10); - ym2203_device &ym2203b(YM2203(config, "2203b", XTAL(12'000'000)/8)); /* verified on PCB */ + ym2203_device &ym2203b(YM2203(config, "2203b", XTAL(12'000'000)/8)); /* verified on PCB */ ym2203b.add_route(0, "mono", 0.20); ym2203b.add_route(1, "mono", 0.20); ym2203b.add_route(2, "mono", 0.20); @@ -1011,7 +1011,7 @@ void lwings_state::fball(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); - okim6295_device &oki(OKIM6295(config, "oki", XTAL(12'000'000)/12, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + okim6295_device &oki(OKIM6295(config, "oki", XTAL(12'000'000)/12, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified oki.add_route(ALL_OUTPUTS, "mono", 1.0); oki.set_addrmap(0, &lwings_state::fball_oki_map); } @@ -1021,12 +1021,12 @@ void lwings_state::trojan(machine_config &config) lwings(config); /* basic machine hardware */ - m_maincpu->set_clock(XTAL(12'000'000)/4); /* verified on PCB */ + m_maincpu->set_clock(XTAL(12'000'000)/4); /* verified on PCB */ m_maincpu->set_addrmap(AS_PROGRAM, &lwings_state::trojan_map); - m_soundcpu->set_clock(XTAL(12'000'000)/4); /* verified on PCB */ + m_soundcpu->set_clock(XTAL(12'000'000)/4); /* verified on PCB */ - z80_device &adpcm(Z80(config, "adpcm", XTAL(12'000'000)/4)); /* verified on PCB */ + z80_device &adpcm(Z80(config, "adpcm", XTAL(12'000'000)/4)); /* verified on PCB */ adpcm.set_addrmap(AS_PROGRAM, &lwings_state::trojan_adpcm_map); adpcm.set_addrmap(AS_IO, &lwings_state::trojan_adpcm_io_map); adpcm.set_periodic_int(FUNC(lwings_state::irq0_line_hold), attotime::from_hz(4000)); @@ -1040,8 +1040,8 @@ void lwings_state::trojan(machine_config &config) /* sound hardware */ GENERIC_LATCH_8(config, "soundlatch2"); - MSM5205(config, m_msm, XTAL(384'000)); /* verified on PCB */ - m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* slave mode */ + MSM5205(config, m_msm, XTAL(384'000)); /* verified on PCB */ + m_msm->set_prescaler_selector(msm5205_device::SEX_4B); /* slave mode */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); } diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 1ad5beaf070..0650493b90c 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -1140,7 +1140,7 @@ ROM_START( newapunk ) ROM_END //PCB is marked: "BOMBER LORD 030" and "lc" on component side ("LC" is the Italian for "Lato Componenti" which translates to "Components Side") -//PCB is marked: "BOMBER LORD 030" and "ls" on solder side ("LS" is the Italian for "Lato Saldature" which translates to "Solders Side") +//PCB is marked: "BOMBER LORD 030" and "ls" on solder side ("LS" is the Italian for "Lato Saldature" which translates to "Solders Side") ROM_START( bomblord ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) ROM_LOAD16_BYTE( "27c020_3.u6", 0x00001, 0x40000, CRC(65d5c54a) SHA1(f794a193d5927b5fb838ab2351c176d8cbd37236) ) diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp index 8a70b2e0560..82cdd92cf25 100644 --- a/src/mame/drivers/matmania.cpp +++ b/src/mame/drivers/matmania.cpp @@ -302,11 +302,11 @@ GFXDECODE_END void matmania_state::matmania(machine_config &config) { /* basic machine hardware */ - M6502(config, m_maincpu, 1500000); /* 1.5 MHz ???? */ + M6502(config, m_maincpu, 1500000); /* 1.5 MHz ???? */ m_maincpu->set_addrmap(AS_PROGRAM, &matmania_state::matmania_map); m_maincpu->set_vblank_int("screen", FUNC(matmania_state::irq0_line_hold)); - M6502(config, m_audiocpu, 1200000); /* 1.2 MHz ???? */ + M6502(config, m_audiocpu, 1200000); /* 1.2 MHz ???? */ m_audiocpu->set_addrmap(AS_PROGRAM, &matmania_state::matmania_sound_map); m_audiocpu->set_periodic_int(FUNC(matmania_state::nmi_line_pulse), attotime::from_hz(15*60)); /* ???? */ diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp index 0a03efb0995..de9c20e5b1a 100644 --- a/src/mame/drivers/megadriv_acbl.cpp +++ b/src/mame/drivers/megadriv_acbl.cpp @@ -1059,7 +1059,7 @@ void md_boot_state::init_barek3() void md_boot_state::init_sonic2mb() { - // 100000 = writes to unpopulated MCU? + // 100000 = writes to unpopulated MCU? m_maincpu->space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(FUNC(md_boot_state::aladmdb_w),this)); m_maincpu->space(AS_PROGRAM).install_read_port(0x300000, 0x300001, "DSW"); diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp index 3d0bb77386b..5f2a8ad202a 100644 --- a/src/mame/drivers/mermaid.cpp +++ b/src/mame/drivers/mermaid.cpp @@ -422,7 +422,7 @@ WRITE_LINE_MEMBER(mermaid_state::rougien_adpcm_int) void mermaid_state::mermaid(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 4000000); // ??? + Z80(config, m_maincpu, 4000000); // ??? m_maincpu->set_addrmap(AS_PROGRAM, &mermaid_state::mermaid_map); LS259(config, m_latch[0]); diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp index 306b3dfbec7..562318e5257 100644 --- a/src/mame/drivers/metlclsh.cpp +++ b/src/mame/drivers/metlclsh.cpp @@ -278,11 +278,11 @@ void metlclsh_state::machine_reset() void metlclsh_state::metlclsh(machine_config &config) { /* basic machine hardware */ - M6809(config, m_maincpu, 1500000); // ? + M6809(config, m_maincpu, 1500000); // ? m_maincpu->set_addrmap(AS_PROGRAM, &metlclsh_state::metlclsh_master_map); // IRQ by YM3526, NMI by CPU #2 - M6809(config, m_subcpu, 1500000); // ? + M6809(config, m_subcpu, 1500000); // ? m_subcpu->set_addrmap(AS_PROGRAM, &metlclsh_state::metlclsh_slave_map); // IRQ by CPU #1, NMI by coin insertion diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index ae1bb2cb3c0..ea581ce9da6 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -590,7 +590,7 @@ void mgavegas_state::mgavegas(machine_config &config) Z80(config, m_maincpu, CPU_CLK); m_maincpu->set_addrmap(AS_PROGRAM, &mgavegas_state::mgavegas_map); - TIMER(config, "int_0").configure_periodic(FUNC(mgavegas_state::int_0), attotime::from_hz(6000)); //6KHz from MSM5205 /VCK + TIMER(config, "int_0").configure_periodic(FUNC(mgavegas_state::int_0), attotime::from_hz(6000)); //6KHz from MSM5205 /VCK NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index c72e1e188d5..4f0d6529acd 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -259,13 +259,13 @@ MC6845_UPDATE_ROW( miniboy7_state::crtc_update_row ) void miniboy7_state::miniboy7_palette(palette_device &palette) const { /* - prom bits - 7654 3210 - ---- ---x red component?. - ---- --x- green component?. - ---- -x-- blue component?. - ---- x--- intensity?. - xxxx ---- unused. + prom bits + 7654 3210 + ---- ---x red component?. + ---- --x- green component?. + ---- -x-- blue component?. + ---- x--- intensity?. + xxxx ---- unused. */ /* 0000IBGR */ diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp index d278049d5aa..5bddb9f9bdb 100644 --- a/src/mame/drivers/mitchell.cpp +++ b/src/mame/drivers/mitchell.cpp @@ -1164,7 +1164,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mitchell_state::mitchell_irq) void mitchell_state::mgakuen(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(16'000'000)/2); /* probably same clock as the other mitchell hardware games */ + Z80(config, m_maincpu, XTAL(16'000'000)/2); /* probably same clock as the other mitchell hardware games */ m_maincpu->set_addrmap(AS_PROGRAM, &mitchell_state::mgakuen_map); m_maincpu->set_addrmap(AS_IO, &mitchell_state::mitchell_io_map); TIMER(config, "scantimer").configure_scanline(FUNC(mitchell_state::mitchell_irq), "screen", 0, 1); @@ -1214,7 +1214,7 @@ void mitchell_state::pang(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(57.42); /* verified on pcb */ + screen.set_refresh_hz(57.42); /* verified on pcb */ screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ screen.set_size(64*8, 32*8); screen.set_visarea(8*8, (64-8)*8-1, 1*8, 31*8-1); @@ -1293,7 +1293,7 @@ void mitchell_state::spangbl(machine_config &config) config.device_remove("oki"); MSM5205(config, m_msm, 400000); // clock and prescaler unknown - m_msm->vck_legacy_callback().set(FUNC(mitchell_state::spangbl_adpcm_int)); // controls music as well as ADCPM rate + m_msm->vck_legacy_callback().set(FUNC(mitchell_state::spangbl_adpcm_int)); // controls music as well as ADCPM rate m_msm->set_prescaler_selector(msm5205_device::S96_4B); m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); @@ -1321,7 +1321,7 @@ void mitchell_state::mstworld(machine_config &config) m_maincpu->set_addrmap(AS_OPCODES, &mitchell_state::decrypted_opcodes_map); m_maincpu->set_vblank_int("screen", FUNC(mitchell_state::irq0_line_hold)); - Z80(config, m_audiocpu, 6000000); /* 6 MHz? */ + Z80(config, m_audiocpu, 6000000); /* 6 MHz? */ m_audiocpu->set_addrmap(AS_PROGRAM, &mitchell_state::mstworld_sound_map); MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell) @@ -1799,7 +1799,7 @@ ROM_END // Similar to "pangbold" but with data on a battery backed 256Kbit RAM (undumped), on a small sub-board with the Z84 and a PLD (also undumped, was protected). ROM_START( pangbp ) ROM_REGION( 2*0x50000, "maincpu", 0 ) - ROM_LOAD( "pangbp_nvr.bin", 0x00000, 0x08000, NO_DUMP ) // Opcodes + data (?) on battery backed RAM (the battery was dead, so it's undumped) + ROM_LOAD( "pangbp_nvr.bin", 0x00000, 0x08000, NO_DUMP ) // Opcodes + data (?) on battery backed RAM (the battery was dead, so it's undumped) ROM_LOAD( "pangbp_4.6l", 0x50000, 0x08000, CRC(01bc7ecf) SHA1(7f3e3cf5f5d03d1c2d1ad624627feb941aea7414) ) // Opcodes + data on ROM (almost the same as the first half of "4.6l" on "pangbold") ROM_LOAD( "pangbp_2.3l", 0x60000, 0x20000, CRC(3f15bb61) SHA1(4f74ee25f32a201482840158b4d4c7aca1cda684) ) // Decrypted opcodes ROM_LOAD( "pangbp_3.5l", 0x10000, 0x20000, CRC(ce6375e4) SHA1(fdd40d82553fcd4d2762ecfd898d0e3112dfde79) ) // Decrypted data diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp index 9fc201925d7..633b9124b42 100644 --- a/src/mame/drivers/mjkjidai.cpp +++ b/src/mame/drivers/mjkjidai.cpp @@ -337,7 +337,7 @@ MACHINE_CONFIG_START(mjkjidai_state::mjkjidai) MSM5205(config, m_msm, 384000); m_msm->vck_legacy_callback().set(FUNC(mjkjidai_state::adpcm_int)); - m_msm->set_prescaler_selector(msm5205_device::S64_4B); /* 6kHz */ + m_msm->set_prescaler_selector(msm5205_device::S64_4B); /* 6kHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp index 090a19448eb..531c3799644 100644 --- a/src/mame/drivers/namcond1.cpp +++ b/src/mame/drivers/namcond1.cpp @@ -16,7 +16,7 @@ gynotai TODOs: - printer (disable it in service mode to suppress POST error); - ball sensors aren't understood; - - Seems to dislike our YGV608 row/colscroll handling + - Seems to dislike our YGV608 row/colscroll handling (for example vertical bounding box is halved offset & size wise for Pac-Man goal stage); To make abcheck run when the EEPROM is clear: diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp index 86024675c58..457e5c39c11 100644 --- a/src/mame/drivers/nmg5.cpp +++ b/src/mame/drivers/nmg5.cpp @@ -981,11 +981,11 @@ void nmg5_state::machine_reset() MACHINE_CONFIG_START(nmg5_state::nmg5) /* basic machine hardware */ - M68000(config, m_maincpu, 16000000); /* 16 MHz */ + M68000(config, m_maincpu, 16000000); /* 16 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &nmg5_state::nmg5_map); m_maincpu->set_vblank_int("screen", FUNC(nmg5_state::irq6_line_hold)); - Z80(config, m_soundcpu, 4000000); /* 4 MHz */ + Z80(config, m_soundcpu, 4000000); /* 4 MHz */ m_soundcpu->set_addrmap(AS_PROGRAM, &nmg5_state::nmg5_sound_map); m_soundcpu->set_addrmap(AS_IO, &nmg5_state::sound_io_map); diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index 4b7dcf5c11f..4170bea8dae 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -715,7 +715,7 @@ void ojankohs_state::machine_reset() void ojankohs_state::ojankohs(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankohs_map); m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankohs_io_map); m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); @@ -749,15 +749,15 @@ void ojankohs_state::ojankohs(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); } void ojankohs_state::ojankoy(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoy_map); m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankoy_io_map); m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); @@ -789,15 +789,15 @@ void ojankohs_state::ojankoy(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); } void ojankohs_state::ccasino(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoy_map); m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ccasino_io_map); m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); @@ -831,15 +831,15 @@ void ojankohs_state::ccasino(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); } void ojankohs_state::ojankoc(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 8000000/2); /* 4.00 MHz */ + Z80(config, m_maincpu, 8000000/2); /* 4.00 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoc_map); m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankoc_io_map); m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); @@ -870,8 +870,8 @@ void ojankohs_state::ojankoc(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); MSM5205(config, m_msm, 8000000/22); - m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); } diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index 4a07fb1a2fb..432b2145c76 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -940,7 +940,7 @@ void opwolf_state::opwolf(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &opwolf_state::opwolf_map); m_maincpu->set_vblank_int("screen", FUNC(opwolf_state::interrupt)); - Z80(config, m_audiocpu, SOUND_CPU_CLOCK); /* 4 MHz */ + Z80(config, m_audiocpu, SOUND_CPU_CLOCK); /* 4 MHz */ m_audiocpu->set_addrmap(AS_PROGRAM, &opwolf_state::opwolf_sound_z80_map); TAITO_CCHIP(config, m_cchip, 12_MHz_XTAL); /* 12MHz measured on pin 20 */ @@ -950,7 +950,7 @@ void opwolf_state::opwolf(machine_config &config) TIMER(config, "cchip_irq_clear").configure_generic(FUNC(opwolf_state::cchip_irq_clear_cb)); - config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ + config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ MCFG_MACHINE_RESET_OVERRIDE(opwolf_state,opwolf) @@ -986,13 +986,13 @@ void opwolf_state::opwolf(machine_config &config) MSM5205(config, m_msm[0], 384000); m_msm[0]->vck_legacy_callback().set(FUNC(opwolf_state::msm5205_vck_w<0>)); - m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm[0]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[0]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); MSM5205(config, m_msm[1], 384000); m_msm[1]->vck_legacy_callback().set(FUNC(opwolf_state::msm5205_vck_w<1>)); - m_msm[1]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm[1]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm[1]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[1]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); @@ -1022,11 +1022,11 @@ void opwolf_state::opwolfb(machine_config &config) /* OSC clocks unknown for the Z80(config, m_audiocpu, SOUND_CPU_CLOCK); /* 4 MHz ??? */ m_audiocpu->set_addrmap(AS_PROGRAM, &opwolf_state::opwolf_sound_z80_map); - z80_device &sub(Z80(config, "sub", SOUND_CPU_CLOCK)); /* 4 MHz ??? */ + z80_device &sub(Z80(config, "sub", SOUND_CPU_CLOCK)); /* 4 MHz ??? */ sub.set_addrmap(AS_PROGRAM, &opwolf_state::opwolfb_sub_z80_map); sub.set_vblank_int("screen", FUNC(opwolf_state::irq0_line_hold)); - config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ + config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -1060,13 +1060,13 @@ void opwolf_state::opwolfb(machine_config &config) /* OSC clocks unknown for the MSM5205(config, m_msm[0], 384000); m_msm[0]->vck_legacy_callback().set(FUNC(opwolf_state::msm5205_vck_w<0>)); - m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm[0]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[0]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); MSM5205(config, m_msm[1], 384000); m_msm[1]->vck_legacy_callback().set(FUNC(opwolf_state::msm5205_vck_w<1>)); - m_msm[1]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm[1]->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm[1]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[1]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp index 5296a109a4e..f7b20e58ede 100644 --- a/src/mame/drivers/pachifev.cpp +++ b/src/mame/drivers/pachifev.cpp @@ -368,8 +368,8 @@ void pachifev_state::pachifev(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); #if USE_MSM - msm5205_device &adpcm(MSM5205(config, "adpcm", XTAL(384'000))); /* guess */ - adpcm.vck_legacy_callback().set(FUNC(pachifev_state::pf_adpcm_int)); /* interrupt function */ + msm5205_device &adpcm(MSM5205(config, "adpcm", XTAL(384'000))); /* guess */ + adpcm.vck_legacy_callback().set(FUNC(pachifev_state::pf_adpcm_int)); /* interrupt function */ adpcm.set_prescaler_selector(msm5205_device::S48_4B); /* 8kHz */ adpcm.add_route(ALL_OUTPUTS, "mono", 1.00); #endif diff --git a/src/mame/drivers/palestra.cpp b/src/mame/drivers/palestra.cpp index 18bc4e07abb..cac0d842f5f 100644 --- a/src/mame/drivers/palestra.cpp +++ b/src/mame/drivers/palestra.cpp @@ -38,7 +38,7 @@ #define MASTER_CLOCK (4000000) #define V_TOTAL_PONG 315 -#define H_TOTAL_PONG 256 // tbc +#define H_TOTAL_PONG 256 // tbc class palestra_state : public driver_device { diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 63a1b75d4ad..eb7e2be3743 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -2946,7 +2946,7 @@ void pc9801_state::init_pc9801vm_kanji() uint8_t *chargen = memregion("chargen")->base(); uint8_t *raw_kanji = memregion("raw_kanji")->base(); uint8_t *kanji = memregion("kanji")->base(); - + /* swap bits for 8x8 characters, discard 8x8 "graphics" characters */ /* TODO: should we keep and use the "graphics" characters? */ for( uint32_t i = 0; i < 0x100; i++ ) diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp index d91971d8781..6398fe6d179 100644 --- a/src/mame/drivers/pcktgal.cpp +++ b/src/mame/drivers/pcktgal.cpp @@ -261,7 +261,7 @@ void pcktgal_state::pcktgal(machine_config &config) MSM5205(config, m_msm, 384000); m_msm->vck_legacy_callback().set(FUNC(pcktgal_state::adpcm_int)); - m_msm->set_prescaler_selector(msm5205_device::S48_4B); // 8kHz + m_msm->set_prescaler_selector(msm5205_device::S48_4B); // 8kHz m_msm->add_route(ALL_OUTPUTS, "mono", 0.70); } diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp index e4fed0a6e15..d993ef2919c 100644 --- a/src/mame/drivers/peplus.cpp +++ b/src/mame/drivers/peplus.cpp @@ -978,10 +978,10 @@ void peplus_state::peplus_palette(palette_device &palette) const uint8_t const *const color_prom = memregion("proms")->base(); uint32_t const proms_size = memregion("proms")->bytes(); /* prom bits - 7654 3210 - ---- -xxx red component. - --xx x--- green component. - xx-- ---- blue component. + 7654 3210 + ---- -xxx red component. + --xx x--- green component. + xx-- ---- blue component. */ for (int i = 0; i < palette.entries(); i++) diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp index aae50f3a12a..327dfa21de4 100644 --- a/src/mame/drivers/r9751.cpp +++ b/src/mame/drivers/r9751.cpp @@ -972,8 +972,8 @@ void r9751_state::scsi_devices(device_slot_interface &device) void r9751_state::wd33c93(device_t *device) { device->set_clock(10000000); - // downcast<wd33c93a_device *>(device)->irq_cb().set(*this, FUNC(r9751_state::scsi_irq_w)); - // downcast<wd33c93a_device *>(device)->drq_cb().set(*this, FUNC(r9751_state::scsi_drq_w)); + // downcast<wd33c93a_device *>(device)->irq_cb().set(*this, FUNC(r9751_state::scsi_irq_w)); + // downcast<wd33c93a_device *>(device)->drq_cb().set(*this, FUNC(r9751_state::scsi_drq_w)); } MACHINE_CONFIG_START(r9751_state::r9751) diff --git a/src/mame/drivers/rad_eu3a14.cpp b/src/mame/drivers/rad_eu3a14.cpp index 6b8c355d13c..9bd325e81d5 100644 --- a/src/mame/drivers/rad_eu3a14.cpp +++ b/src/mame/drivers/rad_eu3a14.cpp @@ -12,12 +12,12 @@ name PCB ID ROM width TSOP pads ROM size SEEPROM die markings Golden Tee Golf Home Edition ? x16 48 4MB no ELAN EU3A14 (developed by FarSight Studios) - Real Swing Golf 74037 x16 48 4MB no ELAN EU3A14 (developed by FarSight Studios) + Real Swing Golf 74037 x16 48 4MB no ELAN EU3A14 (developed by FarSight Studios) Baseball 3 ? x16 48 4MB no ELAN EU3A14 (developed by FarSight Studios) Connectv Football ? x16 48 4MB no ELAN EU3A14 (developed by Medialink) Huntin’3 ? x16 48 4MB no Elan ? (developed by V-Tac Technology Co Ltd.) -------------- - Also on this hardware + Also on this hardware -------------- Play TV Basketball 75029 x16 48 not dumped no ELAN EU3A14 @@ -25,13 +25,13 @@ but the video system has changed, here the sprites are more traditional non-tile based, rather than coming from 'pages' - -- + -- - Compared to the XaviXport games camera hookups, Real Swing Golf just has 6 wires, Its camera PCB is the only one with a ceramic resonator. - Maybe the CU5502 chip offloads some processing from the CPU? + Compared to the XaviXport games camera hookups, Real Swing Golf just has 6 wires, Its camera PCB is the only one with a ceramic resonator. + Maybe the CU5502 chip offloads some processing from the CPU? - The Basketball camera also uses an ETOMS CU5502. It’s different from the others (XaviXport + Real Swing Golf) in that the sensor is on a small PCB with - a 3.58MHz resonator with 16 wires going to another small PCB that has a glob and a 4MHz resonator. 6 wires go from that PCB to the main game PCB. + The Basketball camera also uses an ETOMS CU5502. It’s different from the others (XaviXport + Real Swing Golf) in that the sensor is on a small PCB with + a 3.58MHz resonator with 16 wires going to another small PCB that has a glob and a 4MHz resonator. 6 wires go from that PCB to the main game PCB. */ @@ -332,7 +332,7 @@ void radica_eu3a14_state::draw_page(screen_device &screen, bitmap_ind16 &bitmap, for (int i = m_tilerambase + pagesize * which; i < m_tilerambase + pagesize * (which + 1); i += m_bytespertile) { - int tile = 0; + int tile = 0; if (m_bytespertile == 2) { tile = m_mainram[i + 0] | (m_mainram[i + 1] << 8); @@ -362,7 +362,7 @@ void radica_eu3a14_state::draw_background(screen_device &screen, bitmap_ind16 &b int size; - // m_tilecfg[0] b-as ?-hh b = bytes per tile s = tilesize / page size? a = always set when tilemaps are in use - check? h = related to page positions, when set uses 2x2 pages? ? = used + // m_tilecfg[0] b-as ?-hh b = bytes per tile s = tilesize / page size? a = always set when tilemaps are in use - check? h = related to page positions, when set uses 2x2 pages? ? = used // m_tilecfg[1] ---- ---? ? = used foot // m_tilecfg[2] ---- -B-- B = 4bpp tiles diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 3e7a65e0496..b221bb9f756 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -12,7 +12,7 @@ To unlock floppy drives A-D compile with WORKAROUND_RAINBOW_B (prevents a side e Native single sided 5.25" images with 80 tracks, 10 sectors are well tested (*.IMD / *.TD0=TeleDisk / *.IMG with 400 K). VT180 images (184.320 Bytes) are very unreliable in CP/M - though a real machine can read them. 5.25 MFM PC style drives and 720 K (3.5 " DS-DD MFM PC formatted disks) (on slots 3 + 4) show regressions / bugs - as of Dec.2018 (file content bad while dir is OK, seek errors, write fault errors when copying _to_ hard disk). + as of Dec.2018 (file content bad while dir is OK, seek errors, write fault errors when copying _to_ hard disk). ALWAYS USE THE RIGHT SLOT AND SAVE YOUR DATA BEFORE MOUNTING FOREIGN DISK FORMATS! @@ -27,7 +27,7 @@ The public domain file RBCONVERT.ZIP documents how model 'A' differs from versio NVRAM files from -A and -B machines are not interchangeable. If problems arise, delete the NVRAM file. Venix 86-R (BSW) is working, just follow https://github.com/bsdimp/venix/blob/master/doc/MESS-RB-INSTALL.md - + CPM 2.1 / DOS2.11 / DOS 3.x / diag disks boot. UCSD systems (fort_sys, pas_sys) boot, but expect 4 QD drives loaded with disks (reassign slots, reset and mount three empty 400 K images before startup at #2, #3, #4). @@ -802,7 +802,7 @@ private: UPD7220_DISPLAY_PIXELS_MEMBER( rainbow_state::hgdc_display_pixels ) { - if(m_inp7->read() == 0) + if(m_inp7->read() == 0) return; const rgb_t *paletteX = m_palette2->palette()->entry_list_raw(); diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index 5e9836a71cf..93a5a5797ac 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -368,14 +368,14 @@ void rastan_state::machine_reset() void rastan_state::rastan(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(16'000'000)/2); /* verified on pcb */ + M68000(config, m_maincpu, XTAL(16'000'000)/2); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &rastan_state::rastan_map); m_maincpu->set_vblank_int("screen", FUNC(rastan_state::irq5_line_hold)); - Z80(config, m_audiocpu, XTAL(16'000'000)/4); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(16'000'000)/4); /* verified on pcb */ m_audiocpu->set_addrmap(AS_PROGRAM, &rastan_state::rastan_s_map); - config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ + config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ WATCHDOG_TIMER(config, "watchdog"); @@ -410,7 +410,7 @@ void rastan_state::rastan(machine_config &config) MSM5205(config, m_msm, XTAL(384'000)); /* verified on pcb */ m_msm->vck_legacy_callback().set(FUNC(rastan_state::rastan_msm5205_vck)); /* VCK function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.60); LS157(config, m_adpcm_sel, 0); diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 7b4fd645550..5bd7aeb155c 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -506,7 +506,7 @@ GFXDECODE_END void rmhaihai_state::rmhaihai(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 20000000/4); /* 5 MHz ??? */ + Z80(config, m_maincpu, 20000000/4); /* 5 MHz ??? */ m_maincpu->set_addrmap(AS_PROGRAM, &rmhaihai_state::rmhaihai_map); m_maincpu->set_addrmap(AS_IO, &rmhaihai_state::rmhaihai_io_map); m_maincpu->set_vblank_int("screen", FUNC(rmhaihai_state::irq0_line_hold)); diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp index 74fde741300..96ccc8320af 100644 --- a/src/mame/drivers/sanremo.cpp +++ b/src/mame/drivers/sanremo.cpp @@ -202,15 +202,15 @@ WRITE8_MEMBER(sanremo_state::lamps_w) { /* LAMPS: - 7654 3210 - ---- ---x DISCARD 1 - ---- --x- DISCARD 2 - ---- -x-- DISCARD 3 - ---- x--- DISCARD 4 - ---x ---- DISCARD 5 - --x- ---- START - -x-- ---- BET - x--- ---- (always on) + 7654 3210 + ---- ---x DISCARD 1 + ---- --x- DISCARD 2 + ---- -x-- DISCARD 3 + ---- x--- DISCARD 4 + ---x ---- DISCARD 5 + --x- ---- START + -x-- ---- BET + x--- ---- (always on) */ for (int n = 0; n < 7; n++) m_lamps[n] = BIT(data, n); @@ -220,9 +220,9 @@ WRITE8_MEMBER(sanremo_state::banksel_w) { /* GFX banks selector. - 7654 3210 - ---x xxxx GFX banks selector - xxx- ---- unknown + 7654 3210 + ---x xxxx GFX banks selector + xxx- ---- unknown */ m_banksel = data & 0x1f; } diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index da7a829b7e4..06e2ea4f08c 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -8414,7 +8414,7 @@ void seta_state::daioh(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(57.42); /* verified on PCB */; + screen.set_refresh_hz(57.42); /* verified on PCB */; screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(64*8, 32*8); screen.set_visarea(0*8, 48*8-1, 1*8, 31*8-1); @@ -8451,7 +8451,7 @@ void seta_state::daiohp(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(57.42); /* verified on PCB */; + screen.set_refresh_hz(57.42); /* verified on PCB */; screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); screen.set_size(64*8, 32*8); screen.set_visarea(0*8, 48*8-1, 1*8, 31*8-1); diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index b70929c4f17..4fd07309f70 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -537,10 +537,10 @@ void sf_state::sfan(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &sf_state::sfan_map); m_maincpu->set_vblank_int("screen", FUNC(sf_state::irq1_line_hold)); - Z80(config, m_audiocpu, XTAL(3'579'545)); /* ? xtal is 3.579545MHz */ + Z80(config, m_audiocpu, XTAL(3'579'545)); /* ? xtal is 3.579545MHz */ m_audiocpu->set_addrmap(AS_PROGRAM, &sf_state::sound_map); - z80_device &audio2(Z80(config, "audio2", XTAL(3'579'545))); /* ? xtal is 3.579545MHz */ + z80_device &audio2(Z80(config, "audio2", XTAL(3'579'545))); /* ? xtal is 3.579545MHz */ audio2.set_addrmap(AS_PROGRAM, &sf_state::sound2_map); audio2.set_addrmap(AS_IO, &sf_state::sound2_io_map); audio2.set_periodic_int(FUNC(sf_state::irq0_line_hold), attotime::from_hz(8000)); // ? @@ -569,12 +569,12 @@ void sf_state::sfan(machine_config &config) ymsnd.add_route(1, "rspeaker", 0.60); MSM5205(config, m_msm[0], 384000); - m_msm[0]->set_prescaler_selector(msm5205_device::SEX_4B); /* 8KHz playback ? */ + m_msm[0]->set_prescaler_selector(msm5205_device::SEX_4B); /* 8KHz playback ? */ m_msm[0]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[0]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); MSM5205(config, m_msm[1], 384000); - m_msm[1]->set_prescaler_selector(msm5205_device::SEX_4B); /* 8KHz playback ? */ + m_msm[1]->set_prescaler_selector(msm5205_device::SEX_4B); /* 8KHz playback ? */ m_msm[1]->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_msm[1]->add_route(ALL_OUTPUTS, "rspeaker", 1.0); } diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp index 168dfd4126e..73ce138a9c6 100644 --- a/src/mame/drivers/smc777.cpp +++ b/src/mame/drivers/smc777.cpp @@ -5,10 +5,10 @@ SMC-777 (c) 1983 Sony driver by Angelo Salese - + TODO: - - Implement SMC-70 specific features; - - Implement GFX modes other than 160x100x4 + - Implement SMC-70 specific features; + - Implement GFX modes other than 160x100x4 - ROM/RAM bankswitch, it apparently happens after one instruction prefetching. We currently use an hackish implementation until the MAME/MESS framework can support that ... @@ -653,14 +653,14 @@ WRITE8_MEMBER(smc777_state::gcw_w) * --x- ---- color mode (1=for 2bpp mode, blue is replaced with white) * ---x ---- [SMC-70] interlace * ---- xxyy gfx mode (model dependant) - * [SMC-70] + * [SMC-70] * ---- 11-- 640x400x1 bpp * ---- 10-- 640x200x2 bpp * ---- 01-- 320x200x4 bpp * ---- 00yy 160x100x4 bpp, bits 0-1 selects page * [SMC-777] * ---- 1--- 640x200x2 bpp - * ---- 0--- 320x200x4 bpp + * ---- 0--- 320x200x4 bpp */ m_display_reg = data; @@ -671,7 +671,7 @@ READ8_MEMBER(smc777_state::smc777_mem_r) uint8_t z80_r; // TODO: do the bankswitch AFTER that the prefetch instruction is executed (hackish implementation) - if(m_raminh_prefetch != 0xff) + if(m_raminh_prefetch != 0xff) { z80_r = (uint8_t)m_maincpu->state_int(Z80_R); @@ -700,7 +700,7 @@ READ8_MEMBER(smc777_state::vsync_irq_status_r) m_vsync_idf = false; return 1; } - + return 0; } @@ -743,7 +743,7 @@ void smc777_state::smc777_io(address_map &map) map(0x30, 0x33).mirror(0xff00).rw(FUNC(smc777_state::fdc_r), FUNC(smc777_state::fdc_w)); map(0x34, 0x34).mirror(0xff00).rw(FUNC(smc777_state::fdc1_fast_status_r), FUNC(smc777_state::fdc1_select_w)); // map(0x35, 0x37) rs232 #3 -// map(0x38, 0x3b) cache disk unit +// map(0x38, 0x3b) cache disk unit // 0x38 (R) CDSTS status port (W) CDCMD command port // 0x39 (W) track register // 0x3a (W) sector register @@ -898,7 +898,7 @@ static INPUT_PORTS_START( smc777 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_UNKNOWN ) //status? - + PORT_START("GPDSW") PORT_DIPNAME( 0x01, 0x00, "GPDSW" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp index 3cd6b2deb6e..d6356873a38 100644 --- a/src/mame/drivers/sms_bootleg.cpp +++ b/src/mame/drivers/sms_bootleg.cpp @@ -294,7 +294,7 @@ MACHINE_CONFIG_START(smsbootleg_state::sms_supergame) MCFG_SCREEN_REFRESH_RATE(XTAL(10'738'635)/2 / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC)) MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms) - SEGA315_5246(config, m_vdp, 0); + SEGA315_5246(config, m_vdp, 0); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); m_vdp->irq().set_inputline(m_maincpu, 0); diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index f7734227481..a02039dd890 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -392,8 +392,8 @@ void sothello_state::sothello(machine_config &config) ymsnd.add_route(3, "mono", 0.50); MSM5205(config, m_msm, XTAL(384'000)); - m_msm->vck_legacy_callback().set(FUNC(sothello_state::adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* changed on the fly */ + m_msm->vck_legacy_callback().set(FUNC(sothello_state::adpcm_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* changed on the fly */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/drivers/spg110.cpp b/src/mame/drivers/spg110.cpp index ce9a230aae4..e87f6996ee7 100644 --- a/src/mame/drivers/spg110.cpp +++ b/src/mame/drivers/spg110.cpp @@ -4,10 +4,10 @@ Short Description: - die markings show + die markings show - "SunPlus PA7801" ( known as Sunplus SPG110? ) - Classic Arcade Pinball + "SunPlus PA7801" ( known as Sunplus SPG110? ) + Classic Arcade Pinball *******************************************************************************/ @@ -67,8 +67,8 @@ void spg110_game_state::spg110_base(machine_config &config) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); -// m_spg->add_route(ALL_OUTPUTS, "lspeaker", 0.5); -// m_spg->add_route(ALL_OUTPUTS, "rspeaker", 0.5); +// m_spg->add_route(ALL_OUTPUTS, "lspeaker", 0.5); +// m_spg->add_route(ALL_OUTPUTS, "rspeaker", 0.5); SPG110(config, m_spg, XTAL(27'000'000), "maincpu"); } diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index e0a0db999f4..4ad1ea62f4c 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -523,7 +523,7 @@ void splash_state::splash(machine_config &config) GENERIC_LATCH_8(config, m_soundlatch); m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, 0); - YM3812(config, "ymsnd", XTAL(30'000'000)/8).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3.75MHz (30/8) */ + YM3812(config, "ymsnd", XTAL(30'000'000)/8).add_route(ALL_OUTPUTS, "mono", 0.80); /* 3.75MHz (30/8) */ MSM5205(config, m_msm, XTAL(384'000)); m_msm->vck_legacy_callback().set(FUNC(splash_state::splash_msm5205_int)); /* IRQ handler */ @@ -641,11 +641,11 @@ void funystrp_state::machine_start() void funystrp_state::funystrp(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(24'000'000)/2); /* 12 MHz (24/2) */ + M68000(config, m_maincpu, XTAL(24'000'000)/2); /* 12 MHz (24/2) */ m_maincpu->set_addrmap(AS_PROGRAM, &funystrp_state::funystrp_map); m_maincpu->set_vblank_int("screen", FUNC(funystrp_state::irq6_line_hold)); - Z80(config, m_audiocpu, XTAL(24'000'000)/4); /* 6MHz (24/4) */ + Z80(config, m_audiocpu, XTAL(24'000'000)/4); /* 6MHz (24/4) */ m_audiocpu->set_addrmap(AS_PROGRAM, &funystrp_state::funystrp_sound_map); m_audiocpu->set_addrmap(AS_IO, &funystrp_state::funystrp_sound_io_map); @@ -670,12 +670,12 @@ void funystrp_state::funystrp(machine_config &config) m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); MSM5205(config, m_msm1, XTAL(400'000)); - m_msm1->vck_legacy_callback().set(FUNC(funystrp_state::adpcm_int1)); /* interrupt function */ + m_msm1->vck_legacy_callback().set(FUNC(funystrp_state::adpcm_int1)); /* interrupt function */ m_msm1->set_prescaler_selector(msm5205_device::S48_4B); /* 1 / 48 */ /* Sample rate = 400kHz/64 */ m_msm1->add_route(ALL_OUTPUTS, "mono", 0.80); MSM5205(config, m_msm2, XTAL(400'000)); - m_msm2->vck_legacy_callback().set(FUNC(funystrp_state::adpcm_int2)); /* interrupt function */ + m_msm2->vck_legacy_callback().set(FUNC(funystrp_state::adpcm_int2)); /* interrupt function */ m_msm2->set_prescaler_selector(msm5205_device::S96_4B); /* 1 / 96 */ /* Sample rate = 400kHz/96 */ m_msm2->add_route(ALL_OUTPUTS, "mono", 0.80); } diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index 6af7a1446ce..fd7352d610e 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -1138,10 +1138,10 @@ GFXDECODE_END void srmp2_state::srmp2(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 16000000/2); /* 8.00 MHz */ + M68000(config, m_maincpu, 16000000/2); /* 8.00 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &srmp2_state::srmp2_map); m_maincpu->set_vblank_int("screen", FUNC(srmp2_state::irq4_line_assert)); - m_maincpu->set_periodic_int(FUNC(srmp2_state::irq2_line_assert), attotime::from_hz(15*60)); /* Interrupt times is not understood */ + m_maincpu->set_periodic_int(FUNC(srmp2_state::irq2_line_assert), attotime::from_hz(15*60)); /* Interrupt times is not understood */ MCFG_MACHINE_START_OVERRIDE(srmp2_state,srmp2) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); @@ -1170,15 +1170,15 @@ void srmp2_state::srmp2(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.40); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.45); } void srmp2_state::srmp3(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 3500000); /* 3.50 MHz? or 4.00 MHz? */ + Z80(config, m_maincpu, 3500000); /* 3.50 MHz? or 4.00 MHz? */ m_maincpu->set_addrmap(AS_PROGRAM, &srmp2_state::srmp3_map); m_maincpu->set_addrmap(AS_IO, &srmp2_state::srmp3_io_map); m_maincpu->set_vblank_int("screen", FUNC(srmp2_state::irq0_line_assert)); @@ -1211,8 +1211,8 @@ void srmp2_state::srmp3(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.20); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.45); } @@ -1229,10 +1229,10 @@ void srmp2_state::rmgoldyh(machine_config &config) void srmp2_state::mjyuugi(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 16000000/2); /* 8.00 MHz */ + M68000(config, m_maincpu, 16000000/2); /* 8.00 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &srmp2_state::mjyuugi_map); m_maincpu->set_vblank_int("screen", FUNC(srmp2_state::irq4_line_assert)); - m_maincpu->set_periodic_int(FUNC(srmp2_state::irq2_line_assert), attotime::from_hz(15*60)); /* Interrupt times is not understood */ + m_maincpu->set_periodic_int(FUNC(srmp2_state::irq2_line_assert), attotime::from_hz(15*60)); /* Interrupt times is not understood */ MCFG_MACHINE_START_OVERRIDE(srmp2_state,mjyuugi) @@ -1263,8 +1263,8 @@ void srmp2_state::mjyuugi(machine_config &config) aysnd.add_route(ALL_OUTPUTS, "mono", 0.20); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(srmp2_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.45); } diff --git a/src/mame/drivers/storio.cpp b/src/mame/drivers/storio.cpp index bb5bacc140b..f61ebdf9fd8 100644 --- a/src/mame/drivers/storio.cpp +++ b/src/mame/drivers/storio.cpp @@ -2,18 +2,18 @@ // copyright-holders:David Haywood /****************************************************************************** - VTech Storio and VTech V.Reader - Main processor: Nuvoton W55FA9363SDN (ARM926EJ-S CPU core) - http://www.dingsung.com.cn/download/n32905/1507301944.pdf + VTech Storio and VTech V.Reader + Main processor: Nuvoton W55FA9363SDN (ARM926EJ-S CPU core) + http://www.dingsung.com.cn/download/n32905/1507301944.pdf - Storio (Europe) and V.Reader (North America) cartridges are physically - different, but there is no software region lock, so you can play - Storio games on the V.Reader (and viceversa) by modifying the game's - plastic cartrige (so it can fit in). + Storio (Europe) and V.Reader (North America) cartridges are physically + different, but there is no software region lock, so you can play + Storio games on the V.Reader (and viceversa) by modifying the game's + plastic cartrige (so it can fit in). - Skeleton driver, to reference Software List so that it gets validated + Skeleton driver, to reference Software List so that it gets validated - TODO: everything! + TODO: everything! *******************************************************************************/ diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp index 4a9e0b7ed45..b17af194452 100644 --- a/src/mame/drivers/suprgolf.cpp +++ b/src/mame/drivers/suprgolf.cpp @@ -540,8 +540,8 @@ void suprgolf_state::suprgolf(machine_config &config) ymsnd.add_route(ALL_OUTPUTS, "mono", 0.5); MSM5205(config, m_msm, XTAL(384'000)); /* guess */ - m_msm->vck_legacy_callback().set(FUNC(suprgolf_state::adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 4KHz 4-bit */ + m_msm->vck_legacy_callback().set(FUNC(suprgolf_state::adpcm_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 4KHz 4-bit */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index ce527228ade..83b760a1f4a 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -2467,7 +2467,7 @@ void segas1x_bootleg_state::astormbl(machine_config &config) void segas1x_bootleg_state::astormb2(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(24'000'000)/2); /* 12MHz */ + M68000(config, m_maincpu, XTAL(24'000'000)/2); /* 12MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &segas1x_bootleg_state::astormbl_map); m_maincpu->set_vblank_int("screen", FUNC(segas1x_bootleg_state::irq4_line_hold)); diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 755c7459030..e479a3066ac 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1477,14 +1477,14 @@ void taitol_state::l_system_video(machine_config &config) void fhawk_state::fhawk(machine_config &config) { /* basic machine hardware */ - Z80(config, m_main_cpu, XTAL(13'330'560)/2); /* verified freq on pin122 of TC0090LVC cpu */ + Z80(config, m_main_cpu, XTAL(13'330'560)/2); /* verified freq on pin122 of TC0090LVC cpu */ m_main_cpu->set_addrmap(AS_PROGRAM, &fhawk_state::fhawk_map); m_main_cpu->set_irq_acknowledge_callback(FUNC(taitol_state::irq_callback)); - Z80(config, m_audio_cpu, 12_MHz_XTAL/3); /* verified on pcb */ + Z80(config, m_audio_cpu, 12_MHz_XTAL/3); /* verified on pcb */ m_audio_cpu->set_addrmap(AS_PROGRAM, &fhawk_state::fhawk_3_map); - z80_device &slave(Z80(config, "slave", 12_MHz_XTAL/3)); /* verified on pcb */ + z80_device &slave(Z80(config, "slave", 12_MHz_XTAL/3)); /* verified on pcb */ slave.set_addrmap(AS_PROGRAM, &fhawk_state::fhawk_2_map); slave.set_vblank_int("screen", FUNC(taitol_state::irq0_line_hold)); @@ -1535,21 +1535,21 @@ void champwr_state::champwr(machine_config &config) subdevice<ym2203_device>("ymsnd")->port_b_write_callback().set(FUNC(champwr_state::msm5205_volume_w)); MSM5205(config, m_msm, 384_kHz_XTAL); - m_msm->vck_legacy_callback().set(FUNC(champwr_state::msm5205_vck)); /* VCK function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ + m_msm->vck_legacy_callback().set(FUNC(champwr_state::msm5205_vck)); /* VCK function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.80); } void taitol_2cpu_state::raimais(machine_config &config) { - Z80(config, m_main_cpu, 13330560/2); // needs verification from pin122 of TC0090LVC + Z80(config, m_main_cpu, 13330560/2); // needs verification from pin122 of TC0090LVC m_main_cpu->set_addrmap(AS_PROGRAM, &taitol_2cpu_state::raimais_map); m_main_cpu->set_irq_acknowledge_callback(FUNC(taitol_state::irq_callback)); - Z80(config, m_audio_cpu, 12000000/3); // not verified + Z80(config, m_audio_cpu, 12000000/3); // not verified m_audio_cpu->set_addrmap(AS_PROGRAM, &taitol_2cpu_state::raimais_3_map); - z80_device &slave(Z80(config, "slave", 12000000/3)); // not verified + z80_device &slave(Z80(config, "slave", 12000000/3)); // not verified slave.set_addrmap(AS_PROGRAM, &taitol_2cpu_state::raimais_2_map); slave.set_vblank_int("screen", FUNC(taitol_state::irq0_line_hold)); @@ -1731,11 +1731,11 @@ void taitol_1cpu_state::cachat(machine_config &config) void taitol_2cpu_state::evilston(machine_config &config) { /* basic machine hardware */ - Z80(config, m_main_cpu, XTAL(13'330'560)/2); /* not verified */ + Z80(config, m_main_cpu, XTAL(13'330'560)/2); /* not verified */ m_main_cpu->set_addrmap(AS_PROGRAM, &taitol_2cpu_state::evilston_map); m_main_cpu->set_irq_acknowledge_callback(FUNC(taitol_state::irq_callback)); - Z80(config, m_audio_cpu, 12_MHz_XTAL/3); /* not verified */ + Z80(config, m_audio_cpu, 12_MHz_XTAL/3); /* not verified */ m_audio_cpu->set_addrmap(AS_PROGRAM, &taitol_2cpu_state::evilston_2_map); m_audio_cpu->set_vblank_int("screen", FUNC(taitol_state::irq0_line_hold)); diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp index 0b64bb3e9f2..0ec2eb8e635 100644 --- a/src/mame/drivers/taitoair.cpp +++ b/src/mame/drivers/taitoair.cpp @@ -704,11 +704,11 @@ void taitoair_state::machine_reset() void taitoair_state::airsys(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(12'000'000)); // MC68000P12 + M68000(config, m_maincpu, XTAL(12'000'000)); // MC68000P12 m_maincpu->set_addrmap(AS_PROGRAM, &taitoair_state::airsys_map); m_maincpu->set_vblank_int("screen", FUNC(taitoair_state::irq5_line_hold)); - Z80(config, m_audiocpu, XTAL(16'000'000) / 4); // Z8400AB1 + Z80(config, m_audiocpu, XTAL(16'000'000) / 4); // Z8400AB1 m_audiocpu->set_addrmap(AS_PROGRAM, &taitoair_state::sound_map); TMS32025(config, m_dsp, XTAL(36'000'000)); // Unverified diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index d59a85e1c6f..9f28339519e 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -488,12 +488,12 @@ void tbowl_state::tbowl(machine_config &config) /* something for the samples? */ MSM5205(config, m_msm1, 384000); m_msm1->vck_legacy_callback().set(FUNC(tbowl_state::adpcm_int_1)); /* interrupt function */ - m_msm1->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ + m_msm1->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ m_msm1->add_route(ALL_OUTPUTS, "mono", 0.50); MSM5205(config, m_msm2, 384000); m_msm2->vck_legacy_callback().set(FUNC(tbowl_state::adpcm_int_2)); /* interrupt function */ - m_msm2->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ + m_msm2->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ m_msm2->add_route(ALL_OUTPUTS, "mono", 0.50); } diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp index 3a16baf494d..84fcb199fc9 100644 --- a/src/mame/drivers/tehkanwc.cpp +++ b/src/mame/drivers/tehkanwc.cpp @@ -668,7 +668,7 @@ GFXDECODE_END void tehkanwc_state::tehkanwc(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 18432000/4); /* 18.432000 / 4 */ + Z80(config, m_maincpu, 18432000/4); /* 18.432000 / 4 */ m_maincpu->set_addrmap(AS_PROGRAM, &tehkanwc_state::main_mem); m_maincpu->set_vblank_int("screen", FUNC(tehkanwc_state::irq0_line_hold)); @@ -681,7 +681,7 @@ void tehkanwc_state::tehkanwc(machine_config &config) m_audiocpu->set_addrmap(AS_IO, &tehkanwc_state::sound_port); m_audiocpu->set_vblank_int("screen", FUNC(tehkanwc_state::irq0_line_hold)); - config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */ + config.m_minimum_quantum = attotime::from_hz(600); /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */ WATCHDOG_TIMER(config, "watchdog"); @@ -714,8 +714,8 @@ void tehkanwc_state::tehkanwc(machine_config &config) ay2.add_route(ALL_OUTPUTS, "mono", 0.25); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(tehkanwc_state::adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ + m_msm->vck_legacy_callback().set(FUNC(tehkanwc_state::adpcm_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8KHz */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.45); } diff --git a/src/mame/drivers/testpat.cpp b/src/mame/drivers/testpat.cpp index cf5b4ba2da4..075a751e521 100644 --- a/src/mame/drivers/testpat.cpp +++ b/src/mame/drivers/testpat.cpp @@ -5,11 +5,11 @@ TV test pattern generators Radio, 1983, N5 - http://radioway.ru/1983/05/generator_telesignalov.html - http://radioway.ru/1984/04/generator_telesignalov.html + http://radioway.ru/1983/05/generator_telesignalov.html + http://radioway.ru/1984/04/generator_telesignalov.html Radio, 1985, N6 - http://radioway.ru/1985/06/generator_ispytatelnyh_signalov.html + http://radioway.ru/1985/06/generator_ispytatelnyh_signalov.html ***************************************************************************/ @@ -31,7 +31,7 @@ Radio, 1985, N6 #define MASTER_CLOCK (4000000) #define V_TOTAL_PONG 315 -#define H_TOTAL_PONG 256 // tbc +#define H_TOTAL_PONG 256 // tbc class tp1983_state : public driver_device { diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index 0ca616a0158..f6215bab434 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -2103,7 +2103,7 @@ void toaplan1_state::samesame(machine_config &config) M68000(config, m_maincpu, XTAL(10'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &toaplan1_state::samesame_main_map); - Z180(config, m_audiocpu, XTAL(28'000'000)/8); /* HD647180XOFS6 CPU */ + Z180(config, m_audiocpu, XTAL(28'000'000)/8); /* HD647180XOFS6 CPU */ m_audiocpu->set_addrmap(AS_PROGRAM, &toaplan1_state::samesame_hd647180_mem_map); m_audiocpu->set_addrmap(AS_IO, &toaplan1_state::samesame_hd647180_io_map); @@ -2205,10 +2205,10 @@ void toaplan1_state::outzonecv(machine_config &config) void toaplan1_state::vimana(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(10'000'000)); /* verified on pcb */ + M68000(config, m_maincpu, XTAL(10'000'000)); /* verified on pcb */ m_maincpu->set_addrmap(AS_PROGRAM, &toaplan1_state::vimana_main_map); - Z180(config, m_audiocpu, XTAL(28'000'000)/8); /* HD647180XOFS6 CPU */ + Z180(config, m_audiocpu, XTAL(28'000'000)/8); /* HD647180XOFS6 CPU */ m_audiocpu->set_addrmap(AS_PROGRAM, &toaplan1_state::vimana_hd647180_mem_map); m_audiocpu->set_addrmap(AS_IO, &toaplan1_state::vimana_hd647180_io_map); @@ -2232,7 +2232,7 @@ void toaplan1_state::vimana(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - YM3812(config, m_ymsnd, XTAL(28'000'000)/8); /* verified on pcb */ + YM3812(config, m_ymsnd, XTAL(28'000'000)/8); /* verified on pcb */ m_ymsnd->irq_handler().set_inputline(m_audiocpu, 0); m_ymsnd->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 1df70fc4993..aa8dc302bb2 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -631,11 +631,11 @@ void topspeed_state::topspeed(machine_config &config) MSM5205(config, m_msm[0], XTAL(384'000)); m_msm[0]->vck_legacy_callback().set(FUNC(topspeed_state::msm5205_1_vck)); - m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); // 8 kHz, 4-bit + m_msm[0]->set_prescaler_selector(msm5205_device::S48_4B); // 8 kHz, 4-bit m_msm[0]->add_route(ALL_OUTPUTS, "filter2", 1.0); MSM5205(config, m_msm[1], XTAL(384'000)); - m_msm[1]->set_prescaler_selector(msm5205_device::SEX_4B); // Slave mode, 4-bit + m_msm[1]->set_prescaler_selector(msm5205_device::SEX_4B); // Slave mode, 4-bit m_msm[1]->add_route(ALL_OUTPUTS, "filter3", 1.0); FILTER_VOLUME(config, "filter1l").add_route(ALL_OUTPUTS, "lspeaker", 1.0); diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index 87a1345c9fd..3a343feab7e 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -898,7 +898,7 @@ WRITE_LINE_MEMBER(trackfld_state::vblank_nmi) void trackfld_state::trackfld(machine_config &config) { /* basic machine hardware */ - KONAMI1(config, m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ + KONAMI1(config, m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ m_maincpu->set_addrmap(AS_PROGRAM, &trackfld_state::main_map); Z80(config, m_audiocpu, SOUND_CLOCK/4); @@ -959,7 +959,7 @@ void trackfld_state::trackfld(machine_config &config) void trackfld_state::trackfldu(machine_config &config) { trackfld(config); - MC6809E(config.replace(), m_maincpu, MASTER_CLOCK/6/2); /* exact M6809 model unknown */ + MC6809E(config.replace(), m_maincpu, MASTER_CLOCK/6/2); /* exact M6809 model unknown */ m_maincpu->set_addrmap(AS_PROGRAM, &trackfld_state::main_map); } @@ -972,7 +972,7 @@ INTERRUPT_GEN_MEMBER(trackfld_state::yieartf_timer_irq) void trackfld_state::yieartf(machine_config &config) { /* basic machine hardware */ - MC6809E(config, m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ + MC6809E(config, m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ m_maincpu->set_addrmap(AS_PROGRAM, &trackfld_state::yieartf_map); m_maincpu->set_periodic_int(FUNC(trackfld_state::yieartf_timer_irq), attotime::from_hz(480)); @@ -1076,7 +1076,7 @@ void trackfld_state::hyprolyb(machine_config &config) msm5205_device &msm(MSM5205(config, "msm", 384000)); msm.vck_legacy_callback().set("hyprolyb_adpcm", FUNC(hyprolyb_adpcm_device::vck_callback)); - msm.set_prescaler_selector(msm5205_device::S96_4B); /* 4 kHz */ + msm.set_prescaler_selector(msm5205_device::S96_4B); /* 4 kHz */ msm.add_route(ALL_OUTPUTS, "speaker", 0.5); } @@ -1092,7 +1092,7 @@ void trackfld_state::mastkin(machine_config &config) trackfld(config); /* basic machine hardware */ - MC6809E(config.replace(), m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ + MC6809E(config.replace(), m_maincpu, MASTER_CLOCK/6/2); /* a guess for now */ m_maincpu->set_addrmap(AS_PROGRAM, &trackfld_state::mastkin_map); m_mainlatch->q_out_cb<3>().set_nop(); // actually not used @@ -1105,7 +1105,7 @@ void trackfld_state::wizzquiz(machine_config &config) /* basic machine hardware */ // right cpu? - M6800(config.replace(), m_maincpu, 2048000); /* 1.400 MHz ??? */ + M6800(config.replace(), m_maincpu, 2048000); /* 1.400 MHz ??? */ m_maincpu->set_addrmap(AS_PROGRAM, &trackfld_state::wizzquiz_map); m_screen->set_screen_vblank(DEVCB_WRITELINE(*this, trackfld_state, vblank_nmi)); diff --git a/src/mame/drivers/trkfldch.cpp b/src/mame/drivers/trkfldch.cpp index 49c632d5461..e0141527ade 100644 --- a/src/mame/drivers/trkfldch.cpp +++ b/src/mame/drivers/trkfldch.cpp @@ -13,8 +13,8 @@ PCB Game TV0001 R1.1 My First DDR TV0002 R1.0 Track & Field -DDR & TF PCBs look identical, all the parts are in the same place, the traces are the same, and the silkscreened part # for resistors and caps are the same. - +DDR & TF PCBs look identical, all the parts are in the same place, the traces are the same, and the silkscreened part # for resistors and caps are the same. + currently dies after call at 00:AE85: LDA $0b diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index 1ea896bdf36..f0fd25ade8a 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -827,15 +827,15 @@ void tubep_state::tubep(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &tubep_state::tubep_main_map); m_maincpu->set_addrmap(AS_IO, &tubep_state::tubep_main_portmap); - Z80(config, m_slave, 16000000 / 4); /* 4 MHz */ + Z80(config, m_slave, 16000000 / 4); /* 4 MHz */ m_slave->set_addrmap(AS_PROGRAM, &tubep_state::tubep_second_map); m_slave->set_addrmap(AS_IO, &tubep_state::tubep_second_portmap); - Z80(config, m_soundcpu, 19968000 / 8); /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ + Z80(config, m_soundcpu, 19968000 / 8); /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ m_soundcpu->set_addrmap(AS_PROGRAM, &tubep_state::tubep_sound_map); m_soundcpu->set_addrmap(AS_IO, &tubep_state::tubep_sound_portmap); - NSC8105(config, m_mcu, 6000000); /* 6 MHz Xtal - divided internally ??? */ + NSC8105(config, m_mcu, 6000000); /* 6 MHz Xtal - divided internally ??? */ m_mcu->set_addrmap(AS_PROGRAM, &tubep_state::nsc_map); config.m_minimum_quantum = attotime::from_hz(6000); @@ -893,21 +893,21 @@ void tubep_state::tubepb(machine_config &config) void tubep_state::rjammer(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, 16000000 / 4); /* 4 MHz */ + Z80(config, m_maincpu, 16000000 / 4); /* 4 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &tubep_state::rjammer_main_map); m_maincpu->set_addrmap(AS_IO, &tubep_state::rjammer_main_portmap); - Z80(config, m_slave, 16000000 / 4); /* 4 MHz */ + Z80(config, m_slave, 16000000 / 4); /* 4 MHz */ m_slave->set_addrmap(AS_PROGRAM, &tubep_state::rjammer_second_map); m_slave->set_addrmap(AS_IO, &tubep_state::rjammer_second_portmap); - Z80(config, m_soundcpu, 19968000 / 8); /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ + Z80(config, m_soundcpu, 19968000 / 8); /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */ m_soundcpu->set_addrmap(AS_PROGRAM, &tubep_state::rjammer_sound_map); m_soundcpu->set_addrmap(AS_IO, &tubep_state::rjammer_sound_portmap); GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_NMI); - NSC8105(config, m_mcu, 6000000); /* 6 MHz Xtal - divided internally ??? */ + NSC8105(config, m_mcu, 6000000); /* 6 MHz Xtal - divided internally ??? */ m_mcu->set_addrmap(AS_PROGRAM, &tubep_state::nsc_map); ls259_device &mainlatch(LS259(config, "mainlatch")); // 3A @@ -947,8 +947,8 @@ void tubep_state::rjammer(machine_config &config) ay3.add_route(ALL_OUTPUTS, "mono", 0.10); MSM5205(config, m_msm, 384000); - m_msm->vck_legacy_callback().set(FUNC(tubep_state::rjammer_adpcm_vck)); /* VCK function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz (changes at run time) */ + m_msm->vck_legacy_callback().set(FUNC(tubep_state::rjammer_adpcm_vck)); /* VCK function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz (changes at run time) */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); } diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp index 4b4aba58248..8bb8cefa7a3 100644 --- a/src/mame/drivers/twincobr.cpp +++ b/src/mame/drivers/twincobr.cpp @@ -652,10 +652,10 @@ GFXDECODE_END void twincobr_state::twincobr(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(28'000'000) / 4); /* 7MHz - Main board Crystal is 28MHz */ + M68000(config, m_maincpu, XTAL(28'000'000) / 4); /* 7MHz - Main board Crystal is 28MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &twincobr_state::main_program_map); - z80_device &audiocpu(Z80(config, "audiocpu", XTAL(28'000'000)/8)); /* 3.5MHz */ + z80_device &audiocpu(Z80(config, "audiocpu", XTAL(28'000'000)/8)); /* 3.5MHz */ audiocpu.set_addrmap(AS_PROGRAM, &twincobr_state::sound_program_map); audiocpu.set_addrmap(AS_IO, &twincobr_state::sound_io_map); diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 9b966e38e5e..293191bd0cf 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -541,7 +541,7 @@ void vigilant_state::buccanrs(machine_config &config) m_maincpu->set_addrmap(AS_IO, &vigilant_state::vigilant_io_map); m_maincpu->set_vblank_int("screen", FUNC(vigilant_state::irq0_line_hold)); - z80_device &soundcpu(Z80(config, "soundcpu", 18432000/6)); /* 3.072000 MHz */ + z80_device &soundcpu(Z80(config, "soundcpu", 18432000/6)); /* 3.072000 MHz */ soundcpu.set_addrmap(AS_PROGRAM, &vigilant_state::sound_map); soundcpu.set_addrmap(AS_IO, &vigilant_state::buccanrs_sound_io_map); soundcpu.set_periodic_int(FUNC(vigilant_state::nmi_line_pulse), attotime::from_hz(128*55)); /* clocked by V1 */ diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index 9ebf4e78688..6d8b82f31c2 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -6,17 +6,17 @@ Systems which run on the SPG243 SoC - die markings show - "SunPlus QL8041" ( known as Sunplus SPG240? ) - JAKKS WWE - Fantastic 4 - Justice League - Dora the Explorer - Mattel Classic Sports + die markings show + "SunPlus QL8041" ( known as Sunplus SPG240? ) + JAKKS WWE + Fantastic 4 + Justice League + Dora the Explorer + Mattel Classic Sports - "SunPlus QL8041C" ( known as Sunplus SPG2?? ) see clickstart.cpp instead + "SunPlus QL8041C" ( known as Sunplus SPG2?? ) see clickstart.cpp instead - "SunPlus PA7801" ( known as Sunplus SPG110? ) see spg110.cpp instead + "SunPlus PA7801" ( known as Sunplus SPG110? ) see spg110.cpp instead Status: @@ -35,9 +35,9 @@ Game seems unhappy with NVRAM, clears contents on each boot. rad_skat: Palette issues on the High Score screen. - rad_fb2: - sometimes when selecting QB training camp the sprites don't appear - controls are not properly mapped + rad_fb2: + sometimes when selecting QB training camp the sprites don't appear + controls are not properly mapped vii: When loading a cart from file manager, sometimes MAME will crash. The "MOTOR" option in the diagnostic menu does nothing when selected. @@ -45,17 +45,17 @@ On 'vii_vc1' & 'vii_vc2' cart, the left-right keys are transposed with the up-down keys. - This is not a bug per se, as the games are played with the controller physically rotated 90 degrees. - Note: - Cricket, Skateboarder, Skannerz and Football 2 list a 32-bit checksum at the start of ROM. - This is the byte sum of the file, excluding the first 16 byte (where the checksum is stored) + Note: + Cricket, Skateboarder, Skannerz and Football 2 list a 32-bit checksum at the start of ROM. + This is the byte sum of the file, excluding the first 16 byte (where the checksum is stored) - Test Modes: - Justice League : press UP, DOWN, LEFT, BT3 on the JAKKS logo in that order, quickly, to get test menu - WWE : press UP, BT1, BT2 together during startup logos + Test Modes: + Justice League : press UP, DOWN, LEFT, BT3 on the JAKKS logo in that order, quickly, to get test menu + WWE : press UP, BT1, BT2 together during startup logos - TODO: - Work out how to access the hidden TEST menus for all games (most JAKKS games should have one at least) + TODO: + Work out how to access the hidden TEST menus for all games (most JAKKS games should have one at least) Also on this hardware: diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 63b1c6ae05b..7d523c6ae90 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -283,11 +283,11 @@ void wackygtr_state::program_map(address_map &map) MACHINE_CONFIG_START(wackygtr_state::wackygtr) - MC6809(config, m_maincpu, XTAL(3'579'545)); // HD68B09P + MC6809(config, m_maincpu, XTAL(3'579'545)); // HD68B09P m_maincpu->set_addrmap(AS_PROGRAM, &wackygtr_state::program_map); - m_maincpu->set_periodic_int(FUNC(wackygtr_state::irq0_line_assert), attotime::from_hz(50)); // FIXME + m_maincpu->set_periodic_int(FUNC(wackygtr_state::irq0_line_assert), attotime::from_hz(50)); // FIXME - TIMER(config, "nmi_timer").configure_periodic(FUNC(wackygtr_state::nmi_timer), attotime::from_hz(100)); // FIXME + TIMER(config, "nmi_timer").configure_periodic(FUNC(wackygtr_state::nmi_timer), attotime::from_hz(100)); // FIXME /* Video */ config.set_default_layout(layout_wackygtr); @@ -295,8 +295,8 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr) /* Sound */ SPEAKER(config, "mono").front_center(); MSM5205(config, m_msm, XTAL(384'000)); - m_msm->vck_legacy_callback().set(FUNC(wackygtr_state::adpcm_int)); /* IRQ handler */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ + m_msm->vck_legacy_callback().set(FUNC(wackygtr_state::adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "mono", 1.0); ym2413_device &ymsnd(YM2413(config, "ymsnd", XTAL(3'579'545))); diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp index 3969300db3a..a89ab9a1b35 100644 --- a/src/mame/drivers/wardner.cpp +++ b/src/mame/drivers/wardner.cpp @@ -382,13 +382,13 @@ void wardner_state::machine_reset() void wardner_state::wardner(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(24'000'000) / 4); /* 6MHz */ + Z80(config, m_maincpu, XTAL(24'000'000) / 4); /* 6MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &wardner_state::main_program_map); m_maincpu->set_addrmap(AS_IO, &wardner_state::main_io_map); ADDRESS_MAP_BANK(config, "membank").set_map(&wardner_state::main_bank_map).set_options(ENDIANNESS_LITTLE, 8, 18, 0x8000); - z80_device &audiocpu(Z80(config, "audiocpu", XTAL(14'000'000) / 4)); /* 3.5MHz */ + z80_device &audiocpu(Z80(config, "audiocpu", XTAL(14'000'000) / 4)); /* 3.5MHz */ audiocpu.set_addrmap(AS_PROGRAM, &wardner_state::sound_program_map); audiocpu.set_addrmap(AS_IO, &wardner_state::sound_io_map); @@ -398,7 +398,7 @@ void wardner_state::wardner(machine_config &config) m_dsp->set_addrmap(AS_IO, &wardner_state::dsp_io_map); m_dsp->bio().set(FUNC(wardner_state::twincobr_bio_r)); - config.m_minimum_quantum = attotime::from_hz(6000); /* 100 CPU slices per frame */ + config.m_minimum_quantum = attotime::from_hz(6000); /* 100 CPU slices per frame */ ls259_device &mainlatch(LS259(config, "mainlatch")); mainlatch.q_out_cb<2>().set(FUNC(wardner_state::int_enable_w)); diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index 229a88aa340..41393908320 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -438,11 +438,11 @@ void warriorb_state::machine_reset() void warriorb_state::darius2d(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 12000000); /* 12 MHz ??? (Might well be 16!) */ + M68000(config, m_maincpu, 12000000); /* 12 MHz ??? (Might well be 16!) */ m_maincpu->set_addrmap(AS_PROGRAM, &warriorb_state::darius2d_map); m_maincpu->set_vblank_int("lscreen", FUNC(warriorb_state::irq4_line_hold)); - z80_device &audiocpu(Z80(config, "audiocpu", 16000000/4)); /* 4 MHz ? */ + z80_device &audiocpu(Z80(config, "audiocpu", 16000000/4)); /* 4 MHz ? */ audiocpu.set_addrmap(AS_PROGRAM, &warriorb_state::z80_sound_map); TC0220IOC(config, m_tc0220ioc, 0); @@ -521,11 +521,11 @@ void warriorb_state::darius2d(machine_config &config) void warriorb_state::warriorb(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 16000000); /* 16 MHz ? */ + M68000(config, m_maincpu, 16000000); /* 16 MHz ? */ m_maincpu->set_addrmap(AS_PROGRAM, &warriorb_state::warriorb_map); m_maincpu->set_vblank_int("lscreen", FUNC(warriorb_state::irq4_line_hold)); - z80_device &audiocpu(Z80(config, "audiocpu", 16000000/4)); /* 4 MHz ? */ + z80_device &audiocpu(Z80(config, "audiocpu", 16000000/4)); /* 4 MHz ? */ audiocpu.set_addrmap(AS_PROGRAM, &warriorb_state::z80_sound_map); TC0510NIO(config, m_tc0510nio, 0); diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp index d5df19311f7..8a92726da2d 100644 --- a/src/mame/drivers/wc90b.cpp +++ b/src/mame/drivers/wc90b.cpp @@ -389,8 +389,8 @@ void wc90b_state::wc90b(machine_config &config) YM2203(config, "ymsnd2", YM2203_CLOCK).add_route(ALL_OUTPUTS, "mono", 0.40); MSM5205(config, m_msm, MSM5205_CLOCK); - m_msm->vck_legacy_callback().set(FUNC(wc90b_state::adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ + m_msm->vck_legacy_callback().set(FUNC(wc90b_state::adpcm_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz 4-bit */ m_msm->add_route(ALL_OUTPUTS, "mono", 0.20); } diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 1238c57ac26..b62ff069796 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -674,11 +674,11 @@ void welltris_state::machine_start() void welltris_state::welltris(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 20000000/2); /* 10 MHz */ + M68000(config, m_maincpu, 20000000/2); /* 10 MHz */ m_maincpu->set_addrmap(AS_PROGRAM, &welltris_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(welltris_state::irq1_line_hold)); - Z80(config, m_audiocpu, 8000000/2); /* 4 MHz ??? */ + Z80(config, m_audiocpu, 8000000/2); /* 4 MHz ??? */ m_audiocpu->set_addrmap(AS_PROGRAM, &welltris_state::sound_map); m_audiocpu->set_addrmap(AS_IO, &welltris_state::sound_port_map); /* IRQs are triggered by the YM2610 */ diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp index b1dd4cc61fd..f8e49803b0b 100644 --- a/src/mame/drivers/wgp.cpp +++ b/src/mame/drivers/wgp.cpp @@ -915,14 +915,14 @@ void wgp_state::machine_start() void wgp_state::wgp(machine_config &config) { /* basic machine hardware */ - M68000(config, m_maincpu, 12000000); /* 12 MHz ??? */ + M68000(config, m_maincpu, 12000000); /* 12 MHz ??? */ m_maincpu->set_addrmap(AS_PROGRAM, &wgp_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(wgp_state::irq4_line_hold)); - Z80(config, m_audiocpu, 16000000/4); /* 4 MHz ??? */ + Z80(config, m_audiocpu, 16000000/4); /* 4 MHz ??? */ m_audiocpu->set_addrmap(AS_PROGRAM, &wgp_state::z80_sound_map); - M68000(config, m_subcpu, 12000000); /* 12 MHz ??? */ + M68000(config, m_subcpu, 12000000); /* 12 MHz ??? */ m_subcpu->set_addrmap(AS_PROGRAM, &wgp_state::cpu2_map); m_subcpu->set_vblank_int("screen", FUNC(wgp_state::cpub_interrupt)); diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 708ce014c41..4eb9bcfaae4 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -201,29 +201,29 @@ Fitness Dance has an Atmel H93864C (maybe SEEPROM?) a Microchip DSPIC 33FJ12GP202 and two JRC 2740 dual op amps. Music and Circuit has a 24CS64, two UTC324 quad op amps, a 74HC14, a 74HCT04, and an 8-pin SOIC labeled 61545, which is likely an M61545 dual electronic volume control. - It looks like the sensors (cameras) are from ETOMS - They are all 32x32 arrays except Fitness Play, which is 64x64. Most of the PCBs are marked CIS. - Bowling and Boxing look identical. - LOTR and SW look identical - DQ looks similar to LOTR - Real Swing Golf (different driver) and Fitness Play look different from all the others. + It looks like the sensors (cameras) are from ETOMS + They are all 32x32 arrays except Fitness Play, which is 64x64. Most of the PCBs are marked CIS. + Bowling and Boxing look identical. + LOTR and SW look identical + DQ looks similar to LOTR + Real Swing Golf (different driver) and Fitness Play look different from all the others. - The sensor dies for Bowling, Boxing, Star Wars and DQ are labeled CU5501A. - LOTR is CU5501 - Real Swing Golf is CU5502 - Fitness Play is S-5300A SLH2039H and does not have ETOMS on it. - The Fitness Play main PCB has an extra glob next to the ribbon cable to the camera. - Most of the camera PCBs connect to the main PCB with an 18-20 wire ribbon cable. - - Real Swing Golf just has 6 wires, Its camera PCB is the only one with a ceramic resonator - Maybe the CU5502 chip offloads some processing from the CPU? + The sensor dies for Bowling, Boxing, Star Wars and DQ are labeled CU5501A. + LOTR is CU5501 + Real Swing Golf is CU5502 + Fitness Play is S-5300A SLH2039H and does not have ETOMS on it. + The Fitness Play main PCB has an extra glob next to the ribbon cable to the camera. + Most of the camera PCBs connect to the main PCB with an 18-20 wire ribbon cable. + Real Swing Golf just has 6 wires, Its camera PCB is the only one with a ceramic resonator + Maybe the CU5502 chip offloads some processing from the CPU? - NOTES: - Play TV Monster Truck runs off an entirely different codebase to everything else, presumably coded by the developer from scratch rather than using code supplied by SSD Company LTD - Play TV Rescue Heroes fails to display any kind of XaviX logo or SSD Copyright, it is the only XaviX based game so far to not show these details anywhere in the game. + NOTES: + + Play TV Monster Truck runs off an entirely different codebase to everything else, presumably coded by the developer from scratch rather than using code supplied by SSD Company LTD + Play TV Rescue Heroes fails to display any kind of XaviX logo or SSD Copyright, it is the only XaviX based game so far to not show these details anywhere in the game. @@ -514,7 +514,7 @@ static INPUT_PORTS_START( xavix ) INPUT_PORTS_END static INPUT_PORTS_START( xavix_an ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) // test inputs, not real! PORT_MODIFY("AN0") // 00 @@ -536,14 +536,14 @@ static INPUT_PORTS_START( xavix_an ) INPUT_PORTS_END static INPUT_PORTS_START( xavix_i2c ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) PORT_MODIFY("IN1") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xavix_i2c_state,i2c_r, nullptr) INPUT_PORTS_END static INPUT_PORTS_START( ttv_lotr ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xavix_i2c_lotr_state,camera_r, nullptr) @@ -552,7 +552,7 @@ static INPUT_PORTS_START( ttv_lotr ) INPUT_PORTS_END static INPUT_PORTS_START( xavix_bowl ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) PORT_MODIFY("IN1") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xavix_i2c_bowl_state,camera_r, nullptr) @@ -561,7 +561,7 @@ static INPUT_PORTS_START( xavix_bowl ) INPUT_PORTS_END static INPUT_PORTS_START( epo_sdb ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) PORT_MODIFY("MOUSE0X") PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1) @@ -582,8 +582,8 @@ INPUT_PORTS_END // left + right drums together = select / forward (needed on initial screen). left drum = left in menus right drum = right in menus // analog reading depends heavily on timers, they're too fast right now so drum hits are too hard and register multiple times -static INPUT_PORTS_START( taikodp ) - PORT_INCLUDE(xavix_an) +static INPUT_PORTS_START( taikodp ) + PORT_INCLUDE(xavix_an) PORT_MODIFY("AN0") // 00 (read by one type of function, handled in timer interrupt at 0x1d92 in RAM) PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) @@ -593,7 +593,7 @@ static INPUT_PORTS_START( taikodp ) PORT_MODIFY("AN5") // 11 (read by different function, handled in timer interrupt at 0x1de8) (battery status related?) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) - + PORT_MODIFY("AN7") // 13 (read by identical function to 11 but with different addresses, handled in timer interrupt at 0x1e09 in RAM) (battery status related?) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -613,10 +613,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( xavixp ) - PORT_INCLUDE(xavix) + PORT_INCLUDE(xavix) - PORT_MODIFY("REGION") // PAL/NTSC flag - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_CUSTOM ) + PORT_MODIFY("REGION") // PAL/NTSC flag + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_CUSTOM ) INPUT_PORTS_END @@ -1272,7 +1272,7 @@ void xavix_cart_state::xavix_cart_popira(machine_config &config) xavix_cart(config); // is a battery / power source required to store NVRAM in the CPU? Popira definitely needs NVRAM storing on power-of - // XaviX Tennis won't boot if you do (but that could be an unrelated SEEPROM issue?) & DDR Family Mat gets stuck in 2 Player mode with no obvious way of changing back + // XaviX Tennis won't boot if you do (but that could be an unrelated SEEPROM issue?) & DDR Family Mat gets stuck in 2 Player mode with no obvious way of changing back NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); /* software lists */ @@ -1512,13 +1512,13 @@ ROM_END /* XaviX hardware titles (1st Generation) - These use - SSD 98 PL7351-181 - SSD 98 PA7351-107 - SSD 97 PA7270-107 - type CPUS + These use + SSD 98 PL7351-181 + SSD 98 PA7351-107 + SSD 97 PA7270-107 + type CPUS - only new opcodes are callf and retf? + only new opcodes are callf and retf? */ @@ -1596,7 +1596,7 @@ CONS( 2000, popira, 0, 0, xavix_cart_popira,popira, xavix_cart_st CONS( 2003, taikodp, 0, 0, xavix_i2c_taiko, taikodp, xavix_i2c_cart_state, init_xavix, "Takara / SSD Company LTD", "Taiko De Popira (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ ) // inputs? are the drums analog? -/* SuperXaviX(?) (XaviX 2000 type CPU) hardware titles (2nd XaviX generation?) +/* SuperXaviX(?) (XaviX 2000 type CPU) hardware titles (2nd XaviX generation?) these use the SSD 2000 NEC 85605-621 type CPU @@ -1741,7 +1741,7 @@ ROM_START( dombikec ) ROM_LOAD( "xpbikeconcept.bin", 0x000000, 0x1000000, CRC(3447fce5) SHA1(c7e9e9cd789a17ac886ecf253f67753213cf8d21) ) ROM_END -// Has SEEPROM and an RTC. Adventure has the string DOMYSSDCOLTD a couple of times. +// Has SEEPROM and an RTC. Adventure has the string DOMYSSDCOLTD a couple of times. CONS( 2008, domfitad, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Adventure (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) CONS( 2008, dombikec, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Bike Concept (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp index 351158525c8..8dff608fb5a 100644 --- a/src/mame/drivers/yunsung8.cpp +++ b/src/mame/drivers/yunsung8.cpp @@ -344,12 +344,12 @@ void yunsung8_state::machine_reset() void yunsung8_state::yunsung8(machine_config &config) { /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(16'000'000)/2); /* Z80B @ 8MHz? */ + Z80(config, m_maincpu, XTAL(16'000'000)/2); /* Z80B @ 8MHz? */ m_maincpu->set_addrmap(AS_PROGRAM, &yunsung8_state::main_map); m_maincpu->set_addrmap(AS_IO, &yunsung8_state::port_map); - m_maincpu->set_vblank_int("screen", FUNC(yunsung8_state::irq0_line_assert)); /* No nmi routine */ + m_maincpu->set_vblank_int("screen", FUNC(yunsung8_state::irq0_line_assert)); /* No nmi routine */ - Z80(config, m_audiocpu, XTAL(16'000'000)/4); /* ? */ + Z80(config, m_audiocpu, XTAL(16'000'000)/4); /* ? */ m_audiocpu->set_addrmap(AS_PROGRAM, &yunsung8_state::sound_map); /* video hardware */ @@ -376,7 +376,7 @@ void yunsung8_state::yunsung8(machine_config &config) MSM5205(config, m_msm, XTAL(400'000)); /* verified on pcb */ m_msm->vck_legacy_callback().set(FUNC(yunsung8_state::adpcm_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz, 4 Bits */ + m_msm->set_prescaler_selector(msm5205_device::S96_4B); /* 4KHz, 4 Bits */ m_msm->add_route(ALL_OUTPUTS, "lspeaker", 0.80); m_msm->add_route(ALL_OUTPUTS, "rspeaker", 0.80); } diff --git a/src/mame/includes/vsmile.h b/src/mame/includes/vsmile.h index 672eb334381..defb83e106e 100644 --- a/src/mame/includes/vsmile.h +++ b/src/mame/includes/vsmile.h @@ -128,14 +128,14 @@ public: enum : uint16_t { - BUTTON_YELLOW = 0x01fe, - BUTTON_BLUE = 0x03ee, - BUTTON_ORANGE = 0x03de, - BUTTON_GREEN = 0x03be, - BUTTON_RED = 0x02fe, - BUTTON_CLOUD = 0x03f6, - BUTTON_BALL = 0x03fa, - BUTTON_EXIT = 0x03fc + BUTTON_YELLOW = 0x01fe, + BUTTON_BLUE = 0x03ee, + BUTTON_ORANGE = 0x03de, + BUTTON_GREEN = 0x03be, + BUTTON_RED = 0x02fe, + BUTTON_CLOUD = 0x03f6, + BUTTON_BALL = 0x03fa, + BUTTON_EXIT = 0x03fc }; DECLARE_INPUT_CHANGED_MEMBER(pad_button_changed); @@ -157,4 +157,4 @@ private: uint16_t m_mode; }; -#endif // MAME_INCLUDES_VSMILE_H
\ No newline at end of file +#endif // MAME_INCLUDES_VSMILE_H diff --git a/src/mame/includes/xavix.h b/src/mame/includes/xavix.h index a2ccd147eac..e080bdf0913 100644 --- a/src/mame/includes/xavix.h +++ b/src/mame/includes/xavix.h @@ -230,7 +230,7 @@ private: virtual uint8_t extbus_r(offs_t offset) { return m_rgn[(offset) & (m_rgnlen - 1)]; } virtual void extbus_w(offs_t offset, uint8_t data) { - logerror("%s: write to external bus %06x %02x\n", machine().describe_context(), offset, data); + logerror("%s: write to external bus %06x %02x\n", machine().describe_context(), offset, data); } @@ -280,7 +280,7 @@ private: DECLARE_WRITE8_MEMBER(mouse_7b01_w); DECLARE_WRITE8_MEMBER(mouse_7b10_w); DECLARE_WRITE8_MEMBER(mouse_7b11_w); - + DECLARE_READ8_MEMBER(adc_7b80_r); DECLARE_WRITE8_MEMBER(adc_7b80_w); DECLARE_READ8_MEMBER(adc_7b81_r); @@ -891,7 +891,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(ekara_multi0_r); DECLARE_CUSTOM_INPUT_MEMBER(ekara_multi1_r); -// void xavix_ekara(machine_config &config); +// void xavix_ekara(machine_config &config); protected: diff --git a/src/mame/machine/hpc1.cpp b/src/mame/machine/hpc1.cpp index bfa81052854..c7c5bb3d619 100644 --- a/src/mame/machine/hpc1.cpp +++ b/src/mame/machine/hpc1.cpp @@ -112,8 +112,8 @@ void hpc1_device::device_reset() void hpc1_device::cdrom_config(device_t *device) { - // cdda_device *cdda = device->subdevice<cdda_device>("cdda"); - // cdda->add_route(ALL_OUTPUTS, "^^mono", 1.0); + // cdda_device *cdda = device->subdevice<cdda_device>("cdda"); + // cdda->add_route(ALL_OUTPUTS, "^^mono", 1.0); } void hpc1_device::indigo_mice(device_slot_interface &device) @@ -174,15 +174,15 @@ void hpc1_device::device_add_mconfig(machine_config &config) rs232b.rxd_handler().set(m_scc[1], FUNC(scc85c30_device::rxb_w)); NSCSI_BUS(config, "scsibus", 0); - NSCSI_CONNECTOR(config, "scsibus:0").option_set("wd33c93", WD33C93) - .machine_config([this](device_t *device) { wd33c93(device); }); - NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk", false); + NSCSI_CONNECTOR(config, "scsibus:0").option_set("wd33c93", WD33C93) + .machine_config([this](device_t *device) { wd33c93(device); }); + NSCSI_CONNECTOR(config, "scsibus:1", scsi_devices, "harddisk", false); NSCSI_CONNECTOR(config, "scsibus:2", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:3", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:4", scsi_devices, "cdrom", false); NSCSI_CONNECTOR(config, "scsibus:5", scsi_devices, nullptr, false); NSCSI_CONNECTOR(config, "scsibus:6", scsi_devices, nullptr, false); - NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, nullptr, false); + NSCSI_CONNECTOR(config, "scsibus:7", scsi_devices, nullptr, false); DP8573(config, m_rtc); @@ -549,17 +549,17 @@ void hpc1_device::decrement_chain() WRITE_LINE_MEMBER(hpc1_device::scsi_drq) { - m_scsi_dma.m_drq = state; + m_scsi_dma.m_drq = state; - if (m_scsi_dma.m_drq && m_scsi_dma.m_active) - { - do_scsi_dma(); - } + if (m_scsi_dma.m_drq && m_scsi_dma.m_active) + { + do_scsi_dma(); + } } void hpc1_device::do_scsi_dma() { - if (m_scsi_dma.m_to_mem) + if (m_scsi_dma.m_to_mem) m_cpu_space->write_byte(m_scsi_dma.m_addr & 0x0fffffff, m_wd33c93->dma_r()); else m_wd33c93->dma_w(m_cpu_space->read_byte(m_scsi_dma.m_addr & 0x0fffffff)); diff --git a/src/mame/machine/hpc1.h b/src/mame/machine/hpc1.h index 2b30210be46..a5e365f06ab 100644 --- a/src/mame/machine/hpc1.h +++ b/src/mame/machine/hpc1.h @@ -54,7 +54,7 @@ protected: void lower_local_irq(int channel, uint8_t source_mask); void update_irq(int channel); - void do_scsi_dma(); + void do_scsi_dma(); void dump_chain(uint32_t base); void fetch_chain(); @@ -102,7 +102,7 @@ protected: uint32_t m_length; uint32_t m_next; bool m_irq; - bool m_drq; + bool m_drq; bool m_to_mem; bool m_active; }; diff --git a/src/mame/machine/hpc3.cpp b/src/mame/machine/hpc3.cpp index c13781165e1..755c709dea8 100644 --- a/src/mame/machine/hpc3.cpp +++ b/src/mame/machine/hpc3.cpp @@ -52,7 +52,7 @@ void hpc3_device::device_start() save_item(NAME(m_scsi_dma[i].m_length), i); save_item(NAME(m_scsi_dma[i].m_next), i); save_item(NAME(m_scsi_dma[i].m_irq), i); - save_item(NAME(m_scsi_dma[i].m_drq), i); + save_item(NAME(m_scsi_dma[i].m_drq), i); save_item(NAME(m_scsi_dma[i].m_big_endian), i); save_item(NAME(m_scsi_dma[i].m_to_device), i); save_item(NAME(m_scsi_dma[i].m_active), i); @@ -272,10 +272,10 @@ WRITE32_MEMBER(hpc3_device::hd_enet_w) m_scsi_dma[0].m_active = (m_scsi_dma[0].m_ctrl & HPC3_DMACTRL_ENABLE); m_scsi_dma[0].m_irq = (m_scsi_dma[0].m_ctrl & HPC3_DMACTRL_IRQ); m_wd33c93->reset_w(BIT(data, 6)); - if (m_scsi_dma[0].m_drq && m_scsi_dma[0].m_active) - { - do_scsi_dma(0); - } + if (m_scsi_dma[0].m_drq && m_scsi_dma[0].m_active) + { + do_scsi_dma(0); + } break; case 0x4000/4: LOGMASKED(LOG_ETHERNET, "%s: HPC3 Ethernet CBP Write: %08x\n", machine().describe_context(), data); @@ -670,20 +670,20 @@ void hpc3_device::decrement_chain(int channel) void hpc3_device::scsi_drq(bool state, int channel) { - scsi_dma_t &dma = m_scsi_dma[channel]; - dma.m_drq = state; + scsi_dma_t &dma = m_scsi_dma[channel]; + dma.m_drq = state; - if (dma.m_drq && dma.m_active) - { - do_scsi_dma(channel); - } + if (dma.m_drq && dma.m_active) + { + do_scsi_dma(channel); + } } void hpc3_device::do_scsi_dma(int channel) { - scsi_dma_t &dma = m_scsi_dma[channel]; + scsi_dma_t &dma = m_scsi_dma[channel]; - if (dma.m_to_device) + if (dma.m_to_device) m_wd33c93->dma_w(m_cpu_space->read_byte(dma.m_big_endian ? BYTE4_XOR_BE(dma.m_addr) : BYTE4_XOR_LE(dma.m_addr))); else m_cpu_space->write_byte(dma.m_big_endian ? BYTE4_XOR_BE(dma.m_addr) : BYTE4_XOR_LE(dma.m_addr), m_wd33c93->dma_r()); @@ -829,7 +829,7 @@ WRITE_LINE_MEMBER(hpc3_device::scsi0_irq) if (state) { //if (m_wd33c93->get_dma_count() && m_scsi_dma[0].m_active) - // scsi_dma(0); + // scsi_dma(0); m_ioc2->raise_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI0); } @@ -844,7 +844,7 @@ WRITE_LINE_MEMBER(hpc3_device::scsi1_irq) if (state) { //if (m_wd33c93_2->get_dma_count() && m_scsi_dma[1].m_active) - // scsi_dma(1); + // scsi_dma(1); m_ioc2->raise_local_irq(0, ioc2_device::INT3_LOCAL0_SCSI1); } diff --git a/src/mame/machine/hpc3.h b/src/mame/machine/hpc3.h index 96d325153c7..a27f2f80f53 100644 --- a/src/mame/machine/hpc3.h +++ b/src/mame/machine/hpc3.h @@ -78,7 +78,7 @@ protected: DECLARE_WRITE32_MEMBER(pio_config_w); void do_pbus_dma(uint32_t channel); - void do_scsi_dma(int channel); + void do_scsi_dma(int channel); void dump_chain(uint32_t base); void fetch_chain(int channel); @@ -154,7 +154,7 @@ protected: uint32_t m_length; uint32_t m_next; bool m_irq; - bool m_drq; + bool m_drq; bool m_big_endian; bool m_to_device; bool m_active; diff --git a/src/mame/machine/mbc55x_kbd.cpp b/src/mame/machine/mbc55x_kbd.cpp index 462a988b6e4..e4393486b86 100644 --- a/src/mame/machine/mbc55x_kbd.cpp +++ b/src/mame/machine/mbc55x_kbd.cpp @@ -129,7 +129,7 @@ static INPUT_PORTS_START(mbc55x_kbd) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('o') PORT_CHAR('O') PORT_CODE(KEYCODE_O) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('l') PORT_CHAR('L') PORT_CODE(KEYCODE_L) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(", ,") PORT_CHAR(',') PORT_CODE(KEYCODE_COMMA) - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_F15) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_F15) PORT_START("Y9") PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -139,7 +139,7 @@ static INPUT_PORTS_START(mbc55x_kbd) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('p') PORT_CHAR('P') PORT_CODE(KEYCODE_P) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(". .") PORT_CHAR('.') PORT_CODE(KEYCODE_STOP) - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_F15) + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_F15) PORT_START("Y10") PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -150,7 +150,7 @@ static INPUT_PORTS_START(mbc55x_kbd) PORT_START("Y11") PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS) + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(']') PORT_CHAR('}') PORT_CODE(KEYCODE_CLOSEBRACE) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('`') PORT_CHAR('~') PORT_CODE(KEYCODE_TILDE) // to right of quote PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('*') PORT_CODE(KEYCODE_RCONTROL) // between slash and right shift diff --git a/src/mame/machine/nl_palestra.cpp b/src/mame/machine/nl_palestra.cpp index 0d601341fd5..4048a599d23 100644 --- a/src/mame/machine/nl_palestra.cpp +++ b/src/mame/machine/nl_palestra.cpp @@ -30,11 +30,11 @@ NETLIST_START(palestra) -// SOLVER(Solver, 10000000) to maintain accuracy when SLOW is set and CAP()s are connected +// SOLVER(Solver, 10000000) to maintain accuracy when SLOW is set and CAP()s are connected SOLVER(Solver, 50000) -// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers +// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers PARAM(Solver.ACCURACY, 1e-5) // ??? -// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE +// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE PARAM(NETLIST.USE_DEACTIVATE, 1) ANALOG_INPUT(V5, 5) @@ -90,7 +90,7 @@ NETLIST_START(palestra) TTL_7450_ANDORINVERT(A2D14_1, a2x7, N0X6, a2x8, N1X6) TTL_7450_ANDORINVERT(A2D14_2, a2x10, N0X6, a2x9, N1X6) TTL_7450_ANDORINVERT(A2D15_1, A2D6_1.Q, N0X6, A2D6_2.Q, N1X6) -// NET_C(A2D17_1.A, a2x21) // XXX typo in schematics? +// NET_C(A2D17_1.A, a2x21) // XXX typo in schematics? TTL_7400_NAND(A2D16_1, A2D13_1.Q, A2D13_1.Q) TTL_7400_NAND(A2D16_2, A2D13_2.Q, A2D13_2.Q) @@ -238,7 +238,7 @@ NETLIST_START(palestra) CAP(A3C5, CAP_P(200)) NET_C(clk, A3C5.1) NET_C(N1X1, A3C5.2) -// NET_C(A3C5.2, A3D21.CLKB) +// NET_C(A3C5.2, A3D21.CLKB) #endif // CLK1, CLK2, R1, R2 [14, 1, 2, 3] @@ -480,7 +480,7 @@ NETLIST_START(palestra) TTL_7400_NAND(A4D27_1, A4D30_3.Q, G_SPEED_AUTO) TTL_7400_NAND(A4D27_3, A4D27_1.Q, G_SPEED_4) TTL_7400_NAND(A4D27_4, A4D29_3.Q, G_SPEED_4) -// TTL_74H53_AND_OR_INVERT(A4D32, tbc, tbc, A4D24_3.Q, A4D27_3.Q, A4D16_1.Q, A4D25_4.Q, A4D16_4.Q, A4D27_4.Q, G_SPEED_1) +// TTL_74H53_AND_OR_INVERT(A4D32, tbc, tbc, A4D24_3.Q, A4D27_3.Q, A4D16_1.Q, A4D25_4.Q, A4D16_4.Q, A4D27_4.Q, G_SPEED_1) // sound @@ -505,7 +505,7 @@ NETLIST_START(palestra) // outputs ALIAS(MOVE_UP, A4D18_1.Q) ALIAS(MOVE_DOWN, A4D18_2.Q) -// ALIAS(P_SPEED_X, A4D32.Q) +// ALIAS(P_SPEED_X, A4D32.Q) ALIAS(P_SPEED_X, low) ALIAS(P_SPEED_Y, A4D29_1.Q) ALIAS(P_I1Y, A4D4_2.Q) diff --git a/src/mame/machine/nl_tp1983.cpp b/src/mame/machine/nl_tp1983.cpp index 1626e727f6b..eb1945b38af 100644 --- a/src/mame/machine/nl_tp1983.cpp +++ b/src/mame/machine/nl_tp1983.cpp @@ -30,9 +30,9 @@ NETLIST_START(tp1983) SOLVER(Solver, 480000) -// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers +// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers PARAM(Solver.ACCURACY, 1e-5) // ??? -// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE +// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE PARAM(NETLIST.USE_DEACTIVATE, 1) ANALOG_INPUT(V5, 5) @@ -60,11 +60,11 @@ NETLIST_START(tp1983) NET_C(R19.2, V5) // CLK, STROBE, ENABLE, UNITY, CLR, Bx [9, 10, 11, 12, 13, ...] - TTL_7497(DD4, clk, low, low, low, DD5.Y, high, vsync, low, vsync, vsync, low) + TTL_7497(DD4, clk, low, low, low, DD5.Y, high, vsync, low, vsync, vsync, low) #if 1 TTL_7497(DD5, DD4.ZQ, DD6_2.QQ, low, DD5.ENOUTQ, DD5.Y, high, DD6_1.QQ, low, low, low, low) #else - TTL_7497(DD5, DD4.Z, low, low, DD5.ENOUT, DD5.Y, high, DD6_1.QQ, low, low, low, low) + TTL_7497(DD5, DD4.Z, low, low, DD5.ENOUT, DD5.Y, high, DD6_1.QQ, low, low, low, low) #endif // CLK, D, CLRQ, PREQ [3, 2, 1, 4] diff --git a/src/mame/machine/nl_tp1985.cpp b/src/mame/machine/nl_tp1985.cpp index 89d9b58f62c..6f84538d26a 100644 --- a/src/mame/machine/nl_tp1985.cpp +++ b/src/mame/machine/nl_tp1985.cpp @@ -37,9 +37,9 @@ NETLIST_START(tp1985) SOLVER(Solver, 48000) -// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers +// PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers PARAM(Solver.ACCURACY, 1e-5) // ??? -// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE +// PARAM(Solver.LTE, 1e-4) // Default is not enough for paddle control if using LTE PARAM(NETLIST.USE_DEACTIVATE, 0) ANALOG_INPUT(V5, 5) @@ -100,7 +100,7 @@ NETLIST_START(tp1985) // CLK, D, CLRQ, PREQ [3, 2, 1, 4] TTL_7474(DD3_1, DD1.QA, DD1.QB, DD1.CARRYQ, DD3_1.QQ) -// TTL_7474(DD3_2, VD1.K, DD2.QD, high, DD3_1.QQ) // per book, produces one pulse, shifted too far. +// TTL_7474(DD3_2, VD1.K, DD2.QD, high, DD3_1.QQ) // per book, produces one pulse, shifted too far. #if _DD4 TTL_7474(DD3_2, DD2.QD, VD1.K, DD4.Y, DD3_1.QQ) // per journal, produces two pulse, shifted correctly. #else @@ -128,16 +128,16 @@ NETLIST_START(tp1985) // CLK, STROBE, ENABLE, UNITY, CLR, Bx // // STRB, ENin are tied to GND - TTL_7497(DD4, DD3_1.QQ, low, low, DD5_3.Q, DD5_4.Q, low, DD4.Y, low, DD5_3.Q, low, low) -// TTL_7497(DD4, DD3_1.QQ, low, low, low, DD5_4.Q, low, DD4.Y, low, DD5_3.Q, low, low) -// TTL_7497(DD4, DD3_1.QQ, low, low, low, DD5_4.Q, low, DD4.Y, low, low, low, low) + TTL_7497(DD4, DD3_1.QQ, low, low, DD5_3.Q, DD5_4.Q, low, DD4.Y, low, DD5_3.Q, low, low) +// TTL_7497(DD4, DD3_1.QQ, low, low, low, DD5_4.Q, low, DD4.Y, low, DD5_3.Q, low, low) +// TTL_7497(DD4, DD3_1.QQ, low, low, low, DD5_4.Q, low, DD4.Y, low, low, low, low) TTL_7400_NAND(DD5_3, R13.2, DD4.Y) -// TTL_7400_NAND(DD5_3, high, DD4.Y) +// TTL_7400_NAND(DD5_3, high, DD4.Y) TTL_7400_NAND(DD5_4, DD4.ENOUTQ, DD4.ENOUTQ) TTL_7493(DD6, DD4.ZQ, DD4.ENOUTQ, DD6.QD, DD6.QB) // CLK1, CLK2, R1, R2 [14, 1, 2, 3] #else - TTL_7497(DD4, DD3_1.QQ, low, low, low, low, low, high, low, low, low, low) -// TTL_7493(DDx, DD3_1.QQ, DD3_1.QQ, low, low) + TTL_7497(DD4, DD3_1.QQ, low, low, low, low, low, high, low, low, low, low) +// TTL_7493(DDx, DD3_1.QQ, DD3_1.QQ, low, low) TTL_7493(DDx, DD3_1.QQ, DD3_1.QQ, DDx.QD, DDx.QB) #endif diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 24d2bed88ee..484395b6981 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -248,8 +248,8 @@ void pce_cd_device::device_add_mconfig(machine_config &config) CDROM(config, m_cdrom).set_interface("pce_cdrom"); MSM5205(config, m_msm, PCE_CD_CLOCK / 6); - m_msm->vck_legacy_callback().set(FUNC(pce_cd_device::msm5205_int)); /* interrupt function */ - m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 1/48 prescaler, 4bit data */ + m_msm->vck_legacy_callback().set(FUNC(pce_cd_device::msm5205_int)); /* interrupt function */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 1/48 prescaler, 4bit data */ m_msm->add_route(ALL_OUTPUTS, "^lspeaker", 0.50); m_msm->add_route(ALL_OUTPUTS, "^rspeaker", 0.50); diff --git a/src/mame/machine/taitocchip.cpp b/src/mame/machine/taitocchip.cpp index d80cf03fb59..06021e23d85 100644 --- a/src/mame/machine/taitocchip.cpp +++ b/src/mame/machine/taitocchip.cpp @@ -89,11 +89,11 @@ C-chip EXTERNAL memory map (it acts as a device mapped to ram; dtack is asserted command and 0x04 set if error; this register is very likely handled by the internal rom in the upd78c11 itself rather than the eprom, and probably tests the sram and the 78c11 internal ram, among other things. * Current guess: 0x401 is actually attached to the high 2 bits of the PF register; bit 0 is pf6 out, bit 1 is pf6 in - (attached to pf6 thru a resistor?), bit 2 is pf7 out, bit 3 is pf7 in (attached to pf7 through a resistor). - The 78c11 (I'm guessing) reads pf6 and pf7 once per int; if pf6-in is set it reruns the startup selftest, - clears pf6-out, then re-sets it. if there is an error, it also sets pf7. + (attached to pf6 thru a resistor?), bit 2 is pf7 out, bit 3 is pf7 in (attached to pf7 through a resistor). + The 78c11 (I'm guessing) reads pf6 and pf7 once per int; if pf6-in is set it reruns the startup selftest, + clears pf6-out, then re-sets it. if there is an error, it also sets pf7. * Alternate guess: pf4 selects between rom and ram but pf5,6,7 are all mapped to 0x401. a memory mapped register in - upd78c11 space selects low vs high half of rom/ram access + upd78c11 space selects low vs high half of rom/ram access 0x402-0x5ff = unknown (may be mirror of 0x400 and 0x401?) no idea if /DTACK is asserted for R or W here 0x600 = ?W ram window bank select, selects one of 8 1k banks to be accessible at 0x000-0x3ff , only low 3 bits are valid on this register. not sure if readable. 0x601-0x7ff = unknown, no idea if /DTACK is asserted for R or W here diff --git a/src/mame/machine/xavix.cpp b/src/mame/machine/xavix.cpp index 011715bd441..39686164054 100644 --- a/src/mame/machine/xavix.cpp +++ b/src/mame/machine/xavix.cpp @@ -467,7 +467,7 @@ TIMER_CALLBACK_MEMBER(xavix_state::interrupt_gen) m_screen->update_partial(m_screen->vpos()); } -// m_interrupt_timer->adjust(attotime::never, 0); +// m_interrupt_timer->adjust(attotime::never, 0); m_interrupt_timer->adjust(m_screen->time_until_pos(m_posirq_y[0], m_posirq_x[0]), 0); // epo_dmon expects it to keep firing without being reloaded? check this doesn't break anything else! } @@ -617,7 +617,7 @@ READ8_MEMBER(xavix_i2c_jmat_state::read_extended_io0) READ8_MEMBER(xavix_i2c_jmat_state::read_extended_io1) { LOG("%s: read_extended_io1\n", machine().describe_context()); - + // reads this by reading the byte, then shifting right 4 times to place value into carry flag return m_i2cmem->read_sda() << 3; //return 0x00; diff --git a/src/mame/machine/xavix2002_io.cpp b/src/mame/machine/xavix2002_io.cpp index e5ecc03b73a..dd91f103682 100644 --- a/src/mame/machine/xavix2002_io.cpp +++ b/src/mame/machine/xavix2002_io.cpp @@ -105,7 +105,7 @@ READ8_MEMBER(xavix2002_io_device::pio_out_r) return ret; } - + READ8_MEMBER(xavix2002_io_device::pio_in_r) { diff --git a/src/mame/machine/xavix2002_io.h b/src/mame/machine/xavix2002_io.h index 9f9ba9339ef..c67adf98ce5 100644 --- a/src/mame/machine/xavix2002_io.h +++ b/src/mame/machine/xavix2002_io.h @@ -23,7 +23,7 @@ public: DECLARE_WRITE8_MEMBER(pio_out_w); DECLARE_READ8_MEMBER(pio_out_r); - + DECLARE_READ8_MEMBER(pio_in_r); protected: diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index 0e09e9254d1..736572a4789 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -158,7 +158,7 @@ void mcpx_isalpc_device::device_add_mconfig(machine_config &config) /* More devices are needed: 82093 compatible I/O APIC - dual 8237 DMA controllers + dual 8237 DMA controllers */ } diff --git a/src/mame/video/arabian.cpp b/src/mame/video/arabian.cpp index 241cc2d8ed0..5e68b8cb240 100644 --- a/src/mame/video/arabian.cpp +++ b/src/mame/video/arabian.cpp @@ -128,12 +128,12 @@ void arabian_state::arabian_palette(palette_device &palette) const /* convert an RGB color - there are effectively 6 bits of color: 2 red, 2 green, 2 blue */ int const r = ( rhi * (int)(((153.0 * 192) / 255) + 0.5)) + - ( rlo * int(((102.0 * 192) / 255) + 0.5)) + - ((rhi | rlo) ? 63 : 0); + ( rlo * int(((102.0 * 192) / 255) + 0.5)) + + ((rhi | rlo) ? 63 : 0); int const g = ( ghi * (int)(((156.0 * 192) / 255) + 0.5)) + - ( glo * int((( 99.0 * 192) / 255) + 0.5)) + - ((ghi | glo) ? 63 : 0); + ( glo * int((( 99.0 * 192) / 255) + 0.5)) + + ((ghi | glo) ? 63 : 0); int const b = (bhi * 192) + (bbase * 63); diff --git a/src/mame/video/funworld.cpp b/src/mame/video/funworld.cpp index cd8b298c8af..60443c921d2 100644 --- a/src/mame/video/funworld.cpp +++ b/src/mame/video/funworld.cpp @@ -110,9 +110,9 @@ WRITE8_MEMBER(funworld_state::funworld_colorram_w) TILE_GET_INFO_MEMBER(funworld_state::get_bg_tile_info) { /* - bits - - 7654 3210 - xxxx ---- tiles color. - ---- xxxx unused. + 7654 3210 + xxxx ---- tiles color. + ---- xxxx unused. */ int offs = tile_index; int attr = m_videoram[offs] + (m_colorram[offs] << 8); diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp index c6230e2f418..1c60324d6a7 100644 --- a/src/mame/video/tia.cpp +++ b/src/mame/video/tia.cpp @@ -126,112 +126,112 @@ void tia_ntsc_video_device::tia_ntsc_palette(palette_device &palette) const ********************************************************************/ /********************************* Phase Shift 24.7 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.239, -0.052 }, - { 0.244, 0.030 }, - { 0.201, 0.108 }, - { 0.125, 0.166 }, - { 0.026, 0.194 }, - { -0.080, 0.185 }, - { -0.169, 0.145 }, - { -0.230, 0.077 }, - { -0.247, -0.006 }, - { -0.220, -0.087 }, - { -0.152, -0.153 }, - { -0.057, -0.189 }, - { 0.049, -0.193 }, - { 0.144, -0.161 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.239, -0.052 }, + { 0.244, 0.030 }, + { 0.201, 0.108 }, + { 0.125, 0.166 }, + { 0.026, 0.194 }, + { -0.080, 0.185 }, + { -0.169, 0.145 }, + { -0.230, 0.077 }, + { -0.247, -0.006 }, + { -0.220, -0.087 }, + { -0.152, -0.153 }, + { -0.057, -0.189 }, + { 0.049, -0.193 }, + { 0.144, -0.161 } Phase Shift 25.2 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.239, -0.052 }, - { 0.244, 0.033 }, - { 0.200, 0.113 }, - { 0.119, 0.169 }, - { 0.013, 0.195 }, - { -0.094, 0.183 }, - { -0.182, 0.136 }, - { -0.237, 0.062 }, - { -0.245, -0.020 }, - { -0.210, -0.103 }, - { -0.131, -0.164 }, - { -0.027, -0.193 }, - { 0.079, -0.187 }, - { 0.169, -0.145 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.239, -0.052 }, + { 0.244, 0.033 }, + { 0.200, 0.113 }, + { 0.119, 0.169 }, + { 0.013, 0.195 }, + { -0.094, 0.183 }, + { -0.182, 0.136 }, + { -0.237, 0.062 }, + { -0.245, -0.020 }, + { -0.210, -0.103 }, + { -0.131, -0.164 }, + { -0.027, -0.193 }, + { 0.079, -0.187 }, + { 0.169, -0.145 } Phase Shift 25.7 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.243, -0.049 }, - { 0.242, 0.038 }, - { 0.196, 0.116 }, - { 0.109, 0.172 }, - { 0.005, 0.196 }, - { -0.104, 0.178 }, - { -0.192, 0.127 }, - { -0.241, 0.051 }, - { -0.244, -0.037 }, - { -0.197, -0.115 }, - { -0.112, -0.173 }, - { -0.004, -0.197 }, - { 0.102, -0.179 }, - { 0.190, -0.128 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.243, -0.049 }, + { 0.242, 0.038 }, + { 0.196, 0.116 }, + { 0.109, 0.172 }, + { 0.005, 0.196 }, + { -0.104, 0.178 }, + { -0.192, 0.127 }, + { -0.241, 0.051 }, + { -0.244, -0.037 }, + { -0.197, -0.115 }, + { -0.112, -0.173 }, + { -0.004, -0.197 }, + { 0.102, -0.179 }, + { 0.190, -0.128 } Phase Shift 26.7 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.242, -0.046 }, - { 0.240, 0.044 }, - { 0.187, 0.125 }, - { 0.092, 0.180 }, - { -0.020, 0.195 }, - { -0.128, 0.170 }, - { -0.210, 0.107 }, - { -0.247, 0.022 }, - { -0.231, -0.067 }, - { -0.166, -0.142 }, - { -0.064, -0.188 }, - { 0.049, -0.193 }, - { 0.154, -0.155 }, - { 0.227, -0.086 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.242, -0.046 }, + { 0.240, 0.044 }, + { 0.187, 0.125 }, + { 0.092, 0.180 }, + { -0.020, 0.195 }, + { -0.128, 0.170 }, + { -0.210, 0.107 }, + { -0.247, 0.022 }, + { -0.231, -0.067 }, + { -0.166, -0.142 }, + { -0.064, -0.188 }, + { 0.049, -0.193 }, + { 0.154, -0.155 }, + { 0.227, -0.086 } Phase Shift 27.2 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.243, -0.044 }, - { 0.239, 0.047 }, - { 0.183, 0.129 }, - { 0.087, 0.181 }, - { -0.029, 0.195 }, - { -0.138, 0.164 }, - { -0.217, 0.098 }, - { -0.246, 0.009 }, - { -0.223, -0.081 }, - { -0.149, -0.153 }, - { -0.041, -0.192 }, - { 0.073, -0.188 }, - { 0.173, -0.142 }, - { 0.235, -0.067 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.243, -0.044 }, + { 0.239, 0.047 }, + { 0.183, 0.129 }, + { 0.087, 0.181 }, + { -0.029, 0.195 }, + { -0.138, 0.164 }, + { -0.217, 0.098 }, + { -0.246, 0.009 }, + { -0.223, -0.081 }, + { -0.149, -0.153 }, + { -0.041, -0.192 }, + { 0.073, -0.188 }, + { 0.173, -0.142 }, + { 0.235, -0.067 } Phase Shift 27.7 - { 0.000, 0.000 }, - { 0.192, -0.127 }, - { 0.243, -0.044 }, - { 0.238, 0.051 }, - { 0.178, 0.134 }, - { 0.078, 0.184 }, - { -0.041, 0.194 }, - { -0.151, 0.158 }, - { -0.224, 0.087 }, - { -0.248, -0.005 }, - { -0.214, -0.096 }, - { -0.131, -0.164 }, - { -0.019, -0.195 }, - { 0.099, -0.182 }, - { 0.194, -0.126 }, - { 0.244, -0.042 } + { 0.000, 0.000 }, + { 0.192, -0.127 }, + { 0.243, -0.044 }, + { 0.238, 0.051 }, + { 0.178, 0.134 }, + { 0.078, 0.184 }, + { -0.041, 0.194 }, + { -0.151, 0.158 }, + { -0.224, 0.087 }, + { -0.248, -0.005 }, + { -0.214, -0.096 }, + { -0.131, -0.164 }, + { -0.019, -0.195 }, + { 0.099, -0.182 }, + { 0.194, -0.126 }, + { 0.244, -0.042 } *********************************/ /********************************* diff --git a/src/mame/video/xavix.cpp b/src/mame/video/xavix.cpp index 2613683e49c..751a9f4f48e 100644 --- a/src/mame/video/xavix.cpp +++ b/src/mame/video/xavix.cpp @@ -802,7 +802,7 @@ uint32_t xavix_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, uint8_t size = m_bmp_base[0x13]; // some kind of additional scaling? uint8_t mode = m_bmp_base[0x14]; // eanble,bpp, zval etc. - uint32_t unused = ((m_bmp_base[0x15] << 16) | (m_bmp_base[0x16] << 8) | (m_bmp_base[0x17] << 0)); + uint32_t unused = ((m_bmp_base[0x15] << 16) | (m_bmp_base[0x16] << 8) | (m_bmp_base[0x17] << 0)); if (mode & 0x01) { |
