diff options
author | 2013-04-09 06:46:57 +0000 | |
---|---|---|
committer | 2013-04-09 06:46:57 +0000 | |
commit | c6cd8a09c87f9830898b0c2eb236492b70f0c255 (patch) | |
tree | cf528302c3e6ea6ce70addf4a2a133c5115124a6 /src | |
parent | 8fb2921edb6e1c8146e6348972eb1d23df2fd093 (diff) |
Cleanups and version bumpmame0148u3
Diffstat (limited to 'src')
126 files changed, 511 insertions, 523 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(); diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index 5b1c317df18..d2fffff8b55 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -176,12 +176,12 @@ class aleck64_state : public n64_state public: aleck64_state(const machine_config &mconfig, device_type type, const char *tag) : n64_state(mconfig, type, tag), - m_dip_read_offset(0) { } + m_dip_read_offset(0) { } DECLARE_DRIVER_INIT(aleck64); DECLARE_WRITE32_MEMBER(aleck_dips_w); DECLARE_READ32_MEMBER(aleck_dips_r); -private: +private: UINT32 m_dip_read_offset; }; diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 7a83cffbbd6..2d3739478cd 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -10843,7 +10843,7 @@ DRIVER_INIT_MEMBER(cps_state,sf2dongb) DRIVER_INIT_MEMBER( cps_state, sf2m8 ) { // unscramble gfx - UINT8 *grom = memregion("gfx")->base(); + UINT8 *grom = memregion("gfx")->base(); UINT8 *urom = memregion("user2")->base(); int i = 0x480000, j = 0; diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 07ef91c4724..a1c84abfd8d 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -155,7 +155,7 @@ public: ddenlovr_state(const machine_config &mconfig, device_type type, const char *tag) : dynax_state(mconfig, type, tag) { } - + DECLARE_MACHINE_START(ddenlovr); DECLARE_MACHINE_RESET(ddenlovr); DECLARE_VIDEO_START(ddenlovr); @@ -173,7 +173,7 @@ public: DECLARE_MACHINE_START(hparadis); UINT32 screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + INTERRUPT_GEN_MEMBER(quizchq_irq); INTERRUPT_GEN_MEMBER(mmpanic_irq); DECLARE_WRITE_LINE_MEMBER(quizchq_rtc_irq); @@ -189,7 +189,7 @@ public: DECLARE_WRITE_LINE_MEMBER(mjflove_rtc_irq); DECLARE_WRITE_LINE_MEMBER(mjmyster_rtc_irq); TIMER_DEVICE_CALLBACK_MEMBER(mjmyster_irq); - + DECLARE_CUSTOM_INPUT_MEMBER(ddenlovr_blitter_irq_r); DECLARE_CUSTOM_INPUT_MEMBER(ddenlovj_blitter_r); DECLARE_CUSTOM_INPUT_MEMBER(nettoqc_special_r); @@ -350,7 +350,7 @@ public: DECLARE_VIDEO_START(htengoku); DECLARE_WRITE8_MEMBER(htengoku_dsw_w); DECLARE_READ8_MEMBER(htengoku_dsw_r); - + void ddenlovr_flipscreen_w( UINT8 data ); void ddenlovr_blit_flip_w( UINT8 data ); void do_plot( int x, int y, int pen ); @@ -1733,7 +1733,7 @@ WRITE16_MEMBER(ddenlovr_state::ddenlovr16_transparency_mask_w) WRITE8_MEMBER(ddenlovr_state::quizchq_oki_bank_w ) -{ +{ m_oki->set_bank_base((data & 1) * 0x40000); } @@ -1760,7 +1760,7 @@ WRITE16_MEMBER(ddenlovr_state::quiz365_oki_bank2_w ) { if (ACCESSING_BITS_0_7) { - m_okibank = (m_okibank & 1) | ((data & 1) << 1); + m_okibank = (m_okibank & 1) | ((data & 1) << 1); m_oki->set_bank_base(m_okibank * 0x40000); } } diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index c192e3fe20c..2a943ad6def 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -89,7 +89,7 @@ public: UINT32 screen_update_discoboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void discoboy_setrombank( UINT8 data ); - DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); }; diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index ccb780a6d84..8c4712cb98f 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -825,7 +825,7 @@ allowing to boot them. Promoted to working state. - Removed the 'hack' in the Magic Card 2 sets description... Almost all the sets on this driver were hacked in different - degrees. Not proof that these were released as originals, + degrees. Not proof that these were released as originals, or just a hack. @@ -5420,4 +5420,3 @@ GAME( 199?, soccernw, 0, royalcd1, royalcrd, funworld_state, soccernw, // Other games... GAME( 198?, funquiz, 0, funquiz, funquiz, driver_device, 0, ROT0, "Fun World / Oehlinger", "Fun World Quiz (Austrian)", 0 ) GAMEL( 1986, novoplay, 0, fw2ndpal, novoplay, driver_device, 0, ROT0, "Admiral/Novomatic", "Novo Play Multi Card / Club Card", 0, layout_novoplay ) - diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index 3514a5b593e..8c952950d84 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -376,7 +376,7 @@ WRITE32_MEMBER(ghosteo_state::sound_w) } READ32_MEMBER( ghosteo_state::touryuu_port_10000000_r ) -{ +{ UINT32 port_g = m_bballoon_port[S3C2410_GPIO_PORT_G]; UINT32 data = 0xFFFFFFFF; switch (port_g) diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index fe963fd21af..7f2b6633728 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -257,7 +257,7 @@ public: int write_dest_byte(UINT8 usedata); //UINT16 main_m_vram[0x800][0x800]; - + DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); }; diff --git a/src/mame/drivers/jpms80.c b/src/mame/drivers/jpms80.c index 5b174eef836..ff0b5871c71 100644 --- a/src/mame/drivers/jpms80.c +++ b/src/mame/drivers/jpms80.c @@ -314,8 +314,8 @@ GAME(198?, j80supbk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM GAME(198?, j80topsp ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Sprint (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) GAME(198?, j80topup ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Up (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) GAME(198?, j80tumbl ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Tumble (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) -GAME(198?, j80wsprt, 0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V4, 5x20p) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) -GAME(198?, j80wsprt3, j80wsprt ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V3, 50p, 5 credits) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) +GAME(198?, j80wsprt, 0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V4, 5x20p) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) +GAME(198?, j80wsprt3, j80wsprt ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V3, 50p, 5 credits) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) GAME(198?, j80wsprt2,j80wsprt ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V2, 10x10p) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) GAME(198?, j80blbnk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "PCP","Blankity Bank (PCP) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 7933c60b20c..43e1fd18ce4 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -245,7 +245,7 @@ public: void screen_eof_maygayv1(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(vsync_interrupt); DECLARE_WRITE8_MEMBER(data_from_i8031); - DECLARE_READ8_MEMBER(data_to_i8031); + DECLARE_READ8_MEMBER(data_to_i8031); }; diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c index c795f08c512..60ff432efcb 100644 --- a/src/mame/drivers/megadrvb.c +++ b/src/mame/drivers/megadrvb.c @@ -659,7 +659,7 @@ MACHINE_START_MEMBER(md_boot_state, md_6button) m_io_pad_6b[2] = ioport("IN0"); m_io_pad_6b[3] = ioport("UNK"); - // setup timers for 6 button pads + // setup timers for 6 button pads for (int i = 0; i < 3; i++) m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(FPTR)i); } diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index e3b5158d08f..2f3b2c6f1c1 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -5026,8 +5026,8 @@ ROM_END ROM_START( daytonat )/* Daytona USA (Japan, Turbo hack) */ ROM_REGION( 0x200000, "maincpu", 0 ) // i960 program -// ROM_LOAD32_WORD( "turbo1.12", 0x000000, 0x080000, CRC(0b3d5d4e) SHA1(1660959cb383e22f0d6204547c30cf5fe9272b03) ) /* 4x overdump?, 0x20000 bytes repeat 4 times */ -// ROM_LOAD32_WORD( "turbo2.13", 0x000002, 0x080000, CRC(f7d4e866) SHA1(c8c43904257f718665f9f7a89838eba14bde9465) ) /* 4x overdump?, 0x20000 bytes repeat 4 times */ +// ROM_LOAD32_WORD( "turbo1.12", 0x000000, 0x080000, CRC(0b3d5d4e) SHA1(1660959cb383e22f0d6204547c30cf5fe9272b03) ) /* 4x overdump?, 0x20000 bytes repeat 4 times */ +// ROM_LOAD32_WORD( "turbo2.13", 0x000002, 0x080000, CRC(f7d4e866) SHA1(c8c43904257f718665f9f7a89838eba14bde9465) ) /* 4x overdump?, 0x20000 bytes repeat 4 times */ ROM_LOAD32_WORD( "turbo1.12", 0x000000, 0x020000, CRC(4b41a341) SHA1(daa75f38a11eb16b04550edf53e11f0eaf55cd3e) ) ROM_LOAD32_WORD( "turbo2.13", 0x000002, 0x020000, CRC(6ca580fa) SHA1(102ad6bf5fed4c9c407a9e82d85cff9f15db31c8) ) diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c index 9bd8e155340..c5e778e8fb7 100644 --- a/src/mame/drivers/mpu4vid.c +++ b/src/mame/drivers/mpu4vid.c @@ -309,7 +309,7 @@ public: DECLARE_WRITE16_MEMBER( characteriser16_w ); DECLARE_READ16_MEMBER( characteriser16_r ); DECLARE_WRITE16_MEMBER( bwb_characteriser16_w ); - DECLARE_READ16_MEMBER( bwb_characteriser16_r ); + DECLARE_READ16_MEMBER( bwb_characteriser16_r ); }; /************************************* diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 746dbf1cb68..5d3d9c0ae09 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -1,5 +1,5 @@ /*************************************************************************** - + Namco System II driver by K.Wilkins (Jun1998, Oct1999) Email: kwns2@dysfunction.demon.co.uk @@ -817,7 +817,7 @@ static ADDRESS_MAP_START( c68_default_am, AS_PROGRAM, 8, namcos2_state ) AM_RANGE(0x3002, 0x3002) AM_READ_PORT("MCUDI2") AM_RANGE(0x3003, 0x3003) AM_READ_PORT("MCUDI3") AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dpram_byte_r,dpram_byte_w) AM_SHARE("dpram") - AM_RANGE(0x6000, 0x6fff) AM_READ(ack_mcu_vbl_r) // VBL ack + AM_RANGE(0x6000, 0x6fff) AM_READ(ack_mcu_vbl_r) // VBL ack AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c68", 0) ADDRESS_MAP_END @@ -1426,7 +1426,7 @@ static INPUT_PORTS_START( sgunner ) INPUT_PORTS_END static INPUT_PORTS_START( sgunner2 ) - PORT_START("MCUB") /* M37450 - PORT 5 (multiplexed) */ + PORT_START("MCUB") /* M37450 - PORT 5 (multiplexed) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -1938,11 +1938,11 @@ static MACHINE_CONFIG_START( sgunner2, namcos2_state ) MCFG_CPU_ADD("c68", M37450, C68_CPU_CLOCK) /* C68 @ 8.192MHz (49.152MHz OSC/6) - I/O handling */ MCFG_M3745X_ADC14_CALLBACKS(IOPORT("AN0"), IOPORT("AN1"), IOPORT("AN2"), IOPORT("AN3")) MCFG_M3745X_ADC58_CALLBACKS(IOPORT("AN4"), IOPORT("AN5"), IOPORT("AN6"), IOPORT("AN7")) - MCFG_M3745X_PORT3_CALLBACKS(IOPORT("MCUH"), WRITE8(namcos2_state, c68_p3_w)) // coins/test/service + MCFG_M3745X_PORT3_CALLBACKS(IOPORT("MCUH"), WRITE8(namcos2_state, c68_p3_w)) // coins/test/service MCFG_M3745X_PORT5_CALLBACKS(READ8(namcos2_state, c68_p5_r), NULL) // muxed player 1/2 MCFG_M3745X_PORT6_CALLBACKS(IOPORT("MCUC"), NULL) // unused in sgunner2 MCFG_CPU_PROGRAM_MAP(c68_default_am) - MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_assert) // 37450 maps INT1 to irq0 as it's the first external interrupt on that chip + MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_assert) // 37450 maps INT1 to irq0 as it's the first external interrupt on that chip MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */ diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index f526f732dc6..1f3d39debe4 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -4012,32 +4012,32 @@ ROM_START( crakndj2 ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xa800000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23674.ic22", 0x000000, 0x400000, CRC(54faff5c) SHA1(cd2efcd33f33497e421d319750d2616472f919a4) ) - ROM_LOAD( "rom1.ic1s", 0x0800000, 0x800000, CRC(a6c2f6e7) SHA1(454d3711bf5b7a43c0bc77cd766045394dae9126) ) - ROM_LOAD( "rom2.ic2s", 0x1000000, 0x800000, CRC(f22e29c4) SHA1(d32b4851a314327047f06133b643ce5d5cae5571) ) - ROM_LOAD( "rom3.ic3s", 0x1800000, 0x800000, CRC(6c78efb3) SHA1(37804e444f8077fcfa56135ebfeb3c0ddabad0fa) ) - ROM_LOAD( "rom4.ic4s", 0x2000000, 0x800000, CRC(e9f35177) SHA1(9f8c13e005737f87ef0a0a32f7f0ec436f7aca3b) ) - ROM_LOAD( "rom5.ic5s", 0x2800000, 0x800000, CRC(40f3321d) SHA1(a29b532e2acb9c8d27ae3c857ada48b1a7199d77) ) - ROM_LOAD( "rom6.ic6s", 0x3000000, 0x800000, CRC(6832dd9f) SHA1(753c1fc998ef4522fae3e93b64f8c442d94e3e97) ) + ROM_LOAD( "epr-23674.ic22", 0x000000, 0x400000, CRC(54faff5c) SHA1(cd2efcd33f33497e421d319750d2616472f919a4) ) + ROM_LOAD( "rom1.ic1s", 0x0800000, 0x800000, CRC(a6c2f6e7) SHA1(454d3711bf5b7a43c0bc77cd766045394dae9126) ) + ROM_LOAD( "rom2.ic2s", 0x1000000, 0x800000, CRC(f22e29c4) SHA1(d32b4851a314327047f06133b643ce5d5cae5571) ) + ROM_LOAD( "rom3.ic3s", 0x1800000, 0x800000, CRC(6c78efb3) SHA1(37804e444f8077fcfa56135ebfeb3c0ddabad0fa) ) + ROM_LOAD( "rom4.ic4s", 0x2000000, 0x800000, CRC(e9f35177) SHA1(9f8c13e005737f87ef0a0a32f7f0ec436f7aca3b) ) + ROM_LOAD( "rom5.ic5s", 0x2800000, 0x800000, CRC(40f3321d) SHA1(a29b532e2acb9c8d27ae3c857ada48b1a7199d77) ) + ROM_LOAD( "rom6.ic6s", 0x3000000, 0x800000, CRC(6832dd9f) SHA1(753c1fc998ef4522fae3e93b64f8c442d94e3e97) ) // note: this fails the ROM test on hardware with the same CRC, so it's not a "bad dump" in the traditional sense. // we need someone with a second cartridge to verify if this is a Sega screwup or simply a damaged chip on this cart. - ROM_LOAD( "rom7.ic7s", 0x3800000, 0x800000, BAD_DUMP CRC(9b59e856) SHA1(7da728695cac132bb0ac59116ca400fff913f966) ) - ROM_LOAD( "rom8.ic8s", 0x4000000, 0x800000, CRC(9bea71f4) SHA1(fa3734b072404612e29ed96b3bcb8d416fbe86e3) ) - ROM_LOAD( "rom9.ic9s", 0x4800000, 0x800000, CRC(6029839d) SHA1(04c078e9422bf34a02f0b618a54981cd615da47d) ) - ROM_LOAD( "rom10.ic10s", 0x5000000, 0x800000, CRC(1ad23110) SHA1(1589f6ca1f82c5397c0daef8563efc550d5eb862) ) - ROM_LOAD( "rom11.ic11s", 0x5800000, 0x800000, CRC(e398ee08) SHA1(5a8c48a57127adb9c48ba985d49f169fe2d154a7) ) - ROM_LOAD( "rom12.ic12s", 0x6000000, 0x800000, CRC(5df68891) SHA1(0fc365bd3adab00b132e254847c2804206f0ba3e) ) - ROM_LOAD( "rom13.ic13s", 0x6800000, 0x800000, CRC(2f8e4a60) SHA1(0dc05a77008f18acf9dc5ff51bdc04034de11f5b) ) - ROM_LOAD( "rom14.ic14s", 0x7000000, 0x800000, CRC(83e9dd31) SHA1(7da0092d4b5d1ef3a364e0dfcd611b29f6301d43) ) - ROM_LOAD( "rom15.ic15s", 0x7800000, 0x800000, CRC(1346af29) SHA1(874a5e4e5158405dd8fecc745168f9bfe40154e1) ) - ROM_LOAD( "rom16.ic16s", 0x8000000, 0x800000, CRC(bc63a06a) SHA1(72b06fbba83d291b9b0209741b61f4fdaaef2e2b) ) - ROM_LOAD( "rom17.ic17s", 0x8800000, 0x800000, CRC(512d3ac0) SHA1(a96f17af274336f579f33ec8f474f28073b29286) ) - ROM_LOAD( "rom18.ic18s", 0x9000000, 0x800000, CRC(7007c27e) SHA1(a6bfe89421d34542e780c5eae1c9c6d76f93d252) ) - ROM_LOAD( "rom19.ic19s", 0x9800000, 0x800000, CRC(31f816ba) SHA1(354f8271eef20eb131f83fb9641002cfcd31c8cd) ) - ROM_LOAD( "rom20.ic20s", 0xa000000, 0x800000, CRC(aabcd580) SHA1(9455e218ab381c7ad5adb2884da39ca7948169d5) ) - - ROM_REGION( 4, "rom_key", 0 ) // 317-0311-COM - ROM_LOAD( "crackndj2-key.bin", 0x000000, 0x000004, CRC(b357a848) SHA1(15b5f89583ec2bc65298387a2b8d8e60e71f1617) ) + ROM_LOAD( "rom7.ic7s", 0x3800000, 0x800000, BAD_DUMP CRC(9b59e856) SHA1(7da728695cac132bb0ac59116ca400fff913f966) ) + ROM_LOAD( "rom8.ic8s", 0x4000000, 0x800000, CRC(9bea71f4) SHA1(fa3734b072404612e29ed96b3bcb8d416fbe86e3) ) + ROM_LOAD( "rom9.ic9s", 0x4800000, 0x800000, CRC(6029839d) SHA1(04c078e9422bf34a02f0b618a54981cd615da47d) ) + ROM_LOAD( "rom10.ic10s", 0x5000000, 0x800000, CRC(1ad23110) SHA1(1589f6ca1f82c5397c0daef8563efc550d5eb862) ) + ROM_LOAD( "rom11.ic11s", 0x5800000, 0x800000, CRC(e398ee08) SHA1(5a8c48a57127adb9c48ba985d49f169fe2d154a7) ) + ROM_LOAD( "rom12.ic12s", 0x6000000, 0x800000, CRC(5df68891) SHA1(0fc365bd3adab00b132e254847c2804206f0ba3e) ) + ROM_LOAD( "rom13.ic13s", 0x6800000, 0x800000, CRC(2f8e4a60) SHA1(0dc05a77008f18acf9dc5ff51bdc04034de11f5b) ) + ROM_LOAD( "rom14.ic14s", 0x7000000, 0x800000, CRC(83e9dd31) SHA1(7da0092d4b5d1ef3a364e0dfcd611b29f6301d43) ) + ROM_LOAD( "rom15.ic15s", 0x7800000, 0x800000, CRC(1346af29) SHA1(874a5e4e5158405dd8fecc745168f9bfe40154e1) ) + ROM_LOAD( "rom16.ic16s", 0x8000000, 0x800000, CRC(bc63a06a) SHA1(72b06fbba83d291b9b0209741b61f4fdaaef2e2b) ) + ROM_LOAD( "rom17.ic17s", 0x8800000, 0x800000, CRC(512d3ac0) SHA1(a96f17af274336f579f33ec8f474f28073b29286) ) + ROM_LOAD( "rom18.ic18s", 0x9000000, 0x800000, CRC(7007c27e) SHA1(a6bfe89421d34542e780c5eae1c9c6d76f93d252) ) + ROM_LOAD( "rom19.ic19s", 0x9800000, 0x800000, CRC(31f816ba) SHA1(354f8271eef20eb131f83fb9641002cfcd31c8cd) ) + ROM_LOAD( "rom20.ic20s", 0xa000000, 0x800000, CRC(aabcd580) SHA1(9455e218ab381c7ad5adb2884da39ca7948169d5) ) + + ROM_REGION( 4, "rom_key", 0 ) // 317-0311-COM + ROM_LOAD( "crackndj2-key.bin", 0x000000, 0x000004, CRC(b357a848) SHA1(15b5f89583ec2bc65298387a2b8d8e60e71f1617) ) ROM_END ROM_START( samba2k ) @@ -4494,22 +4494,22 @@ ROM_START( marstv ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x8000000, "rom_board", ROMREGION_ERASEFF) - ROM_LOAD( "epr-22993.ic22", 0x0000000, 0x200000, CRC(6f4acc31) SHA1(22d8dc1526ead0bb18d56b6b2a54840d87838cc5) ) - ROM_LOAD( "mpr-22978.ic1", 0x0800000, 0x800000, CRC(aa8778da) SHA1(d9781e903d4221cf14ffa3f61b05cce7eb453a0f) ) - ROM_LOAD( "mpr-22979.ic2", 0x1000000, 0x800000, CRC(9e6a0b10) SHA1(fd4eed1b2ccc3c0134cf9f64b4a20ad201898fa4) ) - ROM_LOAD( "mpr-22980.ic3", 0x1800000, 0x800000, CRC(82151ac3) SHA1(0bdcac05f7e36aea92ee15519406d6b4efef2a93) ) - ROM_LOAD( "mpr-22981.ic4", 0x2000000, 0x800000, CRC(3832e88a) SHA1(c917ddc96b8078acfb671024f8787b4302b279df) ) - ROM_LOAD( "mpr-22982.ic5", 0x2800000, 0x800000, CRC(dcbee0aa) SHA1(c073a6736c993c30346ef03f0019997e7ae48ef9) ) - ROM_LOAD( "mpr-22983.ic6", 0x3000000, 0x800000, CRC(9abf4bd8) SHA1(845cf6deda3be33aea683ed8b9026f02ad79771b) ) - ROM_LOAD( "mpr-22984.ic7", 0x3800000, 0x800000, CRC(9e0b73a0) SHA1(43bdbea3f7ebc48922db9b374e9f3bfbffd3d9c4) ) - ROM_LOAD( "mpr-22985.ic8", 0x4000000, 0x800000, CRC(886b6255) SHA1(9b5592a95d5da2efaecd8153925d3772a5a4cce9) ) - ROM_LOAD( "mpr-22986.ic9", 0x4800000, 0x800000, CRC(3b28e1d5) SHA1(c7dbd9a30ddf3b2b9e1cde904614d64ed46e6b53) ) - ROM_LOAD( "mpr-22987.ic10", 0x5000000, 0x800000, CRC(62cbad4b) SHA1(08de209618ca5d2df852488ddce5d41ee34d309d) ) - ROM_LOAD( "mpr-22988.ic11", 0x5800000, 0x800000, CRC(72b40a0e) SHA1(f78f96f43546fdc1f42163d2632cea194666f71f) ) - ROM_LOAD( "mpr-22989.ic12s", 0x6000000, 0x800000, CRC(b2cc74e7) SHA1(4f2181923be17dc18233c9a6ef8bedc147ecd89f) ) - ROM_LOAD( "mpr-22990.ic13s", 0x6800000, 0x800000, CRC(653dc7ad) SHA1(337a3363502e9326ca412df4b939fa4d0d897e7a) ) - ROM_LOAD( "mpr-22991.ic14s", 0x7000000, 0x800000, CRC(0c20f313) SHA1(ac335d3015ef348c91319ae0e98b79a60e92f452) ) - ROM_LOAD( "mpr-22992.ic15s", 0x7800000, 0x800000, CRC(5eb6c4c6) SHA1(5dc1bced7ebd7d7e01f74d03706ec4a96585628d) ) + ROM_LOAD( "epr-22993.ic22", 0x0000000, 0x200000, CRC(6f4acc31) SHA1(22d8dc1526ead0bb18d56b6b2a54840d87838cc5) ) + ROM_LOAD( "mpr-22978.ic1", 0x0800000, 0x800000, CRC(aa8778da) SHA1(d9781e903d4221cf14ffa3f61b05cce7eb453a0f) ) + ROM_LOAD( "mpr-22979.ic2", 0x1000000, 0x800000, CRC(9e6a0b10) SHA1(fd4eed1b2ccc3c0134cf9f64b4a20ad201898fa4) ) + ROM_LOAD( "mpr-22980.ic3", 0x1800000, 0x800000, CRC(82151ac3) SHA1(0bdcac05f7e36aea92ee15519406d6b4efef2a93) ) + ROM_LOAD( "mpr-22981.ic4", 0x2000000, 0x800000, CRC(3832e88a) SHA1(c917ddc96b8078acfb671024f8787b4302b279df) ) + ROM_LOAD( "mpr-22982.ic5", 0x2800000, 0x800000, CRC(dcbee0aa) SHA1(c073a6736c993c30346ef03f0019997e7ae48ef9) ) + ROM_LOAD( "mpr-22983.ic6", 0x3000000, 0x800000, CRC(9abf4bd8) SHA1(845cf6deda3be33aea683ed8b9026f02ad79771b) ) + ROM_LOAD( "mpr-22984.ic7", 0x3800000, 0x800000, CRC(9e0b73a0) SHA1(43bdbea3f7ebc48922db9b374e9f3bfbffd3d9c4) ) + ROM_LOAD( "mpr-22985.ic8", 0x4000000, 0x800000, CRC(886b6255) SHA1(9b5592a95d5da2efaecd8153925d3772a5a4cce9) ) + ROM_LOAD( "mpr-22986.ic9", 0x4800000, 0x800000, CRC(3b28e1d5) SHA1(c7dbd9a30ddf3b2b9e1cde904614d64ed46e6b53) ) + ROM_LOAD( "mpr-22987.ic10", 0x5000000, 0x800000, CRC(62cbad4b) SHA1(08de209618ca5d2df852488ddce5d41ee34d309d) ) + ROM_LOAD( "mpr-22988.ic11", 0x5800000, 0x800000, CRC(72b40a0e) SHA1(f78f96f43546fdc1f42163d2632cea194666f71f) ) + ROM_LOAD( "mpr-22989.ic12s", 0x6000000, 0x800000, CRC(b2cc74e7) SHA1(4f2181923be17dc18233c9a6ef8bedc147ecd89f) ) + ROM_LOAD( "mpr-22990.ic13s", 0x6800000, 0x800000, CRC(653dc7ad) SHA1(337a3363502e9326ca412df4b939fa4d0d897e7a) ) + ROM_LOAD( "mpr-22991.ic14s", 0x7000000, 0x800000, CRC(0c20f313) SHA1(ac335d3015ef348c91319ae0e98b79a60e92f452) ) + ROM_LOAD( "mpr-22992.ic15s", 0x7800000, 0x800000, CRC(5eb6c4c6) SHA1(5dc1bced7ebd7d7e01f74d03706ec4a96585628d) ) ROM_REGION( 4, "rom_key", 0 ) // 317-0274-JPN ROM_LOAD( "marstv-key.bin", 0x000000, 0x000004, CRC(45c683ab) SHA1(1af2a582b54459eb1db56f5d3502917bb012d313) ) @@ -8090,7 +8090,7 @@ ROM_END /* 0021-01 */ GAME( 2000,virnba, naomi, naomi, naomi, naomi_state, naomi, ROT0, "Sega", "Virtua NBA (JPN, USA, EXP, KOR, AUS)", GAME_FLAGS ) /* 0022 */ GAME( 2000, tduno2, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Touch de Uno! 2", GAME_UNEMULATED_PROTECTION|GAME_FLAGS ) /* 0023 */ GAME( 2000, 18wheelr, naomi, naomim2, 18wheelr, naomi_state, naomi, ROT0, "Sega", "18 Wheeler Deluxe (Rev A) (JPN)", GAME_FLAGS ) -/* 0025 */ GAME( 2000, marstv, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Mars TV (JPN)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS ) +/* 0025 */ GAME( 2000, marstv, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Mars TV (JPN)", GAME_UNEMULATED_PROTECTION|GAME_FLAGS ) /* 0026 */ GAME( 2000, totd, naomi, naomi, naomi, naomi_state, naomi, ROT0, "Sega", "The Typing of the Dead (JPN, USA, EXP, KOR, AUS) (Rev A)", GAME_FLAGS ) /* 0027 */ GAME( 2000, smarinef, naomi, naomi, naomi, naomi_state, naomi, ROT0, "Sega", "Sega Marine Fishing", GAME_FLAGS ) /* 0028 */ GAME( 2000, vonot, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Virtual On Oratorio Tangram M.S.B.S. ver5.66 2000 Edition", GAME_UNEMULATED_PROTECTION|GAME_FLAGS ) diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index b1bf37aa49d..4f725117e32 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -24,14 +24,14 @@ class powerbal_state : public playmark_state public: powerbal_state(const machine_config &mconfig, device_type type, const char *tag) : playmark_state(mconfig, type, tag), - m_eeprom(*this, "eeprom") { } - + m_eeprom(*this, "eeprom") { } + /* powerbal-specific */ int m_tilebank; int m_bg_yoffset; optional_device<eeprom_device> m_eeprom; - + DECLARE_DRIVER_INIT(powerbal); DECLARE_DRIVER_INIT(magicstk); TILE_GET_INFO_MEMBER(powerbal_get_bg_tile_info); @@ -39,14 +39,14 @@ public: DECLARE_MACHINE_RESET(powerbal); DECLARE_VIDEO_START(powerbal); UINT32 screen_update_powerbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites_powerbal( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void draw_sprites_powerbal( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE16_MEMBER(magicstk_coin_eeprom_w); DECLARE_WRITE16_MEMBER(magicstk_bgvideoram_w); DECLARE_WRITE16_MEMBER(tile_banking_w); - DECLARE_WRITE16_MEMBER(oki_banking); + DECLARE_WRITE16_MEMBER(oki_banking); }; - - + + static const eeprom_interface eeprom_intf = { 6, /* address bits */ diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c index 2126cc12733..a6d762b72a1 100644 --- a/src/mame/drivers/proconn.c +++ b/src/mame/drivers/proconn.c @@ -1421,5 +1421,5 @@ GAME( 199?, pr_gnuc ,0 ,proconn ,proconn , proconn_state, GAME( 199?, pr_gnuca ,pr_gnuc ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Coinworld", "Golden Nugget (Version 1.2) (Coinworld)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, pr_magln ,0 ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Coinworld", "Magic Lines (Version 2.1) (Coinworld)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, pr_maglna ,pr_magln ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Coinworld", "Magic Lines (Version 1.1) (Coinworld)",GAME_IS_SKELETON_MECHANICAL ) -GAME( 199?, pr_wnstk ,0 ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Coinworld", "Winning Streak (Version 1.1) (Coinworld)",GAME_IS_SKELETON_MECHANICAL ) +GAME( 199?, pr_wnstk ,0 ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Coinworld", "Winning Streak (Version 1.1) (Coinworld)",GAME_IS_SKELETON_MECHANICAL ) GAME( 199?, pr_swop ,0 ,proconn ,proconn , proconn_state,proconn ,ROT0 ,"Ace", "Swop It (Ace)",GAME_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index 4c84ab2c4a3..eea8fe812bc 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -403,7 +403,7 @@ MACHINE_RESET_MEMBER(sangho_state,sexyboom) } WRITE_LINE_MEMBER(sangho_state::msx_vdp_interrupt) -{ +{ machine().device("maincpu")->execute().set_input_line(0, (state ? HOLD_LINE : CLEAR_LINE)); } diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 0dae0004875..3d29a2b564d 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -83,7 +83,7 @@ public: void sfkick_remap_banks(); void sfkick_bank_set(int num, int data); DECLARE_WRITE_LINE_MEMBER(irqhandler); - DECLARE_WRITE_LINE_MEMBER(sfkick_vdp_interrupt); + DECLARE_WRITE_LINE_MEMBER(sfkick_vdp_interrupt); }; diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 158f982b7c1..4f90f89efa1 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -220,7 +220,7 @@ static INPUT_PORTS_START( shangha3 ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") PORT_START("DSW1") /* Dipswitch locations assigned as per service mode */ - PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3") + PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3") PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) @@ -229,7 +229,7 @@ static INPUT_PORTS_START( shangha3 ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SWA:4,5,6") + PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SWA:4,5,6") PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) @@ -238,33 +238,33 @@ static INPUT_PORTS_START( shangha3 ) PORT_DIPSETTING( 0x18, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:7") + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:8") + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWA:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("DSW2") /* Dipswitch locations assigned as per service mode */ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:1,2") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:1,2") PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x02, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x0c, 0x0c, "Base Time" ) PORT_DIPLOCATION("SWB:3,4") + PORT_DIPNAME( 0x0c, 0x0c, "Base Time" ) PORT_DIPLOCATION("SWB:3,4") PORT_DIPSETTING( 0x04, "70 sec" ) PORT_DIPSETTING( 0x0c, "80 sec" ) PORT_DIPSETTING( 0x08, "90 sec" ) PORT_DIPSETTING( 0x00, "100 sec" ) - PORT_DIPNAME( 0x30, 0x30, "Additional Time" ) PORT_DIPLOCATION("SWB:5,6") + PORT_DIPNAME( 0x30, 0x30, "Additional Time" ) PORT_DIPLOCATION("SWB:5,6") PORT_DIPSETTING( 0x10, "4 sec" ) PORT_DIPSETTING( 0x30, "5 sec" ) PORT_DIPSETTING( 0x20, "6 sec" ) PORT_DIPSETTING( 0x00, "7 sec" ) - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:7") + PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:7") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWB:8") + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWB:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END @@ -299,30 +299,30 @@ static INPUT_PORTS_START( heberpop ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("DSW") /* Dipswitch locations assigned as per service mode */ - PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") + PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Very_Easy) ) PORT_DIPSETTING( 0x0001, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3") + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:3") PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, "Allow Diagonal Moves" ) PORT_DIPLOCATION("SW1:5") + PORT_DIPNAME( 0x0010, 0x0010, "Allow Diagonal Moves" ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x0000, DEF_STR( No ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:6") + PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0020, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7") + PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") + PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0400, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0200, DEF_STR( 3C_1C ) ) @@ -331,7 +331,7 @@ static INPUT_PORTS_START( heberpop ) PORT_DIPSETTING( 0x0300, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0100, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x3800, 0x3800, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:4,5,6") + PORT_DIPNAME( 0x3800, 0x3800, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:4,5,6") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x2000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x1000, DEF_STR( 3C_1C ) ) @@ -340,10 +340,10 @@ static INPUT_PORTS_START( heberpop ) PORT_DIPSETTING( 0x1800, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x2800, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0800, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") + PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8") + PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) INPUT_PORTS_END @@ -379,26 +379,26 @@ static INPUT_PORTS_START( blocken ) PORT_START("DSW") /* Dipswitch locations assigned as per service mode */ PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" ) - PORT_DIPNAME( 0x0006, 0x0006, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2,3") + PORT_DIPNAME( 0x0006, 0x0006, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:2,3") PORT_DIPSETTING( 0x0004, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0006, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) ) - PORT_DIPNAME( 0x0008, 0x0008, "Game Type" ) PORT_DIPLOCATION("SW1:4") + PORT_DIPNAME( 0x0008, 0x0008, "Game Type" ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x0008, "A" ) PORT_DIPSETTING( 0x0000, "B" ) - PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Players ) ) PORT_DIPLOCATION("SW1:5,6") + PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Players ) ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x0030, "1" ) PORT_DIPSETTING( 0x0020, "2" ) PORT_DIPSETTING( 0x0010, "3" ) PORT_DIPSETTING( 0x0000, "4" ) - PORT_DIPNAME( 0x0040, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7") + PORT_DIPNAME( 0x0040, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7") PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8") + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") + PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0200, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0500, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0800, DEF_STR( 2C_1C ) ) @@ -415,7 +415,7 @@ static INPUT_PORTS_START( blocken ) PORT_DIPSETTING( 0x0a00, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x0900, DEF_STR( 1C_7C ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) ) - PORT_DIPNAME( 0xf000, 0xf000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:5,6,7,8") + PORT_DIPNAME( 0xf000, 0xf000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:5,6,7,8") PORT_DIPSETTING( 0x2000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x5000, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x8000, DEF_STR( 2C_1C ) ) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 016e8bc01a8..a21089399d8 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2778,7 +2778,7 @@ static MACHINE_CONFIG_DERIVED( stmblade, ssv ) MCFG_CPU_DATA_MAP(dsp_data_map) /* don't need this, game just does a simple check at boot then the DSP stalls into a tight loop. */ -// MCFG_QUANTUM_PERFECT_CPU("maincpu") +// MCFG_QUANTUM_PERFECT_CPU("maincpu") MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c index 58050ef78b5..eb67c1eb668 100644 --- a/src/mame/drivers/supercrd.c +++ b/src/mame/drivers/supercrd.c @@ -526,9 +526,9 @@ ROM_END */ ROM_START( fruitstr ) ROM_REGION( 0x18000, "maincpu", 0 ) - ROM_LOAD( "fruitstar_t10s-i-1.ic37", 0x0000, 0x8000, CRC(cd458e9f) SHA1(3fdf59360704ae1550c108c59907067fc7c8424c) ) // 1st half: empty; 2nd half: program (1st half) + ROM_LOAD( "fruitstar_t10s-i-1.ic37", 0x0000, 0x8000, CRC(cd458e9f) SHA1(3fdf59360704ae1550c108c59907067fc7c8424c) ) // 1st half: empty; 2nd half: program (1st half) ROM_CONTINUE( 0x0000, 0x8000) - ROM_LOAD( "fruitstar_t10s-i-2.ic51", 0x8000, 0x8000, CRC(4536976b) SHA1(9a0ef6245e5aedfdb690df4c6d7a32ebf1b22590) ) // 1st half: program (2nd half); 2nd half: empty + ROM_LOAD( "fruitstar_t10s-i-2.ic51", 0x8000, 0x8000, CRC(4536976b) SHA1(9a0ef6245e5aedfdb690df4c6d7a32ebf1b22590) ) // 1st half: program (2nd half); 2nd half: empty ROM_IGNORE( 0x8000) ROM_REGION( 0x20000, "gfxtemp", 0 ) diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 590899fd8b2..9db72f6093d 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -320,7 +320,7 @@ Notes: 320C51 - 40.000MHz (pin96 X2/CLKIN. 10MHz*4, source = CY7C991) OTISR2 - 3.80950MHz (pin12) ES5510 - 2.22MHz, 2.666MHz, 3.8095125MHz (30.4761/8), 8.000MHz (16/2) - + Bottom board: JCG DAUGHTERL PCB-C K9100633A J9100434A (Sticker K91J0633A) |---------------------------------------------------------------------------------| @@ -367,7 +367,7 @@ Notes: ROMs .30-.31 are 27C2001, sound program. ROM .65 is 27C512, linked to 68HC11 MCU * Unpopulated socket. - + Measurements: 68HC11 - 8.000MHz (16/2 on pin74) diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 1335bce9ff1..71db1dca43f 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -429,7 +429,7 @@ void topspeed_state::topspeed_msm5205_clock( device_t *device, int chip ) UINT8 data = m_msm_rom[chip][m_msm_pos[chip]]; msm5205_data_w(device, m_msm_sel[chip] ? data & 0xf : data >> 4 & 0xf); - m_msm_pos[chip] += m_msm_sel[chip]; + m_msm_pos[chip] += m_msm_sel[chip]; m_msm_sel[chip] ^= 1; if ((m_msm_pos[chip]) == m_msm_loop[chip]) diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 0737f23e95f..db7171040c6 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -491,7 +491,7 @@ public: DECLARE_READ16_MEMBER( amiga_ar23_mode_r ); DECLARE_WRITE16_MEMBER( amiga_ar23_mode_w ); void amiga_ar23_init( running_machine &machine, int ar3 ); - + }; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index e2ba5416c16..4be75acafa3 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -209,4 +209,3 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(sound_irq_gen); }; - diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 9b9176ecb0b..53fe6377108 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -110,7 +110,7 @@ class dc_state : public driver_device DECLARE_WRITE64_MEMBER( dc_modem_w ); DECLARE_READ64_MEMBER( dc_rtc_r ); DECLARE_WRITE64_MEMBER( dc_rtc_w ); - + }; /*--------- Ch2-DMA Control Registers ----------*/ diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 9f5856fc8ba..b5b072dcb5f 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -102,5 +102,5 @@ public: int scanline_to_vcount( int scanline ); void dd_adpcm_int(device_t *device, int chip); DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_1); - DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_2); + DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_2); }; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index aee524d24a2..c5c7ed98e1f 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -50,5 +50,5 @@ public: UINT32 screen_update_docastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void video_start_common( UINT32 tile_transmask ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(idsoccer_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(idsoccer_adpcm_int); }; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 23d3c356cb2..1cc377123b6 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -277,7 +277,7 @@ public: INTERRUPT_GEN_MEMBER(jantouki_vblank_interrupt); INTERRUPT_GEN_MEMBER(jantouki_sound_vblank_interrupt); INTERRUPT_GEN_MEMBER(yarunara_clock_interrupt); - INTERRUPT_GEN_MEMBER(mjelctrn_vblank_interrupt); + INTERRUPT_GEN_MEMBER(mjelctrn_vblank_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(neruton_irq_scanline); TIMER_DEVICE_CALLBACK_MEMBER(majxtal7_vblank_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(tenkai_interrupt); @@ -287,7 +287,7 @@ public: DECLARE_WRITE_LINE_MEMBER(jantouki_sound_callback); DECLARE_WRITE_LINE_MEMBER(adpcm_int); DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1); - + DECLARE_MACHINE_RESET(adpcm); DECLARE_WRITE8_MEMBER(adpcm_reset_w); DECLARE_MACHINE_START(gekisha); @@ -318,7 +318,7 @@ public: void jantouki_blitter2_start( int flags ); void jantouki_copylayer( bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int y ); void mjdialq2_copylayer( bitmap_ind16 &bitmap, const rectangle &cliprect, int i ); - void hanamai_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i ); + void hanamai_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i ); int debug_mask(); int debug_viewer( bitmap_ind16 &bitmap, const rectangle &cliprect ); void dynax_common_reset(); diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index f887184fdc3..3cd454b2317 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -93,5 +93,5 @@ public: inline void get_fromance_tile_info( tile_data &tileinfo, int tile_index, int layer ); inline void get_nekkyoku_tile_info( tile_data &tileinfo, int tile_index, int layer ); void init_common( ); - DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int); }; diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 2b714500f89..9cf6b9aaf5b 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -80,7 +80,7 @@ public: ioport_port *m_io_pad_3b[4]; ioport_port *m_io_pad_6b[4]; - int m_other_hacks; // misc hacks + int m_other_hacks; // misc hacks genesis_z80_vars m_genz80; int m_pal; int m_export; @@ -97,7 +97,7 @@ public: void megadriv_init_common(); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( _32x_cart ); - + void megadriv_z80_bank_w(UINT16 data); DECLARE_WRITE16_MEMBER( megadriv_68k_z80_bank_write ); DECLARE_WRITE8_MEMBER(megadriv_z80_z80_bank_w); @@ -116,9 +116,9 @@ public: DECLARE_READ8_MEMBER( z80_unmapped_port_r ); DECLARE_WRITE8_MEMBER( z80_unmapped_port_w ); DECLARE_READ8_MEMBER( z80_unmapped_r ); - DECLARE_WRITE8_MEMBER( z80_unmapped_w ); + DECLARE_WRITE8_MEMBER( z80_unmapped_w ); TIMER_CALLBACK_MEMBER(megadriv_z80_run_state); - + /* Megadrive / Genesis has 3 I/O ports */ emu_timer *m_io_timeout[3]; int m_io_stage[3]; @@ -127,7 +127,7 @@ public: UINT8 m_megadrive_io_tx_regs[3]; read8_delegate m_megadrive_io_read_data_port_ptr; write16_delegate m_megadrive_io_write_data_port_ptr; - + TIMER_CALLBACK_MEMBER( io_timeout_timer_callback ); void megadrive_reset_io(); @@ -144,16 +144,16 @@ public: void megadrive_io_write_ctrl_port(int portnum, UINT16 data); void megadrive_io_write_tx_port(int portnum, UINT16 data); void megadrive_io_write_rx_port(int portnum, UINT16 data); - void megadrive_io_write_sctrl_port(int portnum, UINT16 data); - - void megadriv_stop_scanline_timer(); - + void megadrive_io_write_sctrl_port(int portnum, UINT16 data); + + void megadriv_stop_scanline_timer(); + DECLARE_MACHINE_START( megadriv ); DECLARE_MACHINE_RESET( megadriv ); DECLARE_VIDEO_START( megadriv ); UINT32 screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_megadriv(screen_device &screen, bool state); - + }; class md_boot_state : public md_base_state @@ -181,7 +181,7 @@ public: DECLARE_READ16_MEMBER( mk3mdb_dsw_r ); DECLARE_READ16_MEMBER( ssf2mdb_dsw_r ); DECLARE_READ16_MEMBER( srmdb_dsw_r ); - DECLARE_READ16_MEMBER( topshoot_200051_r ); + DECLARE_READ16_MEMBER( topshoot_200051_r ); DECLARE_READ16_MEMBER(puckpkmna_70001c_r); DECLARE_READ16_MEMBER(puckpkmna_4b2476_r); @@ -253,8 +253,8 @@ public: UINT32 screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); int m_segac2_bg_pal_lookup[4]; int m_segac2_sp_pal_lookup[4]; - void recompute_palette_tables(); - + void recompute_palette_tables(); + DECLARE_WRITE16_MEMBER( segac2_upd7759_w ); DECLARE_READ16_MEMBER( palette_r ); DECLARE_WRITE16_MEMBER( palette_w ); @@ -265,7 +265,7 @@ public: DECLARE_WRITE16_MEMBER( prot_w ); DECLARE_WRITE16_MEMBER( counter_timer_w ); DECLARE_READ16_MEMBER( printer_r ); - DECLARE_WRITE16_MEMBER( print_club_camera_w ); + DECLARE_WRITE16_MEMBER( print_club_camera_w ); DECLARE_READ16_MEMBER(ichirjbl_prot_r); DECLARE_WRITE_LINE_MEMBER(segac2_irq2_interrupt); }; @@ -309,7 +309,7 @@ public: UINT32 screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_megaplay(screen_device &screen, bool state); - + DECLARE_READ8_MEMBER( megaplay_bios_banksel_r ); DECLARE_WRITE8_MEMBER( megaplay_bios_banksel_w ); DECLARE_READ8_MEMBER( megaplay_bios_gamesel_r ); @@ -329,7 +329,7 @@ public: DECLARE_WRITE8_MEMBER( megaplay_game_w ); void mplay_start(); DECLARE_READ16_MEMBER( megadriv_68k_read_z80_extra_ram ); - DECLARE_WRITE16_MEMBER( megadriv_68k_write_z80_extra_ram ); + DECLARE_WRITE16_MEMBER( megadriv_68k_write_z80_extra_ram ); }; class mtech_state : public md_base_state @@ -370,9 +370,9 @@ public: UINT32 screen_update_mtnew(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_mtnew(screen_device &screen, bool state); UINT32 screen_update_megatech_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - + void megatech_set_megadrive_z80_as_megadrive_z80(const char* tag); - + DECLARE_READ8_MEMBER( megatech_cart_select_r ); TIMER_CALLBACK_MEMBER( megatech_z80_run_state ); TIMER_CALLBACK_MEMBER( megatech_z80_stop_state ); diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 211950af82f..7e0a4d704d2 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -119,7 +119,7 @@ public: TIMER_CALLBACK_MEMBER(adc_done_callback); DECLARE_WRITE8_MEMBER(micro3d_upd7759_w); DECLARE_WRITE8_MEMBER(data_from_i8031); - DECLARE_READ8_MEMBER(data_to_i8031); + DECLARE_READ8_MEMBER(data_to_i8031); }; struct micro3d_vtx diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h index 9fea632c31c..f13670600f8 100644 --- a/src/mame/includes/naomi.h +++ b/src/mame/includes/naomi.h @@ -22,7 +22,7 @@ class naomi_state : public dc_state pvr2_framebuffer_ram(*this, "frameram2"), elan_ram(*this, "elan_ram"), m_awflash(*this, "awflash"), - m_eeprom(*this, "main_eeprom") { } + m_eeprom(*this, "main_eeprom") { } /* Naomi 2 specific (To be moved) */ optional_shared_ptr<UINT64> pvr2_texture_ram; @@ -30,7 +30,7 @@ class naomi_state : public dc_state optional_shared_ptr<UINT64> elan_ram; optional_device<macronix_29l001mc_device> m_awflash; optional_device<eeprom_device> m_eeprom; - + DECLARE_WRITE_LINE_MEMBER(aica_irq); DECLARE_MACHINE_RESET(naomi); DECLARE_DRIVER_INIT(atomiswave); @@ -48,7 +48,7 @@ class naomi_state : public dc_state DECLARE_DRIVER_INIT(kick4csh); DECLARE_DRIVER_INIT(vf4evoct); DECLARE_DRIVER_INIT(naomi_mp); - DECLARE_DRIVER_INIT(mvsc2); + DECLARE_DRIVER_INIT(mvsc2); DECLARE_READ64_MEMBER( naomi_arm_r ); DECLARE_WRITE64_MEMBER( naomi_arm_w ); @@ -64,7 +64,7 @@ class naomi_state : public dc_state DECLARE_WRITE64_MEMBER( aw_modem_w ); inline int decode_reg32_64(UINT32 offset, UINT64 mem_mask, UINT64 *shift); - + int jvsboard_type; UINT16 actel_id; diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 86cc2bef862..ccb43efc03f 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -73,5 +73,5 @@ public: UINT32 screen_update_ojankohs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_ojankoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ojankoc_flipscreen( address_space &space, int data ); - DECLARE_WRITE_LINE_MEMBER(ojankohs_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(ojankohs_adpcm_int); }; diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h index a48c1c0760c..f1f8ccad317 100644 --- a/src/mame/includes/pk8000.h +++ b/src/mame/includes/pk8000.h @@ -3,7 +3,7 @@ class pk8000_base_state : public driver_device public: pk8000_base_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) { } - + DECLARE_READ8_MEMBER(pk8000_video_color_r); DECLARE_WRITE8_MEMBER(pk8000_video_color_w); DECLARE_READ8_MEMBER(pk8000_text_start_r); @@ -23,7 +23,7 @@ public: virtual void palette_init(); UINT32 pk8000_video_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *videomem); -protected: +protected: UINT8 m_pk8000_text_start; UINT8 m_pk8000_chargen_start; UINT8 m_pk8000_video_start; @@ -32,5 +32,5 @@ protected: UINT8 m_pk8000_video_mode; UINT8 m_pk8000_video_color; UINT8 m_pk8000_color[32]; - UINT8 m_pk8000_video_enable; + UINT8 m_pk8000_video_enable; }; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 39f47b28021..0c547f05733 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -53,5 +53,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); void spd_adpcm_int(device_t *device, int chip); DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_1); - DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_2); + DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_2); }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 0c9a6c3e7ae..269ce8745d1 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -53,4 +53,3 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int); }; - diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index cc5d0940982..9777aef409f 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -57,5 +57,5 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); void tbowl_adpcm_int(device_t *device, int chip); DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_1); - DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_2); + DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_2); }; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 478d8cb1029..89a0c529cf2 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -51,5 +51,5 @@ public: UINT32 screen_update_tecmo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); - DECLARE_WRITE_LINE_MEMBER(tecmo_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(tecmo_adpcm_int); }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 9beb2e784c3..508de06119b 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -50,5 +50,5 @@ public: TIMER_CALLBACK_MEMBER(reset_callback); void gridiron_draw_led(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 led,int player); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(tehkanwc_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(tehkanwc_adpcm_int); }; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index ee45c3c5969..c87c95671e0 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -66,5 +66,5 @@ public: void reset_sound_region( ); void topspeed_msm5205_clock(device_t *device, int chip); DECLARE_WRITE_LINE_MEMBER(topspeed_msm5205_vck_1); - DECLARE_WRITE_LINE_MEMBER(topspeed_msm5205_vck_2); + DECLARE_WRITE_LINE_MEMBER(topspeed_msm5205_vck_2); }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 5cb29ca1792..387abced4a8 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -42,5 +42,5 @@ public: UINT32 screen_update_wc90b(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); DECLARE_WRITE_LINE_MEMBER(irqhandler); - DECLARE_WRITE_LINE_MEMBER(adpcm_int); + DECLARE_WRITE_LINE_MEMBER(adpcm_int); }; diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 543d676fb20..da1827ef222 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -136,7 +136,7 @@ public: int blitter_core(address_space &space, int sstart, int dstart, int w, int h, int data); inline void update_blaster_banking(); void defender_install_io_space(address_space &space); - + /* older-Williams routines */ DECLARE_WRITE_LINE_MEMBER(williams_main_irq); DECLARE_WRITE_LINE_MEMBER(williams_main_firq); diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 92f39057e2b..e50779ec087 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -40,5 +40,5 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_yunsung8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); + DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); }; diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index 1a8ac03b812..30e766bcbcd 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -288,7 +288,6 @@ MACHINE_START_MEMBER(amiga_state,amiga) MACHINE_RESET_MEMBER(amiga_state,amiga) { - /* set m68k reset function */ m68k_set_reset_callback(m_maincpu, amiga_m68k_reset); diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index 8ea96cb0143..c5975bab6bf 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -716,7 +716,7 @@ TIMER_CALLBACK_MEMBER(dc_state::dc_rtc_increment) /* fill the RTC registers with the proper start-up values */ void dc_state::rtc_initial_setup() -{ +{ static UINT32 current_time; static int year_count,cur_year,i; static const int month_to_day_conversion[12] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index c696cf38bf9..a8bb862dc9e 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -143,7 +143,7 @@ MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2) /* reset POSIRQ timer */ namcos2_posirq_timer->adjust(attotime::never); - + m_player_mux = 0; } diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c index 2e0effbc4de..191290d6ffa 100644 --- a/src/mame/machine/naomi.c +++ b/src/mame/machine/naomi.c @@ -346,4 +346,3 @@ DRIVER_INIT_MEMBER(naomi_state,hotd2) } // f355 PC=0xc065f7c RAM=0xc26dafc - diff --git a/src/mame/machine/naomicrypt.c b/src/mame/machine/naomicrypt.c index 94b8af5baf8..0ad2935d386 100644 --- a/src/mame/machine/naomicrypt.c +++ b/src/mame/machine/naomicrypt.c @@ -57,7 +57,7 @@ static const struct game_keys keys_table[] = { "tduno2", 0x2f6f0f8d }, // 840-0022 2000 { "18wheelr", 0x0007cf54 }, // 840-0023 2000 { "18wheels", 0x0007cf54 }, // ^ - { "marstv", 0x000b8ef5 }, // 840-0025 2000 + { "marstv", 0x000b8ef5 }, // 840-0025 2000 { "vonot", 0x00010715 }, // 840-0028 2000 { "sstrkfgt", 0x00132303 }, // 840-0035 2000 { "wwfroyal", 0x001627c3 }, // 840-0040 2000 @@ -68,7 +68,7 @@ static const struct game_keys keys_table[] = { "samba2k", 0x001702cf }, // 840-0047 2000 { "alienfnt", 0x00174343 }, // 840-0048 2001 { "alienfnta", 0x00174343 }, // ^ - { "crakndj2", 0x00428247 }, // + { "crakndj2", 0x00428247 }, // { "ringout", 0x000b1e40 }, // 840-004C 1999 { "vf4cart", 0x02ef2f96 }, // 840-0080 2002 { "pstone", 0x000e69c1 }, // 841-0001 1999 diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 402471f1570..29eb7fce60b 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -4236,7 +4236,7 @@ endurob2 // (c) 1985 (Beta bootleg) endurobl // (c) 1985 (Herb bootleg) hangon // (c) 1985 (Rev A) hangon1 // (c) 1985 -hangon2 // (c) 1985 +hangon2 // (c) 1985 sharrier // (c) 1985 sharrier1 // (c) 1985 shangonro // (c) 1987 (FD1094, decrypted) @@ -4988,7 +4988,7 @@ derbyoc // 1999.10 Derby Owners Club (Rev B) doa2 // 1999.11 Dead or Alive 2 dybb99 // 1999.11 Dynamite Baseball '99 (Rev B) otrigger // 1999.11 OutTrigger -marstv // 1999.12 Mars TV +marstv // 1999.12 Mars TV puyoda // 1999.12 Puyo Puyo Da! samba // 1999.12 Samba de Amigo (Rev B) vtennis // 1999.12 Virtua Tennis / Power Smash (cartridge) @@ -5051,7 +5051,7 @@ dygolf // 2001.04 Dynamic Golf / Virtua Golf (Rev A) monkeyba // 2001.05 Monkey Ball zerogu2 // 2001.05 Zero Gunner 2 cvsgd // 2001.06 Capcom Vs. SNK Millennium Fight 2000 Pro -crakndj2 // 2001.06 Crackin' DJ Part 2 +crakndj2 // 2001.06 Crackin' DJ Part 2 hmgeo // 2001.06 Heavy Metal Geomatrix (Rev A) wsbbgd // 2001.06 Super Major League / World Series Baseball starseek // 2001.07 Dokidoki Idol Star Seeker diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 58c388269c9..b77f8413fcb 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -2418,6 +2418,6 @@ $(VIDEO)/n64.o: $(MAMESRC)/video/rdpfiltr.c $(DRIVERS)/bfm_sc4.o: $(MAMESRC)/includes/bfm_sc45.h $(DRIVERS)/bfm_sc5.o: $(MAMESRC)/includes/bfm_sc45.h $(DRIVERS)/namcos2.o: $(MAMESRC)/includes/namcos2.h -$(MACHINE)/namcos2.o: $(MAMESRC)/includes/namcos2.h -$(VIDEO)/namcos2.o: $(MAMESRC)/includes/namcos2.h +$(MACHINE)/namcos2.o: $(MAMESRC)/includes/namcos2.h +$(VIDEO)/namcos2.o: $(MAMESRC)/includes/namcos2.h diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c index 6e0da7f271b..7a3a8648c58 100644 --- a/src/mame/video/amiga.c +++ b/src/mame/video/amiga.c @@ -209,7 +209,7 @@ int amiga_copper_execute_next(running_machine &machine, int xpos) state->amiga_custom_w(*state->m_maincpu_program_space, state->m_copper_pending_offset, state->m_copper_pending_data, 0xffff); state->m_copper_pending_offset = 0; } - + /* if we're waiting, check for a breakthrough */ if (state->m_copper_waiting) { diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 4674c22592b..43d61cf2257 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -529,7 +529,7 @@ void dynax_state::dynax_blitter_start(int flags ) LOG(("XY=%X,%X SRC=%X BLIT=%X\n", m_blit_x, m_blit_y, m_blit_src, flags)); - blit_newsrc = blitter_drawgfx( + blit_newsrc = blitter_drawgfx( 0, // layer m_blit_dest, // layer mask gfxregions[m_blit_romregion], // rom region @@ -556,7 +556,7 @@ void dynax_state::jantouki_blitter_start( int flags ) LOG(("XY=%X,%X SRC=%X BLIT=%X\n", m_blit_x, m_blit_y, m_blit_src, flags)); - blit_newsrc = blitter_drawgfx( + blit_newsrc = blitter_drawgfx( 0, // layer m_blit_dest, // layer mask gfxregions[m_blit_romregion], // rom region @@ -733,7 +733,6 @@ static const int priority_mjelctrn[8] = { 0x0231, 0x0321, 0x2031, 0x2301, 0x3021 void dynax_state::dynax_common_reset() { - m_blit_romregion = 0; m_blit2_romregion = 0; m_blit_dest = -1; diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 749a44a77d3..ef60e9aa1e5 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -153,7 +153,7 @@ ppu2c0x_device::ppu2c0x_device(const machine_config &mconfig, device_type type, /* usually, no security value... */ m_security_value = 0; - + m_nmi_callback_proc = ppu2c0x_nmi_delegate(); } @@ -212,7 +212,7 @@ void ppu2c0x_device::device_start() m_cpu = machine().device<cpu_device>( m_cpu_tag ); assert(m_screen && m_cpu); - + // bind our handler m_nmi_callback_proc.bind_relative_to(*owner()); diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index 922926508f4..4f5dcbc41da 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -187,7 +187,7 @@ public: pen_t *m_colortable_mono; /* monochromatic color table modified at run time */ int m_scanline; /* scanline count */ ppu2c0x_scanline_delegate m_scanline_callback_proc; /* optional scanline callback */ - ppu2c0x_hblank_delegate m_hblank_callback_proc; /* optional hblank callback */ + ppu2c0x_hblank_delegate m_hblank_callback_proc; /* optional hblank callback */ ppu2c0x_vidaccess_delegate m_vidaccess_callback_proc; /* optional video access callback */ ppu2c0x_nmi_delegate m_nmi_callback_proc; /* nmi access callback from interface */ int m_regs[PPU_MAX_REG]; /* registers */ diff --git a/src/mame/video/scn2674.c b/src/mame/video/scn2674.c index 6397ac3c5e3..6c9be9ea467 100644 --- a/src/mame/video/scn2674.c +++ b/src/mame/video/scn2674.c @@ -35,7 +35,7 @@ const device_type SCN2674_VIDEO = &device_creator<scn2674_device>; scn2674_device::scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCN2674_VIDEO, "scn2674_device", tag, owner, clock), - m_interrupt_callback(*this) + m_interrupt_callback(*this) { } diff --git a/src/mame/video/scn2674.h b/src/mame/video/scn2674.h index 3b53cbe02d2..6461b7e917a 100644 --- a/src/mame/video/scn2674.h +++ b/src/mame/video/scn2674.h @@ -6,7 +6,7 @@ #define MCFG_SCN2674_VIDEO_ADD(_tag, _clock, _irq) \ MCFG_DEVICE_ADD(_tag, SCN2674_VIDEO, _clock) \ downcast<scn2674_device *>(device)->set_callbacks(DEVCB2_##_irq); - + typedef void (*s2574_interrupt_callback_func)(running_machine &machine); static const UINT8 vsync_table[4] = {3,1,5,7}; //Video related diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 9bfdb6464ae..9552d16e283 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -382,8 +382,8 @@ WRITE16_MEMBER(ssv_state::ssv_scroll_w) COMBINE_DATA(m_scroll + offset); /* offsets 60-7f: CRT Controller */ -// if(((offset*2) & 0x70) == 0x60) -// printf("%04x %04x\n",data,offset*2); +// if(((offset*2) & 0x70) == 0x60) +// printf("%04x %04x\n",data,offset*2); } WRITE16_MEMBER(ssv_state::paletteram16_xrgb_swap_word_w) diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index c23e6a914d2..4755642b2ba 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -1,7 +1,7 @@ /************************************************************************* Taito JC System - + functions to emulate the video hardware *************************************************************************/ diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index d352c553fcf..c7d732f3745 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -35,14 +35,14 @@ 2013/02/27 Robert Tuccitto Palette rebuild due to misaligned data references. Corrected PAL color sequence order. - 2013/03/19 Robert Tuccitto Stripped palette to raw video output + 2013/03/19 Robert Tuccitto Stripped palette to raw video output values removing YIQ/YUV infer data. - 2013/04/02 Robert Tuccitto Corrected rotation values and errors - including duplicate entries for palette. + 2013/04/02 Robert Tuccitto Corrected rotation values and errors + including duplicate entries for palette. 2013/04/07 Robert Tuccitto Address map locations for the XBOARD - added. + added. ***************************************************************************/ @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state ) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank3") /* sc + ac */ AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank4") /* ac */ AM_RANGE(0xe000, 0xffff) AM_ROM - AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */ + AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */ ADDRESS_MAP_END diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index e0c9ad25633..5774191efd2 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -78,7 +78,7 @@ static const gfx_layout apple2gs_text_layout = { - 14,8, /* 14*8 characters */ + 14,8, /* 14*8 characters */ 512, /* 256 characters */ 1, /* 1 bits per pixel */ { 0 }, /* no bitplanes; 1 bit per pixel */ @@ -223,7 +223,7 @@ READ8_MEMBER(apple2gs_state::adbmicro_p2_in) READ8_MEMBER(apple2gs_state::adbmicro_p3_in) { - return 0x7; // don't press IIE capslock/ctrl/shift + return 0x7; // don't press IIE capslock/ctrl/shift } WRITE8_MEMBER(apple2gs_state::adbmicro_p0_out) @@ -255,7 +255,7 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out) if (((data & 0x08) == 0x08) != m_adb_line) { m_adb_dtime = (int)(machine().time().as_ticks(XTAL_3_579545MHz*2) - m_last_adb_time); -// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); +// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); m_last_adb_time = machine().time().as_ticks(XTAL_3_579545MHz*2); m_adb_line = (data & 0x8) ? true : false; } @@ -323,10 +323,10 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) MCFG_CPU_PROGRAM_MAP(apple2gs_map) #if RUN_ADB_MICRO MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL_3_579545MHz) - MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) - MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) - MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) - MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) + MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) + MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) + MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) + MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) #endif MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2gs_state, apple2_interrupt, "screen", 0, 1) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -393,10 +393,10 @@ static MACHINE_CONFIG_DERIVED( apple2gsr1, apple2gs ) #if RUN_ADB_MICRO MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL_3_579545MHz) - MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) - MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) - MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) - MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) + MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) + MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) + MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) + MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) #endif MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c index 2ce52ab5ab7..97eb01bc4aa 100644 --- a/src/mess/drivers/atom.c +++ b/src/mess/drivers/atom.c @@ -273,7 +273,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atombb_mem, AS_PROGRAM, 8, atom_state ) AM_RANGE(0x0000, 0x3fff) AM_RAM AM_RANGE(0x4000, 0x57ff) AM_RAM AM_SHARE("video_ram") - + AM_RANGE(0x7000, 0x7003) AM_MIRROR(0x3fc) AM_DEVREADWRITE(INS8255_TAG, i8255_device, read, write) AM_RANGE(0x7800, 0x780f) AM_MIRROR(0x3f0) AM_DEVREADWRITE(R6522_TAG, via6522_device, read, write) AM_RANGE(0x8000, 0xbfff) AM_ROM AM_REGION(EXTROM_TAG, 0) @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( atombb, atom_state ) MCFG_I8255_ADD(INS8255_TAG, ppi_intf) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, atom_centronics_config) MCFG_CASSETTE_ADD(CASSETTE_TAG, atom_cassette_interface) - + /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") diff --git a/src/mess/drivers/fp200.c b/src/mess/drivers/fp200.c index 52a0b6478f3..57fca63399b 100644 --- a/src/mess/drivers/fp200.c +++ b/src/mess/drivers/fp200.c @@ -8,12 +8,12 @@ - What's the LCDC type? Custom? - Unless I've missed something in the schems, this one shouldn't have any sound capability. - - backup RAM. - - Rewrite video emulation from scratch. + - backup RAM. + - Rewrite video emulation from scratch. - Notes: - - on start-up there's a "memory illegal" warning. Enter "RESET" command - to initialize it (thanks to Takeda Toshiya for pointing this out). + Notes: + - on start-up there's a "memory illegal" warning. Enter "RESET" command + to initialize it (thanks to Takeda Toshiya for pointing this out). ***************************************************************************/ diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index bc8c7f62e6b..0ce50a1f33d 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -23,23 +23,23 @@ public: : md_base_state(mconfig, type, tag), m_slotcart(*this, "mdslot") { } - + ioport_port *m_io_ctrlr; ioport_port *m_io_pad3b[4]; ioport_port *m_io_pad6b[2][4]; - + optional_device<md_cart_slot_device> m_slotcart; - + DECLARE_DRIVER_INIT(mess_md_common); DECLARE_DRIVER_INIT(genesis); DECLARE_DRIVER_INIT(md_eur); DECLARE_DRIVER_INIT(md_jpn); - + READ8_MEMBER(mess_md_io_read_data_port); WRITE16_MEMBER(mess_md_io_write_data_port); - DECLARE_MACHINE_START( md_common ); // setup ioport_port - DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers + DECLARE_MACHINE_START( md_common ); // setup ioport_port + DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers DECLARE_MACHINE_RESET( ms_megadriv ); }; @@ -57,7 +57,7 @@ public: optional_device<pico_cart_slot_device> m_picocart; UINT8 m_page_register; - + UINT16 pico_read_penpos(int pen); DECLARE_READ16_HANDLER(pico_68k_io_read); DECLARE_WRITE16_MEMBER(pico_68k_io_write); @@ -303,7 +303,7 @@ INPUT_PORTS_END UINT16 vdp_get_word_from_68k_mem_console(running_machine &machine, UINT32 source, address_space & space68k) { md_cons_state *state = machine.driver_data<md_cons_state>(); - + if (source <= 0x3fffff) { if (state->m_slotcart->get_type() == SEGA_SVP) @@ -338,7 +338,7 @@ MACHINE_START_MEMBER(md_cons_state, md_common) m_io_pad6b[1][i] = ioport(pad6names[1][i]); } - // setup timers for 6 button pads + // setup timers for 6 button pads for (int i = 0; i < 3; i++) m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(FPTR)i); } @@ -346,7 +346,7 @@ MACHINE_START_MEMBER(md_cons_state, md_common) MACHINE_START_MEMBER(md_cons_state, ms_megadriv) { MACHINE_START_CALL_MEMBER( md_common ); - + vdp_get_word_from_68k_mem = vdp_get_word_from_68k_mem_console; // for now m_cartslot is only in MD and not 32x and SegaCD @@ -1070,7 +1070,7 @@ MACHINE_START_MEMBER(pico_state,pico) m_io_pad = ioport("PAD"); m_io_penx = ioport("PENX"); m_io_peny = ioport("PENY"); - + machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a15),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a15),(base_md_cart_slot_device*)m_picocart)); diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c index 2a175b3f2da..086df4e2253 100644 --- a/src/mess/drivers/mz3500.c +++ b/src/mess/drivers/mz3500.c @@ -1,27 +1,27 @@ /*************************************************************************** - MZ-3500 (c) 198? Sharp - - preliminary driver by Angelo Salese - - TODO: - - BUSREQ / BUSACK signals. - - master/slave comms aren't perfect (especially noticeable if you change the video DIP) - - Notes: - Sub-CPU test meanings: - * RA (tests RAM, first is work RAM, other two are shared RAM banks) - * VR (tests VRAM) - * CRT interface test: - - 40x20 - - 80x25 - - monochrome attribute test - - 80x25 color test (text B-R-G-W, border: black, blue, red, green, black) - - 40x20 color test (text B-R-G-W, border: black, blue, red, green, black) - * Speaker test - * PR (Printer interface test) - * LP (Light pen test) - * RS (RS-232C interface test) + MZ-3500 (c) 198? Sharp + + preliminary driver by Angelo Salese + + TODO: + - BUSREQ / BUSACK signals. + - master/slave comms aren't perfect (especially noticeable if you change the video DIP) + + Notes: + Sub-CPU test meanings: + * RA (tests RAM, first is work RAM, other two are shared RAM banks) + * VR (tests VRAM) + * CRT interface test: + - 40x20 + - 80x25 + - monochrome attribute test + - 80x25 color test (text B-R-G-W, border: black, blue, red, green, black) + - 40x20 color test (text B-R-G-W, border: black, blue, red, green, black) + * Speaker test + * PR (Printer interface test) + * LP (Light pen test) + * RS (RS-232C interface test) ***************************************************************************/ @@ -153,7 +153,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) UINT8 hires; UINT8 color_mode; -// popmessage("%02x",state->m_crtc[6]); +// popmessage("%02x",state->m_crtc[6]); color_mode = state->m_crtc[4] & 1; width80 = (state->m_crtc[5] & 2) >> 1; @@ -166,7 +166,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) attr = (state->m_video_ram[((addr+x)*2+1) & 0x3ffff] & 0x0f); //if(hires) - // tile <<= 1; + // tile <<= 1; for( yi = 0; yi < lr; yi++) { @@ -187,7 +187,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) { /* TODO: "highlight" */ //if(attr & 4) - // tile_data ^= 0xff; + // tile_data ^= 0xff; if(attr & 1) // VL tile_data |= 8; @@ -602,12 +602,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mz3500_master_io, AS_IO, 8, mz3500_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// ADDRESS_MAP_UNMAP_HIGH +// ADDRESS_MAP_UNMAP_HIGH // AM_RANGE(0xe4, 0xe7) SFD upd765 -// AM_RANGE(0xe8, 0xeb) SFD I/O port and DMAC chip select -// AM_RANGE(0xec, 0xef) irq signal from slave to master CPU +// AM_RANGE(0xe8, 0xeb) SFD I/O port and DMAC chip select +// AM_RANGE(0xec, 0xef) irq signal from slave to master CPU AM_RANGE(0xf4, 0xf5) AM_DEVICE("upd765a", upd765a_device, map) // MFD upd765 -// AM_RANGE(0xf8, 0xfb) MFD I/O port +// AM_RANGE(0xf8, 0xfb) MFD I/O port AM_RANGE(0xf8, 0xf8) AM_READWRITE(mz3500_fdc_r,mz3500_fdc_w) AM_RANGE(0xf9, 0xf9) AM_READ(mz3500_fdc_dma_r) AM_RANGE(0xfc, 0xff) AM_READWRITE(mz3500_io_r,mz3500_io_w) // memory mapper @@ -622,9 +622,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mz3500_slave_io, AS_IO, 8, mz3500_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH -// AM_RANGE(0x00, 0x0f) f/f and irq to master CPU -// AM_RANGE(0x10, 0x1f) i8251 -// AM_RANGE(0x20, 0x2f) pit8253 +// AM_RANGE(0x00, 0x0f) f/f and irq to master CPU +// AM_RANGE(0x10, 0x1f) i8251 +// AM_RANGE(0x20, 0x2f) pit8253 AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("i8255", i8255_device, read, write) AM_RANGE(0x40, 0x40) AM_READ_PORT("DSW") AM_RANGE(0x50, 0x5f) AM_RAM_WRITE(mz3500_crtc_w) diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c index cbe5dd7b10e..800b1eeb66f 100644 --- a/src/mess/drivers/p8k.c +++ b/src/mess/drivers/p8k.c @@ -85,7 +85,7 @@ public: void fdc_drq(bool state); virtual void machine_start(); - + DECLARE_WRITE_LINE_MEMBER( p8k_daisy_interrupt ); DECLARE_WRITE_LINE_MEMBER( p8k_dma_irq_w ); DECLARE_WRITE16_MEMBER( pk8_sio_0_serial_transmit ); @@ -607,12 +607,12 @@ static ADDRESS_MAP_START(p8k_16_iomap, AS_IO, 16, p8k_state) // AM_RANGE(0x0fef0, 0x0feff) // clock //AM_RANGE(0x0ff80, 0x0ff87) AM_READWRITE_LEGACY(p8k_16_sio0_r, p8k_16_sio0_w) AM_RANGE(0x0ff80, 0x0ff87) AM_READWRITE(portff82_r,portff82_w) - AM_RANGE(0x0ff88, 0x0ff8f) AM_READWRITE(p8k_16_sio1_r, p8k_16_sio1_w) //"z80sio_1", - AM_RANGE(0x0ff90, 0x0ff97) AM_READWRITE(p8k_16_pio0_r, p8k_16_pio0_w) //"z80pio_0", - AM_RANGE(0x0ff98, 0x0ff9f) AM_READWRITE(p8k_16_pio1_r, p8k_16_pio1_w) //"z80pio_1", - AM_RANGE(0x0ffa0, 0x0ffa7) AM_READWRITE(p8k_16_pio2_r, p8k_16_pio2_w) //"z80pio_2", - AM_RANGE(0x0ffa8, 0x0ffaf) AM_READWRITE(p8k_16_ctc0_r, p8k_16_ctc0_w) //"z80ctc_0", - AM_RANGE(0x0ffb0, 0x0ffb7) AM_READWRITE(p8k_16_ctc1_r, p8k_16_ctc1_w) //"z80ctc_1", + AM_RANGE(0x0ff88, 0x0ff8f) AM_READWRITE(p8k_16_sio1_r, p8k_16_sio1_w) //"z80sio_1", + AM_RANGE(0x0ff90, 0x0ff97) AM_READWRITE(p8k_16_pio0_r, p8k_16_pio0_w) //"z80pio_0", + AM_RANGE(0x0ff98, 0x0ff9f) AM_READWRITE(p8k_16_pio1_r, p8k_16_pio1_w) //"z80pio_1", + AM_RANGE(0x0ffa0, 0x0ffa7) AM_READWRITE(p8k_16_pio2_r, p8k_16_pio2_w) //"z80pio_2", + AM_RANGE(0x0ffa8, 0x0ffaf) AM_READWRITE(p8k_16_ctc0_r, p8k_16_ctc0_w) //"z80ctc_0", + AM_RANGE(0x0ffb0, 0x0ffb7) AM_READWRITE(p8k_16_ctc1_r, p8k_16_ctc1_w) //"z80ctc_1", // AM_RANGE(0x0ffc0, 0x0ffc1) // SCR // AM_RANGE(0x0ffc8, 0x0ffc9) // SBR // AM_RANGE(0x0ffd0, 0x0ffd1) // NBR diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index 1274d374d35..86d0c42eca1 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -10,7 +10,7 @@ TODO: - - slotify cartridges + - slotify cartridges - microdrive - ZX8301 memory access slowdown - use resnet.h to create palette diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c index d7e0c4a0e26..606e02c4b10 100644 --- a/src/mess/drivers/snes.c +++ b/src/mess/drivers/snes.c @@ -81,7 +81,7 @@ public: DECLARE_WRITE8_MEMBER( pfest94_hi_w ); DECLARE_READ8_MEMBER( pfest94_lo_r ); DECLARE_WRITE8_MEMBER( pfest94_lo_w ); - + DECLARE_READ8_MEMBER( spc_ram_100_r ); DECLARE_WRITE8_MEMBER( spc_ram_100_w ); CUSTOM_INPUT_MEMBER( snes_mouse_speed_input ); @@ -779,7 +779,7 @@ WRITE8_MEMBER( snes_console_state::snesbsx_lo_w ) READ8_MEMBER( snes_console_state::pfest94_hi_r ) { UINT16 address = offset & 0xffff; - + if (offset < 0x400000) { if (address < 0x2000) @@ -827,7 +827,7 @@ WRITE8_MEMBER( snes_console_state::pfest94_hi_w ) READ8_MEMBER( snes_console_state::pfest94_lo_r ) { UINT16 address = offset & 0xffff; - + if (offset < 0x400000) { if (address < 0x2000) @@ -848,7 +848,7 @@ READ8_MEMBER( snes_console_state::pfest94_lo_r ) else return m_cartslot->read_l(space, offset); } - return 0xff; // or open_bus? + return 0xff; // or open_bus? } WRITE8_MEMBER( snes_console_state::pfest94_lo_w ) diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h index fa8baa83b43..60bcbd3fbaf 100644 --- a/src/mess/includes/apollo.h +++ b/src/mess/includes/apollo.h @@ -196,7 +196,7 @@ public: DECLARE_WRITE8_MEMBER( apollo_kbd_putchar ); DECLARE_READ8_MEMBER( apollo_kbd_has_beeper ); DECLARE_READ8_MEMBER( apollo_kbd_is_german ); - DECLARE_WRITE8_MEMBER( terminal_kbd_putchar ); + DECLARE_WRITE8_MEMBER( terminal_kbd_putchar ); DECLARE_READ8_MEMBER( apollo_dma8237_ctape_dack_r ); DECLARE_WRITE8_MEMBER( apollo_dma8237_ctape_dack_w ); DECLARE_READ8_MEMBER( apollo_dma8237_fdc_dack_r ); @@ -205,7 +205,7 @@ public: DECLARE_WRITE8_MEMBER( apollo_dma8237_wdc_dack_w ); DECLARE_WRITE_LINE_MEMBER( apollo_dma8237_out_eop ); DECLARE_WRITE_LINE_MEMBER( apollo_dma_1_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( apollo_dma_2_hrq_changed ); + DECLARE_WRITE_LINE_MEMBER( apollo_dma_2_hrq_changed ); }; MACHINE_CONFIG_EXTERN( apollo ); diff --git a/src/mess/includes/dccons.h b/src/mess/includes/dccons.h index 3616ab2bfcf..edabd8238cc 100644 --- a/src/mess/includes/dccons.h +++ b/src/mess/includes/dccons.h @@ -34,10 +34,10 @@ public: WRITE64_MEMBER( dc_mess_gdrom_w ); READ64_MEMBER( dc_mess_g1_ctrl_r ); WRITE64_MEMBER( dc_mess_g1_ctrl_w ); - + private: UINT64 PDTRA, PCTRA; - + UINT8 *atapi_regs; emu_timer *atapi_timer; gdrom_device *gdrom; diff --git a/src/mess/includes/kyocera.h b/src/mess/includes/kyocera.h index c5df1b37f7a..9f8e181a3b8 100644 --- a/src/mess/includes/kyocera.h +++ b/src/mess/includes/kyocera.h @@ -38,7 +38,7 @@ #define HD44102_8_TAG "m9" #define HD44102_9_TAG "m10" #define CENTRONICS_TAG "centronics" -#define RS232_TAG "rs232" +#define RS232_TAG "rs232" //#define I8085_TAG "m19" //#define I8155_TAG "m12" diff --git a/src/mess/includes/microtan.h b/src/mess/includes/microtan.h index fcd06f93754..0182750300d 100644 --- a/src/mess/includes/microtan.h +++ b/src/mess/includes/microtan.h @@ -76,7 +76,7 @@ public: DECLARE_WRITE8_MEMBER(via_1_out_ca2); DECLARE_WRITE8_MEMBER(via_1_out_cb2); DECLARE_WRITE_LINE_MEMBER(via_0_irq); - DECLARE_WRITE_LINE_MEMBER(via_1_irq); + DECLARE_WRITE_LINE_MEMBER(via_1_irq); }; diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 3fc965110ff..10f610018b7 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -161,13 +161,13 @@ public: void btl_smb2a_irq(int scanline, int vblank, int blanked); void btl_smb3_irq(int scanline, int vblank, int blanked); void btl_dn_irq(int scanline, int vblank, int blanked); - void shjy3_irq(int scanline, int vblank, int blanked); + void shjy3_irq(int scanline, int vblank, int blanked); void bandai_lz_irq(int scanline, int vblank, int blanked); void namcot_irq(int scanline, int vblank, int blanked); void futuremedia_irq(int scanline, int vblank, int blanked); void nanjing_irq(int scanline, int vblank, int blanked); - void tengen_800032_irq(int scanline, int vblank, int blanked); - + void tengen_800032_irq(int scanline, int vblank, int blanked); + int nes_ppu_vidaccess(int address, int data); void fds_irq(int scanline, int vblank, int blanked); void ppu_nmi(int *ppu_regs); diff --git a/src/mess/includes/pc1350.h b/src/mess/includes/pc1350.h index 335517c7baf..839813a0641 100644 --- a/src/mess/includes/pc1350.h +++ b/src/mess/includes/pc1350.h @@ -37,7 +37,7 @@ public: DECLARE_READ8_MEMBER(pc1350_lcd_read); DECLARE_WRITE8_MEMBER(pc1350_lcd_write); DECLARE_READ8_MEMBER(pc1350_keyboard_line_r); - + virtual void machine_start(); }; diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h index 84b9ab718c7..02c00714835 100644 --- a/src/mess/includes/pc1401.h +++ b/src/mess/includes/pc1401.h @@ -37,7 +37,7 @@ public: DECLARE_READ8_MEMBER(pc1401_inb); DECLARE_READ8_MEMBER(pc1401_lcd_read); DECLARE_WRITE8_MEMBER(pc1401_lcd_write); - + virtual void machine_start(); }; diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h index dd7c61e5093..48febbcb18f 100644 --- a/src/mess/includes/pc1403.h +++ b/src/mess/includes/pc1403.h @@ -41,7 +41,7 @@ public: DECLARE_WRITE8_MEMBER(pc1403_asic_write); DECLARE_READ8_MEMBER(pc1403_lcd_read); DECLARE_WRITE8_MEMBER(pc1403_lcd_write); - virtual void video_start(); + virtual void video_start(); virtual void machine_start(); }; diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index 06876d24fdb..438ac166b43 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -507,7 +507,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { UINT8 data = sc499_dack_r(&space.machine()); -// DLOG2(("dma ctape dack read %02x",data)); +// DLOG2(("dma ctape dack read %02x",data)); // hack for DN3000: select appropriate DMA channel No. dn3000_dma_channel1 = 1; // 1 = ctape, 2 = floppy dma channel @@ -516,7 +516,7 @@ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { } WRITE8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_w ) { -// DLOG2(("dma ctape dack write %02x", data)); +// DLOG2(("dma ctape dack write %02x", data)); sc499_dack_w(&space.machine(), data); // hack for DN3000: select appropriate DMA channel No. @@ -578,7 +578,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_dma_2_hrq_changed ) { // DLOG2(("dma 2 hrq changed state %02x", state)); machine().device(MAINCPU)->execute().set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); - /* Assert HLDA */ + /* Assert HLDA */ dynamic_cast<i8237_device*>(machine().device(APOLLO_DMA2_TAG))->i8237_hlda_w(state); } diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index 21ef0ee8ce3..f6fb7e85ff4 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -2080,7 +2080,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { UINT8 rv = m_glu_regs[offset]; -// printf("MCU reads reg %x\n", offset); +// printf("MCU reads reg %x\n", offset); // the command full flag is cleared by the MCU reading // first the KGS register and then the command register @@ -2088,7 +2088,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { m_glu_regs[GLU_KG_STATUS] &= ~KGS_COMMAND_FULL; m_glu_mcu_read_kgs = false; -// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); +// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); } // prime for the next command register read to clear the command full flag @@ -2104,7 +2104,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) { m_glu_regs[offset] = data; -// printf("MCU writes %02x to reg %x\n", data, offset); +// printf("MCU writes %02x to reg %x\n", data, offset); switch (offset) { @@ -2114,8 +2114,8 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) m_glu_mouse_read_stat = false; // signal next read will be mouse X break; - case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff -// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); + case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff +// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); if (data & 0x80) { m_glu_regs[GLU_KG_STATUS] |= KGS_ANY_KEY_DOWN | KGS_KEYSTROBE; @@ -2125,7 +2125,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) case GLU_DATA: m_glu_regs[GLU_KG_STATUS] |= KGS_DATA_FULL; m_glu_816_read_dstat = false; -// printf("MCU writes %02x to DATA\n", data); +// printf("MCU writes %02x to DATA\n", data); break; } } @@ -2212,7 +2212,7 @@ UINT8 apple2gs_state::keyglu_816_read(UINT8 offset) { m_glu_816_read_dstat = false; m_glu_regs[GLU_KG_STATUS] &= ~KGS_DATA_FULL; -// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); +// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); } return m_glu_regs[GLU_DATA]; @@ -2238,7 +2238,7 @@ void apple2gs_state::keyglu_816_write(UINT8 offset, UINT8 data) break; case GLU_COMMAND: -// printf("816 sets COMMAND to %02x (raise command full)\n", data); +// printf("816 sets COMMAND to %02x (raise command full)\n", data); m_glu_regs[GLU_KG_STATUS] |= KGS_COMMAND_FULL; break; diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c index e522eec32fa..9388bcba6e3 100644 --- a/src/mess/machine/c2040.c +++ b/src/mess/machine/c2040.c @@ -11,7 +11,7 @@ TODO: - - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) + - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) - 2040 DOS 1 FDC rom (jumps to 104d while getting block header) diff --git a/src/mess/machine/dccons.c b/src/mess/machine/dccons.c index bee389bb2ed..50f7713ec5d 100644 --- a/src/mess/machine/dccons.c +++ b/src/mess/machine/dccons.c @@ -64,7 +64,6 @@ void dc_cons_state::gdrom_raise_irq() TIMER_CALLBACK_MEMBER(dc_cons_state::atapi_xfer_end ) { - UINT8 sector_buffer[ 4096 ]; atapi_timer->adjust(attotime::never); @@ -511,7 +510,7 @@ WRITE32_MEMBER(dc_cons_state::atapi_w ) void dc_cons_state::dreamcast_atapi_init() { xfer_mode = ATAPI_XFER_PIO; - + atapi_regs = auto_alloc_array_clear(machine(), UINT8, ATAPI_REG_MAX); atapi_regs[ATAPI_REG_CMDSTATUS] = 0; diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h index 514158e9c1a..b1661e18216 100644 --- a/src/mess/machine/iq151_disc2.h +++ b/src/mess/machine/iq151_disc2.h @@ -31,7 +31,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // iq151cart_interface overrides virtual void read(offs_t offset, UINT8 &data); virtual void io_read(offs_t offset, UINT8 &data); diff --git a/src/mess/machine/isa_aha1542.c b/src/mess/machine/isa_aha1542.c index 9e0056b04f8..bc2763b348d 100644 --- a/src/mess/machine/isa_aha1542.c +++ b/src/mess/machine/isa_aha1542.c @@ -185,7 +185,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const } aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), + device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), device_isa16_card_interface(mconfig, *this) { } diff --git a/src/mess/machine/md_slot.c b/src/mess/machine/md_slot.c index 53e7ed3aab4..113d8bb4ae1 100644 --- a/src/mess/machine/md_slot.c +++ b/src/mess/machine/md_slot.c @@ -1065,7 +1065,7 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32 csum += (ROM8[i] | (ROM8[i + 1] << 8)); csum &= 0xffff; } - + logerror("INTERNAL HEADER\n" ); logerror("===============\n" ); logerror("Console: %.16s\n", console); diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h index b881d1ec8d0..8b1e1580e43 100644 --- a/src/mess/machine/md_slot.h +++ b/src/mess/machine/md_slot.h @@ -99,8 +99,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a13) {} virtual DECLARE_READ16_MEMBER(read_a15) { return 0xffff; } virtual DECLARE_WRITE16_MEMBER(write_a15) {} - - virtual int read_test() { return 0; } // used by Virtua Racing test + + virtual int read_test() { return 0; } // used by Virtua Racing test /* this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly */ virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); }; @@ -186,7 +186,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a15); virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { if (m_cart) m_cart->write_tmss_bank(space, offset, data, mem_mask); }; - virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test + virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test // TODO: this only needs to be public because megasvp copies rom into memory region, so we need to rework that code... //private: diff --git a/src/mess/machine/md_svp.c b/src/mess/machine/md_svp.c index 5bb5db98118..05b0d06284e 100644 --- a/src/mess/machine/md_svp.c +++ b/src/mess/machine/md_svp.c @@ -91,11 +91,11 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) m_emu_status &= ~SSP_PMC_SET; return 0; } - + // just in case if (m_emu_status & SSP_PMC_HAVE_ADDR) m_emu_status &= ~SSP_PMC_HAVE_ADDR; - + if (reg == 4 || (m_svp->state().state_int(SSP_ST) & 0x60)) { #define CADDR ((((mode<<16)&0x7f0000)|addr)<<1) @@ -110,7 +110,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) int inc = get_inc(mode); if (mode & 0x0400) overwrite_write(&dram[addr], d); - else + else dram[addr] = d; m_pmac_write[reg] += inc; } @@ -131,7 +131,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled write mode %04x, [%06x] %04x\n", - reg, mode, CADDR, d); + reg, mode, CADDR, d); } } else @@ -153,27 +153,27 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled read mode %04x, [%06x]\n", - reg, mode, CADDR); + reg, mode, CADDR); d = 0; } } - + // PMC value corresponds to last PMR accessed (not sure). if (write) m_pmc.d = m_pmac_write[reg]; else m_pmc.d = m_pmac_read[reg]; - + return d; } - + return (UINT32)-1; } READ16_MEMBER( md_rom_svp_device::read_pm0 ) { UINT32 d = pm_io(0, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; d = m_xst2; m_xst2 &= ~2; // ? @@ -183,7 +183,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm0 ) WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) { UINT32 r = pm_io(0, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 = data; // ? } @@ -191,7 +191,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) READ16_MEMBER( md_rom_svp_device::read_pm1 ) { UINT32 r = pm_io(1, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM1 acces in non PM mode?\n"); return 0; @@ -200,7 +200,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm1 ) WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) { UINT32 r = pm_io(1, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM1 acces in non PM mode?\n"); } @@ -208,7 +208,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) READ16_MEMBER( md_rom_svp_device::read_pm2 ) { UINT32 r = pm_io(2, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM2 acces in non PM mode?\n"); return 0; @@ -217,7 +217,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm2 ) WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) { UINT32 r = pm_io(2, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM2 acces in non PM mode?\n"); } @@ -225,7 +225,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) READ16_MEMBER( md_rom_svp_device::read_xst ) { UINT32 d = pm_io(3, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; return m_xst; } @@ -233,7 +233,7 @@ READ16_MEMBER( md_rom_svp_device::read_xst ) WRITE16_MEMBER( md_rom_svp_device::write_xst ) { UINT32 r = pm_io(3, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 |= 1; m_xst = data; @@ -251,13 +251,13 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm4 ) READ16_MEMBER( md_rom_svp_device::read_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; return ((m_pmc.w.l << 4) & 0xfff0) | ((m_pmc.w.l >> 4) & 0xf); - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; return m_pmc.w.l; @@ -266,13 +266,13 @@ READ16_MEMBER( md_rom_svp_device::read_pmc ) WRITE16_MEMBER( md_rom_svp_device::write_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; m_pmc.w.h = data; - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; m_pmc.w.l = data; @@ -293,16 +293,16 @@ WRITE16_MEMBER( md_rom_svp_device::write_al ) READ16_MEMBER( md_rom_svp_device::rom_read1 ) { UINT16 *IRAM = (UINT16 *)m_iram; - return IRAM[offset]; + return IRAM[offset]; } READ16_MEMBER( md_rom_svp_device::rom_read2 ) { - return m_rom[offset + 0x800/2]; + return m_rom[offset + 0x800/2]; } -int md_rom_svp_device::read_test() -{ +int md_rom_svp_device::read_test() +{ return m_test_ipt->read(); } @@ -319,8 +319,8 @@ INPUT_PORTS_END //------------------------------------------------- ADDRESS_MAP_START( md_svp_ssp_map, AS_PROGRAM, 16, md_rom_svp_device ) -// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) -// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) +// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) +// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("iram_svp") AM_RANGE(0x0400, 0xffff) AM_ROMBANK("cart_svp") ADDRESS_MAP_END @@ -390,7 +390,7 @@ void md_rom_svp_device::device_start() // IRAM m_iram = auto_alloc_array(machine(), UINT8, 0x800); this->membank("iram_svp")->set_base(m_iram); - // the other bank, "cart_svp", is setup at call_load + // the other bank, "cart_svp", is setup at call_load } READ16_MEMBER(md_rom_svp_device::read) @@ -415,9 +415,9 @@ READ16_MEMBER(md_rom_svp_device::read) a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4); return DRAM[a1]; } - if (offset < 0x200000/2) - return m_rom[offset]; - else + if (offset < 0x200000/2) + return m_rom[offset]; + else { printf("read out of bound\n"); return 0xffff; diff --git a/src/mess/machine/md_svp.h b/src/mess/machine/md_svp.h index d71c977d92d..a27c6980273 100644 --- a/src/mess/machine/md_svp.h +++ b/src/mess/machine/md_svp.h @@ -11,23 +11,23 @@ // ======================> md_rom_svp_device class md_rom_svp_device : public device_t, - public device_md_cart_interface + public device_md_cart_interface { public: // construction/destruction md_rom_svp_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); md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + //protected: // device-level overrides virtual void device_start(); virtual machine_config_constructor device_mconfig_additions() const; virtual ioport_constructor device_input_ports() const; virtual void set_bank_to_rom(const char *banktag, UINT32 offset); - + required_device<device_t> m_svp; required_ioport m_test_ipt; - + // reading and writing virtual DECLARE_READ16_MEMBER(read); virtual DECLARE_WRITE16_MEMBER(write); diff --git a/src/mess/machine/nes_ines.c b/src/mess/machine/nes_ines.c index 0a65acdb2bc..6f51bbadb70 100644 --- a/src/mess/machine/nes_ines.c +++ b/src/mess/machine/nes_ines.c @@ -30,7 +30,7 @@ there are 3 dots to every 1 CPU cycle, hence 114 is the number of cycles per sca void nes_state::ffe_irq( int scanline, int vblank, int blanked ) { - // 114 is the number of cycles per scanline + // 114 is the number of cycles per scanline // TODO: change to reflect the actual number of cycles spent if (m_IRQ_enable) { diff --git a/src/mess/machine/nes_pcb.c b/src/mess/machine/nes_pcb.c index c63c1093048..53d12e35339 100644 --- a/src/mess/machine/nes_pcb.c +++ b/src/mess/machine/nes_pcb.c @@ -11740,21 +11740,21 @@ struct nes_pcb_intf {write8_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0), read8_delegate(FUNC(b), DEVICE_SELF, (nes_state *)0)} #define NES_SCANLINE_NULL \ - ppu2c0x_scanline_delegate() + ppu2c0x_scanline_delegate() #define NES_HBLANK_NULL \ - ppu2c0x_hblank_delegate() + ppu2c0x_hblank_delegate() #define NES_HBLANK(a) \ - ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) + ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) #define NES_LATCH_NULL \ - ppu2c0x_latch_delegate() + ppu2c0x_latch_delegate() + + #define NES_LATCH(a) \ + ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - #define NES_LATCH(a) \ - ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - WRITE8_MEMBER(nes_carts_state::dummy_l_w) { logerror("write access, offset: %04x, data: %02x\n", offset + 0x4100, data); diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c index c6cafed8e75..3d8c07c18a2 100644 --- a/src/mess/machine/psxcd.c +++ b/src/mess/machine/psxcd.c @@ -463,7 +463,7 @@ void psxcd_device::cdcmd_setloc() void psxcd_device::cdcmd_play() { if(cmdbuf[0] && m_param_count) - loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); + loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); curpos.w = loc.w; if (!curpos.w) diff --git a/src/mess/machine/sat_slot.c b/src/mess/machine/sat_slot.c index 98fb5d6b61d..c05e15c8b05 100644 --- a/src/mess/machine/sat_slot.c +++ b/src/mess/machine/sat_slot.c @@ -143,7 +143,7 @@ bool sat_cart_slot_device::call_load() fread(ROM, len); // fix endianness.... - for (int i = 0; i < len/4; i ++) + for (int i = 0; i < len/4; i ++) ROM[i] = BITSWAP32(ROM[i],7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); // UINT8 tempa = ROM[i+0]; // UINT8 tempb = ROM[i+1]; diff --git a/src/mess/machine/sns_event.c b/src/mess/machine/sns_event.c index 862fe6d1a4d..53b0f19cf27 100644 --- a/src/mess/machine/sns_event.c +++ b/src/mess/machine/sns_event.c @@ -3,10 +3,10 @@ Super NES/Famicom Event cartridges emulation (for SNES/SFC) Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Visit http://mamedev.org for licensing and usage restrictions. TODO: figure out how the Test Mode switch works... - + ***********************************************************************************************************/ @@ -62,7 +62,7 @@ READ8_MEMBER(sns_pfest94_device::read_l) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x10000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } else { @@ -79,7 +79,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x8000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } // called beyond 0x400000! @@ -93,7 +93,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) { offset &= 0x3fffff; int bank = offset / 0x8000; - return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; } } @@ -279,10 +279,8 @@ void sns_pfest94_device::device_timer(emu_timer &timer, device_timer_id id, int if (!m_count) { m_status |= 2; - pfest94_timer->reset(); + pfest94_timer->reset(); } m_count--; } } - - diff --git a/src/mess/machine/sns_event.h b/src/mess/machine/sns_event.h index 12a1e050f4b..cbe602b4748 100644 --- a/src/mess/machine/sns_event.h +++ b/src/mess/machine/sns_event.h @@ -31,16 +31,16 @@ public: virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_READ8_MEMBER(chip_read); virtual DECLARE_WRITE8_MEMBER(chip_write); - + virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + private: UINT8 m_base_bank; UINT8 m_mask; UINT8 m_status; UINT32 m_count; - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; diff --git a/src/mess/machine/sns_rom.h b/src/mess/machine/sns_rom.h index dbc37d7b6ee..561c3fd0d29 100644 --- a/src/mess/machine/sns_rom.h +++ b/src/mess/machine/sns_rom.h @@ -16,7 +16,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); @@ -147,7 +147,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); diff --git a/src/mess/machine/sns_sufami.h b/src/mess/machine/sns_sufami.h index 874470e9f26..10bbf1abc13 100644 --- a/src/mess/machine/sns_sufami.h +++ b/src/mess/machine/sns_sufami.h @@ -38,7 +38,7 @@ public: // device-level overrides virtual void device_start(); - + // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); }; diff --git a/src/mess/machine/sns_upd.h b/src/mess/machine/sns_upd.h index 770ae9908cf..950c89cd752 100644 --- a/src/mess/machine/sns_upd.h +++ b/src/mess/machine/sns_upd.h @@ -28,7 +28,7 @@ public: virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; @@ -80,7 +80,7 @@ public: virtual DECLARE_READ32_MEMBER(setadsp_prg_r); virtual DECLARE_READ16_MEMBER(setadsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; diff --git a/src/mess/machine/ti99/horizon.c b/src/mess/machine/ti99/horizon.c index 99b9ba7e71d..24670d86986 100644 --- a/src/mess/machine/ti99/horizon.c +++ b/src/mess/machine/ti99/horizon.c @@ -65,7 +65,7 @@ horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this) { } diff --git a/src/mess/machine/wangpc_lic.h b/src/mess/machine/wangpc_lic.h index 7576f0780fc..7a40bec9899 100644 --- a/src/mess/machine/wangpc_lic.h +++ b/src/mess/machine/wangpc_lic.h @@ -39,7 +39,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // device_wangpcbus_card_interface overrides virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h index 2619e92e567..d9993e04ad9 100644 --- a/src/mess/machine/wangpckb.h +++ b/src/mess/machine/wangpckb.h @@ -1,9 +1,9 @@ /********************************************************************** - Wang PC keyboard emulation + Wang PC keyboard emulation - Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. *********************************************************************/ diff --git a/src/mess/mess.lst b/src/mess/mess.lst index 9bccb0ee6b6..3e8858187a2 100644 --- a/src/mess/mess.lst +++ b/src/mess/mess.lst @@ -346,7 +346,7 @@ d110 acrnsys1 // 1979 Acorn System 1 (Microcomputer Kit) atom // 1979 Acorn Atom atomeb // 1979 Acorn Atom -atombb // 1979 Acorn Atom +atombb // 1979 Acorn Atom bbca // 1981 BBC Micro Model A bbcb // 1981 BBC Micro Model B bbcbp // 198? BBC Micro Model B+ 64K diff --git a/src/mess/video/gb.c b/src/mess/video/gb.c index 09eed2936b4..a4eea04d8ff 100644 --- a/src/mess/video/gb.c +++ b/src/mess/video/gb.c @@ -532,7 +532,7 @@ void gb_state::sgb_refresh_border() { UINT8 *map = m_sgb_tile_map + ( ( yidx >> 3 ) * 64 ); UINT16 xindex = 0; - + for( UINT16 xidx = 0; xidx < 64; xidx+=2 ) { if( map[xidx+1] & 0x80 ) /* Vertical flip */ diff --git a/src/mess/video/isa_svga_s3.c b/src/mess/video/isa_svga_s3.c index 6d568ea3921..ac20b742e66 100644 --- a/src/mess/video/isa_svga_s3.c +++ b/src/mess/video/isa_svga_s3.c @@ -108,7 +108,7 @@ void isa16_svga_s3_device::device_reset() /* - * S3 Virge 2D/3D accelerator + * S3 Virge 2D/3D accelerator */ ROM_START( s3virge ) @@ -196,7 +196,7 @@ void isa16_s3virge_device::device_reset() } /* - * S3 ViRGE/DX + * S3 ViRGE/DX */ ROM_START( s3virgedx ) diff --git a/src/mess/video/s3virge.c b/src/mess/video/s3virge.c index f1786b4efe7..338d1d726f1 100644 --- a/src/mess/video/s3virge.c +++ b/src/mess/video/s3virge.c @@ -620,7 +620,7 @@ WRITE8_MEMBER(s3virge_vga_device::mem_w) if (svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb32_en) { - // printf("%08x %02x (%02x %02x) %02X\n",offset,data,vga.sequencer.map_mask,svga.bank_w,(vga.sequencer.data[4] & 0x08)); + // printf("%08x %02x (%02x %02x) %02X\n",offset,data,vga.sequencer.map_mask,svga.bank_w,(vga.sequencer.data[4] & 0x08)); if(offset & 0x10000) return; if(vga.sequencer.data[4] & 0x8) diff --git a/src/osd/sdl/debugqtmemorywindow.c b/src/osd/sdl/debugqtmemorywindow.c index 4ca02fd213a..692d1db302a 100644 --- a/src/osd/sdl/debugqtmemorywindow.c +++ b/src/osd/sdl/debugqtmemorywindow.c @@ -134,10 +134,10 @@ void MemoryWindow::memoryRegionChanged(int index) debug_view_memory* memView = downcast<debug_view_memory*>(m_memTable->view()); switch(memView->bytes_per_chunk()) { - case 1: chunkSizeMenuItem("chunkActOne")->setChecked(true); break; - case 2: chunkSizeMenuItem("chunkActTwo")->setChecked(true); break; - case 4: chunkSizeMenuItem("chunkActFour")->setChecked(true); break; - default: break; + case 1: chunkSizeMenuItem("chunkActOne")->setChecked(true); break; + case 2: chunkSizeMenuItem("chunkActTwo")->setChecked(true); break; + case 4: chunkSizeMenuItem("chunkActFour")->setChecked(true); break; + default: break; } } diff --git a/src/osd/sdl/debugqtview.c b/src/osd/sdl/debugqtview.c index be5751f7ba8..bf2d4b7ea7b 100644 --- a/src/osd/sdl/debugqtview.c +++ b/src/osd/sdl/debugqtview.c @@ -30,8 +30,8 @@ DebuggerView::DebuggerView(const debug_view_type& type, DebuggerView::~DebuggerView() { - if (m_machine && m_view) - m_machine->debug_view().free_view(*m_view); + if (m_machine && m_view) + m_machine->debug_view().free_view(*m_view); } diff --git a/src/version.c b/src/version.c index fb61217d299..61bfad493c1 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.148u2 ("__DATE__")"; +const char build_version[] = "0.148u3 ("__DATE__")"; |