diff --git a/hash/amiga1000_flop.xml b/hash/amiga1000_flop.xml index 4f542d42548..4219deea12c 100644 --- a/hash/amiga1000_flop.xml +++ b/hash/amiga1000_flop.xml @@ -27,11 +27,11 @@ - + - + - + diff --git a/hash/amiga1200_flop.xml b/hash/amiga1200_flop.xml index bc9cac9c8a8..645bd193965 100644 --- a/hash/amiga1200_flop.xml +++ b/hash/amiga1200_flop.xml @@ -51,7 +51,7 @@ - + diff --git a/hash/amiga500_flop.xml b/hash/amiga500_flop.xml index 29e7f670dc8..6e9f54d0155 100644 --- a/hash/amiga500_flop.xml +++ b/hash/amiga500_flop.xml @@ -15,7 +15,7 @@ - + diff --git a/hash/amiga500plus_flop.xml b/hash/amiga500plus_flop.xml index 6553a76ec1b..424857c3195 100644 --- a/hash/amiga500plus_flop.xml +++ b/hash/amiga500plus_flop.xml @@ -15,7 +15,7 @@ - + diff --git a/hash/amiga600_flop.xml b/hash/amiga600_flop.xml index ceebdb70be6..b438ba8ca8a 100644 --- a/hash/amiga600_flop.xml +++ b/hash/amiga600_flop.xml @@ -15,7 +15,7 @@ - + diff --git a/hash/amiga_flop.xml b/hash/amiga_flop.xml index d1edaa1464d..525196ec0f6 100644 --- a/hash/amiga_flop.xml +++ b/hash/amiga_flop.xml @@ -10,7 +10,7 @@ Pinball Dreams 1992 21st Century Entertainment - + @@ -51,11 +51,11 @@ - + Pinball Fantasies 1992 21st Century Entertainment - + @@ -82,7 +82,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/hash/amigaaga_flop.xml b/hash/amigaaga_flop.xml index e3ff9af22ad..4c796047e06 100644 --- a/hash/amigaaga_flop.xml +++ b/hash/amigaaga_flop.xml @@ -1,8 +1,8 @@ - @@ -116,7 +116,7 @@ - + diff --git a/hash/coco_cart.xml b/hash/coco_cart.xml index 370f082cd92..ee99f78cfe4 100644 --- a/hash/coco_cart.xml +++ b/hash/coco_cart.xml @@ -45,7 +45,7 @@ Compiled by K1W1 and Cowering (from GoodCoCo) - JDOS v1.23 overdumped, trim to 8K works fine - Spectaculator proper dump is 8K - Cumana DOS v2.0 - + * Notes: Mindroll, Robocop and Predator all have banking. (see https://archive.org/stream/rainbowmagazine-1990-06/The_Rainbow_Magazine_06_1990#page/n59/mode/1up for technique for the latter two) diff --git a/hash/pentagon_cass.xml b/hash/pentagon_cass.xml index c41d14d098f..830a552d6c1 100644 --- a/hash/pentagon_cass.xml +++ b/hash/pentagon_cass.xml @@ -1,12 +1,12 @@ - @@ -22,7 +22,7 @@ - + diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index d3339581940..fdf3751f3fa 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -17,26 +17,26 @@ @@ -457,7 +457,7 @@ - + diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c index 3a7291d1ed9..c2a4c274efb 100644 --- a/src/emu/cpu/avr8/avr8.c +++ b/src/emu/cpu/avr8/avr8.c @@ -1750,9 +1750,9 @@ static CPU_EXECUTE( avr8 ) SREG_W(AVR8_SREG_I, 1); /*if (cpustate->interrupt_pending) { - avr8_poll_interrupt(cpustate); - cpustate->interrupt_pending = false; - }*/ + avr8_poll_interrupt(cpustate); + cpustate->interrupt_pending = false; + }*/ opcycles = 4; break; case 0x0080: // SLEEP @@ -2032,7 +2032,7 @@ static CPU_SET_INFO( avr8 ) /* --- the following bits of info are set as 64-bit signed integers --- */ case CPUINFO_INT_PC: /* intentional fallthrough */ case CPUINFO_INT_REGISTER + AVR8_PC: cpustate->pc = info->i; break; - case CPUINFO_INT_REGISTER + AVR8_SREG: cpustate->status = info->i; break; + case CPUINFO_INT_REGISTER + AVR8_SREG: cpustate->status = info->i; break; case CPUINFO_INT_REGISTER + AVR8_R0: cpustate->r[ 0] = info->i; break; case CPUINFO_INT_REGISTER + AVR8_R1: cpustate->r[ 1] = info->i; break; case CPUINFO_INT_REGISTER + AVR8_R2: cpustate->r[ 2] = info->i; break; @@ -2098,7 +2098,7 @@ CPU_GET_INFO( avr8 ) case CPUINFO_INT_PC: /* intentional fallthrough */ case CPUINFO_INT_REGISTER + AVR8_PC: info->i = cpustate->pc << 1; break; - case CPUINFO_INT_REGISTER + AVR8_SREG: info->i = cpustate->status; break; + case CPUINFO_INT_REGISTER + AVR8_SREG: info->i = cpustate->status; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(avr8); break; diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h index d997094402f..f1b637c3a07 100644 --- a/src/emu/cpu/rsp/rsp.h +++ b/src/emu/cpu/rsp/rsp.h @@ -188,12 +188,12 @@ struct rsp_state UINT8 *imem8; rspimp_state* impstate; - + devcb_resolved_read32 dp_reg_r_func; devcb_resolved_write32 dp_reg_w_func; devcb_resolved_read32 sp_reg_r_func; devcb_resolved_write32 sp_reg_w_func; - devcb_resolved_write32 sp_set_status_func; + devcb_resolved_write32 sp_set_status_func; }; DECLARE_LEGACY_CPU_DEVICE(RSP, rsp); diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c index 4421313cfbd..662dd3e82b8 100644 --- a/src/emu/cpu/rsp/rspdrc.c +++ b/src/emu/cpu/rsp/rspdrc.c @@ -592,7 +592,7 @@ static void rspcom_init(rsp_state *rsp, legacy_cpu_device *device, device_irq_ac rsp->sp_reg_r_func.resolve(config->sp_reg_r_cb, *device); rsp->sp_reg_w_func.resolve(config->sp_reg_w_cb, *device); rsp->sp_set_status_func.resolve(config->sp_set_status_cb, *device); - + rsp->irq_callback = irqcallback; rsp->device = device; rsp->program = &device->space(AS_PROGRAM); diff --git a/src/emu/delegate.h b/src/emu/delegate.h index c256637aa6b..3e2de1160cc 100644 --- a/src/emu/delegate.h +++ b/src/emu/delegate.h @@ -256,9 +256,9 @@ public: : m_rawdata(s_null_mfp), m_realobject(NULL), m_stubfunction(NULL) { } - + // copy constructor - delegate_mfp(const delegate_mfp &src) + delegate_mfp(const delegate_mfp &src) : m_rawdata(src.m_rawdata), m_realobject(src.m_realobject), m_stubfunction(src.m_stubfunction) { } @@ -277,10 +277,10 @@ public: // comparison helpers bool operator==(const delegate_mfp &rhs) const { return (m_rawdata == rhs.m_rawdata); } bool isnull() const { return (m_rawdata == s_null_mfp); } - + // getters delegate_generic_class *real_object(delegate_generic_class *original) const { return m_realobject; } - + // binding helper template void update_after_bind(_FunctionType &funcptr, delegate_generic_class *&object) @@ -345,7 +345,7 @@ private: mfptype &mfp = *reinterpret_cast(&_this->m_rawdata); return (reinterpret_cast<_FunctionClass *>(_this->m_realobject)->*mfp)(p1, p2, p3, p4, p5); } - + // helper to convert a function of a given type to a generic function, forcing template // instantiation to match the source type template @@ -362,7 +362,7 @@ private: }; // internal state - raw_mfp_data m_rawdata; // raw buffer to hold the copy of the function pointer + raw_mfp_data m_rawdata; // raw buffer to hold the copy of the function pointer delegate_generic_class * m_realobject; // pointer to the object used for calling delegate_generic_function m_stubfunction; // pointer to our matching stub function static raw_mfp_data s_null_mfp; // NULL mfp @@ -400,7 +400,7 @@ public: // getters delegate_generic_class *real_object(delegate_generic_class *original) const { return original; } - + // binding helper template void update_after_bind(_FunctionType &funcptr, delegate_generic_class *&object) @@ -546,7 +546,7 @@ public: // getters bool has_object() const { return (object() != NULL); } const char *name() const { return m_name; } - + // helpers bool isnull() const { return (m_raw_function == NULL && m_raw_mfp.isnull()); } bool is_mfp() const { return !m_raw_mfp.isnull(); } @@ -575,7 +575,7 @@ protected: void bind(delegate_generic_class *object) { m_object = object; - + // if we're wrapping a member function pointer, handle special stuff if (m_object != NULL && is_mfp()) m_raw_mfp.update_after_bind(m_function, m_object); diff --git a/src/emu/devcb2.c b/src/emu/devcb2.c index a185849ab51..f4f2bfe8a92 100644 --- a/src/emu/devcb2.c +++ b/src/emu/devcb2.c @@ -79,7 +79,7 @@ void devcb2_base::reset(callback_type type) //------------------------------------------------- // resolve_ioport - resolve an I/O port or fatal -// error if we can't find it +// error if we can't find it //------------------------------------------------- void devcb2_base::resolve_ioport() @@ -93,7 +93,7 @@ void devcb2_base::resolve_ioport() //------------------------------------------------- // resolve_inputline - resolve a device and input -// number or fatal error if we can't find it +// number or fatal error if we can't find it //------------------------------------------------- void devcb2_base::resolve_inputline() @@ -111,8 +111,8 @@ void devcb2_base::resolve_inputline() //------------------------------------------------- -// resolve_space - resolve an address space or -// fatal error if we can't find it +// resolve_space - resolve an address space or +// fatal error if we can't find it //------------------------------------------------- void devcb2_base::resolve_space() @@ -150,7 +150,7 @@ void devcb2_read_base::reset(callback_type type) { // parent first devcb2_base::reset(type); - + // local stuff m_readline = read_line_delegate(); m_read8 = read8_delegate(); @@ -163,7 +163,7 @@ void devcb2_read_base::reset(callback_type type) //------------------------------------------------- // resolve - resolve the specified callback to -// its final form +// its final form //------------------------------------------------- void devcb2_read_base::resolve() @@ -181,7 +181,7 @@ void devcb2_read_base::resolve() { case CALLBACK_NONE: break; - + case CALLBACK_LINE: m_readline.bind_relative_to(*m_device.owner()); m_target_int = 0; @@ -211,21 +211,21 @@ void devcb2_read_base::resolve() m_target_int = 0; m_adapter = m_read64.isnull() ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read64_adapter; break; - + case CALLBACK_IOPORT: resolve_ioport(); m_target_int = 0; m_adapter = (m_target.ioport == NULL) ? &devcb2_read_base::read_constant_adapter : &devcb2_read_base::read_ioport_adapter; break; - + case CALLBACK_LOG: m_adapter = &devcb2_read_base::read_logged_adapter; break; - + case CALLBACK_CONSTANT: m_adapter = &devcb2_read_base::read_constant_adapter; break; - + case CALLBACK_INPUTLINE: throw emu_fatalerror("Device read callbacks can't be connected to input lines\n"); } @@ -239,8 +239,8 @@ void devcb2_read_base::resolve() //------------------------------------------------- // resolve_safe - resolve the callback; if not -// specified, resolve to a constant callback with -// the given value +// specified, resolve to a constant callback with +// the given value //------------------------------------------------- void devcb2_read_base::resolve_safe(UINT64 none_constant_value) @@ -256,8 +256,8 @@ void devcb2_read_base::resolve_safe(UINT64 none_constant_value) //------------------------------------------------- -// read_unresolved_adapter - error-generating -// unresolved adapter +// read_unresolved_adapter - error-generating +// unresolved adapter //------------------------------------------------- UINT64 devcb2_read_base::read_unresolved_adapter(address_space &space, offs_t offset, UINT64 mask) @@ -328,7 +328,7 @@ UINT64 devcb2_read_base::read_ioport_adapter(address_space &space, offs_t offset //------------------------------------------------- // read_logged_adapter - log a read and return a -// constant +// constant //------------------------------------------------- UINT64 devcb2_read_base::read_logged_adapter(address_space &space, offs_t offset, UINT64 mask) @@ -371,7 +371,7 @@ void devcb2_write_base::reset(callback_type type) { // parent first devcb2_base::reset(type); - + // local stuff m_writeline = write_line_delegate(); m_write8 = write8_delegate(); @@ -384,7 +384,7 @@ void devcb2_write_base::reset(callback_type type) //------------------------------------------------- // resolve - resolve the specified callback to -// its final form +// its final form //------------------------------------------------- void devcb2_write_base::resolve() @@ -402,7 +402,7 @@ void devcb2_write_base::resolve() { case CALLBACK_NONE: break; - + case CALLBACK_LINE: m_writeline.bind_relative_to(*m_device.owner()); m_adapter = m_writeline.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write_line_adapter; @@ -427,20 +427,20 @@ void devcb2_write_base::resolve() m_write64.bind_relative_to(*m_device.owner()); m_adapter = m_write64.isnull() ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write64_adapter; break; - + case CALLBACK_IOPORT: resolve_ioport(); m_adapter = (m_target.ioport == NULL) ? &devcb2_write_base::write_noop_adapter : &devcb2_write_base::write_ioport_adapter; break; - + case CALLBACK_LOG: m_adapter = &devcb2_write_base::write_logged_adapter; break; - + case CALLBACK_CONSTANT: m_adapter = &devcb2_write_base::write_noop_adapter; break; - + case CALLBACK_INPUTLINE: resolve_inputline(); m_adapter = &devcb2_write_base::write_inputline_adapter; @@ -456,7 +456,7 @@ void devcb2_write_base::resolve() //------------------------------------------------- // resolve_safe - resolve the callback; if not -// specified, resolve to a no-op +// specified, resolve to a no-op //------------------------------------------------- void devcb2_write_base::resolve_safe() @@ -469,8 +469,8 @@ void devcb2_write_base::resolve_safe() //------------------------------------------------- -// write_unresolved_adapter - error-generating -// unresolved adapter +// write_unresolved_adapter - error-generating +// unresolved adapter //------------------------------------------------- void devcb2_write_base::write_unresolved_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) @@ -540,8 +540,8 @@ void devcb2_write_base::write_ioport_adapter(address_space &space, offs_t offset //------------------------------------------------- -// write_logged_adapter - logging unresolved -// adapter +// write_logged_adapter - logging unresolved +// adapter //------------------------------------------------- void devcb2_write_base::write_logged_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) @@ -562,7 +562,7 @@ void devcb2_write_base::write_noop_adapter(address_space &space, offs_t offset, //------------------------------------------------- // write_inputline_adapter - write to an device's -// input line +// input line //------------------------------------------------- void devcb2_write_base::write_inputline_adapter(address_space &space, offs_t offset, UINT64 data, UINT64 mask) diff --git a/src/emu/devcb2.h b/src/emu/devcb2.h index 6f2fa3a585b..bf318f8287a 100644 --- a/src/emu/devcb2.h +++ b/src/emu/devcb2.h @@ -59,28 +59,28 @@ #define DEVCB2_LOGGER(_string, _value) devcb2_base::logger_desc(_string, _value) #define DEVCB2_INPUTLINE(_tag, _line) devcb2_base::inputline_desc(_tag, _line) -// wrappers for read callbacks into the owner device +// wrappers for read callbacks into the owner device #define DEVCB2_READLINE(_class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_READ8(_class, _func) read8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_READ16(_class, _func) read16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_READ32(_class, _func) read32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_READ64(_class, _func) read64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) - -// wrappers for read callbacks into any tagged device + +// wrappers for read callbacks into any tagged device #define DEVCB2_DEVREADLINE(tag, _class, _func) read_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVREAD8(tag, _class, _func) read8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVREAD16(tag, _class, _func) read16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVREAD32(tag, _class, _func) read32_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVREAD64(tag, _class, _func) read64_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) - -// wrappers for write callbacks into the owner device + +// wrappers for write callbacks into the owner device #define DEVCB2_WRITELINE(_class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_WRITE8(_class, _func) write8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_WRITE16(_class, _func) write16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_WRITE32(_class, _func) write32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) #define DEVCB2_WRITE64(_class, _func) write64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0) - -// wrappers for write callbacks into any tagged device + +// wrappers for write callbacks into any tagged device #define DEVCB2_DEVWRITELINE(tag, _class, _func) write_line_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVWRITE8(tag, _class, _func) write8_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) #define DEVCB2_DEVWRITE16(tag, _class, _func) write16_delegate(&_class::_func, #_class "::" #_func, tag, (_class *)0) @@ -137,28 +137,28 @@ public: devcb2_base &set_rshift(int rshift) { m_rshift = rshift; return *this; } devcb2_base &set_mask(UINT64 mask) { m_mask = mask; return *this; } devcb2_base &set_xor(UINT64 xorval) { m_xor = xorval; return *this; } - + // construction helper classes class null_desc { public: null_desc() { } }; - + class ioport_desc { public: ioport_desc(const char *tag) { m_tag = tag; } const char *m_tag; }; - + class constant_desc { public: constant_desc(UINT64 value) { m_value = value; } UINT64 m_value; }; - + class logger_desc { public: @@ -191,7 +191,7 @@ protected: void resolve_ioport(); void resolve_inputline(); void resolve_space(); - + // the callback target is going to be one of these union callback_target { @@ -199,7 +199,7 @@ protected: device_t * device; ioport_port * ioport; }; - + // configuration device_t & m_device; // reference to our owning device callback_type m_type; // type of callback registered @@ -212,8 +212,8 @@ protected: address_space * m_space; // target address space callback_target m_target; // resolved pointer to target object int m_rshift; // right shift to apply to data read - UINT64 m_mask; // mask to apply to data read - UINT64 m_xor; // XOR to apply to data read + UINT64 m_mask; // mask to apply to data read + UINT64 m_xor; // XOR to apply to data read }; @@ -224,7 +224,7 @@ class devcb2_read_base : public devcb2_base protected: // construction/destruction devcb2_read_base(device_t &device, UINT64 defmask); - + public: // callback configuration using devcb2_base::set_callback; @@ -233,7 +233,7 @@ public: devcb2_base &set_callback(read16_delegate func) { reset(CALLBACK_16); m_read16 = func; return *this; } devcb2_base &set_callback(read32_delegate func) { reset(CALLBACK_32); m_read32 = func; return *this; } devcb2_base &set_callback(read64_delegate func) { reset(CALLBACK_64); m_read64 = func; return *this; } - + // resolution void resolve(); void resolve_safe(UINT64 none_constant_value); @@ -273,7 +273,7 @@ class devcb2_write_base : public devcb2_base protected: // construction/destruction devcb2_write_base(device_t &device, UINT64 defmask); - + public: // callback configuration using devcb2_base::set_callback; diff --git a/src/emu/driver.h b/src/emu/driver.h index 81803a5986e..991419d7759 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -202,7 +202,7 @@ public: (machine.driver_data<_DriverClass>()->*_Function)(); } - // member-to-legacy-static wrappers + // member-to-legacy-static wrappers template DECLARE_READ_LINE_MEMBER( member_wrapper_line ) { return (*_Func)(this); } template diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h index 86cf431ec51..a8f30cd0806 100644 --- a/src/emu/machine/i8243.h +++ b/src/emu/machine/i8243.h @@ -49,7 +49,7 @@ public: // static configuration helpers template static devcb2_base &set_read_handler(device_t &device, _Object object) { return downcast(device).m_readhandler.set_callback(object); } template static devcb2_base &set_write_handler(device_t &device, _Object object) { return downcast(device).m_writehandler.set_callback(object); } - + DECLARE_READ8_MEMBER(i8243_p2_r); DECLARE_WRITE8_MEMBER(i8243_p2_w); diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c index 0a44369835f..00b2ed83ed2 100644 --- a/src/emu/machine/pla.c +++ b/src/emu/machine/pla.c @@ -77,7 +77,7 @@ void pla_device::parse_fusemap() { memory_region *region = machine().root_device().memregion(tag()); jed_data jed; - + jedbin_parse(region->base(), region->bytes(), &jed); UINT32 fusenum = 0; diff --git a/src/emu/machine/scsicb.c b/src/emu/machine/scsicb.c index dfdc9b7481f..88c846295bf 100644 --- a/src/emu/machine/scsicb.c +++ b/src/emu/machine/scsicb.c @@ -128,14 +128,14 @@ UINT8 scsicb_device::get_scsi_line( UINT32 mask ) state = 0; } - verboselog( 1, machine(), "%s get_scsi_line %s %d\n", tag(), get_line_name( mask ), state ); + verboselog( 1, machine(), "%s get_scsi_line %s %d\n", tag(), get_line_name( mask ), state ); return state; } void scsicb_device::set_scsi_line( UINT32 mask, UINT8 state ) { - verboselog( 1, machine(), "%s set_scsi_line %s %d\n", tag(), get_line_name( mask ), state ); + verboselog( 1, machine(), "%s set_scsi_line %s %d\n", tag(), get_line_name( mask ), state ); if( state ) { diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c index 8a1de920a1d..4a08ef25f52 100644 --- a/src/emu/sound/2151intf.c +++ b/src/emu/sound/2151intf.c @@ -1,8 +1,8 @@ /*************************************************************************** - 2151intf.c + 2151intf.c - Support interface YM2151(OPM) + Support interface YM2151(OPM) ***************************************************************************/ @@ -75,7 +75,7 @@ void ym2151_device::device_start() { m_irqhandler.resolve_safe(); m_portwritehandler.resolve_safe(); - + // stream setup int rate = clock() / 64; m_stream = stream_alloc(0, 2, rate); diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h index 160520aebf5..7c7f20570fe 100644 --- a/src/emu/sound/2151intf.h +++ b/src/emu/sound/2151intf.h @@ -34,7 +34,7 @@ // ======================> ym2151_device -class ym2151_device : public device_t, +class ym2151_device : public device_t, public device_sound_interface { public: @@ -48,7 +48,7 @@ public: // read/write DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - + DECLARE_READ8_MEMBER( status_r ); DECLARE_WRITE8_MEMBER( register_w ); DECLARE_WRITE8_MEMBER( data_w ); diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index 6775b40d2e4..38b032d7a45 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -798,7 +798,7 @@ void mos8563_device::device_timer(emu_timer &timer, device_timer_id id, int para UINT8 data = VSS_COPY ? read_videoram(m_block_addr++) : m_data; write_videoram(m_update_addr++, data); - + if (--m_word_count) { m_block_copy_timer->adjust( attotime::from_ticks( 1, m_clock ) ); @@ -1238,12 +1238,12 @@ void mos8563_device::device_start() m_de_begin = 0; m_dram_refresh = 0; m_sync_polarity = 0; - + m_revision = 1; // initialize video RAM UINT8 data = 0xff; - + for (offs_t offset = 0; offset < 0x10000; offset++) { write_videoram(offset, data); @@ -1527,13 +1527,13 @@ void mos8563_device::update_row(bitmap_rgb32 &bitmap, const rectangle &cliprect, if (m_max_ras_addr < 16) { - font_addr = ((m_char_base_addr & 0xe0) << 8) | (ATTR_ALTERNATE_CHARSET << 12) | (code << 4) | (ra & 0x0f); + font_addr = ((m_char_base_addr & 0xe0) << 8) | (ATTR_ALTERNATE_CHARSET << 12) | (code << 4) | (ra & 0x0f); } else { - font_addr = ((m_char_base_addr & 0xc0) << 8) | (ATTR_ALTERNATE_CHARSET << 13) | (code << 5) | (ra & 0x1f); + font_addr = ((m_char_base_addr & 0xc0) << 8) | (ATTR_ALTERNATE_CHARSET << 13) | (code << 5) | (ra & 0x1f); } - + UINT8 data = read_videoram(font_addr); if (ra >= cdv) data = 0; diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h index ccc0336bb72..e2e51822a48 100644 --- a/src/emu/video/mc6845.h +++ b/src/emu/video/mc6845.h @@ -434,7 +434,7 @@ protected: virtual UINT8 draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect, void *param); static const device_timer_id TIMER_BLOCK_COPY = 9; - + emu_timer *m_block_copy_timer; }; diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 9bd5622b567..061f1689479 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -2702,59 +2702,59 @@ void s3_vga_device::s3_define_video_mode() case 0x0d: svga.rgb32_en = 1; divisor = 2; break; default: fatalerror("TODO: s3 video mode not implemented %02x\n",((s3.ext_misc_ctrl_2) >> 4)); break; } -/* switch(s3.cr42 & 0x0f) // TODO: confirm clock settings - { - case 0: - xtal = XTAL_25_1748MHz; - break; - case 1: - xtal = XTAL_28_63636MHz; - break; - case 2: - xtal = 40000000; - break; - case 3: - xtal = 3000000; - break; - case 4: - xtal = 50000000; - break; - case 5: - xtal = 77000000; - break; - case 6: - xtal = 36000000; - break; - case 7: - xtal = 45000000; - break; - case 8: - xtal = 1000000; - break; - case 9: - xtal = 1000000; - break; - case 10: - xtal = 79000000; - break; - case 11: - xtal = 31000000; - break; - case 12: - xtal = 94000000; - break; - case 13: - xtal = 65000000; - break; - case 14: - xtal = 75000000; - break; - case 15: - xtal = 71000000; - break; - default: - xtal = 1000000; - }*/ +/* switch(s3.cr42 & 0x0f) // TODO: confirm clock settings + { + case 0: + xtal = XTAL_25_1748MHz; + break; + case 1: + xtal = XTAL_28_63636MHz; + break; + case 2: + xtal = 40000000; + break; + case 3: + xtal = 3000000; + break; + case 4: + xtal = 50000000; + break; + case 5: + xtal = 77000000; + break; + case 6: + xtal = 36000000; + break; + case 7: + xtal = 45000000; + break; + case 8: + xtal = 1000000; + break; + case 9: + xtal = 1000000; + break; + case 10: + xtal = 79000000; + break; + case 11: + xtal = 31000000; + break; + case 12: + xtal = 94000000; + break; + case 13: + xtal = 65000000; + break; + case 14: + xtal = 75000000; + break; + case 15: + xtal = 71000000; + break; + default: + xtal = 1000000; + }*/ } else { @@ -2763,7 +2763,7 @@ void s3_vga_device::s3_define_video_mode() svga.rgb16_en = 0; svga.rgb32_en = 0; } -// if((vga.miscellaneous_output & 0xc) != 0x0c) +// if((vga.miscellaneous_output & 0xc) != 0x0c) xtal = (vga.miscellaneous_output & 0xc) ? XTAL_28_63636MHz : XTAL_25_1748MHz; recompute_params_clock(divisor, xtal); } diff --git a/src/lib/formats/tzx_cas.c b/src/lib/formats/tzx_cas.c index 4cdc9d4587d..de59fbee26e 100644 --- a/src/lib/formats/tzx_cas.c +++ b/src/lib/formats/tzx_cas.c @@ -496,7 +496,7 @@ static int tzx_cas_do_work( INT16 **buffer ) else { current_block++; - } + } break; case 0x21: /* Group Start */ diff --git a/src/lib/formats/upd765_dsk.c b/src/lib/formats/upd765_dsk.c index 8117a9049cf..b4a2c121fcc 100644 --- a/src/lib/formats/upd765_dsk.c +++ b/src/lib/formats/upd765_dsk.c @@ -299,7 +299,7 @@ bool upd765_format::save(io_generic *io, floppy_image *image) extract_sectors(image, f, sectors, track, head); io_generic_write(io, sectdata, (track*f.head_count + head)*track_size, track_size); } - + return true; } diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c index e7dff45441c..67415c56e1c 100644 --- a/src/mame/audio/gottlieb.c +++ b/src/mame/audio/gottlieb.c @@ -299,7 +299,7 @@ MACHINE_CONFIG_END void gottlieb_state::qbert_knocker(UINT8 knock) { output_set_value("knocker0", knock); - + // start sound on rising edge if (knock & ~m_knocker_prev) m_knocker_sample->start(0, 0); diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index 04215c420c9..f82ff787d21 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -225,7 +225,7 @@ static INPUT_PORTS_START( _3x3puzzle ) PORT_START("VBLANK") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") - + PORT_START("DSW01") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index b4adae0d858..be120b5dd77 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -683,7 +683,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( invrvnge, mw8080bw_root, _8080bw_state ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(invrvnge_io_map) - + MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz/2) // MC6808P MCFG_CPU_PROGRAM_MAP(invrvnge_sound_map) diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 92793695062..7608d6c347a 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1612,7 +1612,7 @@ static MACHINE_CONFIG_START( aerofgtb, aerofgt_state ) MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_DEVICE_ADD("vsystem_spr_ol2", VSYSTEM_SPR2, 0) - + MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) /* sound hardware */ diff --git a/src/mame/drivers/bingoman.c b/src/mame/drivers/bingoman.c index dafb4226071..f9981e8158a 100644 --- a/src/mame/drivers/bingoman.c +++ b/src/mame/drivers/bingoman.c @@ -36,7 +36,7 @@ 1x Xtal 25 MHz @ u61 1x Xtal 40 MHz @ u04 (near TMS34010) - 1x empty DIP8 socket. (Maybe for a serial EPROM) @ u03 + 1x empty DIP8 socket. (Maybe for a serial EPROM) @ u03 1x empty DIP32 socket. Near H8/520. @ u17 1x 2x8 edge connector. @@ -86,58 +86,58 @@ | +-------+ | | +------+ +--------+ | | +----------------+ +----------------+ |H99470| +------+ +-------+ | XTAL | | - | | EMPTY SOCKET | | EMPTY SOCKET | |045 | |74AS74| |74AS32N| |25.00Mhz| | - | | CONNECTION FOR | | CONNECTION FOR | | | +------+ +-------+ +--------+ | - | | TOP-BOARD | | TOP-BOARD | |M48T08| | + | | EMPTY SOCKET | | EMPTY SOCKET | |045 | |74AS74| |74AS32N| |25.00Mhz| | + | | CONNECTION FOR | | CONNECTION FOR | | | +------+ +-------+ +--------+ | + | | TOP-BOARD | | TOP-BOARD | |M48T08| | | +----------------+ +----------------+ |-150PC| +------+ +------+ +------+ | - | +----------------+ +----------------+ | | |74AS74| |74AS74| |74AS04| | + | +----------------+ +----------------+ | | |74AS74| |74AS74| |74AS04| | | |SAMSUNG | |PS.020 | | TIME | +------+ +------+ +------+ | - | | K6T1008C2E | | | |KEEPER| | + | | K6T1008C2E | | | |KEEPER| | | | | | 27C4001| | RAM | +---------+ +---------+ +-------+ | - | +----------------+ +----------------+ | | |102U5500 | |102U5400 | |74AS161| | + | +----------------+ +----------------+ | | |102U5500 | |102U5400 | |74AS161| | | +------+ +---------+ +---------+ +-------+ | - | +-------+ +-------+ +-------+ | - | |411GR-1| |411GR-1| |411GR-1| | - | +-------+ +-------+ +-------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | | - | +----------+ +----------+ +----------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | +-------+ +-------+ +-------+ | + | |411GR-1| |411GR-1| |411GR-1| | + | +-------+ +-------+ +-------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | | + | +----------+ +----------+ +----------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | | |74HCT541N | |74HCT541N | |74HCT541N | | - | +----------+ +----------+ +----------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | | - | +-------+ +--+ +--+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | |411GR-1| +-------------+ |10| |10| | - | +-------+ | | |2U| |2U| +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | | H8/534 | |30| |29| | - | +----------+ | HD6475348 | |10| |20| +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | |74HCT541N | | CP16 | | | | | | - | +----------+ | | | | | | +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | | | | | | | | - | +----+ +--+ | | +--+ +--+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | - | |XTAL| |74| | | | - | | | |HC| +-------------+ +------+ +-------+ +---------+ +---------+ | - | |20.0| |T0| | A0 | |411GR-1| |74ALS245A| |74ALS245A| | - | |0Mhz| |4N| +------+ +-------+ +---------+ +---------+ | + | +----------+ +----------+ +----------+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | | + | +-------+ +--+ +--+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | |411GR-1| +-------------+ |10| |10| | + | +-------+ | | |2U| |2U| +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | | H8/534 | |30| |29| | + | +----------+ | HD6475348 | |10| |20| +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | |74HCT541N | | CP16 | | | | | | + | +----------+ | | | | | | +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | | | | | | | | + | +----+ +--+ | | +--+ +--+ +KM424C2572-6+ +MB81C4256A-70PSZ+ | + | |XTAL| |74| | | | + | | | |HC| +-------------+ +------+ +-------+ +---------+ +---------+ | + | |20.0| |T0| | A0 | |411GR-1| |74ALS245A| |74ALS245A| | + | |0Mhz| |4N| +------+ +-------+ +---------+ +---------+ | | +----+ +--+ | - | | - | | - | +---+ +------------+ +---------+ +-------+ +---------+ | + | | + | | + | +---+ +------------+ +---------+ +-------+ +---------+ | | | A5| | | +----------------+ |74AS573N | |411GR-1| |74AS573N | | - | +---+ | H8/520 | | EMPTY SOCKET | +---------+ +-------+ +---------+ | - | | HD6435208 | | CONNECTION FOR | | - | | CP10 | | TOP-BOARD | +------+ +---------+ +------------+ | - | | | +----------------+ | A1 | |74AS244N | | 102U1400 | | + | +---+ | H8/520 | | EMPTY SOCKET | +---------+ +-------+ +---------+ | + | | HD6435208 | | CONNECTION FOR | | + | | CP10 | | TOP-BOARD | +------+ +---------+ +------------+ | + | | | +----------------+ | A1 | |74AS244N | | 102U1400 | | | | | +------+ +---------+ +------------+ | - | | | | + | | | | | +------------+ +------+ +---------+ +---------+ +------+ +------------+ | - | | A2 | |74HCT573N| |74HCT245N| |74AS08| | | | - | +------+ +---------+ +---------+ +------+ | TMS34010 | | - | | FNL-50 | | - | | | | - | +------+ +---------+ +------+ +---------+ +------+ | WEU9310 | | - | | A4 | |74LS682N | | A3 | |102U0520 | | XTAL | | | | - | +------+ +---------+ +------+ +---------+ |40.000| | | | - | +------+ +------------+ | - | +--+ +--+ | + | | A2 | |74HCT573N| |74HCT245N| |74AS08| | | | + | +------+ +---------+ +---------+ +------+ | TMS34010 | | + | | FNL-50 | | + | | | | + | +------+ +---------+ +------+ +---------+ +------+ | WEU9310 | | + | | A4 | |74LS682N | | A3 | |102U0520 | | XTAL | | | | + | +------+ +---------+ +------+ +---------+ |40.000| | | | + | +------+ +------------+ | + | +--+ +--+ | | | | | | | | |TL| |A6| | | |07| | | +-------+ | @@ -352,7 +352,7 @@ static const gfx_layout charlayout = #endif static GFXDECODE_START( bingoman ) -// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) +// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c index 8e5b61af325..c5cb4365a0e 100644 --- a/src/mame/drivers/chihiro.c +++ b/src/mame/drivers/chihiro.c @@ -56,7 +56,7 @@ Games on this system include.... |*|Quest Of D (Ver.1.01C) | Sega, 2004 | CDROM CDV-10005C | | |*|Sangokushi Taisen (Ver.1.002) | Sega, 2005 | DVDROM CDV-10009D | | |*|Sangokushi Taisen 2 (Ver.2.007) | Sega, 2006 | DVDROM CDV-10019A | | -|*|Sangokushi Taisen | Sega, 2005 | DVDROM CDV-10022 | | +|*|Sangokushi Taisen | Sega, 2005 | DVDROM CDV-10022 | | |*|Sangokushi Taisen 2 Firmware Update | Sega, 2006 | DVDROM CDV-10023 | | |*|Sangokushi Taisen 2 | Sega, 2006 | DVDROM CDV-10029 | | |*|Sangokushi Taisen 3 | Sega, 2008 | DVDROM CDV-10036 | | diff --git a/src/mame/drivers/cops.c b/src/mame/drivers/cops.c index a990ad41185..9ead02943e5 100644 --- a/src/mame/drivers/cops.c +++ b/src/mame/drivers/cops.c @@ -1,9 +1,9 @@ /*************************************************************************** - Atari Games Cops - (hardware developed by Nova Productions Limited) + Atari Games Cops + (hardware developed by Nova Productions Limited) - Preliminary driver by Mariusz Wojcieszek + Preliminary driver by Mariusz Wojcieszek ***************************************************************************/ @@ -565,8 +565,8 @@ static ADDRESS_MAP_START( cops_map, AS_PROGRAM, 8, cops_state ) AM_RANGE(0xb000, 0xb00f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) /* VIA 1 */ AM_RANGE(0xb800, 0xb80f) AM_DEVREADWRITE("via6522_2", via6522_device, read, write) /* VIA 2 */ AM_RANGE(0xc000, 0xcfff) AM_READWRITE(io2_r, io2_w) -// AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE("acia6551_1", acia6551_device, read, write ) -// AM_RANGE(0xd004, 0xd007) AM_DEVREADWRITE("acia6551_2", acia6551_device, read, write ) +// AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE("acia6551_1", acia6551_device, read, write ) +// AM_RANGE(0xd004, 0xd007) AM_DEVREADWRITE("acia6551_2", acia6551_device, read, write ) AM_RANGE(0xd000, 0xd007) AM_READWRITE(dacia_r, dacia_w) AM_RANGE(0xd800, 0xd80f) AM_DEVREADWRITE("via6522_3", via6522_device, read, write) /* VIA 3 */ AM_RANGE(0xe000, 0xffff) AM_ROM AM_REGION("system", 0) @@ -645,8 +645,8 @@ static MACHINE_CONFIG_START( cops, cops_state ) MCFG_VIA6522_ADD("via6522_3", 0, via_3_interface) /* acia */ -// MCFG_ACIA6551_ADD("acia6551_1") -// MCFG_ACIA6551_ADD("acia6551_2") +// MCFG_ACIA6551_ADD("acia6551_1") +// MCFG_ACIA6551_ADD("acia6551_2") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dblcrown.c b/src/mame/drivers/dblcrown.c index fe6a0702f5e..cc8249c6d62 100644 --- a/src/mame/drivers/dblcrown.c +++ b/src/mame/drivers/dblcrown.c @@ -1,37 +1,37 @@ /*************************************************************************** - Double Crown (c) 1997 Cadence Technology / Dyna + Double Crown (c) 1997 Cadence Technology / Dyna - driver by Angelo Salese + driver by Angelo Salese - TODO: - - Bogus "Hole" in main screen display; - - Is the background pen really black? - - Lots of unmapped I/Os (game doesn't make much use of the HW); - - outputs / lamps; - - video / irq timings; + TODO: + - Bogus "Hole" in main screen display; + - Is the background pen really black? + - Lots of unmapped I/Os (game doesn't make much use of the HW); + - outputs / lamps; + - video / irq timings; - Notes: - - at POST the SW tries to write to the palette RAM in a banking fashion. - I think it's just an HW left-over. - - there are various bogus checks to ROM region throughout the whole SW - (0x0030-0x0033? O.o), trying to change the values of these ones changes - the functionality of the game, almost like that the DSWs are tied to - these ... + Notes: + - at POST the SW tries to write to the palette RAM in a banking fashion. + I think it's just an HW left-over. + - there are various bogus checks to ROM region throughout the whole SW + (0x0030-0x0033? O.o), trying to change the values of these ones changes + the functionality of the game, almost like that the DSWs are tied to + these ... ============================================================================ - Excellent System - boardlabel: ES-9411B + Excellent System + boardlabel: ES-9411B - 28.6363 xtal - ES-9409 QFP is 208 pins.. for graphics only? - Z0840006PSC Zilog z80, is rated 6.17 MHz - OKI M82C55A-2 - 65764H-5 .. 64kbit ram CMOS - 2 * N341256P-25 - CMOS SRAM 256K-BIT(32KX8) - 4 * dipsw 8pos - YMZ284-D (ay8910, but without i/o ports) - MAXIM MAX693ACPE is a "Microprocessor Supervisory Circuit", for watchdog? and for keeping nvram stable? + 28.6363 xtal + ES-9409 QFP is 208 pins.. for graphics only? + Z0840006PSC Zilog z80, is rated 6.17 MHz + OKI M82C55A-2 + 65764H-5 .. 64kbit ram CMOS + 2 * N341256P-25 - CMOS SRAM 256K-BIT(32KX8) + 4 * dipsw 8pos + YMZ284-D (ay8910, but without i/o ports) + MAXIM MAX693ACPE is a "Microprocessor Supervisory Circuit", for watchdog? and for keeping nvram stable? ***************************************************************************/ @@ -169,7 +169,7 @@ WRITE8_MEMBER( dblcrown_state::irq_source_w) READ8_MEMBER( dblcrown_state::palette_r) { //if(m_bank & 8) /* TODO: verify this */ - // offset+=0x200; + // offset+=0x200; return m_pal_ram[offset]; } @@ -179,7 +179,7 @@ WRITE8_MEMBER( dblcrown_state::palette_w) int r,g,b,datax; //if(m_bank & 8) /* TODO: verify this */ - // offset+=0x200; + // offset+=0x200; m_pal_ram[offset] = data; offset>>=1; @@ -323,7 +323,7 @@ static ADDRESS_MAP_START( dblcrown_io, AS_IO, 8, dblcrown_state ) AM_RANGE(0x11, 0x11) AM_READWRITE(bank_r,bank_w) AM_RANGE(0x12, 0x12) AM_READWRITE(mux_r,mux_w) AM_RANGE(0x20, 0x21) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w) -// AM_RANGE(0x30, 0x30) always 1? +// AM_RANGE(0x30, 0x30) always 1? AM_RANGE(0x40, 0x40) AM_WRITE(output_w) ADDRESS_MAP_END @@ -591,7 +591,7 @@ MACHINE_CONFIG_END ROM_START( dblcrown ) ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("1.u33", 0x00000, 0x40000, CRC(5df95a9c) SHA1(799333206089989c25ff9f167363073d4cf64bd2) ) -// ROM_FILL( 0x0030, 4, 0xff ) +// ROM_FILL( 0x0030, 4, 0xff ) ROM_REGION( 0x80000, "gfx1", ROMREGION_ERASE00 ) ROM_LOAD("2.u43", 0x00000, 0x80000, CRC(58200bd4) SHA1(2795cfc41056111f66bfb82916343d1c733baa83) ) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 5d0e1d35c4d..3ea863f24cd 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -1659,10 +1659,10 @@ static MACHINE_CONFIG_DERIVED( ffantasybl, dec0_base_sound ) MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8) MCFG_CPU_PROGRAM_MAP(dec0_s_map) -// MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16) -// MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) +// MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16) +// MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) -// MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ +// MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -3088,11 +3088,11 @@ DRIVER_INIT_MEMBER(dec0_state,midresb) READ16_MEMBER(dec0_state::ffantasybl_242024_r) { /* - 000152: 41F9 0024 2020 lea $242020.l, A0 - 000158: 4A68 0004 tst.w ($4,A0) - 00015C: 6700 00A0 beq $1fe + 000152: 41F9 0024 2020 lea $242020.l, A0 + 000158: 4A68 0004 tst.w ($4,A0) + 00015C: 6700 00A0 beq $1fe - This allows us to at insert a coin... + This allows us to at insert a coin... */ return 0xffff; diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 83cf24be47a..2092b3f9ff5 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -1019,7 +1019,7 @@ ROM_START( rallys ) ROM_LOAD( "targ82s.123", 0x0000, 0x0020, CRC(9eb9125c) SHA1(660ad9b2c7c28c3fda4b10c1401c03165d131c61) ) /* unknown */ ROM_END -ROM_START( rallysa ) +ROM_START( rallysa ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "rallys.01", 0x1000, 0x0400, CRC(a192b22b) SHA1(aaae0b1822f934df30b354f787ffa8848c71b52f) ) // 1a ROM_LOAD( "rallys.02", 0x1400, 0x0400, CRC(19e730aa) SHA1(4f4e87d26c14a9ff2be5b4173c4e5804db551e33) ) // 2a diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index d0a7d3728a9..0aaa730179f 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -780,8 +780,8 @@ - Fixed Power Card graphics ROM load.. - Moved jolycdat program to Bonus Card, making it parent. This program is a real original Bonus Card program, and the PCB - was populated with Jolly Card graphics wrongly. The other Bonus Card set - was turned as clone, since has a fake copyright string (hack). + was populated with Jolly Card graphics wrongly. The other Bonus Card set + was turned as clone, since has a fake copyright string (hack). - Renamed the internal layout artwork: bigdeal --> bonuscrd. - Default Bonus Card & Big Deal DIP switches positions, that allow boot the system without errors. @@ -2292,7 +2292,7 @@ static const gfx_layout charlayout = The game could have 2 different palettes, located in the first and second half of the bipolar PROM. */ - + static GFXDECODE_START( fw1stpal ) /* Adressing the first half of the palette */ GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 ) GFXDECODE_END @@ -3051,7 +3051,7 @@ ROM_START( bonuscrd ) ROM_REGION( 0x0400, "proms", 0 ) ROM_LOAD( "n82s147an.bin", 0x0000, 0x0200, BAD_DUMP CRC(136245f3) SHA1(715309982fcafbce88b08237ca46acec31273938) ) // from power card, original fun world encrypted bonus card clone. - ROM_LOAD( "74s472n.bin", 0x0200, 0x0200, CRC(e56780cb) SHA1(c06b854f21b1dcee465ac9c8c9a2934b7e99565f) ) // original dump, but doesn't match the cards colors in real board. + ROM_LOAD( "74s472n.bin", 0x0200, 0x0200, CRC(e56780cb) SHA1(c06b854f21b1dcee465ac9c8c9a2934b7e99565f) ) // original dump, but doesn't match the cards colors in real board. ROM_END @@ -3065,7 +3065,7 @@ ROM_START( bonuscrda ) ROM_REGION( 0x0400, "proms", 0 ) ROM_LOAD( "n82s147an.bin", 0x0000, 0x0200, BAD_DUMP CRC(136245f3) SHA1(715309982fcafbce88b08237ca46acec31273938) ) // from power card, original fun world encrypted bonus card clone. - ROM_LOAD( "74s472n.bin", 0x0200, 0x0200, CRC(e56780cb) SHA1(c06b854f21b1dcee465ac9c8c9a2934b7e99565f) ) // original dump, but doesn't match the cards colors in real board. + ROM_LOAD( "74s472n.bin", 0x0200, 0x0200, CRC(e56780cb) SHA1(c06b854f21b1dcee465ac9c8c9a2934b7e99565f) ) // original dump, but doesn't match the cards colors in real board. ROM_END @@ -3843,10 +3843,10 @@ ROM_END the encrypted graphics set. All these games have some weird things... - 1) Some CPU instructions seems wrong (see below, in driver init) - 2) The CRTC is injected with some wrong register values (fact), - that place the game wrongly, and screw up the input test screen. - + 1) Some CPU instructions seems wrong (see below, in driver init) + 2) The CRTC is injected with some wrong register values (fact), + that place the game wrongly, and screw up the input test screen. + */ ROM_START( magicrd2 ) /* Impera... but seems Bulgarian hack, just for copyright */ @@ -3866,7 +3866,7 @@ ROM_START( magicrd2 ) /* Impera... but seems Bulgarian hack, just for copyright ROM_LOAD( "mc2-82s147.bin", 0x0000, 0x0200, CRC(aa91cc35) SHA1(79f9a755441500e618c4183f524f969fffd44100) ) ROM_REGION( 0x0200, "plds", 0 ) - ROM_LOAD( "gal16v8uni.bin", 0x0000, 0x0117, CRC(b81d7e0a) SHA1(7fef0b2bcea931a830d38ae0f1102434cf281d2d) ) /* Universal GAL */ + ROM_LOAD( "gal16v8uni.bin", 0x0000, 0x0117, CRC(b81d7e0a) SHA1(7fef0b2bcea931a830d38ae0f1102434cf281d2d) ) /* Universal GAL */ ROM_END @@ -3892,7 +3892,7 @@ ROM_END ROM_START( magicrd2b ) /* Imatic Yugoslavian hack for green TAB or Impera boards */ ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "mc2prgv1.bin", 0x8000, 0x8000, CRC(7f759b70) SHA1(23a1a6e8eda57c4a90c51a970302f9a7bf590083) ) -// ROM_LOAD( "mc2prgv2.bin", 0x8000, 0x8000, CRC(b0ed6b40) SHA1(7167e67608f1b0b1cd956c838dacc1310861cb4a) ) // there are also pcbs with this program +// ROM_LOAD( "mc2prgv2.bin", 0x8000, 0x8000, CRC(b0ed6b40) SHA1(7167e67608f1b0b1cd956c838dacc1310861cb4a) ) // there are also pcbs with this program ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "mc2gr2.bin", 0x0000, 0x8000, CRC(733da697) SHA1(45122c64d5a371ec91cecc67b7faf179078e714d) ) @@ -3909,7 +3909,7 @@ ROM_END ROM_START( magicrd2c ) /* Imatic Yugoslavian hack for blue TAB board (encrypted)*/ ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "mc2prgv2.bin", 0x8000, 0x8000, CRC(b0ed6b40) SHA1(7167e67608f1b0b1cd956c838dacc1310861cb4a) ) -// ROM_LOAD( "mc2prgv1.bin", 0x8000, 0x8000, CRC(7f759b70) SHA1(23a1a6e8eda57c4a90c51a970302f9a7bf590083) ) // there are also pcbs with this program +// ROM_LOAD( "mc2prgv1.bin", 0x8000, 0x8000, CRC(7f759b70) SHA1(23a1a6e8eda57c4a90c51a970302f9a7bf590083) ) // there are also pcbs with this program ROM_REGION( 0x10000, "gfx1", 0 ) ROM_LOAD( "mc2gr1b.bin", 0x0000, 0x8000, CRC(ce2629a7) SHA1(84767ed5da8dcee44a210255537e10372bcc264b) ) @@ -4242,7 +4242,7 @@ ROM_END | | '----------------------------------------------------------------------------------------------------------------------' - DIP SW Bank + DIP SW Bank .---------------. |#| |#|#|#|#|#|#| |---------------| diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index ae92e022936..deb6957149b 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( inufuku_map, AS_PROGRAM, 16, inufuku_state ) AM_RANGE(0x780000, 0x780013) AM_WRITE(inufuku_palettereg_w) // bg & text palettebank register AM_RANGE(0x7a0000, 0x7a0023) AM_WRITE(inufuku_scrollreg_w) // bg & text scroll register -// AM_RANGE(0x7e0000, 0x7e0001) AM_WRITENOP // ? +// AM_RANGE(0x7e0000, 0x7e0001) AM_WRITENOP // ? AM_RANGE(0x800000, 0xbfffff) AM_ROM // data rom AM_RANGE(0xfd0000, 0xfdffff) AM_RAM // work ram diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 04ae4940761..96fcafd11b2 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -5008,9 +5008,9 @@ ROM_START( j6ewndg ) ROM_LOAD16_BYTE( "ewn8_8.b16", 0x0000, 0x040000, CRC(674fd826) SHA1(34b17cdc4b8eb67c1100e62dee8bf13c66a5fa82) ) ROM_LOAD16_BYTE( "ewnc1ss.bin", 0x0000, 0x020000, CRC(cc2c4712) SHA1(15729b5bccdb5f0e71bdedbe8817988c186a9d7e) ) ROM_LOAD16_BYTE( "ewncp1.bin", 0x0000, 0x020000, CRC(27b2132a) SHA1(144f491eeaed2b6e0203e31fe5f78280edc41c1e) ) - + ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) - /* missing? */ + /* missing? */ ROM_END diff --git a/src/mame/drivers/jpmsru.c b/src/mame/drivers/jpmsru.c index 3fce250a719..db510a0406c 100644 --- a/src/mame/drivers/jpmsru.c +++ b/src/mame/drivers/jpmsru.c @@ -101,7 +101,7 @@ ROM_START( j_ews ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "ews13c1.bin", 0x0000, 0x000400, CRC(2eec7c4d) SHA1(a1740d27e60192659392ba7602b9b62947c4f6db) ) ROM_LOAD( "ews13b2.bin", 0x0400, 0x000400, CRC(b84b7858) SHA1(90fd64881d52e1f4362ccbcb9434dbf7b25b97f9) ) - ROM_LOAD( "ews13.3", 0x0800, 0x000400, CRC(4d8e197a) SHA1(1569327f0e4b5d7632658b69abf59076effb2600) ) + ROM_LOAD( "ews13.3", 0x0800, 0x000400, CRC(4d8e197a) SHA1(1569327f0e4b5d7632658b69abf59076effb2600) ) ROM_END ROM_START( j_ews8a ) diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c index db818876eb1..eb816487623 100644 --- a/src/mame/drivers/lethalj.c +++ b/src/mame/drivers/lethalj.c @@ -325,8 +325,8 @@ static INPUT_PORTS_START( eggventr ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x1000, DEF_STR( On ) ) PORT_DIPUNUSED_DIPLOC( 0x2000, IP_ACTIVE_LOW, "SW3:3" ) // Manual says switches 1-3 are reserved - PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW3:2" ) - PORT_DIPUNUSED_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW3:1" ) + PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW3:2" ) + PORT_DIPUNUSED_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW3:1" ) PORT_START("IN1") PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index ab584f5fe10..5481b573905 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -113,8 +113,8 @@ public: maygay1b_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd(*this, "vfd") - { - + { + m_NMIENABLE = 0; } @@ -376,7 +376,7 @@ WRITE8_MEMBER(maygay1b_state::m1_8279_w) m1_draw_lamps(chip->ram[chip->disp_address],chip->disp_address, 0); } chip->ram[chip->disp_address] = data; - + if ( chip->disp_auto_inc ) chip->disp_address ++; } @@ -575,7 +575,7 @@ READ8_MEMBER( maygay1b_state::m1_firq_trg_r ) return i; } -// NMI is periodic? or triggered by a write? +// NMI is periodic? or triggered by a write? TIMER_DEVICE_CALLBACK_MEMBER( maygay1b_state::maygay1b_nmitimer_callback ) { if (m_NMIENABLE) @@ -594,7 +594,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( maygay1b_state::maygay1b_nmitimer_callback ) // some games might differ.. WRITE8_MEMBER(maygay1b_state::m1_pia_porta_w) { -// printf("m1_pia_porta_w %02x\n",data); +// printf("m1_pia_porta_w %02x\n",data); if((data & 0x40)) { @@ -882,7 +882,7 @@ READ8_MEMBER(maygay1b_state::m1_meter_r) device_t *ay8910 = machine().device("aysnd"); return ~ay8910_read_ym(ay8910); } - + static ADDRESS_MAP_START( m1_memmap, AS_PROGRAM, 8, maygay1b_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") @@ -893,7 +893,7 @@ static ADDRESS_MAP_START( m1_memmap, AS_PROGRAM, 8, maygay1b_state ) // there is actually an 8279 and an 8051.. AM_RANGE(0x2030, 0x2031) AM_READWRITE(m1_8279_r,m1_8279_w) AM_RANGE(0x2040, 0x2041) AM_READWRITE(m1_8279_2_r,m1_8279_2_w) -// AM_RANGE(0x2050, 0x2050)// SCAN on M1B +// AM_RANGE(0x2050, 0x2050)// SCAN on M1B AM_RANGE(0x2070, 0x207f) AM_DEVREADWRITE_LEGACY("duart68681", duart68681_r, duart68681_w ) @@ -911,7 +911,7 @@ static ADDRESS_MAP_START( m1_memmap, AS_PROGRAM, 8, maygay1b_state ) AM_RANGE(0x2412, 0x2412) AM_READ(m1_firq_trg_r) // firq, sample playback? - + AM_RANGE(0x2420, 0x2421) AM_WRITE(latch_ch2_w ) // oki diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index 014eb08b33b..702aa48b3cd 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -642,7 +642,7 @@ static INPUT_PORTS_START( sarge ) PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) // dupe/invalid +// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) // dupe/invalid PORT_DIPUNUSED( 0x40, 0x40 ) PORT_DIPUNUSED( 0x80, 0x80 ) @@ -677,7 +677,7 @@ static INPUT_PORTS_START( maxrpm ) PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) // dupe/invalid +// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) // dupe/invalid PORT_BIT( 0xc7, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("MONO.IP4") /* J4 1-7,9 */ diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c index b930437c2b6..b033ed794f5 100644 --- a/src/mame/drivers/mpu12wbk.c +++ b/src/mame/drivers/mpu12wbk.c @@ -45,7 +45,7 @@ PCB Layout: - .--------------------------------------------------------------------------------------. + .--------------------------------------------------------------------------------------. | .---------. .---------. | | |74LS174N | |74LS174N | .------------. | | '---------' '---------' |8 1| .------------. | @@ -260,11 +260,11 @@ TILE_GET_INFO_MEMBER(mpu12wbk_state::get_bg_tile_info) ---- ---- bank select. ---- ---- color code. */ -// int attr = m_colorram[tile_index]; -// int code = m_videoram[tile_index] | ((attr & 0xc0) << 2); -// int color = (attr & 0x0f); +// int attr = m_colorram[tile_index]; +// int code = m_videoram[tile_index] | ((attr & 0xc0) << 2); +// int color = (attr & 0x0f); -// SET_TILE_INFO_MEMBER( 0, code, color, 0); +// SET_TILE_INFO_MEMBER( 0, code, color, 0); SET_TILE_INFO_MEMBER( 0, 0 ,0 ,0); } @@ -327,7 +327,7 @@ unknown writes: 1800-1801 R (input?) 1e00-1e01 RW (psg?) - + */ @@ -437,21 +437,21 @@ INPUT_PORTS_END static const gfx_layout charlayout = { -// 8, 8, -// RGN_FRAC(3,3), -// 1, /* 1 bpp */ -// { 0 }, -// { 0, 1, 2, 3, 4, 5, 6, 7 }, -// { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, -// 8*8 /* every char takes 8 consecutive bytes */ +// 8, 8, +// RGN_FRAC(3,3), +// 1, /* 1 bpp */ +// { 0 }, +// { 0, 1, 2, 3, 4, 5, 6, 7 }, +// { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, +// 8*8 /* every char takes 8 consecutive bytes */ -// 8, 8, -// RGN_FRAC(1,3), -// 3, -// { 0, RGN_FRAC(1,3), RGN_FRAC(2,3) }, /* bitplanes are separated */ -// { 0, 1, 2, 3, 4, 5, 6, 7 }, -// { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, -// 8*8 +// 8, 8, +// RGN_FRAC(1,3), +// 3, +// { 0, RGN_FRAC(1,3), RGN_FRAC(2,3) }, /* bitplanes are separated */ +// { 0, 1, 2, 3, 4, 5, 6, 7 }, +// { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, +// 8*8 4,8, RGN_FRAC(1,2), @@ -562,7 +562,7 @@ ROM_START( fruitstb ) ROM_REGION( 0x20000, "gfx1", 0 ) ROM_LOAD( "fruit1.ic37", 0x00000, 0x10000, CRC(c1834a6d) SHA1(ece1e47641087be342d3c5c092d8a7233ae871f3) ) ROM_LOAD( "fruit2.ic38", 0x10000, 0x10000, CRC(32d282a8) SHA1(792174d75dc7ec5f1e6f145539a5ec8e3953e1dd) ) -// ROM_LOAD( "fruit3.ic39", 0x20000, 0x10000, CRC(311a6d4e) SHA1(62cf670b605906f7f4225905118524ee30d0e85b) ) // and this one? +// ROM_LOAD( "fruit3.ic39", 0x20000, 0x10000, CRC(311a6d4e) SHA1(62cf670b605906f7f4225905118524ee30d0e85b) ) // and this one? ROM_REGION( 0x0400, "proms", 0 ) ROM_LOAD( "82s131.ic47", 0x0000, 0x0200, CRC(54565d41) SHA1(8e412a3441c9c1e7f8309f2087389ac4250896e6) ) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 15b7c0183e9..3aca2f8bc0f 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1472,7 +1472,7 @@ void namcos23_state::update_main_interrupts(UINT32 cause) { UINT32 changed = cause ^ m_main_irqcause; m_main_irqcause = cause; - + // level 2: vblank if (changed & MAIN_VBLANK_IRQ) m_maincpu->set_input_line(MIPS3_IRQ0, (cause & MAIN_VBLANK_IRQ) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 799e5ce317a..ac8e46f9efd 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -434,7 +434,7 @@ Mobile Suit Gundam: Federation Vs. Zeon 841-0017C 23638 10 (128Mb) ? Moero Justice Gakuen / Project Justice (Rev A) 841-0015C 23548A 11 (128Mb) 315-6319A present 317-5065-COM Oinori-daimyoujin Matsuri 840-0126B 24053 5 (128Mb) 315-6319A present not present Samba de Amigo Ver. 2000 840-0047C 23600 21 (64Mb) 315-6319A present 317-0295-COM -Star Horse (Rev A) 840-0123C 24122A 7 (128Mb) 315-6319A present not present requires an additional middle board n° 837-13785 +Star Horse (Rev A) 840-0123C 24122A 7 (128Mb) 315-6319A present not present requires an additional middle board n? 837-13785 Virtua Striker 3 (Rev B) 840-0061C 23663B 11 (128Mb) 315-6319A present 317-0310-COM Virtua Striker 3 (Rev C) 840-0061C 23663C 11 (128Mb) 315-6319A present 317-0310-COM Wave Runner GP 840-0064C 24059 6 (128Mb) 315-6319A present not present diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 4e8d2ef2936..6aad19ce4aa 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -1751,7 +1751,7 @@ static MACHINE_CONFIG_START( salamand, nemesis_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.08) MCFG_YM2151_ADD("ymsnd", 3579545) -// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go +// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "rspeaker", 1.2) // reversed according to MT #4565 MCFG_SOUND_ROUTE(1, "lspeaker", 1.2) MACHINE_CONFIG_END @@ -1793,7 +1793,7 @@ static MACHINE_CONFIG_START( blkpnthr, nemesis_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.10) MCFG_YM2151_ADD("ymsnd", 3579545) -// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go +// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -1929,7 +1929,7 @@ static MACHINE_CONFIG_START( hcrash, nemesis_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.10) MCFG_YM2151_ADD("ymsnd", 3579545) -// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go +// MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 5dc0c80c01c..7fa25b671d7 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -900,7 +900,7 @@ static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16, nmk16_state ) AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_SHARE("nmk_txvideoram") ADDRESS_MAP_END -// No sprites without this. Is it actually protection? +// No sprites without this. Is it actually protection? READ16_MEMBER(nmk16_state::tdragonb_prot_r) { return 0x0003; diff --git a/src/mame/drivers/peyper.c b/src/mame/drivers/peyper.c index 0720aae1716..35760493623 100644 --- a/src/mame/drivers/peyper.c +++ b/src/mame/drivers/peyper.c @@ -652,7 +652,7 @@ ROM_START(wolfman) ROM_END -GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, peyper, ROT0, "Sonic", "Odin", GAME_IS_SKELETON_MECHANICAL) +GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, peyper, ROT0, "Sonic", "Odin", GAME_IS_SKELETON_MECHANICAL) GAME( 1985, odin_dlx, 0, peyper, odin_dlx, peyper_state, peyper, ROT0, "Sonic", "Odin De Luxe", GAME_IS_SKELETON_MECHANICAL) GAME( 1986, solarwap, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Solar Wars (Sonic)", GAME_IS_SKELETON_MECHANICAL) GAME( 1986, gamatros, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Gamatron (Sonic)", GAME_IS_SKELETON_MECHANICAL) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index e51703fc776..e3bf7a3cdb1 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -2387,7 +2387,7 @@ ROM_START( kov2p ) ROM_REGION( 0x2800000, "sprcol", 0 ) /* Sprite Colour Data */ ROM_LOAD( "a1200.rom", 0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) ) - ROM_LOAD( "a1201.rom", 0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) ) + ROM_LOAD( "a1201.rom", 0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) ) ROM_LOAD( "a1202.rom", 0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) ) ROM_LOAD( "a1203.rom", 0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) ) ROM_LOAD( "a1204.rom", 0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) ) @@ -2418,7 +2418,7 @@ ROM_START( kov2p205 ) ROM_REGION( 0x2800000, "sprcol", 0 ) /* Sprite Colour Data */ ROM_LOAD( "a1200.rom", 0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) ) - ROM_LOAD( "a1201.rom", 0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) ) + ROM_LOAD( "a1201.rom", 0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) ) ROM_LOAD( "a1202.rom", 0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) ) ROM_LOAD( "a1203.rom", 0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) ) ROM_LOAD( "a1204.rom", 0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) ) diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c index eb8628e4521..07854e9dbf5 100644 --- a/src/mame/drivers/portrait.c +++ b/src/mame/drivers/portrait.c @@ -244,7 +244,7 @@ static const tms52xx_config tms_intf = { DEVCB_NULL }; - + static MACHINE_CONFIG_START( portrait, portrait_state ) MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */ diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index 3bb91744948..1a562498ae4 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -740,7 +740,7 @@ ROM_START( spikes91a ) ROM_LOAD16_BYTE( "3-prg.bin", 0x20001, 0x08000, CRC(b6b24910) SHA1(2e4cf80a8eb1fcd9448405ff881bb99ae4ce8909) ) ROM_REGION( 0x080000, "gfx1", 0 ) - ROM_LOAD32_BYTE( "7.bin", 0x000000, 0x010000, CRC(9596a4c0) SHA1(1f233bb2fa662fb8cd9c0db478e392ca26d9484b) ) + ROM_LOAD32_BYTE( "7.bin", 0x000000, 0x010000, CRC(9596a4c0) SHA1(1f233bb2fa662fb8cd9c0db478e392ca26d9484b) ) ROM_LOAD32_BYTE( "10.bin", 0x000001, 0x010000, CRC(a05249e6) SHA1(8671e0c980ba87ea14895176fb5c8a48bb4c932e) ) ROM_LOAD32_BYTE( "13.bin", 0x000002, 0x010000, CRC(429159f3) SHA1(4395413c4ab4a1fd322a1af6f2b93bb62b044223) ) ROM_LOAD32_BYTE( "16.bin", 0x000003, 0x010000, CRC(f5436c8d) SHA1(d29508cc5ee43d7b072112c6d95c36ee0328e5fb) ) @@ -757,7 +757,7 @@ ROM_START( spikes91a ) ROM_REGION( 0x080000, "gfx3", ROMREGION_INVERT ) ROM_LOAD32_BYTE( "19.bin", 0x000000, 0x010000, CRC(12a67e3f) SHA1(c77b264eae0f55af36728b6e5e5e1fec3d366eb1) ) - ROM_LOAD32_BYTE( "20.bin", 0x000001, 0x010000, CRC(31828996) SHA1(b324902b9fff0bab1daa3af5136b96d50d12956f) ) + ROM_LOAD32_BYTE( "20.bin", 0x000001, 0x010000, CRC(31828996) SHA1(b324902b9fff0bab1daa3af5136b96d50d12956f) ) ROM_LOAD32_BYTE( "21.bin", 0x000002, 0x010000, CRC(51cbe0d6) SHA1(d60b2a297d7e994c60db28e8ba60b0664e01f61d) ) ROM_LOAD32_BYTE( "22.bin", 0x000003, 0x010000, CRC(c289bfc0) SHA1(4a8929c5f304a1d203cad04c72fc6e96764dc858) ) @@ -804,6 +804,6 @@ GAME( 1989, svolley, 0, rpunch, svolley, rpunch_state, svolley, ROT0 GAME( 1989, svolleyk, svolley, rpunch, svolley, rpunch_state, svolley, ROT0, "V-System Co.", "Super Volleyball (Korea)", GAME_NO_COCKTAIL ) GAME( 1989, svolleyu, svolley, rpunch, svolley, rpunch_state, svolley, ROT0, "V-System Co. (Data East license)", "Super Volleyball (US)", GAME_NO_COCKTAIL ) -// video registers are changed, and there's some kind of RAM at 090xxx, possible a different sprite scheme for the bootleg (even if the original is intact) +// video registers are changed, and there's some kind of RAM at 090xxx, possible a different sprite scheme for the bootleg (even if the original is intact) // the sound system seems to be ripped from the later Power Spikes (see aerofgt.c) GAME( 1991, spikes91a,svolley, spikes91a,svolley, rpunch_state, svolley, ROT0, "bootleg", "Super Volleyball (bootleg)", GAME_SUPPORTS_SAVE | GAME_NOT_WORKING | GAME_NO_SOUND | GAME_NO_COCKTAIL ) // aka 1991 Spikes? diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c index e8611714fb9..f4d702400bb 100644 --- a/src/mame/drivers/s3.c +++ b/src/mame/drivers/s3.c @@ -465,7 +465,7 @@ READ_LINE_MEMBER( s3_state::pia4_cb1_r ) READ8_MEMBER( s3_state::dac_r ) { - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s3_state::dac_w ) diff --git a/src/mame/drivers/s4.c b/src/mame/drivers/s4.c index 3d8881137ac..f6a5aadd811 100644 --- a/src/mame/drivers/s4.c +++ b/src/mame/drivers/s4.c @@ -466,7 +466,7 @@ READ_LINE_MEMBER( s4_state::pia4_cb1_r ) READ8_MEMBER( s4_state::dac_r ) {printf("%X ",m_sound_data); - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s4_state::dac_w ) diff --git a/src/mame/drivers/s6.c b/src/mame/drivers/s6.c index 6c318ab33c1..a5ccd5da201 100644 --- a/src/mame/drivers/s6.c +++ b/src/mame/drivers/s6.c @@ -323,7 +323,7 @@ READ_LINE_MEMBER( s6_state::cb1_r ) READ8_MEMBER( s6_state::dac_r ) { - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s6_state::dac_w ) diff --git a/src/mame/drivers/s6a.c b/src/mame/drivers/s6a.c index 8b42ced21d1..620d6b266da 100644 --- a/src/mame/drivers/s6a.c +++ b/src/mame/drivers/s6a.c @@ -448,7 +448,7 @@ READ_LINE_MEMBER( s6a_state::pia4_cb1_r ) READ8_MEMBER( s6a_state::dac_r ) {printf("%X ",m_sound_data); - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s6a_state::dac_w ) diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c index fe9f7062082..291176b4d20 100644 --- a/src/mame/drivers/s8.c +++ b/src/mame/drivers/s8.c @@ -21,7 +21,7 @@ - When you have 3 strikes, you are Out - When you have 3 Outs, your Innings ends (other player gets a turn) - After 3 Innings, it's game over. - - Match digit appears in Outs digit. + - Match digit appears in Outs digit. - Still Crazy, a novelty game where the playfield is completely vertical. It has 4 flippers and the idea is to get the ball up to the alcohol 'still' before @@ -375,7 +375,7 @@ WRITE_LINE_MEMBER( s8_state::pia_cb2_w ) READ8_MEMBER( s8_state::dac_r ) { - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s8_state::dac_w ) diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c index 22f834245b6..94c271de83e 100644 --- a/src/mame/drivers/s9.c +++ b/src/mame/drivers/s9.c @@ -199,8 +199,8 @@ INPUT_CHANGED_MEMBER( s9_state::audio_nmi ) WRITE8_MEMBER( s9_state::sol3_w ) { -// if (BIT(data, 1)) -// m_samples->start(0, 6); // knocker +// if (BIT(data, 1)) +// m_samples->start(0, 6); // knocker } WRITE8_MEMBER( s9_state::sound_w ) @@ -351,7 +351,7 @@ WRITE_LINE_MEMBER( s9_state::pia_cb2_w ) READ8_MEMBER( s9_state::dac_r ) { - return m_sound_data; + return m_sound_data; } WRITE8_MEMBER( s9_state::dac_w ) diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index 8cb8bace9ff..3a58f2e3b40 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -207,7 +207,7 @@ static ADDRESS_MAP_START( hustlerb3_map, AS_PROGRAM, 8, scobra_state ) // NOTE: hardware does not have any 8255 chip. Is this handled through TTL, or a leftover? // Is b800 the actual sound comms? The soundroms are not dumped, so we can't know... -// AM_RANGE(0xb800, 0xb800) AM_WRITENOP +// AM_RANGE(0xb800, 0xb800) AM_WRITENOP AM_RANGE(0xc200, 0xc203) AM_DEVREADWRITE("ppi8255_1", i8255_device, read, write) ADDRESS_MAP_END @@ -625,7 +625,7 @@ static INPUT_PORTS_START( hustlerb3 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - + // 6-pos dipswitch on mainboard K4 PORT_DIPNAME( 0x40, 0x00, "Half Coinage" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 2b73353bdca..f292f02b126 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -121,7 +121,7 @@ READ8_MEMBER(suna16_state::uballoon_prot_r) case 0x0311/2: ret = 0x03; break; - + default: //logerror("uballoon_prot_r %04X\n", offset); break; @@ -137,7 +137,7 @@ WRITE8_MEMBER(suna16_state::uballoon_prot_w) case 0x0001/2: m_prot = data; break; - + default: //logerror("uballoon_prot_w %04X=%02X\n", offset, data); break; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 223d32fd96d..7525d744c9b 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -57,7 +57,7 @@ public: /* other devices */ cpu_device *m_audiocpu; - + /* handlers */ DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(turbofrc_sound_command_w); diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index e7d7bf9658d..fa6d6efa1f3 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -82,7 +82,7 @@ public: DECLARE_WRITE_LINE_MEMBER(carpolo_7474_2s_2_q_cb); DECLARE_WRITE_LINE_MEMBER(carpolo_7474_2u_1_q_cb); DECLARE_WRITE_LINE_MEMBER(carpolo_7474_2u_2_q_cb); - + }; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 7561c94a12f..b20cff29875 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -281,7 +281,7 @@ public: double m_weights[4]; void qbert_knocker(UINT8 knock); - + DECLARE_WRITE8_MEMBER(gottlieb_analog_reset_w); DECLARE_WRITE8_MEMBER(general_output_w); DECLARE_WRITE8_MEMBER(reactor_output_w); diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 6f90f694242..630fa33a18f 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -43,7 +43,7 @@ public: m_VS920A_vram(*this, "vs920a_vram"), m_work_ram(*this, "work_ram"), m_lineram(*this, "lineram"), - m_spr(*this, "vsystem_spr") + m_spr(*this, "vsystem_spr") { } virtual void machine_start() diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 6194068addb..03977b65c7c 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -36,7 +36,7 @@ public: protected: virtual void machine_start(); virtual void video_start(); - + virtual void update_interrupts() { } struct planet; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 98b52633ea5..024cf62af25 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -34,7 +34,7 @@ public: UINT16 m_screen_bank; UINT16 m_bg_bank; UINT32 suprslam_tile_callback( UINT32 code ); - + /* misc */ int m_pending_command; diff --git a/src/mame/layout/seawolf.lay b/src/mame/layout/seawolf.lay index 9a145040e67..ae60618816d 100644 --- a/src/mame/layout/seawolf.lay +++ b/src/mame/layout/seawolf.lay @@ -80,7 +80,7 @@ - + @@ -114,7 +114,7 @@ - + diff --git a/src/mame/layout/seawolf2.lay b/src/mame/layout/seawolf2.lay index ac601965fd6..410b707dac0 100644 --- a/src/mame/layout/seawolf2.lay +++ b/src/mame/layout/seawolf2.lay @@ -73,7 +73,7 @@ - + @@ -107,7 +107,7 @@ - + diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 93c724734a0..d8a4c5f3996 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -223,7 +223,7 @@ void atarigen_state::machine_reset() slapstic_reset(); slapstic_update_bank(slapstic_bank()); } - + // reset sound I/O sound_io_reset(); } @@ -240,28 +240,28 @@ void atarigen_state::device_timer(emu_timer &timer, device_timer_id id, int para timer.adjust(screen->frame_period()); break; } - + case TID_SCANLINE_TIMER: scanline_timer(timer, *reinterpret_cast(ptr), param); break; - + case TID_ATARIVC_EOF: atarivc_eof_update(timer, *reinterpret_cast(ptr)); break; - + // sound I/O case TID_SOUND_RESET: delayed_sound_reset(param); break; - + case TID_SOUND_WRITE: delayed_sound_write(param); break; - + case TID_6502_WRITE: delayed_6502_write(param); break; - + // unhalt the CPU that was passed as a pointer case TID_UNHALT_CPU: reinterpret_cast(ptr)->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE); @@ -559,7 +559,7 @@ void atarigen_state::sound_io_reset() //------------------------------------------------- -// m6502_irq_gen: Generates an IRQ signal to the +// m6502_irq_gen: Generates an IRQ signal to the // 6502 sound processor. //------------------------------------------------- @@ -613,7 +613,7 @@ WRITE16_MEMBER(atarigen_state::sound_reset_w) //------------------------------------------------- -// sound_cpu_reset: Resets the state of the sound +// sound_cpu_reset: Resets the state of the sound // CPU manually. //------------------------------------------------- @@ -652,7 +652,7 @@ READ8_MEMBER(atarigen_state::sound_r) //------------------------------------------------- -// m6502_sound_w: Handles communication from the +// m6502_sound_w: Handles communication from the // sound CPU to the main CPU. //------------------------------------------------- @@ -663,8 +663,8 @@ WRITE8_MEMBER(atarigen_state::m6502_sound_w) //------------------------------------------------- -// m6502_sound_r: Handles reading data -// communicated from the main CPU to the sound +// m6502_sound_r: Handles reading data +// communicated from the main CPU to the sound // CPU. //------------------------------------------------- @@ -717,7 +717,7 @@ void atarigen_state::delayed_sound_reset(int param) //------------------------------------------------- -// delayed_sound_write: Synchronizes a data write +// delayed_sound_write: Synchronizes a data write // from the main CPU to the sound CPU. //------------------------------------------------- @@ -739,7 +739,7 @@ void atarigen_state::delayed_sound_write(int data) //------------------------------------------------- -// delayed_6502_write: Synchronizes a data write +// delayed_6502_write: Synchronizes a data write // from the sound CPU to the main CPU. //------------------------------------------------- @@ -762,8 +762,8 @@ void atarigen_state::delayed_6502_write(int data) ***************************************************************************/ //------------------------------------------------- -// set_volume_by_type: Scans for a particular -// sound chip and changes the volume on all +// set_volume_by_type: Scans for a particular +// sound chip and changes the volume on all // channels associated with it. //------------------------------------------------- @@ -777,7 +777,7 @@ void atarigen_state::set_volume_by_type(int volume, device_type type) //------------------------------------------------- -// set_XXXXX_volume: Sets the volume for a given +// set_XXXXX_volume: Sets the volume for a given // type of chip. //------------------------------------------------- @@ -829,7 +829,7 @@ void atarigen_state::scanline_timer_reset(screen_device &screen, int frequency) //------------------------------------------------- // scanline_timer: Called once every n scanlines -// to generate the periodic callback to the main +// to generate the periodic callback to the main // system. //------------------------------------------------- diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index f7a9f4a4f13..49a410f6d00 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -101,7 +101,7 @@ public: // callbacks provided by the derived class virtual void update_interrupts() = 0; virtual void scanline_update(screen_device &screen, int scanline); - + // interrupt handling void scanline_int_set(screen_device &screen, int scanline); INTERRUPT_GEN_MEMBER(scanline_int_gen); @@ -110,7 +110,7 @@ public: DECLARE_WRITE16_MEMBER(sound_int_ack_w); INTERRUPT_GEN_MEMBER(video_int_gen); DECLARE_WRITE16_MEMBER(video_int_ack_w); - + // EEPROM helpers WRITE16_MEMBER(eeprom_enable_w); WRITE16_MEMBER(eeprom_w); @@ -124,7 +124,7 @@ public: DECLARE_DIRECT_UPDATE_MEMBER(slapstic_setdirect); DECLARE_WRITE16_MEMBER(slapstic_w); DECLARE_READ16_MEMBER(slapstic_r); - + // sound I/O helpers void sound_io_reset(); INTERRUPT_GEN_MEMBER(m6502_irq_gen); @@ -141,7 +141,7 @@ public: void delayed_sound_reset(int param); void delayed_sound_write(int data); void delayed_6502_write(int data); - + // sound helpers void set_volume_by_type(int volume, device_type type); void set_ym2151_volume(int volume); @@ -196,7 +196,7 @@ public: DECLARE_READ8_MEMBER( earom_r ); DECLARE_WRITE8_MEMBER( earom_w ); DECLARE_WRITE8_MEMBER( earom_control_w ); - + // timer IDs enum { diff --git a/src/mame/machine/pgmprot1.c b/src/mame/machine/pgmprot1.c index 18b78b05748..6c9766d26c7 100644 --- a/src/mame/machine/pgmprot1.c +++ b/src/mame/machine/pgmprot1.c @@ -1018,7 +1018,7 @@ void command_handler_kov(pgm_arm_type1_state *state, int pc) default: state->m_valueresponse = 0x880000; -// logerror("Unknown ASIC27 command: %2.2x data: %4.4x\n", (data ^ state->m_valuekey) & 0xff, state->m_value0); +// logerror("Unknown ASIC27 command: %2.2x data: %4.4x\n", (data ^ state->m_valuekey) & 0xff, state->m_value0); break; } } diff --git a/src/mame/mame.lst b/src/mame/mame.lst index c1e5931dda8..a5b1d4df537 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -11569,7 +11569,7 @@ pongf // (c) 1972 Atari - no subcycles // JPM SRU? j_ewnud // Each Way Nudger -j_ewnda +j_ewnda j_ewnd20 j_ews // Each Way Shifter j_ews8a diff --git a/src/mame/video/vsystem_spr.c b/src/mame/video/vsystem_spr.c index e68f6ab53f0..de50554e3ba 100644 --- a/src/mame/video/vsystem_spr.c +++ b/src/mame/video/vsystem_spr.c @@ -218,7 +218,7 @@ void vsystem_spr_device::common_sprite_drawgfx( running_machine &machine, bitmap curr_sprite.zoomy = 32 - curr_sprite.zoomy; int ystart, yend, yinc; - + if (!curr_sprite.flipy) { ystart = 0; yend = curr_sprite.ysize+1; yinc = 1; } else { ystart = curr_sprite.ysize; yend = -1; yinc = -1; } @@ -237,22 +237,22 @@ void vsystem_spr_device::common_sprite_drawgfx( running_machine &machine, bitmap if (m_pdraw) { pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); - pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); + pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); - pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); + pdrawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, machine.priority_bitmap,priority_mask, m_transpen); } else { drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); - drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); - drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); + drawgfxzoom_transpen(bitmap, cliprect, gfx, startno, curr_sprite.color + m_pal_base, curr_sprite.flipx, curr_sprite.flipy, -0x200+curr_sprite.ox + xcnt * curr_sprite.zoomx/2, -0x200+curr_sprite.oy + ycnt * curr_sprite.zoomy/2, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, m_transpen); } xcnt+=xinc; } ycnt+=yinc; } - + } diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h index d333d5eb69f..8f38319e42a 100644 --- a/src/mame/video/vsystem_spr.h +++ b/src/mame/video/vsystem_spr.h @@ -14,7 +14,7 @@ typedef device_delegate vsystem_tile_indirection_delegate; #define MCFG_VSYSTEM_SPR_SET_PALMASK( _palmask ) \ vsystem_spr_device::set_pal_mask(*device, _palmask); \ - + #define MCFG_VSYSTEM_SPR_SET_TRANSPEN( _transpen ) \ vsystem_spr_device::CG10103_set_transpen(*device, _transpen); \ diff --git a/src/mame/video/vsystem_spr2.c b/src/mame/video/vsystem_spr2.c index 70eea6766a4..9061cdb09ab 100644 --- a/src/mame/video/vsystem_spr2.c +++ b/src/mame/video/vsystem_spr2.c @@ -122,7 +122,7 @@ void vsystem_spr2_device::turbofrc_draw_sprites_common( UINT16* spriteram3, int sx = ((curr_sprite.ox + curr_sprite.zoomx * x / 2 + 16) & 0x1ff) - 16; curr = spriteram1[curr_sprite.map % (spriteram1_bytes/2)]; - + pdrawgfxzoom_transpen(bitmap,cliprect,machine.gfx[sprite_gfx], curr, curr_sprite.color, @@ -200,7 +200,7 @@ void vsystem_spr2_device::spinlbrk_draw_sprites_common( UINT16* spriteram3, int sx = ((curr_sprite.ox + curr_sprite.zoomx * x / 2 + 16) & 0x1ff) - 16; curr = spriteram1[curr_sprite.map % (spriteram1_bytes/2)]; - + pdrawgfxzoom_transpen(bitmap,cliprect,machine.gfx[sprite_gfx], curr, curr_sprite.color, @@ -399,7 +399,7 @@ void vsystem_spr2_device::draw_sprites_pipedrm( UINT8* spriteram, int spriteram_ { static const UINT8 zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; const rectangle &visarea = screen.visible_area(); -// UINT8 *spriteram = spriteram; +// UINT8 *spriteram = spriteram; int offs; /* draw the sprites */ @@ -413,14 +413,14 @@ void vsystem_spr2_device::draw_sprites_pipedrm( UINT8* spriteram, int spriteram_ { if (!get_sprite_attributes((UINT16*)&spriteram[offs])) continue; - + curr_sprite.ysize++; curr_sprite.xsize++; curr_sprite.oy -= 6; curr_sprite.ox -= 13; - + int xt, yt; diff --git a/src/mame/video/vsystem_spr2.h b/src/mame/video/vsystem_spr2.h index 08a7c03d748..f79aee2e186 100644 --- a/src/mame/video/vsystem_spr2.h +++ b/src/mame/video/vsystem_spr2.h @@ -5,7 +5,7 @@ class vsystem_spr2_device : public device_t { public: vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + struct vsystem_sprite_attributes { int ox; @@ -26,13 +26,13 @@ public: template void turbofrc_draw_sprites_common( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, _BitmapClass &bitmap, const rectangle &cliprect, int chip_disabled_pri ); - + void turbofrc_draw_sprites( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int chip_disabled_pri ); void turbofrc_draw_sprites( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect, int chip_disabled_pri ); template void spinlbrk_draw_sprites_common( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, _BitmapClass &bitmap, const rectangle &cliprect, int chip_disabled_pri ); - + void spinlbrk_draw_sprites( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int chip_disabled_pri ); void spinlbrk_draw_sprites( UINT16* spriteram3, int spriteram3_bytes, UINT16* spriteram1, int spriteram1_bytes, int sprite_gfx, int spritepalettebank, running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect, int chip_disabled_pri ); diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index cf6a96df583..0826c1b2a20 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -1284,12 +1284,12 @@ WRITE8_MEMBER(a2600_state::switch_A_w) /* Right controller port */ m_joy2->joy_w( data & 0x0f ); -// switch( machine().root_device().ioport("CONTROLLERS")->read() % CATEGORY_SELECT ) -// { -// case 0x0a: /* KidVid voice module */ -// machine().device(CASSETTE_TAG)->change_state(( data & 0x02 ) ? (cassette_state)CASSETTE_MOTOR_DISABLED : (cassette_state)(CASSETTE_MOTOR_ENABLED | CASSETTE_PLAY), (cassette_state)CASSETTE_MOTOR_DISABLED ); -// break; -// } +// switch( machine().root_device().ioport("CONTROLLERS")->read() % CATEGORY_SELECT ) +// { +// case 0x0a: /* KidVid voice module */ +// machine().device(CASSETTE_TAG)->change_state(( data & 0x02 ) ? (cassette_state)CASSETTE_MOTOR_DISABLED : (cassette_state)(CASSETTE_MOTOR_ENABLED | CASSETTE_PLAY), (cassette_state)CASSETTE_MOTOR_DISABLED ); +// break; +// } } READ8_MEMBER(a2600_state::switch_A_r) diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index bdffbeded0f..837ed863fd8 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -9,11 +9,11 @@ 2002/05/13 kubecj added more banks for bankswitching added PAL machine description changed clock to be precise - - 2012/10/25 Robert Tuccitto NTSC Color Generator utilized for - color palette with hue shift/start - based on observation of several - systems across multiple displays + + 2012/10/25 Robert Tuccitto NTSC Color Generator utilized for + color palette with hue shift/start + based on observation of several + systems across multiple displays ***************************************************************************/ diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 4fd6b4a41ed..d74e9bfe3d1 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -178,7 +178,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amiga_mem32, AS_PROGRAM, 32, a1200_state ) ADDRESS_MAP_UNMAP_HIGH -// ADDRESS_MAP_GLOBAL_MASK(0xffffff) // not sure +// ADDRESS_MAP_GLOBAL_MASK(0xffffff) // not sure AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram") AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE16_LEGACY(amiga_cia_r, amiga_cia_w, 0xffffffff) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE16_LEGACY(amiga_custom_r, amiga_custom_w, 0xffffffff) AM_SHARE("custom_regs") @@ -862,7 +862,7 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) MCFG_SOFTWARE_LIST_ADD("flop_common","amiga_flop") MCFG_SOFTWARE_LIST_ADD("flop_list","amiga1200_flop") MCFG_SOFTWARE_LIST_ADD("flop_aga","amigaaga_flop") - + MACHINE_CONFIG_END @@ -1226,7 +1226,7 @@ ROM_START( a600 ) // from A600HD (had HDD by default) ROM_SYSTEM_BIOS(1, "kick205a", "Kickstart 2.05 (37.300)") - ROMX_LOAD("kickstart v2.05 r37.300 (1991)(commodore)(a600hd).rom", 0x000000, 0x080000, CRC(64466c2a) SHA1(f72d89148dac39c696e30b10859ebc859226637b), ROM_GROUPWORD | ROM_BIOS(1)) + ROMX_LOAD("kickstart v2.05 r37.300 (1991)(commodore)(a600hd).rom", 0x000000, 0x080000, CRC(64466c2a) SHA1(f72d89148dac39c696e30b10859ebc859226637b), ROM_GROUPWORD | ROM_BIOS(1)) ROM_SYSTEM_BIOS(2, "kick205b", "Kickstart 2.05 (37.300)") ROMX_LOAD("kickstart v2.05 r37.350 (1992)(commodore)(a600hd)[!].rom", 0x000000, 0x080000, CRC(43b0df7b) SHA1(02843c4253bbd29aba535b0aa3bd9a85034ecde4), ROM_GROUPWORD | ROM_BIOS(2)) @@ -1248,7 +1248,7 @@ ROM_START( a1200 ) ROM_SYSTEM_BIOS(0, "kick30", "Kickstart 3.0 (39.106)") ROMX_LOAD("391523-01.u6a", 0x000000, 0x040000, CRC(c742a412) SHA1(999eb81c65dfd07a71ee19315d99c7eb858ab186), ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(2) | ROM_BIOS(1)) ROMX_LOAD("391524-01.u6b", 0x000002, 0x040000, CRC(d55c6ec6) SHA1(3341108d3a402882b5ef9d3b242cbf3c8ab1a3e9), ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(2) | ROM_BIOS(1)) -// ROMX_LOAD("kickstart v3.0 r39.106 (1992)(commodore)(a1200)[!].rom", 0x000000, 0x080000, CRC(6c9b07d2) SHA1(70033828182fffc7ed106e5373a8b89dda76faa5), ROM_BIOS(1)) +// ROMX_LOAD("kickstart v3.0 r39.106 (1992)(commodore)(a1200)[!].rom", 0x000000, 0x080000, CRC(6c9b07d2) SHA1(70033828182fffc7ed106e5373a8b89dda76faa5), ROM_BIOS(1)) ROM_SYSTEM_BIOS(1, "kick31", "Kickstart 3.1 (40.068)") ROMX_LOAD("391773-01.u6a", 0x000000, 0x040000, CRC(08dbf275) SHA1(b8800f5f909298109ea69690b1b8523fa22ddb37), ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(2) | ROM_BIOS(2)) @@ -1328,10 +1328,10 @@ COMP( 1991, a500pln, a500pl, 0, a500plsn, amiga, amiga_state, amiga, "Co COMP( 1992, a600, 0, 0, a600, amiga, amiga_state, amiga, "Commodore Business Machines", "Amiga 600 (PAL, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS ) COMP( 1992, a600n, a600, 0, a600n, amiga, amiga_state, amiga, "Commodore Business Machines", "Amiga 600 (NTSC, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS ) -COMP( 1992, a1200, 0, 0, a1200, amiga, a1200_state,a1200, "Commodore Business Machines", "Amiga 1200 (PAL, AGA)" , GAME_NOT_WORKING ) +COMP( 1992, a1200, 0, 0, a1200, amiga, a1200_state,a1200, "Commodore Business Machines", "Amiga 1200 (PAL, AGA)" , GAME_NOT_WORKING ) COMP( 1992, a1200n, a1200, 0, a1200n, amiga, a1200_state,a1200, "Commodore Business Machines", "Amiga 1200 (NTSC, AGA)" , GAME_NOT_WORKING ) -COMP( 1992, a3000, 0, 0, a3000, amiga, amiga_state, a3000, "Commodore Business Machines", "Amiga 3000 (PAL, ECS, 68030)" , GAME_NOT_WORKING ) +COMP( 1992, a3000, 0, 0, a3000, amiga, amiga_state, a3000, "Commodore Business Machines", "Amiga 3000 (PAL, ECS, 68030)" , GAME_NOT_WORKING ) COMP( 1992, a3000n, a3000, 0, a3000n, amiga, amiga_state, a3000, "Commodore Business Machines", "Amiga 3000 (NTSC, ECS, 68030)" , GAME_NOT_WORKING ) diff --git a/src/mess/drivers/b2m.c b/src/mess/drivers/b2m.c index dd08da6c0cb..d2bff593ad3 100644 --- a/src/mess/drivers/b2m.c +++ b/src/mess/drivers/b2m.c @@ -175,12 +175,12 @@ static INPUT_PORTS_START( b2m ) INPUT_PORTS_END /* static LEGACY_FLOPPY_OPTIONS_START(b2m) - LEGACY_FLOPPY_OPTION(b2m, "cpm", "Bashkiria-2M disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([2]) - TRACKS([80]) - SECTORS([5]) - SECTOR_LENGTH([1024]) - FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION(b2m, "cpm", "Bashkiria-2M disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([2]) + TRACKS([80]) + SECTORS([5]) + SECTOR_LENGTH([1024]) + FIRST_SECTOR_ID([1])) LEGACY_FLOPPY_OPTIONS_END */ diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index fcd3ffc39c3..223c81223b5 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -3,7 +3,7 @@ TODO: - connect CAPS LOCK to charom A12 on international variants - - DCR models won't boot with 1571CR drive + - DCR models won't boot with 1571CR drive - fix fast serial - remove frame interrupt handler - expansion DMA @@ -957,7 +957,7 @@ WRITE8_MEMBER( c128_state::cia1_pb_w ) */ - m_vic->lp_w(BIT(data, 4)); + m_vic->lp_w(BIT(data, 4)); } WRITE_LINE_MEMBER( c128_state::cia1_cnt_w ) @@ -1055,7 +1055,7 @@ WRITE8_MEMBER( c128_state::cia2_pa_w ) m_iec->atn_w(!BIT(data, 3)); m_iec->clk_w(!BIT(data, 4)); m_iec_data_out = BIT(data, 5); - + update_iec(); } @@ -1085,10 +1085,10 @@ READ8_MEMBER( c128_state::cpu_r) P0 1 P1 1 P2 1 - P3 - P4 CASS SENSE - P5 - P6 CAPS LOCK + P3 + P4 CASS SENSE + P5 + P6 CAPS LOCK */ @@ -1693,12 +1693,12 @@ ROM_END ROM_START( c128cr ) /* C128CR prototype, owned by Bo Zimmers - PCB markings: "COMMODORE 128CR REV.3 // PCB NO.252270" and "PCB ASSY NO.250783" - Sticker on rom cart shield: "C128CR No.2 // ENG. SAMPLE // Jun/9/'86 KNT" - 3 ROMs (combined basic, combined c64/kernal, plain character rom) - 6526A-1 CIAs - ?prototype? 2568R1X VDC w/ 1186 datecode - */ + PCB markings: "COMMODORE 128CR REV.3 // PCB NO.252270" and "PCB ASSY NO.250783" + Sticker on rom cart shield: "C128CR No.2 // ENG. SAMPLE // Jun/9/'86 KNT" + 3 ROMs (combined basic, combined c64/kernal, plain character rom) + 6526A-1 CIAs + ?prototype? 2568R1X VDC w/ 1186 datecode + */ ROM_REGION( 0x10000, M8502_TAG, 0 ) ROM_LOAD( "252343-03.u34", 0x4000, 0x8000, CRC(bc07ed87) SHA1(0eec437994a3f2212343a712847213a8a39f4a7b) ) // "252343-03 // U34" ROM_LOAD( "252343-04.u32", 0x0000, 0x4000, CRC(cc6bdb69) SHA1(36286b2e8bea79f7767639fd85e12c5447c7041b) ) // "252343-04 // US // U32" diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index acc52df8c82..39657f56837 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -80,7 +80,7 @@ void c64_state::read_pla(offs_t offset, offs_t va, int rw, int aec, int ba, int int exrom = m_exp->exrom_r(offset, sphi2, ba, rw, m_hiram); int cas = 0; - UINT32 input = VA12 << 15 | VA13 << 14 | game << 13 | exrom << 12 | rw << 11 | aec << 10 | ba << 9 | A12 << 8 | + UINT32 input = VA12 << 15 | VA13 << 14 | game << 13 | exrom << 12 | rw << 11 | aec << 10 | ba << 9 | A12 << 8 | A13 << 7 | A14 << 6 | A15 << 5 | m_va14 << 4 | m_charen << 3 | m_hiram << 2 | m_loram << 1 | cas; UINT32 data = m_pla->read(input); @@ -195,7 +195,7 @@ void c64_state::write_memory(address_space &space, offs_t offset, UINT8 data, in int sphi2 = m_vic->phi0_r(); read_pla(offset, va, rw, !aec, ba, &casram, &basic, &kernal, &charom, &grw, &io, &roml, &romh); - + if (offset < 0x0002) { // write to internal CPU register @@ -259,7 +259,7 @@ READ8_MEMBER( c64_state::read ) // VIC address bus is floating offs_t va = 0x3fff; - + return read_memory(space, offset, va, aec, ba); } @@ -271,7 +271,7 @@ READ8_MEMBER( c64_state::read ) WRITE8_MEMBER( c64_state::write ) { int aec = 1, ba = 1; - + write_memory(space, offset, data, aec, ba); } @@ -287,7 +287,7 @@ READ8_MEMBER( c64_state::vic_videoram_r ) // A15/A14 are not connected to VIC so they are floating offset |= 0xc000; - + return read_memory(space, offset, va, aec, ba); } diff --git a/src/mess/drivers/cbm2.c b/src/mess/drivers/cbm2.c index 5cf4f76ecc8..0a0a70f5e3f 100644 --- a/src/mess/drivers/cbm2.c +++ b/src/mess/drivers/cbm2.c @@ -2,7 +2,7 @@ TODO: - - 8088 board + - 8088 board - CIA timers fail in burn-in test - NTSC variants unable to load from disk - shift lock @@ -291,7 +291,7 @@ WRITE8_MEMBER( cbm2_state::write ) } if (!extbufcs && m_extbuf_ram) { - m_extbuf_ram[offset & 0x7ff] = data; + m_extbuf_ram[offset & 0x7ff] = data; } if (!vidramcs) { @@ -334,7 +334,7 @@ WRITE8_MEMBER( cbm2_state::write ) } m_exp->write(space, offset & 0x1fff, data, csbank1, csbank2, csbank3); - } + } } @@ -411,7 +411,7 @@ void p500_state::read_pla1(offs_t offset, int busy2, int clrnibcsb, int procvid, { int sphi2 = m_vic->phi0_r(); int bras = 1; - + 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; @@ -757,7 +757,7 @@ READ8_MEMBER( p500_state::vic_videoram_r ) &cs1, &sidcs, &extprtcs, &ciacs, &aciacs, &tript1cs, &tript2cs, &aec, &vsysaden); UINT8 data = 0xff; -// UINT8 clrnib = 0xf; +// UINT8 clrnib = 0xf; if (vsysaden) { @@ -765,10 +765,10 @@ READ8_MEMBER( p500_state::vic_videoram_r ) { data = m_ram->pointer()[(m_vicbnksel << 14) | offset]; } -/* if (!clrnibcs) - { - clrnib = m_color_ram[offset & 0x3ff]; - }*/ +/* if (!clrnibcs) + { + clrnib = m_color_ram[offset & 0x3ff]; + }*/ if (!vidmatcs) { data = m_video_ram[offset & 0x3ff]; @@ -1740,19 +1740,19 @@ static pic8259_interface ext_pic_intf = READ8_MEMBER( cbm2_state::ext_tpi_pb_r ) { /* - - bit description - - 0 _BUSY1 - 1 CIA PB1 - 2 CIA PB2 - 3 CIA PB3 - 4 CIA PB4 - 5 CIA PB5 - 6 1 - 7 1 - - */ + + bit description + + 0 _BUSY1 + 1 CIA PB1 + 2 CIA PB2 + 3 CIA PB3 + 4 CIA PB4 + 5 CIA PB5 + 6 1 + 7 1 + + */ UINT8 data = 0xc0; @@ -1768,19 +1768,19 @@ READ8_MEMBER( cbm2_state::ext_tpi_pb_r ) WRITE8_MEMBER( cbm2_state::ext_tpi_pb_w ) { /* - - bit description - - 0 U22B CL - 1 - 2 - 3 - 4 - 5 - 6 CIA FLAG - 7 - - */ + + bit description + + 0 U22B CL + 1 + 2 + 3 + 4 + 5 + 6 CIA FLAG + 7 + + */ // _BUSY2 if (!BIT(data, 0)) @@ -1795,19 +1795,19 @@ WRITE8_MEMBER( cbm2_state::ext_tpi_pb_w ) WRITE8_MEMBER( cbm2_state::ext_tpi_pc_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 U22 CLK - 6 - 7 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 U22 CLK + 6 + 7 + + */ } static const tpi6525_interface ext_tpi_intf = @@ -1831,19 +1831,19 @@ static const tpi6525_interface ext_tpi_intf = READ8_MEMBER( cbm2_state::ext_cia_pb_r ) { /* - - bit description - - 0 _BUSY1 - 1 TPI PB1 - 2 TPI PB2 - 3 TPI PB3 - 4 TPI PB4 - 5 TPI PB5 - 6 1 - 7 1 - - */ + + bit description + + 0 _BUSY1 + 1 TPI PB1 + 2 TPI PB2 + 3 TPI PB3 + 4 TPI PB4 + 5 TPI PB5 + 6 1 + 7 1 + + */ UINT8 data = 0xc0; @@ -1859,19 +1859,19 @@ READ8_MEMBER( cbm2_state::ext_cia_pb_r ) WRITE8_MEMBER( cbm2_state::ext_cia_pb_w ) { /* - - bit description - - 0 U22B CL - 1 - 2 - 3 - 4 - 5 - 6 PIC IR0, U29B CL, U22B PR - 7 PIC IR7 - - */ + + bit description + + 0 U22B CL + 1 + 2 + 3 + 4 + 5 + 6 PIC IR0, U29B CL, U22B PR + 7 PIC IR7 + + */ // _BUSY2 if (!BIT(data, 0)) diff --git a/src/mess/drivers/craft.c b/src/mess/drivers/craft.c index 8d392bfccf1..7fcb1b741a7 100644 --- a/src/mess/drivers/craft.c +++ b/src/mess/drivers/craft.c @@ -29,10 +29,10 @@ INLINE void verboselog(running_machine &machine, int n_level, const char *s_fmt, #define verboselog(x,y,z,...) #endif -#define MASTER_CLOCK 20000000 +#define MASTER_CLOCK 20000000 -#define VISIBLE_CYCLES 480 -#define HSYNC_CYCLES 155 +#define VISIBLE_CYCLES 480 +#define HSYNC_CYCLES 155 #define LINE_CYCLES (VISIBLE_CYCLES + HSYNC_CYCLES) #define VISIBLE_LINES 480 #define VSYNC_LINES 45 @@ -209,14 +209,14 @@ static void avr8_change_port(running_machine &machine, int reg, UINT8 data) avr8_video_update(machine); /*if (frame_cycles >= state->spi_start_cycle && frame_cycles < (state->spi_start_cycle + 16)) - { - UINT8 bitidx = 7 - ((frame_cycles - state->spi_start_cycle) >> 1); - state->m_pixels[frame_cycles] = ((state->m_regs[AVR8_REGIDX_SPDR] & (1 << bitidx)) ? 0x3f : (data & 0x3f)); - } - else - { - state->m_pixels[frame_cycles] = data & 0x3f; - }*/ + { + UINT8 bitidx = 7 - ((frame_cycles - state->spi_start_cycle) >> 1); + state->m_pixels[frame_cycles] = ((state->m_regs[AVR8_REGIDX_SPDR] & (1 << bitidx)) ? 0x3f : (data & 0x3f)); + } + else + { + state->m_pixels[frame_cycles] = data & 0x3f; + }*/ AVR8_PORTC = data; } diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c index 4aff5fcf75b..d8c8a84f6bc 100644 --- a/src/mess/drivers/hp9k.c +++ b/src/mess/drivers/hp9k.c @@ -31,7 +31,7 @@ xxxxxx-ffffff - system RAM === -TODO: boot tests fail +TODO: boot tests fail ****************************************************************************/ @@ -53,12 +53,12 @@ static UINT8 prom16a[256] = { 0x00, // 256 bytes idprom '2', '0', '1', '0', 'A', '0', '0', '0', '0', '0', '0', // serial in ascii DDDDCSSSSSS date code, country, serial number '9', '8', '1', '6', 'A', ' ', ' ', // product number - 0xff, // 8 bits processor board config + 0xff, // 8 bits processor board config 0x01, // keyboard 98203B 0x02, // CRT alpha see crtid for monitor 0x03, // HP-IB 0x04, // Graphics - 0xff, // end + 0xff, // end 0xff, 0xff, 0xff, @@ -113,10 +113,10 @@ private: int crtc_curreg; int crtc_addrStartHi; int crtc_addrStartLow; - + void calc_prom_crc(UINT8* prom); void putChar(UINT8 thec,int x,int y,bitmap_ind16 &bitmap); - + public: hp9k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), @@ -136,7 +136,7 @@ public: required_device m_maincpu; //required_device m_terminal; required_device m_6845; - + UINT8 m_videoram[0x4000]; UINT8 m_screen[0x800]; @@ -168,18 +168,18 @@ void hp9k_state::calc_prom_crc(UINT8* prom) { int chksum; int i; - + chksum = 0; - for (i=0; i < 256; i+=2) + for (i=0; i < 256; i+=2) { chksum += ((prom[i] << 8) | prom[i+1]); if (chksum&0x10000) chksum++; chksum&=0xffff; } - + chksum=(chksum+1)&0xffff; - - if (chksum!=0) + + if (chksum!=0) { chksum=(0x10000-chksum); prom[0]=(UINT8)(chksum>>8); @@ -268,7 +268,7 @@ WRITE16_MEMBER( hp9k_state::hp9k_videoram_w ) else { //printf("videoram write [%x] at [%x]\n",data,offset); - + if (mem_mask==0xff00) { m_screen[offset&0x7ff]=data>>8; @@ -346,7 +346,7 @@ GFXDECODE_END void hp9k_state::putChar(UINT8 thec,int x,int y,bitmap_ind16 &bitmap) { const UINT8* pchar=machine().gfx[0]->get_data(thec); - + for (int py=0;pybase(); } - + // initialize memory UINT8 data = 0xff; diff --git a/src/mess/drivers/prof180x.c b/src/mess/drivers/prof180x.c index 612b04b11ac..05af6d84202 100644 --- a/src/mess/drivers/prof180x.c +++ b/src/mess/drivers/prof180x.c @@ -173,7 +173,7 @@ static ADDRESS_MAP_START( prof180x_io , AS_IO, 8, prof180x_state ) AM_RANGE(0x09, 0x09) AM_MASK(0xff00) AM_READ(status_r) // Seriously? -// AM_RANGE(0x0a, 0x0a) AM_MIRROR(0xff00) AM_DEVREADWRITE_LEGACY(FDC9268_TAG, upd765_dack_r, upd765_dack_w) +// AM_RANGE(0x0a, 0x0a) AM_MIRROR(0xff00) AM_DEVREADWRITE_LEGACY(FDC9268_TAG, upd765_dack_r, upd765_dack_w) AM_RANGE(0x0b, 0x0b) AM_MIRROR(0xff00) AM_DEVWRITE(CENTRONICS_TAG, centronics_device, write) AM_RANGE(0x0c, 0x0d) AM_MIRROR(0xff00) AM_DEVICE(FDC9268_TAG, upd765a_device, map) ADDRESS_MAP_END diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c index f0cc7df8b28..5b22d3dc0f6 100644 --- a/src/mess/drivers/spectrum.c +++ b/src/mess/drivers/spectrum.c @@ -116,8 +116,8 @@ xx/xx/2001 KS - TS-2068 sound fixed. completly messed timings. 25/10/2012 DH - simplified border emulation to be a (manual) partial update with bitmap - Removed legacy fff4 interrupt hack, modern version of - MAME can handle this just fine + Removed legacy fff4 interrupt hack, modern version of + MAME can handle this just fine Initialisation values used when determining which model is being emulated: 48K Spectrum doesn't use either port. diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h index b2ac236d9f0..67845e357af 100644 --- a/src/mess/includes/c128.h +++ b/src/mess/includes/c128.h @@ -109,7 +109,7 @@ public: inline void check_interrupts(); void read_pla(offs_t offset, offs_t ca, offs_t vma, int ba, int rw, int aec, int z80io, int ms3, int ms2, int ms1, int ms0, - int *sden, int *dir, int *gwe, int *rom1, int *rom2, int *rom3, int *rom4, int *charom, int *colorram, int *vic, + int *sden, int *dir, int *gwe, int *rom1, int *rom2, int *rom3, int *rom4, int *charom, int *colorram, int *vic, int *from1, int *romh, int *roml, int *dwe, int *ioacc, int *clrbank, int *iocs, int *casenb); UINT8 read_memory(address_space &space, offs_t offset, offs_t vma, int ba, int aec, int z80io); void write_memory(address_space &space, offs_t offset, offs_t vma, UINT8 data, int ba, int aec, int z80io); @@ -133,7 +133,7 @@ public: INTERRUPT_GEN_MEMBER( frame_interrupt ); DECLARE_WRITE_LINE_MEMBER( vic_irq_w ); DECLARE_WRITE8_MEMBER( vic_k_w ); - + DECLARE_READ8_MEMBER( sid_potx_r ); DECLARE_READ8_MEMBER( sid_poty_r ); diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h index 5b1db4139f9..c59bcb02fed 100644 --- a/src/mess/includes/fidelz80.h +++ b/src/mess/includes/fidelz80.h @@ -66,7 +66,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(fidelz80_trigger_reset); DECLARE_INPUT_CHANGED_MEMBER(abc_trigger_reset); TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer); - + DECLARE_WRITE8_MEMBER(digit_w); }; diff --git a/src/mess/includes/samcoupe.h b/src/mess/includes/samcoupe.h index 8b2cb1a2a7c..b59cb878aa1 100644 --- a/src/mess/includes/samcoupe.h +++ b/src/mess/includes/samcoupe.h @@ -44,7 +44,7 @@ public: sam_bank_read_ptr[2] = NULL; sam_bank_write_ptr[2] = NULL; sam_bank_read_ptr[3] = NULL; - sam_bank_write_ptr[3] = NULL; + sam_bank_write_ptr[3] = NULL; } virtual void video_start(); diff --git a/src/mess/machine/64h156.c b/src/mess/machine/64h156.c index a14caf4bc30..289358a4a0f 100644 --- a/src/mess/machine/64h156.c +++ b/src/mess/machine/64h156.c @@ -658,7 +658,7 @@ void c64h156_device::stp_w(int data) { int track = floppy_drive_get_current_track(m_image); int tracks = (data - track) & 0x03; - + if (tracks == 3) { tracks = -1; diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c index 3ce0f9ee7c8..fe8fcc05869 100644 --- a/src/mess/machine/b2m.c +++ b/src/mess/machine/b2m.c @@ -206,7 +206,7 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w) { UINT8 drive = ((data >> 1) & 1) ^ 1; UINT8 side = (data & 1) ^ 1; - + static const char *names[] = { "fd0", "fd1"}; floppy_image_device *floppy = NULL; floppy_connector *con = machine().device(names[drive]); @@ -219,7 +219,7 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w) m_b2m_drive = drive; } floppy->ss_w(side); - if (m_b2m_side!=side) { + if (m_b2m_side!=side) { m_b2m_side = side; } } diff --git a/src/mess/machine/c128_comal80.c b/src/mess/machine/c128_comal80.c index ff1ee6c793d..171882e13c7 100644 --- a/src/mess/machine/c128_comal80.c +++ b/src/mess/machine/c128_comal80.c @@ -94,7 +94,7 @@ void c128_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset 4 A14 5 A15 6 A16 - 7 A17 + 7 A17 */ diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c index b37b6c602dc..25cd345de3a 100644 --- a/src/mess/machine/c8280.c +++ b/src/mess/machine/c8280.c @@ -313,7 +313,7 @@ static const floppy_interface c8280_floppy_interface = NULL }; -static struct wd17xx_interface fdc_intf = +static struct wd17xx_interface fdc_intf = { DEVCB_NULL, DEVCB_CPU_INPUT_LINE(M6502_FDC_TAG, M6502_IRQ_LINE), @@ -407,7 +407,7 @@ void c8280_device::device_start() // state saving save_item(NAME(m_rfdo)); save_item(NAME(m_daco)); - save_item(NAME(m_atna)); + save_item(NAME(m_atna)); save_item(NAME(m_fk5)); } @@ -467,19 +467,19 @@ void c8280_device::ieee488_ifc(int state) READ8_MEMBER( c8280_device::fk5_r ) { /* - - bit description - - 0 DS1 - 1 DS2 - 2 _DDEN - 3 DCHG - 4 TSID - 5 MOTOR ENABLE - 6 0 - 7 0 - - */ + + bit description + + 0 DS1 + 1 DS2 + 2 _DDEN + 3 DCHG + 4 TSID + 5 MOTOR ENABLE + 6 0 + 7 0 + + */ UINT8 data = m_fk5; @@ -500,19 +500,19 @@ READ8_MEMBER( c8280_device::fk5_r ) WRITE8_MEMBER( c8280_device::fk5_w ) { /* - - bit description - - 0 DS1 - 1 DS2 - 2 _DDEN - 3 - 4 - 5 MOTOR ENABLE - 6 - 7 - - */ + + bit description + + 0 DS1 + 1 DS2 + 2 _DDEN + 3 + 4 + 5 MOTOR ENABLE + 6 + 7 + + */ m_fk5 = data & 0x3f; diff --git a/src/mess/machine/cbm2_graphic.c b/src/mess/machine/cbm2_graphic.c index cd627be3f4e..be129174c1c 100644 --- a/src/mess/machine/cbm2_graphic.c +++ b/src/mess/machine/cbm2_graphic.c @@ -43,7 +43,7 @@ const device_type CBM2_GRAPHIC = &device_creator; /* static const ef9365_interface gdp_intf = { - SCREEN_TAG + SCREEN_TAG }; */ @@ -52,14 +52,14 @@ static const ef9365_interface gdp_intf = //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_graphic_a ) -/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) - MCFG_SCREEN_SIZE(512, 512) - MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - MCFG_SCREEN_REFRESH_RATE(50) +/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) + MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_REFRESH_RATE(50) - MCFG_EF9365_ADD(EF9365_TAG, gdp_intf)*/ + MCFG_EF9365_ADD(EF9365_TAG, gdp_intf)*/ MACHINE_CONFIG_END @@ -68,14 +68,14 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_graphic_b ) -/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9366_device, screen_update) - MCFG_SCREEN_SIZE(512, 256) - MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - MCFG_SCREEN_REFRESH_RATE(50) +/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9366_device, screen_update) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_REFRESH_RATE(50) - MCFG_EF9366_ADD(EF9366_TAG, gdp_intf)*/ + MCFG_EF9366_ADD(EF9366_TAG, gdp_intf)*/ MACHINE_CONFIG_END diff --git a/src/mess/machine/isa_ide.c b/src/mess/machine/isa_ide.c index b3459bc35ed..1f24045fa67 100644 --- a/src/mess/machine/isa_ide.c +++ b/src/mess/machine/isa_ide.c @@ -36,7 +36,7 @@ WRITE_LINE_MEMBER(isa16_ide_device::ide_interrupt) { m_isa->irq14_w(state); } - else + else { m_isa->irq15_w(state); } diff --git a/src/mess/machine/macadb.c b/src/mess/machine/macadb.c index 98c4791f222..3c9ec20b8f4 100644 --- a/src/mess/machine/macadb.c +++ b/src/mess/machine/macadb.c @@ -1,7 +1,7 @@ /*************************************************************************** macadb.c - handles various aspects of ADB on the Mac. - + ***************************************************************************/ #include "emu.h" @@ -1254,14 +1254,14 @@ void mac_state::adb_linechange(int state, int dtime) } break; - case LST_BIT0: - case LST_BIT1: - case LST_BIT2: - case LST_BIT3: - case LST_BIT4: - case LST_BIT5: - case LST_BIT6: - case LST_BIT7: + case LST_BIT0: + case LST_BIT1: + case LST_BIT2: + case LST_BIT3: + case LST_BIT4: + case LST_BIT5: + case LST_BIT6: + case LST_BIT7: if (!state) { if (dtime >= 90) // "1" bit diff --git a/src/mess/machine/macrtc.c b/src/mess/machine/macrtc.c index bedb38ae137..691110a9264 100644 --- a/src/mess/machine/macrtc.c +++ b/src/mess/machine/macrtc.c @@ -2,11 +2,11 @@ macrtc.c - the real-time clock & NVRAM chip used in early 680x0 Macs, Apple part numbers 343-0040 (original) and 343-0042 (with extended PRAM) - + The IIgs has this chip also, but the VGC contains a relatively sophisticated logic block that offloads the low-level serial comms from the CPU, which makes it look quite different to software. - + ***************************************************************************/ #include "emu.h" diff --git a/src/mess/machine/macrtc.h b/src/mess/machine/macrtc.h index 6ae533916fa..6d53723c093 100644 --- a/src/mess/machine/macrtc.h +++ b/src/mess/machine/macrtc.h @@ -29,7 +29,7 @@ // ======================> rtc3430042_device class rtc3430042_device : public device_t, - public device_rtc_interface, + public device_rtc_interface, public device_nvram_interface { public: diff --git a/src/mess/machine/mos8722.c b/src/mess/machine/mos8722.c index ca3d17735fa..9b301f000b6 100644 --- a/src/mess/machine/mos8722.c +++ b/src/mess/machine/mos8722.c @@ -258,7 +258,7 @@ WRITE8_MEMBER( mos8722_device::write ) int fsdir = MCR_FSDIR; m_reg[MCR] = data; - + if (_8500 != MCR_8500) m_out_z80en_func(MCR_8500); if (fsdir != MCR_FSDIR) m_out_fsdir_func(MCR_FSDIR); break; diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index f7fa24c04b2..a38924e88cb 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -2987,18 +2987,18 @@ READ8_MEMBER(rmnimbus_state::nimbus_mouse_js_r) { /* - bit description + bit description - 0 JOY 0-Up or mouse XB - 1 JOY 0-Down or mouse XA - 2 JOY 0-Left or mouse YA - 3 JOY 0-Right or mouse YB - 4 JOY 0-b0 or mouse rbutton - 5 JOY 0-b1 or mouse lbutton - 6 ?? always reads 1 - 7 ?? always reads 1 + 0 JOY 0-Up or mouse XB + 1 JOY 0-Down or mouse XA + 2 JOY 0-Left or mouse YA + 3 JOY 0-Right or mouse YB + 4 JOY 0-b0 or mouse rbutton + 5 JOY 0-b1 or mouse lbutton + 6 ?? always reads 1 + 7 ?? always reads 1 - */ + */ UINT8 result; //int pc=machine().device(MAINCPU_TAG)->safe_pc(); mouse_joy_state *state = &m_nimbus_mouse; diff --git a/src/mess/machine/upd765.c b/src/mess/machine/upd765.c index ffdc0cb36fd..2b2733c72a4 100644 --- a/src/mess/machine/upd765.c +++ b/src/mess/machine/upd765.c @@ -444,7 +444,7 @@ void upd765_family_device::fifo_push(UINT8 data, bool internal) } fifo[fifo_pos++] = data; fifo_expected--; - + int thr = (fifocfg & FIF_THR)+1; if(!fifo_write && (!fifo_expected || fifo_pos >= thr || (fifocfg & FIF_DIS))) enable_transfer(); @@ -674,7 +674,7 @@ void upd765_family_device::live_run(attotime limit) if(cur_live.bit_counter & 15) break; int slot = (cur_live.bit_counter >> 4)-1; - + if(0) fprintf(stderr, "%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm).cstr(), slot, cur_live.data_reg, cur_live.crc); cur_live.idbuf[slot] = cur_live.data_reg; @@ -910,7 +910,7 @@ void upd765_family_device::live_run(attotime limit) return; } break; - + default: logerror("%s: Unknown live state %d\n", tts(cur_live.tm).cstr(), cur_live.state); return; @@ -1623,7 +1623,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi) case SCAN_ID_FAILED: fprintf(stderr, "RNF\n"); - // command_end(fi, true, 1); + // command_end(fi, true, 1); return; case SECTOR_READ: @@ -1645,7 +1645,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi) result[5] = command[4]; result[6] = command[5]; result_pos = 7; - // command_end(fi, true, 0); + // command_end(fi, true, 0); return; default: @@ -1992,7 +1992,7 @@ bool upd765_family_device::write_one_bit(attotime limit) void upd765_family_device::live_write_raw(UINT16 raw) { - // logerror("write %04x %04x\n", raw, cur_live.crc); + // logerror("write %04x %04x\n", raw, cur_live.crc); cur_live.shift_reg = raw; cur_live.data_bit_context = raw & 1; } @@ -2012,7 +2012,7 @@ void upd765_family_device::live_write_mfm(UINT8 mfm) cur_live.data_reg = mfm; cur_live.shift_reg = raw; cur_live.data_bit_context = context; - // logerror("write %02x %04x %04x\n", mfm, cur_live.crc, raw); + // logerror("write %02x %04x %04x\n", mfm, cur_live.crc, raw); } bool upd765_family_device::sector_matches() const diff --git a/src/mess/machine/upd765.h b/src/mess/machine/upd765.h index e8dca14500d..2ccf44477b1 100644 --- a/src/mess/machine/upd765.h +++ b/src/mess/machine/upd765.h @@ -52,9 +52,9 @@ public: virtual void setup_drq_cb(line_cb cb) = 0; /* Note that the address map must cover and handle the whole 0-7 - * range. The upd765, while conforming to the rest of the - * interface, is not eligible as a result. - */ + * range. The upd765, while conforming to the rest of the + * interface, is not eligible as a result. + */ virtual DECLARE_ADDRESS_MAP(map, 8) = 0; @@ -168,7 +168,7 @@ protected: SPEC_ND = 0x0001, }; - + enum { // General "doing nothing" state IDLE, diff --git a/src/mess/machine/vcsctrl.h b/src/mess/machine/vcsctrl.h index ff9837d45aa..03351963d04 100644 --- a/src/mess/machine/vcsctrl.h +++ b/src/mess/machine/vcsctrl.h @@ -47,16 +47,16 @@ public: // computer interface - // Data returned by the joy_r methods: + // Data returned by the joy_r methods: // bit 0 - pin 1 - Up // bit 1 - pin 2 - Down // bit 2 - pin 3 - Left // bit 3 - pin 4 - Right - // bit 4 - pin 5 - + // bit 4 - pin 5 - // bit 5 - pin 6 - Button // pin 7 - +5V // pin 8 - GND - // bit 6 - pin 9 - + // bit 6 - pin 9 - // UINT8 joy_r(); DECLARE_READ8_MEMBER( joy_r ); diff --git a/src/mess/mess.lst b/src/mess/mess.lst index c4a3edab867..89513bf4d91 100644 --- a/src/mess/mess.lst +++ b/src/mess/mess.lst @@ -657,7 +657,7 @@ a600n // a3000 // Commodore Amiga 3000 a3000n // a1200 // Commodore Amiga 1200 -a1200n // +a1200n // cdtv // Commodore CDTV cd32 // Commodore Amiga CD32 diff --git a/src/mess/video/mos6566.c b/src/mess/video/mos6566.c index 1159fc149db..045166ae579 100644 --- a/src/mess/video/mos6566.c +++ b/src/mess/video/mos6566.c @@ -363,7 +363,7 @@ inline void mos6566_device::bad_line_ba() if (m_ba) { set_ba(CLEAR_LINE); - m_rdy_cycles += 55 - m_cycle; + m_rdy_cycles += 55 - m_cycle; } } else @@ -437,7 +437,7 @@ inline void mos6566_device::matrix_access() if (!m_ba && m_aec) { - m_matrix_line[m_ml_index] = 0xff; + m_matrix_line[m_ml_index] = 0xff; } else { @@ -1427,7 +1427,7 @@ void mos6566_device::execute_run() // Last cycle m_cycle = 1; } - + m_phi0 = 1; set_aec(BIT(m_aec_delay, 2)); @@ -1827,7 +1827,7 @@ void mos6569_device::execute_run() check_sprite_dma(); spr_ba(0); - + m_cycle++; break; @@ -1996,7 +1996,7 @@ void mos6569_device::execute_run() // Last cycle m_cycle = 1; } - + m_phi0 = 1; set_aec(BIT(m_aec_delay, 2)); @@ -2780,7 +2780,7 @@ WRITE8_MEMBER( mos6566_device::write ) { m_cpu->set_unscaled_clock(clock() << BIT(data, 0)); } - + m_reg[offset] = data | 0xfc; m_on = !BIT(data, 0); diff --git a/src/mess/video/mos6566.h b/src/mess/video/mos6566.h index 721c7fe47e7..612b8f18207 100644 --- a/src/mess/video/mos6566.h +++ b/src/mess/video/mos6566.h @@ -314,7 +314,7 @@ public: DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE_LINE_MEMBER( lp_w ); - + DECLARE_READ_LINE_MEMBER( phi0_r ); DECLARE_READ_LINE_MEMBER( ba_r ); DECLARE_READ_LINE_MEMBER( aec_r ); diff --git a/src/mess/video/nubus_m2video.c b/src/mess/video/nubus_m2video.c index b2a22ba76b8..c0175297191 100644 --- a/src/mess/video/nubus_m2video.c +++ b/src/mess/video/nubus_m2video.c @@ -1,7 +1,7 @@ /*************************************************************************** Apple Macintosh II Video Card (630-0153) emulation - + Video ASIC is "TFB" 344-0001 RAMDAC is Bt453: control at Fs09001C, data at Fs090018 Fs08000x is general framebuffer control (video mode at 0) diff --git a/src/mess/video/pds30_30hr.c b/src/mess/video/pds30_30hr.c index 9f35d8403ae..ae660f24483 100644 --- a/src/mess/video/pds30_30hr.c +++ b/src/mess/video/pds30_30hr.c @@ -1,14 +1,14 @@ /*************************************************************************** - Micron/XCEED Technologies Color 30HR - + Micron/XCEED Technologies Color 30HR + Fs800000 - Mode A FsA00000 - Mode B FsC00000 - RAMDAC write offset FsC00004 - RAMDAC write data FsC00008 - RAMDAC write mask FsC0000C - RAMDAC read offset - + ***************************************************************************/ #include "emu.h" diff --git a/src/mess/video/pds30_cb264.c b/src/mess/video/pds30_cb264.c index 2554e964e9a..ad5e4b07aa1 100644 --- a/src/mess/video/pds30_cb264.c +++ b/src/mess/video/pds30_cb264.c @@ -1,7 +1,7 @@ /*************************************************************************** RasterOps ColorBoard 264/SE30 video card emulation - + ***************************************************************************/ #include "emu.h" diff --git a/src/mess/video/pds30_mc30.c b/src/mess/video/pds30_mc30.c index 374dac51852..809681ce686 100644 --- a/src/mess/video/pds30_mc30.c +++ b/src/mess/video/pds30_mc30.c @@ -1,7 +1,7 @@ /*************************************************************************** Micron/XCEED Technologies MacroColor 30 - + Similar to the 30HR, but registers are rearranged and 24bpp support was added. @@ -25,7 +25,7 @@ MACHINE_CONFIG_END ROM_START( xceedmc30 ) ROM_REGION(0x8000, XCEEDMC30_ROM_REGION, 0) - ROM_LOAD( "0390.bin", 0x000000, 0x008000, CRC(adea7a18) SHA1(9141eb1a0e5061e0409d65a89b4eaeb119ee4ffb) ) + ROM_LOAD( "0390.bin", 0x000000, 0x008000, CRC(adea7a18) SHA1(9141eb1a0e5061e0409d65a89b4eaeb119ee4ffb) ) ROM_END //************************************************************************** diff --git a/src/mess/video/pds30_procolor816.c b/src/mess/video/pds30_procolor816.c index 4350c3ff9a6..59a1440f40c 100644 --- a/src/mess/video/pds30_procolor816.c +++ b/src/mess/video/pds30_procolor816.c @@ -1,13 +1,13 @@ /*************************************************************************** Lapis ProColor Server 8*16 video card - + FsFF6001: DAC color # (seems to have the data bits perfectly reversed) FsFF6003: DAC color write (not bitswapped) FsFF6017: Mode (13 = 1bpp, 17 = 2bpp, 1b = 4bpp, 1e = 8bpp, 0a = 15bpp) FsFF7000: Bit 2 is VBL IRQ enable/ack FsFF7001: Bit 0 is VBL status - + ***************************************************************************/ #include "emu.h" diff --git a/src/mess/video/pds30_sigmalview.c b/src/mess/video/pds30_sigmalview.c index b585e72eeec..406f4573c0a 100644 --- a/src/mess/video/pds30_sigmalview.c +++ b/src/mess/video/pds30_sigmalview.c @@ -1,7 +1,7 @@ /*************************************************************************** Sigma Designs L-View card - + ***************************************************************************/ #include "emu.h" @@ -22,7 +22,7 @@ MACHINE_CONFIG_END ROM_START( lview ) ROM_REGION(0x4000, LVIEW_ROM_REGION, 0) - ROM_LOAD( "lv_asi_4_00.bin", 0x000000, 0x004000, CRC(b806f875) SHA1(1e58593b1a8720193d1651b0d8a0d43e4e47563d) ) + ROM_LOAD( "lv_asi_4_00.bin", 0x000000, 0x004000, CRC(b806f875) SHA1(1e58593b1a8720193d1651b0d8a0d43e4e47563d) ) ROM_END //************************************************************************** diff --git a/src/mess/video/spectrum.c b/src/mess/video/spectrum.c index a7c8cf95ee5..3e522f5c10f 100644 --- a/src/mess/video/spectrum.c +++ b/src/mess/video/spectrum.c @@ -59,7 +59,7 @@ void spectrum_state::screen_eof_spectrum(screen_device &screen, bool state) if (state) { m_frame_number++; - + if (m_frame_number >= m_frame_invert_count) { m_frame_number = 0; @@ -110,7 +110,7 @@ UINT32 spectrum_state::screen_update_spectrum(screen_device &screen, bitmap_ind1 int x, y, b, scrx, scry; unsigned short ink, pap; unsigned char *attr, *scr; - // int full_refresh = 1; + // int full_refresh = 1; if (m_border_bitmap.valid()) copyscrollbitmap(bitmap, m_border_bitmap, 0, 0, 0, 0, cliprect); @@ -224,7 +224,7 @@ void spectrum_UpdateBorderBitmap(running_machine &machine) UINT16* bm = &state->m_border_bitmap.pix16(state->m_previous_border_y); if (state->m_previous_border_x < width) - bm[state->m_previous_border_x] = colour; + bm[state->m_previous_border_x] = colour; } spectrum_GetNextPos(machine, state->m_previous_border_x, state->m_previous_border_y); @@ -238,4 +238,4 @@ void spectrum_UpdateBorderBitmap(running_machine &machine) } -} \ No newline at end of file +} diff --git a/src/mess/video/timex.c b/src/mess/video/timex.c index 11a297dc620..75c5ef95869 100644 --- a/src/mess/video/timex.c +++ b/src/mess/video/timex.c @@ -182,7 +182,7 @@ UINT32 spectrum_state::screen_update_ts2068(screen_device &screen, bitmap_ind16 { /* for now TS2068 will do a full-refresh */ int count; - + if (m_border_bitmap.valid()) copyscrollbitmap(bitmap, m_border_bitmap, 0, 0, 0, 0, cliprect); diff --git a/src/tools/jedutil.c b/src/tools/jedutil.c index 088677ede57..bc4f40eaf74 100644 --- a/src/tools/jedutil.c +++ b/src/tools/jedutil.c @@ -1233,7 +1233,7 @@ static void generate_product_terms(const pal_data* pal, const jed_data* jed, UIN if (pal->is_product_term_enabled && !pal->is_product_term_enabled(pal, jed, fuserow)) { - return; + return; } for (index = 0; index < inputpinscount; ++index) diff --git a/src/version.c b/src/version.c index c921ebab81a..78f4f8f4149 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.147u1 ("__DATE__")"; +const char build_version[] = "0.147u2 ("__DATE__")";