Skip to content

Commit 1b0d3a3

Browse files
committed
Avoid clash with rk7007.
1 parent 469991c commit 1b0d3a3

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/mame/ussr/orion.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ ROM_END
372372

373373
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
374374
COMP( 1990, orion128, 0, 0, orion128, radio86, orion_state, empty_init, "<unknown>", "Orion 128", MACHINE_SUPPORTS_SAVE )
375-
COMP( 1990, orionms, orion128, 0, orion128ms, ms7007, orion_state, empty_init, "<unknown>", "Orion 128 (MS7007)", MACHINE_SUPPORTS_SAVE )
375+
COMP( 1990, orionms, orion128, 0, orion128ms, rk7007, orion_state, empty_init, "<unknown>", "Orion 128 (MS7007)", MACHINE_SUPPORTS_SAVE )
376376
COMP( 1990, orionz80, orion128, 0, orionz80, radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II", MACHINE_SUPPORTS_SAVE )
377377
COMP( 1990, orionide, orion128, 0, orionz80, radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE", MACHINE_SUPPORTS_SAVE )
378-
COMP( 1990, orionzms, orion128, 0, orionz80ms, ms7007, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II (MS7007)", MACHINE_SUPPORTS_SAVE )
379-
COMP( 1990, orionidm, orion128, 0, orionz80ms, ms7007, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", MACHINE_SUPPORTS_SAVE )
378+
COMP( 1990, orionzms, orion128, 0, orionz80ms, rk7007, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II (MS7007)", MACHINE_SUPPORTS_SAVE )
379+
COMP( 1990, orionidm, orion128, 0, orionz80ms, rk7007, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", MACHINE_SUPPORTS_SAVE )
380380
COMP( 1994, orionpro, orion128, 0, orionpro, radio86, orion_pro_state, empty_init, "<unknown>", "Orion Pro", MACHINE_SUPPORTS_SAVE )

src/mame/ussr/radio86.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ INPUT_PORTS_START( kr03 )
304304
PORT_BIT(0x00, IP_ACTIVE_LOW, IPT_UNUSED)
305305
INPUT_PORTS_END
306306

307-
INPUT_PORTS_START( ms7007 )
307+
// keyboard module is MS7007, originally designed for UKNC
308+
INPUT_PORTS_START( rk7007 )
308309
PORT_START("LINE0")
309310
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR(' ') PORT_CHAR('0')
310311
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR(')') PORT_CHAR('9')
@@ -697,7 +698,7 @@ COMP( 1986, radio4k, radio86, 0, radio86, radio86, radio86_state, init_ra
697698
COMP( 1986, radiorom, radio86, 0, radiorom, radio86, radio86_state, init_radio86, "<unknown>", "Radio-86RK (ROM-Disk)", MACHINE_SUPPORTS_SAVE )
698699
COMP( 1986, radioram, radio86, 0, radioram, radio86, radio86_state, init_radioram, "<unknown>", "Radio-86RK (ROM/RAM Disk)", MACHINE_SUPPORTS_SAVE )
699700
COMP( 1986, spektr01, radio86, 0, radio86, radio86, radio86_state, init_radio86, "<unknown>", "Spektr-001", MACHINE_SUPPORTS_SAVE )
700-
COMP( 1986, rk7007, radio86, 0, rk7007, ms7007, radio86_state, init_radio86, "<unknown>", "Radio-86RK (MS7007)", MACHINE_SUPPORTS_SAVE )
701-
COMP( 1986, rk700716, radio86, 0, rk700716, ms7007, radio86_state, init_radio86, "<unknown>", "Radio-86RK (MS7007 16K RAM)", MACHINE_SUPPORTS_SAVE )
701+
COMP( 1986, rk7007, radio86, 0, rk7007, rk7007, radio86_state, init_radio86, "<unknown>", "Radio-86RK (MS7007)", MACHINE_SUPPORTS_SAVE )
702+
COMP( 1986, rk700716, radio86, 0, rk700716, rk7007, radio86_state, init_radio86, "<unknown>", "Radio-86RK (MS7007 16K RAM)", MACHINE_SUPPORTS_SAVE )
702703
COMP( 1986, mikron2, radio86, 0, mikron2, radio86, radio86_state, init_radio86, "<unknown>", "Mikron-2", MACHINE_SUPPORTS_SAVE )
703704
COMP( 1986, impuls03, radio86, 0, impuls03, radio86, radio86_state, init_radio86, "<unknown>", "Impuls-03", MACHINE_SUPPORTS_SAVE )

src/mame/ussr/radio86.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ class radio86_state : public driver_device
115115
/*----------- defined in drivers/radio86.c -----------*/
116116

117117
INPUT_PORTS_EXTERN( radio86 );
118-
INPUT_PORTS_EXTERN( ms7007 );
118+
INPUT_PORTS_EXTERN( rk7007 );
119119

120120
#endif // MAME_USSR_RADIO86_H

0 commit comments

Comments
 (0)