From d56881c80f855a41f2f9628896c73a026148598a Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 26 Jul 2023 15:31:20 +0200 Subject: cp1: remove unneeded set_log --- src/mame/layout/cp1.lay | 8 -------- src/mame/skeleton/cp1.cpp | 40 ++++++++++++++++++---------------------- src/mame/taito/taitosj.cpp | 2 +- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/mame/layout/cp1.lay b/src/mame/layout/cp1.lay index de00e2b00e5..4c42cfb5459 100644 --- a/src/mame/layout/cp1.lay +++ b/src/mame/layout/cp1.lay @@ -3,10 +3,6 @@ license:CC0-1.0 --> - - - - @@ -35,9 +31,5 @@ license:CC0-1.0 - - - - diff --git a/src/mame/skeleton/cp1.cpp b/src/mame/skeleton/cp1.cpp index 8494efcea59..b515f3e47a4 100644 --- a/src/mame/skeleton/cp1.cpp +++ b/src/mame/skeleton/cp1.cpp @@ -2,12 +2,12 @@ // copyright-holders:Sandro Ronco /*************************************************************************** - Kosmos CP-1 + Kosmos CP1 06/03/2012 Skeleton driver. on board there is also 8155 - KEYBOARD Membrane keyboard, 57 keys + KEYBOARD Membrane keyboard, 20+10 keys 6 * 7 seg led display ****************************************************************************/ @@ -41,12 +41,14 @@ public: { } void cp1(machine_config &config); -private: - void cp1_io(address_map &map); +protected: virtual void machine_start() override; virtual void machine_reset() override; +private: + void cp1_io(address_map &map); + uint8_t port1_r(); uint8_t port2_r(); void port1_w(uint8_t data); @@ -68,9 +70,8 @@ private: required_ioport_array<5> m_io_lines; required_ioport m_io_config; - uint8_t m_7seg; - uint8_t m_port2; - uint8_t m_matrix; + uint8_t m_port2 = 0; + uint8_t m_matrix = 0; }; uint8_t cp1_state::port1_r() @@ -103,8 +104,8 @@ uint8_t cp1_state::port2_r() uint8_t data = 0; - for(int i=0; i<5; i++) - if (!(m_matrix & (1<read(); return (data & 0x0f) | (m_port2 & 0xf0); @@ -159,8 +160,7 @@ void cp1_state::i8155_write(offs_t offset, uint8_t data) void cp1_state::i8155_porta_w(uint8_t data) { - m_7seg = data & 0x7f; // PA7 is not connected - m_display->matrix(~m_matrix, m_7seg); + m_display->write_mx(data | 0x80); // PA7 is not connected } uint8_t cp1_state::i8155_portb_r() @@ -177,8 +177,8 @@ void cp1_state::i8155_portb_w(uint8_t data) void cp1_state::i8155_portc_w(uint8_t data) { // --xx xxxx keyboard matrix, 7seg select - m_matrix = data & 0x3f; - m_display->matrix(~m_matrix, m_7seg); + m_matrix = ~data & 0x3f; + m_display->write_my(m_matrix); } @@ -227,13 +227,12 @@ INPUT_PORTS_END void cp1_state::machine_start() { + save_item(NAME(m_port2)); + save_item(NAME(m_matrix)); } void cp1_state::machine_reset() { - m_port2 = 0; - m_matrix = 0; - m_7seg = 0; m_cassette->change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE); } @@ -278,10 +277,6 @@ void cp1_state::cp1(machine_config &config) maincpu.p1_out_cb().set(FUNC(cp1_state::port1_w)); maincpu.p2_in_cb().set(FUNC(cp1_state::port2_r)); maincpu.p2_out_cb().set(FUNC(cp1_state::port2_w)); - maincpu.bus_in_cb().set_log("getbus"); - maincpu.bus_out_cb().set_log("putbus"); - maincpu.t0_in_cb().set_log("t0_r"); - maincpu.t1_in_cb().set_log("t1_r"); i8155_device &i8155(I8155(config, "i8155", 0)); i8155.out_pa_callback().set(FUNC(cp1_state::i8155_porta_w)); @@ -291,8 +286,9 @@ void cp1_state::cp1(machine_config &config) I8155(config, "i8155_cp3", 0); - PWM_DISPLAY(config, m_display).set_size(6, 7); + PWM_DISPLAY(config, m_display).set_size(6, 8); m_display->set_segmask(0x3f, 0x7f); + m_display->set_segmask(0x08, 0xff); // 3rd digit DP is always on config.set_default_layout(layout_cp1); SPEAKER(config, "mono").front_center(); @@ -326,4 +322,4 @@ ROM_END /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1980, cp1, 0, 0, cp1, cp1, cp1_state, empty_init, "Kosmos", "CP1 / Computer Praxis", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +COMP( 1980, cp1, 0, 0, cp1, cp1, cp1_state, empty_init, "Kosmos", "CP1 / Computer-Praxis", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/taitosj.cpp b/src/mame/taito/taitosj.cpp index ec85d4b0010..592eae2cf6e 100644 --- a/src/mame/taito/taitosj.cpp +++ b/src/mame/taito/taitosj.cpp @@ -2924,4 +2924,4 @@ GAME( 1983, waterski, 0, nomcu, waterski, taitosj_state, init_taitosj GAME( 1983, bioatack, 0, nomcu, bioatack, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "Bio Attack", MACHINE_SUPPORTS_SAVE ) // Fox Video Games = licensor of movie rights GAME( 1984, sfposeid, 0, mcu, sfposeid, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Sea Fighter Poseidon", MACHINE_SUPPORTS_SAVE ) GAME( 1983, hwrace, 0, nomcu, hwrace, taitosj_state, init_taitosj, ROT270, "Taito Corporation", "High Way Race", MACHINE_SUPPORTS_SAVE ) -GAME( 1984, kikstart, 0, kikstart, kikstart, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Kick Start - Wheelie King", MACHINE_SUPPORTS_SAVE ) +GAME( 1984, kikstart, 0, kikstart, kikstart, taitosj_state, init_taitosj, ROT0, "Taito Corporation", "Kick Start: Wheelie King", MACHINE_SUPPORTS_SAVE ) -- cgit v1.2.3