diff options
| author | 2015-01-28 09:20:10 +0100 | |
|---|---|---|
| committer | 2015-01-28 09:20:10 +0100 | |
| commit | 26e7a17b6326aa5a75a6276e52cf84a94c16d7a0 (patch) | |
| tree | bab4468226c59d590688e0ece892f5bfbca58736 /src/emu/bus | |
| parent | 13b862c4fae88f0f819c2c4416d49249e4de45b9 (diff) | |
Cleanups and version bumpmame0158
Diffstat (limited to 'src/emu/bus')
25 files changed, 226 insertions, 230 deletions
diff --git a/src/emu/bus/a8sio/a8sio.c b/src/emu/bus/a8sio/a8sio.c index 520faa1e40f..fd64d077b50 100644 --- a/src/emu/bus/a8sio/a8sio.c +++ b/src/emu/bus/a8sio/a8sio.c @@ -217,4 +217,3 @@ WRITE_LINE_MEMBER( device_a8sio_card_interface::motor_w ) SLOT_INTERFACE_START(a8sio_cards) SLOT_INTERFACE("cassette", A8SIO_CASSETTE) SLOT_INTERFACE_END - diff --git a/src/emu/bus/a8sio/cassette.c b/src/emu/bus/a8sio/cassette.c index cc2af705dad..45d33173bac 100644 --- a/src/emu/bus/a8sio/cassette.c +++ b/src/emu/bus/a8sio/cassette.c @@ -115,4 +115,3 @@ void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, i break; } } - diff --git a/src/emu/bus/nes_ctrl/4score.c b/src/emu/bus/nes_ctrl/4score.c index ef384855612..a631804f7a7 100644 --- a/src/emu/bus/nes_ctrl/4score.c +++ b/src/emu/bus/nes_ctrl/4score.c @@ -4,15 +4,15 @@ Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. - - - TODO: current implementation is a HACK, due to limitations of the + + + TODO: current implementation is a HACK, due to limitations of the slot system! A real Four Score would be connected to both the controller ports of the NES, but current core cannot emulate something like this until devices can live their own life and being connected to other devices at request. - In current implementation the device has to be mounted separately in + In current implementation the device has to be mounted separately in the two ports and each enables 2 inputs (this is more or less as hacky as the non-slot previous one, where the 4 ports were always available to the emulated system, but it's not a great consolation :( ) @@ -22,7 +22,7 @@ since we could at best have two switches to disable the second player inputs. - Note: Two Pads are hardcoded in inputs below, instead of acting as + Note: Two Pads are hardcoded in inputs below, instead of acting as passthrough for 2 standard joypad devices, in order to show in the internal UI that they belong to P1+P3 and P2+P4, otherwise they would be listed as P1+P2 and P3+P4 respectively. This *HAS* to be changed @@ -171,10 +171,10 @@ void nes_4score_p1p3_device::write(UINT8 data) { if (data & 0x01) return; - + // P3 & P4 inputs in NES Four Score are read serially with P1 & P2 m_latch = m_joypad1->read(); - m_latch |= (m_joypad3->read() << 8); // pad 3 + m_latch |= (m_joypad3->read() << 8); // pad 3 m_latch |= (0x08 << 16); // signature } @@ -182,9 +182,9 @@ void nes_4score_p2p4_device::write(UINT8 data) { if (data & 0x01) return; - + // P3 & P4 inputs in NES Four Score are read serially with P1 & P2 m_latch = m_joypad2->read(); - m_latch |= (m_joypad4->read() << 8); // pad 4 + m_latch |= (m_joypad4->read() << 8); // pad 4 m_latch |= (0x04 << 16); // signature } diff --git a/src/emu/bus/nes_ctrl/4score.h b/src/emu/bus/nes_ctrl/4score.h index f7a688fb162..9d1d4a348fa 100644 --- a/src/emu/bus/nes_ctrl/4score.h +++ b/src/emu/bus/nes_ctrl/4score.h @@ -47,12 +47,12 @@ class nes_4score_p1p3_device : public nes_4score_device public: // construction/destruction nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; - + protected: virtual void write(UINT8 data); - + private: required_ioport m_joypad1; required_ioport m_joypad3; @@ -67,10 +67,10 @@ public: nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const; - + protected: virtual void write(UINT8 data); - + private: required_ioport m_joypad2; required_ioport m_joypad4; diff --git a/src/emu/bus/nes_ctrl/arkpaddle.c b/src/emu/bus/nes_ctrl/arkpaddle.c index 14faf6a2a43..2ab6aef468b 100644 --- a/src/emu/bus/nes_ctrl/arkpaddle.c +++ b/src/emu/bus/nes_ctrl/arkpaddle.c @@ -105,9 +105,9 @@ UINT8 nes_vaus_device::read_bit34() UINT8 nes_vausfc_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 0) //$4016 + if (offset == 0) //$4016 ret = m_button->read() << 1; - else //$4017 + else //$4017 { ret = (m_latch & 0x80) >> 6; m_latch <<= 1; diff --git a/src/emu/bus/nes_ctrl/arkpaddle.h b/src/emu/bus/nes_ctrl/arkpaddle.h index a683f3e9904..73f0ff864d0 100644 --- a/src/emu/bus/nes_ctrl/arkpaddle.h +++ b/src/emu/bus/nes_ctrl/arkpaddle.h @@ -56,7 +56,7 @@ class nes_vausfc_device : public nes_vaus_device public: // construction/destruction nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + protected: virtual UINT8 read_bit34() { return 0; } virtual UINT8 read_exp(offs_t offset); diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/emu/bus/nes_ctrl/bcbattle.c index 403bdeec1ae..c845627487e 100644 --- a/src/emu/bus/nes_ctrl/bcbattle.c +++ b/src/emu/bus/nes_ctrl/bcbattle.c @@ -5,7 +5,7 @@ TODO: this should be actually emulated as a standalone system with a few 7segments LEDs, once we get a dump of its BIOS At the moment we only emulated the connection with a Famicom - + Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -57,26 +57,26 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int if (m_reader->get_byte_length() == 13) { for (int i = 0; i < 13; i++) - m_current_barcode[i] = m_reader->read_code() + '0'; + m_current_barcode[i] = m_reader->read_code() + '0'; } else if (m_reader->get_byte_length() == 8) { for (int i = 0; i < 5; i++) - m_current_barcode[i] = 0x20; + m_current_barcode[i] = 0x20; for (int i = 5; i < 13; i++) - m_current_barcode[i] = m_reader->read_code() + '0'; + m_current_barcode[i] = m_reader->read_code() + '0'; } // read one more, to reset the internal byte counter m_reader->read_code(); // the string "SUNSOFT" is accepted as well by Barcode World - m_current_barcode[13] = 'E'; - m_current_barcode[14] = 'P'; - m_current_barcode[15] = 'O'; - m_current_barcode[16] = 'C'; - m_current_barcode[17] = 'H'; - m_current_barcode[18] = 0x0d; - m_current_barcode[19] = 0x0a; + m_current_barcode[13] = 'E'; + m_current_barcode[14] = 'P'; + m_current_barcode[15] = 'O'; + m_current_barcode[16] = 'C'; + m_current_barcode[17] = 'H'; + m_current_barcode[18] = 0x0d; + m_current_barcode[19] = 0x0a; m_pending_code = 1; } m_new_code = m_reader->get_pending_code(); @@ -110,7 +110,7 @@ void nes_bcbattle_device::device_start() // and sending the proper serial bits, instead of our read_current_bit() function! battler_timer = timer_alloc(TIMER_BATTLER); battler_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1000)); - + save_item(NAME(m_current_barcode)); save_item(NAME(m_new_code)); save_item(NAME(m_pending_code)); @@ -184,7 +184,7 @@ int nes_bcbattle_device::read_current_bit() UINT8 nes_bcbattle_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) //$4017 + if (offset == 1) //$4017 { ret |= read_current_bit() << 2; } diff --git a/src/emu/bus/nes_ctrl/ctrl.c b/src/emu/bus/nes_ctrl/ctrl.c index c90b2bf82e5..9e81d228f6a 100644 --- a/src/emu/bus/nes_ctrl/ctrl.c +++ b/src/emu/bus/nes_ctrl/ctrl.c @@ -1,6 +1,6 @@ /********************************************************************** - Nintendo Family Computer & Entertainment System controller ports + Nintendo Family Computer & Entertainment System controller ports and Family Computer expansion port emulation Here we emulate in fact 3 different kind of ports, which are @@ -9,15 +9,15 @@ corresponding address ($4016 for port1, $4017 for port2) - FC controller ports: these are only hooked to bit 0 of the corresponding address (so that e.g. a NES Zapper could not - be connected to a later FC AV model, because its inputs + be connected to a later FC AV model, because its inputs would not be detected) - FC expansion port: this is hooked to bits 0-4 of both addresses To make things a little bit more complex, old FC models have the controller hardwired to the unit, and the P2 controllers are - directly hooked also to one of the expansion port lines (namely, + directly hooked also to one of the expansion port lines (namely, microphone inputs from P2 go to $4016 bit 2) - Even if the controller port and the expansion port are + Even if the controller port and the expansion port are physically different (the FC expansion is a 15pin port, while the controller ports are 7pin), we emulate them as variants of a common device, exposing the following handlers: @@ -25,15 +25,15 @@ inputs from controllers - read_bit34: for bit3,4 reading, expected to be at the correct offset (but we don't currently check for read_bit34 & 0xf8==0) - - read_exp: for reads going through the expansion, with a offset + - read_exp: for reads going through the expansion, with a offset parameter to decide whether we are reading from $4016 and $4017 - write: to acknowledge writes to $4016 - The driver emulation will take care to only call the correct - handlers they have hooks for: Basic usage is that the expansion - port calls read_exp, FC ctrl ports call read_bit0, and NES ctrl - ports call both read_bit0 and read_bit34. However, to cope with - the original FC microphone, we will have the second controller + The driver emulation will take care to only call the correct + handlers they have hooks for: Basic usage is that the expansion + port calls read_exp, FC ctrl ports call read_bit0, and NES ctrl + ports call both read_bit0 and read_bit34. However, to cope with + the original FC microphone, we will have the second controller port calling read_exp too. Copyright MESS Team. @@ -168,7 +168,7 @@ SLOT_INTERFACE_START( nes_control_port1_devices ) SLOT_INTERFACE("joypad", NES_JOYPAD) SLOT_INTERFACE("zapper", NES_ZAPPER) SLOT_INTERFACE("4score_p1p3", NES_4SCORE_P1P3) -// SLOT_INTERFACE("miracle_piano", NES_MIRACLE) +// SLOT_INTERFACE("miracle_piano", NES_MIRACLE) SLOT_INTERFACE_END SLOT_INTERFACE_START( nes_control_port2_devices ) diff --git a/src/emu/bus/nes_ctrl/ctrl.h b/src/emu/bus/nes_ctrl/ctrl.h index a87b3c9dc9f..79d981827de 100644 --- a/src/emu/bus/nes_ctrl/ctrl.h +++ b/src/emu/bus/nes_ctrl/ctrl.h @@ -1,6 +1,6 @@ /********************************************************************** - Nintendo Family Computer & Entertainment System controller port + Nintendo Family Computer & Entertainment System controller port emulation Copyright MESS Team. @@ -32,12 +32,12 @@ public: // construction/destruction device_nes_control_port_interface(const machine_config &mconfig, device_t &device); virtual ~device_nes_control_port_interface(); - + virtual UINT8 read_bit0() { return 0; }; virtual UINT8 read_bit34() { return 0; }; virtual UINT8 read_exp(offs_t offset) { return 0; }; virtual void write(UINT8 data) { }; - + protected: nes_control_port_device *m_port; }; diff --git a/src/emu/bus/nes_ctrl/fckeybrd.c b/src/emu/bus/nes_ctrl/fckeybrd.c index f31fc04e848..53f3584780c 100644 --- a/src/emu/bus/nes_ctrl/fckeybrd.c +++ b/src/emu/bus/nes_ctrl/fckeybrd.c @@ -18,27 +18,27 @@ const device_type NES_FCKEYBOARD = &device_creator<nes_fckeybrd_device>; static INPUT_PORTS_START( fc_keyboard ) PORT_START("FCKEY.0") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Kana") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Kana") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RSHIFT) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\\') - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Stop") PORT_CODE(KEYCODE_BACKSPACE) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Stop") PORT_CODE(KEYCODE_BACKSPACE) PORT_START("FCKEY.1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('_') - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('/') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('_') + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('/') + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_START("FCKEY.2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K') @@ -48,7 +48,7 @@ static INPUT_PORTS_START( fc_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_START("FCKEY.3") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') @@ -58,7 +58,7 @@ static INPUT_PORTS_START( fc_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_START("FCKEY.4") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H') @@ -68,7 +68,7 @@ static INPUT_PORTS_START( fc_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_START("FCKEY.5") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D') @@ -78,7 +78,7 @@ static INPUT_PORTS_START( fc_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_START("FCKEY.6") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A') @@ -88,24 +88,24 @@ static INPUT_PORTS_START( fc_keyboard ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_START("FCKEY.7") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(ESC)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Grph") PORT_CODE(KEYCODE_LALT) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(ESC)) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Grph") PORT_CODE(KEYCODE_LALT) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_START("FCKEY.8") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Clr") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Clr") + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT) INPUT_PORTS_END @@ -183,7 +183,7 @@ void nes_fckeybrd_device::device_reset() UINT8 nes_fckeybrd_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 0) //$4016 + if (offset == 0) //$4016 { // FC Keyboard: tape input if ((m_cassette->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY) @@ -195,7 +195,7 @@ UINT8 nes_fckeybrd_device::read_exp(offs_t offset) ret |= 0x02; } } - else //$4017 + else //$4017 { // FC Keyboard: rows of the keyboard matrix are read 4-bits at time and returned as bit1->bit4 if (m_fck_scan < 9) @@ -216,16 +216,16 @@ void nes_fckeybrd_device::write(UINT8 data) // tape output (not fully tested) if ((m_cassette->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD) m_cassette->output(((data & 0x07) == 0x07) ? +1.0 : -1.0); - + if (BIT(data, 2)) // keyboard active { UINT8 out = BIT(data, 1); // scan - + if (m_fck_mode && !out && ++m_fck_scan > 9) m_fck_scan = 0; - + m_fck_mode = out; // access lower or upper 4 bits - + if (BIT(data, 0)) // reset m_fck_scan = 0; } diff --git a/src/emu/bus/nes_ctrl/ftrainer.c b/src/emu/bus/nes_ctrl/ftrainer.c index 38fdc326ed6..b8a7a3a22c2 100644 --- a/src/emu/bus/nes_ctrl/ftrainer.c +++ b/src/emu/bus/nes_ctrl/ftrainer.c @@ -119,7 +119,7 @@ void nes_ftrainer_device::device_reset() UINT8 nes_ftrainer_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) //$4017 + if (offset == 1) //$4017 { if (!BIT(m_row_scan, 0)) { diff --git a/src/emu/bus/nes_ctrl/hori.c b/src/emu/bus/nes_ctrl/hori.c index e9d48a98bf3..720552c7799 100644 --- a/src/emu/bus/nes_ctrl/hori.c +++ b/src/emu/bus/nes_ctrl/hori.c @@ -1,8 +1,8 @@ /********************************************************************** Nintendo Family Computer Hori Twin (and 4P?) adapters - - Emulation of the 4Players adapter is quite pointless: if 2P mode + + Emulation of the 4Players adapter is quite pointless: if 2P mode (default mode) it behaves like a Hori Twin adapter, in 4P mode it has P1 and P2 inputs overwriting the inputs coming from the main controllers (possibly creating a bit of confusion, since @@ -117,9 +117,9 @@ nes_hori4p_device::nes_hori4p_device(const machine_config &mconfig, const char * UINT8 nes_horitwin_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 0) //$4016 + if (offset == 0) //$4016 ret |= (m_port1->read_bit0() << 1); - else //$4017 + else //$4017 ret |= (m_port2->read_bit0() << 1); return ret; } @@ -127,21 +127,21 @@ UINT8 nes_horitwin_device::read_exp(offs_t offset) UINT8 nes_hori4p_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (m_cfg->read() == 0) // 2P + if (m_cfg->read() == 0) // 2P { - if (offset == 0) //$4016 + if (offset == 0) //$4016 ret |= (m_port1->read_bit0() << 1); - else //$4017 + else //$4017 ret |= (m_port2->read_bit0() << 1); } - else // 4P + else // 4P { - if (offset == 0) //$4016 + if (offset == 0) //$4016 { ret |= (m_port1->read_bit0() << 0); ret |= (m_port3->read_bit0() << 1); } - else //$4017 + else //$4017 { ret |= (m_port2->read_bit0() << 0); ret |= (m_port4->read_bit0() << 1); diff --git a/src/emu/bus/nes_ctrl/hori.h b/src/emu/bus/nes_ctrl/hori.h index 15601a7cc8e..3f9626221c9 100644 --- a/src/emu/bus/nes_ctrl/hori.h +++ b/src/emu/bus/nes_ctrl/hori.h @@ -51,17 +51,17 @@ class nes_hori4p_device : public device_t, public: // construction/destruction nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; virtual machine_config_constructor device_mconfig_additions() const; - -protected: + +protected: // device-level overrides virtual void device_start() {} - + virtual UINT8 read_exp(offs_t offset); virtual void write(UINT8 data); - + private: required_device<nes_control_port_device> m_port1; required_device<nes_control_port_device> m_port2; diff --git a/src/emu/bus/nes_ctrl/joypad.c b/src/emu/bus/nes_ctrl/joypad.c index 538235e7cf5..9d1a853901b 100644 --- a/src/emu/bus/nes_ctrl/joypad.c +++ b/src/emu/bus/nes_ctrl/joypad.c @@ -3,16 +3,16 @@ Nintendo Family Computer & Entertainment System Joypads The original Famicom had two hardwired controller, with the second - controller slightly different from the first one: it featured no + controller slightly different from the first one: it featured no Start nor Select buttons, but had a built-in microphone (with very limited capabilities, since it basically only detected two states: something blowing into it / nothing blowing into it) for some games to react to users "talking" into it - - Crazy Climber Pads are not really a kind of separate controllers, - but just a couple of small sticks to be put on top of d-pads of - the regular controllers. Users should then control the game by - using both controllers, turned 90 degrees, as a couple of dual + + Crazy Climber Pads are not really a kind of separate controllers, + but just a couple of small sticks to be put on top of d-pads of + the regular controllers. Users should then control the game by + using both controllers, turned 90 degrees, as a couple of dual sticks like in the arcade control panel. However, we emulate them separately so to map the controls to a friendlier default. @@ -20,9 +20,9 @@ by Hori, but possibly licensed by Nintendo, since it use the official logo and brand) which fits into the expansion port and allows to daisy chain a second controller to the first one, to play 4players - game (an image of such connection is shown e.g. in Nekketsu Koukou + game (an image of such connection is shown e.g. in Nekketsu Koukou Dodgeball Bu manual) - + Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -45,8 +45,8 @@ static INPUT_PORTS_START( nes_joypad ) PORT_START("JOYPAD") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -58,7 +58,7 @@ static INPUT_PORTS_START( nes_fcpad_p2 ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Microphone") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -69,8 +69,8 @@ static INPUT_PORTS_START( nes_ccpad_left ) PORT_START("JOYPAD") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY @@ -81,8 +81,8 @@ static INPUT_PORTS_START( nes_ccpad_right ) PORT_START("JOYPAD") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY @@ -103,14 +103,14 @@ static INPUT_PORTS_START( nes_arcstick ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x00) INPUT_PORTS_END //------------------------------------------------- @@ -245,7 +245,7 @@ UINT8 nes_joypad_device::read_bit0() UINT8 nes_fcpad2_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (!offset) // microphone input + if (!offset) // microphone input ret |= m_joypad->read() & 0x04; return ret; @@ -260,9 +260,9 @@ UINT8 nes_fcpad2_device::read_exp(offs_t offset) UINT8 nes_arcstick_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 0) //$4016 + if (offset == 0) //$4016 { - if ((m_cfg->read() & 2) == 0) // we are P1 input + if ((m_cfg->read() & 2) == 0) // we are P1 input { ret |= (m_latch & 1) << 1; m_latch >>= 1; @@ -270,9 +270,9 @@ UINT8 nes_arcstick_device::read_exp(offs_t offset) else ret |= m_daisychain->read_exp(0); } - else //$4017 + else //$4017 { - if ((m_cfg->read() & 2) == 2) // we are P2 input + if ((m_cfg->read() & 2) == 2) // we are P2 input { ret |= (m_latch & 1) << 1; m_latch >>= 1; @@ -280,7 +280,7 @@ UINT8 nes_arcstick_device::read_exp(offs_t offset) else ret |= m_daisychain->read_exp(1); } - + return ret; } @@ -292,7 +292,7 @@ void nes_joypad_device::write(UINT8 data) { if (data & 0x01) return; - + m_latch = m_joypad->read(); } @@ -311,7 +311,6 @@ void nes_arcstick_device::write(UINT8 data) if (data & 0x01) return; - + m_latch = m_joypad->read(); } - diff --git a/src/emu/bus/nes_ctrl/joypad.h b/src/emu/bus/nes_ctrl/joypad.h index 00c6aea58e4..27d5198ef58 100644 --- a/src/emu/bus/nes_ctrl/joypad.h +++ b/src/emu/bus/nes_ctrl/joypad.h @@ -51,9 +51,9 @@ class nes_fcpad2_device : public nes_joypad_device public: // construction/destruction nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; - + protected: virtual UINT8 read_exp(offs_t offset); virtual void write(UINT8 data); @@ -66,7 +66,7 @@ class nes_ccpadl_device : public nes_joypad_device public: // construction/destruction nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; }; @@ -77,7 +77,7 @@ class nes_ccpadr_device : public nes_joypad_device public: // construction/destruction nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; }; @@ -88,7 +88,7 @@ class nes_arcstick_device : public nes_joypad_device public: // construction/destruction nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual ioport_constructor device_input_ports() const; virtual machine_config_constructor device_mconfig_additions() const; @@ -96,7 +96,7 @@ protected: virtual UINT8 read_bit0() { return 0; } virtual UINT8 read_exp(offs_t offset); virtual void write(UINT8 data); - + required_device<nes_control_port_device> m_daisychain; required_ioport m_cfg; }; diff --git a/src/emu/bus/nes_ctrl/konamihs.c b/src/emu/bus/nes_ctrl/konamihs.c index 187d3d80e2e..19654b9bcd9 100644 --- a/src/emu/bus/nes_ctrl/konamihs.c +++ b/src/emu/bus/nes_ctrl/konamihs.c @@ -81,7 +81,7 @@ void nes_konamihs_device::device_reset() UINT8 nes_konamihs_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) //$4017 + if (offset == 1) //$4017 { ret |= m_latch_p1 << 1; ret |= m_latch_p2 << 3; diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/emu/bus/nes_ctrl/miracle.c index dbf8bfd5a7f..0a88e8a4cfc 100644 --- a/src/emu/bus/nes_ctrl/miracle.c +++ b/src/emu/bus/nes_ctrl/miracle.c @@ -1,8 +1,8 @@ /********************************************************************** Nintendo Entertainment System - Miracle Piano Keyboard - - TODO: basically everything, this is just a skeleton with no + + TODO: basically everything, this is just a skeleton with no real MIDI handling at the moment. Copyright MESS Team. @@ -13,8 +13,8 @@ #include "miracle.h" #define MIRACLE_MIDI_WAITING 0 -#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano -#define MIRACLE_MIDI_SEND 2 // send byte to piano +#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano +#define MIRACLE_MIDI_SEND 2 // send byte to piano //************************************************************************** // DEVICE DEFINITIONS @@ -129,7 +129,7 @@ UINT8 nes_miracle_device::read_bit0() void nes_miracle_device::write(UINT8 data) { -// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode); +// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode); if (m_midi_mode == MIRACLE_MIDI_SEND) { @@ -142,7 +142,7 @@ void nes_miracle_device::write(UINT8 data) // then we go back to waiting if (m_sent_bits == 8) { -// printf("xmit MIDI byte %02x\n", m_data_sent); +// printf("xmit MIDI byte %02x\n", m_data_sent); xmit_char(m_data_sent); m_midi_mode = MIRACLE_MIDI_WAITING; m_sent_bits = 0; @@ -157,13 +157,13 @@ void nes_miracle_device::write(UINT8 data) m_strobe_on = 1; return; } - + if (m_strobe_on) { // was timer running? if (m_strobe_clock > 0) { -// printf("got strobe at %d clocks\n", m_strobe_clock); +// printf("got strobe at %d clocks\n", m_strobe_clock); if (m_strobe_clock < 66 && data == 0) { @@ -199,7 +199,7 @@ void nes_miracle_device::write(UINT8 data) void nes_miracle_device::rcv_complete() // Rx completed receiving byte { receive_register_extract(); -// UINT8 rcv = get_received_char(); +// UINT8 rcv = get_received_char(); } void nes_miracle_device::tra_complete() // Tx completed sending byte @@ -247,4 +247,3 @@ void nes_miracle_device::xmit_char(UINT8 data) } } } - diff --git a/src/emu/bus/nes_ctrl/mjpanel.c b/src/emu/bus/nes_ctrl/mjpanel.c index 16e582338c9..4e45ecbd7c7 100644 --- a/src/emu/bus/nes_ctrl/mjpanel.c +++ b/src/emu/bus/nes_ctrl/mjpanel.c @@ -18,36 +18,36 @@ const device_type NES_MJPANEL = &device_creator<nes_mjpanel_device>; static INPUT_PORTS_START( nes_mjpanel ) PORT_START("MJPANEL.0") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("MJPANEL.1") - PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_N ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_M ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_L ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_K ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_MAHJONG_J ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_MAHJONG_I ) + PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_N ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_M ) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_L ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_K ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_MAHJONG_J ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_MAHJONG_I ) PORT_START("MJPANEL.2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_H ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_F ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_E ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_D ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_C ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_MAHJONG_B ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_MAHJONG_A ) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_H ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_F ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_E ) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_D ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_C ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_MAHJONG_B ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_MAHJONG_A ) PORT_START("MJPANEL.3") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_RON ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_PON ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Mahjong Select") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Mahjong Start") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_RON ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI ) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_PON ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Mahjong Select") + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Mahjong Start") INPUT_PORTS_END @@ -124,7 +124,7 @@ void nes_mjpanel_device::write(UINT8 data) { if (data & 0x01) return; - + if (data & 0xf8) logerror("Error: Mahjong panel read with mux data %02x\n", (data & 0xfe)); else diff --git a/src/emu/bus/nes_ctrl/pachinko.c b/src/emu/bus/nes_ctrl/pachinko.c index 875aa92e771..6790e636dd6 100644 --- a/src/emu/bus/nes_ctrl/pachinko.c +++ b/src/emu/bus/nes_ctrl/pachinko.c @@ -20,8 +20,8 @@ static INPUT_PORTS_START( nes_pachinko ) PORT_START("JOYPAD") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -85,7 +85,7 @@ UINT8 nes_pachinko_device::read_exp(offs_t offset) { UINT8 ret = 0; // this controller behaves like a standard P3 joypad, with longer stream of inputs - if (offset == 0) //$4016 + if (offset == 0) //$4016 { ret |= (m_latch & 1) << 1; m_latch >>= 1; @@ -101,7 +101,7 @@ void nes_pachinko_device::write(UINT8 data) { if (data & 0x01) return; - + m_latch = m_joypad->read(); m_latch |= ((m_trigger->read() ^ 0xff) & 0xff) << 8; m_latch |= 0xff0000; diff --git a/src/emu/bus/nes_ctrl/partytap.c b/src/emu/bus/nes_ctrl/partytap.c index f81fb89bd2f..769d2f30d76 100644 --- a/src/emu/bus/nes_ctrl/partytap.c +++ b/src/emu/bus/nes_ctrl/partytap.c @@ -81,7 +81,7 @@ void nes_partytap_device::device_reset() UINT8 nes_partytap_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) //$4017 + if (offset == 1) //$4017 { ret |= m_latch & 0x1c; m_latch >>= 3; diff --git a/src/emu/bus/nes_ctrl/powerpad.c b/src/emu/bus/nes_ctrl/powerpad.c index ba3a5795b43..ab13a49b8bf 100644 --- a/src/emu/bus/nes_ctrl/powerpad.c +++ b/src/emu/bus/nes_ctrl/powerpad.c @@ -130,7 +130,7 @@ void nes_powerpad_device::write(UINT8 data) { if (data & 0x01) return; - + m_latch[0] = m_ipt1->read(); m_latch[1] = m_ipt2->read() | 0xf0; } diff --git a/src/emu/bus/nes_ctrl/suborkey.c b/src/emu/bus/nes_ctrl/suborkey.c index dc05f2fb236..2449f6a5b12 100644 --- a/src/emu/bus/nes_ctrl/suborkey.c +++ b/src/emu/bus/nes_ctrl/suborkey.c @@ -22,7 +22,7 @@ static INPUT_PORTS_START( fc_suborkey ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V') @@ -32,57 +32,57 @@ static INPUT_PORTS_START( fc_suborkey ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_START("SUBOR.2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("NEXT") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("NEXT") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PRIOR") + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PRIOR") PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL) PORT_CHAR(UCHAR_MAMEKEY(DEL)) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_START("SUBOR.3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L') - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_START("SUBOR.4") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_START("SUBOR.5") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) PORT_START("SUBOR.6") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') @@ -92,17 +92,17 @@ static INPUT_PORTS_START( fc_suborkey ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_START("SUBOR.8") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B') @@ -111,11 +111,11 @@ static INPUT_PORTS_START( fc_suborkey ) PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("SUBOR.10") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("LMENU") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("LMENU") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F11) PORT_CHAR(UCHAR_MAMEKEY(F11)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F11) PORT_CHAR(UCHAR_MAMEKEY(F11)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) @@ -124,20 +124,20 @@ static INPUT_PORTS_START( fc_suborkey ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD)PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD)) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10)) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10)) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD)PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_NUMLOCK) PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK)) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_NUMLOCK) PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK)) PORT_START("SUBOR.12") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PAUSE") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("SPACE2") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9)) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PAUSE") + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("SPACE2") + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9)) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad .") PORT_CODE(KEYCODE_DEL_PAD) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad .") PORT_CODE(KEYCODE_DEL_PAD) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) INPUT_PORTS_END @@ -198,7 +198,7 @@ void nes_suborkey_device::device_reset() UINT8 nes_suborkey_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) //$4017 + if (offset == 1) //$4017 { // Subor Keyboard: rows of the keyboard matrix are read 4-bits at time and returned as bit1->bit4 if (m_fck_scan < 13) @@ -206,7 +206,7 @@ UINT8 nes_suborkey_device::read_exp(offs_t offset) else ret |= 0x1e; } - + return ret; } @@ -218,12 +218,12 @@ void nes_suborkey_device::write(UINT8 data) { if (BIT(data, 2)) // keyboard active { - UINT8 out = BIT(data, 1); // scan + UINT8 out = BIT(data, 1); // scan if (m_fck_mode && !out && ++m_fck_scan > 12) m_fck_scan = 0; - + m_fck_mode = out; // access lower or upper 4 bits - + if (BIT(data, 0)) // reset m_fck_scan = 0; } diff --git a/src/emu/bus/nes_ctrl/zapper.c b/src/emu/bus/nes_ctrl/zapper.c index 36965206f46..b603025203b 100644 --- a/src/emu/bus/nes_ctrl/zapper.c +++ b/src/emu/bus/nes_ctrl/zapper.c @@ -80,7 +80,7 @@ void nes_zapper_device::device_reset() UINT8 nes_zapper_device::read_bit34() { UINT8 ret = m_trigger->read(); - if (!m_port->m_brightpixel_cb.isnull() && + if (!m_port->m_brightpixel_cb.isnull() && m_port->m_brightpixel_cb(m_lightx->read(), m_lighty->read())) ret &= ~0x08; // sprite hit else @@ -91,7 +91,7 @@ UINT8 nes_zapper_device::read_bit34() UINT8 nes_zapper_device::read_exp(offs_t offset) { UINT8 ret = 0; - if (offset == 1) // $4017 + if (offset == 1) // $4017 ret |= nes_zapper_device::read_bit34(); return ret; } diff --git a/src/emu/bus/sms_ctrl/joypad.c b/src/emu/bus/sms_ctrl/joypad.c index c42de757e44..24149ca5d4f 100644 --- a/src/emu/bus/sms_ctrl/joypad.c +++ b/src/emu/bus/sms_ctrl/joypad.c @@ -20,10 +20,10 @@ const device_type SMS_JOYPAD = &device_creator<sms_joypad_device>; static INPUT_PORTS_START( sms_joypad ) PORT_START("JOYPAD") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) // Vcc PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) // TL PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // TH diff --git a/src/emu/bus/vcs/dpc.c b/src/emu/bus/vcs/dpc.c index f701a531ebe..f802926ea09 100644 --- a/src/emu/bus/vcs/dpc.c +++ b/src/emu/bus/vcs/dpc.c @@ -37,7 +37,7 @@ void dpc_device::device_start() save_item(NAME(m_df[i].music_mode), i); save_item(NAME(m_df[i].osc_clk), i); } - + save_item(NAME(m_movamt)); save_item(NAME(m_latch_62)); save_item(NAME(m_latch_64)); |
