diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/i960/i960dis.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/m6502/m5074x.c | 189 | ||||
| -rw-r--r-- | src/emu/cpu/m6502/m5074x.h | 24 | ||||
| -rw-r--r-- | src/emu/cpu/m6502/m6502.h | 4 | ||||
| -rw-r--r-- | src/emu/cpu/m6502/om740.lst | 1 | ||||
| -rw-r--r-- | src/emu/cpu/sc61860/sc61860.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/debugcmd.c | 2 | ||||
| -rw-r--r-- | src/emu/device.h | 2 | ||||
| -rw-r--r-- | src/emu/fileio.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/53c7xx.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/8257dma.h | 2 | ||||
| -rw-r--r-- | src/emu/schedule.c | 2 | ||||
| -rw-r--r-- | src/emu/schedule.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/2608intf.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/es5506.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/k007232.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/k053260.c | 14 | ||||
| -rw-r--r-- | src/emu/sound/k053260.h | 36 | ||||
| -rw-r--r-- | src/emu/sound/msm5205.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/spu.c | 1 | ||||
| -rw-r--r-- | src/emu/video/v9938.h | 2 |
21 files changed, 153 insertions, 156 deletions
diff --git a/src/emu/cpu/i960/i960dis.c b/src/emu/cpu/i960/i960dis.c index b9123534301..80acd100dea 100644 --- a/src/emu/cpu/i960/i960dis.c +++ b/src/emu/cpu/i960/i960dis.c @@ -78,7 +78,7 @@ static const mnemonic_t mnem_reg[100] = { "movq",0x5fc }, { "scanbit", 0x641 }, { "daddc", 0x642 }, { "dsubc", 0x643 }, { "dmovt", 0x644 }, { "modac",0x645 }, { "modify",0x650 }, { "extract",0x651 }, { "modtc",0x654 }, { "modpc",0x655 }, - { "emul",0x670 }, { "ediv",0x671 }, { "cvtir", 0x674 }, { "cvtilr", 0x675 }, { "scalerl", 0x676 }, { "scaler", 0x677 }, + { "emul",0x670 }, { "ediv",0x671 }, { "cvtir", 0x674 }, { "cvtilr", 0x675 }, { "scalerl", 0x676 }, { "scaler", 0x677 }, { "atanr",0x680 }, { "logepr", 0x681 }, { "logr", 0x682 }, { "remr", 0x683 }, { "cmpor", 0x684 }, { "cmpr", 0x685 }, { "sqrtr", 0x688 }, { "expr", 0x689 }, { "logbnr", 0x68a }, { "roundr", 0x68b }, { "sinr", 0x68c }, { "cosr", 0x68d }, { "tanr", 0x68e }, { "classr", 0x68f }, { "atanrl",0x690 }, { "logeprl", 0x691 }, { "logrl", 0x692 }, { "remrl", 0x693 }, { "cmporl", 0x694 }, { "cmprl", 0x695 }, { "sqrtrl", 0x698 }, diff --git a/src/emu/cpu/m6502/m5074x.c b/src/emu/cpu/m6502/m5074x.c index 7c6699f0d7c..fb82c61a5b0 100644 --- a/src/emu/cpu/m6502/m5074x.c +++ b/src/emu/cpu/m6502/m5074x.c @@ -9,14 +9,14 @@ // MACROS / CONSTANTS //************************************************************************** -#define IRQ_CNTRREQ (0x80) -#define IRQ_CNTRENA (0x40) -#define IRQ_TMR1REQ (0x20) -#define IRQ_TMR1ENA (0x10) -#define IRQ_TMR2REQ (0x08) -#define IRQ_TMR2ENA (0x04) -#define IRQ_INTREQ (0x02) -#define IRQ_INTENA (0x01) +#define IRQ_CNTRREQ (0x80) +#define IRQ_CNTRENA (0x40) +#define IRQ_TMR1REQ (0x20) +#define IRQ_TMR1ENA (0x10) +#define IRQ_TMR2REQ (0x08) +#define IRQ_TMR2ENA (0x04) +#define IRQ_INTREQ (0x02) +#define IRQ_INTENA (0x01) #define TMRC_TMRXREQ (0x80) #define TMRC_TMRXENA (0x40) @@ -64,7 +64,7 @@ void m5074x_device::device_start() write_p0.resolve_safe(); write_p1.resolve_safe(); write_p2.resolve_safe(); - write_p3.resolve_safe(); + write_p3.resolve_safe(); for (int i = 0; i < NUM_TIMERS; i++) { @@ -243,7 +243,7 @@ void m5074x_device::recalc_timer(int timer) break; case 2: - // Timer X modes: 00 = free run countdown, 01 = invert CNTR pin each time expires, + // Timer X modes: 00 = free run countdown, 01 = invert CNTR pin each time expires, // 10 = count each time CNTR pin inverts, 11 = count when CNTR pin low if ((m_tmrctrl & TMRC_TMRXMDE) == 0) { @@ -291,111 +291,111 @@ void m5074x_device::send_port(address_space &space, UINT8 offset, UINT8 data) UINT8 m5074x_device::read_port(UINT8 offset) { - UINT8 incoming = 0; + UINT8 incoming = 0; - switch (offset) - { - case 0: - incoming = read_p0(); - break; + switch (offset) + { + case 0: + incoming = read_p0(); + break; - case 1: - incoming = read_p1(); - break; + case 1: + incoming = read_p1(); + break; - case 2: - incoming = read_p2(); - break; + case 2: + incoming = read_p2(); + break; - case 3: - incoming = read_p3(); - break; - } + case 3: + incoming = read_p3(); + break; + } - // apply data direction registers - incoming &= (m_ddrs[offset] ^ 0xff); - // OR in ddr-masked version of port writes - incoming |= (m_ports[offset] & m_ddrs[offset]); + // apply data direction registers + incoming &= (m_ddrs[offset] ^ 0xff); + // OR in ddr-masked version of port writes + incoming |= (m_ports[offset] & m_ddrs[offset]); - return incoming; + return incoming; } READ8_MEMBER(m5074x_device::ports_r) { - switch (offset) - { - case 0: - return read_port(0); + switch (offset) + { + case 0: + return read_port(0); - case 1: - return m_ddrs[0]; + case 1: + return m_ddrs[0]; - case 2: - return read_port(1); + case 2: + return read_port(1); - case 3: - return m_ddrs[1]; + case 3: + return m_ddrs[1]; - case 4: - return read_port(2); + case 4: + return read_port(2); - case 5: - return m_ddrs[2]; + case 5: + return m_ddrs[2]; - case 8: - return read_port(3); + case 8: + return read_port(3); - case 9: - return m_ddrs[3]; - } + case 9: + return m_ddrs[3]; + } - return 0xff; + return 0xff; } WRITE8_MEMBER(m5074x_device::ports_w) { - switch (offset) - { - case 0: // p0 - send_port(space, 0, data & m_ddrs[0]); - m_ports[0] = data; - break; - - case 1: // p0 ddr - send_port(space, 0, m_ports[0] & data); - m_ddrs[0] = data; - break; - - case 2: // p1 - send_port(space, 1, data & m_ddrs[1]); - m_ports[1] = data; - break; - - case 3: // p1 ddr - send_port(space, 1, m_ports[1] & data); - m_ddrs[1] = data; - break; - - case 4: // p2 - send_port(space, 2, data & m_ddrs[2]); - m_ports[2] = data; - break; - - case 5: // p2 ddr - send_port(space, 2, m_ports[2] & data); - m_ddrs[2] = data; - break; - - case 8: // p3 - send_port(space, 3, data & m_ddrs[3]); - m_ports[3] = data; - break; - - case 9: // p3 ddr - send_port(space, 3, m_ports[3] & data); - m_ddrs[3] = data; - break; - } + switch (offset) + { + case 0: // p0 + send_port(space, 0, data & m_ddrs[0]); + m_ports[0] = data; + break; + + case 1: // p0 ddr + send_port(space, 0, m_ports[0] & data); + m_ddrs[0] = data; + break; + + case 2: // p1 + send_port(space, 1, data & m_ddrs[1]); + m_ports[1] = data; + break; + + case 3: // p1 ddr + send_port(space, 1, m_ports[1] & data); + m_ddrs[1] = data; + break; + + case 4: // p2 + send_port(space, 2, data & m_ddrs[2]); + m_ports[2] = data; + break; + + case 5: // p2 ddr + send_port(space, 2, m_ports[2] & data); + m_ddrs[2] = data; + break; + + case 8: // p3 + send_port(space, 3, data & m_ddrs[3]); + m_ports[3] = data; + break; + + case 9: // p3 ddr + send_port(space, 3, m_ports[3] & data); + m_ddrs[3] = data; + break; + } } READ8_MEMBER(m5074x_device::tmrirq_r) @@ -429,7 +429,7 @@ READ8_MEMBER(m5074x_device::tmrirq_r) WRITE8_MEMBER(m5074x_device::tmrirq_w) { -// printf("%02x to tmrirq @ %d\n", data, offset); +// printf("%02x to tmrirq @ %d\n", data, offset); switch (offset) { @@ -505,4 +505,3 @@ m50741_device::m50741_device(const machine_config &mconfig, device_type type, co m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), shortname, source) { } - diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h index 98c7848d4e1..d29ed852fca 100644 --- a/src/emu/cpu/m6502/m5074x.h +++ b/src/emu/cpu/m6502/m5074x.h @@ -54,25 +54,25 @@ public: const address_space_config m_program_config; - template<class _read, class _write> void set_p0_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p0_callbacks(_read rd, _write wr) { read_p0.set_callback(rd); write_p0.set_callback(wr); } - template<class _read, class _write> void set_p1_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p1_callbacks(_read rd, _write wr) { read_p1.set_callback(rd); write_p1.set_callback(wr); } - template<class _read, class _write> void set_p2_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p2_callbacks(_read rd, _write wr) { read_p2.set_callback(rd); write_p2.set_callback(wr); } - template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr) { read_p3.set_callback(rd); write_p3.set_callback(wr); @@ -81,10 +81,10 @@ public: devcb2_read8 read_p0, read_p1, read_p2, read_p3; devcb2_write8 write_p0, write_p1, write_p2, write_p3; - DECLARE_READ8_MEMBER(ports_r); - DECLARE_WRITE8_MEMBER(ports_w); - DECLARE_READ8_MEMBER(tmrirq_r); - DECLARE_WRITE8_MEMBER(tmrirq_w); + DECLARE_READ8_MEMBER(ports_r); + DECLARE_WRITE8_MEMBER(ports_w); + DECLARE_READ8_MEMBER(tmrirq_r); + DECLARE_WRITE8_MEMBER(tmrirq_w); bool are_port_bits_output(UINT8 port, UINT8 mask) { return ((m_ddrs[port] & mask) == mask) ? true : false; } @@ -97,12 +97,12 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; } void send_port(address_space &space, UINT8 offset, UINT8 data); - UINT8 read_port(UINT8 offset); + UINT8 read_port(UINT8 offset); void recalc_irqs(); void recalc_timer(int timer); - UINT8 m_ports[6], m_ddrs[6]; + UINT8 m_ports[6], m_ddrs[6]; UINT8 m_intctrl, m_tmrctrl; UINT8 m_tmr12pre, m_tmr1, m_tmr2, m_tmrxpre, m_tmrx; UINT8 m_tmr1latch, m_tmr2latch, m_tmrxlatch; @@ -112,7 +112,7 @@ private: emu_timer *m_timers[NUM_TIMERS]; }; -class m50740_device : public m5074x_device +class m50740_device : public m5074x_device { public: m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -123,7 +123,7 @@ protected: private: }; -class m50741_device : public m5074x_device +class m50741_device : public m5074x_device { public: m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index 4cdff2abd9b..2eccedf3010 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -129,8 +129,8 @@ protected: DASM_spg, /* "special page": implied FF00 OR immediate value (M740)*/ DASM_biz, /* bit, zero page (M740) */ DASM_bzr, /* bit, zero page, relative offset (M740) */ - DASM_bar, /* bit, accumulator, relative offset (M740) */ - DASM_bac /* bit, accumulator (M740) */ + DASM_bar, /* bit, accumulator, relative offset (M740) */ + DASM_bac /* bit, accumulator (M740) */ }; enum { diff --git a/src/emu/cpu/m6502/om740.lst b/src/emu/cpu/m6502/om740.lst index 5082ffad591..d944a0cbcb5 100644 --- a/src/emu/cpu/m6502/om740.lst +++ b/src/emu/cpu/m6502/om740.lst @@ -747,4 +747,3 @@ sbct_zpx do_sbct(TMP); write(X, TMP2); prefetch(); - diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 46b98c7c8e5..a28b2084533 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -58,7 +58,7 @@ struct sc61860_state direct_read_data *direct; int icount; UINT8 ram[0x100]; // internal special ram, should be 0x60, 0x100 to avoid memory corruption for now - + devcb_resolved_read_line reset; devcb_resolved_read_line brk; devcb_resolved_read_line x; @@ -67,7 +67,7 @@ struct sc61860_state devcb_resolved_read8 inb; devcb_resolved_write8 outb; devcb_resolved_write8 outc; - + }; INLINE sc61860_state *get_safe_token(device_t *device) diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index dfef32d84c9..e0d8845de93 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -554,7 +554,7 @@ int debug_command_parameter_cpu(running_machine &machine, const char *param, dev } /* if we got a valid one, return */ - const UINT64 original_cpunum = cpunum; + const UINT64 original_cpunum = cpunum; execute_interface_iterator iter(machine.root_device()); for (device_execute_interface *exec = iter.first(); exec != NULL; exec = iter.next()) { diff --git a/src/emu/device.h b/src/emu/device.h index 3ac184db4ec..0bba84e82fb 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -298,7 +298,7 @@ protected: astring m_name; // name of the device astring m_shortname; // short name of the device astring m_searchpath; // search path, used for media loading - astring m_source; // device source file name + astring m_source; // device source file name // device relationships device_t * m_owner; // device that owns us diff --git a/src/emu/fileio.c b/src/emu/fileio.c index 9e3849dcc66..b4c645aae88 100644 --- a/src/emu/fileio.c +++ b/src/emu/fileio.c @@ -111,7 +111,7 @@ bool path_iterator::next(astring &buffer, const char *name) file_enumerator::file_enumerator(const char *searchpath) : m_iterator(searchpath), m_curdir(NULL)/*, - m_buflen(0)*/ + m_buflen(0)*/ { } diff --git a/src/emu/machine/53c7xx.c b/src/emu/machine/53c7xx.c index 703c367d669..81f71cc4b58 100644 --- a/src/emu/machine/53c7xx.c +++ b/src/emu/machine/53c7xx.c @@ -188,7 +188,7 @@ void ncr53c7xx_device::device_config_complete() else { memset(&m_out_irq_cb, 0, sizeof(m_out_irq_cb)); - } + } } diff --git a/src/emu/machine/8257dma.h b/src/emu/machine/8257dma.h index e9289f826a6..580020a7300 100644 --- a/src/emu/machine/8257dma.h +++ b/src/emu/machine/8257dma.h @@ -91,7 +91,7 @@ public: DECLARE_WRITE8_MEMBER( i8257_w ); /* hold acknowledge */ - WRITE_LINE_MEMBER( i8257_hlda_w ) { } + WRITE_LINE_MEMBER( i8257_hlda_w ) { } /* ready */ WRITE_LINE_MEMBER( i8257_ready_w ) { } diff --git a/src/emu/schedule.c b/src/emu/schedule.c index 19011fcc9be..cd34a0b7700 100644 --- a/src/emu/schedule.c +++ b/src/emu/schedule.c @@ -415,7 +415,7 @@ bool device_scheduler::can_save() const //------------------------------------------------- // apply_suspend_changes - applies suspend/resume -// changes to all device_execute_interfaces +// changes to all device_execute_interfaces //------------------------------------------------- inline void device_scheduler::apply_suspend_changes() diff --git a/src/emu/schedule.h b/src/emu/schedule.h index 0910c2016e1..8767b110c7e 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -219,7 +219,7 @@ private: emu_timer * m_callback_timer; // pointer to the current callback timer bool m_callback_timer_modified; // true if the current callback timer was modified attotime m_callback_timer_expire_time; // the original expiration time - bool m_suspend_changes_pending; // suspend/resume changes are pending + bool m_suspend_changes_pending; // suspend/resume changes are pending // scheduling quanta class quantum_slot diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c index ed24bfc74c8..bdf9d1842f4 100644 --- a/src/emu/sound/2608intf.c +++ b/src/emu/sound/2608intf.c @@ -73,9 +73,9 @@ static const ssg_callbacks psgintf = /* IRQ Handler */ static void IRQHandler(void *param,int irq) { - ym2608_state *info = (ym2608_state *)param; + ym2608_state *info = (ym2608_state *)param; if (!info->irqhandler.isnull()) - info->irqhandler(irq); + info->irqhandler(irq); } /* Timer overflow callback from timer.c */ @@ -148,7 +148,7 @@ static DEVICE_START( ym2608 ) info->device = device; info->irqhandler.resolve(intf->irqhandler, *device); - + /* FIXME: Force to use simgle output */ info->psg = ay8910_start_ym(NULL, YM2608, device, device->clock(), &intf->ay8910_intf); assert_always(info->psg != NULL, "Error creating YM2608/AY8910 chip"); diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index d135bb0dedd..01ad725abaf 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -1393,7 +1393,7 @@ INLINE UINT32 es5506_reg_read_low(es5506_state *chip, es5506_voice *voice, offs_ case 0x68/8: /* PAR */ if (!chip->port_read.isnull()) - result = chip->port_read(0); + result = chip->port_read(0); break; case 0x70/8: /* IRQV */ @@ -1469,7 +1469,7 @@ INLINE UINT32 es5506_reg_read_high(es5506_state *chip, es5506_voice *voice, offs case 0x68/8: /* PAR */ if (!chip->port_read.isnull()) - result = chip->port_read(0); + result = chip->port_read(0); break; case 0x70/8: /* IRQV */ @@ -1492,7 +1492,7 @@ INLINE UINT32 es5506_reg_read_test(es5506_state *chip, es5506_voice *voice, offs { case 0x68/8: /* PAR */ if (!chip->port_read.isnull()) - result = chip->port_read(0); + result = chip->port_read(0); break; case 0x70/8: /* IRQV */ diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c index a1a907b3fdd..18f5c1c9963 100644 --- a/src/emu/sound/k007232.c +++ b/src/emu/sound/k007232.c @@ -316,7 +316,7 @@ static DEVICE_START( k007232 ) info->clock = device->clock(); info->portwritehandler.resolve(info->intf->portwritehandler,*device); - + for( i = 0; i < KDAC_A_PCM_MAX; i++ ) { info->start[i] = 0; diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index 5242c592d1a..d675460c76c 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -28,13 +28,13 @@ const device_type K053260 = &device_creator<k053260_device>; k053260_device::k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053260, "K053260", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_channel(NULL), - m_mode(0), - m_rom(NULL), - m_rom_size(0), - m_delta_table(NULL), - m_intf(NULL) + device_sound_interface(mconfig, *this), + m_channel(NULL), + m_mode(0), + m_rom(NULL), + m_rom_size(0), + m_delta_table(NULL), + m_intf(NULL) { memset(m_regs, 0, sizeof(int)*0x30); } diff --git a/src/emu/sound/k053260.h b/src/emu/sound/k053260.h index c6aae19f8eb..b6882f9a5b7 100644 --- a/src/emu/sound/k053260.h +++ b/src/emu/sound/k053260.h @@ -33,19 +33,19 @@ struct k053260_interface struct k053260_channel { - k053260_channel() : - rate(0), - size(0), - start(0), - bank(0), - volume(0), - play(0), - pan(0), - pos(0), - loop(0), - ppcm(0), - ppcm_data(0) {} - + k053260_channel() : + rate(0), + size(0), + start(0), + bank(0), + volume(0), + play(0), + pan(0), + pos(0), + loop(0), + ppcm(0), + ppcm_data(0) {} + UINT32 rate; UINT32 size; UINT32 start; @@ -63,7 +63,7 @@ struct k053260_channel // ======================> k053260_device class k053260_device : public device_t, - public device_sound_interface + public device_sound_interface { public: k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -78,12 +78,12 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( k053260_w ); - DECLARE_READ8_MEMBER( k053260_r ); + DECLARE_WRITE8_MEMBER( k053260_w ); + DECLARE_READ8_MEMBER( k053260_r ); private: - void InitDeltaTable( int rate, int clock ); - void check_bounds( int channel ); + void InitDeltaTable( int rate, int clock ); + void check_bounds( int channel ); private: sound_stream * m_channel; diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 63e216cca89..4e4a1189d78 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -54,7 +54,7 @@ struct msm5205_state { - const msm5205_interface *intf; + const msm5205_interface *intf; device_t *device; sound_stream * stream; /* number of stream system */ INT32 clock; /* clock rate */ @@ -67,7 +67,7 @@ struct msm5205_state INT32 signal; /* current ADPCM signal */ INT32 step; /* current ADPCM step */ int diff_lookup[49*16]; - devcb_resolved_write_line vclk_callback; + devcb_resolved_write_line vclk_callback; }; INLINE msm5205_state *get_safe_token(device_t *device) diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c index 47af2f88ff6..6ffcbd37723 100644 --- a/src/emu/sound/spu.c +++ b/src/emu/sound/spu.c @@ -2479,7 +2479,6 @@ void spu_device::generate_cdda(void *ptr, const unsigned int sz) while ((cdda_buffer->get_bytes_in()) && (n--)) { - INT16 vl = ((sp[0]*voll)>>15); INT16 vr = ((sp[1]*volr)>>15); diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 7e15516e6cb..1892bc0fff0 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -66,7 +66,7 @@ protected: public: template<class _irq> void set_interrupt_callback(_irq irq) { m_int_callback.set_callback(irq); - } + } int interrupt (); void set_resolution (int); int get_transpen(); |
