diff options
Diffstat (limited to 'src/mame/casio/ctk2000.cpp')
-rw-r--r-- | src/mame/casio/ctk2000.cpp | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/src/mame/casio/ctk2000.cpp b/src/mame/casio/ctk2000.cpp index a3710cb8313..d0320506527 100644 --- a/src/mame/casio/ctk2000.cpp +++ b/src/mame/casio/ctk2000.cpp @@ -48,13 +48,13 @@ public: void ctk2000(machine_config &config); - DECLARE_CUSTOM_INPUT_MEMBER(lcd_r) { return m_lcdc->db_r() >> 4; } + ioport_value lcd_r() { return m_lcdc->db_r() >> 4; } void lcd_w(int state) { m_lcdc->db_w(state << 4); } void apo_w(int state); private: - void ctk2000_map(address_map &map); + void ctk2000_map(address_map &map) ATTR_COLD; virtual void driver_start() override; virtual void driver_reset() override; @@ -113,7 +113,7 @@ void ctk2000_state::ctk2000(machine_config &config) m_maincpu->adc_cb<3>().set_ioport("AIN3"); // LCD - HD44780(config, m_lcdc, 250'000); // TODO: Wrong device type, should be ST7066U_0A; clock not measured, datasheet typical clock used + HD44780(config, m_lcdc, 270'000); // TODO: Wrong device type, should be ST7066U_0A; clock not measured, datasheet typical clock used m_lcdc->set_lcd_size(2, 8); m_lcdc->set_pixel_update_cb(FUNC(ctk2000_state::lcd_update)); @@ -132,81 +132,81 @@ void ctk2000_state::ctk2000(machine_config &config) INPUT_PORTS_START(ctk2100) PORT_START("maincpu:kbd:FI0") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C2") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C2#") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D2") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D2#") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("E2") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F2") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F2#") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G2") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C2 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_CS2 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_D2 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_DS2 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_E2 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_F2 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_FS2 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_G2 PORT_START("maincpu:kbd:FI1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G2#") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A2") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A2#") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B2") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C3") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C3#") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D3") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D3#") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_GS2 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_A2 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_AS2 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_B2 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C3 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_CS3 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_D3 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_DS3 PORT_START("maincpu:kbd:FI2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("E3") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F3") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F3#") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G3") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G3#") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A3") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A3#") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B3") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_E3 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_F3 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_FS3 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_G3 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_GS3 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_A3 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_AS3 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_B3 PORT_START("maincpu:kbd:FI3") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C4") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C4#") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D4") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D4#") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("E4") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F4") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F4#") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G4") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C4 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_CS4 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_D4 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_DS4 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_E4 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_F4 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_FS4 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_G4 PORT_START("maincpu:kbd:FI4") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G4#") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A4") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A4#") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B4") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C5") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C5#") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D5") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D5#") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_GS4 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_A4 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_AS4 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_B4 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C5 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_CS5 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_D5 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_DS5 PORT_START("maincpu:kbd:FI5") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("E5") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F5") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F5#") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G5") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G5#") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A5") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A5#") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B5") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_E5 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_F5 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_FS5 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_G5 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_GS5 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_A5 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_AS5 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_B5 PORT_START("maincpu:kbd:FI6") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C6") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C6#") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D6") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("D6#") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("E6") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F6") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("F6#") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G6") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C6 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_CS6 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_D6 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_DS6 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_E6 + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_F6 + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_FS6 + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_G6 PORT_START("maincpu:kbd:FI7") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("G6#") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A6") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A6#") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B6") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C7") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_GS6 + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_A6 + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_AS6 + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_B6 + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_GM_C7 PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("maincpu:kbd:FI8") @@ -257,19 +257,19 @@ INPUT_PORTS_START(ctk2100) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Variation / Fill In / Fast Forward") PORT_START("P2_R") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(ctk2000_state, lcd_r) + PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(FUNC(ctk2000_state::lcd_r)) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P2_W") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_MEMBER(ctk2000_state, lcd_w) + PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_MEMBER(FUNC(ctk2000_state::lcd_w)) PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", hd44780_device, e_w) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_MEMBER(ctk2000_state, apo_w) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", FUNC(hd44780_device::e_w)) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_MEMBER(FUNC(ctk2000_state::apo_w)) PORT_START("P3") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", hd44780_device, rw_w) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", FUNC(hd44780_device::rw_w)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", hd44780_device, rs_w) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("lcdc", FUNC(hd44780_device::rs_w)) PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("AIN1") |