From a1708a30b35a7c50ede8412378e14300ba7183e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20DEL=20NERO?= Date: Sat, 5 Dec 2015 16:16:24 +0100 Subject: [PATCH] Keyboard support added ! --- src/mame/drivers/squale.cpp | 264 +++++++++++++++++++++++++++++++++++- 1 file changed, 260 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index b9484a20bea..5e4c4b0f6d3 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -79,10 +79,27 @@ public: { } DECLARE_WRITE8_MEMBER(ctrl_w); + DECLARE_READ8_MEMBER(pia_u72_porta_r); + DECLARE_READ8_MEMBER(pia_u72_portb_r); + DECLARE_READ8_MEMBER(pia_u75_porta_r); + DECLARE_READ8_MEMBER(pia_u75_portb_r); + DECLARE_WRITE8_MEMBER(pia_u72_porta_w); + DECLARE_WRITE8_MEMBER(pia_u72_portb_w); + DECLARE_WRITE8_MEMBER(pia_u75_porta_w); + DECLARE_WRITE8_MEMBER(pia_u75_portb_w); + + DECLARE_READ8_MEMBER(ay_porta_r); + DECLARE_READ8_MEMBER(ay_portb_r); + DECLARE_WRITE8_MEMBER(ay_porta_w); + DECLARE_WRITE8_MEMBER(ay_portb_w); + DECLARE_WRITE_LINE_MEMBER(pia_u75_ca2_w); + DECLARE_WRITE_LINE_MEMBER(pia_u75_cb2_w); virtual void machine_start(); virtual void machine_reset(); + UINT8 keyboard_line; + TIMER_DEVICE_CALLBACK_MEMBER(squale_scanline); private: @@ -109,6 +126,149 @@ WRITE8_MEMBER( squale_state::ctrl_w ) m_ef9365->static_set_color_filler(data & 0xF); } +READ8_MEMBER( squale_state::pia_u72_porta_r ) +{ + UINT8 data = 0xFF; + + #ifdef DBGMODE + printf("%s: read pia_u72_porta_r\n",machine().describe_context()); + #endif + + return data; +} + +READ8_MEMBER( squale_state::pia_u75_porta_r ) +{ + UINT8 data = 0xAA; + #ifdef DBGMODE + printf("%s: read pia_u75_porta_r\n",machine().describe_context()); + #endif + data = keyboard_line; + return data; +} + +READ8_MEMBER( squale_state::pia_u72_portb_r ) +{ + UINT8 data = 0xFF; + #ifdef DBGMODE + printf("%s: read pia_u72_portb_r\n",machine().describe_context()); + #endif + return data; +} + +READ8_MEMBER( squale_state::pia_u75_portb_r ) +{ + char kbdrow[6]; + UINT8 data = 0xFF; + + for (int i = 0; i < 8; i++) + { + sprintf(kbdrow,"X%X",i); + + for( int j = 0; j < 8 ; j++) + { + if( !(keyboard_line & (0x01<read() & (0x01<read(); + + #ifdef DBGMODE + printf("%s: read ay_portb_r : 0x%.2X\n",machine().describe_context(),data); + #endif + + return data; +} + +WRITE_LINE_MEMBER(squale_state::pia_u75_ca2_w) +{ + #ifdef DBGMODE + printf("%s: U75 PIA Port CA2 Set to %2x\n", machine().describe_context(),state); + #endif +} + +WRITE_LINE_MEMBER(squale_state::pia_u75_cb2_w) +{ + #ifdef DBGMODE + printf("%s: U75 PIA Port CB2 Set to %2x\n", machine().describe_context(),state); + #endif +} + TIMER_DEVICE_CALLBACK_MEMBER( squale_state::squale_scanline ) { m_ef9365->update_scanline((UINT16)param); @@ -119,8 +279,8 @@ static ADDRESS_MAP_START(squale_mem, AS_PROGRAM, 8, squale_state) AM_RANGE(0x0000,0xefff) AM_RAM AM_RANGE(0xf000,0xf00f) AM_DEVREADWRITE("ef9365", ef9365_device, data_r, data_w) AM_RANGE(0xf010,0xf01f) AM_WRITE( ctrl_w ) - AM_RANGE(0xf044,0xf047) AM_DEVREADWRITE("pia_u75", pia6821_device, read_alt, write_alt) - AM_RANGE(0xf048,0xf04b) AM_DEVREADWRITE("pia_u72", pia6821_device, read_alt, write_alt) + AM_RANGE(0xf044,0xf047) AM_DEVREADWRITE("pia_u75", pia6821_device, read, write) + AM_RANGE(0xf048,0xf04b) AM_DEVREADWRITE("pia_u72", pia6821_device, read, write) AM_RANGE(0xf050,0xf05f) AM_DEVREADWRITE("ef6850", acia6850_device, data_r, data_w) AM_RANGE(0xf060,0xf06f) AM_DEVREADWRITE("ay8910", ay8910_device, data_r, address_data_w) AM_RANGE(0xf100,0xffff) AM_ROMBANK("rom_bank"); @@ -132,6 +292,90 @@ ADDRESS_MAP_END /* Input ports */ static INPUT_PORTS_START( squale ) + PORT_START("X0") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) + + PORT_START("X1") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BackS Delete") PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR(8) PORT_CHAR(UCHAR_MAMEKEY(DEL)) + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') + + PORT_START("X2") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) + + PORT_START("X3") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('-') + + PORT_START("X4") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('[') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR(']') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) + + PORT_START("X5") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BS") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) + + PORT_START("X6") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(TAB)) + + PORT_START("X7") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LF") PORT_CODE(KEYCODE_RALT) PORT_CHAR(10) + + PORT_START("ay_keys") + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift Lck") PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) INPUT_PORTS_END void squale_state::machine_start() @@ -166,16 +410,28 @@ static MACHINE_CONFIG_START( squale, squale_state ) /* Cartridge pia */ MCFG_DEVICE_ADD("pia_u72", PIA6821, 0) - // TODO : Add port I/O handler + MCFG_PIA_READPA_HANDLER(READ8(squale_state, pia_u72_porta_r)) + MCFG_PIA_READPB_HANDLER(READ8(squale_state, pia_u72_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(squale_state, pia_u72_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(squale_state, pia_u72_portb_w)) /* Keyboard pia */ MCFG_DEVICE_ADD("pia_u75", PIA6821, 0) - // TODO : Add port I/O handler + MCFG_PIA_READPA_HANDLER(READ8(squale_state, pia_u75_porta_r)) + MCFG_PIA_READPB_HANDLER(READ8(squale_state, pia_u75_portb_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(squale_state, pia_u75_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(squale_state, pia_u75_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(squale_state, pia_u75_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(squale_state, pia_u75_cb2_w)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ay8910", AY8910, AY_CLOCK) // TODO : Add port I/O handler + MCFG_AY8910_PORT_A_READ_CB(READ8(squale_state, ay_porta_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(squale_state, ay_portb_r)) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(squale_state, ay_porta_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(squale_state, ay_portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_DEVICE_ADD ("ef6850", ACIA6850, 0)