diff options
| author | 2013-06-11 07:16:42 +0000 | |
|---|---|---|
| committer | 2013-06-11 07:16:42 +0000 | |
| commit | 16f5234d435ee57b65043533f8fa2b105fb15a77 (patch) | |
| tree | c6f95d84c6a1cb89ced5353230a98e1f61a6938e /src/emu | |
| parent | 2dc6458ede8c0039e308c994e50acb3b8de2d1ae (diff) | |
Cleanups and version bumpmame0149
Diffstat (limited to 'src/emu')
51 files changed, 646 insertions, 663 deletions
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h index 00369a2ac1e..eb3a03e036c 100644 --- a/src/emu/cpu/rsp/rsp.h +++ b/src/emu/cpu/rsp/rsp.h @@ -16,7 +16,7 @@ #ifndef __RSP_H__ #define __RSP_H__ -#define USE_SIMD (0) +#define USE_SIMD (0) #if USE_SIMD #include <tmmintrin.h> diff --git a/src/emu/debug/dvbpoints.c b/src/emu/debug/dvbpoints.c index 298ce2ee67b..99094a11d4c 100644 --- a/src/emu/debug/dvbpoints.c +++ b/src/emu/debug/dvbpoints.c @@ -2,7 +2,7 @@ dvpoints.c - Breakpoint debugger view. + Breakpoint debugger view. **************************************************************************** @@ -131,15 +131,15 @@ void debug_view_breakpoints::view_click(const int button, const debug_view_xy& p void debug_view_breakpoints::pad_astring_to_length(astring& str, int len) { - int diff = len - str.len(); - if (diff > 0) - { - astring buffer; - buffer.expand(diff); - for (int i = 0; i < diff; i++) - buffer.catprintf(" "); - str.catprintf("%s", buffer.cstr()); - } + int diff = len - str.len(); + if (diff > 0) + { + astring buffer; + buffer.expand(diff); + for (int i = 0; i < diff; i++) + buffer.catprintf(" "); + str.catprintf("%s", buffer.cstr()); + } } //------------------------------------------------- @@ -162,7 +162,7 @@ void debug_view_breakpoints::view_update() for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != NULL; bp = bp->next()) numBPs++; bpList = new device_debug::breakpoint*[numBPs]; - + // Collect int i = 1; for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != NULL; bp = bp->next()) @@ -176,7 +176,7 @@ void debug_view_breakpoints::view_update() for (int row = 0; row < m_visible.y; row++) { UINT32 effrow = m_topleft.y + row; - + // Header if (effrow == 0) { @@ -195,8 +195,8 @@ void debug_view_breakpoints::view_update() if (bpi < numBPs && bpi >= 0) { device_debug::breakpoint* bp = bpList[bpi]; - - astring buffer; + + astring buffer; buffer.printf("%x", bp->index()); pad_astring_to_length(buffer, 5); buffer.catprintf("%c", bp->enabled() ? 'X' : 'O'); @@ -213,7 +213,7 @@ void debug_view_breakpoints::view_update() buffer.catprintf("%s", bp->action()); pad_astring_to_length(buffer, 60); } - + for (int i = 0; i < m_visible.x; i++) { dest->byte = (i < buffer.len()) ? buffer[i] : ' '; @@ -222,7 +222,7 @@ void debug_view_breakpoints::view_update() } continue; } - + // Fill the remaining vertical space for (int i = 0; i < m_visible.x; i++) { @@ -231,6 +231,6 @@ void debug_view_breakpoints::view_update() dest++; } } - + delete bpList; } diff --git a/src/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h index 36e5c398d7e..be57027c186 100644 --- a/src/emu/debug/dvbpoints.h +++ b/src/emu/debug/dvbpoints.h @@ -2,7 +2,7 @@ dvpoints.h - Breakpoint debugger view. + Breakpoint debugger view. **************************************************************************** @@ -77,7 +77,7 @@ private: // internal helpers void enumerate_sources(); bool recompute(offs_t pc, int startline, int lines); - void pad_astring_to_length(astring& str, int len); + void pad_astring_to_length(astring& str, int len); // internal state }; diff --git a/src/emu/dislot.c b/src/emu/dislot.c index 8d61cc85c42..47ecf4896c5 100644 --- a/src/emu/dislot.c +++ b/src/emu/dislot.c @@ -43,7 +43,7 @@ device_card_options *device_slot_interface::static_alloc_card_options(device_t & return options; } - + void device_slot_interface::static_set_card_machine_config(device_t &device, const char *card, const machine_config_constructor machine_config) { static_alloc_card_options(device, card)->m_machine_config = machine_config; diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 903d9493cc6..cce6388a9d3 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -135,20 +135,20 @@ EMUSOUNDOBJS = \ $(EMUOBJ)/sound/flt_vol.o \ $(EMUOBJ)/sound/flt_rc.o \ $(EMUOBJ)/sound/wavwrite.o \ - $(EMUOBJ)/sound/samples.o \ + $(EMUOBJ)/sound/samples.o \ EMUDRIVEROBJS = \ $(EMUDRIVERS)/empty.o \ $(EMUDRIVERS)/testcpu.o \ - + EMUMACHINEOBJS = \ - $(EMUMACHINE)/generic.o \ - $(EMUMACHINE)/ram.o \ - $(EMUMACHINE)/nvram.o \ + $(EMUMACHINE)/generic.o \ + $(EMUMACHINE)/ram.o \ + $(EMUMACHINE)/nvram.o \ $(EMUMACHINE)/laserdsc.o \ $(EMUMACHINE)/net_lib.o \ $(EMUMACHINE)/netlist.o \ - + EMUIMAGEDEVOBJS = \ $(EMUIMAGEDEV)/bitbngr.o \ $(EMUIMAGEDEV)/cartslot.o \ @@ -165,10 +165,10 @@ EMUIMAGEDEVOBJS = \ EMUVIDEOOBJS = \ - $(EMUVIDEO)/generic.o \ - $(EMUVIDEO)/resnet.o \ - $(EMUVIDEO)/rgbutil.o \ - $(EMUVIDEO)/vector.o \ + $(EMUVIDEO)/generic.o \ + $(EMUVIDEO)/resnet.o \ + $(EMUVIDEO)/rgbutil.o \ + $(EMUVIDEO)/vector.o \ LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS) $(EMUVIDEOOBJS) diff --git a/src/emu/machine.c b/src/emu/machine.c index b04c0019321..9bc88a08981 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -559,16 +559,16 @@ astring running_machine::get_statename(const char *option) statename_str.cpy("%g"); else statename_str.cpy(option); - + // strip any extension in the provided statename int index = statename_str.rchr(0, '.'); if (index != -1) statename_str.substr(0, index); - + // handle %d in the template (for image devices) astring statename_dev("%d_"); int pos = statename_str.find(0, statename_dev); - + if (pos != -1) { // if more %d are found, revert to default and ignore them all @@ -578,12 +578,12 @@ astring running_machine::get_statename(const char *option) else { int name_found = 0; - + // find length of the device name int end1 = statename_str.find(pos + 3, "/"); int end2 = statename_str.find(pos + 3, "%"); int end = -1; - + if ((end1 != -1) && (end2 != -1)) end = MIN(end1, end2); else if (end1 != -1) @@ -592,15 +592,15 @@ astring running_machine::get_statename(const char *option) end = end2; else end = statename_str.len(); - + if (end - pos < 3) fatalerror("Something very wrong is going on!!!\n"); - + // copy the device name to an astring astring devname_str; devname_str.cpysubstr(statename_str, pos + 3, end - pos - 3); //printf("check template: %s\n", devname_str.cstr()); - + // verify that there is such a device for this system image_interface_iterator iter(root_device()); for (device_image_interface *image = iter.first(); image != NULL; image = iter.next()) @@ -608,30 +608,30 @@ astring running_machine::get_statename(const char *option) // get the device name astring tempdevname(image->brief_instance_name()); //printf("check device: %s\n", tempdevname.cstr()); - + if (devname_str.cmp(tempdevname) == 0) { // verify that such a device has an image mounted if (image->basename_noext() != NULL) { astring filename(image->basename_noext()); - + // setup snapname and remove the %d_ statename_str.replace(0, devname_str, filename); statename_str.del(pos, 3); //printf("check image: %s\n", filename.cstr()); - + name_found = 1; } } } - + // or fallback to default if (name_found == 0) statename_str.cpy("%g"); } } - + // substitute path and gamename up front statename_str.replace(0, "/", PATH_SEPARATOR); statename_str.replace(0, "%g", basename()); diff --git a/src/emu/machine/7200fifo.c b/src/emu/machine/7200fifo.c index da998e575ac..6913479d4fc 100644 --- a/src/emu/machine/7200fifo.c +++ b/src/emu/machine/7200fifo.c @@ -41,7 +41,7 @@ void fifo7200_device::device_start() m_ef_handler.resolve(); m_ff_handler.resolve(); m_hf_handler.resolve(); - + // state save save_item(NAME(m_read_ptr)); save_item(NAME(m_write_ptr)); @@ -60,11 +60,11 @@ void fifo7200_device::device_reset() memset(m_buffer, 0, m_ram_size * sizeof(UINT16)); m_read_ptr = 0; m_write_ptr = 0; - + m_ef = 1; m_ff = 0; m_hf = 0; - + if (!m_ef_handler.isnull()) m_ef_handler(m_ef); if (!m_ff_handler.isnull()) m_ff_handler(m_ff); if (!m_hf_handler.isnull()) m_hf_handler(m_hf); @@ -82,7 +82,7 @@ void fifo7200_device::fifo_write(UINT16 data) m_buffer[m_write_ptr] = data & 0x1ff; m_write_ptr = (m_write_ptr + 1) % m_ram_size; - + // update flags if (m_ef) { @@ -110,7 +110,7 @@ UINT16 fifo7200_device::fifo_read() logerror("IDT7200 %s fifo_read underflow!\n", tag()); return 0x1ff; } - + UINT16 ret = m_buffer[m_read_ptr]; m_read_ptr = (m_read_ptr + 1) % m_ram_size; @@ -126,12 +126,12 @@ UINT16 fifo7200_device::fifo_read() m_ef = 1; if (!m_ef_handler.isnull()) m_ef_handler(m_ef); } - + else if (((m_read_ptr + m_ram_size / 2) % m_ram_size) == m_write_ptr) { m_hf = 0; if (!m_hf_handler.isnull()) m_hf_handler(m_hf); } - + return ret; } diff --git a/src/emu/machine/7200fifo.h b/src/emu/machine/7200fifo.h index 189bc3a9b06..d54ee274e4a 100644 --- a/src/emu/machine/7200fifo.h +++ b/src/emu/machine/7200fifo.h @@ -93,7 +93,7 @@ public: DECLARE_READ_LINE_MEMBER( ef_r ) { return m_ef; } DECLARE_READ_LINE_MEMBER( ff_r ) { return m_ff; } DECLARE_READ_LINE_MEMBER( hf_r ) { return m_hf; } - + // normal configuration DECLARE_WRITE16_MEMBER( data_word_w ) { fifo_write(data); } DECLARE_READ16_MEMBER( data_word_r ) { return (UINT16)fifo_read(); } @@ -113,14 +113,14 @@ private: UINT16* m_buffer; int m_ram_size; - + int m_read_ptr; int m_write_ptr; - + int m_ef; // empty flag int m_ff; // full flag int m_hf; // half-full flag - + devcb2_write_line m_ef_handler; devcb2_write_line m_ff_handler; devcb2_write_line m_hf_handler; diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h index 06ab61e3e7a..67156c85f67 100644 --- a/src/emu/machine/adc1038.h +++ b/src/emu/machine/adc1038.h @@ -47,7 +47,7 @@ protected: virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); - + adc1038_input_read_func m_input_callback_r_func; private: diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h index aa2209884fa..f7b7ca7f20b 100644 --- a/src/emu/machine/adc1213x.h +++ b/src/emu/machine/adc1213x.h @@ -40,17 +40,17 @@ public: DECLARE_WRITE8_MEMBER( conv_w ); DECLARE_READ8_MEMBER( do_r ); DECLARE_READ8_MEMBER( eoc_r ); - + protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); - + void convert(int channel, int bits16, int lsbfirst); adc1213x_input_convert_func m_input_callback_r_func; - + private: // internal state int m_cycle; diff --git a/src/emu/machine/ay31015.c b/src/emu/machine/ay31015.c index f1713feae73..037e9381609 100644 --- a/src/emu/machine/ay31015.c +++ b/src/emu/machine/ay31015.c @@ -122,7 +122,7 @@ void ay31015_device::device_config_complete() const ay31015_config *intf = reinterpret_cast<const ay31015_config *>(static_config()); if (intf != NULL) *static_cast<ay31015_config *>(this) = *intf; - + // or initialize to defaults if none provided else { @@ -143,13 +143,13 @@ void ay31015_device::device_start() m_read_si.resolve(read_si_cb, *this); m_write_so.resolve(write_so_cb, *this); m_status_changed.resolve(status_changed_cb, *this); - + m_tx_clock = transmitter_clock; m_rx_clock = receiver_clock; - + m_rx_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ay31015_device::rx_process),this)); m_tx_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ay31015_device::tx_process),this)); - + update_rx_timer(); update_tx_timer(); @@ -184,7 +184,7 @@ void ay31015_device::device_reset() { m_control_reg = 0; m_rx_data = 0; - + internal_reset(); } @@ -566,12 +566,12 @@ void ay51013_device::internal_reset() { /* total pulses = 16 * data-bits */ UINT8 t1; - + if (m_control_reg & CONTROL_NB2) t1 = (m_control_reg & CONTROL_NB1) ? 8 : 7; else t1 = (m_control_reg & CONTROL_NB1) ? 6 : 5; - + m_total_pulses = t1 << 4; /* total clock pulses to load a byte */ m_second_stop_bit = ((m_control_reg & CONTROL_TSB) ? 16 : 0); /* 2nd stop bit */ if ((t1 == 5) && (m_second_stop_bit == 16)) @@ -730,4 +730,3 @@ void ay31015_device::set_transmit_data( UINT8 data ) update_status_pins(); } } - diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h index e3f7b36990f..b82c7dd124e 100644 --- a/src/emu/machine/ay31015.h +++ b/src/emu/machine/ay31015.h @@ -74,32 +74,32 @@ public: ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); ~ay31015_device() {} - + /* Set an input pin */ void set_input_pin( ay31015_input_pin_t pin, int data ); - - + + /* Get an output pin */ int get_output_pin( ay31015_output_pin_t pin ); - - + + /* Set a new transmitter clock (new_clock is in Hz) */ void set_transmitter_clock( double new_clock ); - - + + /* Set a new receiver clock (new_clock is in Hz) */ void set_receiver_clock( double new_clock ); - - + + /* Reead the received data */ /* The received data is available on RD8-RD1 (pins 5-12) */ UINT8 get_received_data(); - - + + /* Set the transmitter buffer */ /* The data to transmit is set on DB1-DB8 (pins 26-33) */ void set_transmit_data( UINT8 data ); - + protected: // device-level overrides virtual void device_config_complete(); @@ -120,13 +120,13 @@ protected: TIMER_CALLBACK_MEMBER(tx_process); int m_pins[41]; - + UINT8 m_control_reg; UINT8 m_status_reg; UINT16 m_second_stop_bit; // 0, 8, 16 UINT16 m_total_pulses; // bits * 16 UINT8 m_internal_sample; - + state_t m_rx_state; UINT8 m_rx_data; // byte being received UINT8 m_rx_buffer; // received byte waiting to be accepted by computer @@ -135,7 +135,7 @@ protected: UINT16 m_rx_pulses; // total pulses left double m_rx_clock; emu_timer *m_rx_timer; - + state_t m_tx_state; UINT8 m_tx_data; // byte being sent UINT8 m_tx_buffer; // next byte to send @@ -143,7 +143,7 @@ protected: UINT16 m_tx_pulses; // total pulses left double m_tx_clock; emu_timer *m_tx_timer; - + devcb_resolved_read8 m_read_si; /* SI - pin 20 - This will be called whenever the SI pin is sampled. Optional */ devcb_resolved_write8 m_write_so; /* SO - pin 25 - This will be called whenever data is put on the SO pin. Optional */ devcb_resolved_write8 m_status_changed; /* This will be called whenever one of the status pins may have changed. Optional */ @@ -153,14 +153,14 @@ class ay51013_device : public ay31015_device { public: ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + protected: virtual void internal_reset(); }; -extern const device_type AY31015; // For AY-3-1014A, AY-3-1015(D) and HD6402 variants -extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 variants +extern const device_type AY31015; // For AY-3-1014A, AY-3-1015(D) and HD6402 variants +extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 variants diff --git a/src/emu/machine/com8116.c b/src/emu/machine/com8116.c index d2a9c0aa171..9471fccdac8 100644 --- a/src/emu/machine/com8116.c +++ b/src/emu/machine/com8116.c @@ -48,9 +48,9 @@ const int com8116_device::divisors_32X_5_0688MHz[] = com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, COM8116, "COM8116", tag, owner, clock), - m_write_fx4(*this), - m_write_fr(*this), - m_write_ft(*this) + m_write_fx4(*this), + m_write_fr(*this), + m_write_ft(*this) { } diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index 62adfbfe379..2739c3959fc 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -301,7 +301,7 @@ static astring &nvram_filename(astring &result, device_t &device) running_machine &machine = device.machine(); // start with either basename or basename_biosnum - result.cpy(machine.basename()); + result.cpy(machine.basename()); if (device.machine().root_device().system_bios() != 0 && device.machine().root_device().default_bios() != device.machine().root_device().system_bios()) result.catprintf("_%d", device.machine().root_device().system_bios() - 1); diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 363c0151ba1..4753ad6e72f 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -97,7 +97,7 @@ void ide_controller_device::set_irq(int state) LOG(("IDE interrupt assert\n")); else LOG(("IDE interrupt clear\n")); - + /* signal an interrupt */ m_irq_handler(state); interrupt_pending = state; @@ -885,7 +885,7 @@ READ8_MEMBER( ide_controller_device::read_via_config ) break; } -// printf( "read via config %04x %04x %04x\n", offset, result, mem_mask ); +// printf( "read via config %04x %04x %04x\n", offset, result, mem_mask ); return result; } @@ -1009,7 +1009,7 @@ READ16_MEMBER( ide_controller_device::read_cs0 ) break; } -// printf( "read cs0 %04x %04x %04x\n", offset, result, mem_mask ); +// printf( "read cs0 %04x %04x %04x\n", offset, result, mem_mask ); /* return the result */ return result; @@ -1071,7 +1071,7 @@ READ16_MEMBER( ide_controller_device::read_cs1 ) break; } -// printf( "read cs1 %04x %04x %04x\n", offset, result, mem_mask ); +// printf( "read cs1 %04x %04x %04x\n", offset, result, mem_mask ); /* return the result */ return result; @@ -1086,7 +1086,7 @@ READ16_MEMBER( ide_controller_device::read_cs1 ) WRITE8_MEMBER( ide_controller_device::write_via_config ) { -// printf( "write via config %04x %04x %04x\n", offset, data, mem_mask ); +// printf( "write via config %04x %04x %04x\n", offset, data, mem_mask ); /* logit */ LOG(("%s:IDE via config write to %X = %08X, mem_mask=%d\n", machine().describe_context(), offset, data, mem_mask)); @@ -1139,7 +1139,7 @@ void ide_controller_device::write_dma( UINT16 data ) WRITE16_MEMBER( ide_controller_device::write_cs0 ) { -// printf( "write cs0 %04x %04x %04x\n", offset, data, mem_mask ); +// printf( "write cs0 %04x %04x %04x\n", offset, data, mem_mask ); switch (offset) { @@ -1229,7 +1229,7 @@ WRITE16_MEMBER( ide_controller_device::write_cs1_pc ) WRITE16_MEMBER( ide_controller_device::write_cs1 ) { -// printf( "write cs1 %04x %04x %04x\n", offset, data, mem_mask ); +// printf( "write cs1 %04x %04x %04x\n", offset, data, mem_mask ); /* logit */ LOG(("%s:IDE cs1 write to %X = %08X, mem_mask=%d\n", machine().describe_context(), offset, data, mem_mask)); diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index 38ba0f33818..9aedae570c4 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -100,7 +100,7 @@ public: DECLARE_READ16_MEMBER(read_cs1_pc); DECLARE_WRITE16_MEMBER(write_cs0_pc); DECLARE_WRITE16_MEMBER(write_cs1_pc); - + virtual void set_irq(int state); virtual void set_dmarq(int state); void read_sector_done(); diff --git a/src/emu/machine/idehd.c b/src/emu/machine/idehd.c index d2932a151e6..cf3542e4bc9 100644 --- a/src/emu/machine/idehd.c +++ b/src/emu/machine/idehd.c @@ -239,7 +239,7 @@ ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type, void ide_hdd_device::device_start() { -// save_item(NAME(features)); +// save_item(NAME(features)); save_item(NAME(cur_cylinder)); save_item(NAME(cur_sector)); diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c index a6b81c1fe2c..2dcd019e8da 100644 --- a/src/emu/machine/im6402.c +++ b/src/emu/machine/im6402.c @@ -278,7 +278,7 @@ WRITE8_MEMBER( im6402_device::write ) } else { - set_tbre(CLEAR_LINE); + set_tbre(CLEAR_LINE); } } diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak index 1f189c40f99..cf110df826e 100644 --- a/src/emu/machine/machine.mak +++ b/src/emu/machine/machine.mak @@ -15,7 +15,7 @@ MACHINEOBJ = $(EMUOBJ)/machine #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter NCR53C7XX,$(MACHINES)),) @@ -24,7 +24,7 @@ MACHINEOBJS += $(MACHINEOBJ)/53c7xx.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LSI53C810,$(MACHINES)),) @@ -33,7 +33,7 @@ MACHINEOBJS += $(MACHINEOBJ)/53c810.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 6522VIA,$(MACHINES)),) @@ -41,7 +41,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6522via.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TPI6525,$(MACHINES)),) @@ -49,7 +49,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6525tpi.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 6526CIA,$(MACHINES)),) @@ -57,7 +57,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6526cia.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RIOT6532,$(MACHINES)),) @@ -65,7 +65,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6532riot.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 6821PIA,$(MACHINES)),) @@ -73,7 +73,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6821pia.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 6840PTM,$(MACHINES)),) @@ -81,7 +81,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6840ptm.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ACIA6850,$(MACHINES)),) @@ -89,16 +89,16 @@ MACHINEOBJS += $(MACHINEOBJ)/6850acia.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 68681,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/68681.o +MACHINEOBJS += $(MACHINEOBJ)/68681.o MACHINEOBJS += $(MACHINEOBJ)/n68681.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter 7200FIFO,$(MACHINES)),) @@ -106,55 +106,55 @@ MACHINEOBJS += $(MACHINEOBJ)/7200fifo.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL74123,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/74123.o +MACHINEOBJS += $(MACHINEOBJ)/74123.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL74145,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/74145.o +MACHINEOBJS += $(MACHINEOBJ)/74145.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL74148,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/74148.o +MACHINEOBJS += $(MACHINEOBJ)/74148.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL74153,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/74153.o +MACHINEOBJS += $(MACHINEOBJ)/74153.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL74181,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/74181.o +MACHINEOBJS += $(MACHINEOBJ)/74181.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TTL7474,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/7474.o +MACHINEOBJS += $(MACHINEOBJ)/7474.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter KBDC8042,$(MACHINES)),) @@ -162,7 +162,7 @@ MACHINEOBJS += $(MACHINEOBJ)/8042kbdc.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8257,$(MACHINES)),) @@ -170,7 +170,7 @@ MACHINEOBJS += $(MACHINEOBJ)/8257dma.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AAKARTDEV,$(MACHINES)),) @@ -178,7 +178,7 @@ MACHINEOBJS += $(MACHINEOBJ)/aakart.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ADC0808,$(MACHINES)),) @@ -186,7 +186,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc0808.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ADC083X,$(MACHINES)),) @@ -194,7 +194,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc083x.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ADC1038,$(MACHINES)),) @@ -202,7 +202,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc1038.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ADC1213X,$(MACHINES)),) @@ -210,7 +210,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc1213x.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AM53CF96,$(MACHINES)),) @@ -218,7 +218,7 @@ MACHINEOBJS += $(MACHINEOBJ)/am53cf96.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AM9517A,$(MACHINES)),) @@ -226,7 +226,7 @@ MACHINEOBJS += $(MACHINEOBJ)/am9517a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AMIGAFDC,$(MACHINES)),) @@ -234,7 +234,7 @@ MACHINEOBJS += $(MACHINEOBJ)/amigafdc.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AT28C16,$(MACHINES)),) @@ -242,7 +242,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at28c16.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AT29040,$(MACHINES)),) @@ -250,7 +250,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at29040a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AT45DBXX,$(MACHINES)),) @@ -258,7 +258,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at45dbxx.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ATAFLASH,$(MACHINES)),) @@ -268,7 +268,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ataflash.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter AY31015,$(MACHINES)),) @@ -276,7 +276,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ay31015.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter BANKDEV,$(MACHINES)),) @@ -284,7 +284,7 @@ MACHINEOBJS += $(MACHINEOBJ)/bankdev.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CDP1852,$(MACHINES)),) @@ -292,7 +292,7 @@ MACHINEOBJS += $(MACHINEOBJ)/cdp1852.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CDP1871,$(MACHINES)),) @@ -300,7 +300,7 @@ MACHINEOBJS += $(MACHINEOBJ)/cdp1871.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter COM8116,$(MACHINES)),) @@ -308,15 +308,15 @@ MACHINEOBJS += $(MACHINEOBJ)/com8116.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CR589,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/cr589.o +MACHINEOBJS += $(MACHINEOBJ)/cr589.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CTRONICS,$(MACHINES)),) @@ -324,7 +324,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ctronics.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DS1302,$(MACHINES)),) @@ -332,7 +332,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds1302.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DS2401,$(MACHINES)),) @@ -340,7 +340,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds2401.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DS2404,$(MACHINES)),) @@ -348,7 +348,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds2404.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DS75160A,$(MACHINES)),) @@ -356,7 +356,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds75160a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DS75161A,$(MACHINES)),) @@ -364,15 +364,15 @@ MACHINEOBJS += $(MACHINEOBJ)/ds75161a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter E0516,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/e0516.o +MACHINEOBJS += $(MACHINEOBJ)/e0516.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter EEPROMDEV,$(MACHINES)),) @@ -380,7 +380,7 @@ MACHINEOBJS += $(MACHINEOBJ)/eeprom.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ER2055,$(MACHINES)),) @@ -388,7 +388,7 @@ MACHINEOBJS += $(MACHINEOBJ)/er2055.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ER59256,$(MACHINES)),) @@ -396,15 +396,15 @@ MACHINEOBJS += $(MACHINEOBJ)/er59256.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter F3853,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/f3853.o +MACHINEOBJS += $(MACHINEOBJ)/f3853.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I2CMEM,$(MACHINES)),) @@ -412,72 +412,72 @@ MACHINEOBJS += $(MACHINEOBJ)/i2cmem.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8155,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8155.o +MACHINEOBJS += $(MACHINEOBJ)/i8155.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8212,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8212.o +MACHINEOBJS += $(MACHINEOBJ)/i8212.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8214,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8214.o +MACHINEOBJS += $(MACHINEOBJ)/i8214.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8243,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8243.o +MACHINEOBJS += $(MACHINEOBJ)/i8243.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8251,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8251.o +MACHINEOBJS += $(MACHINEOBJ)/i8251.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8279,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8279.o +MACHINEOBJS += $(MACHINEOBJ)/i8279.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8355,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8355.o +MACHINEOBJS += $(MACHINEOBJ)/i8355.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter IDE,$(MACHINES)),) MACHINEOBJS += $(MACHINEOBJ)/idectrl.o -MACHINEOBJS += $(MACHINEOBJ)/idehd.o +MACHINEOBJS += $(MACHINEOBJ)/idehd.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter IM6402,$(MACHINES)),) @@ -485,7 +485,7 @@ MACHINEOBJS += $(MACHINEOBJ)/im6402.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter INS8154,$(MACHINES)),) @@ -493,7 +493,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ins8154.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter INS8250,$(MACHINES)),) @@ -501,7 +501,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ins8250.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter INTELFLASH,$(MACHINES)),) @@ -509,7 +509,7 @@ MACHINEOBJS += $(MACHINEOBJ)/intelfsh.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter JVS,$(MACHINES)),) @@ -518,7 +518,7 @@ MACHINEOBJS += $(MACHINEOBJ)/jvshost.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter K033906,$(MACHINES)),) @@ -526,7 +526,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k033906.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter K053252,$(MACHINES)),) @@ -534,7 +534,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k053252.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter K056230,$(MACHINES)),) @@ -542,7 +542,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k056230.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LATCH8,$(MACHINES)),) @@ -550,7 +550,7 @@ MACHINEOBJS += $(MACHINEOBJ)/latch8.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LC89510,$(MACHINES)),) @@ -558,7 +558,7 @@ MACHINEOBJS += $(MACHINEOBJ)/lc89510.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LDPR8210,$(MACHINES)),) @@ -566,7 +566,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldpr8210.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LDSTUB,$(MACHINES)),) @@ -574,7 +574,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldstub.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LDV1000,$(MACHINES)),) @@ -584,7 +584,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldv1000.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LDVP931,$(MACHINES)),) @@ -592,7 +592,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldvp931.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter LINFLASH,$(MACHINES)),) @@ -600,7 +600,7 @@ MACHINEOBJS += $(MACHINEOBJ)/linflash.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter M6M80011AP,$(MACHINES)),) @@ -608,7 +608,7 @@ MACHINEOBJS += $(MACHINEOBJ)/m6m80011ap.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MATSUCD,$(MACHINES)),) @@ -616,7 +616,7 @@ MACHINEOBJS += $(MACHINEOBJ)/matsucd.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MB14241,$(MACHINES)),) @@ -624,7 +624,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb14241.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MB3773,$(MACHINES)),) @@ -632,7 +632,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb3773.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MB87078,$(MACHINES)),) @@ -640,7 +640,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb87078.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MB89371,$(MACHINES)),) @@ -648,7 +648,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb89371.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC146818,$(MACHINES)),) @@ -656,7 +656,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc146818.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC2661,$(MACHINES)),) @@ -664,7 +664,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc2661.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6843,$(MACHINES)),) @@ -672,7 +672,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6843.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6846,$(MACHINES)),) @@ -680,7 +680,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6846.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6852,$(MACHINES)),) @@ -688,7 +688,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6852.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6854,$(MACHINES)),) @@ -696,7 +696,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6854.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC68901,$(MACHINES)),) @@ -704,7 +704,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc68901.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MCCS1850,$(MACHINES)),) @@ -712,7 +712,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mccs1850.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MCF5206E,$(MACHINES)),) @@ -720,7 +720,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mcf5206e.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MICROTOUCH,$(MACHINES)),) @@ -728,7 +728,7 @@ MACHINEOBJS += $(MACHINEOBJ)/microtch.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MM58274C,$(MACHINES)),) @@ -736,7 +736,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mm58274c.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MM74C922,$(MACHINES)),) @@ -744,7 +744,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mm74c922.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MOS6526,$(MACHINES)),) @@ -752,7 +752,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6526.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MOS6529,$(MACHINES)),) @@ -760,7 +760,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6529.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MIOT6530,$(MACHINES)),) @@ -768,7 +768,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6530.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MOS6551,$(MACHINES)),) @@ -776,7 +776,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6551.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MSM5832,$(MACHINES)),) @@ -784,7 +784,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm5832.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MSM58321,$(MACHINES)),) @@ -792,7 +792,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm58321.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MSM6242,$(MACHINES)),) @@ -800,7 +800,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm6242.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter NCR539x,$(MACHINES)),) @@ -809,7 +809,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ncr539x.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter NMC9306,$(MACHINES)),) @@ -817,7 +817,7 @@ MACHINEOBJS += $(MACHINEOBJ)/nmc9306.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter NSCSI,$(MACHINES)),) @@ -827,7 +827,7 @@ MACHINEOBJS += $(MACHINEOBJ)/nscsi_hd.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PCF8593,$(MACHINES)),) @@ -835,15 +835,15 @@ MACHINEOBJS += $(MACHINEOBJ)/pcf8593.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PCI,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/pci.o +MACHINEOBJS += $(MACHINEOBJ)/pci.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PCKEYBRD,$(MACHINES)),) @@ -851,7 +851,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pckeybrd.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PD4990A_OLD,$(MACHINES)),) @@ -859,7 +859,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pd4990a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PIC8259,$(MACHINES)),) @@ -867,7 +867,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pic8259.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PIT8253,$(MACHINES)),) @@ -875,15 +875,15 @@ MACHINEOBJS += $(MACHINEOBJ)/pit8253.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PLA,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/pla.o +MACHINEOBJS += $(MACHINEOBJ)/pla.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RF5C296,$(MACHINES)),) @@ -892,7 +892,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rf5c296.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter ROC10937,$(MACHINES)),) @@ -900,7 +900,7 @@ MACHINEOBJS += $(MACHINEOBJ)/roc10937.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RP5C01,$(MACHINES)),) @@ -908,7 +908,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5c01.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RP5C15,$(MACHINES)),) @@ -916,7 +916,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5c15.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RP5H01,$(MACHINES)),) @@ -924,7 +924,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5h01.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RTC4543,$(MACHINES)),) @@ -932,7 +932,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc4543.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RTC65271,$(MACHINES)),) @@ -940,7 +940,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc65271.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RTC9701,$(MACHINES)),) @@ -948,7 +948,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc9701.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter S3520CF,$(MACHINES)),) @@ -956,7 +956,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3520cf.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter S3C2400,$(MACHINES)),) @@ -964,7 +964,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2400.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter S3C2410,$(MACHINES)),) @@ -972,7 +972,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2410.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter S3C2440,$(MACHINES)),) @@ -980,7 +980,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2440.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SATURN,$(MACHINES)),) @@ -988,7 +988,7 @@ MACHINEOBJS += $(MACHINEOBJ)/saturn.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SCSI,$(MACHINES)),) @@ -1001,7 +1001,7 @@ MACHINEOBJS += $(MACHINEOBJ)/scsihle.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SCUDSP,$(MACHINES)),) @@ -1009,7 +1009,7 @@ MACHINEOBJS += $(MACHINEOBJ)/scudsp.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SEIBU_COP,$(MACHINES)),) @@ -1017,7 +1017,7 @@ MACHINEOBJS += $(MACHINEOBJ)/seibu_cop.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SERFLASH,$(MACHINES)),) @@ -1025,7 +1025,7 @@ MACHINEOBJS += $(MACHINEOBJ)/serflash.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SMC91C9X,$(MACHINES)),) @@ -1033,23 +1033,23 @@ MACHINEOBJS += $(MACHINEOBJ)/smc91c9x.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SMPC,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/smpc.o +MACHINEOBJS += $(MACHINEOBJ)/smpc.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter STVCD,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/stvcd.o +MACHINEOBJS += $(MACHINEOBJ)/stvcd.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TC0091LVC,$(MACHINES)),) @@ -1057,7 +1057,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tc009xlvc.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TIMEKPR,$(MACHINES)),) @@ -1065,7 +1065,7 @@ MACHINEOBJS += $(MACHINEOBJ)/timekpr.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMP68301,$(MACHINES)),) @@ -1073,7 +1073,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tmp68301.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS6100,$(MACHINES)),) @@ -1081,7 +1081,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms6100.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS9901,$(MACHINES)),) @@ -1089,7 +1089,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms9901.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS9902,$(MACHINES)),) @@ -1097,7 +1097,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms9902.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD1990A,$(MACHINES)),) @@ -1105,7 +1105,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd1990a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD4701,$(MACHINES)),) @@ -1113,7 +1113,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd4701.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD7002,$(MACHINES)),) @@ -1121,7 +1121,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd7002.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD765,$(MACHINES)),) @@ -1129,15 +1129,15 @@ MACHINEOBJS += $(MACHINEOBJ)/upd765.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter V3021,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/v3021.o +MACHINEOBJS += $(MACHINEOBJ)/v3021.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter WD_FDC,$(MACHINES)),) @@ -1146,7 +1146,7 @@ MACHINEOBJS += $(MACHINEOBJ)/fdc_pll.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter WD11C00_17,$(MACHINES)),) @@ -1154,7 +1154,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd11c00_17.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter WD17XX,$(MACHINES)),) @@ -1162,7 +1162,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd17xx.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter WD2010,$(MACHINES)),) @@ -1170,7 +1170,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd2010.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter WD33C93,$(MACHINES)),) @@ -1179,15 +1179,15 @@ MACHINEOBJS += $(MACHINEOBJ)/wd33c93.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter X2212,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/x2212.o +MACHINEOBJS += $(MACHINEOBJ)/x2212.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter X76F041,$(MACHINES)),) @@ -1196,7 +1196,7 @@ MACHINEOBJS += $(MACHINEOBJ)/x76f041.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter X76F100,$(MACHINES)),) @@ -1205,7 +1205,7 @@ MACHINEOBJS += $(MACHINEOBJ)/x76f100.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80CTC,$(MACHINES)),) @@ -1213,7 +1213,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80ctc.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80DART,$(MACHINES)),) @@ -1221,7 +1221,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80dart.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80DMA,$(MACHINES)),) @@ -1229,7 +1229,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80dma.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80PIO,$(MACHINES)),) @@ -1237,7 +1237,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80pio.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80SIO,$(MACHINES)),) @@ -1245,7 +1245,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80sio.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z80STI,$(MACHINES)),) @@ -1253,15 +1253,15 @@ MACHINEOBJS += $(MACHINEOBJ)/z80sti.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter Z8536,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/z8536.o +MACHINEOBJS += $(MACHINEOBJ)/z8536.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SECFLASH,$(MACHINES)),) @@ -1269,7 +1269,7 @@ MACHINEOBJS += $(MACHINEOBJ)/secflash.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PCCARD,$(MACHINES)),) @@ -1277,11 +1277,11 @@ MACHINEOBJS += $(MACHINEOBJ)/pccard.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8255,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/i8255.o +MACHINEOBJS += $(MACHINEOBJ)/i8255.o endif $(MACHINEOBJ)/s3c2400.o: $(MACHINESRC)/s3c24xx.c diff --git a/src/emu/machine/mb14241.h b/src/emu/machine/mb14241.h index 7b876c0252e..43afabfe2bb 100644 --- a/src/emu/machine/mb14241.h +++ b/src/emu/machine/mb14241.h @@ -12,7 +12,7 @@ class mb14241_device : public device_t { public: mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + DECLARE_WRITE8_MEMBER ( shift_count_w ); DECLARE_WRITE8_MEMBER ( shift_data_w ); DECLARE_READ8_MEMBER( shift_result_r ); @@ -25,7 +25,7 @@ protected: private: // internal state - + UINT16 m_shift_data; /* 15 bits only */ UINT8 m_shift_count; /* 3 bits */ }; diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c index 1b920973179..d0b6558c55c 100644 --- a/src/emu/machine/mc68901.c +++ b/src/emu/machine/mc68901.c @@ -1232,7 +1232,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data) if (data & UCR_PARITY_EVEN) { if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag()); - + parity_code = SERIAL_PARITY_EVEN; } else diff --git a/src/emu/machine/mm58274c.c b/src/emu/machine/mm58274c.c index 0bbefe91095..56e94eecad1 100644 --- a/src/emu/machine/mm58274c.c +++ b/src/emu/machine/mm58274c.c @@ -99,7 +99,7 @@ void mm58274c_device::device_start() save_item(NAME(m_minutes2)); save_item(NAME(m_seconds1)); save_item(NAME(m_seconds2)); - save_item(NAME(m_tenths)); + save_item(NAME(m_tenths)); } //------------------------------------------------- @@ -109,14 +109,14 @@ void mm58274c_device::device_start() void mm58274c_device::device_reset() { system_time systime; - + /* get the current date/time from the core */ machine().current_datetime(systime); - + m_clk_set = systime.local_time.year & 3 << 2; if (m_mode24) m_clk_set |= clk_set_24; - + /* The clock count starts on 1st January 1900 */ m_wday = 1 + ((systime.local_time.weekday - m_day1) % 7); m_years1 = (systime.local_time.year / 10) % 10; @@ -175,75 +175,75 @@ READ8_MEMBER( mm58274c_device::read ) reply = m_status; m_status = 0; break; - + case 0x01: /* Tenths of Seconds */ reply = m_tenths; break; - + case 0x02: /* Units Seconds */ reply = m_seconds2; break; - + case 0x03: /* Tens Seconds */ reply = m_seconds1; break; - + case 0x04: /* Units Minutes */ reply = m_minutes2; break; - + case 0x05: /* Tens Minutes */ reply = m_minutes1; break; - + case 0x06: /* Units Hours */ reply = m_hours2; break; - + case 0x07: /* Tens Hours */ reply = m_hours1; break; - + case 0x08: /* Units Days */ reply = m_days2; break; - + case 0x09: /* Tens Days */ reply = m_days1; break; - + case 0x0a: /* Units Months */ reply = m_months2; break; - + case 0x0b: /* Tens Months */ reply = m_months1; break; - + case 0x0c: /* Units Years */ reply = m_years2; break; - + case 0x0d: /* Tens Years */ reply = m_years1; break; - + case 0x0e: /* Day of Week */ reply = m_wday; break; - + case 0x0f: /* Clock Setting & Interrupt Registers */ - if (m_control & ctl_intsel) /* interrupt register */ + if (m_control & ctl_intsel) /* interrupt register */ reply = m_int_ctl; - else /* clock setting register */ + else /* clock setting register */ { - if (m_clk_set & clk_set_24) /* 24-hour mode */ + if (m_clk_set & clk_set_24) /* 24-hour mode */ reply = m_clk_set & ~clk_set_pm; - else /* 12-hour mode */ + else /* 12-hour mode */ reply = m_clk_set; } break; - + default: reply = 0; break; @@ -261,90 +261,90 @@ WRITE8_MEMBER( mm58274c_device::write ) switch (offset) { case 0x00: /* Control Register (test mode and interrupt not emulated) */ - if ((!(m_control & ctl_intstop)) && (data & ctl_intstop)) /* interrupt stop */ + if ((!(m_control & ctl_intstop)) && (data & ctl_intstop)) /* interrupt stop */ m_interrupt_timer->enable(0); - else if ((m_control & ctl_intstop) && (!(data & ctl_intstop))) /* interrupt run */ + else if ((m_control & ctl_intstop) && (!(data & ctl_intstop))) /* interrupt run */ { attotime period = interrupt_period_table(m_int_ctl & int_ctl_dly); - + m_interrupt_timer->adjust(period, 0, m_int_ctl & int_ctl_rpt ? period : attotime::zero); } - if (data & ctl_clkstop) /* stopping the clock clears the tenth counter */ + if (data & ctl_clkstop) /* stopping the clock clears the tenth counter */ m_tenths = 0; m_control = data; break; - + case 0x01: /* Tenths of Seconds: cannot be written */ break; - + case 0x02: /* Units Seconds */ m_seconds2 = data; break; - + case 0x03: /* Tens Seconds */ m_seconds1 = data; break; - + case 0x04: /* Units Minutes */ m_minutes2 = data; break; - + case 0x05: /* Tens Minutes */ m_minutes1 = data; break; - + case 0x06: /* Units Hours */ m_hours2 = data; break; - + case 0x07: /* Tens Hours */ m_hours1 = data; break; - + case 0x08: /* Units Days */ m_days2 = data; break; - + case 0x09: /* Tens Days */ m_days1 = data; break; - + case 0x0a: /* Units Months */ m_months2 = data; break; - + case 0x0b: /* Tens Months */ m_months1 = data; break; - + case 0x0c: /* Units Years */ m_years2 = data; break; - + case 0x0d: /* Tens Years */ m_years1 = data; break; - + case 0x0e: /* Day of Week */ m_wday = data; break; - + case 0x0f: /* Clock Setting & Interrupt Registers */ - if (m_control & ctl_intsel) /* interrupt register (not emulated) */ + if (m_control & ctl_intsel) /* interrupt register (not emulated) */ { m_int_ctl = data; - if (!(m_control & ctl_intstop)) /* interrupt run */ + if (!(m_control & ctl_intstop)) /* interrupt run */ { attotime period = interrupt_period_table(m_int_ctl & int_ctl_dly); - + m_interrupt_timer->adjust(period, 0, m_int_ctl & int_ctl_rpt ? period : attotime::zero); } } - else /* clock setting register */ + else /* clock setting register */ { m_clk_set = data; #if 0 - if (m_clk_set & clk_set_24) /* 24-hour mode */ + if (m_clk_set & clk_set_24) /* 24-hour mode */ m_clk_set &= ~clk_set_pm; #endif } @@ -482,4 +482,3 @@ TIMER_CALLBACK_MEMBER(mm58274c_device::rtc_increment_cb) } } } - diff --git a/src/emu/machine/mm58274c.h b/src/emu/machine/mm58274c.h index 02d24c4b726..8f1a28b619f 100644 --- a/src/emu/machine/mm58274c.h +++ b/src/emu/machine/mm58274c.h @@ -26,7 +26,7 @@ class mm58274c_device : public device_t, public: mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mm58274c_device() {} - + DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -42,14 +42,14 @@ protected: private: // internal state attotime interrupt_period_table(int val); - + int m_status; /* status register (*read* from address 0 = control register) */ int m_control; /* control register (*write* to address 0) */ - + int m_clk_set; /* clock setting register */ int m_int_ctl; /* interrupt control register */ - - + + int m_wday; /* day of the week (1-7 (1=day1 as set in init)) */ int m_years1; /* years (BCD: 0-99) */ int m_years2; @@ -64,7 +64,7 @@ private: int m_seconds1; /* seconds (BCD : 0-59) */ int m_seconds2; int m_tenths; /* tenths of second (BCD : 0-9) */ - + emu_timer *m_increment_rtc; emu_timer *m_interrupt_timer; }; diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index ac47cddf7a7..5c5dd6cb006 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -75,24 +75,24 @@ void pit8253_device::device_config_complete() // device_start - device-specific startup //------------------------------------------------- -void pit8253_device::common_start( int device_type ) +void pit8253_device::common_start( int device_type ) { m_device_type = device_type; - + /* register for state saving */ for (int timerno = 0; timerno < PIT8253_MAX_TIMER; timerno++) { pit8253_timer *timer = get_timer(timerno); - + /* initialize timer */ timer->clockin = m_intf_timer[timerno].clockin; timer->updatetimer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pit8253_device::update_timer_cb),this)); timer->updatetimer->adjust(attotime::never, timerno); - + /* resolve callbacks */ timer->in_gate_func.resolve(m_intf_timer[timerno].in_gate_func, *this); timer->out_out_func.resolve(m_intf_timer[timerno].out_out_func, *this); - + /* set up state save values */ save_item(NAME(timer->clockin), timerno); save_item(NAME(timer->control), timerno); @@ -144,20 +144,20 @@ void pit8253_device::device_reset() timer->rmsb = timer->wmsb = 0; timer->count = timer->value = timer->latch = 0; timer->lowcount = 0; - + if (!timer->in_gate_func.isnull()) timer->gate = timer->in_gate_func(); else timer->gate = 1; - + timer->output = 2; /* output is undetermined */ timer->latched_count = 0; timer->latched_status = 0; timer->null_count = 1; timer->cycles_to_output = CYCLES_NEVER; - + timer->last_updated = machine().time(); - + update(timer); } } @@ -311,7 +311,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) LOG2(("pit8253: simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x\n", (int)elapsed_cycles, timer->index, mode, bcd, timer->phase, pit8253_gate(timer), timer->output, timer->value)); - switch (mode) + switch (mode) { case 0: /* Mode 0: (Interrupt on Terminal Count) @@ -342,7 +342,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) if (elapsed_cycles >= 0 && timer->phase == 1) { /* Counter load cycle */ - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { --elapsed_cycles; timer->phase = 2; @@ -406,7 +406,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) if (elapsed_cycles >= 0 && timer->phase == 1) { /* Counter load cycle, output goes low */ - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { --elapsed_cycles; timer->phase = 2; @@ -472,7 +472,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) { if (elapsed_cycles >= 0 && timer->phase == 1) { - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { --elapsed_cycles; timer->phase = 2; @@ -552,7 +552,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) { if (elapsed_cycles >= 0 && timer->phase == 1) { - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { --elapsed_cycles; timer->phase = 2; @@ -560,7 +560,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) load_counter_value(timer); } - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { adjusted_value = adjusted_count(bcd, timer->value); @@ -635,7 +635,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles) { if (elapsed_cycles >= 0 && timer->phase == 1) { - if (elapsed_cycles > 0) + if (elapsed_cycles > 0) { --elapsed_cycles; timer->phase = 2; @@ -799,12 +799,12 @@ READ8_MEMBER( pit8253_device::read ) timer->rmsb = 1 - timer->rmsb; --timer->latched_count; } - else + else { value = masked_value(timer); /* Read back current count */ - switch(CTRL_ACCESS(timer->control)) + switch(CTRL_ACCESS(timer->control)) { case 0: default: @@ -892,7 +892,7 @@ void pit8253_device::readback(pit8253_timer *timer, int command) if (timer->latched_count == 0) { value = masked_value(timer); - switch(CTRL_ACCESS(timer->control)) + switch(CTRL_ACCESS(timer->control)) { case 0: /* This should never happen */ @@ -928,7 +928,7 @@ WRITE8_MEMBER( pit8253_device::write ) LOG2(("pit8253: write(): offset=%d data=0x%02x\n", offset, data)); - if (timer == NULL) + if (timer == NULL) { /* Write to mode control register */ timer = get_timer((data >> 6) & 3); @@ -982,7 +982,7 @@ WRITE8_MEMBER( pit8253_device::write ) if (machine().time() > timer->last_updated && timer->clockin != 0) middle_of_a_cycle = 1; - switch(CTRL_ACCESS(timer->control)) + switch(CTRL_ACCESS(timer->control)) { case 0: /* This should never happen */ @@ -1124,4 +1124,3 @@ void pit8253_device::set_clock_signal(int timerno, int state) WRITE_LINE_MEMBER( pit8253_device::clk0_w ) { set_clock_signal(0, state); } WRITE_LINE_MEMBER( pit8253_device::clk1_w ) { set_clock_signal(1, state); } WRITE_LINE_MEMBER( pit8253_device::clk2_w ) { set_clock_signal(2, state); } - diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h index 68aa25ad113..e8ef8bc2b9e 100644 --- a/src/emu/machine/pit8253.h +++ b/src/emu/machine/pit8253.h @@ -29,7 +29,7 @@ /* device types */ -enum +enum { TYPE_PIT8253 = 0, TYPE_PIT8254 @@ -52,14 +52,14 @@ struct pit8253_timer int index; /* index number of the timer */ double clockin; /* input clock frequency in Hz */ int clock; /* clock signal when clockin is 0 */ - + devcb_resolved_read_line in_gate_func; /* callback for gate input */ devcb_resolved_write_line out_out_func; /* callback function for when output changes */ - + attotime last_updated; /* time when last updated */ - + emu_timer *updatetimer; /* MAME timer to process updates */ - + UINT16 value; /* current counter value ("CE" in Intel docs) */ UINT16 latch; /* latched counter value ("OL" in Intel docs) */ UINT16 count; /* new counter value ("CR" in Intel docs) */ @@ -69,13 +69,13 @@ struct pit8253_timer INT32 rmsb; /* 1 = Next read is MSB of 16-bit value */ INT32 wmsb; /* 1 = Next write is MSB of 16-bit value */ INT32 output; /* 0 = low, 1 = high */ - + INT32 gate; /* gate input (0 = low, 1 = high) */ INT32 latched_count; /* number of bytes of count latched */ INT32 latched_status; /* 1 = status latched (8254 only) */ INT32 null_count; /* 1 = mode control or count written, 0 = count loaded */ INT32 phase; /* see phase definition tables in simulate2(), below */ - + UINT32 cycles_to_output; /* cycles until output callback called */ }; @@ -90,20 +90,20 @@ public: DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); - + WRITE_LINE_MEMBER(clk0_w); WRITE_LINE_MEMBER(clk1_w); WRITE_LINE_MEMBER(clk2_w); - + WRITE_LINE_MEMBER(gate0_w); WRITE_LINE_MEMBER(gate1_w); WRITE_LINE_MEMBER(gate2_w); - - + + /* In the 8253/8254 the CLKx input lines can be attached to a regular clock signal. Another option is to use the output from one timer as the input clock to another timer. - + The functions below should supply both functionalities. If the signal is a regular clock signal, use the pit8253_set_clockin function. If the CLKx input signal is the output of the different source, set the new_clockin @@ -113,14 +113,14 @@ public: int get_output(int timer); void set_clockin(int timer, double new_clockin); - + protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); - + // internal state void common_start(int device_type); pit8253_timer *get_timer(int which); @@ -138,7 +138,7 @@ protected: void set_clock_signal(int timerno, int state); TIMER_CALLBACK_MEMBER(update_timer_cb); - + int m_device_type; pit8253_timer m_timers[PIT8253_MAX_TIMER]; diff --git a/src/emu/machine/rf5c296.c b/src/emu/machine/rf5c296.c index 6e303c1812a..3b530a97669 100644 --- a/src/emu/machine/rf5c296.c +++ b/src/emu/machine/rf5c296.c @@ -89,7 +89,7 @@ READ16_MEMBER(rf5c296_device::io_r) case 0x3e1: data = reg_r(m_rf5c296_reg); break; - + default: data = m_pccard->read_memory(space, offset, mem_mask); break; diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index 631a9e805db..b368b005be0 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -3,8 +3,8 @@ RP5H01 TODO: - - follow the datasheet better (all dumps presumably needs to be redone - from scratch?) + - follow the datasheet better (all dumps presumably needs to be redone + from scratch?) ***************************************************************************/ @@ -187,5 +187,3 @@ READ8_MEMBER( rp5h01_device::data_r ) /* return the data */ return (m_data[byte] >> bit) & 1; } - - diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h index 9aaa31c4f12..3800b8e311f 100644 --- a/src/emu/machine/rp5h01.h +++ b/src/emu/machine/rp5h01.h @@ -27,7 +27,7 @@ class rp5h01_device : public device_t { public: rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + DECLARE_WRITE8_MEMBER( enable_w ); /* /CE */ DECLARE_WRITE8_MEMBER( reset_w ); /* RESET */ DECLARE_WRITE8_MEMBER( cs_w ); /* CS */ diff --git a/src/emu/machine/serflash.c b/src/emu/machine/serflash.c index 9de0d2d8de7..5653e58f4f0 100644 --- a/src/emu/machine/serflash.c +++ b/src/emu/machine/serflash.c @@ -46,7 +46,7 @@ void serflash_device::device_reset() { m_flash_enab = 0; flash_hard_reset(machine()); - + m_last_flash_cmd = 0x00; m_flash_addr_seq = 0; m_flash_addr = 0; @@ -61,7 +61,6 @@ void serflash_device::device_reset() void serflash_device::nvram_default() { - } @@ -98,7 +97,6 @@ void serflash_device::nvram_read(emu_file &file) void serflash_device::nvram_write(emu_file &file) { - if (m_length % FLASH_PAGE_SIZE) return; // region size must be multiple of flash page size int size = m_length /= FLASH_PAGE_SIZE; @@ -167,7 +165,7 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w ) switch (data) { - case 0x00: // READ + case 0x00: // READ m_flash_addr_seq = 0; break; @@ -175,21 +173,21 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w ) m_flash_addr_seq = 0; break; - case 0x70: // READ STATUS + case 0x70: // READ STATUS flash_change_state( space.machine(), STATE_READ_STATUS ); break; - case 0x80: // PAGE / CACHE PROGRAM + case 0x80: // PAGE / CACHE PROGRAM m_flash_addr_seq = 0; // this actually seems to be set with the next 2 writes? m_flash_page_addr = 0; break; - case 0x90: // READ ID + case 0x90: // READ ID flash_change_state( space.machine(), STATE_READ_ID ); break; - case 0xff: // RESET + case 0xff: // RESET flash_change_state( space.machine(), STATE_IDLE ); break; @@ -203,11 +201,9 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w ) { switch (m_flash_cmd_prev) { - case 0x00: // READ + case 0x00: // READ if (data == 0x30) { - - memcpy(m_flash_page_data, m_region + m_flash_row * FLASH_PAGE_SIZE, FLASH_PAGE_SIZE); m_flash_page_addr = m_flash_col; m_flash_page_index = m_flash_row; @@ -306,16 +302,16 @@ READ8_MEMBER( serflash_device::flash_io_r ) switch( m_flash_read_seq++ ) { case 0: - data = 0xEC; // Manufacturer + data = 0xEC; // Manufacturer break; case 1: - data = 0xF1; // Device + data = 0xF1; // Device break; case 2: - data = 0x00; // XX + data = 0x00; // XX break; case 3: - data = 0x15; // Flags + data = 0x15; // Flags m_flash_read_seq = 0; break; } @@ -342,7 +338,7 @@ READ8_MEMBER( serflash_device::flash_io_r ) default: { - // logerror("%08x FLASH: unknown read in state %s\n",0x00/*m_maincpu->pc()*/, m_flash_state_name[m_flash_state]); + // logerror("%08x FLASH: unknown read in state %s\n",0x00/*m_maincpu->pc()*/, m_flash_state_name[m_flash_state]); } } @@ -412,4 +408,3 @@ WRITE8_MEMBER(serflash_device::n3d_flash_addr_w) logerror("set flash block to %08x\n", m_flash_addr); } } - diff --git a/src/emu/machine/serflash.h b/src/emu/machine/serflash.h index 13fbb02a26e..e4045a78582 100644 --- a/src/emu/machine/serflash.h +++ b/src/emu/machine/serflash.h @@ -6,7 +6,7 @@ #define __SERFLASH_H__ -#define FLASH_PAGE_SIZE (2048+64) +#define FLASH_PAGE_SIZE (2048+64) @@ -18,16 +18,15 @@ //************************************************************************** #define MCFG_SERFLASH_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SERFLASH, 0) \ - + MCFG_DEVICE_ADD(_tag, SERFLASH, 0) //************************************************************************** // TYPE DEFINITIONS //************************************************************************** class serflash_device; -typedef enum { STATE_IDLE = 0, STATE_READ, STATE_READ_ID, STATE_READ_STATUS, STATE_BLOCK_ERASE, STATE_PAGE_PROGRAM } flash_state_t; -//const char *m_flash_state_name[] = { "IDLE", "READ", "READ_ID", "READ_STATUS", "BLOCK ERASE", "PAGE PROGRAM" }; +typedef enum { STATE_IDLE = 0, STATE_READ, STATE_READ_ID, STATE_READ_STATUS, STATE_BLOCK_ERASE, STATE_PAGE_PROGRAM } flash_state_t; +//const char *m_flash_state_name[] = { "IDLE", "READ", "READ_ID", "READ_STATUS", "BLOCK ERASE", "PAGE PROGRAM" }; // custom initialization for default state typedef device_delegate<void (serflash_device &, void *, size_t)> serflash_init_delegate; @@ -105,4 +104,3 @@ extern const device_type SERFLASH; #endif - diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c index 1d64aa73717..9fd5bf7c77e 100644 --- a/src/emu/machine/tms6100.c +++ b/src/emu/machine/tms6100.c @@ -85,14 +85,14 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d : device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock) { } - + const device_type M58819 = &device_creator<m58819_device>; m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms6100_device(mconfig, M58819, "M58819", tag, owner, clock) { } - + //------------------------------------------------- // device_config_complete - perform any // operations now that the configuration is @@ -231,5 +231,3 @@ READ_LINE_MEMBER(tms6100_device::tms6100_data_r) { return m_data; } - - diff --git a/src/emu/machine/tms6100.h b/src/emu/machine/tms6100.h index a6a13da2340..edfb348c6b1 100644 --- a/src/emu/machine/tms6100.h +++ b/src/emu/machine/tms6100.h @@ -10,7 +10,7 @@ class tms6100_device : public device_t public: tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); - + DECLARE_WRITE_LINE_MEMBER( tms6100_m0_w ); DECLARE_WRITE_LINE_MEMBER( tms6100_m1_w ); DECLARE_WRITE_LINE_MEMBER( tms6100_romclock_w ); @@ -34,8 +34,8 @@ private: UINT8 m_tms_clock; UINT8 m_data; UINT8 m_state; - - const UINT8 *m_rom; + + const UINT8 *m_rom; }; diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c index 066a65922aa..1b032422f57 100644 --- a/src/emu/machine/z80dart.c +++ b/src/emu/machine/z80dart.c @@ -20,8 +20,8 @@ TODO: - - devcb2 - - i8274 DMA scheme + - devcb2 + - i8274 DMA scheme - break detection - wr0 reset tx interrupt pending - wait/ready @@ -494,7 +494,7 @@ z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *tag, { m_rx_data_fifo[i] = 0; m_rx_error_fifo[i] = 0; - } + } } @@ -929,7 +929,7 @@ void z80dart_channel::control_write(UINT8 data) LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd")); LOG(("Z80DART \"%s\" Channel %c : Stop Bits %f\n", m_owner->tag(), 'A' + m_index, get_stop_bits())); LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode())); - + update_serial(); break; @@ -1279,7 +1279,7 @@ void z80dart_channel::update_serial() { if (m_wr[1] & WR4_PARITY_EVEN) parity_code = SERIAL_PARITY_EVEN; - else + else parity_code = SERIAL_PARITY_ODD; } diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h index 63dc7665795..820f78ac2b3 100644 --- a/src/emu/machine/z80dart.h +++ b/src/emu/machine/z80dart.h @@ -360,18 +360,18 @@ protected: enum { - WR2_DATA_XFER_INT = 0x00, // not supported - WR2_DATA_XFER_DMA_INT = 0x01, // not supported - WR2_DATA_XFER_DMA = 0x02, // not supported - WR2_DATA_XFER_ILLEGAL = 0x03, // not supported - WR2_DATA_XFER_MASK = 0x03, // not supported - WR2_PRIORITY = 0x04, // not supported - WR2_MODE_8085_1 = 0x00, // not supported - WR2_MODE_8085_2 = 0x08, // not supported - WR2_MODE_8086_8088 = 0x10, // not supported - WR2_MODE_ILLEGAL = 0x18, // not supported - WR2_MODE_MASK = 0x18, // not supported - WR2_VECTORED_INT = 0x20, // not supported + WR2_DATA_XFER_INT = 0x00, // not supported + WR2_DATA_XFER_DMA_INT = 0x01, // not supported + WR2_DATA_XFER_DMA = 0x02, // not supported + WR2_DATA_XFER_ILLEGAL = 0x03, // not supported + WR2_DATA_XFER_MASK = 0x03, // not supported + WR2_PRIORITY = 0x04, // not supported + WR2_MODE_8085_1 = 0x00, // not supported + WR2_MODE_8085_2 = 0x08, // not supported + WR2_MODE_8086_8088 = 0x10, // not supported + WR2_MODE_ILLEGAL = 0x18, // not supported + WR2_MODE_MASK = 0x18, // not supported + WR2_VECTORED_INT = 0x20, // not supported WR2_PIN10_SYNDETB_RTSB = 0x80 // not supported }; diff --git a/src/emu/memory.h b/src/emu/memory.h index 3fa84a7eaa6..20142a02d6e 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -937,23 +937,23 @@ private: // device delegate macros -#define READ8_DELEGATE(_class, _member) read8_delegate(FUNC(_class::_member), this) -#define WRITE8_DELEGATE(_class, _member) write8_delegate(FUNC(_class::_member), this) -#define READ16_DELEGATE(_class, _member) read16_delegate(FUNC(_class::_member), this) -#define WRITE16_DELEGATE(_class, _member) write16_delegate(FUNC(_class::_member), this) -#define READ32_DELEGATE(_class, _member) read32_delegate(FUNC(_class::_member), this) -#define WRITE32_DELEGATE(_class, _member) write32_delegate(FUNC(_class::_member), this) -#define READ64_DELEGATE(_class, _member) read64_delegate(FUNC(_class::_member), this) -#define WRITE64_DELEGATE(_class, _member) write64_delegate(FUNC(_class::_member), this) - -#define READ8_DEVICE_DELEGATE(_device, _class, _member) read8_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE8_DEVICE_DELEGATE(_device, _class, _member) write8_delegate(FUNC(_class::_member), (_class *)_device) -#define READ16_DEVICE_DELEGATE(_device, _class, _member) read16_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE16_DEVICE_DELEGATE(_device, _class, _member) write16_delegate(FUNC(_class::_member), (_class *)_device) -#define READ32_DEVICE_DELEGATE(_device, _class, _member) read32_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE32_DEVICE_DELEGATE(_device, _class, _member) write32_delegate(FUNC(_class::_member), (_class *)_device) -#define READ64_DEVICE_DELEGATE(_device, _class, _member) read64_delegate(FUNC(_class::_member), (_class *)_device) -#define WRITE64_DEVICE_DELEGATE(_device, _class, _member) write64_delegate(FUNC(_class::_member), (_class *)_device) +#define READ8_DELEGATE(_class, _member) read8_delegate(FUNC(_class::_member), this) +#define WRITE8_DELEGATE(_class, _member) write8_delegate(FUNC(_class::_member), this) +#define READ16_DELEGATE(_class, _member) read16_delegate(FUNC(_class::_member), this) +#define WRITE16_DELEGATE(_class, _member) write16_delegate(FUNC(_class::_member), this) +#define READ32_DELEGATE(_class, _member) read32_delegate(FUNC(_class::_member), this) +#define WRITE32_DELEGATE(_class, _member) write32_delegate(FUNC(_class::_member), this) +#define READ64_DELEGATE(_class, _member) read64_delegate(FUNC(_class::_member), this) +#define WRITE64_DELEGATE(_class, _member) write64_delegate(FUNC(_class::_member), this) + +#define READ8_DEVICE_DELEGATE(_device, _class, _member) read8_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE8_DEVICE_DELEGATE(_device, _class, _member) write8_delegate(FUNC(_class::_member), (_class *)_device) +#define READ16_DEVICE_DELEGATE(_device, _class, _member) read16_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE16_DEVICE_DELEGATE(_device, _class, _member) write16_delegate(FUNC(_class::_member), (_class *)_device) +#define READ32_DEVICE_DELEGATE(_device, _class, _member) read32_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE32_DEVICE_DELEGATE(_device, _class, _member) write32_delegate(FUNC(_class::_member), (_class *)_device) +#define READ64_DEVICE_DELEGATE(_device, _class, _member) read64_delegate(FUNC(_class::_member), (_class *)_device) +#define WRITE64_DEVICE_DELEGATE(_device, _class, _member) write64_delegate(FUNC(_class::_member), (_class *)_device) // helper macro for merging data with the memory mask diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 46868fe2726..ce8a60b7a0a 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -85,14 +85,14 @@ void msm5205_device::device_config_complete() const msm5205_interface *intf = reinterpret_cast<const msm5205_interface *>(static_config()); if (intf != NULL) *static_cast<msm5205_interface *>(this) = *intf; - + // or initialize to defaults if none provided else { memset(&m_vclk_cb, 0, sizeof(m_vclk_cb)); m_select = 0; } - + } //------------------------------------------------- @@ -103,14 +103,14 @@ void msm5205_device::device_start() { m_mod_clock = clock(); m_vclk_callback.resolve(m_vclk_cb, *this); - + /* compute the difference tables */ compute_tables(); - + /* stream system initialize */ m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this); m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(msm5205_device::vclk_callback), this)); - + /* register for save states */ save_item(NAME(m_mod_clock)); save_item(NAME(m_data)); @@ -127,14 +127,14 @@ void msm5205_device::device_start() //------------------------------------------------- void msm5205_device::device_reset() -{ +{ /* initialize work */ m_data = 0; m_vclk = 0; m_reset = 0; m_signal = 0; m_step = 0; - + /* timer and bitwidth set */ playmode_w(m_select); } @@ -189,7 +189,7 @@ TIMER_CALLBACK_MEMBER( msm5205_device::vclk_callback ) int new_signal; /* callback user handler and latch next data */ - if (!m_vclk_callback.isnull()) + if (!m_vclk_callback.isnull()) m_vclk_callback(1); /* reset check at last hiedge of VCLK */ @@ -237,7 +237,7 @@ void msm5205_device::vclk_w(int vclk) if (m_vclk != vclk) { m_vclk = vclk; - if (!vclk) + if (!vclk) vclk_callback(this, 0); } } @@ -325,7 +325,7 @@ void msm5205_device::change_clock_w(INT32 clock) void msm5205_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { stream_sample_t *buffer = outputs[0]; - + /* if this voice is active */ if(m_signal) { diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c index 739f570fe72..7fc7a95e705 100644 --- a/src/emu/sound/sp0256.c +++ b/src/emu/sound/sp0256.c @@ -27,7 +27,7 @@ the sp0256_start() call. If the memory map contents is modified during execution (accross of ROM - bank switching) the bitrevbuff() call must be called after the section + bank switching) the bitrevbuff() call must be called after the section of ROM is modified. */ @@ -112,14 +112,14 @@ void sp0256_device::device_config_complete() const sp0256_interface *intf = reinterpret_cast<const sp0256_interface *>(static_config()); if (intf != NULL) *static_cast<sp0256_interface *>(this) = *intf; - + // or initialize to defaults if none provided else { memset(&m_lrq_cb, 0, sizeof(m_lrq_cb)); memset(&m_sby_cb, 0, sizeof(m_sby_cb)); } - + } //------------------------------------------------- @@ -132,14 +132,14 @@ void sp0256_device::device_start() m_sby.resolve(m_sby_cb, *this); m_drq(1); m_sby(1); - + m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER, this); - + /* -------------------------------------------------------------------- */ /* Configure our internal variables. */ /* -------------------------------------------------------------------- */ m_filt.rng = 1; - + /* -------------------------------------------------------------------- */ /* Allocate a scratch buffer for generating ~10kHz samples. */ /* -------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ void sp0256_device::device_start() save_pointer(NAME(m_scratch), SCBUF_SIZE); m_sc_head = m_sc_tail = 0; - + /* -------------------------------------------------------------------- */ /* Set up the microsequencer's initial state. */ /* -------------------------------------------------------------------- */ @@ -156,7 +156,7 @@ void sp0256_device::device_start() m_lrq = 0x8000; m_page = 0x1000 << 3; m_silent = 1; - + /* -------------------------------------------------------------------- */ /* Setup the ROM. */ /* -------------------------------------------------------------------- */ @@ -165,7 +165,7 @@ void sp0256_device::device_start() // see http://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=72385#Post72385 // TODO: because of this, check if the bitrev functions are even used anywhere else // bitrevbuff(m_rom, 0, 0xffff); - + m_lrq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sp0256_device::set_lrq_timer_proc),this)); // save device variables @@ -208,7 +208,7 @@ void sp0256_device::device_reset() { // reset FIFO and SP0256 m_fifo_head = m_fifo_tail = m_fifo_bitp = 0; - + memset(&m_filt, 0, sizeof(m_filt)); m_halted = 1; m_filt.rpt = -1; @@ -223,7 +223,7 @@ void sp0256_device::device_reset() m_silent = 1; m_drq(1); SET_SBY(1) - + m_lrq = 0; m_lrq_timer->adjust(attotime::from_ticks(50, m_clock)); } @@ -1196,7 +1196,7 @@ WRITE8_MEMBER( sp0256_device::ald_w ) LOG(("sp0256: Droped ALD write\n")); return; } - + /* ---------------------------------------------------------------- */ /* Set LRQ to "busy" and load the 8 LSBs of the data into the ALD */ /* reg. We take the command address, and multiply by 2 bytes to */ @@ -1206,7 +1206,7 @@ WRITE8_MEMBER( sp0256_device::ald_w ) m_ald = (0xff & data) << 4; m_drq(0); SET_SBY(0) - + return; } @@ -1214,13 +1214,13 @@ READ_LINE_MEMBER( sp0256_device::lrq_r ) { // force stream update m_stream->update(); - + return m_lrq == 0x8000; } READ_LINE_MEMBER( sp0256_device::sby_r ) { - // TODO: force stream update?? + // TODO: force stream update?? return m_sby_line; } @@ -1234,7 +1234,7 @@ READ16_MEMBER( sp0256_device::spb640_r ) { return m_lrq; } - + /* -------------------------------------------------------------------- */ /* Offset 1 returns the SPB640 FIFO full status on bit 15. */ /* -------------------------------------------------------------------- */ @@ -1242,7 +1242,7 @@ READ16_MEMBER( sp0256_device::spb640_r ) { return (m_fifo_head - m_fifo_tail) >= 64 ? 0x8000 : 0; } - + /* -------------------------------------------------------------------- */ /* Just return 255 for all other addresses in our range. */ /* -------------------------------------------------------------------- */ @@ -1256,20 +1256,20 @@ WRITE16_MEMBER( sp0256_device::spb640_w ) ald_w(space, 0, data & 0xff); return; } - + if (offset == 1) { /* ---------------------------------------------------------------- */ /* If Bit 10 is set, reset the FIFO, and SP0256. */ /* ---------------------------------------------------------------- */ - + if (data & 0x400) { m_fifo_head = m_fifo_tail = m_fifo_bitp = 0; device_reset(); return; } - + /* ---------------------------------------------------------------- */ /* If the FIFO is full, drop the data. */ /* ---------------------------------------------------------------- */ @@ -1278,16 +1278,16 @@ WRITE16_MEMBER( sp0256_device::spb640_w ) LOG(("spb640: Dropped FIFO write\n")); return; } - + /* ---------------------------------------------------------------- */ /* FIFO up the lower 10 bits of the data. */ /* ---------------------------------------------------------------- */ - + LOG(("spb640: WR_FIFO %.3X %d.%d %d\n", data & 0x3ff, - m_fifo_tail, m_fifo_bitp, m_fifo_head)); - + m_fifo_tail, m_fifo_bitp, m_fifo_head)); + m_fifo[m_fifo_head++ & 63] = data & 0x3ff; - + return; } } @@ -1313,31 +1313,31 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t ** stream_sample_t *output = outputs[0]; int output_index = 0; int length, did_samp/*, old_idx*/; - + while (output_index < samples) { /* ---------------------------------------------------------------- */ /* First, drain as much of our scratch buffer as we can into the */ /* sound buffer. */ /* ---------------------------------------------------------------- */ - + while (m_sc_tail != m_sc_head) { output[output_index++] = m_scratch[m_sc_tail++ & SCBUF_MASK]; m_sc_tail &= SCBUF_MASK; - + if (output_index > samples) break; } - + /* ---------------------------------------------------------------- */ /* If output outputs is full, then we're done. */ /* ---------------------------------------------------------------- */ if (output_index > samples) break; - + length = samples - output_index; - + /* ---------------------------------------------------------------- */ /* Process the current set of filter coefficients as long as the */ /* repeat count holds up and we have room in our scratch buffer. */ @@ -1347,26 +1347,26 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t ** if (length > 0) do { int do_samp; - + /* ------------------------------------------------------------ */ /* If our repeat count expired, emulate the microsequencer. */ /* ------------------------------------------------------------ */ if (m_filt.rpt <= 0) micro(); - + /* ------------------------------------------------------------ */ /* Do as many samples as we can. */ /* ------------------------------------------------------------ */ do_samp = length - did_samp; if (m_sc_head + do_samp - m_sc_tail > SCBUF_SIZE) do_samp = m_sc_tail + SCBUF_SIZE - m_sc_head; - + if (do_samp == 0) break; - + if (m_silent && m_filt.rpt <= 0) { int y = m_sc_head; - + for (int x = 0; x < do_samp; x++) m_scratch[y++ & SCBUF_MASK] = 0; m_sc_head += do_samp; @@ -1375,11 +1375,11 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t ** else { did_samp += lpc12_update(&m_filt, do_samp, - m_scratch, &m_sc_head); + m_scratch, &m_sc_head); } - + m_sc_head &= SCBUF_MASK; - + } while (m_filt.rpt >= 0 && length > did_samp); } } diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h index 91e7d89a0db..b6cd977ef6d 100644 --- a/src/emu/sound/sp0256.h +++ b/src/emu/sound/sp0256.h @@ -81,11 +81,11 @@ public: DECLARE_READ_LINE_MEMBER(sby_r); DECLARE_READ16_MEMBER(spb640_r); DECLARE_WRITE16_MEMBER(spb640_w); - + TIMER_CALLBACK_MEMBER(set_lrq_timer_proc); void set_clock(int clock); void bitrevbuff(UINT8 *buffer, unsigned int start, unsigned int length); - + protected: // device-level overrides virtual void device_config_complete(); @@ -97,20 +97,20 @@ protected: private: UINT32 getb(int len); void micro(); - + sound_stream *m_stream; /* MAME core sound stream */ devcb_resolved_write_line m_drq; /* Data request callback */ devcb_resolved_write_line m_sby; /* Standby callback */ int m_sby_line; /* Standby line state */ int m_cur_len; /* Fullness of current sound buffer. */ - + int m_silent; /* Flag: SP0256 is silent. */ - + INT16 *m_scratch; /* Scratch buffer for audio. */ UINT32 m_sc_head; /* Head pointer into scratch circular buf */ UINT32 m_sc_tail; /* Tail pointer into scratch circular buf */ - + struct lpc12_t m_filt; /* 12-pole filter */ int m_lrq; /* Load ReQuest. == 0 if we can accept a load */ int m_ald; /* Address LoaD. < 0 if no command pending. */ @@ -120,12 +120,12 @@ private: int m_halted; /* True when CPU is halted. */ UINT32 m_mode; /* Mode register. */ UINT32 m_page; /* Page set by SETPAGE */ - + UINT32 m_fifo_head; /* FIFO head pointer (where new data goes). */ UINT32 m_fifo_tail; /* FIFO tail pointer (where data comes from). */ UINT32 m_fifo_bitp; /* FIFO bit-pointer (for partial decles). */ UINT16 m_fifo[64]; /* The 64-decle FIFO. */ - + UINT8 *m_rom; /* 64K ROM. */ emu_timer *m_lrq_timer; diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c index 0a6783960c5..146843687ad 100644 --- a/src/emu/sound/speaker.c +++ b/src/emu/sound/speaker.c @@ -99,7 +99,7 @@ void speaker_sound_device::device_config_complete() const speaker_interface *intf = reinterpret_cast<const speaker_interface *>(static_config()); if (intf != NULL) *static_cast<speaker_interface *>(this) = *intf; - + // or initialize to defaults if none provided else { @@ -116,7 +116,7 @@ void speaker_sound_device::device_start() { int i; double x; - + m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this); m_level = 0; @@ -137,7 +137,7 @@ void speaker_sound_device::device_start() /* Note: To avoid time drift due to floating point inaccuracies, * it is good if the speaker time synchronizes itself with the stream timing regularly. */ - + /* Compute filter kernel; */ /* (Done for each device though the data is shared... * No problem really, but should be done as part of system init if I knew how) @@ -157,8 +157,8 @@ void speaker_sound_device::device_start() #define FILTER_STEP (M_PI / 2 / RATE_MULTIPLIER) /* Distribute symmetrically on x axis; center has x=0 if length is odd */ for (i = 0, x = (0.5 - FILTER_LENGTH / 2.) * FILTER_STEP; - i < FILTER_LENGTH; - i++, x += FILTER_STEP) + i < FILTER_LENGTH; + i++, x += FILTER_STEP) { if (x == 0) m_ampl[i] = 1; @@ -180,7 +180,7 @@ void speaker_sound_device::device_start() save_item(NAME(m_channel_last_sample_time)); save_item(NAME(m_interm_sample_index)); save_item(NAME(m_last_update_time)); - + machine().save().register_postload(save_prepost_delegate(FUNC(speaker_sound_device::speaker_postload), this)); } @@ -201,35 +201,35 @@ void speaker_sound_device::sound_stream_update(sound_stream &stream, stream_samp int volume = m_levels[m_level]; double filtered_volume; attotime sampled_time = attotime::zero; - + if (samples > 0) { /* Prepare to update time state */ sampled_time = attotime(0, m_channel_sample_period); if (samples > 1) sampled_time *= samples; - + /* Note: since the stream is in the process of being updated, * stream->sample_time() will return the time before the update! (MAME 0.130) * Avoid using it here in order to avoid a subtle dependence on the stream implementation. */ } - + if (samples-- > 0) { /* Note that first interm. sample may be composed... */ filtered_volume = update_interm_samples_get_filtered_volume(volume); - + /* Composite volume is now quantized to the stream resolution */ *buffer++ = (stream_sample_t)filtered_volume; - + /* Any additional samples will be homogeneous, however may need filtering across samples: */ while (samples-- > 0) { filtered_volume = update_interm_samples_get_filtered_volume(volume); *buffer++ = (stream_sample_t)filtered_volume; } - + /* Update the time state */ m_channel_last_sample_time += sampled_time; m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period); @@ -289,7 +289,7 @@ void speaker_sound_device::level_w(int new_level) /* Finally update speaker state before returning */ m_level = new_level; - + } @@ -394,5 +394,3 @@ double speaker_sound_device::get_filtered_volume() return filtered_volume; } - - diff --git a/src/emu/sound/speaker.h b/src/emu/sound/speaker.h index d90f3c50316..6adda328ca8 100644 --- a/src/emu/sound/speaker.h +++ b/src/emu/sound/speaker.h @@ -12,7 +12,7 @@ #define __SOUND_SPEAKER_H__ // Length of anti-aliasing filter kernel, measured in number of intermediate samples -enum +enum { FILTER_LENGTH = 64 }; @@ -48,21 +48,21 @@ private: // Updates the composed volume array according to time void update_interm_samples(attotime time, int volume); - + // Updates the composed volume array and returns final filtered volume of next stream sample double update_interm_samples_get_filtered_volume(int volume); - + void finalize_interm_sample(int volume); void init_next_interm_sample(); inline double make_fraction(attotime a, attotime b, double timediv); double get_filtered_volume(); - + // Kernel (pulse response) for filtering across samples (while we avoid fancy filtering within samples) double m_ampl[FILTER_LENGTH]; - + sound_stream *m_channel; int m_level; - + /* The volume of a composed sample grows incrementally each time the speaker is over-sampled. * That is in effect a basic average filter. * Another filter can and will be applied to the array of composed samples. diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index c1148d10d84..2c32a50b7ad 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -1136,7 +1136,7 @@ void ymf271_device::write_register(int slotnum, int reg, int data) slot->ch3_level = data & 0xf; break; } - + default: break; } @@ -1318,7 +1318,7 @@ void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param if (!m_irq_handler.isnull()) m_irq_handler(1); } - + // reload timer m_timA->adjust(attotime::from_hz(m_clock) * (384 * 4 * (256 - m_timerA)), 0); break; @@ -1334,7 +1334,7 @@ void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param if (!m_irq_handler.isnull()) m_irq_handler(1); } - + // reload timer m_timB->adjust(attotime::from_hz(m_clock) * (384 * 16 * (256 - m_timerB)), 0); break; @@ -1447,7 +1447,7 @@ void ymf271_device::ymf271_write_timer(int data) if (!m_ext_rw && !m_ext_write_handler.isnull()) m_ext_write_handler(m_ext_address, data); break; - + default: break; } @@ -1737,11 +1737,11 @@ void ymf271_device::device_reset() m_slots[i].active = 0; m_slots[i].volume = 0; } - + // reset timers and IRQ m_timA->reset(); m_timB->reset(); - + m_irqstate = 0; m_status = 0; m_enable = 0; diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c index 0e8dc68be71..2edc86b200e 100644 --- a/src/emu/sound/ymz280b.c +++ b/src/emu/sound/ymz280b.c @@ -17,7 +17,7 @@ 8-bit PCM, 16-bit PCM ...... 0.172 to 88.2kHz in 512 steps 256 steps total level and 16 steps panpot can be set Voice signal is output in stereo 16-bit 2's complement MSB-first format - + TODO: - Is memory handling 100% correct? At the moment, Konami firebeat.c is the only hardware currently emulated that uses external handlers. diff --git a/src/emu/video/cdp1861.c b/src/emu/video/cdp1861.c index 356eb9d316d..f9e6420c6a5 100644 --- a/src/emu/video/cdp1861.c +++ b/src/emu/video/cdp1861.c @@ -41,9 +41,9 @@ const device_type CDP1861 = &device_creator<cdp1861_device>; cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock), - m_write_irq(*this), - m_write_dma_out(*this), - m_write_efx(*this) + m_write_irq(*this), + m_write_dma_out(*this), + m_write_efx(*this) { } diff --git a/src/emu/video/cdp1862.c b/src/emu/video/cdp1862.c index 0851dd0c91c..9370f09dc93 100644 --- a/src/emu/video/cdp1862.c +++ b/src/emu/video/cdp1862.c @@ -78,9 +78,9 @@ inline void cdp1862_device::initialize_palette() cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock), - m_read_rd(*this), - m_read_bd(*this), - m_read_gd(*this) + m_read_rd(*this), + m_read_bd(*this), + m_read_gd(*this) { } diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h index 3ca51391d0d..6f385daf9c1 100644 --- a/src/emu/video/huc6270.h +++ b/src/emu/video/huc6270.h @@ -67,7 +67,7 @@ private: HUC6270_VDW, HUC6270_VCR }; - + enum huc6270_h_state { HUC6270_HDS, HUC6270_HDW, diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c index b8e607ce0b1..c8180244d15 100644 --- a/src/emu/video/msm6255.c +++ b/src/emu/video/msm6255.c @@ -198,7 +198,7 @@ READ8_MEMBER( msm6255_device::ir_r ) //------------------------------------------------- -// ir_w - +// ir_w - //------------------------------------------------- WRITE8_MEMBER( msm6255_device::ir_w ) @@ -257,7 +257,7 @@ READ8_MEMBER( msm6255_device::dr_r ) //------------------------------------------------- -// dr_w - +// dr_w - //------------------------------------------------- WRITE8_MEMBER( msm6255_device::dr_w ) diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c index 5ad9f301ebc..8f68236dfb0 100644 --- a/src/emu/video/tms9927.c +++ b/src/emu/video/tms9927.c @@ -85,14 +85,14 @@ void tms9927_device::device_start() { assert(clock() > 0); assert(m_hpixels_per_column > 0); - + /* copy the initial parameters */ m_clock = clock(); - + /* get the screen device */ m_screen = downcast<screen_device *>(machine().device(m_screen_tag)); assert(m_screen != NULL); - + /* get the self-load PROM */ if (m_selfload_region != NULL) { @@ -102,7 +102,7 @@ void tms9927_device::device_start() /* register for state saving */ machine().save().register_postload(save_prepost_delegate(FUNC(tms9927_device::state_postload), this)); - + save_item(NAME(m_reg)); save_item(NAME(m_start_datarow)); save_item(NAME(m_reset)); @@ -123,11 +123,11 @@ void tms9927_device::device_reset() void tms9927_device::device_stop() { mame_printf_debug("TMS9937: Final params: (%d, %d, %d, %d, %d, %d, %d)\n", - m_clock, - m_total_hpix, - 0, m_visible_hpix, - m_total_vpix, - 0, m_visible_vpix); + m_clock, + m_total_hpix, + 0, m_visible_hpix, + m_total_vpix, + 0, m_visible_vpix); } @@ -300,4 +300,3 @@ void tms9927_device::recompute_parameters(int postload) m_screen->configure(m_total_hpix, m_total_vpix, visarea, refresh); } - diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h index 8ff3dfa0ed2..94ba9919eee 100644 --- a/src/emu/video/tms9927.h +++ b/src/emu/video/tms9927.h @@ -33,7 +33,7 @@ public: int screen_reset(); int upscroll_offset(); int cursor_bounds(rectangle &bounds); - + protected: // device-level overrides virtual void device_config_complete(); @@ -46,17 +46,17 @@ private: void state_postload(); void recompute_parameters(int postload); void generic_access(address_space &space, offs_t offset); - + // internal state screen_device *m_screen; const UINT8 *m_selfload; - + /* live state */ UINT32 m_clock; UINT8 m_reg[9]; UINT8 m_start_datarow; UINT8 m_reset; - + /* derived state; no need to save */ UINT8 m_valid_config; UINT16 m_total_hpix, m_total_vpix; diff --git a/src/emu/video/upd7227.c b/src/emu/video/upd7227.c index 04a3c11f02f..0b3c3f37a17 100644 --- a/src/emu/video/upd7227.c +++ b/src/emu/video/upd7227.c @@ -44,13 +44,13 @@ ADDRESS_MAP_END upd7227_device::upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock), - device_memory_interface(mconfig, *this), - m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)), - m_cs(1), - m_cd(1), - m_sck(1), - m_si(1), - m_so(1) + device_memory_interface(mconfig, *this), + m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)), + m_cs(1), + m_cd(1), + m_sck(1), + m_si(1), + m_so(1) { } diff --git a/src/emu/video/upd7227.h b/src/emu/video/upd7227.h index b55301c3a76..ca1507948a4 100644 --- a/src/emu/video/upd7227.h +++ b/src/emu/video/upd7227.h @@ -63,18 +63,18 @@ protected: private: enum { - CMD_SMM = 0x18, - CMD_SFF = 0x10, - CMD_LDPI = 0x80, - CMD_SWM = 0x64, - CMD_SRM = 0x60, - CMD_SANDM = 0x6c, - CMD_SORM = 0x68, - CMD_SCM = 0x72, - CMD_BSET = 0x40, - CMD_BRESET = 0x20, - CMD_DISP_ON = 0x09, - CMD_DISP_OFF = 0x08 + CMD_SMM = 0x18, + CMD_SFF = 0x10, + CMD_LDPI = 0x80, + CMD_SWM = 0x64, + CMD_SRM = 0x60, + CMD_SANDM = 0x6c, + CMD_SORM = 0x68, + CMD_SCM = 0x72, + CMD_BSET = 0x40, + CMD_BRESET = 0x20, + CMD_DISP_ON = 0x09, + CMD_DISP_OFF = 0x08 }; int m_sx; diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak index fed2f29d056..880582e46f0 100644 --- a/src/emu/video/video.mak +++ b/src/emu/video/video.mak @@ -15,15 +15,15 @@ VIDEOOBJ = $(EMUOBJ)/video #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SEGA315_5124,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/315_5124.o +VIDEOOBJS+= $(VIDEOOBJ)/315_5124.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter BUFSPRITE,$(VIDEOS)),) @@ -31,47 +31,47 @@ VIDEOOBJS+= $(VIDEOOBJ)/bufsprite.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CDP1861,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/cdp1861.o +VIDEOOBJS+= $(VIDEOOBJ)/cdp1861.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CDP1862,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/cdp1862.o +VIDEOOBJS+= $(VIDEOOBJ)/cdp1862.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CRT9007,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/crt9007.o +VIDEOOBJS+= $(VIDEOOBJ)/crt9007.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CRT9021,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/crt9021.o +VIDEOOBJS+= $(VIDEOOBJ)/crt9021.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter CRT9212,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/crt9212.o +VIDEOOBJS+= $(VIDEOOBJ)/crt9212.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DL1416,$(VIDEOS)),) @@ -79,7 +79,7 @@ VIDEOOBJS+= $(VIDEOOBJ)/dl1416.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter DM9368,$(VIDEOS)),) @@ -87,225 +87,225 @@ VIDEOOBJS+= $(VIDEOOBJ)/dm9368.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter EF9340_1,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/ef9340_1.o +VIDEOOBJS+= $(VIDEOOBJ)/ef9340_1.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter H63484,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/h63484.o +VIDEOOBJS+= $(VIDEOOBJ)/h63484.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD44102,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd44102.o +VIDEOOBJS+= $(VIDEOOBJ)/hd44102.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD44352,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd44352.o +VIDEOOBJS+= $(VIDEOOBJ)/hd44352.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD44780,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd44780.o +VIDEOOBJS+= $(VIDEOOBJ)/hd44780.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD61830,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd61830.o +VIDEOOBJS+= $(VIDEOOBJ)/hd61830.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD63484,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd63484.o +VIDEOOBJS+= $(VIDEOOBJ)/hd63484.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HD66421,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/hd66421.o +VIDEOOBJS+= $(VIDEOOBJ)/hd66421.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HUC6202,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/huc6202.o +VIDEOOBJS+= $(VIDEOOBJ)/huc6202.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HUC6260,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/huc6260.o +VIDEOOBJS+= $(VIDEOOBJ)/huc6260.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HUC6261,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/huc6261.o +VIDEOOBJS+= $(VIDEOOBJ)/huc6261.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HUC6270,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/huc6270.o +VIDEOOBJS+= $(VIDEOOBJ)/huc6270.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter HUC6272,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/huc6272.o +VIDEOOBJS+= $(VIDEOOBJ)/huc6272.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8244,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/i8244.o +VIDEOOBJS+= $(VIDEOOBJ)/i8244.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter I8275,$(VIDEOS)),) VIDEOOBJS+= $(VIDEOOBJ)/i8275.o \ - $(VIDEOOBJ)/i8275x.o + $(VIDEOOBJ)/i8275x.o endif #------------------------------------------------- -# +# #------------------------------------------------- -ifneq ($(filter K053250,$(VIDEOS)),) +ifneq ($(filter K053250,$(VIDEOS)),) VIDEOOBJS+= $(VIDEOOBJ)/k053250.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter M50458,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/m50458.o +VIDEOOBJS+= $(VIDEOOBJ)/m50458.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MB90082,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/mb90082.o +VIDEOOBJS+= $(VIDEOOBJ)/mb90082.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6845,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/mc6845.o +VIDEOOBJS+= $(VIDEOOBJ)/mc6845.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MC6847,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/mc6847.o +VIDEOOBJS+= $(VIDEOOBJ)/mc6847.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter MSM6255,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/msm6255.o +VIDEOOBJS+= $(VIDEOOBJ)/msm6255.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PC_CGA,$(VIDEOS)),) VIDEOOBJS+= $(VIDEOOBJ)/pc_cga.o \ - $(VIDEOOBJ)/cgapal.o + $(VIDEOOBJ)/cgapal.o endif #------------------------------------------------- -# +# #------------------------------------------------- -ifneq ($(filter PC_VGA,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/pc_vga.o +ifneq ($(filter PC_VGA,$(VIDEOS)),) +VIDEOOBJS+= $(VIDEOOBJ)/pc_vga.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter POLY,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/poly.o +VIDEOOBJS+= $(VIDEOOBJ)/poly.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter PSX,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/psx.o +VIDEOOBJS+= $(VIDEOOBJ)/psx.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter RAMDAC,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/ramdac.o +VIDEOOBJS+= $(VIDEOOBJ)/ramdac.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter S2636,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/s2636.o +VIDEOOBJS+= $(VIDEOOBJ)/s2636.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SAA5050,$(VIDEOS)),) @@ -313,14 +313,14 @@ VIDEOOBJS+= $(VIDEOOBJ)/saa5050.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter SED1330,$(VIDEOS)),) VIDEOOBJS+= $(VIDEOOBJ)/sed1330.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter STVVDP,$(VIDEOS)),) @@ -329,39 +329,39 @@ VIDEOOBJS+= $(VIDEOOBJ)/stvvdp1.o \ endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TLC34076,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/tlc34076.o +VIDEOOBJS+= $(VIDEOOBJ)/tlc34076.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS34061,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/tms34061.o +VIDEOOBJS+= $(VIDEOOBJ)/tms34061.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS3556,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/tms3556.o +VIDEOOBJS+= $(VIDEOOBJ)/tms3556.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS9927,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/tms9927.o +VIDEOOBJS+= $(VIDEOOBJ)/tms9927.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter TMS9928A,$(VIDEOS)),) @@ -369,7 +369,7 @@ VIDEOOBJS+= $(VIDEOOBJ)/tms9928a.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD3301,$(VIDEOS)),) @@ -377,15 +377,15 @@ VIDEOOBJS+= $(VIDEOOBJ)/upd3301.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD7220,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/upd7220.o +VIDEOOBJS+= $(VIDEOOBJ)/upd7220.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter UPD7227,$(VIDEOS)),) @@ -393,15 +393,15 @@ VIDEOOBJS+= $(VIDEOOBJ)/upd7227.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter V9938,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/v9938.o +VIDEOOBJS+= $(VIDEOOBJ)/v9938.o endif #------------------------------------------------- -# +# #------------------------------------------------- ifneq ($(filter VOODOO,$(VIDEOS)),) |
