diff options
Diffstat (limited to 'src')
78 files changed, 687 insertions, 685 deletions
diff --git a/src/devices/bus/abcbus/db411223.cpp b/src/devices/bus/abcbus/db411223.cpp index 244cde4c0b4..3061627e1ad 100644 --- a/src/devices/bus/abcbus/db411223.cpp +++ b/src/devices/bus/abcbus/db411223.cpp @@ -15,7 +15,7 @@ // MACROS / CONSTANTS //************************************************************************** -#define Z80_TAG "maincpu" +#define Z80_TAG "maincpu" //************************************************************************** diff --git a/src/devices/bus/abcbus/db411223.h b/src/devices/bus/abcbus/db411223.h index 1434db349aa..8baf538c49b 100644 --- a/src/devices/bus/abcbus/db411223.h +++ b/src/devices/bus/abcbus/db411223.h @@ -23,7 +23,7 @@ // ======================> databoard_4112_23_t class databoard_4112_23_t : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 1d4f385eb6d..0c4018925d5 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -76,8 +76,8 @@ Notes: TODO: - - needs mid-instruction wait state support from Z80 core - - inverted A4/5/6/7 chip select + - needs mid-instruction wait state support from Z80 core + - inverted A4/5/6/7 chip select - copy protection device (sends sector header bytes to CPU? DDEN is serial clock? code checks for either $b6 or $f7) 06F8: ld a,$2F ; SEEK diff --git a/src/devices/bus/abcbus/unidisk.cpp b/src/devices/bus/abcbus/unidisk.cpp index 7b95824e935..17e8e82f01a 100644 --- a/src/devices/bus/abcbus/unidisk.cpp +++ b/src/devices/bus/abcbus/unidisk.cpp @@ -15,7 +15,7 @@ // MACROS / CONSTANTS //************************************************************************** -#define TMS9995_TAG "maincpu" +#define TMS9995_TAG "maincpu" //************************************************************************** diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp index 75fa5d2b46a..21952c4fc8e 100644 --- a/src/devices/bus/bbc/tube/tube_80286.cpp +++ b/src/devices/bus/bbc/tube/tube_80286.cpp @@ -152,4 +152,4 @@ WRITE8_MEMBER(bbc_tube_80286_device::irq_latch_w) IRQ_CALLBACK_MEMBER(bbc_tube_80286_device::irq_callback) { return m_irq_latch; -}
\ No newline at end of file +} diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 7887cdba6cc..5408b9c0dc8 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -55,9 +55,9 @@ //#define LOG_OUTPUT_STREAM std::cout #include "logmacro.h" -#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) -#define LOGPIA(...) LOGMASKED(LOG_PIA, __VA_ARGS__) -#define LOGACIA(...) LOGMASKED(LOG_ACIA, __VA_ARGS__) +#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) +#define LOGPIA(...) LOGMASKED(LOG_PIA, __VA_ARGS__) +#define LOGACIA(...) LOGMASKED(LOG_ACIA, __VA_ARGS__) #ifdef _MSC_VER #define FUNCNAME __func__ @@ -69,15 +69,15 @@ CONSTANTS ***************************************************************************/ -#define UART_TAG "acia" -#define SERIAL_TAG "ser2" // Labled "Ser.I/O2 RC 232C" on the back of the case -#define BRG_TAG "brg" -#define SERIAL_BRF "serial_brf" -#define SERIAL_BAUD "serial_baud" -#define PIA_TAG "pia" -#define CARTSLOT_TAG "t4426" -#define CARTBANK_TAG "t4426_banks" -#define CART_AUTOSTART_TAG "cart_autostart" +#define UART_TAG "acia" +#define SERIAL_TAG "ser2" // Labled "Ser.I/O2 RC 232C" on the back of the case +#define BRG_TAG "brg" +#define SERIAL_BRF "serial_brf" +#define SERIAL_BAUD "serial_baud" +#define PIA_TAG "pia" +#define CARTSLOT_TAG "t4426" +#define CARTBANK_TAG "t4426_banks" +#define CART_AUTOSTART_TAG "cart_autostart" //************************************************************************** // TYPE DEFINITIONS @@ -134,7 +134,7 @@ namespace required_device<mc14411_device> m_brg; required_ioport m_serial_baud; - + void set_bank(); }; }; @@ -301,7 +301,7 @@ void coco_t4426_device::device_reset() } /*---------------------------------------------------- - * Serial port clock sources driven by the selected + * Serial port clock sources driven by the selected * output of the MC14411 ----------------------------------------------------*/ void coco_t4426_device::write_acia_clocks(int id, int state) diff --git a/src/devices/bus/gamate/gamate_protection.cpp b/src/devices/bus/gamate/gamate_protection.cpp index d3c257c53fa..4128b554cd1 100644 --- a/src/devices/bus/gamate/gamate_protection.cpp +++ b/src/devices/bus/gamate/gamate_protection.cpp @@ -93,7 +93,7 @@ READ_LINE_MEMBER(gamate_protection_device::prot_r) m_inpos++; logerror("read from protection %01x\n", retval); - + if (m_inpos == 8) { logerror("unlocking ROM\n"); diff --git a/src/devices/bus/gamate/gamate_protection.h b/src/devices/bus/gamate/gamate_protection.h index 006307af344..5ee37ff3e20 100644 --- a/src/devices/bus/gamate/gamate_protection.h +++ b/src/devices/bus/gamate/gamate_protection.h @@ -15,7 +15,7 @@ public: gamate_protection_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); bool is_protection_passed(); - + DECLARE_WRITE_LINE_MEMBER( prot_w ); DECLARE_READ_LINE_MEMBER( prot_r ); @@ -36,4 +36,4 @@ private: }; #endif // MAME_BUS_GAMATE_PROTECTION_H - + diff --git a/src/devices/bus/gamate/slot.cpp b/src/devices/bus/gamate/slot.cpp index a74b4569b6e..40a1c7fdfaa 100644 --- a/src/devices/bus/gamate/slot.cpp +++ b/src/devices/bus/gamate/slot.cpp @@ -182,7 +182,7 @@ int gamate_cart_slot_device::get_cart_type(const uint8_t *ROM, uint32_t len) case 0x8000: type = GAMATE_PLAIN; break; - + case 0x10000: case 0x20000: case 0x40000: diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp index 861f7591840..d94e5ed28cd 100644 --- a/src/devices/bus/vme/vme_hcpu30.cpp +++ b/src/devices/bus/vme/vme_hcpu30.cpp @@ -132,7 +132,7 @@ MACHINE_CONFIG_MEMBER(vme_hcpu30_card_device::device_add_mconfig) MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_txd)) MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_dtr)) MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_rts)) -// MCFG_DUSCC_OUT_INT_CB(DEVWRITELINE() +// MCFG_DUSCC_OUT_INT_CB(DEVWRITELINE() MCFG_RS232_PORT_ADD (RS232P1_TAG, default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, rxa_w)) diff --git a/src/devices/cpu/sh/sh.cpp b/src/devices/cpu/sh/sh.cpp index bdc0977e3fc..ca867883c47 100644 --- a/src/devices/cpu/sh/sh.cpp +++ b/src/devices/cpu/sh/sh.cpp @@ -1972,7 +1972,7 @@ void sh_common_execution::execute_one(const uint16_t opcode) switch(opcode & 0xf000) { case 0x0000: execute_one_0000(opcode); break; - case 0x1000: MOVLS4(Rm, opcode & 0x0f, Rn); break; + case 0x1000: MOVLS4(Rm, opcode & 0x0f, Rn); break; case 0x2000: op0010(opcode); break; case 0x3000: op0011(opcode); break; case 0x4000: execute_one_4000(opcode); break; @@ -2531,10 +2531,10 @@ void sh_common_execution::generate_checksum_block(drcuml_block *block, compiler_ else { uint32_t sum = 0; - void *base; + void *base; if (m_xor == 0) base = m_direct->read_ptr(seqhead->physpc, SH2_CODE_XOR(0)); - else if (m_xor == 1) base = m_direct->read_ptr(seqhead->physpc, SH34LE_CODE_XOR(0)); - else base = m_direct->read_ptr(seqhead->physpc, SH34BE_CODE_XOR(0)); + else if (m_xor == 1) base = m_direct->read_ptr(seqhead->physpc, SH34LE_CODE_XOR(0)); + else base = m_direct->read_ptr(seqhead->physpc, SH34BE_CODE_XOR(0)); UML_LOAD(block, I0, base, 0, SIZE_WORD, SCALE_x4); // load i0,base,word sum += seqhead->opptr.w[0]; diff --git a/src/devices/cpu/sh/sh.h b/src/devices/cpu/sh/sh.h index 96b02afb8c6..87b6ca9d311 100644 --- a/src/devices/cpu/sh/sh.h +++ b/src/devices/cpu/sh/sh.h @@ -30,7 +30,7 @@ ***************************************************************************/ /* speed up delay loops, bail out of tight loops (can cause timer issues) */ -#define BUSY_LOOP_HACKS 0 +#define BUSY_LOOP_HACKS 0 /* compilation boundaries -- how far back/forward does the analysis extend? */ #define COMPILE_BACKWARDS_BYTES 64 @@ -325,7 +325,7 @@ protected: virtual void LDCSR(const uint16_t opcode) = 0; virtual void LDCMSR(const uint16_t opcode) = 0; virtual void TRAPA(uint32_t i) = 0; - virtual void ILLEGAL() = 0; + virtual void ILLEGAL() = 0; drc_cache m_cache; /* pointer to the DRC code cache */ @@ -380,7 +380,7 @@ public: uint8_t checkints; /* need to check interrupts before next instruction */ uml::code_label labelnum; /* index for local labels */ }; - + virtual void sh2_exception(const char *message, int irqline) { fatalerror("sh2_exception in base classs\n"); }; virtual void generate_update_cycles(drcuml_block *block, compiler_state *compiler, uml::parameter param, bool allow_exception) = 0; @@ -459,7 +459,7 @@ private: bool describe_group_6(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode); bool describe_group_8(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode); bool describe_group_12(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode); - + protected: virtual bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode); virtual bool describe_group_4(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode); diff --git a/src/devices/cpu/sh/sh2.cpp b/src/devices/cpu/sh/sh2.cpp index 3bdb504ab0d..9a9b28b306d 100644 --- a/src/devices/cpu/sh/sh2.cpp +++ b/src/devices/cpu/sh/sh2.cpp @@ -456,8 +456,8 @@ void sh2_device::device_start() /* for (int i = 0; i < 16; ++i) { - save_item(NAME(m_irq_queue[i].irq_vector), i); - save_item(NAME(m_irq_queue[i].irq_priority), i); + save_item(NAME(m_irq_queue[i].irq_vector), i); + save_item(NAME(m_irq_queue[i].irq_priority), i); } */ diff --git a/src/devices/cpu/sh/sh2.h b/src/devices/cpu/sh/sh2.h index ce730c7adb8..3ea520b74ea 100644 --- a/src/devices/cpu/sh/sh2.h +++ b/src/devices/cpu/sh/sh2.h @@ -113,13 +113,13 @@ protected: virtual uint32_t disasm_max_opcode_bytes() const override { return 2; } virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; address_space *m_decrypted_program; - + private: address_space_config m_program_config, m_decrypted_program_config; uint32_t m_cpu_off; uint32_t m_test_irq; - + int8_t m_irq_line_state[17]; address_space *m_internal; @@ -168,7 +168,7 @@ private: virtual void LDCSR(const uint16_t opcode) override; virtual void TRAPA(uint32_t i) override; virtual void RTE() override; - virtual void ILLEGAL() override; + virtual void ILLEGAL() override; virtual void execute_one_f000(uint16_t opcode) override; diff --git a/src/devices/cpu/sh/sh2fe.cpp b/src/devices/cpu/sh/sh2fe.cpp index 47532082c03..3019dc02ab7 100644 --- a/src/devices/cpu/sh/sh2fe.cpp +++ b/src/devices/cpu/sh/sh2fe.cpp @@ -28,4 +28,4 @@ sh2_frontend::sh2_frontend(sh_common_execution *device, uint32_t window_start, u bool sh2_frontend::describe_group_15(opcode_desc &desc, const opcode_desc *prev, uint16_t opcode) { return true; -}
\ No newline at end of file +} diff --git a/src/devices/cpu/sh/sh4.cpp b/src/devices/cpu/sh/sh4.cpp index f8f38fe4522..37f989eae56 100644 --- a/src/devices/cpu/sh/sh4.cpp +++ b/src/devices/cpu/sh/sh4.cpp @@ -2539,7 +2539,7 @@ void sh34_base_device::state_string_export(const device_state_entry &entry, std: /* void sh34_base_device::sh4_set_ftcsr_callback(sh4_ftcsr_callback callback) { - m_ftcsr_read_callback = callback; + m_ftcsr_read_callback = callback; } */ @@ -2606,14 +2606,14 @@ void sh34_base_device::generate_update_cycles(drcuml_block *block, compiler_stat /* param is pc + 2 (the opcode after the current one) as we're calling from opcode handlers here that will point to the current opcode instead - but I believe the exception functoin requires it to point to the next one so update the + but I believe the exception functoin requires it to point to the next one so update the local copy of the PC variable here for that? */ - UML_MOV(block, mem(&m_sh2_state->pc), param); + UML_MOV(block, mem(&m_sh2_state->pc), param); - // save_fast_iregs(block); + // save_fast_iregs(block); UML_CALLC(block, cfunc_CHECKIRQ, this); load_fast_iregs(block); - + /* generate a hash jump via the current mode and PC pc should be pointing to either the exception address or have been left on the next PC set above? */ @@ -2656,7 +2656,7 @@ void sh34_base_device::static_generate_entry_point() UML_CALLC(block, cfunc_CHECKIRQ, this); load_fast_iregs(block); - + /* generate a hash jump via the current mode and PC */ UML_HASHJMP(block, 0, mem(&m_sh2_state->pc), *m_nocode); // hashjmp <mode>,<pc>,nocode @@ -2704,7 +2704,7 @@ void sh34_base_device::static_generate_memory_accessor(int size, int iswrite, co #endif UML_CMP(block, I0, 0xe0000000); - UML_JMPc(block, COND_AE, label); + UML_JMPc(block, COND_AE, label); UML_AND(block, I0, I0, SH34_AM); // and r0, r0, #AM (0x1fffffff) @@ -2741,7 +2741,7 @@ void sh34_base_device::static_generate_memory_accessor(int size, int iswrite, co } else if (size == 4) { - + UML_XOR(block, I0, I0, m_bigendian ? DWORD_XOR_BE(0) : DWORD_XOR_LE(0)); UML_LOAD(block, I0, fastbase, I0, SIZE_DWORD, SCALE_x1); // load i0,fastbase,i0,dword_x1 } @@ -2887,7 +2887,7 @@ static void cfunc_STCRBANK(void *param) { ((sh34_base_device *)param)->func_STCR bool sh34_base_device::generate_group_0_STCRBANK(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCRBANK, this); load_fast_iregs(block); @@ -2899,7 +2899,7 @@ static void cfunc_STCSSR(void *param) { ((sh34_base_device *)param)->func_STCSSR bool sh34_base_device::generate_group_0_STCSSR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCSSR, this); load_fast_iregs(block); @@ -2911,7 +2911,7 @@ static void cfunc_STCSPC(void *param) { ((sh34_base_device *)param)->func_STCSPC bool sh34_base_device::generate_group_0_STCSPC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCSPC, this); load_fast_iregs(block); @@ -2923,7 +2923,7 @@ static void cfunc_PREFM(void *param) { ((sh34_base_device *)param)->func_PREFM() bool sh34_base_device::generate_group_0_PREFM(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_PREFM, this); load_fast_iregs(block); @@ -2935,7 +2935,7 @@ static void cfunc_MOVCAL(void *param) { ((sh34_base_device *)param)->func_MOVCAL bool sh34_base_device::generate_group_0_MOVCAL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_MOVCAL, this); load_fast_iregs(block); @@ -2947,7 +2947,7 @@ static void cfunc_LDTLB(void *param) { ((sh34_base_device *)param)->func_LDTLB() bool sh34_base_device::generate_group_0_LDTLB(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDTLB, this); load_fast_iregs(block); @@ -2959,7 +2959,7 @@ static void cfunc_CLRS(void *param) { ((sh34_base_device *)param)->func_CLRS(); bool sh34_base_device::generate_group_0_CLRS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_CLRS, this); load_fast_iregs(block); @@ -2971,7 +2971,7 @@ static void cfunc_SETS(void *param) { ((sh34_base_device *)param)->func_SETS(); bool sh34_base_device::generate_group_0_SETS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_SETS, this); load_fast_iregs(block); @@ -2983,7 +2983,7 @@ static void cfunc_STCSGR(void *param) { ((sh34_base_device *)param)->func_STCSGR bool sh34_base_device::generate_group_0_STCSGR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCSGR, this); load_fast_iregs(block); @@ -2996,7 +2996,7 @@ static void cfunc_STSFPUL(void *param) { ((sh34_base_device *)param)->func_STSFP bool sh34_base_device::generate_group_0_STSFPUL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STSFPUL, this); load_fast_iregs(block); @@ -3008,7 +3008,7 @@ static void cfunc_STSFPSCR(void *param) { ((sh34_base_device *)param)->func_STSF bool sh34_base_device::generate_group_0_STSFPSCR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STSFPSCR, this); load_fast_iregs(block); @@ -3020,7 +3020,7 @@ static void cfunc_STCDBR(void *param) { ((sh34_base_device *)param)->func_STCDBR bool sh34_base_device::generate_group_0_STCDBR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCDBR, this); load_fast_iregs(block); @@ -3033,7 +3033,7 @@ static void cfunc_RTE(void *param) { ((sh34_base_device *)param)->func_RTE(); }; bool sh34_base_device::generate_group_0_RTE(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { generate_delay_slot(block, compiler, desc, 0xffffffff); - save_fast_iregs(block); + save_fast_iregs(block); UML_CALLC(block, cfunc_RTE, this); load_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->pc), mem(&m_sh2_state->m_delay)); @@ -3047,12 +3047,12 @@ static void cfunc_TRAPA(void *param) { ((sh34_base_device *)param)->func_TRAPA() bool sh34_base_device::generate_group_12_TRAPA(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_MOV(block, mem(&m_sh2_state->pc), desc->pc + 2); // copy the PC because we need to use it - UML_CALLC(block, cfunc_TRAPA, this); + UML_CALLC(block, cfunc_TRAPA, this); load_fast_iregs(block); - UML_HASHJMP(block, 0, mem(&m_sh2_state->pc), *m_nocode); + UML_HASHJMP(block, 0, mem(&m_sh2_state->pc), *m_nocode); return true; } @@ -3233,7 +3233,7 @@ static void cfunc_LDCRBANK(void *param) { ((sh34_base_device *)param)->func_LDCR bool sh34_base_device::generate_group_4_LDCRBANK(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCRBANK, this); load_fast_iregs(block); @@ -3245,7 +3245,7 @@ static void cfunc_STCMRBANK(void *param) { ((sh34_base_device *)param)->func_STC bool sh34_base_device::generate_group_4_STCMRBANK(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCMRBANK, this); load_fast_iregs(block); @@ -3257,7 +3257,7 @@ static void cfunc_LDCMRBANK(void *param) { ((sh34_base_device *)param)->func_LDC bool sh34_base_device::generate_group_4_LDCMRBANK(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCMRBANK, this); load_fast_iregs(block); @@ -3269,7 +3269,7 @@ static void cfunc_STCMSGR(void *param) { ((sh34_base_device *)param)->func_STCMS bool sh34_base_device::generate_group_4_STCMSGR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCMSGR, this); load_fast_iregs(block); @@ -3281,7 +3281,7 @@ static void cfunc_STCMSSR(void *param) { ((sh34_base_device *)param)->func_STCMS bool sh34_base_device::generate_group_4_STCMSSR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCMSSR, this); load_fast_iregs(block); @@ -3293,7 +3293,7 @@ static void cfunc_LDCMSSR(void *param) { ((sh34_base_device *)param)->func_LDCMS bool sh34_base_device::generate_group_4_LDCMSSR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCMSSR, this); load_fast_iregs(block); @@ -3305,7 +3305,7 @@ static void cfunc_LDCSSR(void *param) { ((sh34_base_device *)param)->func_LDCSSR bool sh34_base_device::generate_group_4_LDCSSR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCSSR, this); load_fast_iregs(block); @@ -3317,7 +3317,7 @@ static void cfunc_STCMSPC(void *param) { ((sh34_base_device *)param)->func_STCMS bool sh34_base_device::generate_group_4_STCMSPC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCMSPC, this); load_fast_iregs(block); @@ -3329,7 +3329,7 @@ static void cfunc_LDCMSPC(void *param) { ((sh34_base_device *)param)->func_LDCMS bool sh34_base_device::generate_group_4_LDCMSPC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCMSPC, this); load_fast_iregs(block); @@ -3341,7 +3341,7 @@ static void cfunc_LDCSPC(void *param) { ((sh34_base_device *)param)->func_LDCSPC bool sh34_base_device::generate_group_4_LDCSPC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCSPC, this); load_fast_iregs(block); @@ -3353,7 +3353,7 @@ static void cfunc_STSMFPUL(void *param) { ((sh34_base_device *)param)->func_STSM bool sh34_base_device::generate_group_4_STSMFPUL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STSMFPUL, this); load_fast_iregs(block); @@ -3365,7 +3365,7 @@ static void cfunc_LDSMFPUL(void *param) { ((sh34_base_device *)param)->func_LDSM bool sh34_base_device::generate_group_4_LDSMFPUL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDSMFPUL, this); load_fast_iregs(block); @@ -3377,7 +3377,7 @@ static void cfunc_LDSFPUL(void *param) { ((sh34_base_device *)param)->func_LDSFP bool sh34_base_device::generate_group_4_LDSFPUL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDSFPUL, this); load_fast_iregs(block); @@ -3389,7 +3389,7 @@ static void cfunc_STSMFPSCR(void *param) { ((sh34_base_device *)param)->func_STS bool sh34_base_device::generate_group_4_STSMFPSCR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STSMFPSCR, this); load_fast_iregs(block); @@ -3402,7 +3402,7 @@ static void cfunc_LDSMFPSCR(void *param) { ((sh34_base_device *)param)->func_LDS bool sh34_base_device::generate_group_4_LDSMFPSCR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDSMFPSCR, this); load_fast_iregs(block); @@ -3415,7 +3415,7 @@ static void cfunc_LDSFPSCR(void *param) { ((sh34_base_device *)param)->func_LDSF bool sh34_base_device::generate_group_4_LDSFPSCR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDSFPSCR, this); load_fast_iregs(block); @@ -3427,7 +3427,7 @@ static void cfunc_STCMDBR(void *param) { ((sh34_base_device *)param)->func_STCMD bool sh34_base_device::generate_group_4_STCMDBR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_STCMDBR, this); load_fast_iregs(block); @@ -3439,7 +3439,7 @@ static void cfunc_LDCMDBR(void *param) { ((sh34_base_device *)param)->func_LDCMD bool sh34_base_device::generate_group_4_LDCMDBR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCMDBR, this); load_fast_iregs(block); @@ -3451,7 +3451,7 @@ static void cfunc_LDCDBR(void *param) { ((sh34_base_device *)param)->func_LDCDBR bool sh34_base_device::generate_group_4_LDCDBR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_LDCDBR, this); load_fast_iregs(block); @@ -3479,7 +3479,7 @@ bool sh34_base_device::generate_group_15(drcuml_block *block, compiler_state *co case 0x0e: return generate_group_15_FMAC(block, compiler, desc, opcode, in_delay_slot, ovrpc); case 0x0f: return true; - //if (opcode == 0xffff) return true; // atomiswave uses ffff as NOP? + //if (opcode == 0xffff) return true; // atomiswave uses ffff as NOP? //return false; // dbreak(opcode); break; } return false; @@ -3490,7 +3490,7 @@ static void cfunc_FADD(void *param) { ((sh34_base_device *)param)->func_FADD(); bool sh34_base_device::generate_group_15_FADD(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FADD, this); load_fast_iregs(block); @@ -3502,7 +3502,7 @@ static void cfunc_FSUB(void *param) { ((sh34_base_device *)param)->func_FSUB(); bool sh34_base_device::generate_group_15_FSUB(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSUB, this); load_fast_iregs(block); @@ -3514,7 +3514,7 @@ static void cfunc_FMUL(void *param) { ((sh34_base_device *)param)->func_FMUL(); bool sh34_base_device::generate_group_15_FMUL(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMUL, this); load_fast_iregs(block); @@ -3526,7 +3526,7 @@ static void cfunc_FDIV(void *param) { ((sh34_base_device *)param)->func_FDIV(); bool sh34_base_device::generate_group_15_FDIV(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FDIV, this); load_fast_iregs(block); @@ -3538,7 +3538,7 @@ static void cfunc_FCMP_EQ(void *param) { ((sh34_base_device *)param)->func_FCMP_ bool sh34_base_device::generate_group_15_FCMP_EQ(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FCMP_EQ, this); load_fast_iregs(block); @@ -3550,7 +3550,7 @@ static void cfunc_FCMP_GT(void *param) { ((sh34_base_device *)param)->func_FCMP_ bool sh34_base_device::generate_group_15_FCMP_GT(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FCMP_GT, this); load_fast_iregs(block); @@ -3562,7 +3562,7 @@ static void cfunc_FMOVS0FR(void *param) { ((sh34_base_device *)param)->func_FMOV bool sh34_base_device::generate_group_15_FMOVS0FR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVS0FR, this); load_fast_iregs(block); @@ -3574,7 +3574,7 @@ static void cfunc_FMOVFRS0(void *param) { ((sh34_base_device *)param)->func_FMOV bool sh34_base_device::generate_group_15_FMOVFRS0(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVFRS0, this); load_fast_iregs(block); @@ -3586,7 +3586,7 @@ static void cfunc_FMOVMRFR(void *param) { ((sh34_base_device *)param)->func_FMOV bool sh34_base_device::generate_group_15_FMOVMRFR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVMRFR, this); load_fast_iregs(block); @@ -3598,7 +3598,7 @@ static void cfunc_FMOVMRIFR(void *param) { ((sh34_base_device *)param)->func_FMO bool sh34_base_device::generate_group_15_FMOVMRIFR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVMRIFR, this); load_fast_iregs(block); @@ -3610,7 +3610,7 @@ static void cfunc_FMOVFRMR(void *param) { ((sh34_base_device *)param)->func_FMOV bool sh34_base_device::generate_group_15_FMOVFRMR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVFRMR, this); load_fast_iregs(block); @@ -3622,7 +3622,7 @@ static void cfunc_FMOVFRMDR(void *param) { ((sh34_base_device *)param)->func_FMO bool sh34_base_device::generate_group_15_FMOVFRMDR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVFRMDR, this); load_fast_iregs(block); @@ -3634,7 +3634,7 @@ static void cfunc_FMOVFR(void *param) { ((sh34_base_device *)param)->func_FMOVFR bool sh34_base_device::generate_group_15_FMOVFR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMOVFR, this); load_fast_iregs(block); @@ -3646,7 +3646,7 @@ static void cfunc_FMAC(void *param) { ((sh34_base_device *)param)->func_FMAC(); bool sh34_base_device::generate_group_15_FMAC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FMAC, this); load_fast_iregs(block); @@ -3682,7 +3682,7 @@ static void cfunc_FSTS(void *param) { ((sh34_base_device *)param)->func_FSTS(); bool sh34_base_device::generate_group_15_op1111_0x13_FSTS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSTS, this); load_fast_iregs(block); @@ -3694,7 +3694,7 @@ static void cfunc_FLDS(void *param) { ((sh34_base_device *)param)->func_FLDS(); bool sh34_base_device::generate_group_15_op1111_0x13_FLDS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FLDS, this); load_fast_iregs(block); @@ -3706,7 +3706,7 @@ static void cfunc_FLOAT(void *param) { ((sh34_base_device *)param)->func_FLOAT() bool sh34_base_device::generate_group_15_op1111_0x13_FLOAT(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FLOAT, this); load_fast_iregs(block); @@ -3718,7 +3718,7 @@ static void cfunc_FTRC(void *param) { ((sh34_base_device *)param)->func_FTRC(); bool sh34_base_device::generate_group_15_op1111_0x13_FTRC(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FTRC, this); load_fast_iregs(block); @@ -3730,7 +3730,7 @@ static void cfunc_FNEG(void *param) { ((sh34_base_device *)param)->func_FNEG(); bool sh34_base_device::generate_group_15_op1111_0x13_FNEG(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FNEG, this); load_fast_iregs(block); @@ -3742,7 +3742,7 @@ static void cfunc_FABS(void *param) { ((sh34_base_device *)param)->func_FABS(); bool sh34_base_device::generate_group_15_op1111_0x13_FABS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FABS, this); load_fast_iregs(block); @@ -3754,7 +3754,7 @@ static void cfunc_FSQRT(void *param) { ((sh34_base_device *)param)->func_FSQRT() bool sh34_base_device::generate_group_15_op1111_0x13_FSQRT(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSQRT, this); load_fast_iregs(block); @@ -3766,7 +3766,7 @@ static void cfunc_FSRRA(void *param) { ((sh34_base_device *)param)->func_FSRRA() bool sh34_base_device::generate_group_15_op1111_0x13_FSRRA(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSRRA, this); load_fast_iregs(block); @@ -3778,7 +3778,7 @@ static void cfunc_FLDI0(void *param) { ((sh34_base_device *)param)->func_FLDI0() bool sh34_base_device::generate_group_15_op1111_0x13_FLDI0(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FLDI0, this); load_fast_iregs(block); @@ -3790,7 +3790,7 @@ static void cfunc_FLDI1(void *param) { ((sh34_base_device *)param)->func_FLDI1() bool sh34_base_device::generate_group_15_op1111_0x13_FLDI1(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FLDI1, this); load_fast_iregs(block); @@ -3802,7 +3802,7 @@ static void cfunc_FCNVSD(void *param) { ((sh34_base_device *)param)->func_FCNVSD bool sh34_base_device::generate_group_15_op1111_0x13_FCNVSD(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FCNVSD, this); load_fast_iregs(block); @@ -3814,7 +3814,7 @@ static void cfunc_FCNVDS(void *param) { ((sh34_base_device *)param)->func_FCNVDS bool sh34_base_device::generate_group_15_op1111_0x13_FCNVDS(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FCNVDS, this); load_fast_iregs(block); @@ -3826,7 +3826,7 @@ static void cfunc_FIPR(void *param) { ((sh34_base_device *)param)->func_FIPR(); bool sh34_base_device::generate_group_15_op1111_0x13_FIPR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FIPR, this); load_fast_iregs(block); @@ -3865,7 +3865,7 @@ static void cfunc_FSCHG(void *param) { ((sh34_base_device *)param)->func_FSCHG() bool sh34_base_device::generate_group_15_op1111_0x13_op1111_0xf13_FSCHG(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); //UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSCHG, this); load_fast_iregs(block); @@ -3877,7 +3877,7 @@ static void cfunc_FRCHG(void *param) { ((sh34_base_device *)param)->func_FRCHG() bool sh34_base_device::generate_group_15_op1111_0x13_op1111_0xf13_FRCHG(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); //UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FRCHG, this); load_fast_iregs(block); @@ -3889,7 +3889,7 @@ static void cfunc_FTRV(void *param) { ((sh34_base_device *)param)->func_FTRV(); bool sh34_base_device::generate_group_15_op1111_0x13_op1111_0xf13_FTRV(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FTRV, this); load_fast_iregs(block); @@ -3901,7 +3901,7 @@ static void cfunc_FSSCA(void *param) { ((sh34_base_device *)param)->func_FSSCA() bool sh34_base_device::generate_group_15_op1111_0x13_op1111_0xf13_FSSCA(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) { - save_fast_iregs(block); + save_fast_iregs(block); UML_MOV(block, mem(&m_sh2_state->arg0), desc->opptr.w[0]); UML_CALLC(block, cfunc_FSSCA, this); load_fast_iregs(block); diff --git a/src/devices/cpu/sh/sh4.h b/src/devices/cpu/sh/sh4.h index d3f11e460c4..22a52c0c0f3 100644 --- a/src/devices/cpu/sh/sh4.h +++ b/src/devices/cpu/sh/sh4.h @@ -452,7 +452,7 @@ protected: inline void sh4_check_pending_irq(const char *message) // look for highest priority active exception and handle it { int a,irq,z; - + m_willjump = 0; // for the DRC irq = 0; @@ -569,7 +569,7 @@ protected: virtual void LDCMSR(const uint16_t opcode) override; virtual void RTE() override; virtual void TRAPA(uint32_t i) override; - virtual void ILLEGAL() override; + virtual void ILLEGAL() override; // regular handelrs for sh3/4 specific opcodes virtual void LDTLB(const uint16_t opcode); @@ -642,7 +642,7 @@ protected: void dbreak(const uint16_t opcode); void op1111_0x13(uint16_t opcode); - // group dispatchers to allow for new opcodes + // group dispatchers to allow for new opcodes virtual void execute_one_0000(uint16_t opcode) override; virtual void execute_one_4000(uint16_t opcode) override; virtual void execute_one_f000(uint16_t opcode) override; @@ -729,7 +729,7 @@ protected: virtual bool generate_group_4_LDCMSR(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) override; virtual bool generate_group_12_TRAPA(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) override; - // group generators to allow for new opcodes + // group generators to allow for new opcodes virtual bool generate_group_0(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) override; virtual bool generate_group_4(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) override; virtual bool generate_group_15(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, uint16_t opcode, int in_delay_slot, uint32_t ovrpc) override; diff --git a/src/devices/cpu/sh/sh4fe.cpp b/src/devices/cpu/sh/sh4fe.cpp index 9c8f7b77248..ca122cd4eb4 100644 --- a/src/devices/cpu/sh/sh4fe.cpp +++ b/src/devices/cpu/sh/sh4fe.cpp @@ -36,7 +36,7 @@ uint16_t sh4be_frontend::read_word(opcode_desc &desc) if (desc.physpc >= 0xe0000000) return m_sh->m_direct->read_word(desc.physpc, SH34BE_CODE_XOR(0)); - return m_sh->m_direct->read_word(desc.physpc & SH34_AM, SH34BE_CODE_XOR(0)); + return m_sh->m_direct->read_word(desc.physpc & SH34_AM, SH34BE_CODE_XOR(0)); } @@ -259,7 +259,7 @@ bool sh4_frontend::describe_group_15(opcode_desc &desc, const opcode_desc *prev, case 0x0e: return true; // FMAC(opcode); break; case 0x0f: return true; - //if (opcode == 0xffff) return true; // atomiswave uses ffff as NOP? + //if (opcode == 0xffff) return true; // atomiswave uses ffff as NOP? //return false; // dbreak(opcode); break; } return false; diff --git a/src/devices/cpu/sh/sh_dasm.cpp b/src/devices/cpu/sh/sh_dasm.cpp index aa27aa7128b..b52c6969f65 100644 --- a/src/devices/cpu/sh/sh_dasm.cpp +++ b/src/devices/cpu/sh/sh_dasm.cpp @@ -10,8 +10,8 @@ static const char *const regname[16] = { "R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "R8", "R9", "R10","R11","R12","R13","R14", - // The old SH2 dasm used 'SP' here, the old SH4 used 'R15' - //"SP" + // The old SH2 dasm used 'SP' here, the old SH4 used 'R15' + //"SP" "R15" }; diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index db577ba594a..549dc4b7cbd 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -787,7 +787,7 @@ attotime floppy_image_device::get_next_transition(const attotime &from_when) // access (mz) // MORE TODO: this breaks the tandy2k and pcjr. needs investigation. //if (ready_counter > 0) - // return attotime::never; + // return attotime::never; std::vector<uint32_t> &buf = image->get_buffer(cyl, ss, subcyl); uint32_t cells = buf.size(); diff --git a/src/devices/machine/mc14411.cpp b/src/devices/machine/mc14411.cpp index 6494a12630f..d8ce720a0f3 100644 --- a/src/devices/machine/mc14411.cpp +++ b/src/devices/machine/mc14411.cpp @@ -56,7 +56,7 @@ ***************************************************************************/ const int mc14411_device::s_counter_divider[16] = { - ////////// X64 /////// X16 /////// X8 //////// X1 //////// + ////////// X64 /////// X16 /////// X8 //////// X1 //////// 3, // F1: 614.4 kHz 153.6 kHz 76800 Hz 9600 Hz 4, // F2: 460.8 kHz 115.2 kHz 57600 Hz 7200 Hz 6, // F3: 307.2 kHz 76800 Hz 36400 Hz 4800 Hz diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp index cd2919bc266..0336ac3d5f4 100644 --- a/src/devices/machine/sega_scu.cpp +++ b/src/devices/machine/sega_scu.cpp @@ -2,16 +2,16 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Sega System Control Unit (c) 1995 Sega - - TODO: - - make a screen_device subclass, add pixel timers & irq callbacks to it; - - A-Bus external interrupts; - - Pad signal (lightgun I presume); - - Improve DMA, use DRQ model and timers, make them subdevices? - (old DMA TODO) - - Remove CD transfer DMA hack (tied with CD block bug(s)?) - - Add timings(but how fast are each DMA?). + Sega System Control Unit (c) 1995 Sega + + TODO: + - make a screen_device subclass, add pixel timers & irq callbacks to it; + - A-Bus external interrupts; + - Pad signal (lightgun I presume); + - Improve DMA, use DRQ model and timers, make them subdevices? + (old DMA TODO) + - Remove CD transfer DMA hack (tied with CD block bug(s)?) + - Add timings(but how fast are each DMA?). - Add level priority & DMA status register. ***************************************************************************/ @@ -109,7 +109,7 @@ DEFINE_DEVICE_TYPE(SEGA_SCU, sega_scu_device, "sega_scu", "Sega System Control U // LIVE DEVICE //************************************************************************** -//AM_RANGE(0x0000, 0x0003) src +//AM_RANGE(0x0000, 0x0003) src //AM_RANGE(0x0004, 0x0007) dst //AM_RANGE(0x0008, 0x000b) size //AM_RANGE(0x000c, 0x000f) src/dst add values @@ -120,9 +120,9 @@ DEVICE_ADDRESS_MAP_START( regs_map, 32, sega_scu_device ) AM_RANGE(0x0000, 0x0017) AM_READWRITE(dma_lv0_r,dma_lv0_w) AM_RANGE(0x0020, 0x0037) AM_READWRITE(dma_lv1_r,dma_lv1_w) AM_RANGE(0x0040, 0x0057) AM_READWRITE(dma_lv2_r,dma_lv2_w) - // Super Major League and Shin Megami Tensei - Akuma Zensho reads from there (undocumented), DMA status mirror? - AM_RANGE(0x005c, 0x005f) AM_READ(dma_status_r) -// AM_RANGE(0x0060, 0x0063) AM_WRITE(dma_force_stop_w) + // Super Major League and Shin Megami Tensei - Akuma Zensho reads from there (undocumented), DMA status mirror? + AM_RANGE(0x005c, 0x005f) AM_READ(dma_status_r) +// AM_RANGE(0x0060, 0x0063) AM_WRITE(dma_force_stop_w) AM_RANGE(0x007c, 0x007f) AM_READ(dma_status_r) AM_RANGE(0x0080, 0x0083) AM_DEVREADWRITE("scudsp",scudsp_cpu_device, program_control_r,program_control_w) AM_RANGE(0x0084, 0x0087) AM_DEVWRITE("scudsp", scudsp_cpu_device, program_w) @@ -133,10 +133,10 @@ DEVICE_ADDRESS_MAP_START( regs_map, 32, sega_scu_device ) AM_RANGE(0x0098, 0x009b) AM_WRITE16(t1_mode_w,0x0000ffff) AM_RANGE(0x00a0, 0x00a3) AM_READWRITE(irq_mask_r,irq_mask_w) AM_RANGE(0x00a4, 0x00a7) AM_READWRITE(irq_status_r,irq_status_w) -// AM_RANGE(0x00a8, 0x00ab) AM_WRITE(abus_irqack_w) -// AM_RANGE(0x00b0, 0x00b7) AM_READWRITE(abus_set_r,abus_set_w) -// AM_RANGE(0x00b8, 0x00bb) AM_READWRITE(abus_refresh_r,abus_refresh_w) -// AM_RANGE(0x00c4, 0x00c7) AM_READWRITE(sdram_r,sdram_w) +// AM_RANGE(0x00a8, 0x00ab) AM_WRITE(abus_irqack_w) +// AM_RANGE(0x00b0, 0x00b7) AM_READWRITE(abus_set_r,abus_set_w) +// AM_RANGE(0x00b8, 0x00bb) AM_READWRITE(abus_refresh_r,abus_refresh_w) +// AM_RANGE(0x00c4, 0x00c7) AM_READWRITE(sdram_r,sdram_w) AM_RANGE(0x00c8, 0x00cb) AM_READ(version_r) // returns 4 for stock Saturn ADDRESS_MAP_END @@ -146,7 +146,7 @@ ADDRESS_MAP_END sega_scu_device::sega_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SEGA_SCU, tag, owner, clock), - m_scudsp(*this, "scudsp") + m_scudsp(*this, "scudsp") { } @@ -212,7 +212,7 @@ void sega_scu_device::device_start() save_item(NAME(m_t0c)); save_item(NAME(m_t1s)); save_item(NAME(m_t1md)); - + save_item(NAME(m_dma[0].src)); save_item(NAME(m_dma[0].dst)); save_item(NAME(m_dma[0].src_add)); @@ -246,13 +246,13 @@ void sega_scu_device::device_start() save_item(NAME(m_dma[2].indirect_mode)); save_item(NAME(m_dma[2].rup)); save_item(NAME(m_dma[2].wup)); - + m_hostcpu = machine().device<sh2_device>(m_hostcpu_tag); m_hostspace = &m_hostcpu->space(AS_PROGRAM); m_dma_timer[0] = timer_alloc(DMALV0_ID); m_dma_timer[1] = timer_alloc(DMALV1_ID); - m_dma_timer[2] = timer_alloc(DMALV2_ID); + m_dma_timer[2] = timer_alloc(DMALV2_ID); } @@ -264,7 +264,7 @@ void sega_scu_device::device_reset() { m_ism = 0xbfff; m_ist = 0; - + for(int i=0;i<3;i++) { m_dma[i].start_factor = 7; @@ -287,7 +287,7 @@ void sega_scu_device::device_reset_after_children() void sega_scu_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - + switch(id) { case DMALV0_ID: @@ -297,7 +297,7 @@ void sega_scu_device::device_timer(emu_timer &timer, device_timer_id id, int par const int irqlevel = id == 0 ? 5 : 6; const int irqvector = 0x4b - id; const uint16_t irqmask = 1 << (11-id); - + if(!(m_ism & irqmask)) m_hostcpu->set_input_line_and_vector(irqlevel, HOLD_LINE, irqvector); else @@ -337,7 +337,7 @@ uint32_t sega_scu_device::dma_common_r(uint8_t offset,uint8_t level) case 0x14/4: return 0; // DxMOD / DxRUP / DxWUP / DxFT, write only } - + // can't happen anyway return 0; } @@ -362,7 +362,7 @@ void sega_scu_device::dma_common_w(uint8_t offset,uint8_t level,uint32_t data) break; case 0x10/4: // DxEN / DxGO m_dma[level].enable_mask = BIT(data,8); - + // check if DxGO is enabled for start factor = 7 if(m_dma[level].enable_mask == true && data & 1 && m_dma[level].start_factor == 7) { @@ -383,7 +383,7 @@ void sega_scu_device::dma_common_w(uint8_t offset,uint8_t level,uint32_t data) if(m_dma[level].wup == false) m_dma[level].index = m_dma[level].dst; } - + break; } } @@ -409,7 +409,7 @@ void sega_scu_device::handle_dma_direct(uint8_t level) if(LOG_SCU) printf("Start Add %04x Destination Add %04x\n",m_scu.src_add[dma_ch],m_scu.dst_add[dma_ch]); } #endif - + // Game Basic, World Cup 98 and Batman Forever trips this, according to the docs the SCU can't transfer from BIOS area (can't communicate from/to that bus) if((m_dma[level].src & 0x07f00000) == 0) { @@ -422,7 +422,7 @@ void sega_scu_device::handle_dma_direct(uint8_t level) } update_dma_status(level,true); - + /* max size */ if(m_dma[level].size == 0) { m_dma[level].size = (level == 0) ? 0x00100000 : 0x1000; } @@ -514,7 +514,7 @@ void sega_scu_device::handle_dma_indirect(uint8_t level) if(LOG_SCU) printf("Start Add %04x Destination Add %04x\n",m_scu.src_add[dma_ch],m_scu.dst_add[dma_ch]); } #endif - + indirect_src &=0x07ffffff; indirect_dst &=0x07ffffff; indirect_size &= ((level == 0) ? 0xfffff : 0x3ffff); //TODO: Guardian Heroes sets up a 0x23000 transfer for the FMV? @@ -581,7 +581,7 @@ inline void sega_scu_device::dma_start_factor_ack(uint8_t event) if(m_dma[i].enable_mask == true && m_dma[i].start_factor == event) { if(m_dma[i].indirect_mode == true) { handle_dma_indirect(i); } - else { handle_dma_direct(i); } + else { handle_dma_direct(i); } } } } @@ -627,9 +627,9 @@ void sega_scu_device::check_scanline_timers(int scanline,int y_step) { if(m_tenb == false) return; - + int timer0_compare = (m_t0c & 0x3ff)*y_step; - + // Timer 0 if(scanline == timer0_compare) { @@ -641,9 +641,9 @@ void sega_scu_device::check_scanline_timers(int scanline,int y_step) else m_ist |= (IRQ_TIMER_0); } - + // Timer 1 - // TODO: should happen after some time when hblank-in is received then counts down t1s + // TODO: should happen after some time when hblank-in is received then counts down t1s if( ((m_t1md == false) && ((scanline % y_step) == 0)) || ((m_t1md == true) && (scanline == timer0_compare)) ) @@ -684,7 +684,7 @@ WRITE32_MEMBER(sega_scu_device::irq_status_w) { if(mem_mask != 0xffffffff) logerror("%s IST write %08x with %08x\n",this->tag(),data,mem_mask); - + m_ist &= data; test_pending_irqs(); } @@ -719,7 +719,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vblank_out_w) { if(!state) return; - + if(!(m_ism & IRQ_VBLANK_OUT)) { m_hostcpu->set_input_line_and_vector(0xe, HOLD_LINE, 0x41); @@ -733,7 +733,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vblank_in_w) { if(!state) return; - + if(!(m_ism & IRQ_VBLANK_IN)) { m_hostcpu->set_input_line_and_vector(0xf, HOLD_LINE ,0x40); @@ -747,7 +747,7 @@ WRITE_LINE_MEMBER(sega_scu_device::hblank_in_w) { if(!state) return; - + if(!(m_ism & IRQ_HBLANK_IN)) { m_hostcpu->set_input_line_and_vector(0xd, HOLD_LINE, 0x42); @@ -761,7 +761,7 @@ WRITE_LINE_MEMBER(sega_scu_device::vdp1_end_w) { if(!state) return; - + if(!(m_ism & IRQ_VDP1_END)) { m_hostcpu->set_input_line_and_vector(0x2, HOLD_LINE, 0x4d); @@ -789,7 +789,7 @@ WRITE_LINE_MEMBER(sega_scu_device::smpc_irq_w) { if(!state) return; - + if(!(m_ism & IRQ_SMPC)) m_hostcpu->set_input_line_and_vector(8, HOLD_LINE, 0x47); else diff --git a/src/devices/machine/sega_scu.h b/src/devices/machine/sega_scu.h index 7e82bed1a8a..519a15ed3fb 100644 --- a/src/devices/machine/sega_scu.h +++ b/src/devices/machine/sega_scu.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Sega System Control Unit (c) 1995 Sega + Sega System Control Unit (c) 1995 Sega ***************************************************************************/ @@ -62,7 +62,7 @@ public: DECLARE_READ32_MEMBER(dma_lv2_r); DECLARE_WRITE32_MEMBER(dma_lv2_w); DECLARE_READ32_MEMBER(dma_status_r); - + // Timers DECLARE_WRITE32_MEMBER(t0_compare_w); DECLARE_WRITE32_MEMBER(t1_setdata_w); @@ -73,7 +73,7 @@ public: DECLARE_WRITE32_MEMBER(irq_mask_w); DECLARE_WRITE32_MEMBER(irq_status_w); DECLARE_READ32_MEMBER(version_r); - + DECLARE_WRITE_LINE_MEMBER(vblank_out_w); DECLARE_WRITE_LINE_MEMBER(vblank_in_w); DECLARE_WRITE_LINE_MEMBER(hblank_in_w); @@ -95,7 +95,7 @@ protected: virtual void device_reset() override; virtual void device_reset_after_children() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - + private: required_device<scudsp_cpu_device> m_scudsp; @@ -104,7 +104,7 @@ private: DMALV1_ID, DMALV2_ID }; - + emu_timer *m_dma_timer[3]; uint32_t m_ism; uint32_t m_ist; @@ -113,12 +113,12 @@ private: uint32_t m_status; bool m_t1md; bool m_tenb; - - const char *m_hostcpu_tag; + + const char *m_hostcpu_tag; sh2_device *m_hostcpu; address_space *m_hostspace; void test_pending_irqs(); - + struct { uint32_t src; /* Source DMA lv n address*/ uint32_t dst; /* Destination DMA lv n address*/ @@ -132,7 +132,7 @@ private: bool rup; bool wup; }m_dma[3]; - + uint32_t dma_common_r(uint8_t offset,uint8_t level); void dma_common_w(uint8_t offset,uint8_t level,uint32_t data); void handle_dma_direct(uint8_t level); diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index 1b4f36afb2d..ae017133bcc 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -179,7 +179,7 @@ DEFINE_DEVICE_TYPE(SMPC_HLE, smpc_hle_device, "smpc_hle", "Sega Saturn SMPC HLE // TODO: use DEVICE_ADDRESS_MAP once this fatalerror is fixed: // "uplift_submaps unhandled case: range straddling slots." static ADDRESS_MAP_START( smpc_regs, 0, 8, smpc_hle_device ) -// ADDRESS_MAP_UNMAP_HIGH +// ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x0d) AM_WRITE(ireg_w) AM_RANGE(0x1f, 0x1f) AM_WRITE(command_register_w) AM_RANGE(0x20, 0x5f) AM_READ(oreg_r) @@ -205,7 +205,7 @@ smpc_hle_device::smpc_hle_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, SMPC_HLE, tag, owner, clock), device_memory_interface(mconfig, *this), m_space_config("regs", ENDIANNESS_LITTLE, 8, 7, 0, nullptr, *ADDRESS_MAP_NAME(smpc_regs)), - m_mini_nvram(*this, "smem"), + m_mini_nvram(*this, "smem"), m_mshres(*this), m_mshnmi(*this), m_sshres(*this), @@ -249,7 +249,7 @@ void smpc_hle_device::static_set_control_port_tags(device_t &device, const char MACHINE_CONFIG_MEMBER(smpc_hle_device::device_add_mconfig) MCFG_NVRAM_ADD_0FILL("smem") - + // TODO: custom RTC subdevice MACHINE_CONFIG_END @@ -261,11 +261,11 @@ void smpc_hle_device::device_start() { system_time systime; machine().base_datetime(systime); - -// check if SMEM has valid data via byte 4 in the array, if not then simulate a battery backup fail + +// check if SMEM has valid data via byte 4 in the array, if not then simulate a battery backup fail // (-> call the RTC / Language select menu for Saturn) m_mini_nvram->set_base(&m_smem, 5); - + m_mshres.resolve_safe(); m_mshnmi.resolve_safe(); m_sshres.resolve_safe(); @@ -274,12 +274,12 @@ void smpc_hle_device::device_start() m_syshalt.resolve_safe(); m_dotsel.resolve_safe(); m_irq_line.resolve_safe(); - + m_pdr1_read.resolve_safe(0xff); m_pdr2_read.resolve_safe(0xff); m_pdr1_write.resolve_safe(); m_pdr2_write.resolve_safe(); - + save_item(NAME(m_sf)); save_item(NAME(m_sr)); save_item(NAME(m_ddr1)); @@ -299,15 +299,15 @@ void smpc_hle_device::device_start() save_item(NAME(m_pmode)); save_item(NAME(m_rtc_data)); save_item(NAME(m_smem)); - + m_cmd_timer = timer_alloc(COMMAND_ID); m_rtc_timer = timer_alloc(RTC_ID); m_intback_timer = timer_alloc(INTBACK_ID); m_sndres_timer = timer_alloc(SNDRES_ID); - -// TODO: tag-ify, needed when SCU will be a device + +// TODO: tag-ify, needed when SCU will be a device m_screen = machine().first_screen(); - + m_rtc_data[0] = DectoBCD(systime.local_time.year / 100); m_rtc_data[1] = DectoBCD(systime.local_time.year % 100); m_rtc_data[2] = (systime.local_time.weekday << 4) | (systime.local_time.month+1); @@ -321,7 +321,7 @@ void smpc_hle_device::device_start() m_ctrl1 = downcast<saturn_control_port_device *>(machine().device(m_ctrl1_tag)); m_ctrl2 = downcast<saturn_control_port_device *>(machine().device(m_ctrl2_tag)); } -// m_has_ctrl_ports = (m_ctrl1 != nullptr && m_ctrl2 != nullptr); +// m_has_ctrl_ports = (m_ctrl1 != nullptr && m_ctrl2 != nullptr); } @@ -338,10 +338,10 @@ void smpc_hle_device::device_reset() m_ddr2 = 0; m_pdr1_readback = 0; m_pdr2_readback = 0; - + memset(m_ireg,0,7); memset(m_oreg,0,32); - + m_cmd_timer->reset(); m_intback_timer->reset(); m_sndres_timer->reset(); @@ -349,7 +349,7 @@ void smpc_hle_device::device_reset() m_command_in_progress = false; m_NMI_reset = false; m_cur_dotsel = false; - + m_rtc_timer->adjust(attotime::zero, 0, attotime::from_seconds(1)); } @@ -369,10 +369,10 @@ WRITE8_MEMBER( smpc_hle_device::ireg_w ) { if (!(offset & 1)) // avoid writing to even bytes return; - + m_ireg[offset >> 1] = data; - - if(offset == 1) // check if we are under intback + + if(offset == 1) // check if we are under intback { if(m_intback_stage) { @@ -385,8 +385,8 @@ WRITE8_MEMBER( smpc_hle_device::ireg_w ) else if(data & 0x80) { if(LOG_PAD_CMD) printf("SMPC: CONTINUE request\n"); - - m_intback_timer->adjust(attotime::from_usec(700)); // TODO: is timing correct? + + m_intback_timer->adjust(attotime::from_usec(700)); // TODO: is timing correct? // TODO: following looks wrong here m_oreg[31] = 0x10; @@ -397,7 +397,7 @@ WRITE8_MEMBER( smpc_hle_device::ireg_w ) } READ8_MEMBER( smpc_hle_device::oreg_r ) -{ +{ if (!(offset & 1)) // avoid reading to even bytes (TODO: is it 0s or 1s?) return 0x00; @@ -424,14 +424,14 @@ WRITE8_MEMBER( smpc_hle_device::status_flag_w ) READ8_MEMBER( smpc_hle_device::pdr1_r ) { uint8_t res = (m_pdr1_read() & ~m_ddr1) | m_pdr1_readback; - + return res; } READ8_MEMBER( smpc_hle_device::pdr2_r ) { uint8_t res = (m_pdr2_read() & ~m_ddr2) | m_pdr2_readback; - + return res; } @@ -540,26 +540,26 @@ WRITE8_MEMBER( smpc_hle_device::write ) WRITE8_MEMBER( smpc_hle_device::command_register_w ) { -// don't send a command if previous one is still in progress +// don't send a command if previous one is still in progress // ST-V tries to send a sysres command if OREG31 doesn't return the ack command if(m_command_in_progress == true) return; - + m_comreg = data & 0x1f; - + if(data & 0xe0) logerror("%s COMREG = %02x!?\n",this->tag(),data); - + m_command_in_progress = true; if(m_comreg == 0x0e || m_comreg == 0x0f) { /* on ST-V timing of this is pretty fussy, you get 2 credits at start-up otherwise - * My current theory is that the PLL device can halt the whole system until the frequency change occurs. - * (cfr. diagram on page 3 of SMPC manual) + * My current theory is that the PLL device can halt the whole system until the frequency change occurs. + * (cfr. diagram on page 3 of SMPC manual) * I really don't think that the system can do an usable mid-frame clock switching anyway. */ m_syshalt(1); - + m_cmd_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().max_y,0)); } else if(m_comreg == 0x10) @@ -567,7 +567,7 @@ WRITE8_MEMBER( smpc_hle_device::command_register_w ) // copy ireg to our intback buffer for(int i=0;i<3;i++) m_intback_buf[i] = m_ireg[i]; - + // calculate the timing for intback command int timing; @@ -576,12 +576,12 @@ WRITE8_MEMBER( smpc_hle_device::command_register_w ) if( m_ireg[0] != 0) // non-peripheral data timing += 8; - // TODO: At vblank-out actually ... + // TODO: At vblank-out actually ... if( m_ireg[1] & 8) // peripheral data timing += 700; - + // TODO: check against ireg2, must be 0xf0 - + m_cmd_timer->adjust(attotime::from_usec(timing)); } else @@ -607,7 +607,7 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par // enable or disable Slave SH2 m_sshres(m_comreg & 1); break; - + case 0x06: // SNDON case 0x07: // SNDOFF // enable or disable 68k @@ -621,15 +621,15 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par m_oreg[31] = m_comreg; sf_ack(true); //clear hand-shake flag (TODO: diagnostic wants this to have bit 3 high) return; - -// case 0x0a: // NETLINKON -// case 0x0b: // NETLINKOFF - + +// case 0x0a: // NETLINKON +// case 0x0b: // NETLINKOFF + case 0x0d: // SYSRES // send a 1 -> 0 to device reset lines m_sysres(1); m_sysres(0); - + // send a 1 -> 0 transition to reset line (was PULSE_LINE) m_mshres(1); m_mshres(0); @@ -638,7 +638,7 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par case 0x0e: // CKCHG352 case 0x0f: // CKCHG320 m_dotsel(m_comreg & 1); - + // send a NMI to Master SH2 if enabled if(m_NMI_reset == false) master_sh2_nmi(); @@ -647,22 +647,22 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par m_sshres(1); // clear PLL system halt m_syshalt(0); - + // setup the new dot select m_cur_dotsel = (m_comreg & 1) ^ 1; break; case 0x10: // INTBACK resolve_intback(); - return; - + return; + case 0x16: // SETTIME { for(int i=0;i<7;i++) m_rtc_data[i] = m_ireg[i]; break; } - + case 0x17: // SETSMEM { for(int i=0;i<4;i++) @@ -672,7 +672,7 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par m_smem[4] = 0xff; break; } - + case 0x18: // NMIREQ // NMI is unconditionally requested master_sh2_nmi(); @@ -712,11 +712,11 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par void smpc_hle_device::resolve_intback() { int i; - + m_command_in_progress = false; if(m_intback_buf[0] != 0) - { + { m_oreg[0] = ((m_smem[4] & 0x80) | ((m_NMI_reset & 1) << 6)); for(i=0;i<7;i++) @@ -725,11 +725,11 @@ void smpc_hle_device::resolve_intback() m_oreg[8] = 0; // CTG0 / CTG1? m_oreg[9] = m_region_code; // TODO: system region on Saturn - + /* 0-11 -1-- unknown -x-- ---- VDP2 dot select - ---- x--- MSHNMI + ---- x--- MSHNMI ---- --x- SYSRES ---- ---x SOUNDRES */ @@ -741,7 +741,7 @@ void smpc_hle_device::resolve_intback() 1 << 2 | 0 << 1 | 0 << 0; - + m_oreg[11] = 0 << 6; // CDRES for(i=0;i<4;i++) @@ -755,7 +755,7 @@ void smpc_hle_device::resolve_intback() m_pmode = m_intback_buf[0]>>4; irq_request(); - + // put issued command in OREG31 m_oreg[31] = 0x10; // TODO: doc says 0? /* clear hand-shake flag */ @@ -780,7 +780,7 @@ void smpc_hle_device::intback_continue_request() { if( m_has_ctrl_ports == true ) read_saturn_ports(); - + if (m_intback_stage == 2) { sr_set(0x80 | m_pmode); // pad 2, no more data, echo back pad mode set by intback @@ -793,8 +793,8 @@ void smpc_hle_device::intback_continue_request() } irq_request(); - m_oreg[31] = 0x10; // callback for last command issued - sf_ack(false); + m_oreg[31] = 0x10; // callback for last command issued + sf_ack(false); } int smpc_hle_device::DectoBCD(int num) @@ -940,21 +940,21 @@ void smpc_hle_device::read_saturn_ports() for (int i = 0; i < (status1 & 0xf); i++) { uint8_t id = m_ctrl1->read_id(i); - + m_oreg[reg_offset++] = id; for (int j = 0; j < (id & 0xf); j++) m_oreg[reg_offset++] = m_ctrl1->read_ctrl(j + ctrl1_offset); ctrl1_offset += (id & 0xf); } - + m_oreg[reg_offset++] = status2; // read ctrl2 for (int i = 0; i < (status2 & 0xf); i++) { uint8_t id = m_ctrl2->read_id(i); - + m_oreg[reg_offset++] = id; for (int j = 0; j < (id & 0xf); j++) diff --git a/src/devices/machine/smpc.h b/src/devices/machine/smpc.h index 99d857acff5..c3977db9015 100644 --- a/src/devices/machine/smpc.h +++ b/src/devices/machine/smpc.h @@ -28,7 +28,7 @@ #define MCFG_SMPC_HLE_PDR2_IN_CB(_devcb) \ devcb = &smpc_hle_device::set_pdr2_in_handler(*device, DEVCB_##_devcb); - + #define MCFG_SMPC_HLE_PDR1_OUT_CB(_devcb) \ devcb = &smpc_hle_device::set_pdr1_out_handler(*device, DEVCB_##_devcb); @@ -75,7 +75,7 @@ public: smpc_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // I/O operations -// DECLARE_ADDRESS_MAP( io_map, 8); +// DECLARE_ADDRESS_MAP( io_map, 8); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -95,11 +95,11 @@ public: DECLARE_WRITE8_MEMBER( exle_w ); DECLARE_INPUT_CHANGED_MEMBER( trigger_nmi_r ); - void m68k_reset_trigger(); + void m68k_reset_trigger(); bool get_iosel(bool which); uint8_t get_ddr(bool which); - -// system delegation + +// system delegation template <class Object> static devcb_base &set_master_reset_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_mshres.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_master_nmi_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_mshnmi.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_slave_reset_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_sshres.set_callback(std::forward<Object>(cb)); } @@ -109,7 +109,7 @@ public: template <class Object> static devcb_base &set_dot_select_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_dotsel.set_callback(std::forward<Object>(cb)); } -// PDR delegation +// PDR delegation template <class Object> static devcb_base &set_pdr1_in_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_pdr1_read.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_pdr2_in_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_pdr2_read.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_pdr1_out_handler(device_t &device, Object &&cb) { return downcast<smpc_hle_device &>(device).m_pdr1_write.set_callback(std::forward<Object>(cb)); } @@ -123,7 +123,7 @@ public: protected: // device-level overrides -// virtual void device_validity_check(validity_checker &valid) const override; +// virtual void device_validity_check(validity_checker &valid) const override; virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; @@ -147,7 +147,7 @@ private: const char *m_ctrl1_tag; const char *m_ctrl2_tag; bool m_has_ctrl_ports; - + bool m_sf; bool m_cd_sf; uint8_t m_sr; @@ -163,8 +163,8 @@ private: uint8_t m_comreg; // in usec // timing table, from manual in usec - const uint32_t m_cmd_table_timing[0x20] = - { + const uint32_t m_cmd_table_timing[0x20] = + { 30, 30, // MASTER ON / OFF 30, 30, // SLAVE ON / OFF 10, 10, // <unknown> @@ -188,7 +188,7 @@ private: void intback_continue_request(); void handle_rtc_increment(); void read_saturn_ports(); - + void sr_set(uint8_t data); void sr_ack(); void sf_ack(bool cd_enable); @@ -202,10 +202,10 @@ private: devcb_write_line m_mshres; devcb_write_line m_mshnmi; devcb_write_line m_sshres; -// devcb_write_line m_sshnmi; +// devcb_write_line m_sshnmi; devcb_write_line m_sndres; devcb_write_line m_sysres; -// devcb_write_line m_cdres; +// devcb_write_line m_cdres; devcb_write_line m_syshalt; devcb_write_line m_dotsel; devcb_read8 m_pdr1_read; diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp index e1cf25e6214..87b3b9e344c 100644 --- a/src/devices/machine/stvcd.cpp +++ b/src/devices/machine/stvcd.cpp @@ -1383,7 +1383,7 @@ void saturn_state::cd_exec_command( void ) if(cr2 == 0x0001) // MPEG card cr2 = 0x2; else - cr2 = 0x4; // 0 = No CD, 1 = Audio CD, 2 Regular Data disk (not Saturn), 3 pirate disc, 4 Saturn disc + cr2 = 0x4; // 0 = No CD, 1 = Audio CD, 2 Regular Data disk (not Saturn), 3 pirate disc, 4 Saturn disc cr3 = 0; cr4 = 0; hirqreg |= (CMOK); @@ -1410,19 +1410,19 @@ void saturn_state::cd_exec_command( void ) cr4 = 0; hirqreg |= (CMOK); break; - + // MPEG init case 0x93: hirqreg |= (CMOK|MPED); if(cr2 == 0x0001) hirqreg |= (MPCM); - + cr1 = cd_stat; cr2 = 0; cr3 = 0; cr4 = 0; break; - + default: CDROM_LOG(("CD: Unknown command %04x\n", cr1>>8)) popmessage("CD Block unknown command %02x, contact MAMEdev",cr1>>8); diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp index 6f294a0ddcb..ebdef5e346b 100644 --- a/src/devices/machine/z80scc.cpp +++ b/src/devices/machine/z80scc.cpp @@ -397,7 +397,7 @@ int z80scc_device::z80daisy_irq_ack() } } - // Did we not find a vector? Get the notion of a default vector from the CPU implementation + // Did we not find a vector? Get the notion of a default vector from the CPU implementation if (ret == -1 && m_cputag != nullptr) { // default irq vector is -1 for 68000 but 0 for z80 for example... diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index ff8b0f18b84..a18be27d9c0 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -263,7 +263,7 @@ int z80sio_device::z80daisy_irq_ack() break; } } - // Did we not find a vector? Get the notion of a default vector from the CPU implementation + // Did we not find a vector? Get the notion of a default vector from the CPU implementation if (ret == -1 && m_cputag != nullptr) { // default irq vector is -1 for 68000 but 0 for z80 for example... diff --git a/src/devices/video/huc6270.cpp b/src/devices/video/huc6270.cpp index 454d5e9129a..4d4953e805e 100644 --- a/src/devices/video/huc6270.cpp +++ b/src/devices/video/huc6270.cpp @@ -553,7 +553,7 @@ WRITE_LINE_MEMBER( huc6270_device::hsync_changed ) { m_status |= HUC6270_RR; m_irq_changed_cb( ASSERT_LINE ); - } + } } } @@ -571,16 +571,16 @@ inline void huc6270_device::handle_dma() int sour_inc = ( m_dcr & 0x0004 ) ? -1 : +1; LOG("doing dma sour = %04x, desr = %04x, lenr = %04x\n", m_sour, m_desr, m_lenr ); - + do { uint16_t data; - + // area 0x8000-0xffff cannot be r/w (open bus) if(m_sour <= m_vram_mask) data = m_vram[ m_sour ]; else data = 0; - + if(m_desr <= m_vram_mask) m_vram[ m_desr ] = data; m_sour += sour_inc; @@ -618,7 +618,7 @@ READ8_MEMBER( huc6270_device::read ) if ( m_register_index == VxR ) { m_marr += vram_increments[ ( m_cr >> 11 ) & 3 ]; - + if(m_marr <= m_vram_mask) m_vrr = m_vram[ m_marr ]; else @@ -846,7 +846,7 @@ void huc6270_device::device_start() m_vram = make_unique_clear<uint16_t[]>(m_vram_size/sizeof(uint16_t)); m_vram_mask = (m_vram_size >> 1) - 1; - + save_pointer(NAME(m_vram.get()), m_vram_size/sizeof(uint16_t)); save_item(NAME(m_register_index)); diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index 462da4cf0ba..ad350718e39 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -908,7 +908,7 @@ void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcn if(x >= 1024 || y >= 512) return; - + if ( stv2_current_sprite.ispoly ) { pix = stv2_current_sprite.CMDCOLR&0xffff; @@ -2006,10 +2006,10 @@ void saturn_state::stv_vdp1_process_list( void ) end: m_vdp1.copr = (position * 0x20) >> 3; - + /* TODO: what's the exact formula? Guess it should be a mix between number of pixels written and actual command data fetched. */ // if spritecount = 10000 don't send a vdp1 draw end -// if(spritecount < 10000) +// if(spritecount < 10000) machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(spritecount*16), timer_expired_delegate(FUNC(saturn_state::vdp1_draw_end),this)); if (VDP1_LOG) logerror ("End of list processing!\n"); diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index eb3d8709286..799224e94f0 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -4774,7 +4774,7 @@ void saturn_state::stv_vdp2_copy_roz_bitmap(bitmap_rgb32 &bitmap, if( stv_vdp2_roz_mode3_window(hcnt, vcnt, iRP-1) == false ) continue; } - + pix = roz_bitmap.pix32(y & planerenderedsizey, x & planerenderedsizex); switch( stv2_current_tilemap.transparency ) { diff --git a/src/devices/video/vooddefs.h b/src/devices/video/vooddefs.h index 0c925ea33c7..55c22903799 100644 --- a/src/devices/video/vooddefs.h +++ b/src/devices/video/vooddefs.h @@ -2773,12 +2773,12 @@ void voodoo_device::raster_##name(void *destbase, int32_t y, const poly_extent * if (ALPHAMODE_ALPHATEST(ALPHAMODE)) \ if (!alphaTest(vd->reg[alphaMode].rgb.a, stats, ALPHAMODE, color.get_a())) \ goto skipdrawdepth; \ - \ + \ /* perform fogging */ \ preFog.set(color); \ if (FOGMODE_ENABLE_FOG(FOGMODE)) \ applyFogging(vd, FBZMODE, FOGMODE, FBZCOLORPATH, x, dither4, wfloat, color, iterz, iterw, iterargb); \ - \ + \ /* perform alpha blending */ \ if (ALPHAMODE_ALPHABLEND(ALPHAMODE)) \ alphaBlend(FBZMODE, ALPHAMODE, x, dither, dest[x], depth, preFog, color, vd->fbi.rgb565); \ diff --git a/src/emu/debug/debugcon.cpp b/src/emu/debug/debugcon.cpp index 16f15fbbc60..3b0f2e98b6b 100644 --- a/src/emu/debug/debugcon.cpp +++ b/src/emu/debug/debugcon.cpp @@ -416,7 +416,7 @@ std::string debugger_console::cmderr_to_string(CMDERR error) case CMDERR_NOT_ENOUGH_PARAMS: return "not enough parameters for command"; case CMDERR_TOO_MANY_PARAMS: return "too many parameters for command"; case CMDERR_EXPRESSION_ERROR: return string_format("error in assignment expression: %s", - expression_error(static_cast<expression_error::error_code>(offset)).code_string()); + expression_error(static_cast<expression_error::error_code>(offset)).code_string()); default: return "unknown error"; } } diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h index 71203a4431c..0b1a13c0beb 100644 --- a/src/emu/video/rgbsse.h +++ b/src/emu/video/rgbsse.h @@ -299,9 +299,9 @@ public: // Leave this here in case Model3 blows up... //inline void scale_imm_and_clamp(const s32 scale) //{ - // mul_imm(scale); - // sra_imm(8); - // clamp_to_uint8(); + // mul_imm(scale); + // sra_imm(8); + // clamp_to_uint8(); //} // This version needs values to be 12 bits or less diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp index 59fb07d0a27..55629e2c3c8 100644 --- a/src/lib/formats/acorn_dsk.cpp +++ b/src/lib/formats/acorn_dsk.cpp @@ -522,7 +522,7 @@ int acorn_dos_format::identify(io_generic *io, uint32_t form_factor) int type = find_size(io, form_factor); if(type != -1) - return 90; + return 90; return 0; } diff --git a/src/lib/util/timeconv.h b/src/lib/util/timeconv.h index 80ef6f6b73f..365af8c19fb 100644 --- a/src/lib/util/timeconv.h +++ b/src/lib/util/timeconv.h @@ -36,17 +36,17 @@ typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_dura //--------------------------------------------------------- -// arbitrary_datetime +// arbitrary_datetime //--------------------------------------------------------- struct arbitrary_datetime { - int year; // absolute year (1900 AD = 1900) - int month; // month (1-12) - int day_of_month; // day of month (1-31) - int hour; // hour (0-23) - int minute; // minute (0-59) - int second; // second (0-59) + int year; // absolute year (1900 AD = 1900) + int month; // month (1-12) + int day_of_month; // day of month (1-31) + int hour; // hour (0-23) + int minute; // minute (0-59) + int second; // second (0-59) }; @@ -71,7 +71,7 @@ public: static constexpr int base_second = S; //--------------------------------------------------------- - // from_arbitrary_datetime - converts an + // from_arbitrary_datetime - converts an // from_arbitrary_datetime to this arbitrary_clock's scale //--------------------------------------------------------- @@ -173,7 +173,7 @@ private: //--------------------------------------------------------- - // clamp_or_throw + // clamp_or_throw //--------------------------------------------------------- static int clamp_or_throw(int value, int minimum, int maximum, bool clamp, const char *out_of_range_message) @@ -189,18 +189,18 @@ private: } //--------------------------------------------------------- - // duration_from_arbitrary_datetime - converts an + // duration_from_arbitrary_datetime - converts an // arbitrary_datetime to this arbitrary_clock's duration //--------------------------------------------------------- static duration duration_from_arbitrary_datetime(const arbitrary_datetime &dt, bool clamp) { // range checking - const int month = clamp_or_throw(dt.month, 1, 12, clamp, "invalid dt.month"); - const int day_of_month = clamp_or_throw(dt.day_of_month, 1, gregorian_days_in_month(month, dt.year), clamp, "invalid dt.day_of_month"); - const int hour = clamp_or_throw(dt.hour, 0, 23, clamp, "invalid dt.hour"); - const int minute = clamp_or_throw(dt.minute, 0, 59, clamp, "invalid dt.minute"); - const int second = clamp_or_throw(dt.second, 0, 59, clamp, "invalid dt.second"); + const int month = clamp_or_throw(dt.month, 1, 12, clamp, "invalid dt.month"); + const int day_of_month = clamp_or_throw(dt.day_of_month, 1, gregorian_days_in_month(month, dt.year), clamp, "invalid dt.day_of_month"); + const int hour = clamp_or_throw(dt.hour, 0, 23, clamp, "invalid dt.hour"); + const int minute = clamp_or_throw(dt.minute, 0, 59, clamp, "invalid dt.minute"); + const int second = clamp_or_throw(dt.second, 0, 59, clamp, "invalid dt.second"); const int64_t our_absolute_day = absolute_day(Y, M, D); const int64_t their_absolute_day = absolute_day(dt.year, month, day_of_month); diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp index b4606282d12..b165007c8c5 100644 --- a/src/mame/drivers/4enraya.cpp +++ b/src/mame/drivers/4enraya.cpp @@ -543,7 +543,7 @@ ROM_START( 4enrayaa ) ROM_END -/* +/* Unknown 'Pac-Man' gambling game. */ ROM_START(unkpacg) @@ -557,7 +557,7 @@ ROM_START(unkpacg) ROM_LOAD( "5.u18", 0x0000, 0x2000, CRC(44f272d2) SHA1(b39cbc1f290d9fb2453396906e4da4a682c41ef4) ) ROM_END -/* +/* Unknown 'Space Invaders' gambling game. All roms are 0x8000 but only the last 0x2000 of each is used. */ @@ -587,7 +587,7 @@ ROM_START( unksig ) ROM_CONTINUE( 0x4000, 0x2000) // only data here matters ROM_END -/* +/* Unknown 'Space Invaders' gambling game All roms are 0x10000 but with a lot of addressing issues diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 828d4bece86..5d86e84729b 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -41,28 +41,28 @@ should be [:mac] ':3f' (089A8) MAC 7e4a2:1fe4a2 (SEGA 00f SEGD 0f PGA 0fc PGD 43fc NONX 0 WP 1) - [:mac] ':3f' (100082) SEGMENT 80eeb:27 (SEGA 000 SEGD 27) - [:mac] ':3f' (100084) PAGE 80ee8:02 (SEGA 000 SEGD 27 PGA 271 PGD 0283) - [:mac] ':3f' (100084) PAGE 80ee9:83 (SEGA 000 SEGD 27 PGA 271 PGD 0283) - [:mac] ':3f' (100082) SEGMENT 806eb:27 (SEGA 000 SEGD 27) - [:mac] ':3f' (100084) PAGE 806e8:02 (SEGA 000 SEGD 27 PGA 270 PGD 0282) - [:mac] ':3f' (100084) PAGE 806e9:82 (SEGA 000 SEGD 27 PGA 270 PGD 0282) - [:mac] ':3f' (100082) MAC 7feea:1b8eea (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) - [:mac] ':3f' (100082): unmapped program memory write to 1B8EEA = 00 & FF - [:mac] ':3f' (100082) MAC 7feeb:1b8eeb (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) - [:mac] ':3f' (100082): unmapped program memory write to 1B8EEB = 27 & FF - [:mac] ':3f' (100084) MAC 7fee8:1b8ee8 (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) - [:mac] ':3f' (100084): unmapped program memory write to 1B8EE8 = 02 & FF - [:mac] ':3f' (100084) MAC 7fee9:1b8ee9 (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) - [:mac] ':3f' (100084): unmapped program memory write to 1B8EE9 = 81 & FF - [:mac] ':3f' (100082) MAC 7f6ea:1b86ea (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) - [:mac] ':3f' (100082): unmapped program memory write to 1B86EA = 00 & FF - [:mac] ':3f' (100082) MAC 7f6eb:1b86eb (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) - [:mac] ':3f' (100082): unmapped program memory write to 1B86EB = 27 & FF - [:mac] ':3f' (100084) MAC 7f6e8:1b86e8 (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) - [:mac] ':3f' (100084): unmapped program memory write to 1B86E8 = 02 & FF - [:mac] ':3f' (100084) MAC 7f6e9:1b86e9 (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) - [:mac] ':3f' (100084): unmapped program memory write to 1B86E9 = 80 & FF + [:mac] ':3f' (100082) SEGMENT 80eeb:27 (SEGA 000 SEGD 27) + [:mac] ':3f' (100084) PAGE 80ee8:02 (SEGA 000 SEGD 27 PGA 271 PGD 0283) + [:mac] ':3f' (100084) PAGE 80ee9:83 (SEGA 000 SEGD 27 PGA 271 PGD 0283) + [:mac] ':3f' (100082) SEGMENT 806eb:27 (SEGA 000 SEGD 27) + [:mac] ':3f' (100084) PAGE 806e8:02 (SEGA 000 SEGD 27 PGA 270 PGD 0282) + [:mac] ':3f' (100084) PAGE 806e9:82 (SEGA 000 SEGD 27 PGA 270 PGD 0282) + [:mac] ':3f' (100082) MAC 7feea:1b8eea (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) + [:mac] ':3f' (100082): unmapped program memory write to 1B8EEA = 00 & FF + [:mac] ':3f' (100082) MAC 7feeb:1b8eeb (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) + [:mac] ':3f' (100082): unmapped program memory write to 1B8EEB = 27 & FF + [:mac] ':3f' (100084) MAC 7fee8:1b8ee8 (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) + [:mac] ':3f' (100084): unmapped program memory write to 1B8EE8 = 02 & FF + [:mac] ':3f' (100084) MAC 7fee9:1b8ee9 (SEGA 00f SEGD 36 PGA 36f PGD 0371 NONX 0 WP 0) + [:mac] ':3f' (100084): unmapped program memory write to 1B8EE9 = 81 & FF + [:mac] ':3f' (100082) MAC 7f6ea:1b86ea (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) + [:mac] ':3f' (100082): unmapped program memory write to 1B86EA = 00 & FF + [:mac] ':3f' (100082) MAC 7f6eb:1b86eb (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) + [:mac] ':3f' (100082): unmapped program memory write to 1B86EB = 27 & FF + [:mac] ':3f' (100084) MAC 7f6e8:1b86e8 (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) + [:mac] ':3f' (100084): unmapped program memory write to 1B86E8 = 02 & FF + [:mac] ':3f' (100084) MAC 7f6e9:1b86e9 (SEGA 00f SEGD 36 PGA 36e PGD 0370 NONX 0 WP 0) + [:mac] ':3f' (100084): unmapped program memory write to 1B86E9 = 80 & FF - short/long reset (RSTBUT) - CIO diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp index 6be2d5ace8b..7a3823c91f9 100644 --- a/src/mame/drivers/anes.cpp +++ b/src/mame/drivers/anes.cpp @@ -38,7 +38,7 @@ public: DECLARE_WRITE8_MEMBER(vram_offset_w); DECLARE_WRITE8_MEMBER(blit_trigger_w); - + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: @@ -69,7 +69,7 @@ WRITE8_MEMBER(anes_state::blit_trigger_w) writes 1 to port $0b, writes to program space, writes 2 to port $0b, writes to program space writes a mode to port $0b, writes to trigger port $0a */ - + //printf("%02x%02x%02x\n",m_vram_offset[0],m_vram_offset[1],m_vram_offset[2]); } @@ -81,18 +81,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, AS_IO, 8, anes_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH - + AM_RANGE(0x07, 0x07) AM_WRITENOP // mux write AM_RANGE(0x08, 0x09) AM_DEVWRITE("ym", ym2413_device, write) AM_RANGE(0x0a, 0x0a) AM_WRITE(blit_trigger_w) -// AM_RANGE(0x0b, 0x0b) AM_WRITE(blit_mode_w) +// AM_RANGE(0x0b, 0x0b) AM_WRITE(blit_mode_w) AM_RANGE(0x0c, 0x0e) AM_WRITE(vram_offset_w) AM_RANGE(0x11, 0x11) AM_READ_PORT("DSW1") AM_RANGE(0x12, 0x12) AM_READ_PORT("DSW2") AM_RANGE(0x13, 0x13) AM_READ_PORT("DSW3") AM_RANGE(0x14, 0x15) AM_READNOP // mux read AM_RANGE(0x16, 0x16) AM_READ_PORT("IN0") AM_WRITENOP -// AM_RANGE(0xfe, 0xfe) banking? unknown ROM range +// AM_RANGE(0xfe, 0xfe) banking? unknown ROM range ADDRESS_MAP_END @@ -100,7 +100,7 @@ static INPUT_PORTS_START( anes ) PORT_START("IN0") PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // blitter busy status PORT_BIT( 0xef, IP_ACTIVE_LOW, IPT_UNKNOWN ) // used, coin? - + PORT_START("DSW1") PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "SW1:1") PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "SW1:2") diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index e87fe73c247..1c5e800ccf1 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -454,7 +454,7 @@ ROM_START( bottom9n ) ROM_LOAD32_BYTE( "891e05h", 0xc0002, 0x10000, CRC(b0aba53b) SHA1(e76b345ae354533959ed06217b91ce3c93b22a23) ) ROM_LOAD32_BYTE( "891e05d", 0xc0003, 0x10000, CRC(f6d3f886) SHA1(b8bdcc9470aa93849b8c8a1f03971281cacc6d44) ) - + ROM_REGION( 0x020000, "k051316", 0 ) ROM_LOAD( "891e07a", 0x00000, 0x10000, CRC(b8d8b939) SHA1(ee91fb46d70db2d17f5909c4ea7ee1cf2d317d10) ) /* zoom/rotate */ ROM_LOAD( "891e07b", 0x10000, 0x10000, CRC(83b2f92d) SHA1(c4972018e1f8109656784fae3e023a5522622c4b) ) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index a8979fb08c4..03e3fbe46f5 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -354,7 +354,7 @@ static ADDRESS_MAP_START( cv1k_d_map, AS_PROGRAM, 64, cv1k_state ) AM_RANGE(0x10400000, 0x10400007) AM_DEVWRITE8("ymz770", ymz770_device, write, 0xffffffffffffffffU) AM_RANGE(0x10C00000, 0x10C00007) AM_READWRITE8(serial_rtc_eeprom_r, serial_rtc_eeprom_w, 0xffffffffffffffffU) // AM_RANGE(0x18000000, 0x18000057) // blitter, installed on reset - AM_RANGE(0xf0000000, 0xf0ffffff) AM_RAM // mem mapped cache (sh3 internal?) + AM_RANGE(0xf0000000, 0xf0ffffff) AM_RAM // mem mapped cache (sh3 internal?) ADDRESS_MAP_END static ADDRESS_MAP_START( cv1k_port, AS_IO, 64, cv1k_state ) @@ -848,7 +848,7 @@ void cv1k_state::install_speedups(uint32_t idleramoff, uint32_t idlepc, bool is_ m_idlepc = idlepc; m_maincpu->sh2drc_set_options(SH2DRC_FASTEST_OPTIONS); - + m_maincpu->sh2drc_add_pcflush(idlepc+2); m_maincpu->space(AS_PROGRAM).install_read_handler(0xc000000+m_idleramoffs, 0xc000000+m_idleramoffs+7, read64_delegate(FUNC(cv1k_state::speedup_r),this)); diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 23261159d76..5a010d14dd6 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -890,7 +890,7 @@ INPUT_PORTS_END static const ioport_value rotary_table[12] = { - 0xfffe, 0xfffd, 0xfffb, 0xfff7, + 0xfffe, 0xfffd, 0xfffb, 0xfff7, 0xffef, 0xffdf, 0xffbf, 0xff7f, 0xfeff, 0xfdff, 0xfbff, 0xf7ff }; @@ -906,25 +906,25 @@ INPUT_PORTS_END static INPUT_PORTS_START( rotary_null ) PORT_START("AN0") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("AN1") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( hbarrel ) PORT_INCLUDE( dec0 ) - + PORT_MODIFY("INPUTS") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Bomb") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Fire") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Bomb") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x0000, DEF_STR( 2C_1C ) ) @@ -972,16 +972,16 @@ static INPUT_PORTS_START( birdtry ) PORT_INCLUDE( dec0 ) PORT_MODIFY("INPUTS") -// PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot") -// PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Select") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) -// PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Shoot") -// PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Select") +// PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot") +// PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Select") + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) +// PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Shoot") +// PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Select") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") DEC0_COIN_SETTING PORT_SERVICE_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW1:5" ) @@ -1031,7 +1031,7 @@ static INPUT_PORTS_START( birdtry ) */ PORT_INCLUDE( rotary_null ) -// TODO: trackball inputs +// TODO: trackball inputs INPUT_PORTS_END static INPUT_PORTS_START( baddudes ) @@ -1040,14 +1040,14 @@ static INPUT_PORTS_START( baddudes ) PORT_MODIFY("INPUTS") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Attack") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Attack") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") DEC0_COIN_SETTING PORT_SERVICE_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW1:5" ) @@ -1101,14 +1101,14 @@ static INPUT_PORTS_START( robocop ) PORT_MODIFY("INPUTS") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Attack") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Attack") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") DEC0_COIN_SETTING PORT_DIPUNUSED_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW1:5" ) // Always OFF @@ -1156,13 +1156,13 @@ static INPUT_PORTS_START( hippodrm ) PORT_MODIFY("INPUTS") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Attack") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Attack") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") - PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW") DEC0_COIN_SETTING @@ -1197,7 +1197,7 @@ static INPUT_PORTS_START( hippodrm ) PORT_START("VBLANK") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") - + PORT_INCLUDE( rotary_null ) INPUT_PORTS_END @@ -1233,7 +1233,7 @@ static INPUT_PORTS_START( slyspy ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Attack") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") DEC0_COIN_SETTING PORT_SERVICE_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW1:5" ) @@ -1277,7 +1277,7 @@ static INPUT_PORTS_START( midres ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Fire") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("DSW") DEC0_COIN_SETTING PORT_DIPUNUSED_DIPLOC( 0x0010, IP_ACTIVE_LOW, "SW1:5" ) // Always OFF @@ -1330,13 +1330,13 @@ static INPUT_PORTS_START( midresb ) PORT_MODIFY("INPUTS") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire") PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump") - PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Fire") PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_NAME("P2 Jump") PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_MODIFY("SYSTEM") - PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW") DEC0_COIN_SETTING @@ -1381,16 +1381,16 @@ static INPUT_PORTS_START( bouldash ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) // squeeze diamond PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) // escape PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 3 - only in Service Mode */ -// PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) +// PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // squeeze diamond PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // escape - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) -// PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) - + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) +// PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) + PORT_MODIFY("SYSTEM") PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* extremely slow palette fades with ACTIVE_HIGH */ @@ -1441,7 +1441,7 @@ static INPUT_PORTS_START( bouldash ) PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - + PORT_INCLUDE( rotary_null ) INPUT_PORTS_END @@ -3643,10 +3643,10 @@ ROM_END DRIVER_INIT_MEMBER(dec0_state,midresb) { -// m_maincpu->space(AS_PROGRAM).install_read_handler(0x00180000, 0x0018000f, read16_delegate(FUNC(dec0_state::dec0_controls_r),this)); -// m_maincpu->space(AS_PROGRAM).install_read_handler(0x001a0000, 0x001a000f, read16_delegate(FUNC(dec0_state::dec0_rotary_r),this)); +// m_maincpu->space(AS_PROGRAM).install_read_handler(0x00180000, 0x0018000f, read16_delegate(FUNC(dec0_state::dec0_controls_r),this)); +// m_maincpu->space(AS_PROGRAM).install_read_handler(0x001a0000, 0x001a000f, read16_delegate(FUNC(dec0_state::dec0_rotary_r),this)); -// m_maincpu->space(AS_PROGRAM).install_write_handler(0x00180014, 0x00180015, write16_delegate(FUNC(dec0_state::midres_sound_w),this)); +// m_maincpu->space(AS_PROGRAM).install_write_handler(0x00180014, 0x00180015, write16_delegate(FUNC(dec0_state::midres_sound_w),this)); } READ16_MEMBER(dec0_state::ffantasybl_242024_r) diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 1d70be8e6af..0dc89e55a4f 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -575,11 +575,11 @@ ROM_START( europc ) ROM_SYSTEM_BIOS( 4, "v2.08a", "EuroPC v2.08a" ) ROMX_LOAD("bios_v2.08a.bin", 0x8000, 0x8000, CRC(872520b7) SHA1(9c94d33c0d454fab7bcd0c4516b50f1c3c6a30b8), ROM_BIOS(5)) ROM_SYSTEM_BIOS( 5, "v2.08b", "EuroPC v2.08b" ) - ROMX_LOAD("bios_v2.08b.bin", 0x8000, 0x8000, CRC(668c0d19) SHA1(69412e58e0ed1d141e633f094af91ec5f7ae064b), ROM_BIOS(6)) - ROM_SYSTEM_BIOS( 6, "v2.04", "EuroPC v2.04" ) - ROMX_LOAD("bios_v2.04.bin", 0x8000, 0x8000, CRC(e623967c) SHA1(5196b14018da1f3198e2950af0e6eab41425f556), ROM_BIOS(7)) - ROM_SYSTEM_BIOS( 7, "v2.05", "EuroPC v2.05" ) - ROMX_LOAD("bios_2.05.bin", 0x8000, 0x8000, CRC(372ceed6) SHA1(bb3d3957a22422f98be2225bdc47705bcab96f56), ROM_BIOS(8)) // v2.04 and v2.05 don't work yet, , see comment section + ROMX_LOAD("bios_v2.08b.bin", 0x8000, 0x8000, CRC(668c0d19) SHA1(69412e58e0ed1d141e633f094af91ec5f7ae064b), ROM_BIOS(6)) + ROM_SYSTEM_BIOS( 6, "v2.04", "EuroPC v2.04" ) + ROMX_LOAD("bios_v2.04.bin", 0x8000, 0x8000, CRC(e623967c) SHA1(5196b14018da1f3198e2950af0e6eab41425f556), ROM_BIOS(7)) + ROM_SYSTEM_BIOS( 7, "v2.05", "EuroPC v2.05" ) + ROMX_LOAD("bios_2.05.bin", 0x8000, 0x8000, CRC(372ceed6) SHA1(bb3d3957a22422f98be2225bdc47705bcab96f56), ROM_BIOS(8)) // v2.04 and v2.05 don't work yet, , see comment section ROM_END ROM_START( europc2 ) diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index 49dcdd3e792..6aad71d332c 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -71,7 +71,7 @@ READ8_MEMBER( gamate_state::card_available_check ) { // bits 0 and 1 checked return m_card_available ? 3: 1; -} +} WRITE8_MEMBER( gamate_state::card_reset ) { @@ -115,7 +115,7 @@ READ8_MEMBER(gamate_state::read_cart) } static ADDRESS_MAP_START( gamate_mem, AS_PROGRAM, 8, gamate_state ) - AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM + AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x03f0) AM_READWRITE(sound_r,sound_w) AM_RANGE(0x4400, 0x4400) AM_MIRROR(0x03ff) AM_READ_PORT("JOY") AM_RANGE(0x4800, 0x4800) AM_MIRROR(0x03ff) AM_READ(gamate_nmi_r) diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 129fc920c3b..ddc1feb620a 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -498,7 +498,7 @@ static MACHINE_CONFIG_START( hikaru ) // MCFG_CPU_IO_MAP(hikaru_port) MCFG_CPU_FORCE_NO_DRC() // MCFG_CPU_VBLANK_INT("screen", hikaru,vblank) - + MCFG_CPU_ADD("slave", SH4LE, CPU_CLOCK) MCFG_CPU_PROGRAM_MAP(hikaru_map_slave) MCFG_CPU_FORCE_NO_DRC() diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index 23071ef9b94..c777aab8bab 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -417,8 +417,8 @@ static MACHINE_CONFIG_DERIVED( isbc8630, rpc86 ) MCFG_ISBC_215_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w)) MCFG_DEVICE_ADD("statuslatch", LS259, 0) // U14 -// MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate0)) -// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate1)) +// MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate0)) +// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate1)) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(isbc_state, nmi_mask_w)) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(isbc_state, override_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(isbc_state, bus_intr_out1_w)) diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp index 7119c10621c..45e4ab5f1a5 100644 --- a/src/mame/drivers/jalmah.cpp +++ b/src/mame/drivers/jalmah.cpp @@ -753,7 +753,7 @@ void jalmah_state::daireika_palette_dma(uint16_t val) /*a1=88000*/ if(val == 0) return; - + src_addr = 0x301c0 + (val * 0x40); // popmessage("%08x",src_addr); for(index_1 = 0; index_1 < 0x200; index_1 += 0x20) diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index 0cfe72d4590..a86dc50fc0d 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -28,7 +28,7 @@ Year + Game System Protection Plus Alpha A Yes + Encryption (key 2) Saint Dragon A Yes + Encryption (key 1) 90 RodLand (World, set 1) / A Encryption (key 3) - RodLand (World, set 2) A Encryption (key 2) + RodLand (World, set 2) A Encryption (key 2) RodLand (Japan) A Encryption (key 2) R&T (Prototype?) A Encryption (key 2) Phantasm (Japan) / A Encryption (key 1) diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp index da2e53e0263..b01caadf534 100644 --- a/src/mame/drivers/mephisto_montec.cpp +++ b/src/mame/drivers/mephisto_montec.cpp @@ -317,11 +317,11 @@ WRITE8_MEMBER(mephisto_montec_state::mondial2_input_mux_w) { if (!BIT(leds_data, i)) { - if (data & 0x10) output().set_led_value(100 + i, 1); - if (data & 0x20) output().set_led_value( 8 + i, 1); - if (data & 0x40) output().set_led_value( 0 + i, 1); + if (data & 0x10) output().set_led_value(100 + i, 1); + if (data & 0x20) output().set_led_value( 8 + i, 1); + if (data & 0x40) output().set_led_value( 0 + i, 1); } - } + } m_input_mux = data ^ 0xff; m_beeper->set_state(BIT(data, 7)); diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index ee8862fdcd1..2ac54b96b14 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1956,7 +1956,7 @@ static ADDRESS_MAP_START( aw_map, AS_PROGRAM, 64, atomiswave_state ) AM_RANGE(0x08000000, 0x0bffffff) AM_NOP // 'Unassigned' /* Area 3 */ - AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_SHARE("dc_ram") + AM_RANGE(0x0c000000, 0x0cffffff) AM_RAM AM_SHARE("dc_ram") AM_RANGE(0x0d000000, 0x0dffffff) AM_RAM AM_SHARE("dc_ram") // extra ram on Naomi (mirror on DC) AM_RANGE(0x0e000000, 0x0effffff) AM_RAM AM_SHARE("dc_ram") // mirror AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE("dc_ram") // mirror @@ -2699,9 +2699,9 @@ MACHINE_RESET_MEMBER(naomi_state,naomi) MCFG_CPU_PROGRAM_MAP(naomi_map) MCFG_CPU_IO_MAP(naomi_port) MCFG_CPU_FORCE_NO_DRC() - + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dc_state, dc_scanline, "screen", 0, 1) - + MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8. MCFG_CPU_PROGRAM_MAP(dc_audio_map) diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index 6b38c897a35..fc0a5d30df5 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -333,7 +333,7 @@ Form Factor: Luggable CPU: 8088 @ 4.77MHz RAM: 256K, expandable to 512K and 640K Mainboard with 4 ISA slots, video decoder circuitry to show 16 levels of grayscale on the internal monitor, interface to WD1002-HD0 harddisk controller -Bus: 4x ISA: 1) 8088 slot CPU, keyboard connector, reset switch, +Bus: 4x ISA: 1) 8088 slot CPU, keyboard connector, reset switch, 2) Floppy disk controller, serial, parallel, RAM expansion 3) Kaypro CGA card with composite and colour TTL outputs, ROM 81-820 needs to be dumped 4) empty @@ -804,7 +804,7 @@ static MACHINE_CONFIG_DERIVED(kaypro16, pccga) MCFG_DEVICE_MODIFY("isa3") MCFG_SLOT_FIXED(true) MCFG_DEVICE_MODIFY("isa4") - MCFG_SLOT_FIXED(true) + MCFG_SLOT_FIXED(true) MCFG_DEVICE_MODIFY("isa5") MCFG_SLOT_DEFAULT_OPTION(nullptr) MCFG_DEVICE_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp index 79ead536042..fc6b8011e3a 100644 --- a/src/mame/drivers/pgm2.cpp +++ b/src/mame/drivers/pgm2.cpp @@ -464,10 +464,10 @@ ROM_START( ddpdojh ) ROM_LOAD16_WORD_SWAP( "ddpdoj_wave0.u12", 0x00000000, 0x1000000, CRC(2b71a324) SHA1(f69076cc561f40ca564d804bc7bd455066f8d77c) ) ROM_END -/* - The Kov3 Program rom is a module consisting of a NOR flash and a FPGA, this provides an extra layer of encryption on top of the usual +/* + The Kov3 Program rom is a module consisting of a NOR flash and a FPGA, this provides an extra layer of encryption on top of the usual that is only unlocked when the correct sequence is recieved from the ARM MCU (IGS036) - + Newer gambling games use the same modules. */ @@ -661,7 +661,7 @@ void pgm2_state::decrypt_kov3_module(uint32_t addrxor, uint16_t dataxor) for (int i = 0; i < size/2; i++) buffer[i] = src[i^addrxor]^dataxor; - + memcpy(src, &buffer[0], size); } diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp index 735a6ec0962..34790927f93 100644 --- a/src/mame/drivers/rx78.cpp +++ b/src/mame/drivers/rx78.cpp @@ -471,12 +471,12 @@ static MACHINE_CONFIG_START( rx78 ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ -// MCFG_SCREEN_SIZE(192, 184) -// MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 184-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ +// MCFG_SCREEN_SIZE(192, 184) +// MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 184-1) /* guess: generic NTSC video timing at 256x224, system runs at 192x184, suppose with some border area to compensate */ - MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 442, 0, 256, 263, 0, 224) + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 442, 0, 256, 263, 0, 224) MCFG_SCREEN_UPDATE_DRIVER(rx78_state, screen_update) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp index 115f0823c50..5b5537ab5d0 100644 --- a/src/mame/drivers/saturn.cpp +++ b/src/mame/drivers/saturn.cpp @@ -484,12 +484,12 @@ public: uint8_t saturn_direct_port_read(bool which); uint8_t smpc_direct_mode(uint16_t in_value, bool which); uint8_t smpc_th_control_mode(uint16_t in_value, bool which); - + void nvram_init(nvram_device &nvram, void *data, size_t size); required_device<sat_cart_slot_device> m_exp; required_device<nvram_device> m_nvram; - + required_device<saturn_control_port_device> m_ctrl1; required_device<saturn_control_port_device> m_ctrl2; @@ -587,7 +587,7 @@ void sat_console_state::nvram_init(nvram_device &nvram, void *data, size_t size) MACHINE_START_MEMBER(sat_console_state, saturn) -{ +{ machine().device<scsp_device>("scsp")->set_ram_base(m_sound_ram); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x02400000, 0x027fffff, read32_delegate(FUNC(sat_console_state::saturn_null_ram_r),this), write32_delegate(FUNC(sat_console_state::saturn_null_ram_w),this)); @@ -644,7 +644,7 @@ MACHINE_START_MEMBER(sat_console_state, saturn) } // save states -// save_pointer(NAME(m_scu_regs.get()), 0x100/4); +// save_pointer(NAME(m_scu_regs.get()), 0x100/4); save_item(NAME(m_en_68k)); save_item(NAME(m_scsp_last_line)); save_item(NAME(m_vdp2.odd)); @@ -717,8 +717,8 @@ inline uint8_t sat_console_state::saturn_direct_port_read(bool which) uint8_t cur_mode = m_smpc_hle->get_ddr(which); uint8_t res = 0; uint16_t ctrl_read = port->read_direct(); - -// check for control method + +// check for control method switch(cur_mode & 0x60) { case 0: break; @@ -873,7 +873,7 @@ MACHINE_CONFIG_DERIVED( saturnus, saturn ) MCFG_DEVICE_MODIFY("smpc") smpc_hle_device::static_set_region_code(*device, 4); - + MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED( saturneu, saturn ) @@ -909,7 +909,7 @@ MACHINE_CONFIG_END void sat_console_state::saturn_init_driver(int rgn) { -// m_saturn_region = rgn; +// m_saturn_region = rgn; m_vdp2.pal = (rgn == 12) ? 1 : 0; // set compatible options @@ -929,7 +929,7 @@ void sat_console_state::saturn_init_driver(int rgn) m_minit_boost_timeslice = attotime::zero; m_sinit_boost_timeslice = attotime::zero; -// m_scu_regs = make_unique_clear<uint32_t[]>(0x100/4); +// m_scu_regs = make_unique_clear<uint32_t[]>(0x100/4); m_backupram = make_unique_clear<uint8_t[]>(0x8000); } diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index e187e153130..391fafa9e4b 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -324,7 +324,7 @@ MACHINE_CONFIG_END ROM_LOAD16_WORD( "mb_serial.ic57", 0x0000, 0x0080, CRC(e1e3c009) SHA1(66bc636c527389c3338f631d78c788b4bd4e93be) ) // net_firm_119.ic72 - Network/Media Board firmware VER 1.19(VxWorks), 1st half contain original 1.10 version -// fpr-24407.ic72 - version 1.25 +// fpr-24407.ic72 - version 1.25 #define SEGASP_NETFIRM \ ROM_REGION( 0x200000, "netcpu", 0) \ ROM_LOAD( "net_eeprom.ic74s", 0x00000000, 0x200, CRC(77cc5a6c) SHA1(cbfba546256b70bce6c6fd0030d7e2e410a25526) ) \ diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp index 5dcaddb9bdf..8aeeb792914 100644 --- a/src/mame/drivers/seibucats.cpp +++ b/src/mame/drivers/seibucats.cpp @@ -95,9 +95,9 @@ public: } // screen updates -// uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); -// IRQ_CALLBACK_MEMBER(spi_irq_callback); -// INTERRUPT_GEN_MEMBER(spi_interrupt); +// uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); +// IRQ_CALLBACK_MEMBER(spi_irq_callback); +// INTERRUPT_GEN_MEMBER(spi_interrupt); DECLARE_READ16_MEMBER(input_mux_r); DECLARE_WRITE16_MEMBER(input_select_w); @@ -109,7 +109,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; -// virtual void video_start() override; +// virtual void video_start() override; private: @@ -284,14 +284,14 @@ static MACHINE_CONFIG_START( seibucats ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_UPDATE_DRIVER(seibucats_state, screen_update) +// MCFG_SCREEN_UPDATE_DRIVER(seibucats_state, screen_update) MCFG_SCREEN_UPDATE_DRIVER(seibuspi_state, screen_update_sys386f) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, SPI_HTOTAL, SPI_HBEND, SPI_HBSTART, SPI_VTOTAL, SPI_VBEND, SPI_VBSTART) MCFG_GFXDECODE_ADD("gfxdecode", "palette", seibucats) MCFG_PALETTE_ADD_INIT_BLACK("palette", 8192) -// MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) +// MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) //MCFG_PALETTE_INIT_OWNER(seibucats_state, seibucats) /* sound hardware */ @@ -311,16 +311,16 @@ MACHINE_CONFIG_END ROM_START( emjjoshi ) ROM_REGION32_LE( 0x200000, "ipl", 0 ) /* i386 program */ - ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(e69bed6d) SHA1(e9626e704c5d28419cfa6a7a2c1b13b4b46f941c) ) - ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(1082ede1) SHA1(0d1a682f37ede5c9070c14d1c3491a3082ad0759) ) - ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(df85a8f7) SHA1(83226767b0c33e8cc3baee6f6bb17e4f1a6c9c27) ) - ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(6fe7fd41) SHA1(e7ea9cb83bdeed4872f9e423b8294b9ca4b29b6b) ) - + ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(e69bed6d) SHA1(e9626e704c5d28419cfa6a7a2c1b13b4b46f941c) ) + ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(1082ede1) SHA1(0d1a682f37ede5c9070c14d1c3491a3082ad0759) ) + ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(df85a8f7) SHA1(83226767b0c33e8cc3baee6f6bb17e4f1a6c9c27) ) + ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(6fe7fd41) SHA1(e7ea9cb83bdeed4872f9e423b8294b9ca4b29b6b) ) + ROM_REGION( 0x30000, "gfx1", ROMREGION_ERASEFF ) /* text layer roms - none! */ ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASEFF ) /* background layer roms - none! */ - ROM_REGION( 0x600000, "gfx3", 0) + ROM_REGION( 0x600000, "gfx3", 0) ROM_LOAD("obj1.u0231", 0x000000, 0x200000, NO_DUMP ) ROM_LOAD("obj2.u0233", 0x200000, 0x200000, NO_DUMP ) ROM_LOAD("obj3.u0232", 0x400000, 0x200000, NO_DUMP ) @@ -334,16 +334,16 @@ ROM_END // MJ1-1537 ROM_START( emjscanb ) ROM_REGION32_LE( 0x200000, "ipl", 0 ) /* i386 program */ - ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(6e5c7c16) SHA1(19c00833357b97d0ed91a962e95d3ae2582da66c) ) - ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(a5a17fdd) SHA1(3295ecb1055cf1ab612eb915aabe8d2895aeca6a) ) - ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(b89d7693) SHA1(174b2ecfd8a3c593a81905c1c9d62728f710f5d1) ) - ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(6b38a07b) SHA1(2131ae726fc38c8054801c1de4d17eec5b55dd2d) ) - + ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(6e5c7c16) SHA1(19c00833357b97d0ed91a962e95d3ae2582da66c) ) + ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(a5a17fdd) SHA1(3295ecb1055cf1ab612eb915aabe8d2895aeca6a) ) + ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(b89d7693) SHA1(174b2ecfd8a3c593a81905c1c9d62728f710f5d1) ) + ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(6b38a07b) SHA1(2131ae726fc38c8054801c1de4d17eec5b55dd2d) ) + ROM_REGION( 0x30000, "gfx1", ROMREGION_ERASEFF ) /* text layer roms - none! */ ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASEFF ) /* background layer roms - none! */ - ROM_REGION( 0x600000, "gfx3", 0) + ROM_REGION( 0x600000, "gfx3", 0) ROM_LOAD("obj1.u0231", 0x000000, 0x200000, NO_DUMP ) ROM_LOAD("obj2.u0233", 0x200000, 0x200000, NO_DUMP ) ROM_LOAD("obj3.u0232", 0x400000, 0x200000, NO_DUMP ) @@ -355,16 +355,16 @@ ROM_END ROM_START( emjtrapz ) ROM_REGION32_LE( 0x200000, "ipl", 0 ) /* i386 program */ - ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(88e4ef2a) SHA1(110451c09983ce4720f75b89282ca49f47169a85) ) - ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(e4716996) SHA1(6abd84c1e4facf6570988db0a63968a1647144b1) ) - ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(69995273) SHA1(a7e10d21a524a286acd0a8c19c41a101eee30626) ) - ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(99f86a19) SHA1(41deb5eb78c0a675da7e1b1bbd5c440e157c7a25) ) - + ROM_LOAD32_BYTE( "prg0.u016", 0x000000, 0x080000, CRC(88e4ef2a) SHA1(110451c09983ce4720f75b89282ca49f47169a85) ) + ROM_LOAD32_BYTE( "prg1.u011", 0x000001, 0x080000, CRC(e4716996) SHA1(6abd84c1e4facf6570988db0a63968a1647144b1) ) + ROM_LOAD32_BYTE( "prg2.u017", 0x000002, 0x080000, CRC(69995273) SHA1(a7e10d21a524a286acd0a8c19c41a101eee30626) ) + ROM_LOAD32_BYTE( "prg3.u015", 0x000003, 0x080000, CRC(99f86a19) SHA1(41deb5eb78c0a675da7e1b1bbd5c440e157c7a25) ) + ROM_REGION( 0x30000, "gfx1", ROMREGION_ERASEFF ) /* text layer roms - none! */ ROM_REGION( 0x900000, "gfx2", ROMREGION_ERASEFF ) /* background layer roms - none! */ - ROM_REGION( 0x600000, "gfx3", 0) + ROM_REGION( 0x600000, "gfx3", 0) ROM_LOAD("obj1.u0231", 0x000000, 0x200000, NO_DUMP ) ROM_LOAD("obj2.u0233", 0x200000, 0x200000, NO_DUMP ) ROM_LOAD("obj3.u0232", 0x400000, 0x200000, NO_DUMP ) @@ -403,4 +403,4 @@ ROM_END /* 25 */ // Oshioki /* 26 */ // Private Eyes /* 27 */ // Gal Jong Kakutou Club -/* 28 */ // BINKAN Lips Plus +/* 28 */ // BINKAN Lips Plus diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 3a832c9f7c2..8d0df302af0 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -421,7 +421,7 @@ DRIVER_INIT_MEMBER(stv_state,stv) m_minit_boost_timeslice = attotime::zero; m_sinit_boost_timeslice = attotime::zero; -// m_scu_regs = std::make_unique<uint32_t[]>(0x100/4); +// m_scu_regs = std::make_unique<uint32_t[]>(0x100/4); m_backupram = std::make_unique<uint8_t[]>(0x8000); memset(m_backupram.get(), 0, sizeof(uint8_t) * 0x8000); @@ -1086,7 +1086,7 @@ static MACHINE_CONFIG_START( stv ) MCFG_SMPC_HLE_MASTER_RESET_CB(WRITELINE(saturn_state, master_sh2_reset_w)) MCFG_SMPC_HLE_MASTER_NMI_CB(WRITELINE(saturn_state, master_sh2_nmi_w)) MCFG_SMPC_HLE_SLAVE_RESET_CB(WRITELINE(saturn_state, slave_sh2_reset_w)) -// MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(saturn_state, sound_68k_reset_w)) // ST-V games controls reset line via PDR2 +// MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(saturn_state, sound_68k_reset_w)) // ST-V games controls reset line via PDR2 MCFG_SMPC_HLE_SYSTEM_RESET_CB(WRITELINE(saturn_state, system_reset_w)) MCFG_SMPC_HLE_SYSTEM_HALT_CB(WRITELINE(saturn_state, system_halt_w)) MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(saturn_state, dot_select_w)) @@ -1216,7 +1216,7 @@ MACHINE_RESET_MEMBER(stv_state,stv) else m_cart_reg[3] = nullptr; - + m_en_68k = 0; m_port_sel = m_mux_data = 0; @@ -1270,7 +1270,7 @@ MACHINE_START_MEMBER(stv_state,stv) machine().device<scsp_device>("scsp")->set_ram_base(m_sound_ram); // save states -// save_pointer(NAME(m_scu_regs.get()), 0x100/4); +// save_pointer(NAME(m_scu_regs.get()), 0x100/4); save_item(NAME(m_en_68k)); save_item(NAME(m_prev_gamebank_select)); save_item(NAME(m_port_sel)); @@ -1356,19 +1356,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( batmanfr ) PORT_INCLUDE( stv ) - + PORT_MODIFY("PORTA") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Jump") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Punch") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Kick") - + PORT_MODIFY("PORTB") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Punch") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Kick") - + PORT_MODIFY("PORTE") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2887,7 +2887,7 @@ ROM_START( sfish2 ) DISK_REGION( "cdrom" ) DISK_IMAGE_READONLY( "cdp-00428", 0, SHA1(166cb5518fa5e0ab15d40dade70fa8913089dcd2) ) - ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ + ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ ROM_END ROM_START( sfish2j ) diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index d2be1095d38..9b9751282c7 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -8,16 +8,16 @@ Driver by Manuel Abadia <emumanu+mame@gmail.com> ** NOTES: Merge with wrally.ccp??? Address map nearly identical & PCB is reworked to add connections for light guns and different RAM - - is the visible area correct? if it's larger than the startup - screen then scene 5 of desert chariots doesn't cover the entire - screen either. - - the instructions say to reload the gun after each shot, but - there is no reload button listed in service mode, and it doesn't - seem to be required, was it a mechanical feature of the gun or - is our logic inverted somewhere, the gun test shows 'ON' when - you're not pressing fire too. + + is the visible area correct? if it's larger than the startup + screen then scene 5 of desert chariots doesn't cover the entire + screen either. + + the instructions say to reload the gun after each shot, but + there is no reload button listed in service mode, and it doesn't + seem to be required, was it a mechanical feature of the gun or + is our logic inverted somewhere, the gun test shows 'ON' when + you're not pressing fire too. REF.940531 +-------------------------------------------------+ diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp index baf635780b6..5ab8ae1df32 100644 --- a/src/mame/drivers/tmc600.cpp +++ b/src/mame/drivers/tmc600.cpp @@ -50,26 +50,26 @@ Notes: CN2 - 10x2 pin printer connector [TMC-700] CN3 - 32x3 pin EURO connector CN4 - DIN5D tape connector - 1 input (500 mV / 47 kohm) - 2 GND - 3 output (580 mV / 47 kohm) - 4 input (500 mV / 47 kohm) - 5 output (580 mV / 47 kohm) + 1 input (500 mV / 47 kohm) + 2 GND + 3 output (580 mV / 47 kohm) + 4 input (500 mV / 47 kohm) + 5 output (580 mV / 47 kohm) CN5 - DIN5X video connector - 1 GND - 2 GND - 3 ? - 4 GND - 5 ? + 1 GND + 2 GND + 3 ? + 4 GND + 5 ? CN6 - DIN2 power connector - 1 8..12V DC..400Hz 300mA - 2 GND + 1 8..12V DC..400Hz 300mA + 2 GND CN7 - DIN5D audio connector [TMCP-300] - 1 NC - 2 GND - 3 AUDIO - 4 NC - 5 AUDIO + 1 NC + 2 GND + 3 AUDIO + 4 NC + 5 AUDIO CN8 - 10x2 pin keyboard connector SW1 - RUN/STOP switch SW2 - internal speaker/external audio switch [TMCP-300] diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h index 0bffd8e9862..fbd8e7613ec 100644 --- a/src/mame/includes/saturn.h +++ b/src/mame/includes/saturn.h @@ -53,14 +53,14 @@ public: memory_region *m_cart_reg[4]; std::unique_ptr<uint8_t[]> m_backupram; -// std::unique_ptr<uint32_t[]> m_scu_regs; +// std::unique_ptr<uint32_t[]> m_scu_regs; std::unique_ptr<uint16_t[]> m_vdp2_regs; std::unique_ptr<uint32_t[]> m_vdp2_vram; std::unique_ptr<uint32_t[]> m_vdp2_cram; std::unique_ptr<uint32_t[]> m_vdp1_vram; std::unique_ptr<uint16_t[]> m_vdp1_regs; - uint8_t m_en_68k; + uint8_t m_en_68k; int m_minit_boost; int m_sinit_boost; @@ -365,7 +365,7 @@ public: uint8_t line_screen_enabled; uint8_t mosaic_screen_enabled; bool roz_mode3; - + int layer_name; /* just to keep track */ } stv2_current_tilemap; @@ -591,9 +591,9 @@ public: DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback); -// DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); -// DECLARE_READ16_MEMBER(scudsp_dma_r); -// DECLARE_WRITE16_MEMBER(scudsp_dma_w); +// DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); +// DECLARE_READ16_MEMBER(scudsp_dma_r); +// DECLARE_WRITE16_MEMBER(scudsp_dma_w); // SMPC HLE delegates DECLARE_WRITE_LINE_MEMBER(master_sh2_reset_w); @@ -605,10 +605,10 @@ public: DECLARE_WRITE_LINE_MEMBER(dot_select_w); -// void debug_scudma_command(int ref, const std::vector<std::string> ¶ms); -// void debug_scuirq_command(int ref, const std::vector<std::string> ¶ms); -// void debug_help_command(int ref, const std::vector<std::string> ¶ms); -// void debug_commands(int ref, const std::vector<std::string> ¶ms); +// void debug_scudma_command(int ref, const std::vector<std::string> ¶ms); +// void debug_scuirq_command(int ref, const std::vector<std::string> ¶ms); +// void debug_help_command(int ref, const std::vector<std::string> ¶ms); +// void debug_commands(int ref, const std::vector<std::string> ¶ms); }; diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 3c28545fcb5..959b75770f7 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -133,7 +133,7 @@ public: uint16_t crypt_read_callback(uint32_t addr); uint16_t crypt_read_callback_ch1(uint32_t addr); uint16_t crypt_read_callback_ch2(uint32_t addr); - + DECLARE_READ8_MEMBER(pdr1_input_r); DECLARE_READ8_MEMBER(pdr2_input_r); DECLARE_WRITE8_MEMBER(pdr1_output_w); diff --git a/src/mame/layout/mephisto_mondial2.lay b/src/mame/layout/mephisto_mondial2.lay index 84e23a50fca..acdf037fca2 100644 --- a/src/mame/layout/mephisto_mondial2.lay +++ b/src/mame/layout/mephisto_mondial2.lay @@ -85,58 +85,58 @@ <group name="panel"> <bezel element="panel_background"><bounds x="0" y="0" width="78" height="12" /></bezel> - <bezel name="led100" element="led"> <bounds x="1.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led101" element="led"> <bounds x="11.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led102" element="led"> <bounds x="21.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led103" element="led"> <bounds x="31.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led104" element="led"> <bounds x="41.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led105" element="led"> <bounds x="51.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led106" element="led"> <bounds x="61.1" y="0.25" width="1.3" height="1" /> </bezel> - <bezel name="led107" element="led"> <bounds x="71.1" y="0.25" width="1.3" height="1" /> </bezel> - - <bezel element="hlb" inputtag="KEY.1" inputmask="0x01"> <bounds x="1" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x02"> <bounds x="11" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x04"> <bounds x="21" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x08"> <bounds x="31" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x10"> <bounds x="41" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x20"> <bounds x="51" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x40"> <bounds x="61" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.1" inputmask="0x80"> <bounds x="71" y="2" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x01"> <bounds x="1" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x02"> <bounds x="11" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x04"> <bounds x="21" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x08"> <bounds x="31" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x10"> <bounds x="41" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x20"> <bounds x="51" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x40"> <bounds x="61" y="7.5" width="6" height="4" /> </bezel> - <bezel element="hlb" inputtag="KEY.0" inputmask="0x80"> <bounds x="71" y="7.5" width="6" height="4" /> </bezel> - - <bezel element="text_play"> <bounds x="3" y="0" width="4" height="1.5" /> </bezel> - <bezel element="text_pos"> <bounds x="13" y="0" width="3" height="1.5" /> </bezel> - <bezel element="text_mem"> <bounds x="23" y="0" width="3" height="1.5" /> </bezel> - <bezel element="text_info"> <bounds x="33" y="0" width="4" height="1.5" /> </bezel> - <bezel element="text_err"> <bounds x="43" y="0" width="3" height="1.5" /> </bezel> - <bezel element="text_plus"> <bounds x="53" y="0" width="3" height="1.5" /> </bezel> - <bezel element="text_black"> <bounds x="63" y="0" width="1" height="1.5" /> </bezel> - <bezel element="text_white"> <bounds x="73.5" y="0" width="1" height="1.5" /> </bezel> - - <bezel element="text_b1"> <bounds x="2" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b2"> <bounds x="12" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b3"> <bounds x="22" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b4"> <bounds x="32" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b5"> <bounds x="42" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b6"> <bounds x="52" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b7"> <bounds x="62" y="2.5" width="4" height="1.5" /> </bezel> - <bezel element="text_b8"> <bounds x="72" y="2.5" width="4" height="1.5" /> </bezel> - - <bezel element="text_play"> <bounds x="2" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_pos"> <bounds x="12" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_mem"> <bounds x="22" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_info"> <bounds x="32" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_cl"> <bounds x="42" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_lev"> <bounds x="52" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_ent"> <bounds x="62" y="9.5" width="4" height="1.5" /> </bezel> - <bezel element="text_res"> <bounds x="72" y="9.5" width="4" height="1.5" /> </bezel> + <bezel name="led100" element="led"> <bounds x="1.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led101" element="led"> <bounds x="11.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led102" element="led"> <bounds x="21.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led103" element="led"> <bounds x="31.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led104" element="led"> <bounds x="41.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led105" element="led"> <bounds x="51.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led106" element="led"> <bounds x="61.1" y="0.25" width="1.3" height="1" /> </bezel> + <bezel name="led107" element="led"> <bounds x="71.1" y="0.25" width="1.3" height="1" /> </bezel> + + <bezel element="hlb" inputtag="KEY.1" inputmask="0x01"> <bounds x="1" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x02"> <bounds x="11" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x04"> <bounds x="21" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x08"> <bounds x="31" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x10"> <bounds x="41" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x20"> <bounds x="51" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x40"> <bounds x="61" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.1" inputmask="0x80"> <bounds x="71" y="2" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x01"> <bounds x="1" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x02"> <bounds x="11" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x04"> <bounds x="21" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x08"> <bounds x="31" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x10"> <bounds x="41" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x20"> <bounds x="51" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x40"> <bounds x="61" y="7.5" width="6" height="4" /> </bezel> + <bezel element="hlb" inputtag="KEY.0" inputmask="0x80"> <bounds x="71" y="7.5" width="6" height="4" /> </bezel> + + <bezel element="text_play"> <bounds x="3" y="0" width="4" height="1.5" /> </bezel> + <bezel element="text_pos"> <bounds x="13" y="0" width="3" height="1.5" /> </bezel> + <bezel element="text_mem"> <bounds x="23" y="0" width="3" height="1.5" /> </bezel> + <bezel element="text_info"> <bounds x="33" y="0" width="4" height="1.5" /> </bezel> + <bezel element="text_err"> <bounds x="43" y="0" width="3" height="1.5" /> </bezel> + <bezel element="text_plus"> <bounds x="53" y="0" width="3" height="1.5" /> </bezel> + <bezel element="text_black"> <bounds x="63" y="0" width="1" height="1.5" /> </bezel> + <bezel element="text_white"> <bounds x="73.5" y="0" width="1" height="1.5" /> </bezel> + + <bezel element="text_b1"> <bounds x="2" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b2"> <bounds x="12" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b3"> <bounds x="22" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b4"> <bounds x="32" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b5"> <bounds x="42" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b6"> <bounds x="52" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b7"> <bounds x="62" y="2.5" width="4" height="1.5" /> </bezel> + <bezel element="text_b8"> <bounds x="72" y="2.5" width="4" height="1.5" /> </bezel> + + <bezel element="text_play"> <bounds x="2" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_pos"> <bounds x="12" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_mem"> <bounds x="22" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_info"> <bounds x="32" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_cl"> <bounds x="42" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_lev"> <bounds x="52" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_ent"> <bounds x="62" y="9.5" width="4" height="1.5" /> </bezel> + <bezel element="text_res"> <bounds x="72" y="9.5" width="4" height="1.5" /> </bezel> </group> <view name="Chessboard + Display"> @@ -305,7 +305,7 @@ <bezel element="panel_background"><bounds x="0" y="88.5" width="84" height="13.5" /></bezel> <group ref="panel"><bounds x="3" y="89" width="78" height="12" /></group> </view> - + <view name="Display"> <group ref="panel"><bounds x="0" y="0" width="78" height="12" /></group> </view> diff --git a/src/mame/layout/notechan.lay b/src/mame/layout/notechan.lay index 811badcf7dc..e379c0e0be6 100644 --- a/src/mame/layout/notechan.lay +++ b/src/mame/layout/notechan.lay @@ -2,15 +2,15 @@ <mamelayout version="2"> <!-- - Test panel for Note Chance. - Written by Roberto Fresca. + Test panel for Note Chance. + Written by Roberto Fresca. - 4 rows of 8 lines. - From D7 to D0. + 4 rows of 8 lines. + From D7 to D0. --> <!-- - ****** Elements ****** + ****** Elements ****** --> <element name="L0" defstate="0"> @@ -436,14 +436,14 @@ <!-- - ****** Screen & Position ****** + ****** Screen & Position ****** --> <view name="Button Lamps"> <bounds left="0" top="0" right="4" bottom="4" /> <!-- - ****** 1st row ****** + ****** 1st row ****** --> <bezel name="lamp0" element="L0"> @@ -472,7 +472,7 @@ </bezel> <!-- - ****** 2nd row ****** + ****** 2nd row ****** --> <bezel name="lamp8" element="L8"> @@ -501,7 +501,7 @@ </bezel> <!-- - ****** 3rd row ****** + ****** 3rd row ****** --> <bezel name="lamp16" element="L16"> @@ -530,7 +530,7 @@ </bezel> <!-- - ****** 4th row ****** + ****** 4th row ****** --> <bezel name="lamp24" element="L24"> diff --git a/src/mame/machine/dec0.cpp b/src/mame/machine/dec0.cpp index a5f59d8b347..0dc090e32be 100644 --- a/src/mame/machine/dec0.cpp +++ b/src/mame/machine/dec0.cpp @@ -71,7 +71,7 @@ READ16_MEMBER(dec0_state::midres_controls_r) case 0xa: // clr.w return 0; - + case 0xc: return 0; /* ?? watchdog ?? */ } diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp index 29054381891..473a77f8ac4 100644 --- a/src/mame/machine/kay_kbd.cpp +++ b/src/mame/machine/kay_kbd.cpp @@ -18,6 +18,8 @@ ******************************************************************************/ #include "emu.h" +#include "machine/kay_kbd.h" + #include "sound/beep.h" #include "includes/kaypro.h" diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp index fcea8b20e19..b13fe92b4aa 100644 --- a/src/mame/machine/saturn.cpp +++ b/src/mame/machine/saturn.cpp @@ -340,7 +340,7 @@ WRITE_LINE_MEMBER(saturn_state::master_sh2_nmi_w) WRITE_LINE_MEMBER( saturn_state::slave_sh2_reset_w ) { m_slave->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE); -// m_smpc.slave_on = state; +// m_smpc.slave_on = state; } WRITE_LINE_MEMBER( saturn_state::sound_68k_reset_w ) @@ -378,7 +378,7 @@ WRITE_LINE_MEMBER(saturn_state::system_halt_w) WRITE_LINE_MEMBER(saturn_state::dot_select_w) { uint32_t xtal; - + xtal = state ? MASTER_CLOCK_320 : MASTER_CLOCK_352; machine().device("maincpu")->set_unscaled_clock(xtal/2); diff --git a/src/mame/machine/seibucop/seibucop_dma.hxx b/src/mame/machine/seibucop/seibucop_dma.hxx index 904caa64511..114d2c432c9 100644 --- a/src/mame/machine/seibucop/seibucop_dma.hxx +++ b/src/mame/machine/seibucop/seibucop_dma.hxx @@ -49,7 +49,7 @@ void raiden2cop_device::dma_palette_brightness() src = (cop_dma_src[cop_dma_mode] << 6); dst = (cop_dma_dst[cop_dma_mode] << 6); size = ((cop_dma_size[cop_dma_mode] << 5) - (cop_dma_dst[cop_dma_mode] << 6) + 0x20) / 2; - + for (i = 0; i < size; i++) { uint16_t pal_val; @@ -94,7 +94,7 @@ void raiden2cop_device::dma_palette_brightness() g = (paldata & 0x03e0) >> 5; rt = (targetpaldata & 0x001f) >> 0; r = (paldata & 0x001f) >> 0; - + // TODO: presumably any brightness value that isn't 0x0000-0x000f has no effect here if (pal_brightness_val == 0x10) pal_val = bt << 10 | gt << 5 | rt << 0; diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index b4b94bdf69a..4dbf86e6620 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -257,7 +257,7 @@ void tc0220ioc_device::device_reset() MACHINE_CONFIG_MEMBER( tc0220ioc_device::device_add_mconfig ) MCFG_WATCHDOG_ADD("watchdog") -// MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(3200)) +// MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(3200)) MACHINE_CONFIG_END /***************************************************************************** diff --git a/src/mame/mame.lst b/src/mame/mame.lst index faa465f0c45..e54b6e9a650 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -8711,7 +8711,7 @@ bishi // GX575 (c) 1996 (Japan) sbishi // GX675 (c) 1998 (Japan) sbishik // GX675 (c) 1998 (Korea) sbishika // GX675 (c) 1998 (Korea) -dobouchn // +dobouchn // @source:bitgraph.cpp bitgrpha // @@ -17125,7 +17125,7 @@ kaypro4a // Kaypro 4 - 4/84 kaypro4p88 // Kaypro 4 - 4/83 w/plus88 board installed kayproii // Kaypro II - 2/83 omni2 // Omni II -omni4 // Omni 4 +omni4 // Omni 4 robie // Kaypro Robie @source:kc.cpp @@ -33451,7 +33451,7 @@ fpoint1 // (c) 1989 (Japan, FD1094) fpoint1d // fpointbj // (c) 1989 (Datsu bootleg, Japan) fpointbl // (c) 1989 (Datsu bootleg) -fpointbla // +fpointbla // fpointd // goldnaxe // (c) 1989 (8751) goldnaxe1 // (c) 1989 (FD1094) @@ -33745,9 +33745,9 @@ strkfgtr // 1991.06 Strike Fighter (World) strkfgtrj // 1991.06 Strike Fighter (Japan) @source:seibucats.cpp -emjjoshi // (c) 1999 Seibu Kaihatsu / CATS -emjscanb // (c) 2001 Seibu Kaihatsu / CATS -emjtrapz // (c) 2001 Seibu Kaihatsu / CATS +emjjoshi // (c) 1999 Seibu Kaihatsu / CATS +emjscanb // (c) 2001 Seibu Kaihatsu / CATS +emjtrapz // (c) 2001 Seibu Kaihatsu / CATS @source:seibuspi.cpp batlball // (c) 1995 Seibu Kaihatsu (Tuning License) diff --git a/src/mame/video/gamate.cpp b/src/mame/video/gamate.cpp index 90b224f4034..02d82ab6b98 100644 --- a/src/mame/video/gamate.cpp +++ b/src/mame/video/gamate.cpp @@ -2,26 +2,26 @@ // copyright-holders:David Haywood, Peter Wilhelmsen, Kevtris /* - Notes: + Notes: - Some games are glitchy, most of these glitches are verified to happen on hardware - for example + Some games are glitchy, most of these glitches are verified to happen on hardware + for example - Badly flipped sprites in Tornado and Insect War - Heavy flickering sprites in many games + Badly flipped sprites in Tornado and Insect War + Heavy flickering sprites in many games - Most of these issues are difficult to notice on real hardware due to the poor - quality display. + Most of these issues are difficult to notice on real hardware due to the poor + quality display. - Thanks to Kevtris for the documentation on which this implementation is based - (some comments taken directly from this) - http://blog.kevtris.org/blogfiles/Gamate%20Inside.txt + Thanks to Kevtris for the documentation on which this implementation is based + (some comments taken directly from this) + http://blog.kevtris.org/blogfiles/Gamate%20Inside.txt - ToDo: + ToDo: - Emulate vram pull / LCD refresh timings more accurately. - Interrupt should maybe be in here, not in drivers/gamate.cpp? - Verify both Window modes act the same as hardware. + Emulate vram pull / LCD refresh timings more accurately. + Interrupt should maybe be in here, not in drivers/gamate.cpp? + Verify both Window modes act the same as hardware. */ #include "emu.h" @@ -125,7 +125,7 @@ WRITE8_MEMBER(gamate_video_device::xpos_w) /* BxxX XXXX B: Bitplane. 0 = lower (bitplane 0), 1 = upper (bitplane 1) - X: 5 lower bits of the 13 bit VRAM address. + X: 5 lower bits of the 13 bit VRAM address. */ m_bitplaneselect = (data & 0x80) >> 7; set_vram_addr_lower_5bits(data & 0x1f); @@ -135,7 +135,7 @@ WRITE8_MEMBER(gamate_video_device::ypos_w) { /* YYYY YYYY - Y: 8 upper bits of 13 bit VRAM address. + Y: 8 upper bits of 13 bit VRAM address. */ set_vram_addr_upper_8bits(data); } @@ -170,13 +170,13 @@ void gamate_video_device::get_real_x_and_y(int &ret_x, int &ret_y, int scanline) { /* the Gamate video has 2 'Window' modes, Mode 1 is enabled with an actual register - Mode 2 is enabled automatically based on the yscroll value - + Mode 2 is enabled automatically based on the yscroll value + both modes seem designed to allow for a non-scrolling status bar at the top of the display. */ - if (m_scrolly < 0xc8) + if (m_scrolly < 0xc8) { ret_y = scanline + m_scrolly; @@ -199,8 +199,8 @@ void gamate_video_device::get_real_x_and_y(int &ret_x, int &ret_y, int scanline) ret_x = m_scrollx; /* - Using Yscroll values of C8-CF, D8-DF, E8-EF, and F8-FF will result in the same - effect as if a Yscroll value of 00h were used. + Using Yscroll values of C8-CF, D8-DF, E8-EF, and F8-FF will result in the same + effect as if a Yscroll value of 00h were used. */ if (m_scrolly & 0x08) // values of C8-CF, D8-DF, E8-EF, and F8-FF { @@ -210,13 +210,13 @@ void gamate_video_device::get_real_x_and_y(int &ret_x, int &ret_y, int scanline) else { /* - Values D0-D7, E0-E7, and F0-F7 all produce a bit more useful effect. The upper - 1-8 scanlines will be pulled from rows F8-FFh in VRAM (i.e. 1F00h = row F8h). + Values D0-D7, E0-E7, and F0-F7 all produce a bit more useful effect. The upper + 1-8 scanlines will be pulled from rows F8-FFh in VRAM (i.e. 1F00h = row F8h). - If F0 is selected, then the upper 8 rows will be the last 8 rows in VRAM- - 1F00-1FFFh area. If F1 is selected, the upper 8 rows will be the last 7 rows - in VRAM and so on. This special window area DOES NOT SCROLL with X making it - useful for status bars. I don't think any games actually used it, though. + If F0 is selected, then the upper 8 rows will be the last 8 rows in VRAM- + 1F00-1FFFh area. If F1 is selected, the upper 8 rows will be the last 7 rows + in VRAM and so on. This special window area DOES NOT SCROLL with X making it + useful for status bars. I don't think any games actually used it, though. */ int fixedscanlines = m_scrolly & 0x7; @@ -232,7 +232,7 @@ void gamate_video_device::get_real_x_and_y(int &ret_x, int &ret_y, int scanline) ret_y = scanline;// +m_scrolly; //if (ret_y >= 0xc8) - // ret_y -= 0xc8; + // ret_y -= 0xc8; } } @@ -299,9 +299,9 @@ PALETTE_INIT_MEMBER(gamate_video_device, gamate) } /* - Of the 150 scanlines emitted, all contain pixel data pulled from RAM. There are - exactly 72900 clocks per frame, so at the nominal 4.433MHz rate, this means the - frame rate is 60.8093Hz. + Of the 150 scanlines emitted, all contain pixel data pulled from RAM. There are + exactly 72900 clocks per frame, so at the nominal 4.433MHz rate, this means the + frame rate is 60.8093Hz. */ MACHINE_CONFIG_MEMBER( gamate_video_device::device_add_mconfig ) diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index ff22e34adba..76eec7f87eb 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -583,7 +583,7 @@ uint32_t legionna_state::screen_update_legionna(screen_device &screen, bitmap_in draw_sprites(screen,bitmap,cliprect); //if (machine().input().code_pressed_once(KEYCODE_Z)) - // if (m_raiden2cop) m_raiden2cop->dump_table(); + // if (m_raiden2cop) m_raiden2cop->dump_table(); return 0; } @@ -604,7 +604,7 @@ uint32_t legionna_state::screen_update_heatbrl(screen_device &screen, bitmap_ind draw_sprites(screen,bitmap,cliprect); //if (machine().input().code_pressed_once(KEYCODE_Z)) - // if (m_raiden2cop) m_raiden2cop->dump_table(); + // if (m_raiden2cop) m_raiden2cop->dump_table(); return 0; } @@ -625,7 +625,7 @@ uint32_t legionna_state::screen_update_godzilla(screen_device &screen, bitmap_in draw_sprites(screen,bitmap,cliprect); //if (machine().input().code_pressed_once(KEYCODE_Z)) - // if (m_raiden2cop) m_raiden2cop->dump_table(); + // if (m_raiden2cop) m_raiden2cop->dump_table(); return 0; @@ -652,7 +652,7 @@ uint32_t legionna_state::screen_update_grainbow(screen_device &screen, bitmap_in draw_sprites(screen,bitmap,cliprect); //if (machine().input().code_pressed_once(KEYCODE_Z)) - // if (m_raiden2cop) m_raiden2cop->dump_table(); + // if (m_raiden2cop) m_raiden2cop->dump_table(); return 0; } diff --git a/src/mame/video/taito_b.cpp b/src/mame/video/taito_b.cpp index b4ce3fd91a6..caf0590af34 100644 --- a/src/mame/video/taito_b.cpp +++ b/src/mame/video/taito_b.cpp @@ -377,7 +377,7 @@ uint32_t taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 m_tc0180vcu->tilemap_draw(screen, bitmap, cliprect, 1, 0); - // TODO: only hiticej properly enables this up during attract mode, + // TODO: only hiticej properly enables this up during attract mode, // hitice / hiticerb keeps this disabled, maybe a btanb fixed in later revision? if (m_pixel_bitmap && (m_pixel_scroll[0] & 0x5800) == 0x5000) /* hitice only */ { diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index d8fe6a80395..1dda727ad85 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -47,8 +47,8 @@ * * */ - - + + #include "emu.h" #include "video/ygv608.h" #include "screen.h" @@ -255,12 +255,12 @@ static ADDRESS_MAP_START( regs_map, AS_IO, 8, ygv608_device ) AM_RANGE( 1, 1) AM_READWRITE(pattern_name_table_x_r,pattern_name_table_x_w) AM_RANGE( 2, 2) AM_READWRITE(ram_access_ctrl_r,ram_access_ctrl_w) - + AM_RANGE( 3, 3) AM_READWRITE(sprite_address_r,sprite_address_w) AM_RANGE( 4, 4) AM_READWRITE(scroll_address_r,scroll_address_w) AM_RANGE( 5, 5) AM_READWRITE(palette_address_r,palette_address_w) AM_RANGE( 6, 6) AM_READWRITE(sprite_bank_r,sprite_bank_w) - + // screen control AM_RANGE( 7, 7) AM_READWRITE(screen_ctrl_7_r, screen_ctrl_7_w) AM_RANGE( 8, 8) AM_READWRITE(screen_ctrl_8_r, screen_ctrl_8_w) @@ -327,8 +327,8 @@ ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, de //------------------------------------------------- void ygv608_device::device_start() { -// memset(&m_ports, 0, sizeof(m_ports)); -// memset(&m_regs, 0, sizeof(m_regs)); +// memset(&m_ports, 0, sizeof(m_ports)); +// memset(&m_regs, 0, sizeof(m_regs)); memset(&m_pattern_name_table, 0, sizeof(m_pattern_name_table)); memset(&m_sprite_attribute_table, 0, sizeof(m_sprite_attribute_table)); @@ -444,7 +444,7 @@ inline int ygv608_device::get_col_division(int raw_col) { if((m_v_div_size & 4) == 0) return 0; - + return ((raw_col >> m_col_shift) * 2) & 0x7f; } @@ -467,7 +467,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_8 ) int col = tile_index >> 6; int row = tile_index & 0x3f; int translated_column = get_col_division(col); - + uint8_t attr = 0; int pattern_name_base = 0; int set = (m_md == MD_1PLANE_256COLOUR @@ -527,7 +527,7 @@ TILE_GET_INFO_MEMBER( ygv608_device::get_tile_info_A_8 ) } page &= 0x1f; - + /* add page, base address to pattern name */ j += ( (int)m_scroll_data_table[0][0xc0+page] << 10 ); j += ( m_base_addr[0][base] << 8 ); @@ -850,8 +850,8 @@ void ygv608_device::postload() void ygv608_device::register_state_save() { -// save_item(NAME(m_ports.b)); -// save_item(NAME(m_regs.b)); +// save_item(NAME(m_ports.b)); +// save_item(NAME(m_regs.b)); save_item(NAME(m_pattern_name_table)); save_item(NAME(m_sprite_attribute_table.b)); save_item(NAME(m_scroll_data_table)); @@ -860,7 +860,7 @@ void ygv608_device::register_state_save() save_item(NAME(m_color_state_r)); save_item(NAME(m_color_state_w)); // TODO: register save for the newly added variables - + machine().save().register_postload(save_prepost_delegate(FUNC(ygv608_device::postload), this)); } @@ -912,13 +912,13 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipy = (g_attr & SZ_VERTREVERSE) != 0; } - // calculate code and apply sprite base address + // calculate code and apply sprite base address code = ( (int)(m_sprite_bank & sprite_mask[size]) << sprite_shift[size] ) | (int)sa->sn; // apply spf to color (invalidates individual attribute bits for color) if (spf != 0) color = ( code >> ( (spf + spf_shift[size]) * 2 ) ) & 0x0f; // check code boundary (TODO: do we really need this?) - if( code >= layout_total(size) ) + if( code >= layout_total(size) ) { logerror( "SZ_%d: sprite=%d\n", size, code ); code = 0; @@ -948,7 +948,7 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect flipx,flipy, sx-512,sy-512,0x00); } - + } #endif @@ -1064,7 +1064,7 @@ uint32_t ygv608_device::update_screen(screen_device &screen, bitmap_ind16 &bitma for( col=0; col<m_page_x; col++ ) { int translated_column = get_col_division(col); - + m_tilemap_B->set_scrolly(col, ( (int)m_scroll_data_table[1][translated_column] + ( (int)m_scroll_data_table[1][translated_column+1] << 8 ) ) ); @@ -1130,7 +1130,7 @@ uint32_t ygv608_device::update_screen(screen_device &screen, bitmap_ind16 &bitma draw_sprites(bitmap, finalclip); draw_layer_roz(screen, m_work_bitmap, finalclip, m_tilemap_A); - + if(m_planeA_trans_enable == true) copybitmap_trans( bitmap, m_work_bitmap, 0, 0, 0, 0, finalclip, 0); else @@ -1408,7 +1408,7 @@ WRITE8_MEMBER( ygv608_device::sprite_data_w ) WRITE8_MEMBER( ygv608_device::scroll_data_w ) { m_scroll_data_table[m_ba_plane_scroll_select][m_scroll_address] = data; - + if (m_scaw == true) { m_scroll_address++; @@ -1505,15 +1505,15 @@ void ygv608_device::HandleReset() m_register_address = 0; m_register_autoinc_r = false; m_register_autoinc_w = false; - + /* Clear registers #0-38, #47-49 */ for(i=0;i<39;i++) m_iospace->write_byte(i, 0x00); for(i=47;i<50;i++) m_iospace->write_byte(i, 0x00); -// memset( &m_regs.b[0], 0, 39 ); -// memset( &m_regs.b[47], 0, 3 ); +// memset( &m_regs.b[0], 0, 39 ); +// memset( &m_regs.b[47], 0, 3 ); /* Clear internal ram */ memset( m_pattern_name_table, 0, 4096 ); @@ -1639,12 +1639,12 @@ WRITE8_MEMBER( ygv608_device::pattern_name_table_x_w ) * ---- x--- SCAW Address autoincrements after scroll data write * ---- -x-- SCAR Address autoincrements after scroll data read * ---- --x- SAAW Address autoincrements after sprite attribute table write - * ---- ---x SAAR Address autoincrements after sprite attribute table read + * ---- ---x SAAR Address autoincrements after sprite attribute table read ***/ READ8_MEMBER( ygv608_device::ram_access_ctrl_r ) { return (m_cpaw<<7) | (m_cpar<<6) | - (m_ba_plane_scroll_select<<4) | + (m_ba_plane_scroll_select<<4) | (m_scaw<<3) | (m_scar<<2) | (m_saaw<<1) | (m_saar<<0); } @@ -1725,7 +1725,7 @@ WRITE8_MEMBER( ygv608_device::sprite_bank_w ) READ8_MEMBER( ygv608_device::screen_ctrl_7_r ) { return (m_dckm<<7)|(m_flip<<6)| - (m_zron<<3)|((m_md & 3)<<1)|(m_dspe<<0); + (m_zron<<3)|((m_md & 3)<<1)|(m_dspe<<0); } // R#7W - screen control 7 @@ -1740,31 +1740,31 @@ WRITE8_MEMBER( ygv608_device::screen_ctrl_7_w ) m_zron = BIT(data,3); m_md = new_md; m_dspe = BIT(data,0); - + m_na8_mask = ((m_flip == true) ? 0x03 : 0x0f ); - + // changing mode resets the pattern name table states (Mappy Arrange) p0_state_w = 0; p0_state_r = 0; pattern_mode_setup(); // TODO: add dot clock into CRTC -// screen_configure(); +// screen_configure(); } inline void ygv608_device::pattern_mode_setup() -{ +{ m_bits16 = (m_md == MD_2PLANE_8BIT ? 0 : 1 ); - + if(m_md == MD_2PLANE_16BIT ) m_page_x = m_page_y = 32; - else + else { - if (m_page_size == false ) + if (m_page_size == false ) { m_page_x = 64; m_page_y = 32; } - else + else { m_page_x = 32; m_page_y = 64; @@ -1787,7 +1787,7 @@ inline void ygv608_device::pattern_mode_setup() READ8_MEMBER( ygv608_device::screen_ctrl_8_r ) { return (m_h_display_size<<6)|(m_v_display_size<<4)| - (m_roz_wrap_disable<<3)|(m_scroll_wrap_disable<<2)| + (m_roz_wrap_disable<<3)|(m_scroll_wrap_disable<<2)| (m_page_size<<0); } @@ -1796,13 +1796,13 @@ WRITE8_MEMBER( ygv608_device::screen_ctrl_8_w ) { if( (data & 1) != m_page_size) m_tilemap_resize = 1; - -/**/m_h_display_size = (data >> 6) & 3; -/**/m_v_display_size = (data >> 4) & 3; + +/**/m_h_display_size = (data >> 6) & 3; +/**/m_v_display_size = (data >> 4) & 3; m_roz_wrap_disable = BIT(data,3); /**/m_scroll_wrap_disable = BIT(data,2); m_page_size = BIT(data,0); - + pattern_mode_setup(); } @@ -1820,22 +1820,22 @@ WRITE8_MEMBER( ygv608_device::screen_ctrl_8_w ) READ8_MEMBER( ygv608_device::screen_ctrl_9_r ) { return (m_pattern_size<<6)| - (m_h_div_size<<3)|(m_v_div_size<<0); + (m_h_div_size<<3)|(m_v_div_size<<0); } WRITE8_MEMBER( ygv608_device::screen_ctrl_9_w ) { uint8_t new_pts = (data >> 6) & 3; - + if(new_pts != m_pattern_size) m_tilemap_resize = 1; - + m_pattern_size = new_pts; /**/m_h_div_size = (data >> 3) & 7; m_v_div_size = (data >> 0) & 7; //popmessage("%02x %02x",m_h_div_size,m_v_div_size); - + // TODO: this code is garbage ... if(m_v_div_size == 0) m_col_shift = 8; @@ -1854,7 +1854,7 @@ WRITE8_MEMBER( ygv608_device::screen_ctrl_9_w ) } } } - + // R#10R - screen control 10: mosaic & sprite /*** * xx-- ---- SPAx: Auxiliary bits of sprite attribute table (0=8x8 or no flip, 1=16x16 or flipy, 2=32x32 or flipx, 3=64x64 or flipx & y ) @@ -1887,7 +1887,7 @@ WRITE8_MEMBER( ygv608_device::screen_ctrl_10_w ) READ8_MEMBER( ygv608_device::screen_ctrl_11_r ) { return (m_scm<<6)|(m_yse<<5)|(m_cbdr<<4)| - (m_priority_mode<<2)|(m_planeB_trans_enable<<1)|(m_planeA_trans_enable<<0); + (m_priority_mode<<2)|(m_planeB_trans_enable<<1)|(m_planeA_trans_enable<<0); } // R#11W - screen control 11 @@ -2089,13 +2089,13 @@ WRITE8_MEMBER( ygv608_device::crtc_w ) case 40: { int new_display_width = (data & 0x3f) * 16; - + m_crtc.htotal &= ~0x600; m_crtc.htotal |= ((data & 0xc0) << 3); if(new_display_width != m_crtc.display_width) m_screen_resize = 1; - + m_crtc.display_width = new_display_width; break; } @@ -2130,7 +2130,7 @@ WRITE8_MEMBER( ygv608_device::crtc_w ) // TODO: VSLS, bit 6 if(new_display_height != m_crtc.display_height) m_screen_resize = 1; - + m_crtc.display_height = new_display_height; break; } @@ -2150,7 +2150,7 @@ WRITE8_MEMBER( ygv608_device::crtc_w ) { m_crtc.vtotal &= ~0xff; m_crtc.vtotal |= data & 0xff; - + // TODO: call it for all mods in the CRTC, add sanity checks screen_configure(); diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index 25043a604e9..575e5463028 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -166,7 +166,7 @@ private: uint8_t m_na8_mask; // mask on/off na11/9:8 int m_col_shift; // shift in scroll table column index - + // base address shortcuts uint32_t m_base_addr[2][8]; uint32_t m_base_y_shift; // for extracting pattern y coord 'base' @@ -181,8 +181,8 @@ private: // === new variable handling starts here === uint8_t m_screen_status; /**< port #6: status port r/w */ - uint8_t m_dma_status; /**< port #7: system control port r/w */ - + uint8_t m_dma_status; /**< port #7: system control port r/w */ + uint8_t m_register_address; /**< RN: Register address select */ bool m_register_autoinc_r; /**< RRAI: Register address auto-increment on read */ bool m_register_autoinc_w; /**< RWAI: Register address auto-increment on write */ @@ -210,41 +210,41 @@ private: uint8_t m_sprite_aux_reg; /**< SPA: auxiliary bits of sprite attribute table */ uint8_t m_border_color; /**< BDC: border color */ - bool m_saar; /**< SAAR: Address autoinc after reading sprite attribute table */ - bool m_saaw; /**< SAAW: Address autoinc after writing sprite attribute table */ - bool m_scar; /**< SCAR: Address autoinc after reading scroll data table */ - bool m_scaw; /**< SCAW: Address autoinc after writing scroll data table */ - bool m_cpar; /**< CPAR: Address autoinc after reading color palette */ - bool m_cpaw; /**< CPAW: Address autoinc after writing color palette */ - bool m_ba_plane_scroll_select; /**< B/(A) P#2 gains access to scroll data table in A/B plane */ - - bool m_dspe; /**< DSPE: display permission of pattern plane(s) (screen blanked if 0) */ - uint8_t m_md; /**< MDx: mode for pattern planes */ - bool m_zron; /**< ZRON: enable ROZ features */ - bool m_flip; /**< FLIP: enable flip for attribute bits 11 & 10 */ - bool m_dckm; /**< DCKM: dot clock frequency select */ - - bool m_page_size; /**< PGS: page size setter */ - uint8_t m_h_display_size; /**< HDS: horizontal display domain */ - uint8_t m_v_display_size; /**< VDS: vertical display domain */ - bool m_roz_wrap_disable; /**< RLRT: ROZ wraparound disable */ - bool m_scroll_wrap_disable; /**< RLSC: ROZ wraparound disable */ - - uint8_t m_pattern_size; /**< PTS: pattern size of pattern plane */ - uint8_t m_h_div_size; /**< SLH: size of horizontal division in screen division scrolling */ - uint8_t m_v_div_size; /**< SLV: size of vertical division in screen division scrolling */ - - bool m_planeA_trans_enable; /**< CTPA: enable transparency for plane A */ - bool m_planeB_trans_enable; /**< CTPA: enable transparency for plane B */ - uint8_t m_priority_mode; /**< PRM: priority mode select */ - bool m_cbdr; /**< CBDR: color bus terminals CB7 to 0 and SPRT */ - bool m_yse; /**< YSE: permission control of trasparency timing output of YS terminal */ - uint8_t m_scm; /**< SCM: output frequency of clock signal output from terminal FSC */ - - uint8_t m_planeA_color_fetch; /**< APF: A plane color fetch mode */ - uint8_t m_planeB_color_fetch; /**< BPF: B plane color fetch mode */ - uint8_t m_sprite_color_fetch; /**< SPF: sprite color fetch mode */ - + bool m_saar; /**< SAAR: Address autoinc after reading sprite attribute table */ + bool m_saaw; /**< SAAW: Address autoinc after writing sprite attribute table */ + bool m_scar; /**< SCAR: Address autoinc after reading scroll data table */ + bool m_scaw; /**< SCAW: Address autoinc after writing scroll data table */ + bool m_cpar; /**< CPAR: Address autoinc after reading color palette */ + bool m_cpaw; /**< CPAW: Address autoinc after writing color palette */ + bool m_ba_plane_scroll_select; /**< B/(A) P#2 gains access to scroll data table in A/B plane */ + + bool m_dspe; /**< DSPE: display permission of pattern plane(s) (screen blanked if 0) */ + uint8_t m_md; /**< MDx: mode for pattern planes */ + bool m_zron; /**< ZRON: enable ROZ features */ + bool m_flip; /**< FLIP: enable flip for attribute bits 11 & 10 */ + bool m_dckm; /**< DCKM: dot clock frequency select */ + + bool m_page_size; /**< PGS: page size setter */ + uint8_t m_h_display_size; /**< HDS: horizontal display domain */ + uint8_t m_v_display_size; /**< VDS: vertical display domain */ + bool m_roz_wrap_disable; /**< RLRT: ROZ wraparound disable */ + bool m_scroll_wrap_disable; /**< RLSC: ROZ wraparound disable */ + + uint8_t m_pattern_size; /**< PTS: pattern size of pattern plane */ + uint8_t m_h_div_size; /**< SLH: size of horizontal division in screen division scrolling */ + uint8_t m_v_div_size; /**< SLV: size of vertical division in screen division scrolling */ + + bool m_planeA_trans_enable; /**< CTPA: enable transparency for plane A */ + bool m_planeB_trans_enable; /**< CTPA: enable transparency for plane B */ + uint8_t m_priority_mode; /**< PRM: priority mode select */ + bool m_cbdr; /**< CBDR: color bus terminals CB7 to 0 and SPRT */ + bool m_yse; /**< YSE: permission control of trasparency timing output of YS terminal */ + uint8_t m_scm; /**< SCM: output frequency of clock signal output from terminal FSC */ + + uint8_t m_planeA_color_fetch; /**< APF: A plane color fetch mode */ + uint8_t m_planeB_color_fetch; /**< BPF: B plane color fetch mode */ + uint8_t m_sprite_color_fetch; /**< SPF: sprite color fetch mode */ + // screen section devcb_write_line m_vblank_handler; devcb_write_line m_raster_handler; @@ -257,9 +257,9 @@ private: void vblank_irq_check(); /**< mask + pend check for vblank irq */ void raster_irq_check(); /**< mask + pend check for raster irq */ void pattern_name_autoinc_check(); /**< check autoinc for tile pointers */ - void pattern_mode_setup(); /**< refresh pattern mode at register 7/8 change*/ - int get_col_division(int raw_col); /**< calculate column scroll */ - + void pattern_mode_setup(); /**< refresh pattern mode at register 7/8 change*/ + int get_col_division(int raw_col); /**< calculate column scroll */ + enum { VBLANK_TIMER, diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp index 75aafe0d25d..67283ce8fa3 100644 --- a/src/tools/imgtool/imgtool.cpp +++ b/src/tools/imgtool/imgtool.cpp @@ -753,7 +753,7 @@ void imgtool::partition::get_attribute_name(uint32_t attribute, const imgtool_at //------------------------------------------------- -// test_imgtool_datetime - unit test for imgtool::datetime +// test_imgtool_datetime - unit test for imgtool::datetime //------------------------------------------------- static bool test_imgtool_datetime(int second, int minute, int hour, int day_of_month, int month, int year) @@ -806,7 +806,7 @@ static bool test_imgtool_datetime(int second, int minute, int hour, int day_of_m //------------------------------------------------- -// test_imgtool_datetime - unit tests for imgtool::datetime +// test_imgtool_datetime - unit tests for imgtool::datetime //------------------------------------------------- static bool test_imgtool_datetime() @@ -814,9 +814,9 @@ static bool test_imgtool_datetime() bool error = false; // various test cases for imgtool::datetime - if (test_imgtool_datetime(34, 23, 12, 18, 3, 1993)) // March 18th, 1993 12:23:34 + if (test_imgtool_datetime(34, 23, 12, 18, 3, 1993)) // March 18th, 1993 12:23:34 error = true; - if (test_imgtool_datetime(0, 20, 16, 25, 12, 1976)) // December 25th, 1976 16:20:00 + if (test_imgtool_datetime(0, 20, 16, 25, 12, 1976)) // December 25th, 1976 16:20:00 error = true; return error; diff --git a/src/tools/imgtool/library.h b/src/tools/imgtool/library.h index cf1e16a111b..c709a70201b 100644 --- a/src/tools/imgtool/library.h +++ b/src/tools/imgtool/library.h @@ -112,9 +112,9 @@ namespace imgtool time_t to_time_t() const; private: - static imgtool_clock::duration s_gmt_offset; - datetime_type m_type; - std::chrono::time_point<imgtool_clock> m_time_point; + static imgtool_clock::duration s_gmt_offset; + datetime_type m_type; + std::chrono::time_point<imgtool_clock> m_time_point; static imgtool_clock::duration calculate_gmt_offset(); }; diff --git a/src/tools/imgtool/modules/fat.cpp b/src/tools/imgtool/modules/fat.cpp index 3dcdd1e5301..e1b3a914c2b 100644 --- a/src/tools/imgtool/modules/fat.cpp +++ b/src/tools/imgtool/modules/fat.cpp @@ -1244,12 +1244,12 @@ static void fat_cannonicalize_sfn(char *sfn, const uint8_t *sfn_bytes) static imgtool::datetime fat_crack_time(uint32_t fat_time) { util::arbitrary_datetime dt; - dt.second = ((fat_time >> 0) & 0x001F) * 2; - dt.minute = ((fat_time >> 5) & 0x003F); - dt.hour = ((fat_time >> 11) & 0x001F); - dt.day_of_month = ((fat_time >> 16) & 0x001F); - dt.month = ((fat_time >> 21) & 0x000F); - dt.year = ((fat_time >> 25) & 0x007F) + 1980; + dt.second = ((fat_time >> 0) & 0x001F) * 2; + dt.minute = ((fat_time >> 5) & 0x003F); + dt.hour = ((fat_time >> 11) & 0x001F); + dt.day_of_month = ((fat_time >> 16) & 0x001F); + dt.month = ((fat_time >> 21) & 0x000F); + dt.year = ((fat_time >> 25) & 0x007F) + 1980; return imgtool::datetime(imgtool::datetime::LOCAL, dt); } diff --git a/src/tools/imgtool/modules/prodos.cpp b/src/tools/imgtool/modules/prodos.cpp index f5b27537671..6db41ae529b 100644 --- a/src/tools/imgtool/modules/prodos.cpp +++ b/src/tools/imgtool/modules/prodos.cpp @@ -189,12 +189,12 @@ enum creation_policy_t static imgtool::datetime prodos_crack_time(uint32_t prodos_time) { util::arbitrary_datetime dt; - dt.second = 0; - dt.minute = ((prodos_time >> 16) & 0x3F); - dt.hour = ((prodos_time >> 24) & 0x1F); - dt.day_of_month = ((prodos_time >> 0) & 0x1F); - dt.month = ((prodos_time >> 5) & 0x0F) + 1; - dt.year = ((prodos_time >> 9) & 0x7F) + 1900; + dt.second = 0; + dt.minute = ((prodos_time >> 16) & 0x3F); + dt.hour = ((prodos_time >> 24) & 0x1F); + dt.day_of_month = ((prodos_time >> 0) & 0x1F); + dt.month = ((prodos_time >> 5) & 0x0F) + 1; + dt.year = ((prodos_time >> 9) & 0x7F) + 1900; if (dt.year <= 1949) dt.year += 100; |