Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(MESS) amstrad: Added preliminary support for the AMX mouse. [Barry Rodewald]

Browse Source
This commit is contained in:
mahlemiut 2014-01-29 10:01:24 +00:00
parent ebe4bb2f54
commit 4a7e551be4
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mess/drivers/amstrad.c
View File

@ -367,10 +367,29 @@ As far as I know, the KC compact used HD6845S only.
INPUT_PORTS_END
static INPUT_PORTS_START( amx_mouse )
PORT_START("mouse_input1")
PORT_BIT(0xff , 0, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01)
PORT_START("mouse_input2")
PORT_BIT(0xff , 0, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01)
PORT_START("mouse_input3")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_NAME("Left mouse button") PORT_CODE(MOUSECODE_BUTTON1) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON5) PORT_NAME("Right mouse button") PORT_CODE(MOUSECODE_BUTTON2) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON6) PORT_NAME("Middle mouse button") PORT_CODE(MOUSECODE_BUTTON3) PORT_CONDITION("controller_type", 0x01, EQUALS, 0x01)
PORT_START("controller_type")
PORT_CONFNAME( 0x01, 0x00, "Joystick port device" )
PORT_CONFSETTING(0x00, "2-button Joystick" )
PORT_CONFSETTING(0x01, "AMX mouse interface" )
INPUT_PORTS_END
static INPUT_PORTS_START( cpc464 )
PORT_INCLUDE(amstrad_keyboard)
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END
@ -396,6 +415,7 @@ static INPUT_PORTS_START( cpc664 )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Keypad f4") PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END
@ -427,6 +447,7 @@ static INPUT_PORTS_START( cpc6128 )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END
@ -494,6 +515,7 @@ static INPUT_PORTS_START( cpc6128f )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('w') PORT_CHAR('W')
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END
static INPUT_PORTS_START( cpc6128s )
@ -551,12 +573,14 @@ static INPUT_PORTS_START( kccomp )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_SHIFT_2)
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END
static INPUT_PORTS_START( plus )
PORT_INCLUDE(amstrad_keyboard)
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
/* The CPC+ and GX4000 adds support for analogue controllers.
Up to two joysticks or four paddles can be used, although the ASIC supports twice that.
@ -738,6 +762,7 @@ static INPUT_PORTS_START( aleste )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Funny looking Russian symbol") PORT_CODE(KEYCODE_END)
PORT_INCLUDE(crtc_links)
PORT_INCLUDE(amx_mouse)
INPUT_PORTS_END

28
src/mess/machine/amstrad.c
View File

@ -2668,6 +2668,10 @@ READ8_MEMBER(amstrad_state::amstrad_psg_porta_read)
if (keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F])
{
if((m_io_ctrltype->read_safe(0) == 1) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9) // joystick 1
{
return m_amx_mouse_data;
}
return keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0xFF;
}
return 0xFF;
@ -2700,6 +2704,30 @@ IRQ_CALLBACK_MEMBER(amstrad_state::amstrad_cpu_acknowledge_int)
}
return (m_asic.ram[0x2805] & 0xf8) | m_plus_irq_cause;
}
// update AMX mouse inputs (normally done every 1/300th of a second)
if(m_io_ctrltype->read_safe(0) == 1)
{
static UINT8 prev_x,prev_y;
UINT8 data_x, data_y;
m_amx_mouse_data = 0;
data_x = m_io_mouse1->read_safe(0) & 0xff;
data_y = m_io_mouse2->read_safe(0) & 0xff;
if(data_x < prev_x)
m_amx_mouse_data |= 0x08;
if(data_x > prev_x)
m_amx_mouse_data |= 0x04;
if(data_y < prev_y)
m_amx_mouse_data |= 0x02;
if(data_y > prev_y)
m_amx_mouse_data |= 0x01;
m_amx_mouse_data |= (m_io_mouse3->read_safe(0) << 4);
prev_x = data_x;
prev_y = data_y;
m_amx_mouse_data |= (m_io_keyboard_row_9->read_safe(0) & 0x80); // DEL key
}
return 0xFF;
}