diff options
author | 2018-01-28 14:25:52 +1100 | |
---|---|---|
committer | 2018-01-28 14:25:52 +1100 | |
commit | 4e8bb7c7e5c84ee384fd2c3b68896ca74cff9884 (patch) | |
tree | 5a185ef6a4070f53ad73122f280ca872f7580719 /src/devices | |
parent | 46af74afdfc4735a47db4ccea6263932e118b198 (diff) |
srcclean and regenerate localisations (nw)
Diffstat (limited to 'src/devices')
25 files changed, 84 insertions, 84 deletions
diff --git a/src/devices/bus/electron/cart/slot.cpp b/src/devices/bus/electron/cart/slot.cpp index 49791c92ce6..805e0449462 100644 --- a/src/devices/bus/electron/cart/slot.cpp +++ b/src/devices/bus/electron/cart/slot.cpp @@ -281,4 +281,4 @@ SLOT_INTERFACE_START(electron_cart) SLOT_INTERFACE_INTERNAL("click", ELECTRON_CLICK) //SLOT_INTERFACE_INTERNAL("cumana", ELECTRON_CUMANA) SLOT_INTERFACE_INTERNAL("peg400", ELECTRON_PEG400) -SLOT_INTERFACE_END
\ No newline at end of file +SLOT_INTERFACE_END diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 7d498310a28..8f58eb4858c 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -92,7 +92,7 @@ READ16_MEMBER(mach32_8514a_device::mach32_config1_r) * bits 6-7 16bpp colour mode (0=555, 1=565, 2=655, 3=664) * bit 8 Multiplex pixels - processes 4 pixels in parallel by the DAC * bit 9 24bpp config (0=3Bytes/pixel, 1=4Bytes/pixel) - * bit 10 24bpp colour order (0=RGB, LSB reserved in 4Bpp, 1=BGR, MSB reserved in 4Bpp) + * bit 10 24bpp colour order (0=RGB, LSB reserved in 4Bpp, 1=BGR, MSB reserved in 4Bpp) * bit 11 Display pixel size to be written * bits 12-13 DAC extended address inputs RS2,RS3 * bit 14 Enabled 8-bit DAC (0=6-bit) @@ -164,7 +164,7 @@ void mach32_device::ati_define_video_mode() ati_vga_device::ati_define_video_mode(); return; } - + set_dot_clock(); } diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 815d1319e58..3ce09ccd029 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -31,7 +31,7 @@ public: DECLARE_READ16_MEMBER(mach32_config1_r); DECLARE_WRITE16_MEMBER(mach32_horz_overscan_w) {} // TODO DECLARE_READ16_MEMBER(mach32_ext_ge_r) { return 0x0000; } // TODO - + bool has_display_mode_changed() { if(display_mode_change) { display_mode_change = false; return true; } else return false; } protected: diff --git a/src/devices/bus/nubus/quadralink.cpp b/src/devices/bus/nubus/quadralink.cpp index 199cd08d13f..9b8abc93c91 100644 --- a/src/devices/bus/nubus/quadralink.cpp +++ b/src/devices/bus/nubus/quadralink.cpp @@ -126,35 +126,35 @@ WRITE32_MEMBER( nubus_quadralink_device::dev_w ) //printf("write %x to QL space @ %x, mask %08x\n", data, offset, mem_mask); switch (offset) { - case 0x0000: // SCC 2 A control + case 0x0000: // SCC 2 A control m_scc2->ca_w(space, 0, data & 0xff); break; - case 0x0002: // SCC 2 A data + case 0x0002: // SCC 2 A data m_scc2->da_w(space, 0, data & 0xff); break; - case 0x0004: // SCC 2 B control + case 0x0004: // SCC 2 B control m_scc2->cb_w(space, 0, data & 0xff); break; - case 0x0006: // SCC 2 B data + case 0x0006: // SCC 2 B data m_scc2->db_w(space, 0, data & 0xff); break; - case 0x10000: // SCC 1 A control + case 0x10000: // SCC 1 A control m_scc1->ca_w(space, 0, data & 0xff); break; - case 0x10002: // SCC 1 A data + case 0x10002: // SCC 1 A data m_scc1->da_w(space, 0, data & 0xff); break; - case 0x10004: // SCC 1 B control + case 0x10004: // SCC 1 B control m_scc1->cb_w(space, 0, data & 0xff); break; - case 0x10006: // SCC 1 B data + case 0x10006: // SCC 1 B data m_scc1->db_w(space, 0, data & 0xff); break; } @@ -173,7 +173,7 @@ READ32_MEMBER( nubus_quadralink_device::dev_r ) case 0x0004: return m_scc2->cb_r(space, 0); - + case 0x0006: return m_scc2->db_r(space, 0); @@ -185,7 +185,7 @@ READ32_MEMBER( nubus_quadralink_device::dev_r ) case 0x10004: return m_scc1->cb_r(space, 0); - + case 0x10006: return m_scc1->db_r(space, 0); } diff --git a/src/devices/bus/psx/gamebooster.cpp b/src/devices/bus/psx/gamebooster.cpp index 0a04ec215a5..8cc92e2f5dc 100644 --- a/src/devices/bus/psx/gamebooster.cpp +++ b/src/devices/bus/psx/gamebooster.cpp @@ -3,8 +3,8 @@ /********************************************************************** Datel Game Booster for Playstation 1 - - Gameboy emulator with Gameboy cartridge slot + + Gameboy emulator with Gameboy cartridge slot **********************************************************************/ @@ -106,7 +106,7 @@ WRITE16_MEMBER(psx_gamebooster_device::exp_w) { offset -= 0x20000; logerror("%s: psx_gamebooster_device::exp_w %04x %04x\n", machine().describe_context(), offset*2, data); - + if (mem_mask & 0xff00) m_cartslot->write_bank(space, (offset*2)+1, data>>8); if (mem_mask & 0x00ff) m_cartslot->write_bank(space, (offset*2)+0, data); // send this 2nd or it erases the bank with the above diff --git a/src/devices/cpu/e132xs/32xsdefs.h b/src/devices/cpu/e132xs/32xsdefs.h index e1f10ae9e29..94333e2adf9 100644 --- a/src/devices/cpu/e132xs/32xsdefs.h +++ b/src/devices/cpu/e132xs/32xsdefs.h @@ -47,7 +47,7 @@ #define EHCMACD 0x04e #define EHCSUMD 0x086 #define EHCFFTD 0x096 -#define EMUL_N 0x100 +#define EMUL_N 0x100 #define EMUL 0x102 #define EMULU 0x104 #define EMULS 0x106 diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index fbf7020ce50..b72499028f3 100644 --- a/src/devices/cpu/e132xs/e132xs.cpp +++ b/src/devices/cpu/e132xs/e132xs.cpp @@ -415,7 +415,7 @@ void hyperstone_device::dump_registers() { //if (m_core->global_regs[0] == 0x11094) //{ - // total_11094++; + // total_11094++; //} return; } else if (total_ops == 0ULL) { @@ -1943,4 +1943,4 @@ DEFINE_DEVICE_TYPE(E132XSR, e132xsr_device, "e132xsr", "E1-32XSR") DEFINE_DEVICE_TYPE(GMS30C2116, gms30c2116_device, "gms30c2116", "GMS30C2116") DEFINE_DEVICE_TYPE(GMS30C2132, gms30c2132_device, "gms30c2132", "GMS30C2132") DEFINE_DEVICE_TYPE(GMS30C2216, gms30c2216_device, "gms30c2216", "GMS30C2216") -DEFINE_DEVICE_TYPE(GMS30C2232, gms30c2232_device, "gms30c2232", "GMS30C2232")
\ No newline at end of file +DEFINE_DEVICE_TYPE(GMS30C2232, gms30c2232_device, "gms30c2232", "GMS30C2232") diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h index f3c37dacdfb..ba5a6efa356 100644 --- a/src/devices/cpu/e132xs/e132xs.h +++ b/src/devices/cpu/e132xs/e132xs.h @@ -46,14 +46,14 @@ #define EXECUTE_UNMAPPED_CODE 2 #define EXECUTE_RESET_CACHE 3 -#define E132XS_STRICT_VERIFY 0x0001 /* verify all instructions */ +#define E132XS_STRICT_VERIFY 0x0001 /* verify all instructions */ #define SINGLE_INSTRUCTION_MODE (1) -#define ENABLE_E132XS_DRC (1) +#define ENABLE_E132XS_DRC (1) -#define E132XS_LOG_DRC_REGS (0) -#define E132XS_LOG_INTERPRETER_REGS (0) +#define E132XS_LOG_DRC_REGS (0) +#define E132XS_LOG_INTERPRETER_REGS (0) #define E132XS_COUNT_INSTRUCTIONS (0) //************************************************************************** @@ -443,9 +443,9 @@ private: /* internal compiler state */ struct compiler_state { - uint32_t m_cycles; /* accumulated cycles */ - uint8_t m_checkints; /* need to check interrupts before next instruction */ - uml::code_label m_labelnum; /* index for local labels */ + uint32_t m_cycles; /* accumulated cycles */ + uint8_t m_checkints; /* need to check interrupts before next instruction */ + uml::code_label m_labelnum; /* index for local labels */ }; void execute_run_drc(); diff --git a/src/devices/cpu/e132xs/e132xsdrc.cpp b/src/devices/cpu/e132xs/e132xsdrc.cpp index 8bcfe2b5eb0..1b198470e6a 100644 --- a/src/devices/cpu/e132xs/e132xsdrc.cpp +++ b/src/devices/cpu/e132xs/e132xsdrc.cpp @@ -1231,4 +1231,4 @@ bool hyperstone_device::generate_opcode(drcuml_block *block, compiler_state *com UML_LABEL(block, done); return true; -}
\ No newline at end of file +} diff --git a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx index b15fd7a90ab..c35a129f369 100644 --- a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx +++ b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx @@ -4528,9 +4528,9 @@ void hyperstone_device::generate_lddp(drcuml_block *block, compiler_state *compi UML_ADD(block, I3, I0, 8); UML_AND(block, I0, I0, ~3); UML_CALLH(block, *m_mem_read32); - UML_MOV(block, I2, I1); // I2: dreg[0] + UML_MOV(block, I2, I1); // I2: dreg[0] UML_ADD(block, I0, I0, 4); - UML_CALLH(block, *m_mem_read32); // I1: dreg[4] + UML_CALLH(block, *m_mem_read32); // I1: dreg[4] if (SRC_GLOBAL) { @@ -4847,9 +4847,9 @@ void hyperstone_device::generate_frame(drcuml_block *block, compiler_state *comp UML_ROLAND(block, I1, DRC_SR, 7, 0x7f); UML_SUB(block, I1, I1, op & 0xf); - UML_ROLINS(block, DRC_SR, I1, 25, 0xfe000000); // SET_FP(GET_FP - SRC_CODE) - UML_ROLINS(block, DRC_SR, op, 17, 0x01e00000); // SET_FL(DST_CODE) - UML_AND(block, DRC_SR, DRC_SR, ~M_MASK); // SET_M(0) + UML_ROLINS(block, DRC_SR, I1, 25, 0xfe000000); // SET_FP(GET_FP - SRC_CODE) + UML_ROLINS(block, DRC_SR, op, 17, 0x01e00000); // SET_FL(DST_CODE) + UML_AND(block, DRC_SR, DRC_SR, ~M_MASK); // SET_M(0) UML_MOV(block, I0, mem(&SP)); UML_MOV(block, I6, I0); @@ -4859,7 +4859,7 @@ void hyperstone_device::generate_frame(drcuml_block *block, compiler_state *comp UML_ROLAND(block, I2, I0, 30, 0x7f); UML_ADD(block, I2, I2, (64 - 10)); UML_SUB(block, I3, I2, I1); - UML_SEXT(block, I3, I3, SIZE_BYTE); // difference = ((SP & 0x1fc) >> 2) + (64 - 10) - ((GET_FP - SRC_CODE) + GET_FL) + UML_SEXT(block, I3, I3, SIZE_BYTE); // difference = ((SP & 0x1fc) >> 2) + (64 - 10) - ((GET_FP - SRC_CODE) + GET_FL) int diff_in_range, done; UML_CMP(block, I3, -64); diff --git a/src/devices/cpu/e132xs/e132xsfe.cpp b/src/devices/cpu/e132xs/e132xsfe.cpp index 6baa4b58a1f..474661e5821 100644 --- a/src/devices/cpu/e132xs/e132xsfe.cpp +++ b/src/devices/cpu/e132xs/e132xsfe.cpp @@ -14,9 +14,9 @@ #define FE_FP ((m_cpu->m_core->global_regs[1] & 0xfe000000) >> 25) #define FE_FL (m_cpu->m_core->fl_lut[((m_cpu->m_core->global_regs[1] >> 21) & 0xf)]) -#define FE_DST_CODE ((op & 0xf0) >> 4) -#define FE_SRC_CODE (op & 0x0f) -#define SR_CODE (1 << 1) +#define FE_DST_CODE ((op & 0xf0) >> 4) +#define FE_SRC_CODE (op & 0x0f) +#define SR_CODE (1 << 1) /*************************************************************************** INSTRUCTION PARSERS diff --git a/src/devices/cpu/e132xs/e132xsfe.h b/src/devices/cpu/e132xs/e132xsfe.h index 5301ee13ca1..7463fd964d0 100644 --- a/src/devices/cpu/e132xs/e132xsfe.h +++ b/src/devices/cpu/e132xs/e132xsfe.h @@ -31,4 +31,4 @@ private: hyperstone_device *m_cpu; }; -#endif /* MAME_CPU_E132XS_E132XSFE_H */
\ No newline at end of file +#endif /* MAME_CPU_E132XS_E132XSFE_H */ diff --git a/src/devices/cpu/e132xs/e132xsop.hxx b/src/devices/cpu/e132xs/e132xsop.hxx index eb56e4cde0f..8b0c3817b08 100644 --- a/src/devices/cpu/e132xs/e132xsop.hxx +++ b/src/devices/cpu/e132xs/e132xsop.hxx @@ -336,7 +336,7 @@ void hyperstone_device::hyperstone_mov() check_delay_PC(); - const bool h = (SR & H_MASK) != 0; + const bool h = (SR & H_MASK) != 0; SR &= ~H_MASK; if (DST_GLOBAL && h && !(SR & S_MASK)) { diff --git a/src/devices/machine/myb3k_kbd.cpp b/src/devices/machine/myb3k_kbd.cpp index 7e07d383366..7dbbc8d7391 100644 --- a/src/devices/machine/myb3k_kbd.cpp +++ b/src/devices/machine/myb3k_kbd.cpp @@ -271,7 +271,7 @@ INPUT_PORTS_START( myb3k_common_ports ) PORT_START("MYB3K_TB") PORT_BIT( 0x0001U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("KP 5") // 87 PORT_BIT( 0x0002U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("KP 6") // 88 -// PORT_BIT( 0x0004U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA_PAD) PORT_NAME("KP ,") // 89 +// PORT_BIT( 0x0004U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA_PAD) PORT_NAME("KP ,") // 89 PORT_BIT( 0x0008U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("KP 1") // 90 PORT_BIT( 0x0010U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("KP 2") // 91 PORT_BIT( 0x0020U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("KP 3") // 92 @@ -284,13 +284,13 @@ INPUT_PORTS_START( myb3k_keyboard ) PORT_INCLUDE( myb3k_common_ports ) PORT_MODIFY("MYB3K_T2") - PORT_BIT( 0x0008U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F12) PORT_NAME("Kanji") PORT_CHAR(UCHAR_MAMEKEY(F12)) // 12 + PORT_BIT( 0x0008U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F12) PORT_NAME("Kanji") PORT_CHAR(UCHAR_MAMEKEY(F12)) // 12 PORT_MODIFY("MYB3K_T3") - PORT_BIT( 0x0080U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_NAME("1 !") PORT_CHAR('1') PORT_CHAR('!') PORT_CHAR_IGNORE PORT_CHAR(0x30AA) // 16 オ + PORT_BIT( 0x0080U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_NAME("1 !") PORT_CHAR('1') PORT_CHAR('!') PORT_CHAR_IGNORE PORT_CHAR(0x30AA) // 16 オ PORT_MODIFY("MYB3K_T4") - PORT_BIT( 0x0002U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_NAME("3 #") PORT_CHAR('3') PORT_CHAR('#') PORT_CHAR_IGNORE PORT_CHAR(0x30E7) // 18 ョ + PORT_BIT( 0x0002U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_NAME("3 #") PORT_CHAR('3') PORT_CHAR('#') PORT_CHAR_IGNORE PORT_CHAR(0x30E7) // 18 ョ PORT_MODIFY("MYB3K_T5") PORT_BIT( 0x0080U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_NAME("w W") PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR_IGNORE PORT_CHAR(0x30E8) // 32 ヨ diff --git a/src/devices/machine/myb3k_kbd.h b/src/devices/machine/myb3k_kbd.h index 9682f2aa352..69a5e5c0513 100644 --- a/src/devices/machine/myb3k_kbd.h +++ b/src/devices/machine/myb3k_kbd.h @@ -72,7 +72,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; output_delegate m_keyboard_cb; - required_ioport_array<12> m_io_kbd_t; + required_ioport_array<12> m_io_kbd_t; u8 m_io_kbd_state[12][8]; int m_x, m_y; @@ -84,7 +84,7 @@ protected: class jb3000_keyboard_device : public myb3k_keyboard_device { public: - jb3000_keyboard_device( + jb3000_keyboard_device( const machine_config &mconfig, char const *tag, device_t *owner, @@ -96,7 +96,7 @@ private: class stepone_keyboard_device : public myb3k_keyboard_device { public: - stepone_keyboard_device( + stepone_keyboard_device( const machine_config &mconfig, char const *tag, device_t *owner, diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index fe316f15dd7..c25aa538df3 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -17,7 +17,7 @@ Implements WD2010 / WD1010 controller basics for a single hard disk. UNIMPLEMENTED FEATURES : - more than 1 drive (untested) - - multi sector transfers (M = 1) + - multi sector transfers (M = 1) - seek and index timers / ID not found. - implied seeks / implied writes / retries - edge or level triggered seek complete (SC) @@ -399,7 +399,7 @@ void wd2010_device::restore(uint8_t data) // Datasheet: DIRIN HIGH = in ; LOW = out m_out_dirin_cb(0); // 0 = heads move away from the spindle, towards track O. - // Omitted: store step rate for later (implied seeks). + // Omitted: store step rate for later (implied seeks). int step_pulses = 0; while (step_pulses <= STEP_LIMIT) @@ -419,7 +419,7 @@ void wd2010_device::restore(uint8_t data) if ( m_in_tk000_cb() || (step_pulses == STEP_LIMIT) ) // Simulate TRACK 00 signal (normally from DRIVE) { - m_present_cylinder = 0; + m_present_cylinder = 0; m_task_file[TASK_FILE_CYLINDER_HIGH] = 0; m_task_file[TASK_FILE_CYLINDER_LOW] = 0; @@ -428,9 +428,9 @@ void wd2010_device::restore(uint8_t data) newstatus &= ~(STATUS_BSY | STATUS_CIP); // prepare new status; (INTRQ later) reset BSY, CIP // NOTE: calculation needs 'data' (extracted from command register) - float step_ms = SETTLING_MS + LATENCY_MS + ( (float)sqrt(1.0 * step_pulses) * STEP_RATE_MS ); + float step_ms = SETTLING_MS + LATENCY_MS + ( (float)sqrt(1.0 * step_pulses) * STEP_RATE_MS ); - cmd_timer->adjust(attotime::from_usec(1000 * step_ms), newstatus); + cmd_timer->adjust(attotime::from_usec(1000 * step_ms), newstatus); return; } @@ -463,7 +463,7 @@ void wd2010_device::seek(uint8_t data) int direction; // 0 = towards 0 int step_pulses; - + // Calculate number of steps by comparing the cylinder registers // HI/LO with the internally stored position. uint32_t cylinder_registers = CYLINDER; @@ -479,7 +479,7 @@ void wd2010_device::seek(uint8_t data) } // NOTE: calculation needs 'step_pulses' and 'data' (taken from command register) - float step_ms = SETTLING_MS + LATENCY_MS + ( (float)sqrt(1.0 * step_pulses) * STEP_RATE_MS ); + float step_ms = SETTLING_MS + LATENCY_MS + ( (float)sqrt(1.0 * step_pulses) * STEP_RATE_MS ); m_out_dirin_cb(direction); @@ -532,7 +532,7 @@ void wd2010_device::seek(uint8_t data) m_task_file[TASK_FILE_CYLINDER_LOW] = (m_present_cylinder - ((m_task_file[TASK_FILE_CYLINDER_HIGH] << 8) )) & 0xff; //LOGERROR("SEEK (END) - m_present_cylinder = %u SDH CYL L/H %02x / %02x\n", m_present_cylinder,m_task_file[TASK_FILE_CYLINDER_LOW],m_task_file[TASK_FILE_CYLINDER_HIGH]); - cmd_timer->adjust(attotime::from_usec(1000 * step_ms), newstatus); + cmd_timer->adjust(attotime::from_usec(1000 * step_ms), newstatus); } //------------------------------------------------- diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h index 920177f025d..a57559c25a2 100644 --- a/src/devices/sound/k054539.h +++ b/src/devices/sound/k054539.h @@ -73,7 +73,7 @@ protected: // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - + // device_rom_interface overrides virtual void rom_bank_updated() override; diff --git a/src/devices/sound/qsound.h b/src/devices/sound/qsound.h index b39260ad76a..6dd27481500 100644 --- a/src/devices/sound/qsound.h +++ b/src/devices/sound/qsound.h @@ -46,7 +46,7 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - + // device_rom_interface overrides virtual void rom_bank_updated() override; diff --git a/src/devices/sound/volt_reg.cpp b/src/devices/sound/volt_reg.cpp index 46c3e1471cf..12f3ed31130 100644 --- a/src/devices/sound/volt_reg.cpp +++ b/src/devices/sound/volt_reg.cpp @@ -5,12 +5,12 @@ volt_reg.c Direct current. - - TODO: - - If we continue having this device in MAME, add support for default voltage other - than (currently hardcoded) 5.0 - - When used in combination with a DAC, vreg device 1st stream update is skipped, - causing the DAC to fetch invalid input data. Why does this happen? + + TODO: + - If we continue having this device in MAME, add support for default voltage other + than (currently hardcoded) 5.0 + - When used in combination with a DAC, vreg device 1st stream update is skipped, + causing the DAC to fetch invalid input data. Why does this happen? ***************************************************************************/ diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 7fe158db129..aaaa46ea04a 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -39,7 +39,7 @@ public: virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb); void set_offset(uint16_t val) { vga.crtc.offset = val; } - + protected: enum { @@ -284,7 +284,7 @@ public: bool is_8514a_enabled() { return ibm8514.enabled; } bool is_passthrough_set() { return ibm8514.passthrough; } - + READ16_MEMBER(ibm8514_gpstatus_r); WRITE16_MEMBER(ibm8514_cmd_w); WRITE16_MEMBER(ibm8514_display_ctrl_w); @@ -331,7 +331,7 @@ public: READ16_MEMBER(ibm8514_write_mask_r); WRITE16_MEMBER(ibm8514_write_mask_w); WRITE16_MEMBER(ibm8514_advfunc_w); - + void ibm8514_wait_draw(); struct { @@ -469,7 +469,7 @@ public: WRITE16_MEMBER(mach8_advfunc_w) { mach8.ati_mode = false; ibm8514_advfunc_w(space,offset,data,mem_mask); } uint16_t get_ext_config() { return mach8.ge_ext_config; } uint16_t offset() { if(mach8.ati_mode) return mach8.ge_pitch; else return 128; } - + protected: mach8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual void device_start() override; diff --git a/src/devices/video/ppu2c0x.h b/src/devices/video/ppu2c0x.h index 3f8408b70cc..11eff9624ce 100644 --- a/src/devices/video/ppu2c0x.h +++ b/src/devices/video/ppu2c0x.h @@ -219,8 +219,8 @@ protected: uint8_t m_planebuf[2]; int m_scanline; /* scanline count */ std::unique_ptr<uint8_t[]> m_spriteram; /* sprite ram */ - - + + private: static constexpr device_timer_id TIMER_HBLANK = 0; static constexpr device_timer_id TIMER_NMI = 1; diff --git a/src/devices/video/ppu2c0x_vt.cpp b/src/devices/video/ppu2c0x_vt.cpp index fad7f78ab97..bfd18d3d68a 100644 --- a/src/devices/video/ppu2c0x_vt.cpp +++ b/src/devices/video/ppu2c0x_vt.cpp @@ -40,7 +40,7 @@ READ8_MEMBER(ppu_vt03_device::palette_read) void ppu_vt03_device::set_new_pen(int i) { - if(m_pal_mode == PAL_MODE_NEW_RGB) { + if(m_pal_mode == PAL_MODE_NEW_RGB) { uint16_t rgbval = (m_newpal[i&0x7f] & 0xff) | ((m_newpal[(i&0x7f)+0x80] & 0xff)<<8); uint8_t blue = (rgbval & 0x001f) << 3; uint8_t green = (rgbval & 0x3e0) >> 2; @@ -49,7 +49,7 @@ void ppu_vt03_device::set_new_pen(int i) } else { // TODO: should this be tidied up? uint16_t palval = (m_newpal[i&0x7f] & 0x3f) | ((m_newpal[(i&0x7f)+0x80] & 0x3f)<<6); - + uint8_t rhue = palval & 0x0F; uint8_t rlum = (palval >> 4) & 0x0F; uint8_t rsat = (palval >> 8) & 0x0F; @@ -61,7 +61,7 @@ void ppu_vt03_device::set_new_pen(int i) uint8_t hue_lut[16] = {0xD, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x0, 0xE, 0xF}; rhue = hue_lut[rhue]; } - + // Get base color double hue = 287.0; @@ -69,7 +69,7 @@ void ppu_vt03_device::set_new_pen(int i) double Kb = 0.1145; double Ku = 2.029; double Kv = 1.140; - + double sat; double y, u, v; double rad; @@ -97,7 +97,7 @@ void ppu_vt03_device::set_new_pen(int i) y = (m_pal_mode == PAL_MODE_NEW_VG) ? 0.4 : 0.9; break; } - + sat *= (rsat / 15.0); y *= (rlum / 15.0); u = sat * cos(rad); @@ -121,7 +121,7 @@ void ppu_vt03_device::set_new_pen(int i) B = 0; if (B > 255) B = 255; - + m_palette->set_pen_color(i & 0x7f, rgb_t(R, G ,B)); } @@ -194,7 +194,7 @@ void ppu_vt03_device::device_reset() // todo: what are the actual defaults for these? for (int i = 0;i < 0x20;i++) set_201x_reg(i, 0x00); - + init_palette(*m_palette, 0); m_read_bg4_bg3 = 0; m_va34 = 0; diff --git a/src/devices/video/ppu2c0x_vt.h b/src/devices/video/ppu2c0x_vt.h index bc1a723d273..da9857aae38 100644 --- a/src/devices/video/ppu2c0x_vt.h +++ b/src/devices/video/ppu2c0x_vt.h @@ -42,9 +42,9 @@ public: template <class Object> static devcb_base &set_read_bg_callback(device_t &device, Object &&cb) { return downcast<ppu_vt03_device &>(device).m_read_bg.set_callback(std::forward<Object>(cb)); } template <class Object> static devcb_base &set_read_sp_callback(device_t &device, Object &&cb) { return downcast<ppu_vt03_device &>(device).m_read_sp.set_callback(std::forward<Object>(cb)); } - + static void set_palette_mode(device_t &device, vtxx_pal_mode pmode) { downcast<ppu_vt03_device &>(device).m_pal_mode = pmode; } - + virtual DECLARE_READ8_MEMBER(read) override; virtual DECLARE_WRITE8_MEMBER(write) override; virtual DECLARE_READ8_MEMBER(palette_read) override; @@ -86,9 +86,9 @@ private: palette_device *m_palette; uint8_t m_201x_regs[0x20]; - + vtxx_pal_mode m_pal_mode = PAL_MODE_VT0x; - + void set_2010_reg(uint8_t data); void set_new_pen(int i); diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index 299281f55a2..b54fb66ea84 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -898,7 +898,7 @@ void saturn_state::drawpixel_4bpp_trans(int x, int y, int patterndata, int offse void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcnt) { int pix,transmask, spd = stv2_current_sprite.CMDPMOD & 0x40; -// int mode; +// int mode; int mesh = stv2_current_sprite.CMDPMOD & 0x100; int pix2; @@ -966,7 +966,7 @@ void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcn //mode = 2; pix = pix+(stv2_current_sprite.CMDCOLR&0xffc0); transmask = 0x3f; - + // Scud: the disposable assassin wants transparent pen on 0 if ( !spd ) { @@ -1018,7 +1018,7 @@ void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcn pix |= stv2_current_sprite.CMDPMOD & 0x8000; /* TODO: from docs: - "Except for the color calculation of replace and shadow, color calculation can only be performed when the color code of the original picture is RGB code. + "Except for the color calculation of replace and shadow, color calculation can only be performed when the color code of the original picture is RGB code. Color calculation can be executed when the color code is color bank code, but the results are not guaranteed." Currently no idea about the "result not guaranteed" part, let's disable this branch for the time being ... */ @@ -1063,7 +1063,7 @@ void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcn m_vdp1.framebuffer_draw_lines[y][x] = stv_vdp1_apply_gouraud_shading( x, y, pix ); break; default: - // TODO: mode 5: prohibited, mode 6: gouraud shading + half-luminance, mode 7: gouraud-shading + half-transparent + // TODO: mode 5: prohibited, mode 6: gouraud shading + half-luminance, mode 7: gouraud-shading + half-transparent popmessage("VDP1 PMOD = %02x, contact MAMEdev",stv2_current_sprite.CMDPMOD & 0x7); m_vdp1.framebuffer_draw_lines[y][x] = pix; break; diff --git a/src/devices/video/stvvdp2.cpp b/src/devices/video/stvvdp2.cpp index 13e07a5124b..64d2057ce83 100644 --- a/src/devices/video/stvvdp2.cpp +++ b/src/devices/video/stvvdp2.cpp @@ -64,7 +64,7 @@ Video emulation TODO: - virtual hydlide: \- transparent pens usage on most vdp1 items should be black instead. \- likewise "press start button" is the other way around, i.e. black pen where it should be transparent instead. - + Notes of Interest & Unclear features: -the test mode / bios is drawn with layer NBG3; |