summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
commitebeaa953a3a6ae98842b4a169bc95e5f3c673d8c (patch)
tree41959790c00308fc3cac9c71176709f53683151d /src/emu
parent18b8ce2f9467ae23672cea11f4a3fc5e42e24b9c (diff)
Cleanups and version bumpmame0156
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/bus/a2bus/a2bus.h14
-rw-r--r--src/emu/bus/a2bus/a2eext80col.c1
-rw-r--r--src/emu/bus/a2bus/a2estd80col.c1
-rw-r--r--src/emu/bus/a2bus/a2swyft.c3
-rw-r--r--src/emu/bus/a2bus/ramcard128k.c13
-rw-r--r--src/emu/bus/a2bus/ramcard16k.c11
-rw-r--r--src/emu/bus/astrocde/exp.h2
-rw-r--r--src/emu/bus/astrocde/ram.c12
-rw-r--r--src/emu/bus/astrocde/ram.h20
-rw-r--r--src/emu/bus/astrocde/rom.c13
-rw-r--r--src/emu/bus/astrocde/rom.h10
-rw-r--r--src/emu/bus/astrocde/slot.c3
-rw-r--r--src/emu/bus/centronics/epson_lx810l.h10
-rw-r--r--src/emu/bus/coco/coco_dwsock.c171
-rw-r--r--src/emu/bus/coco/coco_dwsock.h39
-rw-r--r--src/emu/bus/cpc/playcity.c3
-rw-r--r--src/emu/bus/cpc/playcity.h21
-rw-r--r--src/emu/bus/gameboy/gb_slot.c6
-rw-r--r--src/emu/bus/isa/mda.c2
-rw-r--r--src/emu/bus/isa/xsu_cards.c10
-rw-r--r--src/emu/bus/pce/pce_slot.c2
-rw-r--r--src/emu/bus/pet/hsg.c2
-rw-r--r--src/emu/bus/pet/hsg.h2
-rw-r--r--src/emu/bus/spc1000/fdd.c8
-rw-r--r--src/emu/bus/spc1000/fdd.h6
-rw-r--r--src/emu/bus/spc1000/vdp.c2
-rw-r--r--src/emu/bus/spc1000/vdp.h2
-rw-r--r--src/emu/cpu/cp1610/cp1610.c4
-rw-r--r--src/emu/cpu/cp1610/cp1610.h8
-rw-r--r--src/emu/cpu/powerpc/ppc.h2
-rw-r--r--src/emu/cpu/rsp/rsp.h2
-rw-r--r--src/emu/cpu/rsp/rspcp2.c30
-rw-r--r--src/emu/cpu/rsp/rspcp2.h38
-rw-r--r--src/emu/cpu/rsp/rspcp2d.c58
-rw-r--r--src/emu/cpu/rsp/rspcp2d.h4
-rw-r--r--src/emu/cpu/rsp/rspcp2s.c33
-rw-r--r--src/emu/cpu/rsp/rspcp2s.h66
-rw-r--r--src/emu/cpu/rsp/rspdrc.c10
-rw-r--r--src/emu/cpu/upd7810/upd7810.c14
-rw-r--r--src/emu/machine/i6300esb.c8
-rw-r--r--src/emu/machine/i6300esb.h2
-rw-r--r--src/emu/machine/i82875p.h4
-rw-r--r--src/emu/machine/intelfsh.c6
-rw-r--r--src/emu/machine/intelfsh.h4
-rw-r--r--src/emu/machine/lpc-acpi.c2
-rw-r--r--src/emu/machine/lpc-rtc.c4
-rw-r--r--src/emu/machine/lpc-rtc.h2
-rw-r--r--src/emu/machine/lpc.c1
-rw-r--r--src/emu/machine/lpc.h1
-rw-r--r--src/emu/machine/omti5100.c4
-rw-r--r--src/emu/machine/omti5100.h2
-rw-r--r--src/emu/machine/pci.c22
-rw-r--r--src/emu/machine/pci.h2
-rw-r--r--src/emu/machine/pla.c14
-rw-r--r--src/emu/machine/pla.h4
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/memory.h2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/sound/sn76477.h12
-rw-r--r--src/emu/video/315_5124.h2
-rw-r--r--src/emu/video/315_5313.c2
-rw-r--r--src/emu/video/snes_ppu.c25
62 files changed, 384 insertions, 403 deletions
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index 7444df4151c..a440ef0c83c 100644
--- a/src/emu/bus/a2bus/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
@@ -16,13 +16,13 @@
#include "emu.h"
// /INH special addresses
-#define INH_START_INVALID 0xffff;
-#define INH_END_INVALID 0x0000;
+#define INH_START_INVALID 0xffff;
+#define INH_END_INVALID 0x0000;
-// /INH types
-#define INH_NONE 0x00
-#define INH_READ 0x01
-#define INH_WRITE 0x02
+// /INH types
+#define INH_NONE 0x00
+#define INH_READ 0x01
+#define INH_WRITE 0x02
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
@@ -120,7 +120,7 @@ protected:
devcb_write_line m_out_irq_cb;
devcb_write_line m_out_nmi_cb;
- devcb_write8 m_out_inh_cb;
+ devcb_write8 m_out_inh_cb;
device_a2bus_card_interface *m_device_list[8];
const char *m_cputag;
diff --git a/src/emu/bus/a2bus/a2eext80col.c b/src/emu/bus/a2bus/a2eext80col.c
index b6bd2443489..f4ffbb0505e 100644
--- a/src/emu/bus/a2bus/a2eext80col.c
+++ b/src/emu/bus/a2bus/a2eext80col.c
@@ -71,4 +71,3 @@ UINT8 *a2eaux_ext80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
-
diff --git a/src/emu/bus/a2bus/a2estd80col.c b/src/emu/bus/a2bus/a2estd80col.c
index 5bffdc11af6..2bfcef11a8c 100644
--- a/src/emu/bus/a2bus/a2estd80col.c
+++ b/src/emu/bus/a2bus/a2estd80col.c
@@ -78,4 +78,3 @@ UINT8 *a2eaux_std80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
-
diff --git a/src/emu/bus/a2bus/a2swyft.c b/src/emu/bus/a2bus/a2swyft.c
index 1547814ec68..a7e011bd1c3 100644
--- a/src/emu/bus/a2bus/a2swyft.c
+++ b/src/emu/bus/a2bus/a2swyft.c
@@ -74,7 +74,7 @@ void a2bus_swyft_device::device_reset()
{
m_rombank = 0;
- m_inh_state = INH_READ; // read-enable the ROM
+ m_inh_state = INH_READ; // read-enable the ROM
recalc_slot_inh();
}
@@ -146,4 +146,3 @@ int a2bus_swyft_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/a2bus/ramcard128k.c b/src/emu/bus/a2bus/ramcard128k.c
index e78dde368e9..3b05128e186 100644
--- a/src/emu/bus/a2bus/ramcard128k.c
+++ b/src/emu/bus/a2bus/ramcard128k.c
@@ -126,11 +126,11 @@ void a2bus_ssramcard_device::do_io(int offset)
}
#if 0
- printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n",
- offset,
- (m_inh_state & INH_READ) ? 'R' : 'x',
- (m_inh_state & INH_WRITE) ? 'W' : 'x',
- m_dxxx_bank, m_main_bank);
+ printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n",
+ offset,
+ (m_inh_state & INH_READ) ? 'R' : 'x',
+ (m_inh_state & INH_WRITE) ? 'W' : 'x',
+ m_dxxx_bank, m_main_bank);
#endif
}
@@ -157,7 +157,7 @@ void a2bus_ssramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT
UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
{
- assert(m_inh_state & INH_READ); // this should never happen
+ assert(m_inh_state & INH_READ); // this should never happen
if (offset < 0xe000)
{
@@ -188,4 +188,3 @@ int a2bus_ssramcard_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/a2bus/ramcard16k.c b/src/emu/bus/a2bus/ramcard16k.c
index dc731cfb06e..a25ba79423f 100644
--- a/src/emu/bus/a2bus/ramcard16k.c
+++ b/src/emu/bus/a2bus/ramcard16k.c
@@ -107,10 +107,10 @@ void a2bus_ramcard_device::do_io(int offset)
}
#if 0
- printf("LC: new state %c%c dxxx=%04x\n",
- (m_inh_state & INH_READ) ? 'R' : 'x',
- (m_inh_state & INH_WRITE) ? 'W' : 'x',
- m_dxxx_bank);
+ printf("LC: new state %c%c dxxx=%04x\n",
+ (m_inh_state & INH_READ) ? 'R' : 'x',
+ (m_inh_state & INH_WRITE) ? 'W' : 'x',
+ m_dxxx_bank);
#endif
}
@@ -137,7 +137,7 @@ void a2bus_ramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8
UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
{
- assert(m_inh_state & INH_READ); // this should never happen
+ assert(m_inh_state & INH_READ); // this should never happen
if (offset < 0xe000)
{
@@ -168,4 +168,3 @@ int a2bus_ramcard_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/astrocde/exp.h b/src/emu/bus/astrocde/exp.h
index bbd8c0b6465..3acbe2590d0 100644
--- a/src/emu/bus/astrocde/exp.h
+++ b/src/emu/bus/astrocde/exp.h
@@ -34,7 +34,7 @@ public:
virtual void device_start();
bool get_card_mounted() { return m_card_mounted; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
diff --git a/src/emu/bus/astrocde/ram.c b/src/emu/bus/astrocde/ram.c
index 41f79e176e9..4aae888cba6 100644
--- a/src/emu/bus/astrocde/ram.c
+++ b/src/emu/bus/astrocde/ram.c
@@ -19,7 +19,7 @@
mapped to the cartridge memory starting at $2000. So it would be possible to
load a cartridge program from tape into the expansion memory, then flip the range
switch and run it as a cartridge. This is useful for cartridge development.
-
+
Blue RAM -- available in 4K, 16K, and 32K. These also use an INS8154 chip,
(not yet implemented) which has an additional $80 bytes of RAM mapped
immediately after the end of the expansion address space. This memory
@@ -29,17 +29,17 @@
past this range)
16K: $6000 to $9FFF
32K: $6000 to $DFFF
-
+
VIPER System 1 -- This is available in 16K only. It also includes a keyboard (not implemented).
16K: $6000 to $9FFF
-
+
Lil' WHITE RAM -- This is available in 32K only. Attempts to read and write
to memory outside of its address range ($D000 to $FFFF) are mapped to the expansion
memory $5000 to $7FFF. The current implementation won't allow the shadow RAM area
to be accessed when RAM protect is on, but there is no known software that will
access the upper range of the expansion RAM when RAM protect is enabled.
32K: $5000 to $CFFF
-
+
R&L 64K RAM Board -- This is a highly configurable kit. RAM can be installed in
2K increments. So, the entire 44K expansion memory can be filled. It is also
possible to override the rest of the memory map with RAM (not implemented).
@@ -48,7 +48,7 @@
installing switches. The ranges are $0000 to $0FFF (first 4K), $0000 to $3FFF (first 16K),
and $0000 to $FFFF (all 64K). The current implementation is for 44K expansion memory mapped from
$5000 to $FFFF, with only a single write protect covering this entire range.
-
+
***********************************************************************************************************/
@@ -209,5 +209,3 @@ WRITE8_MEMBER(astrocade_rl64ram_device::write)
if (!m_write_prot->read())
m_ram[offset] = data;
}
-
-
diff --git a/src/emu/bus/astrocde/ram.h b/src/emu/bus/astrocde/ram.h
index 8434249cdee..c99fec58aa2 100644
--- a/src/emu/bus/astrocde/ram.h
+++ b/src/emu/bus/astrocde/ram.h
@@ -37,7 +37,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device
public:
// construction/destruction
astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
};
@@ -48,7 +48,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device
public:
// construction/destruction
astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
};
@@ -60,7 +60,7 @@ class astrocade_viper_sys1_device : public device_t,
public:
// construction/destruction
astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
@@ -69,7 +69,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
@@ -83,16 +83,16 @@ class astrocade_whiteram_device : public device_t,
public:
// construction/destruction
astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
virtual ioport_constructor device_input_ports() const;
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
@@ -106,16 +106,16 @@ class astrocade_rl64ram_device : public device_t,
public:
// construction/destruction
astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0xb000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
virtual ioport_constructor device_input_ports() const;
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
diff --git a/src/emu/bus/astrocde/rom.c b/src/emu/bus/astrocde/rom.c
index 3f76b024df0..25ef8123666 100644
--- a/src/emu/bus/astrocde/rom.c
+++ b/src/emu/bus/astrocde/rom.c
@@ -80,21 +80,20 @@ READ8_MEMBER(astrocade_rom_device::read_rom)
READ8_MEMBER(astrocade_rom_256k_device::read_rom)
{
- if (offset < 0x1000) // 0x2000-0x2fff
+ if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x3f];
- else if (offset < 0x1fc0) // 0x3000-0x3fbf
+ else if (offset < 0x1fc0) // 0x3000-0x3fbf
return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)];
- else // 0x3fc0-0x3fff
+ else // 0x3fc0-0x3fff
return m_base_bank = offset & 0x3f;
}
READ8_MEMBER(astrocade_rom_512k_device::read_rom)
{
- if (offset < 0x1000) // 0x2000-0x2fff
+ if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x7f];
- else if (offset < 0x1f80) // 0x3000-0x3fbf
+ else if (offset < 0x1f80) // 0x3000-0x3fbf
return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)];
- else // 0x3fc0-0x3fff
+ else // 0x3fc0-0x3fff
return m_base_bank = offset & 0x7f;
}
-
diff --git a/src/emu/bus/astrocde/rom.h b/src/emu/bus/astrocde/rom.h
index 4c30038dfce..64fd9f3d7ac 100644
--- a/src/emu/bus/astrocde/rom.h
+++ b/src/emu/bus/astrocde/rom.h
@@ -31,13 +31,13 @@ class astrocade_rom_256k_device : public astrocade_rom_device
public:
// construction/destruction
astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start();
virtual void device_reset();
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
-
+
private:
UINT8 m_base_bank;
};
@@ -49,13 +49,13 @@ class astrocade_rom_512k_device : public astrocade_rom_device
public:
// construction/destruction
astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start();
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
-
+
private:
UINT8 m_base_bank;
};
diff --git a/src/emu/bus/astrocde/slot.c b/src/emu/bus/astrocde/slot.c
index 08895cbd569..5b70beff977 100644
--- a/src/emu/bus/astrocde/slot.c
+++ b/src/emu/bus/astrocde/slot.c
@@ -207,7 +207,7 @@ void astrocade_cart_slot_device::get_default_card_software(astring &result)
const char *slot_string = "rom";
UINT32 size = core_fsize(m_file);
int type = ASTROCADE_STD;
-
+
if (size == 0x40000)
type = ASTROCADE_256K;
if (size == 0x80000)
@@ -236,4 +236,3 @@ READ8_MEMBER(astrocade_cart_slot_device::read_rom)
else
return 0xff;
}
-
diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/emu/bus/centronics/epson_lx810l.h
index 29f80e803e4..6c40abf50fb 100644
--- a/src/emu/bus/centronics/epson_lx810l.h
+++ b/src/emu/bus/centronics/epson_lx810l.h
@@ -28,15 +28,15 @@
// ======================> epson_lx810l_t
class epson_lx810l_t : public device_t,
- public device_centronics_peripheral_interface
+ public device_centronics_peripheral_interface
{
public:
// construction/destruction
epson_lx810l_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, UINT32 clock);
epson_lx810l_t(const machine_config &mconfig, device_type type,
- const char *name, const char *tag, device_t *owner,
- UINT32 clock, const char *shortname, const char *source);
+ const char *name, const char *tag, device_t *owner,
+ UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@@ -103,7 +103,7 @@ class epson_ap2000_t : public epson_lx810l_t
public:
// construction/destruction
epson_ap2000_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/emu/bus/coco/coco_dwsock.c
index aff17ae2929..c0228bef3cc 100644
--- a/src/emu/bus/coco/coco_dwsock.c
+++ b/src/emu/bus/coco/coco_dwsock.c
@@ -24,8 +24,8 @@ const device_type COCO_DWSOCK = &device_creator<beckerport_device>;
INPUT_PORTS_START( coco_drivewire )
PORT_START(DRIVEWIRE_PORT_TAG)
- PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port")
- PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL )
+ PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port")
+ PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL )
PORT_CONFSETTING( 65500, "65500" )
PORT_CONFSETTING( 65501, "65501" )
PORT_CONFSETTING( 65502, "65502" )
@@ -52,7 +52,7 @@ ioport_constructor beckerport_device::device_input_ports() const
//-------------------------------------------------
INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
{
- this->update_port();
+ this->update_port();
}
//**************************************************************************
@@ -64,18 +64,18 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
//-------------------------------------------------
beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__),
- m_dwconfigport(*this, DRIVEWIRE_PORT_TAG)
+ : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__),
+ m_dwconfigport(*this, DRIVEWIRE_PORT_TAG)
{
- m_pSocket = NULL;
- m_head = 0;
- m_rx_pending = 0;
+ m_pSocket = NULL;
+ m_head = 0;
+ m_rx_pending = 0;
}
beckerport_device::~beckerport_device()
{
- if (m_pSocket != NULL)
- device_stop();
+ if (m_pSocket != NULL)
+ device_stop();
}
/*-------------------------------------------------
@@ -84,22 +84,22 @@ beckerport_device::~beckerport_device()
void beckerport_device::device_start(void)
{
- char chAddress[64];
+ char chAddress[64];
- /* format address string for opening the port */
- snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport);
+ /* format address string for opening the port */
+ snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport);
- fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport);
+ fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport);
- UINT64 filesize; // unused
- file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize);
- if (filerr != FILERR_NONE)
- {
- fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr);
- return;
- }
+ UINT64 filesize; // unused
+ file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize);
+ if (filerr != FILERR_NONE)
+ {
+ fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr);
+ return;
+ }
- fprintf(stderr, "Connected!\n");
+ fprintf(stderr, "Connected!\n");
}
/*-------------------------------------------------
@@ -108,12 +108,12 @@ void beckerport_device::device_start(void)
void beckerport_device::device_stop(void)
{
- if (m_pSocket != NULL)
- {
- printf("Closing connection to Drivewire server\n");
- osd_close(m_pSocket);
- m_pSocket = NULL;
- }
+ if (m_pSocket != NULL)
+ {
+ printf("Closing connection to Drivewire server\n");
+ osd_close(m_pSocket);
+ m_pSocket = NULL;
+ }
}
/*-------------------------------------------------
@@ -132,40 +132,40 @@ void beckerport_device::device_config_complete(void)
READ8_MEMBER(beckerport_device::read)
{
- unsigned char data = 0x5a;
-
- if (m_pSocket == NULL)
- return data;
-
- switch (offset)
- {
- case DWS_STATUS:
- if (!m_rx_pending)
- {
- /* Try to read from dws */
- file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending);
- if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message
- fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr);
- else
- m_head = 0;
- }
- //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending);
- data = (m_rx_pending > 0) ? 2 : 0;
- break;
- case DWS_DATA:
- if (!m_rx_pending) {
- fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n");
- break;
- }
- data = m_buf[m_head++];
- m_rx_pending--;
- //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending);
- break;
- default:
- fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset);
- }
-
- return (int)data;
+ unsigned char data = 0x5a;
+
+ if (m_pSocket == NULL)
+ return data;
+
+ switch (offset)
+ {
+ case DWS_STATUS:
+ if (!m_rx_pending)
+ {
+ /* Try to read from dws */
+ file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending);
+ if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr);
+ else
+ m_head = 0;
+ }
+ //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending);
+ data = (m_rx_pending > 0) ? 2 : 0;
+ break;
+ case DWS_DATA:
+ if (!m_rx_pending) {
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n");
+ break;
+ }
+ data = m_buf[m_head++];
+ m_rx_pending--;
+ //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending);
+ break;
+ default:
+ fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset);
+ }
+
+ return (int)data;
}
/*-------------------------------------------------
@@ -174,26 +174,26 @@ READ8_MEMBER(beckerport_device::read)
WRITE8_MEMBER(beckerport_device::write)
{
- char d = (char)data;
- file_error filerr;
-
- if (m_pSocket == NULL)
- return;
-
- switch (offset)
- {
- case DWS_STATUS:
- //printf("beckerport_write: error: write (0x%02x) to status register\n", d);
- break;
- case DWS_DATA:
- filerr = osd_write(m_pSocket, &d, 0, 1, NULL);
- if (filerr != FILERR_NONE)
- fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr);
- //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff);
- break;
- default:
- fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset);
- }
+ char d = (char)data;
+ file_error filerr;
+
+ if (m_pSocket == NULL)
+ return;
+
+ switch (offset)
+ {
+ case DWS_STATUS:
+ //printf("beckerport_write: error: write (0x%02x) to status register\n", d);
+ break;
+ case DWS_DATA:
+ filerr = osd_write(m_pSocket, &d, 0, 1, NULL);
+ if (filerr != FILERR_NONE)
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr);
+ //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff);
+ break;
+ default:
+ fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset);
+ }
}
/*-------------------------------------------------
@@ -202,8 +202,7 @@ WRITE8_MEMBER(beckerport_device::write)
void beckerport_device::update_port(void)
{
- device_stop();
- m_dwtcpport = m_dwconfigport->read_safe(65504);
- device_start();
+ device_stop();
+ m_dwtcpport = m_dwconfigport->read_safe(65504);
+ device_start();
}
-
diff --git a/src/emu/bus/coco/coco_dwsock.h b/src/emu/bus/coco/coco_dwsock.h
index 9abbc240244..0006a091cdc 100644
--- a/src/emu/bus/coco/coco_dwsock.h
+++ b/src/emu/bus/coco/coco_dwsock.h
@@ -23,33 +23,33 @@
class beckerport_device : public device_t
{
public:
- beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual ~beckerport_device();
+ beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual ~beckerport_device();
- // optional information overrides
- virtual ioport_constructor device_input_ports() const;
+ // optional information overrides
+ virtual ioport_constructor device_input_ports() const;
- virtual void device_start(void);
- virtual void device_stop(void);
- virtual void device_config_complete(void);
+ virtual void device_start(void);
+ virtual void device_stop(void);
+ virtual void device_config_complete(void);
- void update_port(void);
+ void update_port(void);
- // driver update handlers
- DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed);
+ // driver update handlers
+ DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed);
- virtual DECLARE_READ8_MEMBER(read);
- virtual DECLARE_WRITE8_MEMBER(write);
+ virtual DECLARE_READ8_MEMBER(read);
+ virtual DECLARE_WRITE8_MEMBER(write);
- // types
- enum dwsock_ports {
- DWS_STATUS,
- DWS_DATA
- };
+ // types
+ enum dwsock_ports {
+ DWS_STATUS,
+ DWS_DATA
+ };
private:
- /* IP hostname */
- const char * m_hostname;
+ /* IP hostname */
+ const char * m_hostname;
/* IP port */
required_ioport m_dwconfigport;
@@ -69,4 +69,3 @@ extern const device_type COCO_DWSOCK;
typedef device_type_iterator<&device_creator<beckerport_device>, beckerport_device> beckerport_device_iterator;
#endif /* _DWSOCK_H_ */
-
diff --git a/src/emu/bus/cpc/playcity.c b/src/emu/bus/cpc/playcity.c
index e6803ffb049..161213b1582 100644
--- a/src/emu/bus/cpc/playcity.c
+++ b/src/emu/bus/cpc/playcity.c
@@ -1,4 +1,4 @@
-/*
+/*
PlayCity expansion device
Z80 CTC
@@ -158,4 +158,3 @@ void cpc_playcity_device::update_ymz_clock()
m_ymz2->ay_set_clock(clk);
popmessage("YMZ clocks set to %d Hz",clk);
}
-
diff --git a/src/emu/bus/cpc/playcity.h b/src/emu/bus/cpc/playcity.h
index 0f904da3bc3..0c35887e345 100644
--- a/src/emu/bus/cpc/playcity.h
+++ b/src/emu/bus/cpc/playcity.h
@@ -1,15 +1,15 @@
-/*
+/*
PlayCity expansion device
- I/O ports:
- * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock)
- * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI)
- * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input)
- * F883 - Z80CTC channel 3 (input is channel 2 output)
- * F884 - YMZ294 #1 (right) data
- * F888 - YMZ294 #2 (left) data
- * F984 - YMZ294 #1 (right) register select
- * F988 - YMZ294 #2 (left) register select
+ I/O ports:
+ * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock)
+ * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI)
+ * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input)
+ * F883 - Z80CTC channel 3 (input is channel 2 output)
+ * F884 - YMZ294 #1 (right) data
+ * F888 - YMZ294 #2 (left) data
+ * F984 - YMZ294 #1 (right) register select
+ * F988 - YMZ294 #2 (left) register select
*/
#ifndef CPC_PLAYCITY_H_
@@ -64,4 +64,3 @@ extern const device_type CPC_PLAYCITY;
#endif /* CPC_PLAYCITY_H_ */
-
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c
index 728905746ed..5caab4688c8 100644
--- a/src/emu/bus/gameboy/gb_slot.c
+++ b/src/emu/bus/gameboy/gb_slot.c
@@ -557,11 +557,11 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
/* Check if we're dealing with the multigame variant of the MBC1 mapper */
if (type == GB_MBC_MBC1)
- { // bomberman collection korea
+ { // bomberman collection korea
if (ROM[0x134] == 0x42 && ROM[0x135] == 0x4f && ROM[0x136] == 0x4d && ROM[0x137] == 0x53)
type = GB_MBC_MBC1_COL;
-// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B)
-// type = GB_MBC_MBC1_COL;
+// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B)
+// type = GB_MBC_MBC1_COL;
// genjin collection
if (ROM[0x134] == 0x47 && ROM[0x135] == 0x45 && ROM[0x136] == 0x4e && ROM[0x137] == 0x43)
type = GB_MBC_MBC1_COL;
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index eb93ab93a75..fc2953061fc 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -968,7 +968,7 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case MDA_LOWRES_TEXT_INTEN:
diff --git a/src/emu/bus/isa/xsu_cards.c b/src/emu/bus/isa/xsu_cards.c
index 992eaf222d6..d6b9a607d1d 100644
--- a/src/emu/bus/isa/xsu_cards.c
+++ b/src/emu/bus/isa/xsu_cards.c
@@ -39,13 +39,13 @@ SLOT_INTERFACE_START( mc1502_isa8_cards )
SLOT_INTERFACE_END
SLOT_INTERFACE_START( ec184x_isa8_cards )
- SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font
- SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font
+ SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font
+ SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font
SLOT_INTERFACE("ec1841.0003", ISA8_FDC_XT)
/*
- SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC
- SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port
- SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port
+ SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC
+ SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port
+ SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port
*/
SLOT_INTERFACE("mda", ISA8_MDA)
SLOT_INTERFACE("hdc", ISA8_HDC_EC1841)
diff --git a/src/emu/bus/pce/pce_slot.c b/src/emu/bus/pce/pce_slot.c
index 45eded53d3e..7ed13a71e6c 100644
--- a/src/emu/bus/pce/pce_slot.c
+++ b/src/emu/bus/pce/pce_slot.c
@@ -6,7 +6,7 @@
TODO:
- reimplement cart mirroring in a better way
-
+
***********************************************************************************************************/
diff --git a/src/emu/bus/pet/hsg.c b/src/emu/bus/pet/hsg.c
index 649fba69803..a5499eb2960 100644
--- a/src/emu/bus/pet/hsg.c
+++ b/src/emu/bus/pet/hsg.c
@@ -13,7 +13,7 @@
TODO:
- http://www.6502.org/users/sjgray/computer/hsg/index.html
+ http://www.6502.org/users/sjgray/computer/hsg/index.html
- version A (EF9365, 512x512 interlaced, 1 page)
- version B (EF9366, 512x256 non-interlaced, 2 pages)
diff --git a/src/emu/bus/pet/hsg.h b/src/emu/bus/pet/hsg.h
index b82d6a94dce..c99e360e739 100644
--- a/src/emu/bus/pet/hsg.h
+++ b/src/emu/bus/pet/hsg.h
@@ -26,7 +26,7 @@
// ======================> cbm8000_hsg_t
class cbm8000_hsg_t : public device_t,
- public device_pet_expansion_card_interface
+ public device_pet_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/spc1000/fdd.c b/src/emu/bus/spc1000/fdd.c
index 1a9cbb33f81..ebe1c6e90d3 100644
--- a/src/emu/bus/spc1000/fdd.c
+++ b/src/emu/bus/spc1000/fdd.c
@@ -34,18 +34,18 @@ WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_c_w)
READ8_MEMBER( spc1000_fdd_exp_device::tc_r )
{
logerror("%s: tc_r\n", space.machine().describe_context());
-
+
// toggle tc on read
m_fdc->tc_w(true);
m_timer_tc->adjust(attotime::zero);
-
+
return 0xff;
}
WRITE8_MEMBER( spc1000_fdd_exp_device::control_w )
{
logerror("%s: control_w(%02x)\n", space.machine().describe_context(), data);
-
+
// bit 0, motor on signal
if (m_fd0)
m_fd0->mon_w(!BIT(data, 0));
@@ -150,7 +150,7 @@ void spc1000_fdd_exp_device::device_start()
{
m_timer_tc = timer_alloc(TIMER_TC);
m_timer_tc->adjust(attotime::never);
-
+
m_fd0 = subdevice<floppy_connector>("upd765:0")->get_device();
m_fd1 = subdevice<floppy_connector>("upd765:1")->get_device();
}
diff --git a/src/emu/bus/spc1000/fdd.h b/src/emu/bus/spc1000/fdd.h
index b06dc8fa971..7ee6f56a50c 100644
--- a/src/emu/bus/spc1000/fdd.h
+++ b/src/emu/bus/spc1000/fdd.h
@@ -36,7 +36,7 @@ public:
DECLARE_WRITE8_MEMBER(i8255_b_w);
DECLARE_READ8_MEMBER(i8255_c_r);
DECLARE_WRITE8_MEMBER(i8255_c_w);
-
+
private:
// internal state
required_device<z80_device> m_cpu;
@@ -47,11 +47,11 @@ private:
floppy_image_device *m_fd1;
emu_timer *m_timer_tc;
-
+
UINT8 m_i8255_0_pc;
UINT8 m_i8255_1_pc;
UINT8 m_i8255_portb;
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
static const device_timer_id TIMER_TC = 0;
};
diff --git a/src/emu/bus/spc1000/vdp.c b/src/emu/bus/spc1000/vdp.c
index 511a7937bb0..539bfe5a8bb 100644
--- a/src/emu/bus/spc1000/vdp.c
+++ b/src/emu/bus/spc1000/vdp.c
@@ -19,7 +19,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt)
static MACHINE_CONFIG_FRAGMENT(scp1000_vdp)
- MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
+ MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen")
diff --git a/src/emu/bus/spc1000/vdp.h b/src/emu/bus/spc1000/vdp.h
index 8fbc10ad4e1..f4cd47e9b81 100644
--- a/src/emu/bus/spc1000/vdp.h
+++ b/src/emu/bus/spc1000/vdp.h
@@ -30,7 +30,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write);
DECLARE_WRITE_LINE_MEMBER(vdp_interrupt);
-
+
private:
// internal state
required_device<tms9928a_device> m_vdp;
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 36f30e4ebe4..7b11d6a3681 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -1009,11 +1009,11 @@ void cp1610_cpu_device::cp1610_besc(int dir)
* S Z C OV 1 000 s1e e p ppp ppp ppp ppp ppp
* - - - - BEXT ADDR, eeee
***************************************************/
- void cp1610_cpu_device::cp1610_bext(int ext, int dir)
+ void cp1610_cpu_device::cp1610_bext(int ext, int dir)
{
UINT16 offset = cp1610_readop(m_r[7]);
m_r[7]++;
-
+
if (m_read_bext(ext))
{
m_r[7] += (offset ^ dir);
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h
index 9d6121f8cd1..bc7b05d9765 100644
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@@ -35,8 +35,8 @@ enum
#define MCFG_CP1610_BEXT_CALLBACK(_read) \
downcast<cp1610_cpu_device *>(device)->set_bext_callback(DEVCB_##_read);
-
-
+
+
class cp1610_cpu_device : public cpu_device
{
public:
@@ -47,7 +47,7 @@ public:
{
m_read_bext.set_callback(rd);
}
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -87,7 +87,7 @@ private:
int m_mask_interrupts;
address_space *m_program;
int m_icount;
-
+
devcb_read8 m_read_bext;
void cp1610_illegal();
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h
index ccab255971f..b41363e93d3 100644
--- a/src/emu/cpu/powerpc/ppc.h
+++ b/src/emu/cpu/powerpc/ppc.h
@@ -217,7 +217,7 @@ public:
static void set_bus_frequency(device_t &device, UINT32 bus_frequency) { downcast<ppc_device &>(device).c_bus_frequency = bus_frequency; }
void ppc_set_dcstore_callback(write32_delegate callback);
-
+
void ppcdrc_set_options(UINT32 options);
void ppcdrc_add_fastram(offs_t start, offs_t end, UINT8 readonly, void *base);
void ppcdrc_add_hotspot(offs_t pc, UINT32 opcode, UINT32 cycles);
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index 1e8380cc968..c4bf16ccdf3 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -269,7 +269,7 @@ protected:
direct_read_data *m_direct;
private:
- rsp_cop2 *m_cop2;
+ rsp_cop2 *m_cop2;
UINT32 *m_dmem32;
UINT16 *m_dmem16;
diff --git a/src/emu/cpu/rsp/rspcp2.c b/src/emu/cpu/rsp/rspcp2.c
index 7dca6014eb6..4f7ab80a51b 100644
--- a/src/emu/cpu/rsp/rspcp2.c
+++ b/src/emu/cpu/rsp/rspcp2.c
@@ -27,14 +27,14 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define VREG_B(reg, offset) m_v[(reg)].b[(offset)^1]
#define VREG_S(reg, offset) m_v[(reg)].s[(offset)]
@@ -56,11 +56,11 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
#define ZERO 3
#define CLIP2 4
-#define ACCUM(x) m_accum[x].q
-#define ACCUM_H(x) (UINT16)m_accum[x].w[3]
-#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
-#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
-#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
+#define ACCUM(x) m_accum[x].q
+#define ACCUM_H(x) (UINT16)m_accum[x].w[3]
+#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
+#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
+#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
#define SET_ACCUM_H(v, x) m_accum[x].w[3] = v;
#define SET_ACCUM_M(v, x) m_accum[x].w[2] = v;
@@ -123,9 +123,9 @@ static const int vector_elements_2[16][8] =
};
rsp_cop2::rsp_cop2(rsp_device &rsp, running_machine &machine)
- : m_rsp(rsp)
- , m_machine(machine)
- , m_reciprocal_res(0)
+ : m_rsp(rsp)
+ , m_machine(machine)
+ , m_reciprocal_res(0)
, m_reciprocal_high(0)
, m_dp_allowed(0)
{
diff --git a/src/emu/cpu/rsp/rspcp2.h b/src/emu/cpu/rsp/rspcp2.h
index df33c13baf6..9b00b5a57f5 100644
--- a/src/emu/cpu/rsp/rspcp2.h
+++ b/src/emu/cpu/rsp/rspcp2.h
@@ -126,36 +126,36 @@ public:
virtual void mtc2();
virtual void ctc2();
- virtual void handle_cop2(UINT32 op);
+ virtual void handle_cop2(UINT32 op);
- void log_instruction_execution();
- virtual void cfunc_unimplemented_opcode() { }
+ void log_instruction_execution();
+ virtual void cfunc_unimplemented_opcode() { }
protected:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
- UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
- UINT16 SATURATE_ACCUM1(int accum, UINT16 negative, UINT16 positive);
+ UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
+ UINT16 SATURATE_ACCUM1(int accum, UINT16 negative, UINT16 positive);
- UINT32 m_op;
+ UINT32 m_op;
- rsp_device& m_rsp;
+ rsp_device& m_rsp;
running_machine& m_machine;
- UINT32 m_vres[8]; /* used for temporary vector results */
+ UINT32 m_vres[8]; /* used for temporary vector results */
- VECTOR_REG m_v[32];
+ VECTOR_REG m_v[32];
- ACCUMULATOR_REG m_accum[8];
- UINT16 m_vflag[6][8];
+ ACCUMULATOR_REG m_accum[8];
+ UINT16 m_vflag[6][8];
- INT32 m_reciprocal_res;
- UINT32 m_reciprocal_high;
- INT32 m_dp_allowed;
+ INT32 m_reciprocal_res;
+ UINT32 m_reciprocal_high;
+ INT32 m_dp_allowed;
private:
- void handle_lwc2(UINT32 op);
- void handle_swc2(UINT32 op);
- void handle_vector_ops(UINT32 op);
+ void handle_lwc2(UINT32 op);
+ void handle_swc2(UINT32 op);
+ void handle_vector_ops(UINT32 op);
};
-#endif /* __RSPCP2_H__ */ \ No newline at end of file
+#endif /* __RSPCP2_H__ */
diff --git a/src/emu/cpu/rsp/rspcp2d.c b/src/emu/cpu/rsp/rspcp2d.c
index cc33779e5f4..0abc3e10f1f 100644
--- a/src/emu/cpu/rsp/rspcp2d.c
+++ b/src/emu/cpu/rsp/rspcp2d.c
@@ -28,14 +28,14 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define VREG_B(reg, offset) m_v[(reg)].b[(offset)^1]
#define W_VREG_S(reg, offset) m_v[(reg)].s[(offset)]
@@ -60,16 +60,16 @@ static void cfunc_ctc2(void *param);
#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
-#define ACCUM(x) m_accum[x].q
+#define ACCUM(x) m_accum[x].q
#define SET_ACCUM_H(v, x) m_accum[x].w[3] = v;
#define SET_ACCUM_M(v, x) m_accum[x].w[2] = v;
#define SET_ACCUM_L(v, x) m_accum[x].w[1] = v;
#define SET_ACCUM_LL(v, x) m_accum[x].w[0] = v;
-#define SET_ACCUM(v, x) m_accum[x].q = v;
+#define SET_ACCUM(v, x) m_accum[x].q = v;
-#define GET_VS1(out, i) out = VREG_S(vs1reg, i)
-#define GET_VS2(out, i) out = VREG_S(vs2reg, VEC_EL_2(el, i))
+#define GET_VS1(out, i) out = VREG_S(vs1reg, i)
+#define GET_VS2(out, i) out = VREG_S(vs2reg, VEC_EL_2(el, i))
#define CARRY_FLAG(x) (m_vflag[CARRY][x & 7] != 0 ? 0xffff : 0)
#define COMPARE_FLAG(x) (m_vflag[COMPARE][x & 7] != 0 ? 0xffff : 0)
@@ -96,10 +96,10 @@ static void cfunc_ctc2(void *param);
#define CLEAR_CLIP2_FLAG(x) { m_vflag[CLIP2][x & 7] = 0; }
#define CACHE_VALUES() \
- const int op = m_op; \
- const int vdreg = VDREG; \
- const int vs1reg = VS1REG; \
- const int vs2reg = VS2REG; \
+ const int op = m_op; \
+ const int vdreg = VDREG; \
+ const int vs1reg = VS1REG; \
+ const int vs2reg = VS2REG; \
const int el = EL;
#define WRITEBACK_RESULT() { \
@@ -2105,7 +2105,7 @@ void rsp_cop2_drc::vsaw()
W_VREG_S(vdreg, i) = ACCUM_L(i);
}
break;
- default: // Unsupported
+ default: // Unsupported
{
for (int i = 0; i < 8; i++)
{
@@ -3465,8 +3465,8 @@ int rsp_cop2_drc::generate_vector_opcode(drcuml_block *block, rsp_device::compil
UML_CALLC(block, cfunc_vmov, this);
return TRUE;
- case 0x34: /* VRSQ */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ case 0x34: /* VRSQ */
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
UML_CALLC(block, cfunc_vrsq, this);
return TRUE;
@@ -3480,8 +3480,8 @@ int rsp_cop2_drc::generate_vector_opcode(drcuml_block *block, rsp_device::compil
UML_CALLC(block, cfunc_vrsqh, this);
return TRUE;
- case 0x37: /* VNOP */
- case 0x3F: /* VNULL */
+ case 0x37: /* VNOP */
+ case 0x3F: /* VNULL */
return TRUE;
default:
@@ -3708,27 +3708,27 @@ int rsp_cop2_drc::generate_cop2(drcuml_block *block, rsp_device::compiler_state
case 0x00: /* MFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
}
return TRUE;
case 0x02: /* CFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
}
return TRUE;
case 0x04: /* MTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
return TRUE;
case 0x06: /* CTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
return TRUE;
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
@@ -3736,4 +3736,4 @@ int rsp_cop2_drc::generate_cop2(drcuml_block *block, rsp_device::compiler_state
return generate_vector_opcode(block, compiler, desc);
}
return FALSE;
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/rsp/rspcp2d.h b/src/emu/cpu/rsp/rspcp2d.h
index 51c00dc53f3..96eb7a9a32b 100644
--- a/src/emu/cpu/rsp/rspcp2d.h
+++ b/src/emu/cpu/rsp/rspcp2d.h
@@ -104,7 +104,7 @@ public:
virtual void ctc2();
private:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
};
-#endif /* __RSPCP2D_H__ */ \ No newline at end of file
+#endif /* __RSPCP2D_H__ */
diff --git a/src/emu/cpu/rsp/rspcp2s.c b/src/emu/cpu/rsp/rspcp2s.c
index 5f53bb927c6..4f59ecc555d 100644
--- a/src/emu/cpu/rsp/rspcp2s.c
+++ b/src/emu/cpu/rsp/rspcp2s.c
@@ -26,14 +26,14 @@ using namespace uml;
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define EXTRACT16(reg, value, element) \
switch((element) & 7) \
@@ -2322,9 +2322,8 @@ inline void rsp_cop2_simd::vsaw()
m_xv[VDREG] = m_accum_l;
break;
}
- default: // Unsupported, writes 0 to VD
+ default: // Unsupported, writes 0 to VD
{
-
}
}
}
@@ -3602,27 +3601,27 @@ int rsp_cop2_simd::generate_cop2(drcuml_block *block, rsp_device::compiler_state
case 0x00: /* MFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
}
return TRUE;
case 0x02: /* CFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
}
return TRUE;
case 0x04: /* MTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
return TRUE;
case 0x06: /* CTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
return TRUE;
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
diff --git a/src/emu/cpu/rsp/rspcp2s.h b/src/emu/cpu/rsp/rspcp2s.h
index 4c0e5d9a557..f040ca9c52a 100644
--- a/src/emu/cpu/rsp/rspcp2s.h
+++ b/src/emu/cpu/rsp/rspcp2s.h
@@ -111,48 +111,48 @@ public:
#endif
private:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
-
- UINT16 ACCUM_H(int x);
- UINT16 ACCUM_M(int x);
- UINT16 ACCUM_L(int x);
- UINT16 ACCUM_LL(int x);
- UINT16 CARRY_FLAG(const int x);
- UINT16 COMPARE_FLAG(const int x);
- UINT16 CLIP1_FLAG(const int x);
- UINT16 ZERO_FLAG(const int x);
- UINT16 CLIP2_FLAG(const int x);
- UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
-
- __m128i m_accum_h;
- __m128i m_accum_m;
- __m128i m_accum_l;
- __m128i m_accum_ll;
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
+
+ UINT16 ACCUM_H(int x);
+ UINT16 ACCUM_M(int x);
+ UINT16 ACCUM_L(int x);
+ UINT16 ACCUM_LL(int x);
+ UINT16 CARRY_FLAG(const int x);
+ UINT16 COMPARE_FLAG(const int x);
+ UINT16 CLIP1_FLAG(const int x);
+ UINT16 ZERO_FLAG(const int x);
+ UINT16 CLIP2_FLAG(const int x);
+ UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
+
+ __m128i m_accum_h;
+ __m128i m_accum_m;
+ __m128i m_accum_l;
+ __m128i m_accum_ll;
// Mirror of v[] for now, to be used in parallel as
// more vector ops are transitioned over
- __m128i m_xv[32];
- __m128i m_xvflag[6];
+ __m128i m_xv[32];
+ __m128i m_xvflag[6];
#if SIMUL_SIMD
- UINT32 m_old_r[35];
- UINT8 m_old_dmem[4096];
+ UINT32 m_old_r[35];
+ UINT8 m_old_dmem[4096];
- UINT32 m_scalar_r[35];
- UINT8 m_scalar_dmem[4096];
+ UINT32 m_scalar_r[35];
+ UINT8 m_scalar_dmem[4096];
- INT32 m_old_reciprocal_res;
- UINT32 m_old_reciprocal_high;
- INT32 m_old_dp_allowed;
+ INT32 m_old_reciprocal_res;
+ UINT32 m_old_reciprocal_high;
+ INT32 m_old_dp_allowed;
- INT32 m_scalar_reciprocal_res;
- UINT32 m_scalar_reciprocal_high;
- INT32 m_scalar_dp_allowed;
+ INT32 m_scalar_reciprocal_res;
+ UINT32 m_scalar_reciprocal_high;
+ INT32 m_scalar_dp_allowed;
- INT32 m_simd_reciprocal_res;
- UINT32 m_simd_reciprocal_high;
- INT32 m_simd_dp_allowed;
+ INT32 m_simd_reciprocal_res;
+ UINT32 m_simd_reciprocal_high;
+ INT32 m_simd_dp_allowed;
#endif
};
-#endif /* __RSPCP2S_H__ */ \ No newline at end of file
+#endif /* __RSPCP2S_H__ */
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index dbc81187796..44a0a22542a 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -786,16 +786,16 @@ void rsp_device::generate_branch(drcuml_block *block, compiler_state *compiler,
/* update the cycles and jump through the hash table to the target */
if (desc->targetpc != BRANCH_TARGET_DYNAMIC)
{
- generate_update_cycles(block, &compiler_temp, desc->targetpc, TRUE); // <subtract cycles>
+ generate_update_cycles(block, &compiler_temp, desc->targetpc, TRUE); // <subtract cycles>
if (desc->flags & OPFLAG_INTRABLOCK_BRANCH)
- UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc
+ UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc
else
- UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode
+ UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode
}
else
{
- generate_update_cycles(block, &compiler_temp, mem(&m_rsp_state->jmpdest), TRUE); // <subtract cycles>
- UML_HASHJMP(block, 0, mem(&m_rsp_state->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode
+ generate_update_cycles(block, &compiler_temp, mem(&m_rsp_state->jmpdest), TRUE); // <subtract cycles>
+ UML_HASHJMP(block, 0, mem(&m_rsp_state->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode
}
}
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index 057daf35f84..3737ac94703 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -1345,17 +1345,17 @@ void upd7810_device::handle_timers(int cycles)
IRR |= INTFE1;
/* Conditions When ECNT Causes a CO0 Output Change */
if (((0x00 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 */
- /* ((0x10 == (ETMM & 0x30)) prohibited */
- ((0x20 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 or at falling CI input */
- ((0x30 == (ETMM & 0x30)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO0 if ECNT == ETM0 or ECNT == ETM1 */
+ /* ((0x10 == (ETMM & 0x30)) prohibited */
+ ((0x20 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 or at falling CI input */
+ ((0x30 == (ETMM & 0x30)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO0 if ECNT == ETM0 or ECNT == ETM1 */
{
upd7810_co0_output_change();
}
/* Conditions When ECNT Causes a CO1 Output Change */
if (((0x00 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 */
- /* ((0x40 == (ETMM & 0xc0)) prohibited */
- ((0x80 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 or at falling CI input */
- ((0xc0 == (ETMM & 0xc0)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO1 if ECNT == ETM0 or ECNT == ETM1 */
+ /* ((0x40 == (ETMM & 0xc0)) prohibited */
+ ((0x80 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 or at falling CI input */
+ ((0xc0 == (ETMM & 0xc0)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO1 if ECNT == ETM0 or ECNT == ETM1 */
{
upd7810_co1_output_change();
}
@@ -1816,7 +1816,7 @@ void upd7810_device::device_reset()
m_itf = 0;
m_nmi = 0;
m_int1 = 0;
- m_int2 = 1; /* physical (inverted) INT2 line state */
+ m_int2 = 1; /* physical (inverted) INT2 line state */
m_txs = 0;
m_rxs = 0;
diff --git a/src/emu/machine/i6300esb.c b/src/emu/machine/i6300esb.c
index 8dcfbd6cec5..725c03534e0 100644
--- a/src/emu/machine/i6300esb.c
+++ b/src/emu/machine/i6300esb.c
@@ -86,8 +86,8 @@ ADDRESS_MAP_END
i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
- acpi(*this, "acpi"),
- rtc (*this, "rtc")
+ acpi(*this, "acpi"),
+ rtc (*this, "rtc")
{
}
@@ -661,7 +661,7 @@ void i6300esb_lpc_device::map_bios(address_space *memory_space, UINT32 start, UI
{
// Ignore idsel, a16 inversion for now
UINT32 mask = m_region->bytes() - 1;
- memory_space->install_rom(start, end, m_region->base() + (start & mask));
+ memory_space->install_rom(start, end, m_region->base() + (start & mask));
}
void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -750,5 +750,3 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
if(rtc_conf & 4)
rtc->map_extdevice(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space);
}
-
-
diff --git a/src/emu/machine/i6300esb.h b/src/emu/machine/i6300esb.h
index 79a7bb376b3..3f7bb286678 100644
--- a/src/emu/machine/i6300esb.h
+++ b/src/emu/machine/i6300esb.h
@@ -19,7 +19,7 @@ public:
virtual void reset_all_mappings();
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual DECLARE_ADDRESS_MAP(config_map, 32);
diff --git a/src/emu/machine/i82875p.h b/src/emu/machine/i82875p.h
index 138b489c02e..998c1e51ed9 100644
--- a/src/emu/machine/i82875p.h
+++ b/src/emu/machine/i82875p.h
@@ -5,7 +5,7 @@
#include "pci.h"
-#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \
+#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \
MCFG_PCI_HOST_ADD(_tag, I82875P_HOST, 0x80862578, 0x02, _subdevice_id) \
downcast<i82875p_host_device *>(device)->set_cpu_tag(_cpu_tag); \
downcast<i82875p_host_device *>(device)->set_ram_size(_ram_size);
@@ -21,7 +21,7 @@ public:
void set_ram_size(int ram_size);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual DECLARE_ADDRESS_MAP(config_map, 32);
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index c7c2fe6d6c2..8d15e34ff2c 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -379,7 +379,7 @@ intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, cons
fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { }
-
+
fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
@@ -400,10 +400,10 @@ amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *
amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
-
+
amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { }
-
+
amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f800t", __FILE__) { }
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 0f95237fd55..95fce17b2ee 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -39,7 +39,7 @@
#define MCFG_FUJITSU_29F160T_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, FUJITSU_29F160T, 0)
-
+
#define MCFG_FUJITSU_29F016A_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A, 0)
@@ -161,7 +161,7 @@ protected:
UINT8 m_maker_id;
bool m_sector_is_4k;
bool m_sector_is_16k;
- bool m_top_boot_sector;
+ bool m_top_boot_sector;
UINT8 m_page_size;
// internal state
diff --git a/src/emu/machine/lpc-acpi.c b/src/emu/machine/lpc-acpi.c
index e30c6d36094..5493fa5ecf6 100644
--- a/src/emu/machine/lpc-acpi.c
+++ b/src/emu/machine/lpc-acpi.c
@@ -40,7 +40,7 @@ lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag,
}
void lpc_acpi_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_acpi_device::map);
}
diff --git a/src/emu/machine/lpc-rtc.c b/src/emu/machine/lpc-rtc.c
index c296504d1a6..0f51234c3a2 100644
--- a/src/emu/machine/lpc-rtc.c
+++ b/src/emu/machine/lpc-rtc.c
@@ -18,13 +18,13 @@ lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, d
}
void lpc_rtc_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::map);
}
void lpc_rtc_device::map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::extmap);
}
diff --git a/src/emu/machine/lpc-rtc.h b/src/emu/machine/lpc-rtc.h
index 9135d1a590b..b2d4ea3155f 100644
--- a/src/emu/machine/lpc-rtc.h
+++ b/src/emu/machine/lpc-rtc.h
@@ -14,7 +14,7 @@ public:
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual void map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
DECLARE_READ8_MEMBER( index_r);
DECLARE_WRITE8_MEMBER( index_w);
diff --git a/src/emu/machine/lpc.c b/src/emu/machine/lpc.c
index 7921542adf1..fd9aeee275e 100644
--- a/src/emu/machine/lpc.c
+++ b/src/emu/machine/lpc.c
@@ -4,4 +4,3 @@ lpc_device::lpc_device(const machine_config &mconfig, device_type type, const ch
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-
diff --git a/src/emu/machine/lpc.h b/src/emu/machine/lpc.h
index 7cb9587da59..75af5ffb612 100644
--- a/src/emu/machine/lpc.h
+++ b/src/emu/machine/lpc.h
@@ -12,4 +12,3 @@ public:
};
#endif
-
diff --git a/src/emu/machine/omti5100.c b/src/emu/machine/omti5100.c
index 84d00f178e9..8e4e8fcfa53 100644
--- a/src/emu/machine/omti5100.c
+++ b/src/emu/machine/omti5100.c
@@ -51,7 +51,7 @@ const rom_entry *omti5100_device::device_rom_region() const
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( omti5100_z8 )
-// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */)
+// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */)
MACHINE_CONFIG_END
machine_config_constructor omti5100_device::device_mconfig_additions() const
@@ -70,7 +70,7 @@ machine_config_constructor omti5100_device::device_mconfig_additions() const
omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, OMTI5100, "OMTI 5100 SCSI/SASI Controller", tag, owner, clock, "omti5100", __FILE__),
-// m_cpu(*this, "z8"),
+// m_cpu(*this, "z8"),
m_bsy_w(*this),
m_cd_w(*this),
m_io_w(*this),
diff --git a/src/emu/machine/omti5100.h b/src/emu/machine/omti5100.h
index ede9493880f..ecb8d460d2c 100644
--- a/src/emu/machine/omti5100.h
+++ b/src/emu/machine/omti5100.h
@@ -88,7 +88,7 @@ protected:
virtual void device_reset();
private:
-// required_device<z8681_device> m_cpu;
+// required_device<z8681_device> m_cpu;
devcb_write_line m_bsy_w;
devcb_write_line m_cd_w;
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index 1e823dc319f..abad1e64426 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -226,11 +226,11 @@ void pci_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end
}
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
void pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
}
@@ -291,15 +291,15 @@ void agp_device::device_reset()
pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI_BRIDGE, "PCI-PCI Bridge", tag, owner, clock, "pci_bridge", __FILE__),
- device_memory_interface(mconfig, *this),
- configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
+ device_memory_interface(mconfig, *this),
+ configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source),
- device_memory_interface(mconfig, *this),
- configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
+ device_memory_interface(mconfig, *this),
+ configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
@@ -373,15 +373,15 @@ void pci_bridge_device::reset_all_mappings()
void pci_bridge_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
for(int i = all_devices.count()-1; i>=0; i--)
if(all_devices[i] != this)
all_devices[i]->map_device(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
@@ -458,7 +458,7 @@ void pci_host_device::regenerate_mapping()
io_space->unmap_readwrite(io_window_start, io_window_end);
map_device(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
READ32_MEMBER(pci_host_device::config_address_r)
@@ -492,7 +492,7 @@ UINT32 pci_host_device::config_read(UINT8 bus, UINT8 device, UINT16 reg, UINT32
}
} else
abort();
-
+
return data;
}
diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h
index ea6d861311c..a10b28d1a8a 100644
--- a/src/emu/machine/pci.h
+++ b/src/emu/machine/pci.h
@@ -37,7 +37,7 @@ public:
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
void map_config(UINT8 device, address_space *config_space);
diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c
index 09c799fa1ee..4d0a3978161 100644
--- a/src/emu/machine/pla.c
+++ b/src/emu/machine/pla.c
@@ -59,7 +59,7 @@ void pla_device::device_start()
m_cache.resize(csize);
for (int i = 0; i < csize; i++)
m_cache[i] = read(i);
-
+
m_cache_size = csize;
}
@@ -72,19 +72,19 @@ void pla_device::parse_fusemap()
{
jed_data jed;
int result = JEDERR_NONE;
-
+
// read pla file
switch (m_format)
{
case PLA_FMT_JEDBIN:
result = jedbin_parse(region()->base(), region()->bytes(), &jed);
break;
-
+
case PLA_FMT_BERKELEY:
result = pla_parse(region()->base(), region()->bytes(), &jed);
break;
}
-
+
if (result != JEDERR_NONE)
{
for (int p = 0; p < m_terms; p++)
@@ -92,11 +92,11 @@ void pla_device::parse_fusemap()
m_term[p].and_mask = 0;
m_term[p].or_mask = 0;
}
-
+
logerror("%s PLA parse error %d!\n", tag(), result);
return;
}
-
+
// parse it
UINT32 fusenum = 0;
@@ -148,7 +148,7 @@ UINT32 pla_device::read(UINT32 input)
// try the cache first
if (input < m_cache_size)
return m_cache[input];
-
+
for (int i = 0; i < CACHE2_SIZE; ++i)
{
UINT64 cache2_entry = m_cache2[i];
diff --git a/src/emu/machine/pla.h b/src/emu/machine/pla.h
index 96a33aaae43..411b1bec15b 100644
--- a/src/emu/machine/pla.h
+++ b/src/emu/machine/pla.h
@@ -99,7 +99,7 @@ public:
static void set_num_terms(device_t &device, UINT32 t) { downcast<pla_device &>(device).m_terms = t; }
static void set_inputmask(device_t &device, UINT32 mask) { downcast<pla_device &>(device).m_input_mask = mask; } // UINT32!
static void set_format(device_t &device, int format) { downcast<pla_device &>(device).m_format = format; }
-
+
UINT32 inputs() { return m_inputs; }
UINT32 outputs() { return m_outputs; }
@@ -113,7 +113,7 @@ private:
void parse_fusemap();
int m_format;
-
+
UINT32 m_inputs;
UINT32 m_outputs;
UINT32 m_terms;
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 078e07a8420..e8bddfe42e9 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -3435,7 +3435,7 @@ UINT16 *address_table::subtable_open(offs_t l1index)
for (int i=0; i<size; i++)
subptr[i] = subentry;
m_table[l1index] = newentry;
- UINT32 subkey = subentry + (subentry << 8) + (subentry << 16) + (subentry << 24);
+ UINT32 subkey = subentry + (subentry << 8) + (subentry << 16) + (subentry << 24);
m_subtable[newentry - SUBTABLE_BASE].m_checksum = subkey * (((1 << level2_bits())/4));
subentry = newentry;
}
diff --git a/src/emu/memory.h b/src/emu/memory.h
index b433baa541a..e90cc58394c 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -649,7 +649,7 @@ public:
m_endianness(endianness),
m_bitwidth(width),
m_bytewidth(width <= 8 ? 1 : width <= 16 ? 2 : width <= 32 ? 4 : 8)
- { }
+ { }
// getters
memory_share *next() const { return m_next; }
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 3b177c5ac8e..279a3755b8f 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -537,7 +537,7 @@ static void region_post_process(romload_private *romdata, const char *rgntag, bo
return;
LOG(("+ datawidth=%dbit endian=%s\n", region->bitwidth(),
- region->endianness() == ENDIANNESS_LITTLE ? "little" : "big"));
+ region->endianness() == ENDIANNESS_LITTLE ? "little" : "big"));
/* if the region is inverted, do that now */
if (invert)
diff --git a/src/emu/sound/sn76477.h b/src/emu/sound/sn76477.h
index 07260c66b89..f0a4faefd85 100644
--- a/src/emu/sound/sn76477.h
+++ b/src/emu/sound/sn76477.h
@@ -116,7 +116,7 @@ public:
dev.m_vco_voltage = volt;
dev.m_vco_cap = cap;
dev.m_vco_res = res;
- }
+ }
static void set_pitch_voltage(device_t &device, double volt) { downcast<sn76477_device &>(device).m_pitch_voltage = volt; }
static void set_slf_params(device_t &device, double cap, double res)
{
@@ -137,16 +137,16 @@ public:
dev.m_mixer_a = a;
dev.m_mixer_b = b;
dev.m_mixer_c = c;
- }
+ }
static void set_envelope_params(device_t &device, UINT32 env1, UINT32 env2)
{
sn76477_device &dev = downcast<sn76477_device &>(device);
dev.m_envelope_1 = env1;
dev.m_envelope_2 = env2;
- }
+ }
static void set_enable(device_t &device, UINT32 enable) { downcast<sn76477_device &>(device).m_enable = enable; }
-
-
+
+
/* these functions take 0 or 1 as a logic input */
WRITE_LINE_MEMBER( enable_w ); /* active LO, 0 = enabled, 1 = disabled */
WRITE_LINE_MEMBER( mixer_a_w );
@@ -257,7 +257,7 @@ private:
UINT32 m_mixer_c;
UINT32 m_envelope_1;
UINT32 m_envelope_2;
-
+
/* others */
sound_stream *m_channel; /* returned by stream_create() */
int m_our_sample_rate; /* from machine.sample_rate() */
diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h
index 8c852db7b9f..fc1b1366000 100644
--- a/src/emu/video/315_5124.h
+++ b/src/emu/video/315_5124.h
@@ -62,7 +62,7 @@ public:
sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source, int xscroll_hpos = X_SCROLL_HPOS_5124);
static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; }
-
+
template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_int_cb.set_callback(object); }
diff --git a/src/emu/video/315_5313.c b/src/emu/video/315_5313.c
index b71d67c8ba2..bdfbe924db1 100644
--- a/src/emu/video/315_5313.c
+++ b/src/emu/video/315_5313.c
@@ -2503,7 +2503,7 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline)
{
UINT16 *lineptr;
-
+
if (!m_use_alt_timing)
{
diff --git a/src/emu/video/snes_ppu.c b/src/emu/video/snes_ppu.c
index e41f2f00bd3..900d1f07a83 100644
--- a/src/emu/video/snes_ppu.c
+++ b/src/emu/video/snes_ppu.c
@@ -361,11 +361,10 @@ void snes_ppu_device::device_start()
void snes_ppu_device::device_reset()
{
-
#if SNES_LAYER_DEBUG
memset(&m_debug_options, 0, sizeof(m_debug_options));
#endif
-
+
/* Inititialize registers/variables */
m_update_windows = 1;
m_beam.latch_vert = 0;
@@ -376,32 +375,32 @@ void snes_ppu_device::device_reset()
m_mode = 0;
m_ppu1_version = 1; // 5C77 chip version number, read by STAT77, only '1' is known
m_ppu2_version = 3; // 5C78 chip version number, read by STAT78, only '2' & '3' encountered so far.
-
+
m_cgram_address = 0;
m_read_ophct = 0;
m_read_opvct = 0;
m_vmadd = 0;
-
+
PPU_REG(VMAIN) = 0x80;
// what about other regs?
-
+
/* Inititialize mosaic table */
for (int j = 0; j < 16; j++)
{
for (int i = 0; i < 4096; i++)
m_mosaic_table[j][i] = (i / (j + 1)) * (j + 1);
}
-
+
/* Init VRAM */
memset(m_vram, 0, SNES_VRAM_SIZE);
-
+
/* Init Palette RAM */
memset((UINT8 *)m_cgram, 0, SNES_CGRAM_SIZE);
-
+
/* Init oam RAM */
memset((UINT8 *)m_oam_ram, 0xff, SNES_OAM_SIZE);
-
+
m_stat78 = 0;
// other initializations to 0
@@ -419,7 +418,7 @@ void snes_ppu_device::device_reset()
memset(m_scanlines[i].layer, 0, SNES_SCR_WIDTH);
memset(m_scanlines[i].blend_exception, 0, SNES_SCR_WIDTH);
}
-
+
for (int i = 0; i < 6; i++)
{
m_layer[i].window1_enabled = 0;
@@ -439,10 +438,10 @@ void snes_ppu_device::device_reset()
m_layer[i].sub_bg_enabled = 0;
m_layer[i].hoffs = 0;
m_layer[i].voffs = 0;
-
+
memset(m_clipmasks[i], 0, SNES_SCR_WIDTH);
}
-
+
for (int i = 0; i < ARRAY_LENGTH(m_oam_spritelist); i++)
{
m_oam_spritelist[i].tile = 0;
@@ -456,7 +455,7 @@ void snes_ppu_device::device_reset()
m_oam_spritelist[i].height = 0;
m_oam_spritelist[i].width = 0;
}
-
+
for (int i = 0; i < ARRAY_LENGTH(m_oam_tilelist); i++)
{
m_oam_tilelist[i].x = 0;