From 31387945c8dc0da124e5a752df3bbea311b294e1 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 7 Oct 2012 09:12:56 +0000 Subject: [PATCH] srcclean (nw) --- hash/a2600.xml | 4 +- hash/cbm2_cart.xml | 16 +- hash/cbm2_flop.xml | 4 +- hash/p500_flop.xml | 2 +- hash/pc8801_flop.xml | 2 +- hash/pc98.xml | 4 +- src/emu/clifront.c | 2 +- src/emu/cpu/tms0980/tms0980.c | 4 +- src/emu/devdelegate.c | 6 +- src/emu/devdelegate.h | 2 +- src/emu/device.h | 2 +- src/emu/driver.c | 2 +- src/emu/driver.h | 4 +- src/emu/machine/53c810.c | 4 +- src/emu/machine/ds75160a.h | 2 +- src/emu/machine/ds75161a.c | 2 +- src/emu/machine/ds75161a.h | 2 +- src/emu/machine/mos6526.c | 116 +++--- src/emu/machine/rtc4543.c | 8 +- src/emu/machine/s3c2400.c | 2 +- src/emu/machine/s3c2410.c | 2 +- src/emu/machine/scsibus.c | 2 +- src/emu/machine/seibu_cop.c | 16 +- src/emu/sound/sn76496.c | 2 +- src/emu/video/pc_vga.c | 28 +- src/emu/video/pc_vga.h | 12 +- src/emu/video/tms9928a.c | 4 +- src/mame/drivers/8080bw.c | 38 +- src/mame/drivers/blackt96.c | 2 +- src/mame/drivers/calchase.c | 2 +- src/mame/drivers/cd32.c | 2 +- src/mame/drivers/cdi.c | 2 +- src/mame/drivers/cps1.c | 8 +- src/mame/drivers/deshoros.c | 2 +- src/mame/drivers/firebeat.c | 2 +- src/mame/drivers/gammagic.c | 606 +++++++++++++++---------------- src/mame/drivers/ggconnie.c | 2 +- src/mame/drivers/intrscti.c | 4 +- src/mame/drivers/jack.c | 8 +- src/mame/drivers/jpmsys5.c | 12 +- src/mame/drivers/kontest.c | 2 +- src/mame/drivers/magictg.c | 2 +- src/mame/drivers/magtouch.c | 2 +- src/mame/drivers/mediagx.c | 24 +- src/mame/drivers/ninjakd2.c | 8 +- src/mame/drivers/nsm.c | 2 +- src/mame/drivers/pangofun.c | 2 +- src/mame/drivers/pcat_dyn.c | 2 +- src/mame/drivers/pcat_nit.c | 2 +- src/mame/drivers/pipedrm.c | 2 +- src/mame/drivers/pntnpuzl.c | 4 +- src/mame/drivers/queen.c | 2 +- src/mame/drivers/raiden2.c | 2 +- src/mame/drivers/saturn.c | 4 +- src/mame/drivers/savquest.c | 2 +- src/mame/drivers/shangha3.c | 8 +- src/mame/drivers/spectra.c | 32 +- src/mame/drivers/su2000.c | 2 +- src/mame/drivers/taitowlf.c | 2 +- src/mame/drivers/techno.c | 2 +- src/mame/drivers/vicdual.c | 28 +- src/mame/drivers/vlc.c | 252 ++++++------- src/mame/drivers/xtom3d.c | 2 +- src/mame/includes/archimds.h | 10 +- src/mame/includes/bfm_sc45.h | 2 +- src/mame/includes/bzone.h | 2 +- src/mame/includes/crbaloon.h | 2 +- src/mame/includes/deco32.h | 2 +- src/mame/includes/decocass.h | 8 +- src/mame/includes/dkong.h | 2 +- src/mame/includes/irobot.h | 2 +- src/mame/includes/kaneko16.h | 2 +- src/mame/includes/m79amb.h | 2 +- src/mame/includes/megadriv.h | 6 +- src/mame/includes/mw8080bw.h | 4 +- src/mame/includes/ninjakd2.h | 2 +- src/mame/includes/orbit.h | 2 +- src/mame/includes/stv.h | 4 +- src/mame/includes/vicdual.h | 2 +- src/mame/machine/archimds.c | 4 +- src/mame/machine/genpin.h | 2 +- src/mame/machine/megacd.c | 56 +-- src/mame/machine/megacd.h | 12 +- src/mame/machine/pcecommn.h | 8 +- src/mame/machine/seicop.c | 28 +- src/mame/video/awpvid.c | 4 +- src/mame/video/dkong.c | 10 +- src/mame/video/jack.c | 4 +- src/mame/video/ninjakd2.c | 6 +- src/mess/drivers/a2600.c | 18 +- src/mess/drivers/ami1200.c | 2 +- src/mess/drivers/amiga.c | 2 +- src/mess/drivers/astrocde.c | 2 +- src/mess/drivers/bml3.c | 4 +- src/mess/drivers/c128.c | 4 +- src/mess/drivers/c64.c | 4 +- src/mess/drivers/cbm2.c | 392 ++++++++++---------- src/mess/drivers/d6800.c | 2 +- src/mess/drivers/elwro800.c | 2 +- src/mess/drivers/indiana.c | 4 +- src/mess/drivers/jr100.c | 4 +- src/mess/drivers/korgm1.c | 40 +- src/mess/drivers/n64.c | 2 +- src/mess/drivers/pc8801.c | 4 +- src/mess/drivers/pv9234.c | 4 +- src/mess/drivers/rainbow.c | 2 +- src/mess/drivers/test_t400.c | 2 +- src/mess/drivers/ti99_4p.c | 2 +- src/mess/drivers/ti99_4x.c | 2 +- src/mess/drivers/tm990189.c | 2 +- src/mess/drivers/vic10.c | 4 +- src/mess/drivers/x68k.c | 2 +- src/mess/drivers/xerox820.c | 4 +- src/mess/drivers/xor100.c | 2 +- src/mess/includes/atarist.h | 2 +- src/mess/includes/cbm2.h | 10 +- src/mess/includes/comquest.h | 2 +- src/mess/includes/concept.h | 6 +- src/mess/includes/dccons.h | 10 +- src/mess/includes/fmtowns.h | 2 +- src/mess/includes/kramermc.h | 2 +- src/mess/includes/vtech2.h | 8 +- src/mess/includes/x68k.h | 8 +- src/mess/machine/a2arcadebd.c | 8 +- src/mess/machine/amigakbd.h | 12 +- src/mess/machine/bebox.c | 86 ++--- src/mess/machine/cbm2_graphic.c | 60 +-- src/mess/machine/kr2376.c | 2 +- src/mess/machine/msx.c | 2 +- src/mess/machine/pc.c | 20 +- src/mess/machine/rx01.c | 4 +- src/mess/machine/vtech2.c | 2 +- src/mess/video/isa_svga_cirrus.c | 4 +- src/mess/video/isa_svga_cirrus.h | 6 +- src/mess/video/isa_svga_s3.c | 2 +- src/mess/video/isa_svga_s3.h | 4 +- src/mess/video/isa_svga_tseng.c | 4 +- src/mess/video/isa_svga_tseng.h | 4 +- src/mess/video/isa_vga.c | 2 +- src/mess/video/isa_vga.h | 2 +- src/mess/video/isa_vga_ati.c | 4 +- src/mess/video/isa_vga_ati.h | 4 +- src/mess/video/nubus_vikbw.h | 2 +- 143 files changed, 1160 insertions(+), 1160 deletions(-) diff --git a/hash/a2600.xml b/hash/a2600.xml index 75a7572b409..d3248a7c3b1 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -355,7 +355,7 @@ Info from Atariage and Atarimania - + The Activision Decathlon 1983 Activision @@ -597,7 +597,7 @@ Info from Atariage and Atarimania - + Alpha Beam with Ernie (PAL) 1983 diff --git a/hash/cbm2_cart.xml b/hash/cbm2_cart.xml index cf8fa5a66a2..e40b422121f 100644 --- a/hash/cbm2_cart.xml +++ b/hash/cbm2_cart.xml @@ -6,7 +6,7 @@ Calc Result 1983 Handic Software - + @@ -24,7 +24,7 @@ ProfiText 198? <unknown> - + @@ -36,7 +36,7 @@ Demo 1 198? <unknown> - + @@ -52,7 +52,7 @@ Demo 2 198? <unknown> - + @@ -68,7 +68,7 @@ Moni610 2008 Ullrich von Bassewitz - + @@ -80,7 +80,7 @@ VT52 Emulator 1986 <unknown> - + @@ -92,7 +92,7 @@ High Resolution Graphics 198? Commodore - + @@ -106,7 +106,7 @@ Word Result 198? Handic Software - + diff --git a/hash/cbm2_flop.xml b/hash/cbm2_flop.xml index 977d3aa2084..a3cedcb0218 100644 --- a/hash/cbm2_flop.xml +++ b/hash/cbm2_flop.xml @@ -1,7 +1,7 @@ - + Factory Burn In Diagnostics for B Series 1983 @@ -13,7 +13,7 @@ - + Terminal Version 2.0 for B Series 1983 diff --git a/hash/p500_flop.xml b/hash/p500_flop.xml index 0988f3c4d62..fce7444b933 100644 --- a/hash/p500_flop.xml +++ b/hash/p500_flop.xml @@ -1,7 +1,7 @@ - + Factory Burn In Diagnostics for P500 1983 diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml index d9ca6aeb7d3..0d5f012c3f2 100644 --- a/hash/pc8801_flop.xml +++ b/hash/pc8801_flop.xml @@ -54516,7 +54516,7 @@ ExtractDisk [02]"DATA_DISK " -> "ncs music art v.2_02.d88" - diff --git a/src/emu/clifront.c b/src/emu/clifront.c index a47cf14bc82..4fb86daae35 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -1283,7 +1283,7 @@ void cli_frontend::listsoftware(const char *gamename) /*------------------------------------------------- - verifysoftware - verify roms from the software + verifysoftware - verify roms from the software list of the specified driver(s) -------------------------------------------------*/ void cli_frontend::verifysoftware(const char *gamename) diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index a018de90f4a..474e8da9b44 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -269,7 +269,7 @@ struct tms0980_state const tms0980_config *config; address_space *program; address_space *data; - + devcb_resolved_read8 m_read_k; devcb_resolved_write16 m_write_o; devcb_resolved_write16 m_write_r; @@ -509,7 +509,7 @@ static void cpu_init_tms_common( legacy_cpu_device *device, const UINT32* decode cpustate->program = &device->space( AS_PROGRAM ); cpustate->data = &device->space( AS_PROGRAM ); - + cpustate->m_read_k.resolve(cpustate->config->read_k, *device); cpustate->m_write_o.resolve(cpustate->config->write_o, *device); cpustate->m_write_r.resolve(cpustate->config->write_r, *device); diff --git a/src/emu/devdelegate.c b/src/emu/devdelegate.c index c0a661fff7f..1018a314e66 100644 --- a/src/emu/devdelegate.c +++ b/src/emu/devdelegate.c @@ -42,8 +42,8 @@ //------------------------------------------------- // bound_object - use the device name to locate -// a device relative to the given search root; -// fatal error if not found +// a device relative to the given search root; +// fatal error if not found //------------------------------------------------- delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) @@ -57,7 +57,7 @@ delegate_late_bind &device_delegate_helper::bound_object(device_t &search_root) //------------------------------------------------- // safe_tag - return a tag string or (unknown) if -// the object is not valid +// the object is not valid //------------------------------------------------- const char *device_delegate_helper::safe_tag(device_t *object) diff --git a/src/emu/devdelegate.h b/src/emu/devdelegate.h index 8c5987fe872..d641813a893 100644 --- a/src/emu/devdelegate.h +++ b/src/emu/devdelegate.h @@ -57,7 +57,7 @@ class device_delegate_helper protected: // constructor device_delegate_helper(const char *devname) : m_device_name(devname) { } - + // internal helpers delegate_late_bind &bound_object(device_t &search_root); static const char *safe_tag(device_t *object); diff --git a/src/emu/device.h b/src/emu/device.h index 5c281502934..194cc3b80f9 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -987,7 +987,7 @@ inline device_t *device_t::siblingdevice(const char *tag) const // query relative to the parent, if we have one if (m_owner != NULL) return m_owner->subdevice(tag); - + // otherwise, it's NULL unless the tag is absolute return (tag[0] == ':') ? subdevice(tag) : NULL; } diff --git a/src/emu/driver.c b/src/emu/driver.c index 618c37aeb94..20077c6b650 100644 --- a/src/emu/driver.c +++ b/src/emu/driver.c @@ -42,7 +42,7 @@ //************************************************************************** -// ADDRESS_MAPS +// ADDRESS_MAPS //************************************************************************** // default address map diff --git a/src/emu/driver.h b/src/emu/driver.h index df2e9854c60..de3648d8a77 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -166,7 +166,7 @@ typedef void (*legacy_callback_func)(running_machine &machine); // ======================> driver_device // base class for machine driver-specific devices -class driver_device : public device_t, +class driver_device : public device_t, public device_memory_interface { public: @@ -204,7 +204,7 @@ public: // dummy driver_init callbacks void init_0() { } - + // memory helpers address_space &generic_space() const { return space(AS_PROGRAM); } diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c index a96eb514c8a..a1811949c48 100644 --- a/src/emu/machine/53c810.c +++ b/src/emu/machine/53c810.c @@ -393,7 +393,7 @@ void lsi53c810_device::dma_exec() UINT8 lsi53c810_device::lsi53c810_reg_r( int offset ) { -// logerror("53c810: read reg %d:0x%x (PC=%x)\n", offset, offset, space.device().safe_pc()); +// logerror("53c810: read reg %d:0x%x (PC=%x)\n", offset, offset, space.device().safe_pc()); switch(offset) { case 0x00: /* SCNTL0 */ @@ -476,7 +476,7 @@ UINT8 lsi53c810_device::lsi53c810_reg_r( int offset ) void lsi53c810_device::lsi53c810_reg_w(int offset, UINT8 data) { -// logerror("53c810: %02x to reg %d:0x%x (PC=%x)\n", data, offset, offset, space.device().safe_pc()); +// logerror("53c810: %02x to reg %d:0x%x (PC=%x)\n", data, offset, offset, space.device().safe_pc()); switch(offset) { case 0x00: /* SCNTL0 */ diff --git a/src/emu/machine/ds75160a.h b/src/emu/machine/ds75160a.h index 86ed7502523..b274eed7965 100644 --- a/src/emu/machine/ds75160a.h +++ b/src/emu/machine/ds75160a.h @@ -81,7 +81,7 @@ private: devcb_resolved_write8 m_out_bus_func; UINT8 m_data; - + int m_te; int m_pe; }; diff --git a/src/emu/machine/ds75161a.c b/src/emu/machine/ds75161a.c index 94580943dd9..faa574b7c91 100644 --- a/src/emu/machine/ds75161a.c +++ b/src/emu/machine/ds75161a.c @@ -95,7 +95,7 @@ void ds75161a_device::device_start() m_in_eoi_func.resolve(m_in_eoi_cb, *this); m_in_atn_func.resolve(m_in_atn_cb, *this); m_in_srq_func.resolve(m_in_srq_cb, *this); - + m_out_ren_func.resolve(m_out_ren_cb, *this); m_out_ifc_func.resolve(m_out_ifc_cb, *this); m_out_ndac_func.resolve(m_out_ndac_cb, *this); diff --git a/src/emu/machine/ds75161a.h b/src/emu/machine/ds75161a.h index dc5a9b8fcdc..78c37b6f51d 100644 --- a/src/emu/machine/ds75161a.h +++ b/src/emu/machine/ds75161a.h @@ -91,7 +91,7 @@ public: DECLARE_READ_LINE_MEMBER( eoi_r ); DECLARE_READ_LINE_MEMBER( atn_r ); DECLARE_READ_LINE_MEMBER( srq_r ); - + DECLARE_WRITE_LINE_MEMBER( ren_w ); DECLARE_WRITE_LINE_MEMBER( ifc_w ); DECLARE_WRITE_LINE_MEMBER( ndac_w ); diff --git a/src/emu/machine/mos6526.c b/src/emu/machine/mos6526.c index 6bb967730de..8ae2b64b7b3 100644 --- a/src/emu/machine/mos6526.c +++ b/src/emu/machine/mos6526.c @@ -9,17 +9,17 @@ /* - TODO: + TODO: - - pass Lorenz test suite 2.15 - - ICR01 - - IMR - - CIA1TA/TB - - CIA2TA/TB - - pass VICE cia tests - - 8520 read/write - - 5710 read/write - - optimize + - pass Lorenz test suite 2.15 + - ICR01 + - IMR + - CIA1TA/TB + - CIA2TA/TB + - pass VICE cia tests + - 8520 read/write + - 5710 read/write + - optimize */ @@ -49,7 +49,7 @@ enum SDR, ICR, IMR = ICR, CRA, - CRB + CRB }; @@ -79,13 +79,13 @@ enum #define CRA_START 0x01 #define CRA_STARTED BIT(m_cra, 0) -#define CRA_PBON BIT(m_cra, 1) +#define CRA_PBON BIT(m_cra, 1) #define CRA_OUTMODE BIT(m_cra, 2) #define CRA_RUNMODE BIT(m_cra, 3) #define CRA_LOAD BIT(m_cra, 4) -#define CRA_INMODE BIT(m_cra, 5) -#define CRA_SPMODE BIT(m_cra, 6) -#define CRA_TODIN BIT(m_cra, 7) +#define CRA_INMODE BIT(m_cra, 5) +#define CRA_SPMODE BIT(m_cra, 6) +#define CRA_TODIN BIT(m_cra, 7) // control register B @@ -99,12 +99,12 @@ enum #define CRB_START 0x01 #define CRB_STARTED BIT(m_crb, 0) -#define CRB_PBON BIT(m_crb, 1) +#define CRB_PBON BIT(m_crb, 1) #define CRB_OUTMODE BIT(m_crb, 2) #define CRB_RUNMODE BIT(m_crb, 3) -#define CRB_LOAD BIT(m_crb, 4) -#define CRB_INMODE ((m_crb & 0x60) >> 5) -#define CRB_ALARM BIT(m_crb, 7) +#define CRB_LOAD BIT(m_crb, 4) +#define CRB_INMODE ((m_crb & 0x60) >> 5) +#define CRB_ALARM BIT(m_crb, 7) @@ -253,7 +253,7 @@ inline UINT8 mos6526_device::bcd_increment(UINT8 value) if ((value & 0x0f) >= 0x0a) value += 0x10 - 0x0a; - + return value; } @@ -270,7 +270,7 @@ inline void mos6526_device::clock_tod() UINT8 hour = (UINT8) (m_tod >> 24); m_tod_count++; - + if (m_tod_count == (CRA_TODIN ? 5 : 6)) { m_tod_count = 0; @@ -531,7 +531,7 @@ inline void mos6526_device::clock_pipeline() { // timer A pipeline m_count_a3 = m_count_a2; - + switch (CRA_INMODE) { case CRA_INMODE_PHI2: @@ -566,11 +566,11 @@ inline void mos6526_device::clock_pipeline() case CRB_INMODE_CNT: m_count_b2 = m_count_b1; break; - + case CRB_INMODE_TA: m_count_b2 = m_ta_out; break; - + case CRB_INMODE_CNT_TA: m_count_b2 = m_ta_out && m_cnt; break; @@ -594,7 +594,7 @@ inline void mos6526_device::clock_pipeline() //------------------------------------------------- -// synchronize - +// synchronize - //------------------------------------------------- inline void mos6526_device::synchronize() @@ -709,7 +709,7 @@ void mos6526_device::device_start() save_item(NAME(m_tb_latch)); save_item(NAME(m_cra)); save_item(NAME(m_crb)); - + save_item(NAME(m_tod_count)); save_item(NAME(m_tod)); save_item(NAME(m_tod_latch)); @@ -838,7 +838,7 @@ READ8_MEMBER( mos6526_device::read ) case PRB: data = (m_in_pb_func(0) & ~m_ddrb) | (m_prb & m_ddrb); - + if (CRA_PBON) { int pb6 = CRA_OUTMODE ? m_ta_pb6 : m_ta_out; @@ -854,49 +854,49 @@ READ8_MEMBER( mos6526_device::read ) data &= ~0x80; data |= pb7 << 7; } - + m_pc = 0; m_out_pc_func(m_pc); break; - + case DDRA: data = m_ddra; break; - + case DDRB: data = m_ddrb; break; - + case TA_LO: data = m_ta & 0xff; break; - + case TA_HI: data = m_ta >> 8; break; - + case TB_LO: data = m_tb & 0xff; break; - + case TB_HI: data = m_tb >> 8; break; - + case TOD_10THS: data = read_tod(0); m_tod_latched = false; break; - + case TOD_SEC: data = read_tod(1); break; - + case TOD_MIN: data = read_tod(2); break; - + case TOD_HR: if (!m_tod_latched) { @@ -906,11 +906,11 @@ READ8_MEMBER( mos6526_device::read ) data = read_tod(3); break; - + case SDR: data = m_sdr; break; - + case ICR: data = (m_ir1 << 7) | m_icr; @@ -922,11 +922,11 @@ READ8_MEMBER( mos6526_device::read ) m_irq = false; m_out_irq_func(CLEAR_LINE); break; - + case CRA: data = m_cra; break; - + case CRB: data = m_crb; break; @@ -952,21 +952,21 @@ WRITE8_MEMBER( mos6526_device::write ) case PRB: m_prb = data; update_pb(); - + m_pc = 0; m_out_pc_func(m_pc); break; - + case DDRA: m_ddra = data; update_pa(); break; - + case DDRB: m_ddrb = data; update_pb(); break; - + case TA_LO: m_ta_latch = (m_ta_latch & 0xff00) | data; @@ -975,7 +975,7 @@ WRITE8_MEMBER( mos6526_device::write ) m_ta = (m_ta & 0xff00) | data; } break; - + case TA_HI: m_ta_latch = (data << 8) | (m_ta_latch & 0xff); @@ -989,7 +989,7 @@ WRITE8_MEMBER( mos6526_device::write ) m_ta = (data << 8) | (m_ta & 0xff); } break; - + case TB_LO: m_tb_latch = (m_tb_latch & 0xff00) | data; @@ -998,7 +998,7 @@ WRITE8_MEMBER( mos6526_device::write ) m_tb = (m_tb & 0xff00) | data; } break; - + case TB_HI: m_tb_latch = (data << 8) | (m_tb_latch & 0xff); @@ -1012,21 +1012,21 @@ WRITE8_MEMBER( mos6526_device::write ) m_tb = (data << 8) | (m_tb & 0xff); } break; - + case TOD_10THS: write_tod(0, data); m_tod_stopped = false; break; - + case TOD_SEC: write_tod(1, data); break; - + case TOD_MIN: write_tod(2, data); break; - + case TOD_HR: m_tod_stopped = true; @@ -1038,12 +1038,12 @@ WRITE8_MEMBER( mos6526_device::write ) write_tod(3, data); break; - + case SDR: m_sdr = data; m_sdr_empty = false; break; - + case IMR: if (IMR_SET) { @@ -1059,11 +1059,11 @@ WRITE8_MEMBER( mos6526_device::write ) m_ir0 = 1; } break; - + case CRA: set_cra(data); break; - + case CRB: set_crb(data); break; @@ -1134,7 +1134,7 @@ WRITE_LINE_MEMBER( mos6526_device::cnt_w ) m_count_a0 = 1; m_count_b0 = 1; } - + m_cnt = state; } diff --git a/src/emu/machine/rtc4543.c b/src/emu/machine/rtc4543.c index bce0e766991..878e6e3cc63 100644 --- a/src/emu/machine/rtc4543.c +++ b/src/emu/machine/rtc4543.c @@ -2,9 +2,9 @@ rtc4543.c - Epson R4543 real-time clock chip emulation by R. Belmont - + TODO: writing (not done by System 12 or 23 so no test case) - + **********************************************************************/ #include "rtc4543.h" @@ -93,8 +93,8 @@ void rtc4543_device::rtc_clock_updated(int year, int month, int day, int day_of_ { static const int weekday[7] = { 7, 1, 2, 3, 4, 5, 6 }; - m_regs[0] = make_bcd(second); // seconds (BCD, 0-59) in bits 0-6, bit 7 = battery low - m_regs[1] = make_bcd(minute); // minutes (BCD, 0-59) + m_regs[0] = make_bcd(second); // seconds (BCD, 0-59) in bits 0-6, bit 7 = battery low + m_regs[1] = make_bcd(minute); // minutes (BCD, 0-59) m_regs[2] = make_bcd(hour); // hour (BCD, 0-23) m_regs[3] = make_bcd(weekday[day_of_week]); // low nibble = day of the week m_regs[3] |= (make_bcd(day) & 0x0f)<<4; // high nibble = low digit of day diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c index 01359553535..60479565893 100644 --- a/src/emu/machine/s3c2400.c +++ b/src/emu/machine/s3c2400.c @@ -62,7 +62,7 @@ DEVICE_START( s3c2400 ) space.install_legacy_readwrite_handler( *device, 0x15800000, 0x15800007, FUNC(s3c24xx_adc_r), FUNC(s3c24xx_adc_w)); space.install_legacy_readwrite_handler( *device, 0x15900000, 0x15900017, FUNC(s3c24xx_spi_0_r), FUNC(s3c24xx_spi_0_w)); space.install_legacy_readwrite_handler( *device, 0x15a00000, 0x15a0003f, FUNC(s3c24xx_mmc_r), FUNC(s3c24xx_mmc_w)); - + s3c24xx_video_start( device, device->machine()); } diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c index cb404c03853..f02dd3e048a 100644 --- a/src/emu/machine/s3c2410.c +++ b/src/emu/machine/s3c2410.c @@ -65,7 +65,7 @@ DEVICE_START( s3c2410 ) space.install_legacy_readwrite_handler( *device, 0x59000000, 0x59000017, FUNC(s3c24xx_spi_0_r), FUNC(s3c24xx_spi_0_w)); space.install_legacy_readwrite_handler( *device, 0x59000020, 0x59000037, FUNC(s3c24xx_spi_1_r), FUNC(s3c24xx_spi_1_w)); space.install_legacy_readwrite_handler( *device, 0x5a000000, 0x5a000043, FUNC(s3c24xx_sdi_r), FUNC(s3c24xx_sdi_w)); - + s3c24xx_video_start( device, device->machine()); } diff --git a/src/emu/machine/scsibus.c b/src/emu/machine/scsibus.c index 9b0419534e1..917d5278bc8 100644 --- a/src/emu/machine/scsibus.c +++ b/src/emu/machine/scsibus.c @@ -406,7 +406,7 @@ void scsibus_device::scsi_in_line_changed(UINT8 line, UINT8 state) if(state) { data_idx++; - + // If the data buffer is full flush it to the SCSI disk data_last = (bytes_left >= sectorbytes) ? sectorbytes : bytes_left; diff --git a/src/emu/machine/seibu_cop.c b/src/emu/machine/seibu_cop.c index e00762da95b..a15751f0d44 100644 --- a/src/emu/machine/seibu_cop.c +++ b/src/emu/machine/seibu_cop.c @@ -178,13 +178,13 @@ WRITE16_MEMBER(seibu_cop_device::pal_brightness_mode_w) WRITE16_MEMBER(seibu_cop_device::dma_unk_param_w) { /* - This sets up a DMA mode of some sort - 0x0e00: grainbow, cupsoc - 0x0a00: legionna, godzilla, denjinmk - 0x0600: heatbrl - 0x1e00: zeroteam, xsedae - raiden2 and raidendx doesn't set this up, this could indicate that this is related to the non-private buffer DMAs - (both only uses 0x14 and 0x15 as DMAs afaik) + This sets up a DMA mode of some sort + 0x0e00: grainbow, cupsoc + 0x0a00: legionna, godzilla, denjinmk + 0x0600: heatbrl + 0x1e00: zeroteam, xsedae + raiden2 and raidendx doesn't set this up, this could indicate that this is related to the non-private buffer DMAs + (both only uses 0x14 and 0x15 as DMAs afaik) */ COMBINE_DATA(&m_dma_unk_param); } @@ -271,7 +271,7 @@ void seibu_cop_device::palette_dma_transfer(void) 0x86 is used by Seibu Cup Soccer 0x87 is used by Denjin Makai - TODO: + TODO: - Denjin Makai mode 4 is totally guessworked. - SD Gundam doesn't fade colors correctly, it should have the text layer / sprites with normal gradient and the rest dimmed in most cases, presumably bad RAM table or bad algorithm diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index d3ff82bd1ed..3d1fe5af251 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -104,7 +104,7 @@ frequency register, while the others have 0x400 as before. Should fix a bug or two on sega games, particularly Vigilante on Sega Master System. Verified on SMS hardware. - + 27/06/2012: Michael Zapf Converted to modern device, legacy devices were gradually removed afterwards. diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 49fe33f6039..5b1bab0dcd6 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -203,15 +203,15 @@ void vga_device::device_start() // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; - - // copy over interfaces - vga.read_dipswitch = read8_delegate(); //read_dipswitch; + + // copy over interfaces + vga.read_dipswitch = read8_delegate(); //read_dipswitch; vga.svga_intf.vram_size = 0x100000; vga.svga_intf.seq_regcount = 0x05; vga.svga_intf.crtc_regcount = 0x19; - vga.memory = auto_alloc_array_clear(machine(), UINT8, vga.svga_intf.vram_size); + vga.memory = auto_alloc_array_clear(machine(), UINT8, vga.svga_intf.vram_size); } void svga_device::device_start() @@ -231,15 +231,15 @@ void cirrus_vga_device::device_start() // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; - - // copy over interfaces - vga.read_dipswitch = read8_delegate(); //read_dipswitch; + + // copy over interfaces + vga.read_dipswitch = read8_delegate(); //read_dipswitch; vga.svga_intf.vram_size = 0x200000; vga.svga_intf.seq_regcount = 0x08; vga.svga_intf.crtc_regcount = 0x19; - vga.memory = auto_alloc_array_clear(machine(), UINT8, vga.svga_intf.vram_size); + vga.memory = auto_alloc_array_clear(machine(), UINT8, vga.svga_intf.vram_size); } void ati_vga_device::device_start() @@ -1599,25 +1599,25 @@ READ8_MEMBER(vga_device::port_03c0_r) case 3: if (!vga.read_dipswitch.isnull() && vga.read_dipswitch(space, 0, mem_mask) & 0x01) data |= 0x10; - else + else data |= 0x10; break; case 2: if (!vga.read_dipswitch.isnull() && vga.read_dipswitch(space, 0, mem_mask) & 0x02) data |= 0x10; - else + else data |= 0x10; break; case 1: if (!vga.read_dipswitch.isnull() && vga.read_dipswitch(space, 0, mem_mask) & 0x04) data |= 0x10; - else + else data |= 0x10; break; case 0: if (!vga.read_dipswitch.isnull() && vga.read_dipswitch(space, 0, mem_mask) & 0x08) data |= 0x10; - else + else data |= 0x10; break; } @@ -2045,7 +2045,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_trident_vga ) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0) MACHINE_CONFIG_END @@ -2055,7 +2055,7 @@ MACHINE_CONFIG_FRAGMENT( pcvideo_cirrus_vga ) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", CIRRUS_VGA, 0) MACHINE_CONFIG_END diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h index 3b6455185ef..add761b2e19 100644 --- a/src/emu/video/pc_vga.h +++ b/src/emu/video/pc_vga.h @@ -27,7 +27,7 @@ public: virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - + virtual READ8_MEMBER(port_03b0_r); virtual WRITE8_MEMBER(port_03b0_w); virtual READ8_MEMBER(port_03c0_r); @@ -48,7 +48,7 @@ protected: void vga_vh_vga(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_cga(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_mono(bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual UINT8 pc_vga_choosevideomode(); + virtual UINT8 pc_vga_choosevideomode(); void recompute_params_clock(int divisor, int xtal); UINT8 crtc_reg_read(UINT8 index); void recompute_params(); @@ -64,7 +64,7 @@ private: inline UINT8 rotate_right(UINT8 val); inline UINT8 vga_logical_op(UINT8 data, UINT8 plane, UINT8 mask); inline UINT8 vga_latch_write(int offs, UINT8 data); - + protected: struct { @@ -183,7 +183,7 @@ protected: /* oak vga */ struct { UINT8 reg; } oak; - } vga; + } vga; }; @@ -196,7 +196,7 @@ class svga_device : public vga_device { public: // construction/destruction - svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); + svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: @@ -588,7 +588,7 @@ public: virtual WRITE8_MEMBER(port_03d0_w); virtual READ8_MEMBER(mem_r); virtual WRITE8_MEMBER(mem_w); - + protected: private: }; diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c index 92ebd850b4e..8f8e4a905e8 100644 --- a/src/emu/video/tms9928a.c +++ b/src/emu/video/tms9928a.c @@ -97,7 +97,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type typ { m_50hz = is_50hz; m_reva = is_reva; -// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap)); +// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap)); } @@ -108,7 +108,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag { m_50hz = false; m_reva = true; -// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap)); +// static_set_addrmap(*this, AS_DATA, ADDRESS_MAP_NAME(memmap)); } diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 3709416472a..6a87a82c619 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -2343,7 +2343,7 @@ Claybuster is on the same hardware, PCB labels CS 235A and CS 238A as well TIMER_DEVICE_CALLBACK_MEMBER(_8080bw_state::claybust_gun_callback) { - + // reset gun latch m_claybust_gun_pos = 0; } @@ -2358,23 +2358,23 @@ INPUT_CHANGED_MEMBER(_8080bw_state::claybust_gun_trigger) if (newval) { /* - The game registers a valid shot after the gun trigger is pressed, and IN1 d0 is high. - It latches the gun position and then compares it with VRAM contents: 1 byte/8 pixels, 0 means miss. - IN1 d0 probably indicates if the latch is ready or not (glitches happen otherwise) + The game registers a valid shot after the gun trigger is pressed, and IN1 d0 is high. + It latches the gun position and then compares it with VRAM contents: 1 byte/8 pixels, 0 means miss. + IN1 d0 probably indicates if the latch is ready or not (glitches happen otherwise) - in $06 - cpi $04 - rc - mov h,a - in $02 - mov l,a - lxi d,$1ffe <-- this is where the +2 comes from - dad d - out $00 - mov a,m - ana a - rz - */ + in $06 + cpi $04 + rc + mov h,a + in $02 + mov l,a + lxi d,$1ffe <-- this is where the +2 comes from + dad d + out $00 + mov a,m + ana a + rz + */ UINT8 gunx = ioport("GUNX")->read_safe(0x00); UINT8 guny = ioport("GUNY")->read_safe(0x20); m_claybust_gun_pos = ((gunx >> 3) | (guny << 5)) + 2; @@ -2426,7 +2426,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( gunchamp ) PORT_INCLUDE( claybust ) - + PORT_MODIFY("IN1") // switch is 6-pos, but DNS06:5 and DNS06:6 are not connected @@ -2461,7 +2461,7 @@ MACHINE_CONFIG_DERIVED_CLASS( claybust, invaders, _8080bw_state ) MCFG_TIMER_DRIVER_ADD("claybust_gun", _8080bw_state, claybust_gun_callback) - MCFG_MACHINE_START_OVERRIDE(_8080bw_state, claybust) + MCFG_MACHINE_START_OVERRIDE(_8080bw_state, claybust) /* sound hardware */ // TODO: discrete sound diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index d8047f88840..33eeaf1c9f0 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -362,7 +362,7 @@ static INPUT_PORTS_START( blackt96 ) PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - + #if 0 PORT_START("IN2") PORT_DIPNAME( 0x0001, 0x0001, "2" ) diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c index 04285f11083..ee75c3ac687 100644 --- a/src/mame/drivers/calchase.c +++ b/src/mame/drivers/calchase.c @@ -601,7 +601,7 @@ static ADDRESS_MAP_START( calchase_io, AS_IO, 32, calchase_state ) AM_RANGE(0x03a0, 0x03a7) AM_NOP //To debug AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", trident_vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", trident_vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03e0, 0x03ef) AM_NOP //To debug AM_RANGE(0x0378, 0x037f) AM_NOP //To debug // AM_RANGE(0x0300, 0x03af) AM_NOP diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c index 04e2fea7973..bc3b59d284f 100644 --- a/src/mame/drivers/cd32.c +++ b/src/mame/drivers/cd32.c @@ -1475,7 +1475,7 @@ DRIVER_INIT_MEMBER(cd32_state,odeontw2) /***************************************************************************************************/ // these are clones of the cd32 SYSTEM because they run on a stock retail unit, with additional HW -GAME( 1993, cd32bios, 0, cd32base, cd32, cd32_state, cd32, ROT0, "Commodore Business Machines", "CD32 Bios", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND | GAME_IS_BIOS_ROOT ) +GAME( 1993, cd32bios, 0, cd32base, cd32, cd32_state, cd32, ROT0, "Commodore Business Machines", "CD32 Bios", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND | GAME_IS_BIOS_ROOT ) GAME( 1995, cndypuzl, cd32bios, cd32base, cndypuzl, cd32_state, cndypuzl, ROT0, "CD Express", "Candy Puzzle (v1.0)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 1995, haremchl, cd32bios, cd32base, haremchl, cd32_state, haremchl, ROT0, "CD Express", "Harem Challenge", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 1995, lsrquiz, cd32bios, cd32base, lsrquiz, cd32_state, lsrquiz, ROT0, "CD Express", "Laser Quiz Italy", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) /* no player 2 inputs (ingame) */ diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c index 727546f789c..d555577deaa 100644 --- a/src/mame/drivers/cdi.c +++ b/src/mame/drivers/cdi.c @@ -625,7 +625,7 @@ CONS( 1991, cdimono1, 0, 0, cdimono1, cdi, driver_device, 0, // The Quizard games are RETAIL CD-i units, with additional JAMMA adapters & dongles for protection, hence being 'clones' of the system. -GAME( 1995, cdibios, 0, cdi_base, quizard, driver_device, 0, ROT0, "Philips", "CD-i Bios", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_IS_BIOS_ROOT ) +GAME( 1995, cdibios, 0, cdi_base, quizard, driver_device, 0, ROT0, "Philips", "CD-i Bios", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_IS_BIOS_ROOT ) // Working GAME( 1995, quizrd12, cdibios, quizrd12, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 1.2", GAME_IMPERFECT_SOUND | GAME_UNEMULATED_PROTECTION ) GAME( 1995, quizrd17, cdibios, quizrd17, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 1.7", GAME_IMPERFECT_SOUND | GAME_UNEMULATED_PROTECTION ) diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 50feb363ea8..3ba0262a7f0 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -3063,10 +3063,10 @@ static MACHINE_CONFIG_START( cps1_10MHz, cps_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on one of the input gates of the 74ls08@4J on GNG romboard 88620-b-2 */ -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(64*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) +// MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on one of the input gates of the 74ls08@4J on GNG romboard 88620-b-2 */ +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(64*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 ) MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2, 518, 64, 448, 259, 16, 240) /* guess: assume that CPS-1 uses the same exact timings as CPS-2 */ MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1) MCFG_SCREEN_VBLANK_DRIVER(cps_state, screen_eof_cps1) diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index 4f56c326f4e..79baeb878c4 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -59,7 +59,7 @@ protected: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); -public: +public: UINT32 screen_update_destiny(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 64f118c7f38..2da7cf0c306 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -217,7 +217,7 @@ public: DECLARE_WRITE32_MEMBER(lamp_output3_ppp_w); DECLARE_READ32_MEMBER(ppc_spu_share_r); DECLARE_WRITE32_MEMBER(ppc_spu_share_w); - DECLARE_READ16_MEMBER(spu_unk_r); + DECLARE_READ16_MEMBER(spu_unk_r); TIMER_CALLBACK_MEMBER(keyboard_timer_callback); }; diff --git a/src/mame/drivers/gammagic.c b/src/mame/drivers/gammagic.c index 11244897728..dff557abea3 100644 --- a/src/mame/drivers/gammagic.c +++ b/src/mame/drivers/gammagic.c @@ -15,7 +15,7 @@ V8000 platform includes: 1 Motherboard MICRONICS M55Hi-Plus PCI/ISA, Chipset INTEL i430HX (TRITON II), 64 MB Ram (4 SIMM M x 16 MB SIMM) On board Sound Blaster Vibra 16C chipset. 1 TOSHIBA CD-ROM or DVD-ROM Drive w/Bootable CD-ROM with Game. -1 OAK SVGA PCI Video Board. +1 OAK SVGA PCI Video Board. 1 Voodoo Graphics PCI Video Board, connected to the monitor. 1 21" SVGA Color Monitor, 16x9 Aspect, Vertical mount, with touchscreen. 1 Bally's IO-Board, Based on 68000 procesor as interface to all gaming devices @@ -88,7 +88,7 @@ public: device_t *m_pic8259_2; device_t *m_dma8237_1; device_t *m_dma8237_2; - + emu_timer *m_atapi_timer; //SCSIInstance *m_inserted_cdrom; @@ -101,7 +101,7 @@ public: /* memory */ UINT8 m_atapi_regs[ATAPI_REG_MAX]; UINT8 m_atapi_data[ATAPI_DATA_SIZE]; - + DECLARE_DRIVER_INIT(gammagic); }; @@ -221,324 +221,324 @@ static I8237_INTERFACE( dma8237_2_config ) /* static READ32_HANDLER( atapi_r ) { - gammagic_state *state = space.machine().driver_data(); - UINT8 *atapi_regs = state->m_atapi_regs; - //running_machine &machine = space.machine(); - int reg, data; + gammagic_state *state = space.machine().driver_data(); + UINT8 *atapi_regs = state->m_atapi_regs; + //running_machine &machine = space.machine(); + int reg, data; - if (mem_mask == 0x0000ffff) // word-wide command read - { + if (mem_mask == 0x0000ffff) // word-wide command read + { logerror("ATAPI: packet read = %04x\n", state->m_atapi_data[state->m_atapi_data_ptr]); - // assert IRQ and drop DRQ - if (state->m_atapi_data_ptr == 0 && state->m_atapi_data_len == 0) - { - // get the data from the device - if( state->m_atapi_xferlen > 0 ) - { - SCSIReadData( state->m_inserted_cdrom, state->m_atapi_data, state->m_atapi_xferlen ); - state->m_atapi_data_len = state->m_atapi_xferlen; - } + // assert IRQ and drop DRQ + if (state->m_atapi_data_ptr == 0 && state->m_atapi_data_len == 0) + { + // get the data from the device + if( state->m_atapi_xferlen > 0 ) + { + SCSIReadData( state->m_inserted_cdrom, state->m_atapi_data, state->m_atapi_xferlen ); + state->m_atapi_data_len = state->m_atapi_xferlen; + } - if (state->m_atapi_xfermod > MAX_TRANSFER_SIZE) - { - state->m_atapi_xferlen = MAX_TRANSFER_SIZE; - state->m_atapi_xfermod = state->m_atapi_xfermod - MAX_TRANSFER_SIZE; - } - else - { - state->m_atapi_xferlen = state->m_atapi_xfermod; - state->m_atapi_xfermod = 0; - } + if (state->m_atapi_xfermod > MAX_TRANSFER_SIZE) + { + state->m_atapi_xferlen = MAX_TRANSFER_SIZE; + state->m_atapi_xfermod = state->m_atapi_xfermod - MAX_TRANSFER_SIZE; + } + else + { + state->m_atapi_xferlen = state->m_atapi_xfermod; + state->m_atapi_xfermod = 0; + } - //verboselog\\( machine, 2, "atapi_r: atapi_xferlen=%d\n", state->m_atapi_xferlen ); - if( state->m_atapi_xferlen != 0 ) - { - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_SERVDSC; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; - } - else - { - logerror("ATAPI: dropping DRQ\n"); - atapi_regs[ATAPI_REG_CMDSTATUS] = 0; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; - } + //verboselog\\( machine, 2, "atapi_r: atapi_xferlen=%d\n", state->m_atapi_xferlen ); + if( state->m_atapi_xferlen != 0 ) + { + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_SERVDSC; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; + } + else + { + logerror("ATAPI: dropping DRQ\n"); + atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; + } - atapi_regs[ATAPI_REG_COUNTLOW] = state->m_atapi_xferlen & 0xff; - atapi_regs[ATAPI_REG_COUNTHIGH] = (state->m_atapi_xferlen>>8)&0xff; + atapi_regs[ATAPI_REG_COUNTLOW] = state->m_atapi_xferlen & 0xff; + atapi_regs[ATAPI_REG_COUNTHIGH] = (state->m_atapi_xferlen>>8)&0xff; - atapi_irq(space.machine(), ASSERT_LINE); - } + atapi_irq(space.machine(), ASSERT_LINE); + } - if( state->m_atapi_data_ptr < state->m_atapi_data_len ) - { - data = state->m_atapi_data[state->m_atapi_data_ptr++]; - data |= ( state->m_atapi_data[state->m_atapi_data_ptr++] << 8 ); - if( state->m_atapi_data_ptr >= state->m_atapi_data_len ) - { - - state->m_atapi_data_ptr = 0; - state->m_atapi_data_len = 0; + if( state->m_atapi_data_ptr < state->m_atapi_data_len ) + { + data = state->m_atapi_data[state->m_atapi_data_ptr++]; + data |= ( state->m_atapi_data[state->m_atapi_data_ptr++] << 8 ); + if( state->m_atapi_data_ptr >= state->m_atapi_data_len ) + { - if( state->m_atapi_xferlen == 0 ) - { - atapi_regs[ATAPI_REG_CMDSTATUS] = 0; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; - atapi_irq(space.machine(), ASSERT_LINE); - } - } - } - else - { - data = 0; - } - } - else - { - atapi_irq(space.machine(), CLEAR_LINE); - int shift; - shift = 0; - reg = offset<<2; - switch(mem_mask) - { - case 0x000000ff: - break; - case 0x0000ff00: - reg+=1; - data >>= 8; - shift=8; - break; - case 0x00ff0000: - reg+=2; - data >>=16; - shift=16; - break; - case 0xff000000: - reg+=3; - data >>=24; - shift=24; - break; - } - data = atapi_regs[reg]; - data <<= shift; - } - return data; + state->m_atapi_data_ptr = 0; + state->m_atapi_data_len = 0; + + if( state->m_atapi_xferlen == 0 ) + { + atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; + atapi_irq(space.machine(), ASSERT_LINE); + } + } + } + else + { + data = 0; + } + } + else + { + atapi_irq(space.machine(), CLEAR_LINE); + int shift; + shift = 0; + reg = offset<<2; + switch(mem_mask) + { + case 0x000000ff: + break; + case 0x0000ff00: + reg+=1; + data >>= 8; + shift=8; + break; + case 0x00ff0000: + reg+=2; + data >>=16; + shift=16; + break; + case 0xff000000: + reg+=3; + data >>=24; + shift=24; + break; + } + data = atapi_regs[reg]; + data <<= shift; + } + return data; } static WRITE32_HANDLER( atapi_w ) { - gammagic_state *state = space.machine().driver_data(); - UINT8 *atapi_regs = state->m_atapi_regs; - UINT8 *atapi_data = state->m_atapi_data; - int reg; - if (mem_mask == 0x0000ffff) // word-wide command write - { - atapi_data[state->m_atapi_data_ptr++] = data & 0xff; - atapi_data[state->m_atapi_data_ptr++] = data >> 8; + gammagic_state *state = space.machine().driver_data(); + UINT8 *atapi_regs = state->m_atapi_regs; + UINT8 *atapi_data = state->m_atapi_data; + int reg; + if (mem_mask == 0x0000ffff) // word-wide command write + { + atapi_data[state->m_atapi_data_ptr++] = data & 0xff; + atapi_data[state->m_atapi_data_ptr++] = data >> 8; - if (state->m_atapi_cdata_wait) - { - logerror("ATAPI: waiting, ptr %d wait %d\n", state->m_atapi_data_ptr, state->m_atapi_cdata_wait); - if (state->m_atapi_data_ptr == state->m_atapi_cdata_wait) - { - // send it to the device - SCSIWriteData( state->m_inserted_cdrom, atapi_data, state->m_atapi_cdata_wait ); + if (state->m_atapi_cdata_wait) + { + logerror("ATAPI: waiting, ptr %d wait %d\n", state->m_atapi_data_ptr, state->m_atapi_cdata_wait); + if (state->m_atapi_data_ptr == state->m_atapi_cdata_wait) + { + // send it to the device + SCSIWriteData( state->m_inserted_cdrom, atapi_data, state->m_atapi_cdata_wait ); - // assert IRQ - atapi_irq(space.machine(), ASSERT_LINE); + // assert IRQ + atapi_irq(space.machine(), ASSERT_LINE); - // not sure here, but clear DRQ at least? - atapi_regs[ATAPI_REG_CMDSTATUS] = 0; - } - } + // not sure here, but clear DRQ at least? + atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + } + } - else if ( state->m_atapi_data_ptr == 12 ) - { - int phase; - // reset data pointer for reading SCSI results - state->m_atapi_data_ptr = 0; - state->m_atapi_data_len = 0; + else if ( state->m_atapi_data_ptr == 12 ) + { + int phase; + // reset data pointer for reading SCSI results + state->m_atapi_data_ptr = 0; + state->m_atapi_data_len = 0; - // send it to the SCSI device - SCSISetCommand( state->m_inserted_cdrom, state->m_atapi_data, 12 ); - SCSIExecCommand( state->m_inserted_cdrom, &state->m_atapi_xferlen ); - SCSIGetPhase( state->m_inserted_cdrom, &phase ); + // send it to the SCSI device + SCSISetCommand( state->m_inserted_cdrom, state->m_atapi_data, 12 ); + SCSIExecCommand( state->m_inserted_cdrom, &state->m_atapi_xferlen ); + SCSIGetPhase( state->m_inserted_cdrom, &phase ); - if (state->m_atapi_xferlen != -1) - { - logerror("ATAPI: SCSI command %02x returned %d bytes from the device\n", atapi_data[0]&0xff, state->m_atapi_xferlen); + if (state->m_atapi_xferlen != -1) + { + logerror("ATAPI: SCSI command %02x returned %d bytes from the device\n", atapi_data[0]&0xff, state->m_atapi_xferlen); - // store the returned command length in the ATAPI regs, splitting into - // multiple transfers if necessary - state->m_atapi_xfermod = 0; - if (state->m_atapi_xferlen > MAX_TRANSFER_SIZE) - { - state->m_atapi_xfermod = state->m_atapi_xferlen - MAX_TRANSFER_SIZE; - state->m_atapi_xferlen = MAX_TRANSFER_SIZE; - } - - atapi_regs[ATAPI_REG_COUNTLOW] = state->m_atapi_xferlen & 0xff; - atapi_regs[ATAPI_REG_COUNTHIGH] = (state->m_atapi_xferlen>>8)&0xff; + // store the returned command length in the ATAPI regs, splitting into + // multiple transfers if necessary + state->m_atapi_xfermod = 0; + if (state->m_atapi_xferlen > MAX_TRANSFER_SIZE) + { + state->m_atapi_xfermod = state->m_atapi_xferlen - MAX_TRANSFER_SIZE; + state->m_atapi_xferlen = MAX_TRANSFER_SIZE; + } - if (state->m_atapi_xferlen == 0) - { - // if no data to return, set the registers properly - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRDY; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO|ATAPI_INTREASON_COMMAND; - } - else - { - // indicate data ready: set DRQ and DMA ready, and IO in INTREASON - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_SERVDSC; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; - } + atapi_regs[ATAPI_REG_COUNTLOW] = state->m_atapi_xferlen & 0xff; + atapi_regs[ATAPI_REG_COUNTHIGH] = (state->m_atapi_xferlen>>8)&0xff; - switch( phase ) - { - case SCSI_PHASE_DATAOUT: - state->m_atapi_cdata_wait = state->m_atapi_xferlen; - break; - } + if (state->m_atapi_xferlen == 0) + { + // if no data to return, set the registers properly + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRDY; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO|ATAPI_INTREASON_COMMAND; + } + else + { + // indicate data ready: set DRQ and DMA ready, and IO in INTREASON + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_SERVDSC; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_IO; + } - // perform special ATAPI processing of certain commands - switch (atapi_data[0]&0xff) - { - case 0x00: // BUS RESET / TEST UNIT READY - case 0xbb: // SET CDROM SPEED - atapi_regs[ATAPI_REG_CMDSTATUS] = 0; - break; + switch( phase ) + { + case SCSI_PHASE_DATAOUT: + state->m_atapi_cdata_wait = state->m_atapi_xferlen; + break; + } - case 0x45: // PLAY - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_BSY; - state->m_atapi_timer->adjust( downcast(&space->device())->cycles_to_attotime( ATAPI_CYCLES_PER_SECTOR ) ); - break; - } + // perform special ATAPI processing of certain commands + switch (atapi_data[0]&0xff) + { + case 0x00: // BUS RESET / TEST UNIT READY + case 0xbb: // SET CDROM SPEED + atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + break; - // assert IRQ - atapi_irq(space.machine(), ASSERT_LINE); - } - else - { - logerror("ATAPI: SCSI device returned error!\n"); + case 0x45: // PLAY + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_BSY; + state->m_atapi_timer->adjust( downcast(&space->device())->cycles_to_attotime( ATAPI_CYCLES_PER_SECTOR ) ); + break; + } - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_CHECK; - atapi_regs[ATAPI_REG_ERRFEAT] = 0x50; // sense key = ILLEGAL REQUEST - atapi_regs[ATAPI_REG_COUNTLOW] = 0; - atapi_regs[ATAPI_REG_COUNTHIGH] = 0; - } - } - } - else - { - reg = offset<<2; - switch(mem_mask) - { - case 0x000000ff: - break; - case 0x0000ff00: - reg+=1; - data >>= 8; - break; - case 0x00ff0000: - reg+=2; - data >>=16; - break; - case 0xff000000: - reg+=3; - data >>=24; - break; - } + // assert IRQ + atapi_irq(space.machine(), ASSERT_LINE); + } + else + { + logerror("ATAPI: SCSI device returned error!\n"); - atapi_regs[reg] = data; - logerror("ATAPI: reg %d = %x (offset %x mask %x PC=%x)\n", reg, data, offset, mem_mask, cpu_get_pc(&space->device())); + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_CHECK; + atapi_regs[ATAPI_REG_ERRFEAT] = 0x50; // sense key = ILLEGAL REQUEST + atapi_regs[ATAPI_REG_COUNTLOW] = 0; + atapi_regs[ATAPI_REG_COUNTHIGH] = 0; + } + } + } + else + { + reg = offset<<2; + switch(mem_mask) + { + case 0x000000ff: + break; + case 0x0000ff00: + reg+=1; + data >>= 8; + break; + case 0x00ff0000: + reg+=2; + data >>=16; + break; + case 0xff000000: + reg+=3; + data >>=24; + break; + } - if (reg == ATAPI_REG_CMDSTATUS) - { - logerror("ATAPI command %x issued! (PC=%x)\n", data, cpu_get_pc(&space->device())); - switch (data) - { - case 0xa0: // PACKET - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ; - atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_COMMAND; + atapi_regs[reg] = data; + logerror("ATAPI: reg %d = %x (offset %x mask %x PC=%x)\n", reg, data, offset, mem_mask, cpu_get_pc(&space->device())); - state->m_atapi_data_ptr = 0; - state->m_atapi_data_len = 0; + if (reg == ATAPI_REG_CMDSTATUS) + { + logerror("ATAPI command %x issued! (PC=%x)\n", data, cpu_get_pc(&space->device())); + switch (data) + { + case 0xa0: // PACKET + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ; + atapi_regs[ATAPI_REG_INTREASON] = ATAPI_INTREASON_COMMAND; - // we have no data - state->m_atapi_xferlen = 0; - state->m_atapi_xfermod = 0; + state->m_atapi_data_ptr = 0; + state->m_atapi_data_len = 0; - state->m_atapi_cdata_wait = 0; - break; + // we have no data + state->m_atapi_xferlen = 0; + state->m_atapi_xfermod = 0; - case 0xa1: // IDENTIFY PACKET DEVICE - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ; + state->m_atapi_cdata_wait = 0; + break; - state->m_atapi_data_ptr = 0; - state->m_atapi_data_len = 512; + case 0xa1: // IDENTIFY PACKET DEVICE + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ; - // we have no data - state->m_atapi_xferlen = 0; - state->m_atapi_xfermod = 0; + state->m_atapi_data_ptr = 0; + state->m_atapi_data_len = 512; - memset( atapi_data, 0, state->m_atapi_data_len ); + // we have no data + state->m_atapi_xferlen = 0; + state->m_atapi_xfermod = 0; - atapi_data[ 0 ^ 1 ] = 0x85; // ATAPI device, cmd set 5 compliant, DRQ within 3 ms of PACKET command - atapi_data[ 1 ^ 1 ] = 0x80; // ATAPI device, removable media + memset( atapi_data, 0, state->m_atapi_data_len ); - memset( &atapi_data[ 46 ], ' ', 8 ); - atapi_data[ 46 ^ 1 ] = '1'; - atapi_data[ 47 ^ 1 ] = '.'; - atapi_data[ 48 ^ 1 ] = '0'; - - - memset( &atapi_data[ 54 ], ' ', 40 ); - atapi_data[ 54 ^ 1 ] = 'T'; - atapi_data[ 55 ^ 1 ] = 'O'; - atapi_data[ 56 ^ 1 ] = 'S'; - atapi_data[ 57 ^ 1 ] = 'H'; - atapi_data[ 58 ^ 1 ] = 'I'; - atapi_data[ 59 ^ 1 ] = 'B'; - atapi_data[ 60 ^ 1 ] = 'A'; - atapi_data[ 61 ^ 1 ] = ' '; - atapi_data[ 62 ^ 1 ] = 'X'; - atapi_data[ 63 ^ 1 ] = 'M'; - atapi_data[ 64 ^ 1 ] = '-'; - atapi_data[ 65 ^ 1 ] = '3'; - atapi_data[ 66 ^ 1 ] = '3'; - atapi_data[ 67 ^ 1 ] = '0'; - atapi_data[ 68 ^ 1 ] = '1'; - atapi_data[ 69 ^ 1 ] = ' '; + atapi_data[ 0 ^ 1 ] = 0x85; // ATAPI device, cmd set 5 compliant, DRQ within 3 ms of PACKET command + atapi_data[ 1 ^ 1 ] = 0x80; // ATAPI device, removable media - atapi_data[ 98 ^ 1 ] = 0x06; // Word 49=Capabilities, IORDY may be disabled (bit_10), LBA Supported mandatory (bit_9) - atapi_data[ 99 ^ 1 ] = 0x00; + memset( &atapi_data[ 46 ], ' ', 8 ); + atapi_data[ 46 ^ 1 ] = '1'; + atapi_data[ 47 ^ 1 ] = '.'; + atapi_data[ 48 ^ 1 ] = '0'; - atapi_regs[ATAPI_REG_COUNTLOW] = 0; - atapi_regs[ATAPI_REG_COUNTHIGH] = 2; - atapi_irq(space.machine(), ASSERT_LINE); - break; - case 0xec: //IDENTIFY DEVICE - Must abort here and set for packet data - atapi_regs[ATAPI_REG_ERRFEAT] = ATAPI_ERRFEAT_ABRT; - atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_CHECK; - - atapi_irq(space.machine(), ASSERT_LINE); - - case 0xef: // SET FEATURES - atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + memset( &atapi_data[ 54 ], ' ', 40 ); + atapi_data[ 54 ^ 1 ] = 'T'; + atapi_data[ 55 ^ 1 ] = 'O'; + atapi_data[ 56 ^ 1 ] = 'S'; + atapi_data[ 57 ^ 1 ] = 'H'; + atapi_data[ 58 ^ 1 ] = 'I'; + atapi_data[ 59 ^ 1 ] = 'B'; + atapi_data[ 60 ^ 1 ] = 'A'; + atapi_data[ 61 ^ 1 ] = ' '; + atapi_data[ 62 ^ 1 ] = 'X'; + atapi_data[ 63 ^ 1 ] = 'M'; + atapi_data[ 64 ^ 1 ] = '-'; + atapi_data[ 65 ^ 1 ] = '3'; + atapi_data[ 66 ^ 1 ] = '3'; + atapi_data[ 67 ^ 1 ] = '0'; + atapi_data[ 68 ^ 1 ] = '1'; + atapi_data[ 69 ^ 1 ] = ' '; - state->m_atapi_data_ptr = 0; - state->m_atapi_data_len = 0; + atapi_data[ 98 ^ 1 ] = 0x06; // Word 49=Capabilities, IORDY may be disabled (bit_10), LBA Supported mandatory (bit_9) + atapi_data[ 99 ^ 1 ] = 0x00; - atapi_irq(space.machine(), ASSERT_LINE); - break; + atapi_regs[ATAPI_REG_COUNTLOW] = 0; + atapi_regs[ATAPI_REG_COUNTHIGH] = 2; - default: - logerror("ATAPI: Unknown IDE command %x\n", data); - break; - } - } - } + atapi_irq(space.machine(), ASSERT_LINE); + break; + case 0xec: //IDENTIFY DEVICE - Must abort here and set for packet data + atapi_regs[ATAPI_REG_ERRFEAT] = ATAPI_ERRFEAT_ABRT; + atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_CHECK; + + atapi_irq(space.machine(), ASSERT_LINE); + + case 0xef: // SET FEATURES + atapi_regs[ATAPI_REG_CMDSTATUS] = 0; + + state->m_atapi_data_ptr = 0; + state->m_atapi_data_len = 0; + + atapi_irq(space.machine(), ASSERT_LINE); + break; + + default: + logerror("ATAPI: Unknown IDE command %x\n", data); + break; + } + } + } } */ // Memory is mostly handled by the chipset @@ -569,7 +569,7 @@ static ADDRESS_MAP_START( gammagic_io, AS_IO, 32, gammagic_state) AM_RANGE(0x03f0, 0x0cf7) AM_NOP AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write) AM_RANGE(0x0400, 0xffff) AM_NOP - + ADDRESS_MAP_END @@ -596,7 +596,7 @@ static INPUT_PORTS_START( gammagic ) AT_KEYB_HELPER( 0x0800, "F1", KEYCODE_S ) /* F1 3B BB */ AT_KEYB_HELPER( 0x1000, "F2", KEYCODE_D ) /* F2 3C BC */ AT_KEYB_HELPER( 0x4000, "F4", KEYCODE_F ) /* F4 3E BE */ - + PORT_START("pc_keyboard_4") AT_KEYB_HELPER( 0x0004, "F8", KEYCODE_F8 ) // f8=42 /f10=44 /minus 4a /plus=4e @@ -607,7 +607,7 @@ static INPUT_PORTS_START( gammagic ) PORT_START("pc_keyboard_5") AT_KEYB_HELPER( 0x0001, "KP 2(DN)", KEYCODE_2_PAD ) /* Keypad 2 (Down arrow) 50 D0 */ - + PORT_START("pc_keyboard_6") AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up", KEYCODE_UP ) /* Up 67 e7 */ AT_KEYB_HELPER( 0x0080, "(MF2)Page Up", KEYCODE_PGUP ) /* Page Up 68 e8 */ @@ -643,23 +643,23 @@ static MACHINE_START(gammagic) static MACHINE_RESET( gammagic ) { //gammagic_state *state = machine.driver_data(); - + //void *cd; - //SCSIGetDevice( state->m_inserted_cdrom, &cd ); - + //SCSIGetDevice( state->m_inserted_cdrom, &cd ); + } /*static void atapi_irq(running_machine &machine, int state) { - gammagic_state *drvstate = machine.driver_data(); - pic8259_ir6_w(drvstate->m_pic8259_2, state); + gammagic_state *drvstate = machine.driver_data(); + pic8259_ir6_w(drvstate->m_pic8259_2, state); } static void atapi_exit(running_machine& machine) { - gammagic_state *state = machine.driver_data(); - SCSIDeleteInstance(state->m_inserted_cdrom); + gammagic_state *state = machine.driver_data(); + SCSIDeleteInstance(state->m_inserted_cdrom); } */ @@ -667,7 +667,7 @@ static void atapi_exit(running_machine& machine) static void atapi_init(running_machine &machine) { gammagic_state *state = machine.driver_data(); - + state->m_atapi_regs[ATAPI_REG_CMDSTATUS] = 0; state->m_atapi_regs[ATAPI_REG_ERRFEAT] = 1; state->m_atapi_regs[ATAPI_REG_COUNTLOW] = 0x14; @@ -675,9 +675,9 @@ static void atapi_init(running_machine &machine) state->m_atapi_data_ptr = 0; state->m_atapi_data_len = 0; state->m_atapi_cdata_wait = 0; - + //SCSIAllocInstance( machine, &SCSIClassCr589, &state->m_inserted_cdrom, ":cdrom" ); - + //machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(atapi_exit), &machine)); } @@ -782,11 +782,11 @@ static MACHINE_CONFIG_START( gammagic, gammagic_state ) MCFG_PIC8259_ADD( "pic8259_1", gammagic_pic8259_1_config ) MCFG_PIC8259_ADD( "pic8259_2", gammagic_pic8259_2_config ) MCFG_MC146818_ADD( "rtc", MC146818_STANDARD ) -// MCFG_I82371SB_ADD("i82371sb") -// MCFG_I82439TX_ADD("i82439tx", "maincpu", "user") +// MCFG_I82371SB_ADD("i82371sb") +// MCFG_I82439TX_ADD("i82439tx", "maincpu", "user") MCFG_PCI_BUS_ADD("pcibus", 0) -// MCFG_PCI_BUS_DEVICE(0, "i82439tx", i82439tx_pci_read, i82439tx_pci_write) -// MCFG_PCI_BUS_DEVICE(1, "i82371sb", i82371sb_pci_read, i82371sb_pci_write) +// MCFG_PCI_BUS_DEVICE(0, "i82439tx", i82439tx_pci_read, i82439tx_pci_write) +// MCFG_PCI_BUS_DEVICE(1, "i82371sb", i82371sb_pci_read, i82371sb_pci_write) /* video hardware */ MCFG_FRAGMENT_ADD( pcvideo_vga ) @@ -797,30 +797,30 @@ DRIVER_INIT_MEMBER(gammagic_state,gammagic) { init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, gammagic_set_keyb_int); kbdc8042_init(machine(), &at8042); - atapi_init(machine()); -} + atapi_init(machine()); +} ROM_START( gammagic ) ROM_REGION32_LE(0x40000, "user", 0) - //Original Memory Set + //Original Memory Set //ROM_LOAD("m7s04.rom", 0, 0x40000, CRC(3689f5a9) SHA1(8daacdb0dc6783d2161680564ffe83ac2515f7ef)) //ROM_LOAD("otivga_tx2953526.rom", 0x0000, 0x8000, CRC(916491af) SHA1(d64e3a43a035d70ace7a2d0603fc078f22d237e1)) - + //Temp. Memory Set (Only for initial driver development stage) ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) ROM_CONTINUE( 0x0001, 0x4000 ) ROM_LOAD("5hx29.bin", 0x20000, 0x20000, CRC(07719a55) SHA1(b63993fd5186cdb4f28c117428a507cd069e1f68)) - + DISK_REGION( "cdrom" ) DISK_IMAGE_READONLY( "gammagic", 0,SHA1(caa8fc885d84dbc07fb0604c76cd23c873a65ce6) ) ROM_END ROM_START( 99bottles ) ROM_REGION32_LE(0x40000, "user", 0) - //Original BIOS/VGA-BIOS Rom Set - //ROM_LOAD("m7s04.rom", 0, 0x40000, CRC(3689f5a9) SHA1(8daacdb0dc6783d2161680564ffe83ac2515f7ef)) + //Original BIOS/VGA-BIOS Rom Set + //ROM_LOAD("m7s04.rom", 0, 0x40000, CRC(3689f5a9) SHA1(8daacdb0dc6783d2161680564ffe83ac2515f7ef)) //ROM_LOAD("otivga_tx2953526.rom", 0x0000, 0x8000, CRC(916491af) SHA1(d64e3a43a035d70ace7a2d0603fc078f22d237e1)) - + //Temporary (Chipset compatible Rom Set, only for driver development stage) ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) ) ROM_CONTINUE( 0x0001, 0x4000 ) diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c index a1037b0b2fc..19c33ec41ce 100644 --- a/src/mame/drivers/ggconnie.c +++ b/src/mame/drivers/ggconnie.c @@ -30,7 +30,7 @@ public: : pce_common_state(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(lamp_w); - DECLARE_WRITE8_MEMBER(output_w); + DECLARE_WRITE8_MEMBER(output_w); }; diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 4ebc81ed63a..49f43d09d13 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -90,12 +90,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( intrscti_sub_map, AS_PROGRAM, 8, intrscti_state ) AM_RANGE(0x0000, 0x07ff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM -// AM_RANGE(0x0000, 0xffff) AM_WRITENOP +// AM_RANGE(0x0000, 0xffff) AM_WRITENOP ADDRESS_MAP_END static ADDRESS_MAP_START( intrscti_sub_io_map, AS_IO, 8, intrscti_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x00, 0xff) AM_NOP +// AM_RANGE(0x00, 0xff) AM_NOP ADDRESS_MAP_END diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 20332ecc5d8..a694e1891c8 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -74,7 +74,7 @@ Stephh's Notes: - When On (0x80), lives are set to 255 (0xff) but they are NOT infinite Other bits from DSW2 (but bit 5) don't seem to be read / tested at all ... - + ***************************************************************************/ @@ -146,7 +146,7 @@ WRITE8_MEMBER(jack_state::joinem_control_w) // d0: related to test mode? // d1: unused? // d2: ? - + // d3-d4: palette bank int palette_bank = data & (machine().total_colors() - 1) >> 3 & 0x18; if (m_joinem_palette_bank != palette_bank) @@ -157,7 +157,7 @@ WRITE8_MEMBER(jack_state::joinem_control_w) // d5: assume nmi enable m_joinem_nmi_enable = data & 0x20; - + // d6: unused? // d7: flip screen @@ -890,7 +890,7 @@ MACHINE_RESET_MEMBER(jack_state,striv) MACHINE_START_MEMBER(jack_state,joinem) { m_joinem_palette_bank = 0; - + save_item(NAME(m_joinem_nmi_enable)); save_item(NAME(m_joinem_palette_bank)); } diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index 3e50915bf9c..ac90e8893cc 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -12,10 +12,10 @@ * Monopoly Deluxe Known Issues: - * Some features used by the AWP games such as reels and meters - are not emulated. - * Timing for reels, and other opto devices is controlled by the same clock - as the lamps, in a weird daisychain setup. + * Some features used by the AWP games such as reels and meters + are not emulated. + * Timing for reels, and other opto devices is controlled by the same clock + as the lamps, in a weird daisychain setup. AWP game notes: The byte at 0x81 of the EVEN 68k rom appears to be some kind of @@ -766,7 +766,7 @@ READ16_MEMBER(jpmsys5_state::coins_awp_r) { case 2: { - return ioport("COINS")->read() << 8; + return ioport("COINS")->read() << 8; } break; default: @@ -856,7 +856,7 @@ static INPUT_PORTS_START( popeye ) PORT_CONFSETTING( 0x02, "13") PORT_CONFSETTING( 0x01, "14") PORT_CONFSETTING( 0x00, "15") - + PORT_START("DIRECT") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Cash door") PORT_CODE(KEYCODE_T) PORT_TOGGLE diff --git a/src/mame/drivers/kontest.c b/src/mame/drivers/kontest.c index b261a915edd..c0b079e6bd2 100644 --- a/src/mame/drivers/kontest.c +++ b/src/mame/drivers/kontest.c @@ -53,7 +53,7 @@ protected: virtual void video_start(); virtual void palette_init(); -public: +public: INTERRUPT_GEN_MEMBER(kontest_interrupt); }; diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index 347c4f06b41..47e62ab9b87 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -212,7 +212,7 @@ protected: virtual void machine_start(); virtual void machine_reset(); virtual void video_start(); -public: +public: UINT32 screen_update_magictg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c index d13c0aa5111..a4955fdbd41 100644 --- a/src/mame/drivers/magtouch.c +++ b/src/mame/drivers/magtouch.c @@ -181,7 +181,7 @@ static ADDRESS_MAP_START( magtouch_io, AS_IO, 32, magtouch_state ) AM_RANGE(0x02e0, 0x02e7) AM_READWRITE8(magtouch_io_r, magtouch_io_w, 0xffffffff) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ns16450_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 42eeb211f16..6876d93b63f 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -186,18 +186,18 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_mediagx(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ32_MEMBER(speedup0_r); - DECLARE_READ32_MEMBER(speedup1_r); - DECLARE_READ32_MEMBER(speedup2_r); - DECLARE_READ32_MEMBER(speedup3_r); - DECLARE_READ32_MEMBER(speedup4_r); - DECLARE_READ32_MEMBER(speedup5_r); - DECLARE_READ32_MEMBER(speedup6_r); - DECLARE_READ32_MEMBER(speedup7_r); - DECLARE_READ32_MEMBER(speedup8_r); - DECLARE_READ32_MEMBER(speedup9_r); - DECLARE_READ32_MEMBER(speedup10_r); - DECLARE_READ32_MEMBER(speedup11_r); + DECLARE_READ32_MEMBER(speedup0_r); + DECLARE_READ32_MEMBER(speedup1_r); + DECLARE_READ32_MEMBER(speedup2_r); + DECLARE_READ32_MEMBER(speedup3_r); + DECLARE_READ32_MEMBER(speedup4_r); + DECLARE_READ32_MEMBER(speedup5_r); + DECLARE_READ32_MEMBER(speedup6_r); + DECLARE_READ32_MEMBER(speedup7_r); + DECLARE_READ32_MEMBER(speedup8_r); + DECLARE_READ32_MEMBER(speedup9_r); + DECLARE_READ32_MEMBER(speedup10_r); + DECLARE_READ32_MEMBER(speedup11_r); TIMER_DEVICE_CALLBACK_MEMBER(sound_timer_callback); }; diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 6121fc4da25..0797a8507e7 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -911,21 +911,21 @@ void ninjakd2_state::machine_reset() int num_banks = (machine().root_device().memregion("maincpu")->bytes() - 0x10000) / 0x4000; machine().root_device().membank("bank1")->configure_entries(0, num_banks, machine().root_device().memregion("maincpu")->base() + 0x10000, 0x4000); machine().root_device().membank("bank1")->set_entry(0); - + m_rom_bank_mask = num_banks - 1; } MACHINE_START_MEMBER(ninjakd2_state,omegaf) { omegaf_io_protection_start(); - + machine_start(); } MACHINE_RESET_MEMBER(ninjakd2_state,omegaf) { omegaf_io_protection_reset(); - + machine_reset(); } @@ -1481,7 +1481,7 @@ void ninjakd2_state::robokid_motion_error_kludge(UINT16 offset) ROM[1] = 0x03; // and 3 ROM[2] = 0x18; ROM[3] = 0xf6; // jr $-8 - + m_maincpu->space(AS_PROGRAM).install_read_handler(offset, offset, read8_delegate(FUNC(ninjakd2_state::robokid_motion_error_verbose_r), this)); } diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c index c050e7f993d..1bc2bc24b3c 100644 --- a/src/mame/drivers/nsm.c +++ b/src/mame/drivers/nsm.c @@ -90,7 +90,7 @@ WRITE8_MEMBER( nsm_state::cru_w ) m_cru_data[m_cru_count] = 0; } m_cru_data[m_cru_count] |= (data << offset); - + UINT8 i,j; int segments; if (!m_cru_count && (offset == 7)) diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c index fa6dbf7cc1a..69c6ceade7a 100644 --- a/src/mame/drivers/pangofun.c +++ b/src/mame/drivers/pangofun.c @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( pcat_io, AS_IO, 32, pangofun_state ) AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8("rtc", mc146818_device, read, write, 0xffffffff) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END #define AT_KEYB_HELPER(bit, text, key1) \ diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c index 4d4ee193e53..1ba46970941 100644 --- a/src/mame/drivers/pcat_dyn.c +++ b/src/mame/drivers/pcat_dyn.c @@ -70,7 +70,7 @@ static ADDRESS_MAP_START( pcat_io, AS_IO, 32, pcat_dyn_state ) AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8("rtc", mc146818_device, read, write, 0xffffffff) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END #define AT_KEYB_HELPER(bit, text, key1) \ diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c index 4c09f9b3272..00196c1f54a 100644 --- a/src/mame/drivers/pcat_nit.c +++ b/src/mame/drivers/pcat_nit.c @@ -212,7 +212,7 @@ static ADDRESS_MAP_START( pcat_nit_io, AS_IO, 32, pcat_nit_state ) AM_RANGE(0x0280, 0x0283) AM_READNOP AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ns16450_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 4e5185950c3..318796b9866 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -191,7 +191,7 @@ static WRITE8_HANDLER( pipedrm_bankswitch_w ) state->membank("bank1")->set_entry(data & 0x7); /* map to the fromance gfx register */ - state->fromance_gfxreg_w(space, offset, ((data >> 6) & 0x01) | /* flipscreen */ + state->fromance_gfxreg_w(space, offset, ((data >> 6) & 0x01) | /* flipscreen */ ((~data >> 2) & 0x02)); /* videoram select */ } diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index f39ce68a4a3..ab389771f31 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -311,10 +311,10 @@ static ADDRESS_MAP_START( pntnpuzl_map, AS_PROGRAM, 16, pntnpuzl_state ) AM_RANGE(0x28001a, 0x28001b) AM_WRITENOP /* standard VGA */ - AM_RANGE(0x3a0000, 0x3bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffff) + AM_RANGE(0x3a0000, 0x3bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffff) AM_RANGE(0x3c03b0, 0x3c03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffff) AM_RANGE(0x3c03c0, 0x3c03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffff) - AM_RANGE(0x3c03d0, 0x3c03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffff) + AM_RANGE(0x3c03d0, 0x3c03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffff) AM_RANGE(0x400000, 0x407fff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index 5d8fd711435..bc563e11204 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -543,7 +543,7 @@ static ADDRESS_MAP_START( queen_io, AS_IO, 32, queen_state ) AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 2c06ed61f9a..e86a3bcc710 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -1924,7 +1924,7 @@ static MACHINE_CONFIG_START( zeroteam, raiden2_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */ +// MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */ MCFG_SCREEN_RAW_PARAMS(XTAL_32MHz/4,546,0,40*8,264,0,32*8) /* hand-tuned to match ~55.47 */ MCFG_SCREEN_UPDATE_DRIVER(raiden2_state, screen_update_raiden2) MCFG_GFXDECODE(raiden2) diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c index a4729dfa330..9812bbb9e9a 100644 --- a/src/mame/drivers/saturn.c +++ b/src/mame/drivers/saturn.c @@ -1986,7 +1986,7 @@ WRITE32_MEMBER(saturn_state::saturn_cs1_w) MACHINE_RESET_MEMBER(saturn_state,saturn) { m_scsp_last_line = 0; - + // don't let the slave cpu and the 68k go anywhere machine().device("slave")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -2067,7 +2067,7 @@ MACHINE_RESET_MEMBER(saturn_state,saturn) MACHINE_RESET_MEMBER(saturn_state,stv) { m_scsp_last_line = 0; - + // don't let the slave cpu and the 68k go anywhere machine().device("slave")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index 5e28d7329e2..4ec70059f20 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -419,7 +419,7 @@ static ADDRESS_MAP_START(savquest_io, AS_IO, 32, savquest_state) AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 77d106b6468..0712f0596ea 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -557,10 +557,10 @@ static MACHINE_CONFIG_START( blocken, shangha3_state ) MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(60) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) -// MCFG_SCREEN_SIZE(24*16, 16*16) -// MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) +// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) +// MCFG_SCREEN_SIZE(24*16, 16*16) +// MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) MCFG_SCREEN_RAW_PARAMS(BLOCKEN_MASTER_CLOCK/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update_shangha3) diff --git a/src/mame/drivers/spectra.c b/src/mame/drivers/spectra.c index e9ea0df7646..30cbbf210a0 100644 --- a/src/mame/drivers/spectra.c +++ b/src/mame/drivers/spectra.c @@ -212,22 +212,22 @@ TIMER_DEVICE_CALLBACK_MEMBER( spectra_state::outtimer) static const sn76477_interface sn76477_intf = { - RES_M(1000), /* 4 noise_res */ - RES_M(1000), /* 5 filter_res */ - CAP_N(0), /* 6 filter_cap */ - RES_K(470), /* 7 decay_res */ - CAP_N(1), /* 8 attack_decay_cap */ - RES_K(22), /* 10 attack_res */ - RES_K(100), /* 11 amplitude_res */ - RES_K(52), /* 12 feedback_res */ - 5.0, /* 16 vco_voltage */ - CAP_U(0.01), /* 17 vco_cap */ - RES_K(390), /* 18 vco_res */ - 0.0, /* 19 pitch_voltage */ - RES_M(1), /* 20 slf_res */ - CAP_U(0.1), /* 21 slf_cap */ - CAP_U(0.47), /* 23 oneshot_cap */ - RES_K(470), /* 24 oneshot_res */ + RES_M(1000), /* 4 noise_res */ + RES_M(1000), /* 5 filter_res */ + CAP_N(0), /* 6 filter_cap */ + RES_K(470), /* 7 decay_res */ + CAP_N(1), /* 8 attack_decay_cap */ + RES_K(22), /* 10 attack_res */ + RES_K(100), /* 11 amplitude_res */ + RES_K(52), /* 12 feedback_res */ + 5.0, /* 16 vco_voltage */ + CAP_U(0.01), /* 17 vco_cap */ + RES_K(390), /* 18 vco_res */ + 0.0, /* 19 pitch_voltage */ + RES_M(1), /* 20 slf_res */ + CAP_U(0.1), /* 21 slf_cap */ + CAP_U(0.47), /* 23 oneshot_cap */ + RES_K(470), /* 24 oneshot_res */ 0, /* 22 vco (variable) */ 0, /* 26 mixer A (grounded) */ 0, /* 25 mixer B (variable) */ diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c index f63306feb46..e886bc066fe 100644 --- a/src/mame/drivers/su2000.c +++ b/src/mame/drivers/su2000.c @@ -102,7 +102,7 @@ static ADDRESS_MAP_START( pcat_io, AS_IO, 32, su2000_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) ADDRESS_MAP_END diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index d446df54684..47a825d5901 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -489,7 +489,7 @@ static ADDRESS_MAP_START(taitowlf_io, AS_IO, 32, taitowlf_state ) #if ENABLE_VGA AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) #endif AM_RANGE(0x03f0, 0x03ff) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0a78, 0x0a7b) AM_WRITE(pnp_data_w) diff --git a/src/mame/drivers/techno.c b/src/mame/drivers/techno.c index 1d2034c6942..88ffe786ff1 100644 --- a/src/mame/drivers/techno.c +++ b/src/mame/drivers/techno.c @@ -49,7 +49,7 @@ protected: private: bool m_digwait; UINT8 m_keyrow; -public: +public: INTERRUPT_GEN_MEMBER(techno_intgen); }; diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 6ebca781edf..31d96ead81d 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -108,7 +108,7 @@ INPUT_CHANGED_MEMBER(vicdual_state::coin_changed) /* increment the coin counter */ coin_counter_w(machine(), 0, 1); coin_counter_w(machine(), 0, 0); - + coin_in(); } } @@ -460,7 +460,7 @@ static INPUT_PORTS_START( frogs ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DOOR:1") // 1 switch located on the inside of the coin door PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - + // There is no dipswitch: on a physical level, these settings are applied by grounding // otherwise floating pins (ground wires are provided on pin 1/30) PORT_DIPNAME( 0x10, 0x10, "Allow Free Game" ) PORT_DIPLOCATION("PIN:5") // 26 @@ -921,7 +921,7 @@ static INPUT_PORTS_START( digger ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("IN2") -// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,vicdual_get_timer_value, NULL) // it's like this according to the schematics, but gameplay speed is too fast; +// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,vicdual_get_timer_value, NULL) // it's like this according to the schematics, but gameplay speed is too fast; PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,vicdual_get_composite_blank_comp, NULL) // gameplay speed is correct now, there's likely an error in the schematics then... PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,vicdual_read_coin_status, NULL) @@ -1278,7 +1278,7 @@ static INPUT_PORTS_START( invho2 ) PORT_DIPNAME( 0x03, 0x01, "Head On 2 Lives" ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0x01, "3" ) -// PORT_DIPSETTING( 0x02, "3" ) // dupe +// PORT_DIPSETTING( 0x02, "3" ) // dupe PORT_DIPSETTING( 0x03, "4" ) /* There's probably a bug in the Invinco game code: @@ -1290,8 +1290,8 @@ static INPUT_PORTS_START( invho2 ) PORT_DIPNAME( 0x03, 0x03, "Invinco Lives" ) PORT_DIPLOCATION("SW1:3,4") PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x02, "4" ) -// PORT_DIPSETTING( 0x01, "5" ) // results in 3, see above -// PORT_DIPSETTING( 0x00, "6" ) // results in 4, see above +// PORT_DIPSETTING( 0x01, "5" ) // results in 3, see above +// PORT_DIPSETTING( 0x00, "6" ) // results in 4, see above INPUT_PORTS_END @@ -1646,7 +1646,7 @@ static INPUT_PORTS_START( brdrline ) PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x01, "4" ) PORT_DIPSETTING( 0x02, "5" ) -// PORT_DIPSETTING( 0x03, "5" ) // dupe +// PORT_DIPSETTING( 0x03, "5" ) // dupe INPUT_PORTS_END @@ -1700,7 +1700,7 @@ static INPUT_PORTS_START( starrkr ) PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x01, "4" ) PORT_DIPSETTING( 0x02, "5" ) -// PORT_DIPSETTING( 0x03, "5" ) // dupe +// PORT_DIPSETTING( 0x03, "5" ) // dupe INPUT_PORTS_END @@ -2064,7 +2064,7 @@ static INPUT_PORTS_START( samurai ) PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,samurai_protection_r, (void *)1) - PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2") // unknown, but used + PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2") // unknown, but used PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, vicdual_state,vicdual_get_composite_blank_comp, NULL) @@ -2201,7 +2201,7 @@ INPUT_CHANGED_MEMBER(vicdual_state::nsub_coin_in) m_nsub_play_counter++; } } - + // increment coin counter coin_counter_w(machine(), which, 1); coin_counter_w(machine(), which, 0); @@ -2211,7 +2211,7 @@ INPUT_CHANGED_MEMBER(vicdual_state::nsub_coin_in) case 2: m_nsub_play_counter++; break; - + default: break; } @@ -2249,10 +2249,10 @@ static INPUT_PORTS_START( nsub ) PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 0C_1C ) ) // invalid +// PORT_DIPSETTING( 0x00, DEF_STR( 0C_1C ) ) // invalid PORT_DIPNAME( 0x78, 0x08, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW:4,5,6,7") PORT_DIPSETTING( 0x40, "Shared With Coin A" ) -// PORT_DIPSETTING( 0x00, DEF_STR( 1C_0C ) ) // invalid +// PORT_DIPSETTING( 0x00, DEF_STR( 1C_0C ) ) // invalid PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x18, DEF_STR( 1C_3C ) ) @@ -2280,7 +2280,7 @@ MACHINE_START_MEMBER(vicdual_state,nsub) MACHINE_RESET_MEMBER(vicdual_state,nsub) { m_nsub_coin_counter = ioport("COINAGE")->read() & 7; - + machine_reset(); } diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c index 4e440d2a574..862046612c6 100644 --- a/src/mame/drivers/vlc.c +++ b/src/mame/drivers/vlc.c @@ -13,9 +13,9 @@ CGA monitor 15Khz 60hz - 2x 62256 NVRAM + batt (connect in 16bits) - 2x 6264 BACKUP + batt (connect in 8bits) - 1x MODEM XE1214 from XECOM (300/1200 Baud) - - - + + + on MAME 0.145u4 Yves Todo : @@ -37,7 +37,7 @@ Read OE 8 bit on D15..D8 U50 4Bit D Flop Register is connect on D3..D0 this one seem to have 2 use. -1. keep track of the PAL16R8 state +1. keep track of the PAL16R8 state 2. DOOR SWITCH is connect on U50 Clear pin (D3..D0 LOW = Door Open) Write Clock 4 bits in D-Flop Register Read OE 4 bits on D3..D0 @@ -89,7 +89,7 @@ BOOT:FE1AA8 0040 dc.b $40 * @ BOOT:FE1AA9 0000 dc.b 0 -BOOT:FE19F0 INI_CRTC6845: +BOOT:FE19F0 INI_CRTC6845: BOOT:FE19F0 48E7 8140 movem.l d0/d7/a1,-(sp) BOOT:FE19F4 2258 movea.l (a0)+,a1 * type1 = 0xA50000, type2 = 0xA80000 BOOT:FE19F6 50D1 st (a1) @@ -102,7 +102,7 @@ BOOT:FE1A0A 6100 0108 bsr set_vid_D0_A0 * D0 = 0 BOOT:FE1A0A * A0 = 0xB00000 BOOT:FE1A0E 7E0D moveq #$D,d7 BOOT:FE1A10 -BOOT:FE1A10 LOOP: +BOOT:FE1A10 LOOP: BOOT:FE1A10 13C7 0090 0001 move.b d7,(CRTC_ADR) BOOT:FE1A16 13D9 0090 8001 move.b (a1)+,(CRTC_DAT) BOOT:FE1A1C 51CF FFF2 dbf d7,LOOP @@ -111,13 +111,13 @@ BOOT:FE1A24 4E75 rts *** MC6845 Initialization *** - Htotal Hdisp HsyncPos HsyncW Vtotal VtotalAdj Vdisp VsyncPos InterMode MaxScanAdr CurStart CurEnd StartAdrH StartAdrL CurH CurL LightPenH LightPenL + Htotal Hdisp HsyncPos HsyncW Vtotal VtotalAdj Vdisp VsyncPos InterMode MaxScanAdr CurStart CurEnd StartAdrH StartAdrL CurH CurL LightPenH LightPenL ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- register: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- nevada TYPE1 : 42 31 35 03 32 02 31 31 00 07 00 00 00 00 00 00 00 00 nevada TYPE2 : 64 45 51 06 32 02 31 31 00 07 00 00 00 00 00 00 00 00 - + */ @@ -160,22 +160,22 @@ public: device_t *m_duart18_68681; device_t *m_duart39_68681; device_t *m_duart40_68681; - + required_device m_maincpu; optional_device m_microtouch; required_shared_ptr m_nvram; required_shared_ptr m_backup; - + UINT16 m_datA40000; - + //UINT8* m_videoram; //UINT8* m_colorram; - + UINT16* m_videoram; tilemap_t *m_bg_tilemap; - + DECLARE_DRIVER_INIT(nevada); }; @@ -185,29 +185,29 @@ this DUMP is done writing 0 to 255 and reading output (probably not the good way PAL is connected on the UPPER byte D15..D8 Adress A40000..A40001 -2 Type of PAL (one for game, the other is to set game to fabric default) +2 Type of PAL (one for game, the other is to set game to fabric default) -there is a 74LS173 on the LOWER byte that used bit D3..D0 +there is a 74LS173 on the LOWER byte that used bit D3..D0 funny thing , the DOOR ACCESS Switch is connected on the CLEAR PIN of this 4bits register so when D3..D0 are LOW , DOOR is OPEN */ static const UINT8 pal35[256] = { -0x11, 0x42, 0x5B, 0xCA, 0x19, 0x42, 0x5B, 0xCA, 0x38, 0x63, 0x3A, 0x63, 0x3A, 0x63, 0x3A, 0x63, -0xD3, 0x08, 0x5B, 0xCA, 0x19, 0xCA, 0x19, 0xCA, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB, -0xD3, 0xCA, 0x5B, 0xCC, 0x5B, 0xCC, 0x5B, 0xCC, 0xBA, 0x63, 0x38, 0x65, 0x38, 0x65, 0x38, 0x65, -0xD1, 0xCA, 0x5B, 0xC8, 0x5B, 0xC8, 0x5B, 0xC8, 0x9A, 0xEB, 0x1A, 0xED, 0x1A, 0xED, 0x1A, 0xED, -0x0C, 0x65, 0xF0, 0x00, 0x64, 0xF5, 0x04, 0x65, 0xB8, 0x25, 0x20, 0x20, 0x24, 0x24, 0x24, 0x24, -0xF0, 0x00, 0xF8, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xB8, 0x3D, 0xFC, 0x19, 0xFC, 0x19, 0xFC, 0x19, -0x44, 0xF9, 0xC4, 0xF9, 0xC4, 0xFD, 0xC4, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, -0xC0, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, -0x0C, 0x44, 0xFB, 0x04, 0x67, 0xD4, 0x0C, 0x44, 0xBA, 0x24, 0x22, 0x02, 0x26, 0x06, 0x26, 0x06, -0xFB, 0x00, 0xFB, 0x00, 0xEF, 0x10, 0xCE, 0x18, 0xEF, 0x18, 0xEF, 0x18, 0xFF, 0x18, 0xFF, 0x18, -0x44, 0xF8, 0xC6, 0xD8, 0xCE, 0xDC, 0xCE, 0xDC, 0xEF, 0x9E, 0x67, 0xB8, 0x67, 0xBC, 0x67, 0xBC, -0xC6, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCB, 0x9A, 0xEF, 0x9A, 0xFF, 0xD8, 0xDB, 0xD8, -0x66, 0xF4, 0x00, 0x64, 0xBA, 0x25, 0x22, 0x22, 0x26, 0x26, 0x26, 0x26, 0xF2, 0x00, 0xFA, 0x00, -0xFA, 0x00, 0xFA, 0x00, 0xBA, 0x3D, 0xFA, 0x19, 0xFA, 0x19, 0xFA, 0x19, 0x44, 0xF9, 0xC2, 0xF0, -0xC2, 0xF4, 0xC2, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xC2, 0xD0, 0xCA, 0xD0, -0xCA, 0xD0, 0xCA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0x08, 0x63, 0xD3, 0x08 +0x11, 0x42, 0x5B, 0xCA, 0x19, 0x42, 0x5B, 0xCA, 0x38, 0x63, 0x3A, 0x63, 0x3A, 0x63, 0x3A, 0x63, +0xD3, 0x08, 0x5B, 0xCA, 0x19, 0xCA, 0x19, 0xCA, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB, +0xD3, 0xCA, 0x5B, 0xCC, 0x5B, 0xCC, 0x5B, 0xCC, 0xBA, 0x63, 0x38, 0x65, 0x38, 0x65, 0x38, 0x65, +0xD1, 0xCA, 0x5B, 0xC8, 0x5B, 0xC8, 0x5B, 0xC8, 0x9A, 0xEB, 0x1A, 0xED, 0x1A, 0xED, 0x1A, 0xED, +0x0C, 0x65, 0xF0, 0x00, 0x64, 0xF5, 0x04, 0x65, 0xB8, 0x25, 0x20, 0x20, 0x24, 0x24, 0x24, 0x24, +0xF0, 0x00, 0xF8, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xB8, 0x3D, 0xFC, 0x19, 0xFC, 0x19, 0xFC, 0x19, +0x44, 0xF9, 0xC4, 0xF9, 0xC4, 0xFD, 0xC4, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, +0xC0, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, +0x0C, 0x44, 0xFB, 0x04, 0x67, 0xD4, 0x0C, 0x44, 0xBA, 0x24, 0x22, 0x02, 0x26, 0x06, 0x26, 0x06, +0xFB, 0x00, 0xFB, 0x00, 0xEF, 0x10, 0xCE, 0x18, 0xEF, 0x18, 0xEF, 0x18, 0xFF, 0x18, 0xFF, 0x18, +0x44, 0xF8, 0xC6, 0xD8, 0xCE, 0xDC, 0xCE, 0xDC, 0xEF, 0x9E, 0x67, 0xB8, 0x67, 0xBC, 0x67, 0xBC, +0xC6, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCB, 0x9A, 0xEF, 0x9A, 0xFF, 0xD8, 0xDB, 0xD8, +0x66, 0xF4, 0x00, 0x64, 0xBA, 0x25, 0x22, 0x22, 0x26, 0x26, 0x26, 0x26, 0xF2, 0x00, 0xFA, 0x00, +0xFA, 0x00, 0xFA, 0x00, 0xBA, 0x3D, 0xFA, 0x19, 0xFA, 0x19, 0xFA, 0x19, 0x44, 0xF9, 0xC2, 0xF0, +0xC2, 0xF4, 0xC2, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xC2, 0xD0, 0xCA, 0xD0, +0xCA, 0xD0, 0xCA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0x08, 0x63, 0xD3, 0x08 }; @@ -231,8 +231,8 @@ static const mc6845_interface mc6845_intf = static const gfx_layout charlayout = { - /* Todo , just for sample */ - + /* Todo , just for sample */ + 8,8, RGN_FRAC(1,4), 4, @@ -246,17 +246,17 @@ static const gfx_layout charlayout = /* static WRITE16_HANDLER( nevada_videoram_w ) { -// Todo, Just for sample +// Todo, Just for sample - nevada_state *state = space->machine().driver_data(); - state->m_videoram[offset] = data; - state->m_bg_tilemap->mark_tile_dirty(offset); + nevada_state *state = space->machine().driver_data(); + state->m_videoram[offset] = data; + state->m_bg_tilemap->mark_tile_dirty(offset); } */ /***************************************************************************/ static GFXDECODE_START( nevada ) - /* Todo , just for sample */ + /* Todo , just for sample */ GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) GFXDECODE_END @@ -264,15 +264,15 @@ GFXDECODE_END /* static TILE_GET_INFO( get_bg_tile_info ) { -// Todo, Just for sample - nevada_state *state = machine.driver_data(); +// Todo, Just for sample + nevada_state *state = machine.driver_data(); - int attr = state->m_colorram[tile_index]; - int code = ((attr & 1) << 8) | state->m_videoram[tile_index]; - int bank = (attr & 0x02) >> 1; - int color = (attr & 0x3c) >> 2; + int attr = state->m_colorram[tile_index]; + int code = ((attr & 1) << 8) | state->m_videoram[tile_index]; + int bank = (attr & 0x02) >> 1; + int color = (attr & 0x3c) >> 2; - SET_TILE_INFO(bank, code, color, 0); + SET_TILE_INFO(bank, code, color, 0); } */ @@ -280,22 +280,22 @@ static TILE_GET_INFO( get_bg_tile_info ) /***************************************************************************/ static VIDEO_START( nevada ) { -// todo +// todo /* - nevada_state *state = machine.driver_data(); - state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); -*/ + nevada_state *state = machine.driver_data(); + state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); +*/ } /***************************************************************************/ static SCREEN_UPDATE_IND16( nevada ) { // Todo -/* - nevada_state *state = screen.machine().driver_data(); - state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); -*/ - return 0; +/* + nevada_state *state = screen.machine().driver_data(); + state->m_bg_tilemap->draw(bitmap, cliprect, 0, 0); +*/ + return 0; } /***************************************************************************/ @@ -319,35 +319,35 @@ static NVRAM_HANDLER( nevada ) if (file) file->read(state->m_nvram,state->m_nvram.bytes()); else - { + { UINT16* defaultram = (UINT16 *) state->memregion("defaults")->base(); memset(state->m_nvram,0x00,state->m_nvram.bytes()); if (defaultram) memcpy(state->m_nvram, state->memregion("defaults")->base(), state->memregion("defaults")->bytes()); - } + } } } /*************************************************************************** - U18 MC68681 RS232 UART SIDEA = MODEM 1200 Baud + U18 MC68681 RS232 UART SIDEA = MODEM 1200 Baud U18 MC68681 RS232 UART SIDEB = not used Interrupt 4 ***************************************************************************/ static void duart18_irq_handler(device_t *device, int state, UINT8 vector ) -{ +{ device->machine().device("maincpu")->execute().set_input_line_and_vector(4, state, vector); }; /***************************************************************************/ static void duart18_tx(device_t *device, int channel, UINT8 data) { -// nevada_state *state = device->machine().driver_data(); -/* Todo , just for sample */ +// nevada_state *state = device->machine().driver_data(); +/* Todo , just for sample */ if ( channel == 0 ) { - // Modem 1200 Baud - } + // Modem 1200 Baud + } }; /***************************************************************************/ @@ -367,24 +367,24 @@ static UINT8 duart18_input( device_t *device ) ***************************************************************************/ static void duart39_irq_handler( device_t *device, int state, UINT8 vector ) -{ +{ device->machine().device("maincpu")->execute().set_input_line_and_vector(3, state, vector); }; /***************************************************************************/ static void duart39_tx(device_t *device, int channel, UINT8 data) { -// nevada_state *state = device->machine().driver_data(); -/* Todo , just for sample */ +// nevada_state *state = device->machine().driver_data(); +/* Todo , just for sample */ if ( channel == 0 ) { // Printer - } + } else { // Player Tracking Interface J2 (not used) - } - + } + }; /***************************************************************************/ @@ -406,14 +406,14 @@ static UINT8 duart39_input( device_t *device ) static void duart40_irq_handler( device_t *device, int state, UINT8 vector ) { -/* Todo , just for sample */ +/* Todo , just for sample */ device->machine().device("maincpu")->execute().set_input_line_and_vector(5, state, vector); }; /***************************************************************************/ static void duart40_tx( device_t *device, int channel, UINT8 data ) { -/* Todo , just for sample */ +/* Todo , just for sample */ nevada_state *state = device->machine().driver_data(); if ( channel == 0 ) { @@ -421,13 +421,13 @@ static void duart40_tx( device_t *device, int channel, UINT8 data ) } else { - // JCM Bill Acceptor - } + // JCM Bill Acceptor + } }; /***************************************************************************/ WRITE8_MEMBER( nevada_state::microtouch_tx ) { - /* Todo , just for sample */ + /* Todo , just for sample */ duart68681_rx_data(m_duart40_68681, 0, data); } @@ -464,8 +464,8 @@ static const ay8910_interface ay8910_config = { AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, -// DEVCB_INPUT_PORT("DSW1"), /* not used */ -// DEVCB_INPUT_PORT("DSW2"), /* not used */ +// DEVCB_INPUT_PORT("DSW1"), /* not used */ +// DEVCB_INPUT_PORT("DSW2"), /* not used */ DEVCB_NULL, /* callback for display state changes */ DEVCB_NULL, /* callback for cursor state changes */ DEVCB_NULL, @@ -474,9 +474,9 @@ static const ay8910_interface ay8910_config = /***************************************************************************/ static READ16_HANDLER(io_board_r) -{ - // IO board Serial communication 0xA00000 - return 1; +{ + // IO board Serial communication 0xA00000 + return 1; } /***************************************************************************/ static WRITE16_HANDLER(io_board_w) @@ -491,25 +491,25 @@ static WRITE16_HANDLER (io_board_x) /***************************************************************************/ static READ16_HANDLER( nevada_sec_r ) -{ - nevada_state *state = space.machine().driver_data(); -// D3..D0 = DOOR OPEN or Track STATE of PAL35 - UINT16 res; - /* UPPER byte is use for input in PAL35 */ +{ + nevada_state *state = space.machine().driver_data(); +// D3..D0 = DOOR OPEN or Track STATE of PAL35 + UINT16 res; + /* UPPER byte is use for input in PAL35 */ // 74LS173 $bits Register used LOWER bits D3..D0 for PAL35 state and DOOR LOGIC SWITCH - res = pal35[state->m_datA40000 >> 8]; + res = pal35[state->m_datA40000 >> 8]; res = res << 8; res = res | (state->m_datA40000 & 0x00FF); - + return res; } /***************************************************************************/ static WRITE16_HANDLER( nevada_sec_w ) -{ - nevada_state *state = space.machine().driver_data(); +{ + nevada_state *state = space.machine().driver_data(); // 74LS173 $bits Register used LOWER bits D3..D0 for DOOR LOGIC SWITCH - state->m_datA40000 = data | 0x00f0; // since D7..D4 are not used and are connected to PULLUP -// popmessage("WRITE %04x %04x ",datA40000,data); + state->m_datA40000 = data | 0x00f0; // since D7..D4 are not used and are connected to PULLUP +// popmessage("WRITE %04x %04x ",datA40000,data); } /***************************************************************************/ @@ -521,7 +521,7 @@ DOOR Switch desc 1 x COIN DOOR SW 1 x TOP DOOR SW 1 x COMPUTER DOOR SW - + Interrupt Vector INT1 RTC MSM6242 INT2 nc @@ -539,7 +539,7 @@ U39 MC68681 RS232 UART SIDEB = Player Tracking Interface J2 (not used) U18 MC68681 RS232 UART SIDEA = MODEM LOW SPEED 1200 BAUD from XECOM -U18 MC68681 PIN4 IP1 from U16 (75HC189 pin6) from PIN2 J90 UNKNOWN ! +U18 MC68681 PIN4 IP1 from U16 (75HC189 pin6) from PIN2 J90 UNKNOWN ! U18 MC68681 PIN36 IP2 ACCESS DOOR SWITCH U18 MC68681 PIN2 IP3 LOW Battery Detector for ACCESS DOOR SWITCH U18 MC68681 PIN39 IP4 from U12 75174 UNKNOWN ! @@ -561,18 +561,18 @@ U40 MC68681 Pin27 OP4 JCM Bill Acceptor (J4-6, J4-7 Control) // missing adress for : // external I/O board communication via PAL23 - A23 A22 A21 A20 | A19 A18 A17 A16 | A15 A14 A13 A12 | A11 A10 A9 A8 | A7 A6 A5 A4 | A3 A2 A1 xx + A23 A22 A21 A20 | A19 A18 A17 A16 | A15 A14 A13 A12 | A11 A10 A9 A8 | A7 A6 A5 A4 | A3 A2 A1 xx Memory Map (generic) -------------------- 00000000 0000FFFF NVRAM (only 0..FFFF vector and jump) 16bits 00010000 00011FFF BACKUP1 8bits - 00020000 00021FFF BACKUP2 8bits + 00020000 00021FFF BACKUP2 8bits 00B00000 00B01FFF VIDEO RAM 8bits 00FA0000 00FBFFFF Not used (Expension board SRAM) 00FC0000 00FDFFFF PROGRAM 16bits 00FE0000 00FFFFFF BOOTLOADER 16bits - 00010001 + 00010001 00014001 00020001 00024001 @@ -582,7 +582,7 @@ U40 MC68681 Pin27 OP4 JCM Bill Acceptor (J4-6, J4-7 Control) 00A08001 I/O Board Communication 00A10000 WDT STROBE DS1232 WatchDog Controller (this adress reset Strobe of Ds1232) 00A20001 AY8912 BDIR AUDIO Data bus on D7..D0 - 00A28001 AY8912 BC1 AUDIO + 00A28001 AY8912 BC1 AUDIO 00A300x1 6242 CS RTC U41 A0..A3 (A4..A7 ON A0..A3) Data bus on D3..D0 00A4000x PAL CS READ U35 SECURITY PAL16R8 Data bus on D15..D8 00A4000x PAL CLK WRITE U35 SECURITY PAL16R8 @@ -591,18 +591,18 @@ U40 MC68681 Pin27 OP4 JCM Bill Acceptor (J4-6, J4-7 Control) 00B100x0 68681 CS UART U40 RS1..RS4 REGISTER (A4..A7 ON RS1..RS4) Data bus on D7..D0 00B200x0 68681 CS UART U39 RS1..RS4 REGISTER (A4..A7 ON RS1..RS4) Data bus on D7..D0 00E000x0 68681 CS UART U18 RS1..RS4 REGISTER (A4..A7 ON RS1..RS4) Data bus on D15..D8 -*/ +*/ /***************************************************************************/ static ADDRESS_MAP_START( nevada_map, AS_PROGRAM, 16,nevada_state ) AM_RANGE(0x00000000, 0x0000ffff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x00010000, 0x00021fff) AM_RAM AM_SHARE("backup") - AM_RANGE(0x00900000, 0x00900001) AM_DEVWRITE8("crtc",mc6845_device, address_w,0x00ff ) + AM_RANGE(0x00900000, 0x00900001) AM_DEVWRITE8("crtc",mc6845_device, address_w,0x00ff ) AM_RANGE(0x00908000, 0x00908001) AM_DEVWRITE8("crtc",mc6845_device,register_w,0x00ff ) AM_RANGE(0x00a00000, 0x00a00001) AM_READWRITE_LEGACY (io_board_r,io_board_w) AM_RANGE(0x00a08000, 0x00a08001) AM_WRITE_LEGACY(io_board_x) AM_RANGE(0x00a10000, 0x00a10001) AM_WRITE(watchdog_reset16_w ) - AM_RANGE(0x00a20000, 0x00a20001) AM_DEVWRITE8_LEGACY("aysnd", ay8910_address_w,0x00ff ) - AM_RANGE(0x00a28000, 0x00a28001) AM_DEVWRITE8_LEGACY("aysnd", ay8910_data_w ,0x00ff ) + AM_RANGE(0x00a20000, 0x00a20001) AM_DEVWRITE8_LEGACY("aysnd", ay8910_address_w,0x00ff ) + AM_RANGE(0x00a28000, 0x00a28001) AM_DEVWRITE8_LEGACY("aysnd", ay8910_data_w ,0x00ff ) AM_RANGE(0x00a30000, 0x00A300ff) AM_DEVREADWRITE8("rtc",msm6242_device, read, write, 0x00ff) AM_RANGE(0x00a40000, 0x00A40001) AM_READWRITE_LEGACY( nevada_sec_r, nevada_sec_w) //AM_RANGE(0x00b00000, 0x00b01fff) AM_RAM_WRITE(nevada_videoram_w) AM_BASE_MEMBER(nevada_state, m_videoram) @@ -621,7 +621,7 @@ static ADDRESS_MAP_START( nevada_iomap, AS_IO, 8, nevada_state ) ADDRESS_MAP_END /* -U18 MC68681 PIN4 IP1 from U16 (75HC189 pin6) from PIN2 J90 UNKNOWN ! +U18 MC68681 PIN4 IP1 from U16 (75HC189 pin6) from PIN2 J90 UNKNOWN ! U18 MC68681 PIN36 IP2 ACCESS DOOR SWITCH U18 MC68681 PIN2 IP3 LOW Battery Detector for ACCESS DOOR SWITCH U18 MC68681 PIN39 IP4 from U12 75174 UNKNOWN ! @@ -656,7 +656,7 @@ static INPUT_PORTS_START( nevada ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_START("DSW3") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN4 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("LOW BATT U51") INPUT_PORTS_END @@ -694,7 +694,7 @@ static MACHINE_RESET( nevada ) { nevada_state *state = machine.driver_data(); - + state->m_duart18_68681 = machine.device( "duart18_68681" ); state->m_duart39_68681 = machine.device( "duart39_68681" ); state->m_duart40_68681 = machine.device( "duart40_68681" ); @@ -710,17 +710,17 @@ static MACHINE_CONFIG_START( nevada, nevada_state ) MCFG_CPU_ADD("maincpu", M68000, MASTER_CPU) MCFG_CPU_PROGRAM_MAP(nevada_map) MCFG_CPU_IO_MAP(nevada_iomap) //0x10000 0x20000 - + MCFG_MACHINE_RESET(nevada) MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(150)) /* 150ms Ds1232 TD to Ground */ - - - MCFG_NVRAM_HANDLER(nevada) + + + MCFG_NVRAM_HANDLER(nevada) // video hardware MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE((42+1)*8, (32+1)*8) /* From MC6845 init, registers 00 & 04 (programmed with value-1). */ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 31*8-1) /* From MC6845 init, registers 01 & 06. */ MCFG_SCREEN_UPDATE_STATIC(nevada) @@ -729,33 +729,33 @@ static MACHINE_CONFIG_START( nevada, nevada_state ) MCFG_PALETTE_LENGTH(256) MCFG_PALETTE_INIT(nevada) MCFG_VIDEO_START(nevada) - + MCFG_MC6845_ADD("crtc", MC6845, MC6845_CLOCK, mc6845_intf) - + // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - + MCFG_DUART68681_ADD( "duart18_68681", XTAL_3_6864MHz , nevada_duart18_68681_config ) // UARTA = Modem 1200Baud MCFG_DUART68681_ADD( "duart39_68681", XTAL_3_6864MHz , nevada_duart39_68681_config ) // UARTA = Printer MCFG_DUART68681_ADD( "duart40_68681", XTAL_3_6864MHz , nevada_duart40_68681_config ) // UARTA = Touch , UARTB = Bill Acceptor MCFG_MICROTOUCH_ADD( "microtouch", nevada_microtouch_config ) /* devices */ MCFG_MSM6242_ADD("rtc", nevada_rtc_intf) - + MACHINE_CONFIG_END /***************************************************************************/ ROM_START( nevada ) - ROM_REGION( 0x1000000, "maincpu", 0 ) /* 2 x 27C512 */ + ROM_REGION( 0x1000000, "maincpu", 0 ) /* 2 x 27C512 */ ROM_LOAD16_BYTE( "u9even.bin" , 0xfc0000, 0x010000, CRC(ADB207BD) SHA1(3E3509B78FDF32785F92CB21272694673D25C563) ) // program fc0000..fdffff ROM_LOAD16_BYTE( "u10odd.bin" , 0xfc0001, 0x010000, CRC(A79778D7) SHA1(6FF969F09D9781479360BCA3403B927099AD6481) ) - + ROM_LOAD16_BYTE( "u31even.bin", 0xfe0000, 0x010000, CRC(C9779F30) SHA1(5310B3D8B5E887313CE8059BD72D0730A295074F) ) // Boot fe0000..ffffff - ROM_LOAD16_BYTE( "u32odd.bin" , 0xfe0001, 0x010000, CRC(51035ED1) SHA1(66CBF582CDF34CF3DDE30CF8A99BBCED4AF1CE6F) ) - + ROM_LOAD16_BYTE( "u32odd.bin" , 0xfe0001, 0x010000, CRC(51035ED1) SHA1(66CBF582CDF34CF3DDE30CF8A99BBCED4AF1CE6F) ) + ROM_REGION16_BE( 0x0010000, "defaults", 0 ) /* 2 x 62256 NVRAM */ ROM_LOAD16_BYTE( "u30nv_even.bin", 0x000000, 0x008000, CRC(11f5c663) SHA1(f447fd59010bc7fbbda321c5aaf13e23c2aebd40) ) // NVRAM even (RESET + Vector table in NVRAM) ROM_LOAD16_BYTE( "u33nv_odd.bin" , 0x000001, 0x008000, CRC(20623da2) SHA1(2dd31a96f0a3454855cd975e8ee95e43316344e0) ) // NVRAM odd @@ -766,7 +766,7 @@ ROM_START( nevada ) /* BACKUP RAM PAL DUMP - */ + */ ROM_END /***************************************************************************/ @@ -775,24 +775,24 @@ ROM_END *************************/ DRIVER_INIT_MEMBER(nevada_state,nevada) { - UINT16 *ROM = (UINT16 *)memregion("maincpu")->base(); - + UINT16 *ROM = (UINT16 *)memregion("maincpu")->base(); + memset(m_backup,0x00,m_backup.bytes()); // temp - + /* Patch for WDT test with int Level7 */ /* PATCH FE0086 4278 0414 Clrf $0414 */ /* this skip the test for the WDT */ -// ROM[0xFE0086/2] = 0x4278; -// ROM[0xFE0088/2] = 0x0414; - - // Skip PAL SECURITY +// ROM[0xFE0086/2] = 0x4278; +// ROM[0xFE0088/2] = 0x0414; + + // Skip PAL SECURITY ROM[0xFE0248/2] = 0x4E71; // nop ROM[0xFE05D0/2] = 0x4E71; // nop ROM[0xFE05D8/2] = 0x6014; // bra ROM[0xFE0606/2] = 0x600A; // bra -// ROM[0xFE18B4/2] = 0x4E71; // nop - - +// ROM[0xFE18B4/2] = 0x4E71; // nop + + } /***************************************************************************/ diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index 70e9a51575b..6df6263083d 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -551,7 +551,7 @@ static ADDRESS_MAP_START(xtom3d_io, AS_IO, 32, xtom3d_state) AM_RANGE(0x01f0, 0x01f7) AM_READWRITE(ide_r, ide_w) AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f0, 0x03f7) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write) diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index 4726eeb3b62..9cb2eb43551 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -68,7 +68,7 @@ public: UINT8 m_ioc_regs[0x80/4]; UINT8 m_vidc_bpp_mode; UINT8 m_vidc_interlace; - + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: @@ -77,13 +77,13 @@ private: static const device_timer_id TIMER_VIDEO = 1; static const device_timer_id TIMER_AUDIO = 2; static const device_timer_id TIMER_IOC = 3; - + void vidc_vblank(); void vidc_video_tick(); void vidc_audio_tick(); void ioc_timer(int param); - - void vidc_dynamic_res_change(); + + void vidc_dynamic_res_change(); void latch_timer_cnt(int tmr); void a310_set_timer(int tmr); DECLARE_READ32_MEMBER(ioc_ctrl_r); @@ -99,7 +99,7 @@ private: UINT8 m_vidc_pixel_clk; UINT8 m_vidc_stereo_reg[8]; emu_timer *m_timer[4], *m_snd_timer, *m_vid_timer; - emu_timer *m_vbl_timer; + emu_timer *m_vbl_timer; }; /* IOC registers */ diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index 0578fa92568..d465592d0f5 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -56,7 +56,7 @@ public: int m_chk41addr; bool m_dochk41; - + UINT16 m_mainram[0x10000/2]; diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index 6d26071b94c..24fa368cbb6 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -18,7 +18,7 @@ public: m_discrete(*this, "discrete") { } optional_device m_discrete; - + UINT8 m_analog_data; UINT8 m_rb_input_select; DECLARE_WRITE8_MEMBER(bzone_coin_counter_w); diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 0f3a83b9467..f4c8a008307 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -24,7 +24,7 @@ public: required_shared_ptr m_colorram; required_shared_ptr m_spriteram; required_shared_ptr m_pc3092_data; - required_device m_discrete; + required_device m_discrete; UINT16 m_collision_address; UINT8 m_collision_address_clear; tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index cf8ef87aa18..01b805694a3 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -107,7 +107,7 @@ public: DECLARE_VIDEO_START(nslasher); UINT32 screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_fghthist(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - UINT32 screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + UINT32 screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_captaven(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(deco32_vbl_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(interrupt_gen); diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index d6493e9c58d..c9a49d947c6 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -210,7 +210,7 @@ public: DECLARE_WRITE8_MEMBER(decocass_center_v_shift_w); void decocass_video_state_save_init(); - + DECLARE_WRITE8_MEMBER(ram_w); DECLARE_WRITE8_MEMBER(charram_w); DECLARE_WRITE8_MEMBER(fgvideoram_w); @@ -239,16 +239,16 @@ private: DECLARE_READ8_MEMBER(decocass_type5_r); DECLARE_WRITE8_MEMBER(decocass_type5_w); DECLARE_READ8_MEMBER(decocass_nodong_r); - + void draw_object(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_center(bitmap_ind16 &bitmap, const rectangle &cliprect); void mark_bg_tile_dirty(offs_t offset); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int color, int sprite_y_adjust, int sprite_y_adjust_flip_screen, UINT8 *sprite_ram, int interleave); - + void draw_missiles(bitmap_ind16 &bitmap, const rectangle &cliprect, int missile_y_adjust, int missile_y_adjust_flip_screen, - UINT8 *missile_ram, int interleave); + UINT8 *missile_ram, int interleave); }; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index e0d303ad2c6..434b96e0330 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -110,7 +110,7 @@ public: const UINT8 * m_color_codes; emu_timer * m_scanline_timer; INT8 m_vidhw; /* Selected video hardware RS Conversion / TKG04 */ - + optional_device m_discrete; /* radar scope */ diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 2e505b47314..37d35486122 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -74,7 +74,7 @@ public: DECLARE_READ8_MEMBER(irobot_status_r); DECLARE_WRITE8_MEMBER(irobot_paletteram_w); DECLARE_READ8_MEMBER(quad_pokeyn_r); - DECLARE_WRITE8_MEMBER(quad_pokeyn_w); + DECLARE_WRITE8_MEMBER(quad_pokeyn_w); DECLARE_DRIVER_INIT(irobot); virtual void machine_reset(); virtual void video_start(); diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 62a16266aa3..52d3e263915 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -116,7 +116,7 @@ public: DECLARE_DRIVER_INIT(berlwall); DECLARE_PALETTE_INIT(berlwall); DECLARE_VIDEO_START(berlwall); - UINT32 screen_update_berlwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_berlwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; class kaneko16_shogwarr_state : public kaneko16_state diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h index a34fadda189..c891b14f089 100644 --- a/src/mame/includes/m79amb.h +++ b/src/mame/includes/m79amb.h @@ -14,7 +14,7 @@ public: required_shared_ptr m_mask; required_device m_discrete; - + /* misc */ UINT8 m_lut_gun1[0x100]; UINT8 m_lut_gun2[0x100]; diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 7c69135e00d..d08a672f692 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -107,7 +107,7 @@ public: : driver_device(mconfig, type, tag), m_vdp(*this,"gen_vdp"), m_megadrive_ram(*this,"megadrive_ram") - { + { sega_cd_connected = 0; } required_device m_vdp; @@ -273,7 +273,7 @@ public: DECLARE_VIDEO_START(segac2_new); DECLARE_MACHINE_START(segac2); DECLARE_MACHINE_RESET(segac2); - + UINT32 screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -313,7 +313,7 @@ public: DECLARE_DRIVER_INIT(megaplay); DECLARE_VIDEO_START(megplay); DECLARE_MACHINE_RESET(megaplay); - + UINT32 screen_update_megplay(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_megaplay(screen_device &screen, bool state); }; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 3f02585b781..9a6df23ad09 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -47,7 +47,7 @@ public: required_shared_ptr m_main_ram; optional_shared_ptr m_colorram; optional_device m_discrete; - + /* sound-related */ UINT8 m_port_1_last; UINT8 m_port_2_last; @@ -78,7 +78,7 @@ public: samples_device *m_samples2; device_t *m_sn1; device_t *m_sn2; - device_t *m_sn; + device_t *m_sn; DECLARE_READ8_MEMBER(mw8080bw_shift_result_rev_r); DECLARE_READ8_MEMBER(mw8080bw_reversable_shift_result_r); diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index b70011e1d50..4612d07d5a3 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -47,7 +47,7 @@ public: void omegaf_io_protection_reset(); void robokid_motion_error_kludge(UINT16 offset); void video_init_common(UINT32 vram_alloc_size); - + DECLARE_WRITE8_MEMBER(ninjakd2_bankselect_w); DECLARE_WRITE8_MEMBER(ninjakd2_soundreset_w); DECLARE_WRITE8_MEMBER(ninjakd2_pcm_play_w); diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index c6110ce2db0..a917f75e8d1 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -27,7 +27,7 @@ public: /* memory pointers */ required_shared_ptr m_playfield_ram; required_shared_ptr m_sprite_ram; - + required_device m_discrete; /* video-related */ diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h index 5939b35317c..e5a5e508ec2 100644 --- a/src/mame/includes/stv.h +++ b/src/mame/includes/stv.h @@ -202,7 +202,7 @@ public: UINT32 screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(saturn_scanline); TIMER_DEVICE_CALLBACK_MEMBER(saturn_slave_scanline); - + void scu_do_transfer(UINT8 event); void scu_test_pending_irq(); DECLARE_READ32_MEMBER(saturn_scu_r); @@ -233,7 +233,7 @@ public: void saturn_init_driver(int rgn); int m_scsp_last_line; - + }; #define MASTER_CLOCK_352 57272720 diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 62d85952e9f..ffdcb50ef04 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -33,7 +33,7 @@ public: void coin_in(); void assert_coin_status(); - + DECLARE_WRITE8_MEMBER(vicdual_videoram_w); DECLARE_WRITE8_MEMBER(vicdual_characterram_w); DECLARE_READ8_MEMBER(depthch_io_r); diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c index 90f055dba7b..919441055cb 100644 --- a/src/mame/machine/archimds.c +++ b/src/mame/machine/archimds.c @@ -867,8 +867,8 @@ WRITE32_MEMBER(archimedes_state::archimedes_vidc_w) case VIDC_HCR: m_vidc_regs[VIDC_HCR] = ((val >> 14)<<1)+1; break; // case VIDC_HSWR: m_vidc_regs[VIDC_HSWR] = (val >> 14)+1; break; case VIDC_HBSR: m_vidc_regs[VIDC_HBSR] = ((val >> 14)<<1)+1; break; - case VIDC_HDSR: m_vidc_regs[VIDC_HDSR] = (val >> 14); break; - case VIDC_HDER: m_vidc_regs[VIDC_HDER] = (val >> 14); break; + case VIDC_HDSR: m_vidc_regs[VIDC_HDSR] = (val >> 14); break; + case VIDC_HDER: m_vidc_regs[VIDC_HDER] = (val >> 14); break; case VIDC_HBER: m_vidc_regs[VIDC_HBER] = ((val >> 14)<<1)+1; break; // #define VIDC_HCSR 0x98 // #define VIDC_HIR 0x9c diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h index fd099dba56b..4c65bddedad 100644 --- a/src/mame/machine/genpin.h +++ b/src/mame/machine/genpin.h @@ -30,4 +30,4 @@ static const samples_interface genpin_samples_intf = MACHINE_CONFIG_EXTERN( genpin_audio ); -#endif /* GENPIN_H_ */ \ No newline at end of file +#endif /* GENPIN_H_ */ diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c index 92c592f2c2a..3b727117739 100644 --- a/src/mame/machine/megacd.c +++ b/src/mame/machine/megacd.c @@ -159,7 +159,7 @@ static MACHINE_CONFIG_FRAGMENT( segacd_fragment ) MCFG_TIMER_DRIVER_ADD("stamp_timer", sega_segacd_device, segacd_gfx_conversion_timer_callback) MCFG_TIMER_DRIVER_ADD("scd_dma_timer", sega_segacd_device, scd_dma_timer_callback) - + MCFG_DEFAULT_LAYOUT( layout_megacd ) @@ -1100,7 +1100,7 @@ void sega_segacd_device::CDD_Import(running_machine& machine) WRITE16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_w ) { - + UINT16 old_halt = a12000_halt_reset_reg; @@ -1170,7 +1170,7 @@ READ16_MEMBER( sega_segacd_device::scd_a12000_halt_reset_r ) READ16_MEMBER( sega_segacd_device::scd_a12002_memory_mode_r ) { - + int temp = scd_rammode; int temp2 = 0; @@ -1208,7 +1208,7 @@ WRITE8_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w_8_15 ) WRITE8_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w_0_7 ) { - + //printf("scd_a12002_memory_mode_w_0_7 %04x\n",data); @@ -1234,7 +1234,7 @@ WRITE8_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w_0_7 ) WRITE16_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w ) { - + if (ACCESSING_BITS_8_15) scd_a12002_memory_mode_w_8_15(space, 0, data>>8, mem_mask>>8); @@ -1248,7 +1248,7 @@ WRITE16_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w ) READ16_MEMBER( sega_segacd_device::segacd_sub_memory_mode_r ) { - + int temp = scd_rammode; int temp2 = 0; @@ -1270,7 +1270,7 @@ WRITE8_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w_8_15 ) WRITE8_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w_0_7 ) { - + segacd_memory_priority_mode = (data&0x0018)>>3; @@ -1330,7 +1330,7 @@ WRITE8_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w_0_7 ) WRITE16_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w ) { //printf("segacd_sub_memory_mode_w %04x %04x\n", data, mem_mask); - + if (ACCESSING_BITS_8_15) segacd_sub_memory_mode_w_8_15(space, 0, data>>8, mem_mask>>8); @@ -1352,13 +1352,13 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_flags_r ) { - + return segacd_comms_flags; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_subcpu_w ) { - + if (ACCESSING_BITS_8_15) // Dragon's Lair { @@ -1374,7 +1374,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_subcpu_w ) WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_maincpu_w ) { - + if (ACCESSING_BITS_8_15) { @@ -1410,19 +1410,19 @@ WRITE16_MEMBER( sega_segacd_device::scd_4m_prgbank_ram_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_main_part1_r ) { - + return segacd_comms_part1[offset]; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_main_part1_w ) { - + COMBINE_DATA(&segacd_comms_part1[offset]); } READ16_MEMBER( sega_segacd_device::segacd_comms_main_part2_r ) { - + return segacd_comms_part2[offset]; } @@ -1434,7 +1434,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_main_part2_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_sub_part1_r ) { - + return segacd_comms_part1[offset]; } @@ -1445,13 +1445,13 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_sub_part1_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_sub_part2_r ) { - + return segacd_comms_part2[offset]; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_sub_part2_w ) { - + COMBINE_DATA(&segacd_comms_part2[offset]); } @@ -1620,13 +1620,13 @@ READ16_MEMBER( sega_segacd_device::scd_hint_vector_r ) READ16_MEMBER( sega_segacd_device::scd_a12006_hint_register_r ) { - + return segacd_hint_register; } WRITE16_MEMBER( sega_segacd_device::scd_a12006_hint_register_w ) { - + COMBINE_DATA(&segacd_hint_register); } @@ -2129,7 +2129,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_dataram_part2_w ) READ16_MEMBER( sega_segacd_device::segacd_irq_mask_r ) { - + return segacd_irq_mask; } @@ -2138,7 +2138,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_irq_mask_w ) if (ACCESSING_BITS_0_7) { UINT16 control = CDD_CONTROL; - + // printf("segacd_irq_mask_w %04x %04x (CDD control is %04x)\n",data, mem_mask, control); if (data & 0x10) @@ -2166,7 +2166,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_irq_mask_w ) READ16_MEMBER( sega_segacd_device::segacd_cdd_ctrl_r ) { - + return CDD_CONTROL; } @@ -2176,7 +2176,7 @@ WRITE16_MEMBER( sega_segacd_device::segacd_cdd_ctrl_w ) if (ACCESSING_BITS_0_7) { UINT16 control = CDD_CONTROL; - + //printf("segacd_cdd_ctrl_w %04x %04x (control %04x irq %04x\n", data, mem_mask, control, segacd_irq_mask); @@ -2580,13 +2580,13 @@ void sega_segacd_device::device_start() segacd_irq3_timer = machine().device(":segacd:irq3_timer"); address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM); - + segacd_font_bits = reinterpret_cast(machine().root_device().memshare(":segacd:segacd_font")->ptr()); segacd_backupram = reinterpret_cast(machine().root_device().memshare(":segacd:backupram")->ptr()); segacd_dataram = reinterpret_cast(machine().root_device().memshare(":segacd:dataram")->ptr()); -// segacd_dataram2 = reinterpret_cast(machine().root_device().memshare(":segacd:dataram2")->ptr()); +// segacd_dataram2 = reinterpret_cast(machine().root_device().memshare(":segacd:dataram2")->ptr()); segacd_4meg_prgram = reinterpret_cast(machine().root_device().memshare(":segacd:segacd_program")->ptr()); - + segacd_4meg_prgbank = 0; @@ -2618,7 +2618,7 @@ void sega_segacd_device::device_start() space.install_read_handler (0x0000070, 0x0000073, read16_delegate(FUNC(sega_segacd_device::scd_hint_vector_r),this) ); - + @@ -2698,7 +2698,7 @@ void sega_segacd_device::device_reset() // initialize some stuff on reset - + segacd_ram_writeprotect_bits = 0; segacd_4meg_prgbank = 0; segacd_memory_priority_mode = 0; diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h index 044e1ea4214..339999217ec 100644 --- a/src/mame/machine/megacd.h +++ b/src/mame/machine/megacd.h @@ -370,7 +370,7 @@ public: UINT16 segacd_imagebuffer_start_address; UINT16 segacd_imagebuffer_offset; - + UINT16 segacd_comms_flags;// = 0x0000; UINT16 segacd_comms_part1[0x8]; UINT16 segacd_comms_part2[0x8]; @@ -422,7 +422,7 @@ public: UINT32 CDD_EXT; UINT16 CDD_CONTROL; INT16 CDD_DONE; - + TIMER_DEVICE_CALLBACK_MEMBER( segacd_irq3_timer_callback ); TIMER_DEVICE_CALLBACK_MEMBER( scd_dma_timer_callback ); TIMER_DEVICE_CALLBACK_MEMBER( segacd_access_timer_callback ); @@ -480,7 +480,7 @@ public: void SCD_GET_TILE_INFO_32x32_1x1( int& tile_region, int& tileno, int tile_index ); void SCD_GET_TILE_INFO_16x16_16x16( int& tile_region, int& tileno, int tile_index ); void SCD_GET_TILE_INFO_32x32_16x16( int& tile_region, int& tileno, int tile_index ); - + TILE_GET_INFO_MEMBER( get_stampmap_16x16_1x1_tile_info ); TILE_GET_INFO_MEMBER( get_stampmap_32x32_1x1_tile_info ); TILE_GET_INFO_MEMBER( get_stampmap_16x16_16x16_tile_info ); @@ -556,9 +556,9 @@ public: WRITE16_MEMBER( segacd_stampmap_base_address_w ); READ16_MEMBER( segacd_imagebuffer_start_address_r ); WRITE16_MEMBER( segacd_imagebuffer_start_address_w ); - READ16_MEMBER( segacd_imagebuffer_offset_r ); + READ16_MEMBER( segacd_imagebuffer_offset_r ); WRITE16_MEMBER( segacd_imagebuffer_offset_w ); - READ16_MEMBER( segacd_imagebuffer_vcell_size_r ); + READ16_MEMBER( segacd_imagebuffer_vcell_size_r ); WRITE16_MEMBER( segacd_imagebuffer_vcell_size_w ); READ16_MEMBER( segacd_imagebuffer_hdot_size_r ); WRITE16_MEMBER( segacd_imagebuffer_hdot_size_w ); @@ -569,7 +569,7 @@ public: READ16_MEMBER( segacd_cdfader_r ); WRITE16_MEMBER( segacd_cdfader_w ); READ16_MEMBER( segacd_backupram_r ); - WRITE16_MEMBER( segacd_backupram_w ); + WRITE16_MEMBER( segacd_backupram_w ); READ16_MEMBER( segacd_font_color_r ); WRITE16_MEMBER( segacd_font_color_w ); READ16_MEMBER( segacd_font_converted_r ); diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index aa4a2cc1289..da8f6636100 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -18,13 +18,13 @@ public: : driver_device(mconfig, type, tag) { } DECLARE_WRITE8_MEMBER(pce_joystick_w); - DECLARE_READ8_MEMBER(pce_joystick_r); - + DECLARE_READ8_MEMBER(pce_joystick_r); + DECLARE_DRIVER_INIT(pce_common); - + virtual UINT8 joy_read(); private: - UINT8 m_io_port_options; /*driver-specific options for the PCE*/ + UINT8 m_io_port_options; /*driver-specific options for the PCE*/ int m_joystick_port_select; /* internal index of joystick ports */ int m_joystick_data_select; /* which nibble of joystick data we want */ }; diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 2a05ae78bf8..76ba4216dea 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -2048,10 +2048,10 @@ static void cop_take_hit_box_params(UINT8 offs) { height = UINT8(cop_collision_info[offs].hitbox_y >> 8); - start_y = INT8(cop_collision_info[offs].hitbox_y); + start_y = INT8(cop_collision_info[offs].hitbox_y); width = UINT8(cop_collision_info[offs].hitbox_x >> 8); - start_x = INT8(cop_collision_info[offs].hitbox_x); - } + start_x = INT8(cop_collision_info[offs].hitbox_x); + } cop_collision_info[offs].min_x = (cop_collision_info[offs].x >> 16) + start_x; cop_collision_info[offs].max_x = cop_collision_info[offs].min_x + width; @@ -2089,8 +2089,8 @@ static UINT8 cop_calculate_collsion_detection(running_machine &machine) //if(res == 0) //popmessage("0:%08x %08x %08x 1:%08x %08x %08x\n",cop_collision_info[0].x,cop_collision_info[0].y,cop_collision_info[0].hitbox,cop_collision_info[1].x,cop_collision_info[1].y,cop_collision_info[1].hitbox); -// popmessage("0:%08x %08x %08x %08x 1:%08x %08x %08x %08x\n",cop_collision_info[0].min_x,cop_collision_info[0].max_x,cop_collision_info[0].min_y, cop_collision_info[0].max_y, -// cop_collision_info[1].min_x,cop_collision_info[1].max_x,cop_collision_info[1].min_y, cop_collision_info[1].max_y); +// popmessage("0:%08x %08x %08x %08x 1:%08x %08x %08x %08x\n",cop_collision_info[0].min_x,cop_collision_info[0].max_x,cop_collision_info[0].min_y, cop_collision_info[0].max_y, +// cop_collision_info[1].min_x,cop_collision_info[1].max_x,cop_collision_info[1].min_y, cop_collision_info[1].max_y); return res; } @@ -2779,15 +2779,15 @@ static WRITE16_HANDLER( generic_cop_w ) cur_angle = INT8(space.read_byte(cop_register[0] + (0x34 ^ 3))); //space.write_byte(cop_register[0] + (0^3),space.read_byte(cop_register[0] + (0^3)) & 0xfb); //correct? /* - 0x00 0x00 0x60 0x00 - 0x00 0x20 0x60 0x20 - 0x00 0x40 0x60 0x60 - 0x00 0x60 0x60 0x60 - 0x00 0x80 0x60 0xa0 - 0x00 0xa0 0x60 0xa0 - 0x00 0xc0 0x60 0xc0 - 0x00 0xe0 0x60 0xe0 - */ + 0x00 0x00 0x60 0x00 + 0x00 0x20 0x60 0x20 + 0x00 0x40 0x60 0x60 + 0x00 0x60 0x60 0x60 + 0x00 0x80 0x60 0xa0 + 0x00 0xa0 0x60 0xa0 + 0x00 0xc0 0x60 0xc0 + 0x00 0xe0 0x60 0xe0 + */ if(cur_angle > cop_angle_compare) { diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c index 5cb2b7f82da..f7f614d6a7c 100644 --- a/src/mame/video/awpvid.c +++ b/src/mame/video/awpvid.c @@ -7,8 +7,8 @@ This is a primitive handler for generating reels with multiple symbols visible hanging off steppers.c . - - TODO: Add any lamping persistance simulations we need. + + TODO: Add any lamping persistance simulations we need. **************************************************************************************/ diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 3dc7d971b63..b1e60faf178 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -129,7 +129,7 @@ static const res_net_info radarscp_net_info = { { RES_NET_AMP_DARLINGTON, 470 * TRS_J1, 470*(1-TRS_J1), 3, { 1000, 470, 220 } }, { RES_NET_AMP_DARLINGTON, 470 * TRS_J1, 470*(1-TRS_J1), 3, { 1000, 470, 220 } }, - { RES_NET_AMP_EMITTER, 680 * TRS_J1, 680*(1-TRS_J1), 2, { 470, 220, 0 } } /* radarscp */ + { RES_NET_AMP_EMITTER, 680 * TRS_J1, 680*(1-TRS_J1), 2, { 470, 220, 0 } } /* radarscp */ } }; @@ -139,7 +139,7 @@ static const res_net_info radarscp_net_bck_info = { { RES_NET_AMP_DARLINGTON, 470, 4700, 0, { 0 } }, { RES_NET_AMP_DARLINGTON, 470, 4700, 0, { 0 } }, - { RES_NET_AMP_EMITTER, 470, 4700, 0, { 0 } } /* radarscp */ + { RES_NET_AMP_EMITTER, 470, 4700, 0, { 0 } } /* radarscp */ } }; @@ -713,9 +713,9 @@ static void radarscp_step(running_machine &machine, int line_cnt) int sig; /* vsync is divided by 2 by a LS161 - * The resulting 30 Hz signal clocks a LFSR (LS164) operating as a - * random number generator. - */ + * The resulting 30 Hz signal clocks a LFSR (LS164) operating as a + * random number generator. + */ if ( line_cnt == 0) { diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index f018ff797da..bf20cede5d9 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -133,12 +133,12 @@ WRITE8_MEMBER(jack_state::joinem_scroll_w) case 0: m_bg_tilemap->set_scrolly(offset >> 2, -data); break; - + // byte 1/2/3: no effect? default: break; } - + m_scrollram[offset] = data; } diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c index 517c9dd2141..6bfd3beb171 100644 --- a/src/mame/video/ninjakd2.c +++ b/src/mame/video/ninjakd2.c @@ -1,7 +1,7 @@ /****************************************************************************** UPL "sprite framebuffer" hardware - + Functions to emulate the video hardware ******************************************************************************/ @@ -118,7 +118,7 @@ void ninjakd2_state::video_init_common(UINT32 vram_alloc_size) m_robokid_bg0_videoram = auto_alloc_array_clear(machine(), UINT8, vram_alloc_size); m_robokid_bg1_videoram = auto_alloc_array_clear(machine(), UINT8, vram_alloc_size); m_robokid_bg2_videoram = auto_alloc_array_clear(machine(), UINT8, vram_alloc_size); - + save_pointer(NAME(m_robokid_bg0_videoram), vram_alloc_size); save_pointer(NAME(m_robokid_bg1_videoram), vram_alloc_size); save_pointer(NAME(m_robokid_bg2_videoram), vram_alloc_size); @@ -352,7 +352,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap) counts as one sprite drawn. This is proven by Mutant Night, which doesn't work correctly (leaves shots on screen) if we don't take big sprites into account. - */ + */ for (;;) { diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index d4be0f25107..f5be2a36e75 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -47,8 +47,8 @@ public: a2600_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_riot_ram(*this, "riot_ram") -// , m_joy1(*this, CONTROL1_TAG) -// , m_joy2(*this, CONTROL2_TAG) +// , m_joy1(*this, CONTROL1_TAG) +// , m_joy2(*this, CONTROL2_TAG) { } dpc_t m_dpc; @@ -128,8 +128,8 @@ public: DECLARE_READ8_MEMBER(riot_input_port_8_r); protected: -// required_device m_joy1; -// required_device m_joy2; +// required_device m_joy1; +// required_device m_joy2; int next_bank(); void modeF8_switch(UINT16 offset, UINT8 data); void modeFA_switch(UINT16 offset, UINT8 data); @@ -1276,7 +1276,7 @@ READ8_MEMBER(a2600_state::switch_A_r) case 0x00: /* Joystick */ case 0x05: /* Joystick w/Boostergrip */ val |= machine().root_device().ioport("SWA_JOY")->read() & 0xF0; -// val |= ( m_joy1->joy_r() & 0x0F ) << 4; +// val |= ( m_joy1->joy_r() & 0x0F ) << 4; break; case 0x01: /* Paddle */ val |= machine().root_device().ioport("SWA_PAD")->read() & 0xF0; @@ -2315,8 +2315,8 @@ static MACHINE_CONFIG_START( a2600, a2600_state ) /* devices */ MCFG_RIOT6532_ADD("riot", MASTER_CLOCK_NTSC / 3, r6532_interface) -// MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) -// MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) +// MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) +// MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) MCFG_FRAGMENT_ADD(a2600_cartslot) MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC") @@ -2351,8 +2351,8 @@ static MACHINE_CONFIG_START( a2600p, a2600_state ) /* devices */ MCFG_RIOT6532_ADD("riot", MASTER_CLOCK_PAL / 3, r6532_interface) -// MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) -// MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) +// MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, NULL, NULL) +// MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, NULL, NULL) MCFG_FRAGMENT_ADD(a2600_cartslot) MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL") diff --git a/src/mess/drivers/ami1200.c b/src/mess/drivers/ami1200.c index ac6a7888217..55d21c83977 100644 --- a/src/mess/drivers/ami1200.c +++ b/src/mess/drivers/ami1200.c @@ -326,7 +326,7 @@ static MACHINE_CONFIG_START( a1200n, ami1200_state ) MCFG_FLOPPY_DRIVE_ADD("fd1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - + MCFG_AMIGA_KEYBOARD_ADD("kbd") MACHINE_CONFIG_END diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index ea0f2a40fa2..643d2eb1d1e 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) MCFG_FLOPPY_DRIVE_ADD("fd1", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd2", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd3", amiga_floppies, 0, 0, amiga_fdc::floppy_formats) - + MCFG_AMIGA_KEYBOARD_ADD("kbd") MACHINE_CONFIG_END diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrocde.c index 15ae0b12df8..2c9ffaee101 100644 --- a/src/mess/drivers/astrocde.c +++ b/src/mess/drivers/astrocde.c @@ -17,7 +17,7 @@ class astrocde_mess_state : public astrocde_state { public: astrocde_mess_state(const machine_config &mconfig, device_type type, const char *tag) - : astrocde_state(mconfig, type, tag) + : astrocde_state(mconfig, type, tag) { } void get_ram_expansion_settings(int &ram_expansion_installed, int &write_protect_on, int &expansion_ram_start, int &expansion_ram_end, int &shadow_ram_end); diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index 3b9ec952e1c..fcd2be66c1f 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -111,7 +111,7 @@ protected: virtual void machine_start(); virtual void video_start(); virtual void palette_init(); -public: +public: UINT32 screen_update_bml3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(bml3_irq); INTERRUPT_GEN_MEMBER(bml3_timer_firq); @@ -893,7 +893,7 @@ static MACHINE_CONFIG_START( bml3, bml3_state ) MCFG_CPU_ADD("maincpu",M6809, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(bml3_mem) MCFG_CPU_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq) -// MCFG_CPU_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45) +// MCFG_CPU_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45) // MCFG_MACHINE_RESET_OVERRIDE(bml3_state,bml3) diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index 11c9698cd4a..217462c7b13 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -969,7 +969,7 @@ static const mc6845_interface vdc_intf = READ8_MEMBER( c128_state::sid_potx_r ) { UINT8 cia1_pa = m_cia1->pa_r(); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); @@ -984,7 +984,7 @@ READ8_MEMBER( c128_state::sid_potx_r ) READ8_MEMBER( c128_state::sid_poty_r ) { UINT8 cia1_pa = m_cia1->pa_r(); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index 6981d2e7e69..0fd65235657 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -422,7 +422,7 @@ static MOS6567_INTERFACE( vic_intf ) READ8_MEMBER( c64_state::sid_potx_r ) { UINT8 cia1_pa = m_cia1->pa_r(); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); @@ -437,7 +437,7 @@ READ8_MEMBER( c64_state::sid_potx_r ) READ8_MEMBER( c64_state::sid_poty_r ) { UINT8 cia1_pa = m_cia1->pa_r(); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); diff --git a/src/mess/drivers/cbm2.c b/src/mess/drivers/cbm2.c index a90c5bdcb3f..4dad48b3581 100644 --- a/src/mess/drivers/cbm2.c +++ b/src/mess/drivers/cbm2.c @@ -2,15 +2,15 @@ TODO: - - CIA timers fail in burn-in test - - NTSC variants unable to load from disk - - shift lock - - Hungarian keyboard - - cbm620hu charom banking? - - read VIC video/color RAM thru PLA (Sphi2 = 1, AE = 0) - - user port - - co-processor bus - - 8088 co-processor board + - CIA timers fail in burn-in test + - NTSC variants unable to load from disk + - shift lock + - Hungarian keyboard + - cbm620hu charom banking? + - read VIC video/color RAM thru PLA (Sphi2 = 1, AE = 0) + - user port + - co-processor bus + - 8088 co-processor board */ @@ -45,7 +45,7 @@ // read_pla - low profile PLA read //------------------------------------------------- -void cbm2_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, +void cbm2_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4) { UINT32 input = P0 << 15 | P1 << 14 | P2 << 13 | P3 << 12 | busy2 << 11 | eras << 10 | ecas << 9 | refen << 8 | cas << 7 | ras << 6; @@ -66,7 +66,7 @@ void cbm2_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras, // read_pla - high profile PLA read //------------------------------------------------- -void cbm2hp_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, +void cbm2hp_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4) { UINT32 input = ras << 13 | cas << 12 | refen << 11 | eras << 10 | ecas << 9 | busy2 << 8 | P3 << 3 | P2 << 2 | P1 << 1 | P0; @@ -88,7 +88,7 @@ void cbm2hp_state::read_pla(offs_t offset, int ras, int cas, int refen, int eras //------------------------------------------------- void cbm2_state::bankswitch(offs_t offset, int busy2, int eras, int ecas, int refen, int cas, int ras, int *sysioen, int *dramen, - int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *buframcs, int *extbufcs, int *vidramcs, + int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *buframcs, int *extbufcs, int *vidramcs, int *diskromcs, int *csbank1, int *csbank2, int *csbank3, int *basiccs, int *knbcs, int *kernalcs, int *crtccs, int *cs1, int *sidcs, int *extprtcs, int *ciacs, int *aciacs, int *tript1cs, int *tript2cs) { @@ -333,7 +333,7 @@ void p500_state::read_pla1(offs_t offset, int bras, int busy2, int sphi2, int cl { UINT32 input = P0 << 15 | P2 << 14 | bras << 13 | P1 << 12 | P3 << 11 | busy2 << 10 | m_statvid << 9 | sphi2 << 8 | clrnibcsb << 7 | m_dramon << 6 | procvid << 5 | refen << 4 | m_vicdotsel << 3 | ba << 2 | aec << 1 | srw; - + UINT32 data = m_pla1->read(input); *datxen = BIT(data, 0); @@ -356,7 +356,7 @@ void p500_state::read_pla2(offs_t offset, offs_t va, int ba, int sphi2, int vice { UINT32 input = VA12 << 15 | ba << 14 | A13 << 13 | A15 << 12 | A14 << 11 | A11 << 10 | A10 << 9 | A12 << 8 | sphi2 << 7 | vicen << 6 | m_statvid << 5 | m_vicdotsel << 4 | ae << 3 | segf << 2 | bcas << 1 | bank0; - + UINT32 data = m_pla2->read(input); *clrnibcsb = BIT(data, 0); @@ -385,7 +385,7 @@ void p500_state::bankswitch(offs_t offset, offs_t va, int srw, int sphi0, int sp int clrnibcsb = 1, procvid = 1, segf = 1; - read_pla1(offset, bras, busy2, sphi2, clrnibcsb, procvid, refen, ba, *aec, srw, + read_pla1(offset, bras, busy2, sphi2, clrnibcsb, procvid, refen, ba, *aec, srw, datxen, dramxen, clrniben, &segf, _64kcasen, casenb, viddaten, viddat_tr); int bank0 = 1, vicen = 1; @@ -429,7 +429,7 @@ void p500_state::bankswitch(offs_t offset, offs_t va, int srw, int sphi0, int sp *clrnibcs = clrnibcsb || bcas; *vidmatcs = vidmatcsb || bcas; - read_pla1(offset, bras, busy2, sphi2, clrnibcsb, procvid, refen, ba, *aec, srw, + read_pla1(offset, bras, busy2, sphi2, clrnibcsb, procvid, refen, ba, *aec, srw, datxen, dramxen, clrniben, &segf, _64kcasen, casenb, viddaten, viddat_tr); } @@ -441,7 +441,7 @@ void p500_state::bankswitch(offs_t offset, offs_t va, int srw, int sphi0, int sp UINT8 p500_state::read_memory(address_space &space, offs_t offset, offs_t va, int sphi0, int sphi1, int sphi2, int ba, int ae, int bras, int bcas, UINT8 *clrnib) { int srw = 1, busy2 = 1, refen = 0; - + int datxen = 1, dramxen = 1, clrniben = 1, _64kcasen = 1, casenb = 1, viddaten = 1, viddat_tr = 1; int clrnibcs = 1, extbufcs = 1, discromcs = 1, buframcs = 1, charomcs = 1, viccs = 1, vidmatcs = 1; int csbank1 = 1, csbank2 = 1, csbank3 = 1, basiclocs = 1, basichics = 1, kernalcs = 1; @@ -476,7 +476,7 @@ UINT8 p500_state::read_memory(address_space &space, offs_t offset, offs_t va, in data = m_charom[va & 0xfff]; } } - + if (clrniben) { if (!clrnibcs && !vsysaden) @@ -564,7 +564,7 @@ void p500_state::write_memory(address_space &space, offs_t offset, UINT8 data, i { int srw = 0, busy2 = 1, refen = 0; offs_t va = 0xffff; - + int datxen = 1, dramxen = 1, clrniben = 1, _64kcasen = 1, casenb = 1, viddaten = 1, viddat_tr = 1; int clrnibcs = 1, extbufcs = 1, discromcs = 1, buframcs = 1, charomcs = 1, viccs = 1, vidmatcs = 1; int csbank1 = 1, csbank2 = 1, csbank3 = 1, basiclocs = 1, basichics = 1, kernalcs = 1; @@ -675,25 +675,25 @@ WRITE8_MEMBER( p500_state::write ) READ8_MEMBER( p500_state::vic_videoram_r ) { /* - int sphi0 = 0, sphi1 = 1, sphi2 = 0, ba = 1, ae = 0, bras = 0, bcas = 0; - offs_t va = offset; + int sphi0 = 0, sphi1 = 1, sphi2 = 0, ba = 1, ae = 0, bras = 0, bcas = 0; + offs_t va = offset; - return read_memory(space, 0, va, sphi0, sphi1, sphi2, ba, ae, bras, bcas); - */ + return read_memory(space, 0, va, sphi0, sphi1, sphi2, ba, ae, bras, bcas); + */ /* - int ba = 1, ae = 0, bras = 1, bcas = 0; - UINT8 clrnib = 0xf; + int ba = 1, ae = 0, bras = 1, bcas = 0; + UINT8 clrnib = 0xf; + + if (offset < 0x1000) + { + return read_memory(space, 0, offset, 0, 1, 0, ba, ae, bras, bcas, &clrnib); + } + else + { + return read_memory(space, 0, offset, 1, 0, 1, ba, ae, bras, bcas, &clrnib); + } + */ - if (offset < 0x1000) - { - return read_memory(space, 0, offset, 0, 1, 0, ba, ae, bras, bcas, &clrnib); - } - else - { - return read_memory(space, 0, offset, 1, 0, 1, ba, ae, bras, bcas, &clrnib); - } - */ - if (offset < 0x1000) { return m_charom[offset & 0xfff]; @@ -961,7 +961,7 @@ static MC6845_UPDATE_ROW( lp_crtc_update_row ) { int color = BIT(data, 7) ^ BIT(code, 7) ^ BIT(ma, 13); if (cursor_x == column) color ^= 1; - + bitmap.pix32(y, x++) = RGB_MONOCHROME_GREEN[color]; data <<= 1; @@ -1000,7 +1000,7 @@ static MC6845_UPDATE_ROW( hp_crtc_update_row ) { int color = BIT(data, 7) ^ BIT(code, 7) ^ BIT(ma, 13); if (cursor_x == column) color ^= 1; - + bitmap.pix32(y, x++) = RGB_MONOCHROME_GREEN[color]; data <<= 1; @@ -1106,19 +1106,19 @@ WRITE_LINE_MEMBER( p500_state::tpi1_irq_w ) READ8_MEMBER( cbm2_state::tpi1_pa_r ) { /* - - bit description - - 0 0 - 1 0 - 2 REN - 3 ATN - 4 DAV - 5 EOI - 6 NDAC - 7 NRFD - - */ + + bit description + + 0 0 + 1 0 + 2 REN + 3 ATN + 4 DAV + 5 EOI + 6 NDAC + 7 NRFD + + */ UINT8 data = 0; @@ -1136,19 +1136,19 @@ READ8_MEMBER( cbm2_state::tpi1_pa_r ) WRITE8_MEMBER( cbm2_state::tpi1_pa_w ) { /* - - bit description - - 0 75161A DC - 1 75161A TE - 2 REN - 3 ATN - 4 DAV - 5 EOI - 6 NDAC - 7 NRFD - - */ + + bit description + + 0 75161A DC + 1 75161A TE + 2 REN + 3 ATN + 4 DAV + 5 EOI + 6 NDAC + 7 NRFD + + */ // IEEE-488 m_ieee2->dc_w(BIT(data, 0)); @@ -1167,26 +1167,26 @@ WRITE8_MEMBER( cbm2_state::tpi1_pa_w ) READ8_MEMBER( cbm2_state::tpi1_pb_r ) { /* - - bit description - - 0 IFC - 1 SRQ - 2 user port PB2 - 3 user port PB3 - 4 - 5 - 6 - 7 CASS SW - - */ + + bit description + + 0 IFC + 1 SRQ + 2 user port PB2 + 3 user port PB3 + 4 + 5 + 6 + 7 CASS SW + + */ UINT8 data = 0; // IEEE-488 data |= m_ieee2->ifc_r(); data |= m_ieee2->srq_r() << 1; - + // user port //data |= m_user->pb2_r() << 2; //data |= m_user->pb3_r() << 3; @@ -1200,23 +1200,23 @@ READ8_MEMBER( cbm2_state::tpi1_pb_r ) WRITE8_MEMBER( cbm2_state::tpi1_pb_w ) { /* - - bit description - - 0 IFC - 1 SRQ - 2 user port PB2 - 3 user port PB3 - 4 DRAMON - 5 CASS WRT - 6 CASS MTR - 7 - - */ + + bit description + + 0 IFC + 1 SRQ + 2 user port PB2 + 3 user port PB3 + 4 DRAMON + 5 CASS WRT + 6 CASS MTR + 7 + + */ // IEEE-488 - m_ieee2->ifc_w(BIT(data, 0)); - m_ieee2->srq_w(BIT(data, 1)); + m_ieee2->ifc_w(BIT(data, 0)); + m_ieee2->srq_w(BIT(data, 1)); // user port //m_user->pb2_w(BIT(data, 2)); @@ -1313,19 +1313,19 @@ WRITE8_MEMBER( cbm2_state::tpi2_pb_w ) READ8_MEMBER( cbm2_state::tpi2_pc_r ) { /* - - bit description - - 0 COLUMN 0 - 1 COLUMN 1 - 2 COLUMN 2 - 3 COLUMN 3 - 4 COLUMN 4 - 5 COLUMN 5 - 6 0=PAL, 1=NTSC - 7 0 - - */ + + bit description + + 0 COLUMN 0 + 1 COLUMN 1 + 2 COLUMN 2 + 3 COLUMN 3 + 4 COLUMN 4 + 5 COLUMN 5 + 6 0=PAL, 1=NTSC + 7 0 + + */ return (m_ntsc << 6) | (read_keyboard() & 0x3f); } @@ -1333,19 +1333,19 @@ READ8_MEMBER( cbm2_state::tpi2_pc_r ) READ8_MEMBER( cbm2hp_state::tpi2_pc_r ) { /* - - bit description - - 0 COLUMN 0 - 1 COLUMN 1 - 2 COLUMN 2 - 3 COLUMN 3 - 4 COLUMN 4 - 5 COLUMN 5 - 6 1 - 7 1 - - */ + + bit description + + 0 COLUMN 0 + 1 COLUMN 1 + 2 COLUMN 2 + 3 COLUMN 3 + 4 COLUMN 4 + 5 COLUMN 5 + 6 1 + 7 1 + + */ return read_keyboard(); } @@ -1353,19 +1353,19 @@ READ8_MEMBER( cbm2hp_state::tpi2_pc_r ) READ8_MEMBER( p500_state::tpi2_pc_r ) { /* - - bit description - - 0 COLUMN 0 - 1 COLUMN 1 - 2 COLUMN 2 - 3 COLUMN 3 - 4 COLUMN 4 - 5 COLUMN 5 - 6 0 - 7 0 - - */ + + bit description + + 0 COLUMN 0 + 1 COLUMN 1 + 2 COLUMN 2 + 3 COLUMN 3 + 4 COLUMN 4 + 5 COLUMN 5 + 6 0 + 7 0 + + */ return read_keyboard(); } @@ -1373,19 +1373,19 @@ READ8_MEMBER( p500_state::tpi2_pc_r ) WRITE8_MEMBER( p500_state::tpi2_pc_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 VICBNKSEL0 - 7 VICBNKSEL1 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 + 6 VICBNKSEL0 + 7 VICBNKSEL1 + + */ m_vicbnksel = data >> 6; } @@ -1437,19 +1437,19 @@ static const tpi6525_interface p500_tpi2_intf = READ8_MEMBER( cbm2_state::cia_pa_r ) { /* - - bit description - - 0 IEEE-488 D0, user port 1D0 - 1 IEEE-488 D1, user port 1D1 - 2 IEEE-488 D2, user port 1D2 - 3 IEEE-488 D3, user port 1D3 - 4 IEEE-488 D4, user port 1D4 - 5 IEEE-488 D5, user port 1D5 - 6 IEEE-488 D6, user port 1D6, LTPN - 7 IEEE-488 D7, user port 1D7, GAME TRIGGER 24 - - */ + + bit description + + 0 IEEE-488 D0, user port 1D0 + 1 IEEE-488 D1, user port 1D1 + 2 IEEE-488 D2, user port 1D2 + 3 IEEE-488 D3, user port 1D3 + 4 IEEE-488 D4, user port 1D4 + 5 IEEE-488 D5, user port 1D5 + 6 IEEE-488 D6, user port 1D6, LTPN + 7 IEEE-488 D7, user port 1D7, GAME TRIGGER 24 + + */ UINT8 data = 0; @@ -1469,19 +1469,19 @@ READ8_MEMBER( cbm2_state::cia_pa_r ) WRITE8_MEMBER( cbm2_state::cia_pa_w ) { /* - - bit description - - 0 IEEE-488 D0, user port 1D0 - 1 IEEE-488 D1, user port 1D1 - 2 IEEE-488 D2, user port 1D2 - 3 IEEE-488 D3, user port 1D3 - 4 IEEE-488 D4, user port 1D4 - 5 IEEE-488 D5, user port 1D5 - 6 IEEE-488 D6, user port 1D6 - 7 IEEE-488 D7, user port 1D7 - - */ + + bit description + + 0 IEEE-488 D0, user port 1D0 + 1 IEEE-488 D1, user port 1D1 + 2 IEEE-488 D2, user port 1D2 + 3 IEEE-488 D3, user port 1D3 + 4 IEEE-488 D4, user port 1D4 + 5 IEEE-488 D5, user port 1D5 + 6 IEEE-488 D6, user port 1D6 + 7 IEEE-488 D7, user port 1D7 + + */ // IEEE-488 m_ieee1->write(space, 0, data); @@ -1496,19 +1496,19 @@ WRITE8_MEMBER( cbm2_state::cia_pa_w ) READ8_MEMBER( cbm2_state::cia_pb_r ) { /* - - bit description - - 0 user port 2D0, GAME10 - 1 user port 2D1, GAME11 - 2 user port 2D2, GAME12 - 3 user port 2D3, GAME13 - 4 user port 2D4, GAME20 - 5 user port 2D5, GAME21 - 6 user port 2D6, GAME22 - 7 user port 2D7, GAME23 - - */ + + bit description + + 0 user port 2D0, GAME10 + 1 user port 2D1, GAME11 + 2 user port 2D2, GAME12 + 3 user port 2D3, GAME13 + 4 user port 2D4, GAME20 + 5 user port 2D5, GAME21 + 6 user port 2D6, GAME22 + 7 user port 2D7, GAME23 + + */ UINT8 data = 0; @@ -1525,19 +1525,19 @@ READ8_MEMBER( cbm2_state::cia_pb_r ) WRITE8_MEMBER( cbm2_state::cia_pb_w ) { /* - - bit description - - 0 user port 2D0 - 1 user port 2D1 - 2 user port 2D2 - 3 user port 2D3 - 4 user port 2D4 - 5 user port 2D5 - 6 user port 2D6 - 7 user port 2D7 - - */ + + bit description + + 0 user port 2D0 + 1 user port 2D1 + 2 user port 2D2 + 3 user port 2D3 + 4 user port 2D4 + 5 user port 2D5 + 6 user port 2D6 + 7 user port 2D7 + + */ //m_user->data2_w(data); } diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c index d811843cf0f..a4a25fd2267 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -78,7 +78,7 @@ private: UINT8 m_portb; virtual void machine_start(); virtual void machine_reset(); -public: +public: UINT32 screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(d6800_p); }; diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c index 756fa18bbe5..56bc32376af 100644 --- a/src/mess/drivers/elwro800.c +++ b/src/mess/drivers/elwro800.c @@ -49,7 +49,7 @@ public: DECLARE_WRITE8_MEMBER(elwro800jr_fdc_control_w); DECLARE_READ8_MEMBER(elwro800jr_io_r); DECLARE_WRITE8_MEMBER(elwro800jr_io_w); - DECLARE_MACHINE_RESET(elwro800); + DECLARE_MACHINE_RESET(elwro800); INTERRUPT_GEN_MEMBER(elwro800jr_interrupt); DECLARE_READ8_MEMBER(i8255_port_c_r); DECLARE_WRITE8_MEMBER(i8255_port_c_w); diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c index 216dce3c5a1..20c7b54b942 100644 --- a/src/mess/drivers/indiana.c +++ b/src/mess/drivers/indiana.c @@ -37,8 +37,8 @@ static ADDRESS_MAP_START(indiana_mem, AS_PROGRAM, 32, indiana_state) AM_RANGE(0x7f6003b0, 0x7f6003bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) AM_RANGE(0x7f6003c0, 0x7f6003cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) AM_RANGE(0x7f6003d0, 0x7f6003df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) - AM_RANGE(0x7f7a0000, 0x7f7bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) - AM_RANGE(0x80000000, 0x803fffff) AM_MIRROR(0x7fc00000) AM_RAM // 4 MB RAM + AM_RANGE(0x7f7a0000, 0x7f7bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) + AM_RANGE(0x80000000, 0x803fffff) AM_MIRROR(0x7fc00000) AM_RAM // 4 MB RAM ADDRESS_MAP_END diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c index 064253b44bd..482cf75fdbd 100644 --- a/src/mess/drivers/jr100.c +++ b/src/mess/drivers/jr100.c @@ -265,11 +265,11 @@ static const via6522_interface jr100_via_intf = DEVCB_NULL, /* in_ca2_func */ DEVCB_NULL, /* in_cb2_func */ DEVCB_DRIVER_MEMBER(jr100_state,jr100_via_write_a), /* out_a_func */ - DEVCB_DRIVER_MEMBER(jr100_state,jr100_via_write_b), /* out_b_func */ + DEVCB_DRIVER_MEMBER(jr100_state,jr100_via_write_b), /* out_b_func */ DEVCB_NULL, /* out_ca1_func */ DEVCB_NULL, /* out_cb1_func */ DEVCB_NULL, /* out_ca2_func */ - DEVCB_DRIVER_LINE_MEMBER(jr100_state, jr100_via_write_cb2), /* out_cb2_func */ + DEVCB_DRIVER_LINE_MEMBER(jr100_state, jr100_via_write_cb2), /* out_cb2_func */ DEVCB_NULL /* irq_func */ }; static const cassette_interface jr100_cassette_interface = diff --git a/src/mess/drivers/korgm1.c b/src/mess/drivers/korgm1.c index 88f67bc0d27..a3555d1133f 100644 --- a/src/mess/drivers/korgm1.c +++ b/src/mess/drivers/korgm1.c @@ -1,11 +1,11 @@ /*************************************************************************** - Korg M1 (c) 1988 + Korg M1 (c) 1988 - skeleton driver + skeleton driver - Note: driver isn't yet hooked up to mess.lst / mess.mak, until a ROM - dump is found. + Note: driver isn't yet hooked up to mess.lst / mess.mak, until a ROM + dump is found. ***************************************************************************/ @@ -51,24 +51,24 @@ UINT32 korgm1_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, static ADDRESS_MAP_START( korgm1_map, AS_PROGRAM, 16, korgm1_state ) AM_RANGE(0x00000, 0x0ffff) AM_RAM // 64 KB -// AM_RANGE(0x50000, 0x57fff) AM_RAM // memory card 32 KB +// AM_RANGE(0x50000, 0x57fff) AM_RAM // memory card 32 KB AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("ipl", 0) ADDRESS_MAP_END static ADDRESS_MAP_START( korgm1_io, AS_IO, 16, korgm1_state ) -// AM_RANGE(0x0000, 0x00ff) internal peripheral (?) -// AM_RANGE(0x0100, 0x01ff) VDF 1 (MB87404) -// AM_RANGE(0x0200, 0x02ff) VDF 2 (MB87404) -// AM_RANGE(0x0500, 0x0503) MDE (MB87405) -// AM_RANGE(0x0600, 0x0601) OPZ 1 (8-bit port) -// AM_RANGE(0x0700, 0x0701) OPZ 2 (8-bit port) -// AM_RANGE(0x0800, 0x0801) SCAN (8-bit port) (keyboard) -// AM_RANGE(0x0900, 0x09??) A/D Converter (M58990P, Joystick, "value" and After Touch routes here) ** -// AM_RANGE(0x0a00, 0x0a03) PPI (CXD1095, presumably i8255 compatible, LCD, LED and SW routes here) * -// AM_RANGE(0x0b00, 0x0b01) LCDC (8-bit port) -// AM_RANGE(0x1000, 0x11ff) TG (MB87402) -// AM_RANGE(0x2000, 0x23ff) SCSI -// AM_RANGE(0x3000, 0x33ff) FDC +// AM_RANGE(0x0000, 0x00ff) internal peripheral (?) +// AM_RANGE(0x0100, 0x01ff) VDF 1 (MB87404) +// AM_RANGE(0x0200, 0x02ff) VDF 2 (MB87404) +// AM_RANGE(0x0500, 0x0503) MDE (MB87405) +// AM_RANGE(0x0600, 0x0601) OPZ 1 (8-bit port) +// AM_RANGE(0x0700, 0x0701) OPZ 2 (8-bit port) +// AM_RANGE(0x0800, 0x0801) SCAN (8-bit port) (keyboard) +// AM_RANGE(0x0900, 0x09??) A/D Converter (M58990P, Joystick, "value" and After Touch routes here) ** +// AM_RANGE(0x0a00, 0x0a03) PPI (CXD1095, presumably i8255 compatible, LCD, LED and SW routes here) * +// AM_RANGE(0x0b00, 0x0b01) LCDC (8-bit port) +// AM_RANGE(0x1000, 0x11ff) TG (MB87402) +// AM_RANGE(0x2000, 0x23ff) SCSI +// AM_RANGE(0x3000, 0x33ff) FDC // TG 2? ADDRESS_MAP_END @@ -145,7 +145,7 @@ static const gfx_layout charlayout = #endif static GFXDECODE_START( korgm1 ) -// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) +// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -202,7 +202,7 @@ ROM_START( korgm1 ) ROM_REGION( 0x200000, "pcm", ROMREGION_ERASE00 ) ROM_LOAD( "pcm.rom", 0x00000, 0x200000, NO_DUMP ) -// ROM_REGION( 0x10000, "gfx1", ROMREGION_ERASE00 ) +// ROM_REGION( 0x10000, "gfx1", ROMREGION_ERASE00 ) ROM_END GAME( 1988, korgm1, 0, korgm1, korgm1, 0, ROT0, "Korg", "M1", GAME_IS_SKELETON ) diff --git a/src/mess/drivers/n64.c b/src/mess/drivers/n64.c index 3705dbc4ecd..12ba1a93395 100644 --- a/src/mess/drivers/n64.c +++ b/src/mess/drivers/n64.c @@ -18,7 +18,7 @@ class n64_mess_state : public n64_state { public: n64_mess_state(const machine_config &mconfig, device_type type, const char *tag) - : n64_state(mconfig, type, tag) + : n64_state(mconfig, type, tag) { } DECLARE_READ32_MEMBER(dd_null_r); diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index ae7eb484756..4b9d42a86d6 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -2348,8 +2348,8 @@ static void pc8801_sound_irq( device_t *device, int irq ) /* TIMER_DEVICE_CALLBACK_MEMBER(pc8801_state::pc8801_rtc_irq) { - if(m_timer_irq_mask) - pc8801_raise_irq(machine(),1<<(2),1); + if(m_timer_irq_mask) + pc8801_raise_irq(machine(),1<<(2),1); } */ diff --git a/src/mess/drivers/pv9234.c b/src/mess/drivers/pv9234.c index b748989cb65..9fe1d526730 100644 --- a/src/mess/drivers/pv9234.c +++ b/src/mess/drivers/pv9234.c @@ -79,10 +79,10 @@ WRITE32_MEMBER( pv9234_state::debug1_w ) { j = (data & 0xff000000) >> 24; data <<= 8; -// printf("%c",j); // this prints 'OFF' to the console. +// printf("%c",j); // this prints 'OFF' to the console. logerror("debug1=%02x %c\n",j,j); } -// printf("\n"); +// printf("\n"); } } diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index 92c1b18f7b9..e37e5ddb9ef 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -130,7 +130,7 @@ private: void update_kbd_irq(); virtual void machine_reset(); -public: +public: UINT32 screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_tick); diff --git a/src/mess/drivers/test_t400.c b/src/mess/drivers/test_t400.c index 7bcc07c56ae..d63495bd575 100644 --- a/src/mess/drivers/test_t400.c +++ b/src/mess/drivers/test_t400.c @@ -21,7 +21,7 @@ public: WRITE8_MEMBER( t400_test_suite_state::port_l_w ) { -// printf("L: %u\n", data); +// printf("L: %u\n", data); } static ADDRESS_MAP_START( cop_io, AS_IO, 8, t400_test_suite_state ) diff --git a/src/mess/drivers/ti99_4p.c b/src/mess/drivers/ti99_4p.c index 697532bba92..d383fac173d 100644 --- a/src/mess/drivers/ti99_4p.c +++ b/src/mess/drivers/ti99_4p.c @@ -96,7 +96,7 @@ public: virtual void machine_start(); DECLARE_MACHINE_RESET(ti99_4p); TIMER_DEVICE_CALLBACK_MEMBER(sgcpu_hblank_interrupt); - + void set_tms9901_INT2_from_v9938(v99x8_device &vdp, int state); tms9900_device* m_cpu; diff --git a/src/mess/drivers/ti99_4x.c b/src/mess/drivers/ti99_4x.c index 6e954ce9ae7..35035d39d4e 100644 --- a/src/mess/drivers/ti99_4x.c +++ b/src/mess/drivers/ti99_4x.c @@ -88,7 +88,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER( load_interrupt ); TIMER_DEVICE_CALLBACK_MEMBER(ti99_4ev_hblank_interrupt); - + // Some values to keep tms9900_device* m_cpu; tms9901_device* m_tms9901; diff --git a/src/mess/drivers/tm990189.c b/src/mess/drivers/tm990189.c index 80936107fd3..470b72f7c88 100644 --- a/src/mess/drivers/tm990189.c +++ b/src/mess/drivers/tm990189.c @@ -144,7 +144,7 @@ public: DECLARE_MACHINE_RESET(tm990_189); DECLARE_MACHINE_START(tm990_189_v); DECLARE_MACHINE_RESET(tm990_189_v); - + TIMER_DEVICE_CALLBACK_MEMBER(display_callback); TIMER_CALLBACK_MEMBER(clear_load); void hold_load(); diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c index e3b637d10bd..c408a7f67d4 100644 --- a/src/mess/drivers/vic10.c +++ b/src/mess/drivers/vic10.c @@ -254,7 +254,7 @@ static MOS6566_INTERFACE( vic_intf ) READ8_MEMBER( vic10_state::sid_potx_r ) { UINT8 cia_pa = m_cia->pa_r(); - + int sela = BIT(cia_pa, 6); int selb = BIT(cia_pa, 7); @@ -269,7 +269,7 @@ READ8_MEMBER( vic10_state::sid_potx_r ) READ8_MEMBER( vic10_state::sid_poty_r ) { UINT8 cia_pa = m_cia->pa_r(); - + int sela = BIT(cia_pa, 6); int selb = BIT(cia_pa, 7); diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 70cfc4fcba0..4c77392c535 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -436,7 +436,7 @@ int x68k_state::x68k_keyboard_pop_scancode() } void x68k_state::x68k_keyboard_push_scancode(unsigned char code) -{ +{ m_keyboard.keynum++; if(m_keyboard.keynum >= 1) { // keyboard buffer full diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index da7befdc460..852c3e1429b 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -559,13 +559,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(xerox820_state::ctc_tick) WRITE_LINE_MEMBER(xerox820_state::ctc_z0_w) { -// device_t *device = machine().device(Z80CTC_TAG); +// device_t *device = machine().device(Z80CTC_TAG); // z80ctc_trg1_w(device, state); } WRITE_LINE_MEMBER(xerox820_state::ctc_z2_w) { -// device_t *device = machine().device(Z80CTC_TAG); +// device_t *device = machine().device(Z80CTC_TAG); // z80ctc_trg3_w(device, state); } diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index 79692edfcbb..faf6a462316 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -482,7 +482,7 @@ static Z80CTC_INTERFACE( ctc_intf ) DEVCB_CPU_INPUT_LINE(Z80_TAG, INPUT_LINE_IRQ0), /* interrupt handler */ DEVCB_DRIVER_LINE_MEMBER(xor100_state,ctc_z0_w), /* ZC/TO0 callback */ DEVCB_DRIVER_LINE_MEMBER(xor100_state,ctc_z1_w), /* ZC/TO1 callback */ - DEVCB_DRIVER_LINE_MEMBER(xor100_state,ctc_z2_w) /* ZC/TO2 callback */ + DEVCB_DRIVER_LINE_MEMBER(xor100_state,ctc_z2_w) /* ZC/TO2 callback */ }; /* WD1795-02 Interface */ diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index 0331529598a..9fbb76e55b8 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -333,7 +333,7 @@ public: TIMER_CALLBACK_MEMBER(atariste_dmasound_tick); TIMER_CALLBACK_MEMBER(atariste_microwire_tick); - + void dmasound_set_state(int level); void dmasound_tick(); void microwire_shift(); diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h index 463c2647483..7490445cf83 100644 --- a/src/mess/includes/cbm2.h +++ b/src/mess/includes/cbm2.h @@ -100,11 +100,11 @@ public: DECLARE_MACHINE_START( cbm2_pal ); DECLARE_MACHINE_RESET( cbm2 ); - virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, + virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4); void bankswitch(offs_t offset, int busy2, int eras, int ecas, int refen, int cas, int ras, int *sysioen, int *dramen, - int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *buframcs, int *extbufcs, int *vidramcs, + int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *buframcs, int *extbufcs, int *vidramcs, int *diskromcs, int *csbank1, int *csbank2, int *csbank3, int *basiccs, int *knbcs, int *kernalcs, int *crtccs, int *cs1, int *sidcs, int *extprtcs, int *ciacs, int *aciacs, int *tript1cs, int *tript2cs); @@ -172,7 +172,7 @@ public: : cbm2_state(mconfig, type, tag) { } - virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, + virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas, int busy2, int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4); DECLARE_READ8_MEMBER( tpi2_pc_r ); @@ -203,7 +203,7 @@ public: void read_pla1(offs_t offset, int bras, int busy2, int sphi2, int clrnibcsb, int procvid, int refen, int ba, int aec, int srw, int *datxen, int *dramxen, int *clrniben, int *segf, int *_64kcasen, int *casenb, int *viddaten, int *viddat_tr); - + void read_pla2(offs_t offset, offs_t va, int ba, int sphi2, int vicen, int ae, int segf, int bcas, int bank0, int *clrnibcsb, int *extbufcs, int *discromcs, int *buframcs, int *charomcs, int *procvid, int *viccs, int *vidmatcs); @@ -212,7 +212,7 @@ public: int *clrnibcs, int *extbufcs, int *discromcs, int *buframcs, int *charomcs, int *viccs, int *vidmatcs, int *csbank1, int *csbank2, int *csbank3, int *basiclocs, int *basichics, int *kernalcs, int *cs1, int *sidcs, int *extprtcs, int *ciacs, int *aciacs, int *tript1cs, int *tript2cs, int *aec, int *vsysaden); - + UINT8 read_memory(address_space &space, offs_t offset, offs_t va, int sphi0, int sphi1, int sphi2, int ba, int ae, int bras, int bcas, UINT8 *clrnib); void write_memory(address_space &space, offs_t offset, UINT8 data, int sphi0, int sphi1, int sphi2, int ba, int ae, int bras, int bcas); diff --git a/src/mess/includes/comquest.h b/src/mess/includes/comquest.h index 1a8c375cd1f..9d087b4355a 100644 --- a/src/mess/includes/comquest.h +++ b/src/mess/includes/comquest.h @@ -24,7 +24,7 @@ public: DECLARE_WRITE8_MEMBER(comquest_write); virtual void machine_reset(); virtual void video_start(); - UINT32 screen_update_comquest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_comquest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; #endif /* COMQUEST_H_ */ diff --git a/src/mess/includes/concept.h b/src/mess/includes/concept.h index 45ab8205961..e2c5bc28c3a 100644 --- a/src/mess/includes/concept.h +++ b/src/mess/includes/concept.h @@ -54,11 +54,11 @@ public: virtual void video_start(); UINT32 screen_update_concept(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(concept_interrupt); - + void install_expansion_slot(int slot, read8_delegate reg_read, write8_delegate reg_write, read8_delegate rom_read, write8_delegate rom_write); - + void concept_fdc_init(int slot); void concept_hdc_init(int slot); @@ -68,7 +68,7 @@ public: DECLARE_READ8_MEMBER(concept_hdc_reg_r); DECLARE_WRITE8_MEMBER(concept_hdc_reg_w); - DECLARE_READ8_MEMBER(concept_hdc_rom_r); + DECLARE_READ8_MEMBER(concept_hdc_rom_r); DECLARE_READ8_MEMBER(via_in_a); DECLARE_WRITE8_MEMBER(via_out_a); DECLARE_READ8_MEMBER(via_in_b); diff --git a/src/mess/includes/dccons.h b/src/mess/includes/dccons.h index 8ebbd71baa3..9a7a38ce7e7 100644 --- a/src/mess/includes/dccons.h +++ b/src/mess/includes/dccons.h @@ -8,18 +8,18 @@ public: DECLARE_DRIVER_INIT(dc); DECLARE_DRIVER_INIT(dcus); DECLARE_DRIVER_INIT(dcjp); - + DECLARE_READ64_MEMBER(dcus_idle_skip_r); DECLARE_READ64_MEMBER(dcjp_idle_skip_r); - + DECLARE_MACHINE_RESET(dc_console); DECLARE_READ64_MEMBER(dc_pdtra_r); DECLARE_WRITE64_MEMBER(dc_pdtra_w); DECLARE_READ64_MEMBER(dc_arm_r); DECLARE_WRITE64_MEMBER(dc_arm_w); DECLARE_WRITE64_MEMBER(ta_texture_directpath0_w); - DECLARE_WRITE64_MEMBER(ta_texture_directpath1_w); -private: + DECLARE_WRITE64_MEMBER(ta_texture_directpath1_w); +private: UINT64 PDTRA, PCTRA; - + }; diff --git a/src/mess/includes/fmtowns.h b/src/mess/includes/fmtowns.h index 3bb44f58009..64c65e7114b 100644 --- a/src/mess/includes/fmtowns.h +++ b/src/mess/includes/fmtowns.h @@ -252,7 +252,7 @@ class towns_state : public driver_device void poll_keyboard(); void mouse_timeout(); void wait_end(); -public: +public: INTERRUPT_GEN_MEMBER(towns_vsync_irq); TIMER_CALLBACK_MEMBER(towns_cd_status_ready); TIMER_CALLBACK_MEMBER(towns_cdrom_read_byte); diff --git a/src/mess/includes/kramermc.h b/src/mess/includes/kramermc.h index 3b4aaaccce2..59590db0582 100644 --- a/src/mess/includes/kramermc.h +++ b/src/mess/includes/kramermc.h @@ -19,7 +19,7 @@ public: DECLARE_DRIVER_INIT(kramermc); virtual void machine_reset(); virtual void video_start(); - UINT32 screen_update_kramermc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + UINT32 screen_update_kramermc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER(kramermc_port_a_r); DECLARE_READ8_MEMBER(kramermc_port_b_r); DECLARE_WRITE8_MEMBER(kramermc_port_a_w); diff --git a/src/mess/includes/vtech2.h b/src/mess/includes/vtech2.h index d358c4c7636..50eecba02bd 100644 --- a/src/mess/includes/vtech2.h +++ b/src/mess/includes/vtech2.h @@ -56,18 +56,18 @@ public: DECLARE_MACHINE_RESET(laser700); UINT32 screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vtech2_interrupt); - + int mra_bank(int bank, int offs); void mwa_bank(int bank, int offs, int data); - + DECLARE_WRITE8_MEMBER(mwa_bank1); DECLARE_WRITE8_MEMBER(mwa_bank2); DECLARE_WRITE8_MEMBER(mwa_bank3); DECLARE_WRITE8_MEMBER(mwa_bank4); DECLARE_READ8_MEMBER(mra_bank1); - DECLARE_READ8_MEMBER(mra_bank2); + DECLARE_READ8_MEMBER(mra_bank2); DECLARE_READ8_MEMBER(mra_bank3); - DECLARE_READ8_MEMBER(mra_bank4); + DECLARE_READ8_MEMBER(mra_bank4); }; diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h index 261833f0769..01fe0478e3d 100644 --- a/src/mess/includes/x68k.h +++ b/src/mess/includes/x68k.h @@ -297,7 +297,7 @@ public: DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback); DECLARE_WRITE_LINE_MEMBER(x68k_scsi_irq); DECLARE_WRITE_LINE_MEMBER(x68k_scsi_drq); - + void mfp_init(); void x68k_keyboard_ctrl_w(int data); int x68k_keyboard_pop_scancode(); @@ -308,7 +308,7 @@ public: void md_6button_init(); UINT8 md_6button_r(int port); UINT8 xpd1lr_r(int port); - + DECLARE_WRITE_LINE_MEMBER(x68k_fm_irq); DECLARE_WRITE_LINE_MEMBER(x68k_irq2_line); @@ -345,7 +345,7 @@ public: DECLARE_READ16_MEMBER(x68k_exp_r); DECLARE_WRITE16_MEMBER(x68k_exp_w); DECLARE_READ16_MEMBER(x68k_scc_r); - + DECLARE_READ16_MEMBER(x68k_spritereg_r); DECLARE_WRITE16_MEMBER(x68k_spritereg_w); DECLARE_READ16_MEMBER(x68k_spriteram_r); @@ -367,7 +367,7 @@ private: void x68k_draw_text(bitmap_ind16 &bitmap, int xscr, int yscr, rectangle rect); void x68k_draw_gfx_scanline(bitmap_ind16 &bitmap, rectangle cliprect, UINT8 priority); void x68k_draw_gfx(bitmap_ind16 &bitmap,rectangle cliprect); - void x68k_draw_sprites(bitmap_ind16 &bitmap, int priority, rectangle cliprect); + void x68k_draw_sprites(bitmap_ind16 &bitmap, int priority, rectangle cliprect); }; diff --git a/src/mess/machine/a2arcadebd.c b/src/mess/machine/a2arcadebd.c index f4fe424da77..61029aca31c 100644 --- a/src/mess/machine/a2arcadebd.c +++ b/src/mess/machine/a2arcadebd.c @@ -3,12 +3,12 @@ a2arcadeboard.c Implementation of the Third Millenium Engineering Arcade Board - + TODO: - VDPTEST program seems to want more than 16K of RAM, but docs/ads/press releases say 16k, period - MLDEMO program needs vsync IRQ from the TMS but doesn't program the registers the way our emulation wants to enable IRQs - + *********************************************************************/ #include "emu.h" @@ -120,7 +120,7 @@ void a2bus_arcboard_device::device_reset() case 1: return m_tms->register_read(space, 0); - case 6: + case 6: return ay8910_r(m_ay, space, 0); } @@ -146,7 +146,7 @@ void a2bus_arcboard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 case 6: ay8910_data_w(m_ay, space, 0, data); break; - } + } } WRITE_LINE_MEMBER( a2bus_arcboard_device::tms_irq_w ) diff --git a/src/mess/machine/amigakbd.h b/src/mess/machine/amigakbd.h index b05100d8fb1..b8cf6a1615e 100644 --- a/src/mess/machine/amigakbd.h +++ b/src/mess/machine/amigakbd.h @@ -7,7 +7,7 @@ //************************************************************************** #define MCFG_AMIGA_KEYBOARD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AMIGAKBD, 0) + MCFG_DEVICE_ADD(_tag, AMIGAKBD, 0) @@ -25,20 +25,20 @@ public: // optional information overrides virtual ioport_constructor device_input_ports() const; - + DECLARE_INPUT_CHANGED_MEMBER( kbd_update ); - + protected: // device-level overrides virtual void device_start(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - + void kbd_sendscancode(UINT8 scancode ); -private: +private: UINT8 *m_buf; int m_buf_pos; int m_cur_pos; - emu_timer *m_timer; + emu_timer *m_timer; }; // device type definition diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c index 3b848622a59..08d87797186 100644 --- a/src/mess/machine/bebox.c +++ b/src/mess/machine/bebox.c @@ -227,7 +227,7 @@ WRITE64_MEMBER(bebox_state::bebox_cpu0_imask_w ) } WRITE64_MEMBER(bebox_state::bebox_cpu1_imask_w ) -{ +{ UINT32 old_imask = m_cpu_imask[1]; bebox_mbreg32_w(&m_cpu_imask[1], data, mem_mask); @@ -610,48 +610,48 @@ void bebox_ide_interrupt(device_t *device, int state) /* static READ64_MEMBER(bebox_state::bebox_video_r ) { - UINT64 result = 0; - mem_mask = FLIPENDIAN_INT64(mem_mask); - if (ACCESSING_BITS_0_7) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 0, mem_mask >> 0) << 0; - if (ACCESSING_BITS_8_15) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 1, mem_mask >> 8) << 8; - if (ACCESSING_BITS_16_23) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 2, mem_mask >> 16) << 16; - if (ACCESSING_BITS_24_31) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 3, mem_mask >> 24) << 24; - if (ACCESSING_BITS_32_39) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 4, mem_mask >> 32) << 32; - if (ACCESSING_BITS_40_47) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 5, mem_mask >> 40) << 40; - if (ACCESSING_BITS_48_55) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 6, mem_mask >> 48) << 48; - if (ACCESSING_BITS_56_63) - result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 7, mem_mask >> 56) << 56; - return FLIPENDIAN_INT64(result); + UINT64 result = 0; + mem_mask = FLIPENDIAN_INT64(mem_mask); + if (ACCESSING_BITS_0_7) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 0, mem_mask >> 0) << 0; + if (ACCESSING_BITS_8_15) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 1, mem_mask >> 8) << 8; + if (ACCESSING_BITS_16_23) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 2, mem_mask >> 16) << 16; + if (ACCESSING_BITS_24_31) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 3, mem_mask >> 24) << 24; + if (ACCESSING_BITS_32_39) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 4, mem_mask >> 32) << 32; + if (ACCESSING_BITS_40_47) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 5, mem_mask >> 40) << 40; + if (ACCESSING_BITS_48_55) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 6, mem_mask >> 48) << 48; + if (ACCESSING_BITS_56_63) + result |= (UINT64)vga_mem_linear_r(space, offset * 8 + 7, mem_mask >> 56) << 56; + return FLIPENDIAN_INT64(result); } static WRITE64_MEMBER(bebox_state::bebox_video_w ) { - data = FLIPENDIAN_INT64(data); - mem_mask = FLIPENDIAN_INT64(mem_mask); - if (ACCESSING_BITS_0_7) - vga_mem_linear_w(space, offset * 8 + 0, data >> 0 , mem_mask >> 0); - if (ACCESSING_BITS_8_15) - vga_mem_linear_w(space, offset * 8 + 1, data >> 8 , mem_mask >> 8); - if (ACCESSING_BITS_16_23) - vga_mem_linear_w(space, offset * 8 + 2, data >> 16, mem_mask >> 16); - if (ACCESSING_BITS_24_31) - vga_mem_linear_w(space, offset * 8 + 3, data >> 24, mem_mask >> 24); - if (ACCESSING_BITS_32_39) - vga_mem_linear_w(space, offset * 8 + 4, data >> 32, mem_mask >> 32); - if (ACCESSING_BITS_40_47) - vga_mem_linear_w(space, offset * 8 + 5, data >> 40, mem_mask >> 40); - if (ACCESSING_BITS_48_55) - vga_mem_linear_w(space, offset * 8 + 6, data >> 48, mem_mask >> 48); - if (ACCESSING_BITS_56_63) - vga_mem_linear_w(space, offset * 8 + 7, data >> 56, mem_mask >> 56); + data = FLIPENDIAN_INT64(data); + mem_mask = FLIPENDIAN_INT64(mem_mask); + if (ACCESSING_BITS_0_7) + vga_mem_linear_w(space, offset * 8 + 0, data >> 0 , mem_mask >> 0); + if (ACCESSING_BITS_8_15) + vga_mem_linear_w(space, offset * 8 + 1, data >> 8 , mem_mask >> 8); + if (ACCESSING_BITS_16_23) + vga_mem_linear_w(space, offset * 8 + 2, data >> 16, mem_mask >> 16); + if (ACCESSING_BITS_24_31) + vga_mem_linear_w(space, offset * 8 + 3, data >> 24, mem_mask >> 24); + if (ACCESSING_BITS_32_39) + vga_mem_linear_w(space, offset * 8 + 4, data >> 32, mem_mask >> 32); + if (ACCESSING_BITS_40_47) + vga_mem_linear_w(space, offset * 8 + 5, data >> 40, mem_mask >> 40); + if (ACCESSING_BITS_48_55) + vga_mem_linear_w(space, offset * 8 + 6, data >> 48, mem_mask >> 48); + if (ACCESSING_BITS_56_63) + vga_mem_linear_w(space, offset * 8 + 7, data >> 56, mem_mask >> 56); } */ /************************************* @@ -662,7 +662,7 @@ static WRITE64_MEMBER(bebox_state::bebox_video_w ) READ8_MEMBER(bebox_state::bebox_page_r) -{ +{ UINT8 data = m_at_pages[offset % 0x10]; switch(offset % 8) @@ -685,7 +685,7 @@ READ8_MEMBER(bebox_state::bebox_page_r) WRITE8_MEMBER(bebox_state::bebox_page_w) -{ +{ m_at_pages[offset % 0x10] = data; switch(offset % 8) @@ -711,7 +711,7 @@ WRITE8_MEMBER(bebox_state::bebox_page_w) WRITE8_MEMBER(bebox_state::bebox_80000480_w) -{ +{ switch(offset % 8) { case 1: @@ -910,7 +910,7 @@ static const struct kbdc8042_interface bebox_8042_interface = READ64_MEMBER(bebox_state::scsi53c810_r ) -{ +{ int reg = offset*8; UINT64 r = 0; if (!(mem_mask & U64(0xff00000000000000))) { @@ -943,7 +943,7 @@ READ64_MEMBER(bebox_state::scsi53c810_r ) WRITE64_MEMBER(bebox_state::scsi53c810_w ) -{ +{ int reg = offset*8; if (!(mem_mask & U64(0xff00000000000000))) { m_lsi53c810->lsi53c810_reg_w(reg+0, data >> 56); diff --git a/src/mess/machine/cbm2_graphic.c b/src/mess/machine/cbm2_graphic.c index 4beb892512e..1f2813723c1 100644 --- a/src/mess/machine/cbm2_graphic.c +++ b/src/mess/machine/cbm2_graphic.c @@ -9,10 +9,10 @@ /* - TODO: + TODO: - - version A (EF9365, 512x512 interlaced, 1 page) - - version B (EF9366, 512x256 non-interlaced, 2 pages) + - version A (EF9365, 512x512 interlaced, 1 page) + - version B (EF9366, 512x256 non-interlaced, 2 pages) */ @@ -41,7 +41,7 @@ const device_type CBM2_GRAPHIC = &device_creator; // ef9345_interface gdp_intf //------------------------------------------------- -static const ef9345_interface gdp_intf = +static const ef9345_interface gdp_intf = { SCREEN_TAG }; @@ -145,19 +145,19 @@ UINT8 cbm2_graphic_cartridge_device::cbm2_bd_r(address_space &space, offs_t offs else if (offset == 0x7f90) { /* - - bit description - - 0 light pen - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - */ + + bit description + + 0 light pen + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + */ } else if (offset == 0x7fb0) { @@ -184,19 +184,19 @@ void cbm2_graphic_cartridge_device::cbm2_bd_w(address_space &space, offs_t offse if (offset == 0x7f80) { /* - - bit description - - 0 hard copy (0=active) - 1 operating page select (version B) - 2 - 3 read-modify-write (1=active) - 4 display switch (1=graphic) - 5 display page select (version B) - 6 - 7 - - */ + + bit description + + 0 hard copy (0=active) + 1 operating page select (version B) + 2 + 3 read-modify-write (1=active) + 4 display switch (1=graphic) + 5 display page select (version B) + 6 + 7 + + */ } else if (offset >= 0x7ff0) { diff --git a/src/mess/machine/kr2376.c b/src/mess/machine/kr2376.c index 8115e92cc0d..1d0eed61ddc 100644 --- a/src/mess/machine/kr2376.c +++ b/src/mess/machine/kr2376.c @@ -344,7 +344,7 @@ static DEVICE_START( kr2376 ) assert(device->tag() != NULL); kr2376->intf = (const kr2376_interface*)device->static_config(); - + assert(kr2376->intf != NULL); assert(kr2376->intf->clock > 0); diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c index c8d7e092cee..91e1f5d7d24 100644 --- a/src/mess/machine/msx.c +++ b/src/mess/machine/msx.c @@ -119,7 +119,7 @@ DEVICE_IMAGE_LOAD (msx_cart) { "SUPERLODE", SLOT_SUPERLODERUNNER }, { "MAJUTSUSHI", SLOT_MAJUTSUSHI }, }; - + for (int i = 0; i < ARRAY_LENGTH(mapper_types) && type < 0; i++) { if (!mame_stricmp(mapper, mapper_types[i].mapper_name)) diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c index a7623a5566d..d24e2cac56b 100644 --- a/src/mess/machine/pc.c +++ b/src/mess/machine/pc.c @@ -924,8 +924,8 @@ TIMER_CALLBACK_MEMBER(pc_state::mc1502_keyb_signal_callback) key |= machine().root_device().ioport("Y10")->read(); key |= machine().root_device().ioport("Y11")->read(); key |= machine().root_device().ioport("Y12")->read(); -// DBG_LOG(1,"mc1502_k_s_c",("= %02X (%d) %s\n", key, mc1502_keyb.pulsing, -// (key || mc1502_keyb.pulsing) ? " will IRQ" : "")); +// DBG_LOG(1,"mc1502_k_s_c",("= %02X (%d) %s\n", key, mc1502_keyb.pulsing, +// (key || mc1502_keyb.pulsing) ? " will IRQ" : "")); /* If a key is pressed and we're not pulsing yet, start pulsing the IRQ1; @@ -946,13 +946,13 @@ TIMER_CALLBACK_MEMBER(pc_state::mc1502_keyb_signal_callback) READ8_MEMBER(pc_state::mc1502_ppi_porta_r) { -// DBG_LOG(1,"mc1502_ppi_porta_r",("= %02X\n", mc1502_keyb.latch)); +// DBG_LOG(1,"mc1502_ppi_porta_r",("= %02X\n", mc1502_keyb.latch)); return mc1502_keyb.latch; } WRITE8_MEMBER(pc_state::mc1502_ppi_porta_w) { -// DBG_LOG(1,"mc1502_ppi_porta_w",("( %02X )\n", data)); +// DBG_LOG(1,"mc1502_ppi_porta_w",("( %02X )\n", data)); mc1502_keyb.latch = data; if (mc1502_keyb.pulsing) mc1502_keyb.pulsing--; @@ -961,7 +961,7 @@ WRITE8_MEMBER(pc_state::mc1502_ppi_porta_w) WRITE8_MEMBER(pc_state::mc1502_ppi_portb_w) { -// DBG_LOG(2,"mc1502_ppi_portb_w",("( %02X )\n", data)); +// DBG_LOG(2,"mc1502_ppi_portb_w",("( %02X )\n", data)); m_ppi_portb = data; pit8253_gate2_w(machine().device("pit8253"), BIT(data, 0)); pc_speaker_set_spkrdata( machine(), data & 0x02 ); @@ -981,8 +981,8 @@ READ8_MEMBER(pc_state::mc1502_ppi_portc_r) // 0x10 -- SNDOUT data = ( data & ~0x10 ) | ( (BIT(m_ppi_portb, 1) && timer2_output) ? 0x10 : 0x00 ); -// DBG_LOG(2,"mc1502_ppi_portc_r",("= %02X (tap_val %f t2out %d) at %s\n", -// data, tap_val, timer2_output, machine().describe_context())); +// DBG_LOG(2,"mc1502_ppi_portc_r",("= %02X (tap_val %f t2out %d) at %s\n", +// data, tap_val, timer2_output, machine().describe_context())); return data; } @@ -1003,7 +1003,7 @@ READ8_MEMBER(pc_state::mc1502_kppi_porta_r) if (mc1502_keyb.mask & 0x0400) { key |= machine().root_device().ioport("Y11")->read(); } if (mc1502_keyb.mask & 0x0800) { key |= machine().root_device().ioport("Y12")->read(); } key ^= 0xff; -// DBG_LOG(2,"mc1502_kppi_porta_r",("= %02X\n", key)); +// DBG_LOG(2,"mc1502_kppi_porta_r",("= %02X\n", key)); return key; } @@ -1015,14 +1015,14 @@ WRITE8_MEMBER(pc_state::mc1502_kppi_portb_w) mc1502_keyb.mask |= 1 << 11; else mc1502_keyb.mask &= ~(1 << 11); -// DBG_LOG(2,"mc1502_kppi_portb_w",("( %02X -> %04X )\n", data, mc1502_keyb.mask)); +// DBG_LOG(2,"mc1502_kppi_portb_w",("( %02X -> %04X )\n", data, mc1502_keyb.mask)); } WRITE8_MEMBER(pc_state::mc1502_kppi_portc_w) { mc1502_keyb.mask &= ~(7 << 8); mc1502_keyb.mask |= ((data ^ 7) & 7) << 8; -// DBG_LOG(2,"mc1502_kppi_portc_w",("( %02X -> %04X )\n", data, mc1502_keyb.mask)); +// DBG_LOG(2,"mc1502_kppi_portc_w",("( %02X -> %04X )\n", data, mc1502_keyb.mask)); } diff --git a/src/mess/machine/rx01.c b/src/mess/machine/rx01.c index 9037e260b93..ad92dba7ed4 100644 --- a/src/mess/machine/rx01.c +++ b/src/mess/machine/rx01.c @@ -176,7 +176,7 @@ UINT16 rx01_device::status_read() void rx01_device::data_write(UINT16 data) { -// printf("data_write %04x\n",data); +// printf("data_write %04x\n",data); // data can be written only if TR is set if (BIT(m_rxcs,7)) m_rxdb = data; machine().scheduler().timer_set(attotime::from_msec(100), FUNC(command_execution_callback), 0, this); @@ -185,7 +185,7 @@ void rx01_device::data_write(UINT16 data) UINT16 rx01_device::data_read() { if (m_state==RX01_EMPTY && BIT(m_rxcs,7)) m_rxcs &= (1<<7); // clear TR bit; -// printf("data_read %04x\n",m_rxdb); +// printf("data_read %04x\n",m_rxdb); return m_rxdb; } diff --git a/src/mess/machine/vtech2.c b/src/mess/machine/vtech2.c index 162be163935..ab23737e721 100644 --- a/src/mess/machine/vtech2.c +++ b/src/mess/machine/vtech2.c @@ -146,7 +146,7 @@ WRITE8_MEMBER(vtech2_state::laser_bank_select_w) write8_delegate(FUNC(vtech2_state::mwa_bank3), this), write8_delegate(FUNC(vtech2_state::mwa_bank4), this), }; - + machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(offset * 0x4000, offset * 0x4000 + 0x3fff, mra_bank_soft[offset], mwa_bank_soft[offset]); } else diff --git a/src/mess/video/isa_svga_cirrus.c b/src/mess/video/isa_svga_cirrus.c index df502e0818a..20f28810efe 100644 --- a/src/mess/video/isa_svga_cirrus.c +++ b/src/mess/video/isa_svga_cirrus.c @@ -26,7 +26,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_cirrus ) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", CIRRUS_VGA, 0) MACHINE_CONFIG_END @@ -74,7 +74,7 @@ void isa8_svga_cirrus_device::device_start() set_isa_device(); m_vga = subdevice("vga"); - + m_isa->install_rom(this, 0xc0000, 0xc7fff, 0, 0, "svga", "dm_clgd5430"); m_isa->install_device(0x03b0, 0x03bf, 0, 0, read8_delegate(FUNC(cirrus_vga_device::port_03b0_r),m_vga), write8_delegate(FUNC(cirrus_vga_device::port_03b0_w),m_vga)); diff --git a/src/mess/video/isa_svga_cirrus.h b/src/mess/video/isa_svga_cirrus.h index e98fd365d27..0a55de42759 100644 --- a/src/mess/video/isa_svga_cirrus.h +++ b/src/mess/video/isa_svga_cirrus.h @@ -24,14 +24,14 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides virtual void device_start(); virtual void device_reset(); -private: - cirrus_vga_device *m_vga; +private: + cirrus_vga_device *m_vga; }; diff --git a/src/mess/video/isa_svga_s3.c b/src/mess/video/isa_svga_s3.c index 96bb78df8fe..743966a43bc 100644 --- a/src/mess/video/isa_svga_s3.c +++ b/src/mess/video/isa_svga_s3.c @@ -27,7 +27,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_s3 ) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", S3_VGA, 0) MACHINE_CONFIG_END diff --git a/src/mess/video/isa_svga_s3.h b/src/mess/video/isa_svga_s3.h index 9bbf69f133e..c5ed940bc4b 100644 --- a/src/mess/video/isa_svga_s3.h +++ b/src/mess/video/isa_svga_s3.h @@ -24,13 +24,13 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides virtual void device_start(); virtual void device_reset(); -private: +private: s3_vga_device *m_vga; ibm8514a_device *m_8514; }; diff --git a/src/mess/video/isa_svga_tseng.c b/src/mess/video/isa_svga_tseng.c index fe04cf986f1..603f468850c 100644 --- a/src/mess/video/isa_svga_tseng.c +++ b/src/mess/video/isa_svga_tseng.c @@ -26,7 +26,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_tseng ) MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", TSENG_VGA, 0) MACHINE_CONFIG_END @@ -74,7 +74,7 @@ void isa8_svga_et4k_device::device_start() set_isa_device(); m_vga = subdevice("vga"); - + m_isa->install_rom(this, 0xc0000, 0xc7fff, 0, 0, "et4000", "et4000"); m_isa->install_device(0x3b0, 0x3bf, 0, 0, read8_delegate(FUNC(tseng_vga_device::port_03b0_r),m_vga), write8_delegate(FUNC(tseng_vga_device::port_03b0_w),m_vga)); diff --git a/src/mess/video/isa_svga_tseng.h b/src/mess/video/isa_svga_tseng.h index 735b936f82f..1c82f0690dd 100644 --- a/src/mess/video/isa_svga_tseng.h +++ b/src/mess/video/isa_svga_tseng.h @@ -24,13 +24,13 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides virtual void device_start(); virtual void device_reset(); -private: +private: tseng_vga_device *m_vga; }; diff --git a/src/mess/video/isa_vga.c b/src/mess/video/isa_vga.c index 7b582b50fae..637c7de4db9 100644 --- a/src/mess/video/isa_vga.c +++ b/src/mess/video/isa_vga.c @@ -62,7 +62,7 @@ READ8_MEMBER( isa8_vga_device::input_port_0_r ) { return 0xff; } //return space. void isa8_vga_device::device_start() { set_isa_device(); - + m_vga = subdevice("vga"); m_isa->install_rom(this, 0xc0000, 0xc7fff, 0, 0, "ibm_vga", "ibm_vga"); diff --git a/src/mess/video/isa_vga.h b/src/mess/video/isa_vga.h index 7e7ab09517a..50b7b2fc796 100644 --- a/src/mess/video/isa_vga.h +++ b/src/mess/video/isa_vga.h @@ -24,7 +24,7 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides diff --git a/src/mess/video/isa_vga_ati.c b/src/mess/video/isa_vga_ati.c index a735d8a1db3..f878bc73ba1 100644 --- a/src/mess/video/isa_vga_ati.c +++ b/src/mess/video/isa_vga_ati.c @@ -29,7 +29,7 @@ static MACHINE_CONFIG_FRAGMENT( vga_ati ) MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update) MCFG_PALETTE_LENGTH(0x100) - + MCFG_DEVICE_ADD("vga", ATI_VGA, 0) MACHINE_CONFIG_END @@ -78,7 +78,7 @@ void isa16_vga_gfxultra_device::device_start() m_vga = subdevice("vga"); m_8514 = subdevice("vga:8514a"); - + m_isa->install_rom(this, 0xc0000, 0xc7fff, 0, 0, "vga", "gfxultra"); m_isa->install_device(0x1ce, 0x1cf, 0, 0, read8_delegate(FUNC(ati_vga_device::ati_port_ext_r),m_vga), write8_delegate(FUNC(ati_vga_device::ati_port_ext_w),m_vga)); diff --git a/src/mess/video/isa_vga_ati.h b/src/mess/video/isa_vga_ati.h index 8345f31fd5b..133314123ae 100644 --- a/src/mess/video/isa_vga_ati.h +++ b/src/mess/video/isa_vga_ati.h @@ -31,13 +31,13 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides virtual void device_start(); virtual void device_reset(); -private: +private: ati_vga_device *m_vga; mach8_device *m_8514; }; diff --git a/src/mess/video/nubus_vikbw.h b/src/mess/video/nubus_vikbw.h index faf754d3b59..0478a5197ef 100644 --- a/src/mess/video/nubus_vikbw.h +++ b/src/mess/video/nubus_vikbw.h @@ -24,7 +24,7 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides