diff options
| author | 2012-10-30 07:07:38 +0000 | |
|---|---|---|
| committer | 2012-10-30 07:07:38 +0000 | |
| commit | 6bfc7e54f9e932a70056ff0b3d79396ff8ef00b3 (patch) | |
| tree | 85ed98268eb2848966ebfef9c284b7d359f82e8f /src/emu | |
| parent | 05e6b5ff93f294d0bc11f7680af87786ada1f124 (diff) | |
Clean-ups and version bumpmame0147u2
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/avr8/avr8.c | 10 | ||||
| -rw-r--r-- | src/emu/cpu/rsp/rsp.h | 4 | ||||
| -rw-r--r-- | src/emu/cpu/rsp/rspdrc.c | 2 | ||||
| -rw-r--r-- | src/emu/delegate.h | 18 | ||||
| -rw-r--r-- | src/emu/devcb2.c | 58 | ||||
| -rw-r--r-- | src/emu/devcb2.h | 36 | ||||
| -rw-r--r-- | src/emu/driver.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/i8243.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/pla.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/scsicb.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/2151intf.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/2151intf.h | 4 | ||||
| -rw-r--r-- | src/emu/video/mc6845.c | 12 | ||||
| -rw-r--r-- | src/emu/video/mc6845.h | 2 | ||||
| -rw-r--r-- | src/emu/video/pc_vga.c | 108 |
15 files changed, 135 insertions, 135 deletions
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<typename _FunctionType> void update_after_bind(_FunctionType &funcptr, delegate_generic_class *&object) @@ -345,7 +345,7 @@ private: mfptype &mfp = *reinterpret_cast<mfptype *>(&_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 <typename _SourceType> @@ -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<typename _FunctionType> 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<read_line_device_func _Func> DECLARE_READ_LINE_MEMBER( member_wrapper_line ) { return (*_Func)(this); } template<write_line_device_func _Func> 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<class _Object> static devcb2_base &set_read_handler(device_t &device, _Object object) { return downcast<i8243_device &>(device).m_readhandler.set_callback(object); } template<class _Object> static devcb2_base &set_write_handler(device_t &device, _Object object) { return downcast<i8243_device &>(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); } |
