diff options
author | arbee <rb6502@users.noreply.github.com> | 2019-05-16 16:32:08 -0400 |
---|---|---|
committer | arbee <rb6502@users.noreply.github.com> | 2019-05-16 16:32:08 -0400 |
commit | ce2e1630682547d7c760ae12de93551b33f8250c (patch) | |
tree | a5619d4095d16531f01df2afea8d658c68a5d6ad | |
parent | 5d7bad23f4934fb4deb7116b62a8e4aa24bae154 (diff) | |
parent | 6d67351c0d5b146def0e319f9c039e695d1c40d1 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | src/emu/inpttype.h | 2 | ||||
-rw-r--r-- | src/mame/drivers/fidel_csc.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/fidel_elite.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/fidel_vsc.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/hh_pic16.cpp | 5 | ||||
-rw-r--r-- | src/mame/layout/mchess.lay | 10 |
6 files changed, 12 insertions, 11 deletions
diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h index c77df5f39f6..3c30ad517f4 100644 --- a/src/emu/inpttype.h +++ b/src/emu/inpttype.h @@ -168,7 +168,7 @@ inline void construct_core_types_P2(simple_list<input_type_entry> &typelist) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON2, "P2 Button 2", input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON3_INDEXED(1), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON3, "P2 Button 3", input_seq(KEYCODE_Q, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON2_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON4, "P2 Button 4", input_seq(KEYCODE_W, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(1)) ) - INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON5, "P2 Button 5", input_seq(JOYCODE_BUTTON5_INDEXED(1)) ) + INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON5, "P2 Button 5", input_seq(KEYCODE_E, input_seq::or_code, JOYCODE_BUTTON5_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON6, "P2 Button 6", input_seq(JOYCODE_BUTTON6_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON7, "P2 Button 7", input_seq(JOYCODE_BUTTON7_INDEXED(1)) ) INPUT_PORT_DIGITAL_TYPE( 2, PLAYER2, BUTTON8, "P2 Button 8", input_seq(JOYCODE_BUTTON8_INDEXED(1)) ) diff --git a/src/mame/drivers/fidel_csc.cpp b/src/mame/drivers/fidel_csc.cpp index c8b86b99b7f..4127a2df34a 100644 --- a/src/mame/drivers/fidel_csc.cpp +++ b/src/mame/drivers/fidel_csc.cpp @@ -372,7 +372,7 @@ WRITE8_MEMBER(csc_state::pia1_pb_w) m_speech->start_w(data >> 1 & 1); // d4: lower TSI volume - m_speech->set_output_gain(0, (data & 0x10) ? 0.5 : 1.0); + m_speech->set_output_gain(0, (data & 0x10) ? 0.25 : 1.0); } READ8_MEMBER(csc_state::pia1_pb_r) diff --git a/src/mame/drivers/fidel_elite.cpp b/src/mame/drivers/fidel_elite.cpp index 3a2226dbafa..458d9e21dfe 100644 --- a/src/mame/drivers/fidel_elite.cpp +++ b/src/mame/drivers/fidel_elite.cpp @@ -176,7 +176,7 @@ WRITE8_MEMBER(elite_state::ppi_portc_w) m_speech_bank = data >> 4 & 1; // d5: lower TSI volume - m_speech->set_output_gain(0, (data & 0x20) ? 0.5 : 1.0); + m_speech->set_output_gain(0, (data & 0x20) ? 0.25 : 1.0); // d6,d7: bookrom bankswitch (model EAG) if (m_rombank != nullptr) diff --git a/src/mame/drivers/fidel_vsc.cpp b/src/mame/drivers/fidel_vsc.cpp index 4f0ccca9b4e..fab9b75e647 100644 --- a/src/mame/drivers/fidel_vsc.cpp +++ b/src/mame/drivers/fidel_vsc.cpp @@ -275,7 +275,7 @@ WRITE8_MEMBER(vsc_state::pio_portb_w) m_speech->start_w(data >> 6 & 1); // d2: lower TSI volume - m_speech->set_output_gain(0, (data & 4) ? 0.5 : 1.0); + m_speech->set_output_gain(0, (data & 4) ? 0.25 : 1.0); } diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index a454aef4ae7..3ade8a5655b 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -44,6 +44,7 @@ - ttfball: discrete sound part, for volume gating? - what's the relation between hccbaskb and tbaskb? Is one the bootleg of the other? Or are they both made by the same subcontractor? I presume Toytronic. + - uspbball and pabball internal artwork ***************************************************************************/ @@ -1672,7 +1673,7 @@ INPUT_PORTS_END void uspbball_state::uspbball(machine_config &config) { /* basic machine hardware */ - PIC1650(config, m_maincpu, 1000000); // approximation - RC osc. R=22K, C=47pF + PIC1650(config, m_maincpu, 900000); // approximation - RC osc. R=22K, C=47pF m_maincpu->read_a().set_ioport("IN.0"); m_maincpu->write_a().set(FUNC(uspbball_state::write_a)); m_maincpu->read_b().set_constant(0xff); @@ -1683,7 +1684,7 @@ void uspbball_state::uspbball(machine_config &config) m_maincpu->write_d().set(FUNC(uspbball_state::write_d)); // PIC CLKOUT, tied to RTCC - CLOCK(config, "clock", 1000000/4).signal_handler().set_inputline("maincpu", PIC16C5x_RTCC); + CLOCK(config, "clock", 900000/4).signal_handler().set_inputline("maincpu", PIC16C5x_RTCC); TIMER(config, "display_decay").configure_periodic(FUNC(hh_pic16_state::display_decay_tick), attotime::from_msec(1)); config.set_default_layout(layout_hh_pic16_test); diff --git a/src/mame/layout/mchess.lay b/src/mame/layout/mchess.lay index dc5911fe027..9e77f64bb7b 100644 --- a/src/mame/layout/mchess.lay +++ b/src/mame/layout/mchess.lay @@ -142,7 +142,11 @@ <!-- build screen --> - <view name="Internal Layout"> + <view name="Internal Layout (Screen)"> + <group ref="display"><bounds x="0" y="0" width="86" height="94.434" /></group> + </view> + + <view name="Internal Layout (Full)"> <bounds left="-1" right="185" top="-1" bottom="96" /> <group ref="display"><bounds x="0" y="0" width="86" height="94.434" /></group> @@ -153,8 +157,4 @@ <bezel element="text_switch" inputtag="IN.3" inputmask="0x01"><bounds x="95" y="38" width="24" height="2.7" /></bezel> </view> - <view name="Screen Overlay"> - <group ref="display"><bounds x="0" y="0" width="86" height="94.434" /></group> - </view> - </mamelayout> |