summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-02-25 08:09:13 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-02-25 08:09:13 +0100
commit6ae44e46f91aa2bd74d9895e6bfd345baebd3d22 (patch)
tree70be3ad6f499bb138c0335e8d2d16790f6f971b3 /src/emu/bus
parent33c8d18d612786130c2baafd644604137f6f4ef8 (diff)
Cleanups and version bumpmame0159
Diffstat (limited to 'src/emu/bus')
-rw-r--r--src/emu/bus/a2bus/a2bus.h2
-rw-r--r--src/emu/bus/cpc/smartwatch.c12
-rw-r--r--src/emu/bus/cpc/smartwatch.h12
-rw-r--r--src/emu/bus/nes_ctrl/bcbattle.c2
-rw-r--r--src/emu/bus/nes_ctrl/miracle.c17
-rw-r--r--src/emu/bus/snes_ctrl/bcbattle.c24
-rw-r--r--src/emu/bus/snes_ctrl/bcbattle.h2
-rw-r--r--src/emu/bus/snes_ctrl/ctrl.h4
-rw-r--r--src/emu/bus/snes_ctrl/joypad.c5
-rw-r--r--src/emu/bus/snes_ctrl/joypad.h2
-rw-r--r--src/emu/bus/snes_ctrl/miracle.c23
-rw-r--r--src/emu/bus/snes_ctrl/mouse.c19
-rw-r--r--src/emu/bus/snes_ctrl/mouse.h2
-rw-r--r--src/emu/bus/snes_ctrl/multitap.c4
-rw-r--r--src/emu/bus/snes_ctrl/pachinko.c6
-rw-r--r--src/emu/bus/snes_ctrl/sscope.c21
-rw-r--r--src/emu/bus/snes_ctrl/sscope.h2
-rw-r--r--src/emu/bus/snes_ctrl/twintap.c10
18 files changed, 82 insertions, 87 deletions
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index f14b1d40354..90ab602607d 100644
--- a/src/emu/bus/a2bus/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
@@ -176,7 +176,7 @@ public:
void recalc_slot_inh() { m_a2bus->recalc_inh(m_slot); }
void set_maincpu_halt(int state) { m_a2bus->set_maincpu_halt(state); }
- // pass through the original address space if any for debugger protection
+ // pass through the original address space if any for debugger protection
// when debugging e.g. coprocessor cards (Z80 SoftCard etc).
UINT8 slot_dma_read(address_space &space, UINT16 offset) { return m_a2bus->dma_r(space, offset); }
void slot_dma_write(address_space &space, UINT16 offset, UINT8 data) { m_a2bus->dma_w(space, offset, data); }
diff --git a/src/emu/bus/cpc/smartwatch.c b/src/emu/bus/cpc/smartwatch.c
index cb82fba853d..85a559bc0d0 100644
--- a/src/emu/bus/cpc/smartwatch.c
+++ b/src/emu/bus/cpc/smartwatch.c
@@ -1,10 +1,10 @@
/*
- Dobbertin Smartwatch
-
- Created: 23/2/2015
-
- TODO: setting the time (requires the DS1315 core to be able to do this,
- at the moment it just reads the current time)
+ Dobbertin Smartwatch
+
+ Created: 23/2/2015
+
+ TODO: setting the time (requires the DS1315 core to be able to do this,
+ at the moment it just reads the current time)
*/
#include "emu.h"
diff --git a/src/emu/bus/cpc/smartwatch.h b/src/emu/bus/cpc/smartwatch.h
index aacdd085981..8e2007f8a28 100644
--- a/src/emu/bus/cpc/smartwatch.h
+++ b/src/emu/bus/cpc/smartwatch.h
@@ -1,10 +1,10 @@
/*
- Dobbertin Smartwatch
-
- Dallas DS1216 Smartwatch + DS1315 Phantom Time chip
-
- Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch
-
+ Dobbertin Smartwatch
+
+ Dallas DS1216 Smartwatch + DS1315 Phantom Time chip
+
+ Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch
+
*/
#ifndef SMARTWATCH_H_
diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/emu/bus/nes_ctrl/bcbattle.c
index 81331440767..aa75aeddd39 100644
--- a/src/emu/bus/nes_ctrl/bcbattle.c
+++ b/src/emu/bus/nes_ctrl/bcbattle.c
@@ -35,7 +35,7 @@ machine_config_constructor nes_bcbattle_device::device_mconfig_additions() const
//-------------------------------------------------
// This part is the hacky replacement for the real Barcode unit [shared with SNES implementation]:
-// code periodically checks whether a new code has been scanned and it moves it to the
+// code periodically checks whether a new code has been scanned and it moves it to the
// m_current_barcode array
void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/emu/bus/nes_ctrl/miracle.c
index bcf596b8d72..ff122d09dfb 100644
--- a/src/emu/bus/nes_ctrl/miracle.c
+++ b/src/emu/bus/nes_ctrl/miracle.c
@@ -12,8 +12,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
@@ -141,7 +141,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)
{
@@ -154,7 +154,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;
@@ -175,7 +175,7 @@ void nes_miracle_device::write(UINT8 data)
// 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)
{
@@ -188,7 +188,7 @@ void nes_miracle_device::write(UINT8 data)
m_status_bit = true;
if (m_recv_read != m_recv_write)
{
-// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
+// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
m_data_sent = m_recvring[m_recv_read++];
if (m_recv_read >= RECV_RING_SIZE)
{
@@ -199,7 +199,7 @@ void nes_miracle_device::write(UINT8 data)
else
{
m_read_status = false;
-// printf("Miracle has no data\n");
+// printf("Miracle has no data\n");
}
return;
}
@@ -230,7 +230,7 @@ void nes_miracle_device::rcv_complete() // Rx completed receiving byte
receive_register_extract();
UINT8 rcv = get_received_char();
-// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
+// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
if (m_recv_write >= RECV_RING_SIZE)
{
@@ -282,4 +282,3 @@ void nes_miracle_device::xmit_char(UINT8 data)
}
}
}
-
diff --git a/src/emu/bus/snes_ctrl/bcbattle.c b/src/emu/bus/snes_ctrl/bcbattle.c
index 83682589c71..27d7dd1c71c 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.c
+++ b/src/emu/bus/snes_ctrl/bcbattle.c
@@ -35,7 +35,7 @@ machine_config_constructor snes_bcbattle_device::device_mconfig_additions() cons
//-------------------------------------------------
// This part is the hacky replacement for the real Barcode unit [shared with NES implementation]:
-// code periodically checks whether a new code has been scanned and it moves it to the
+// code periodically checks whether a new code has been scanned and it moves it to the
// m_current_barcode array
void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
@@ -140,7 +140,7 @@ int snes_bcbattle_device::read_current_bit()
m_cur_bit++;
return bit;
}
- if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES)
+ if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES)
{
m_cur_bit = 0;
//printf("%X ", m_current_barcode[m_cur_byte]);
@@ -175,26 +175,26 @@ void snes_bcbattle_device::port_poll()
UINT8 snes_bcbattle_device::read_pin4()
{
UINT8 ret = 0;
-
+
if (m_idx >= 80)
ret |= 0x00;
- else if (m_idx >= 28) // scan actual barcode
+ else if (m_idx >= 28) // scan actual barcode
{
- ret |= read_current_bit(); // if no code is pending transmission, the function returns 0
+ ret |= read_current_bit(); // if no code is pending transmission, the function returns 0
m_idx++;
}
- else if (m_idx >= 25) // unknown flags?
+ else if (m_idx >= 25) // unknown flags?
m_idx++;
- else if (m_idx == 24) // barcode present
+ else if (m_idx == 24) // barcode present
{
ret |= m_pending_code;
m_idx++;
}
- else if (m_idx >= 12) // controller ID
+ else if (m_idx >= 12) // controller ID
ret |= BIT(0x7000, m_idx++);
- else // first 12 bytes are unknown and probably always 0
+ else // first 12 bytes are unknown and probably always 0
m_idx++;
-
+
return ret;
}
@@ -207,7 +207,7 @@ void snes_bcbattle_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
diff --git a/src/emu/bus/snes_ctrl/bcbattle.h b/src/emu/bus/snes_ctrl/bcbattle.h
index 00d653c5e29..e960b8ac134 100644
--- a/src/emu/bus/snes_ctrl/bcbattle.h
+++ b/src/emu/bus/snes_ctrl/bcbattle.h
@@ -45,7 +45,7 @@ protected:
int read_current_bit();
private:
-
+
static const device_timer_id TIMER_BATTLER = 1;
required_device<barcode_reader_device> m_reader;
UINT8 m_current_barcode[20];
diff --git a/src/emu/bus/snes_ctrl/ctrl.h b/src/emu/bus/snes_ctrl/ctrl.h
index d7f87ef5c42..2d6850806d7 100644
--- a/src/emu/bus/snes_ctrl/ctrl.h
+++ b/src/emu/bus/snes_ctrl/ctrl.h
@@ -29,13 +29,13 @@ public:
// construction/destruction
device_snes_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_snes_control_port_interface();
-
+
virtual UINT8 read_pin4() { return 0; };
virtual UINT8 read_pin5() { return 0; };
virtual void write_pin6(UINT8 data) { };
virtual void write_strobe(UINT8 data) { };
virtual void port_poll() { };
-
+
protected:
snes_control_port_device *m_port;
};
diff --git a/src/emu/bus/snes_ctrl/joypad.c b/src/emu/bus/snes_ctrl/joypad.c
index a8291c2dfdb..4b26d35b887 100644
--- a/src/emu/bus/snes_ctrl/joypad.c
+++ b/src/emu/bus/snes_ctrl/joypad.c
@@ -97,7 +97,7 @@ void snes_joypad_device::port_poll()
// if up, no down
if (temp & 0x10)
temp &= ~0x20;
-
+
m_latch = temp | 0xffff0000;
}
@@ -121,7 +121,6 @@ void snes_joypad_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/joypad.h b/src/emu/bus/snes_ctrl/joypad.h
index 9c6920e7a18..bb0b36b6a4f 100644
--- a/src/emu/bus/snes_ctrl/joypad.h
+++ b/src/emu/bus/snes_ctrl/joypad.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_joypad;
int m_strobe;
diff --git a/src/emu/bus/snes_ctrl/miracle.c b/src/emu/bus/snes_ctrl/miracle.c
index c7a25a630dd..081a2c5f030 100644
--- a/src/emu/bus/snes_ctrl/miracle.c
+++ b/src/emu/bus/snes_ctrl/miracle.c
@@ -4,17 +4,17 @@
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
-
+
recv at PC = 008a4a
xmit at PC = 008adb
-
+
**********************************************************************/
#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
@@ -130,12 +130,12 @@ UINT8 snes_miracle_device::read_pin4()
void snes_miracle_device::write_pin6(UINT8 data)
{
-// printf("%02x to pin6\n", data);
+// printf("%02x to pin6\n", data);
}
void snes_miracle_device::write_strobe(UINT8 data)
{
-// printf("%02x to strobe\n", data);
+// printf("%02x to strobe\n", data);
if (m_midi_mode == MIRACLE_MIDI_SEND)
{
@@ -148,7 +148,7 @@ void snes_miracle_device::write_strobe(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;
@@ -169,7 +169,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
// 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 < 500 && data == 0)
{
@@ -182,7 +182,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
m_status_bit = true;
if (m_recv_read != m_recv_write)
{
-// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
+// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read);
m_data_sent = m_recvring[m_recv_read++];
if (m_recv_read >= RECV_RING_SIZE)
{
@@ -193,7 +193,7 @@ void snes_miracle_device::write_strobe(UINT8 data)
else
{
m_read_status = false;
-// printf("Miracle has no data\n");
+// printf("Miracle has no data\n");
}
return;
}
@@ -225,7 +225,7 @@ void snes_miracle_device::rcv_complete() // Rx completed receiving byte
receive_register_extract();
UINT8 rcv = get_received_char();
-// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
+// printf("Got %02x -> [%d]\n", rcv, m_recv_write);
m_recvring[m_recv_write++] = rcv;
if (m_recv_write >= RECV_RING_SIZE)
{
@@ -277,4 +277,3 @@ void snes_miracle_device::xmit_char(UINT8 data)
}
}
}
-
diff --git a/src/emu/bus/snes_ctrl/mouse.c b/src/emu/bus/snes_ctrl/mouse.c
index 1d6cb5b52f6..8337af09859 100644
--- a/src/emu/bus/snes_ctrl/mouse.c
+++ b/src/emu/bus/snes_ctrl/mouse.c
@@ -1,7 +1,7 @@
/**********************************************************************
Nintendo Super Famicom & SNES Mouse
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -32,11 +32,11 @@ static INPUT_PORTS_START( snes_mouse )
// detect a sudden jump in the wrong direction, making the usage unfriendly...
PORT_START("MOUSE_X")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_X ) PORT_NAME("Superscope X Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
-// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
+// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
PORT_START("MOUSE_Y")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_Y) PORT_NAME("Superscope Y Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
-// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
+// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
INPUT_PORTS_END
@@ -155,7 +155,7 @@ void snes_mouse_device::port_poll()
m_deltax = var;
m_oldx = m_x;
}
-
+
var = m_y - m_oldy;
if (var)
{
@@ -163,7 +163,7 @@ void snes_mouse_device::port_poll()
if (m_diry != new_dir)
m_diry = new_dir;
}
-
+
if (var < -127)
{
m_deltay = 0x7f;
@@ -196,14 +196,14 @@ void snes_mouse_device::port_poll()
UINT8 snes_mouse_device::read_pin4()
{
UINT8 res = 0;
-
+
if (m_strobe == 1)
{
// reading with strobe 1, changes mouse speed
m_speed = (m_speed + 1) % 3;
return res;
}
-
+
if (m_idx >= 32)
res |= 0x01;
else if (m_idx >= 24)
@@ -222,7 +222,7 @@ UINT8 snes_mouse_device::read_pin4()
}
else
res |= BIT(m_latch, m_idx++);
-
+
return res;
}
@@ -235,7 +235,6 @@ void snes_mouse_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/mouse.h b/src/emu/bus/snes_ctrl/mouse.h
index fbce1ba6c41..c795b93579a 100644
--- a/src/emu/bus/snes_ctrl/mouse.h
+++ b/src/emu/bus/snes_ctrl/mouse.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_buttons;
required_ioport m_xaxis;
diff --git a/src/emu/bus/snes_ctrl/multitap.c b/src/emu/bus/snes_ctrl/multitap.c
index bf1d04cada9..8a18422c19f 100644
--- a/src/emu/bus/snes_ctrl/multitap.c
+++ b/src/emu/bus/snes_ctrl/multitap.c
@@ -121,14 +121,14 @@ UINT8 snes_multitap_device::read_pin4()
ret |= m_select ? m_port1->read_pin4() : m_port3->read_pin4();
else // 1P
ret |= m_select ? m_port1->read_pin4() : 0;
-
+
return ret;
}
UINT8 snes_multitap_device::read_pin5()
{
UINT8 ret = 0;
-
+
if (m_cfg->read() == 0) // 4P
ret |= m_select ? m_port2->read_pin4() : m_port4->read_pin4();
return ret;
diff --git a/src/emu/bus/snes_ctrl/pachinko.c b/src/emu/bus/snes_ctrl/pachinko.c
index 099e4e00f57..e69050a9a78 100644
--- a/src/emu/bus/snes_ctrl/pachinko.c
+++ b/src/emu/bus/snes_ctrl/pachinko.c
@@ -83,7 +83,7 @@ void snes_pachinko_device::device_reset()
void snes_pachinko_device::port_poll()
{
UINT8 dial = BITSWAP8(m_dial->read() ^ 0xff,7,6,5,4,3,2,1,0);
- m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID
+ m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID
}
//-------------------------------------------------
@@ -105,7 +105,7 @@ void snes_pachinko_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
diff --git a/src/emu/bus/snes_ctrl/sscope.c b/src/emu/bus/snes_ctrl/sscope.c
index 93e46879a16..178ab25bddd 100644
--- a/src/emu/bus/snes_ctrl/sscope.c
+++ b/src/emu/bus/snes_ctrl/sscope.c
@@ -112,11 +112,11 @@ void snes_sscope_device::port_poll()
// then start elaborating input bits
// 1. only keep old turbo value
m_latch &= 0x04;
-
+
// 2. set onscreen/offscreen
if (!m_port->m_onscreen_cb.isnull())
m_latch |= (m_port->m_onscreen_cb(m_x, m_y) ? 0x00 : 0x40);
-
+
// 3. pause is a button that is always edge sensitive
if (BIT(input, 3) && !m_pause_lock)
{
@@ -134,11 +134,11 @@ void snes_sscope_device::port_poll()
}
else if (!BIT(input, 2))
m_turbo_lock = 0;
-
+
// 5. cursor is a button that is always level sensitive
m_latch |= BIT(input, 1);
-
- // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive;
+
+ // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive;
// otherwise it is edge sensitive
if (BIT(input, 0) && (BIT(m_latch, 2) || !m_fire_lock))
{
@@ -147,7 +147,7 @@ void snes_sscope_device::port_poll()
}
else if (!BIT(input, 0))
m_fire_lock = 0;
-
+
// If we have pressed fire or cursor and we are on-screen and SuperScope is in Port2, then latch video signal.
// Notice that this only works in Port2 because its IOBit pin is connected to bit7 of the IO Port, while Port1
// has IOBit pin connected to bit6 of the IO Port, and the latter is not detected by the H/V Counters. In other
@@ -163,12 +163,12 @@ void snes_sscope_device::port_poll()
UINT8 snes_sscope_device::read_pin4()
{
UINT8 res = 0;
-
- if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s
+
+ if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s
res |= 0x01;
else
res |= BIT(m_latch, m_idx++);
-
+
return res;
}
@@ -181,7 +181,6 @@ void snes_sscope_device::write_strobe(UINT8 data)
int old = m_strobe;
m_strobe = data & 0x01;
- if (m_strobe < old) // 1 -> 0 transition
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}
-
diff --git a/src/emu/bus/snes_ctrl/sscope.h b/src/emu/bus/snes_ctrl/sscope.h
index e6a806038fc..7b9379336dc 100644
--- a/src/emu/bus/snes_ctrl/sscope.h
+++ b/src/emu/bus/snes_ctrl/sscope.h
@@ -41,7 +41,7 @@ protected:
virtual UINT8 read_pin4();
virtual void write_strobe(UINT8 data);
virtual void port_poll();
-
+
private:
required_ioport m_buttons;
required_ioport m_xaxis;
diff --git a/src/emu/bus/snes_ctrl/twintap.c b/src/emu/bus/snes_ctrl/twintap.c
index 6ddcb32b158..d5d38d55ac4 100644
--- a/src/emu/bus/snes_ctrl/twintap.c
+++ b/src/emu/bus/snes_ctrl/twintap.c
@@ -3,12 +3,12 @@
Nintendo Super Famicom - Yonezawa / PartyRoom 21 Twin Tap Controller
This controller consists of two 1-button small units attached to a
- single 7pin connector. You plug the connector to Port2 and two
+ single 7pin connector. You plug the connector to Port2 and two
players can compete on the quiz game (Port1 should have a joypad
plugged in, to start the game and browse the menus). By plugging
a multitap adapter to Port2, up to 4 Twin Tap controllers can be
attached at the same time, allowing for 8 players quiz sessions.
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -28,7 +28,7 @@ static INPUT_PORTS_START( snes_twintap )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 2")
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 1")
PORT_BIT( 0x8ffc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown
+ PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown
INPUT_PORTS_END
@@ -108,7 +108,7 @@ void snes_twintap_device::write_strobe(UINT8 data)
{
int old = m_strobe;
m_strobe = data & 0x01;
-
- if (m_strobe < old) // 1 -> 0 transition
+
+ if (m_strobe < old) // 1 -> 0 transition
port_poll();
}