diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/bus/coleco/sac.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/bus/coleco/sac.cpp')
-rw-r--r-- | src/devices/bus/coleco/sac.cpp | 139 |
1 files changed, 0 insertions, 139 deletions
diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp deleted file mode 100644 index 7b3cef9b114..00000000000 --- a/src/devices/bus/coleco/sac.cpp +++ /dev/null @@ -1,139 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Curt Coder -/********************************************************************** - - ColecoVision Super Action Controller emulation - -**********************************************************************/ - -#include "emu.h" -#include "sac.h" - - - -//************************************************************************** -// DEVICE DEFINITIONS -//************************************************************************** - -DEFINE_DEVICE_TYPE(COLECO_SUPER_ACTION_CONTROLLER, coleco_super_action_controller_device, "coleco_sac", "ColecoVision Super Action Controller") - - -CUSTOM_INPUT_MEMBER( coleco_super_action_controller_device::keypad_r ) -{ - uint8_t data = 0xf; - uint16_t keypad = m_io_keypad->read(); - - if (!BIT(keypad, 0)) data &= 0x0a; - if (!BIT(keypad, 1)) data &= 0x0d; - if (!BIT(keypad, 2)) data &= 0x07; - if (!BIT(keypad, 3)) data &= 0x0c; - if (!BIT(keypad, 4)) data &= 0x02; - if (!BIT(keypad, 5)) data &= 0x03; - if (!BIT(keypad, 6)) data &= 0x0e; - if (!BIT(keypad, 7)) data &= 0x05; - if (!BIT(keypad, 8)) data &= 0x01; - if (!BIT(keypad, 9)) data &= 0x0b; - if (!BIT(keypad, 10)) data &= 0x06; - if (!BIT(keypad, 11)) data &= 0x09; - if (!BIT(keypad, 12)) data &= 0x04; - if (!BIT(keypad, 13)) data &= 0x08; - - return data; -} - -INPUT_CHANGED_MEMBER( coleco_super_action_controller_device::slider_w ) -{ - // TODO -} - -static INPUT_PORTS_START( coleco_super_action_controller ) - PORT_START("COMMON0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) - PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) - - PORT_START("COMMON1") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, coleco_super_action_controller_device, keypad_r, nullptr) - PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) - - PORT_START("KEYPAD") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 0") PORT_CODE(KEYCODE_0_PAD) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 1") PORT_CODE(KEYCODE_1_PAD) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 2") PORT_CODE(KEYCODE_2_PAD) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 3") PORT_CODE(KEYCODE_3_PAD) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 4") PORT_CODE(KEYCODE_4_PAD) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 5") PORT_CODE(KEYCODE_5_PAD) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 6") PORT_CODE(KEYCODE_6_PAD) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 7") PORT_CODE(KEYCODE_7_PAD) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 8") PORT_CODE(KEYCODE_8_PAD) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad 9") PORT_CODE(KEYCODE_9_PAD) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad #") PORT_CODE(KEYCODE_MINUS_PAD) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Keypad *") PORT_CODE(KEYCODE_PLUS_PAD) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON4 ) - - PORT_START("SLIDER") - PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(25) PORT_REVERSE PORT_RESET PORT_CHANGED_MEMBER(DEVICE_SELF, coleco_super_action_controller_device, slider_w, nullptr) -INPUT_PORTS_END - - -//------------------------------------------------- -// input_ports - device-specific input ports -//------------------------------------------------- - -ioport_constructor coleco_super_action_controller_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( coleco_super_action_controller ); -} - - - -//************************************************************************** -// LIVE DEVICE -//************************************************************************** - -//------------------------------------------------- -// coleco_super_action_controller_device - constructor -//------------------------------------------------- - -coleco_super_action_controller_device::coleco_super_action_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, COLECO_SUPER_ACTION_CONTROLLER, tag, owner, clock), - device_colecovision_control_port_interface(mconfig, *this), - m_io_common0(*this, "COMMON0"), - m_io_common1(*this, "COMMON1"), - m_io_keypad(*this, "KEYPAD") -{ -} - - -//------------------------------------------------- -// device_start - device-specific startup -//------------------------------------------------- - -void coleco_super_action_controller_device::device_start() -{ - // state saving - save_item(NAME(m_common0)); - save_item(NAME(m_common1)); -} - - -//------------------------------------------------- -// joy_r - joystick read -//------------------------------------------------- - -uint8_t coleco_super_action_controller_device::joy_r() -{ - uint8_t data = 0x7f; - - if (!m_common0) data &= m_io_common0->read(); - if (!m_common1) data &= m_io_common1->read(); - - return data; -} |