diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/h83002/h8.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/h83002/h8disasm.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/h83002/h8ops.h | 4 | ||||
| -rw-r--r-- | src/emu/cpu/tms32031/tms32031.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/z8000/z8000.c | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/chd_cd.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/fdc_pll.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/msm6242.c | 24 | ||||
| -rw-r--r-- | src/emu/machine/scsihd.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/wd_fdc.c | 20 | ||||
| -rw-r--r-- | src/emu/machine/wd_fdc.h | 2 | ||||
| -rw-r--r-- | src/emu/video/msm6255.c | 4 |
12 files changed, 38 insertions, 38 deletions
diff --git a/src/emu/cpu/h83002/h8.h b/src/emu/cpu/h83002/h8.h index d3107efbf25..0cada2d9f0e 100644 --- a/src/emu/cpu/h83002/h8.h +++ b/src/emu/cpu/h83002/h8.h @@ -1,7 +1,7 @@ /*************************************************************************** h8.h : Public constants and function defs for the H8/300, H8/300H, - H8/2000S, and H8/2600S family emulators. + H8/2000S, and H8/2600S family emulators. ****************************************************************************/ diff --git a/src/emu/cpu/h83002/h8disasm.c b/src/emu/cpu/h83002/h8disasm.c index ec50944a07b..5756665cf43 100644 --- a/src/emu/cpu/h83002/h8disasm.c +++ b/src/emu/cpu/h83002/h8disasm.c @@ -1301,8 +1301,8 @@ static UINT32 h8disasm_6(UINT32 address, UINT32 opcode, char *buffer, const UINT else { sprintf(buffer, "%4.4x ???", opcode); - } - size = 6; + } + size = 6; break; case 0x2: data32=h8_mem_read32(2); diff --git a/src/emu/cpu/h83002/h8ops.h b/src/emu/cpu/h83002/h8ops.h index 20ac80d87c0..6112f3e72a4 100644 --- a/src/emu/cpu/h83002/h8ops.h +++ b/src/emu/cpu/h83002/h8ops.h @@ -1908,12 +1908,12 @@ static void h8_group6(h83xx_state *h8, UINT16 opcode) h8_bset8(h8, (udata16 >> 4) & 0x7, udata8); h8_mem_write8(address24, udata8); } - else if ((udata16 & 0xff00) == 0x6300) + else if ((udata16 & 0xff00) == 0x6300) { h8_btst8(h8, h8_getreg8(h8, (udata16 >> 4) & 0xf), udata8); h8_mem_write8(address24, udata8); } - else if ((udata16 & 0xff0f) == 0x6000) + else if ((udata16 & 0xff0f) == 0x6000) { h8_bset8(h8, h8_getreg8(h8, (udata16 >> 4) & 0xf), udata8); h8_mem_write8(address24, udata8); diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 279a2d6a269..f4ae3fa644f 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -396,7 +396,7 @@ inline UINT32 tms3203x_device::RMEM(offs_t addr) { if (m_mcbl_mode && addr < 0x1000) return m_bootrom[addr]; - + return m_program->read_dword(addr << 2); } diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index b7c7fbdc1f1..a0f6050b310 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -554,7 +554,7 @@ static CPU_INIT( z8001 ) cpustate->device = device; cpustate->program = &device->space(AS_PROGRAM); /* If the system decodes STn lines to distinguish between data and program memory fetches, - install the data space. If it doesn't, install the program memory into data memory space. */ + install the data space. If it doesn't, install the program memory into data memory space. */ if (device->has_space(AS_DATA)) cpustate->data = &device->space(AS_DATA); else @@ -577,7 +577,7 @@ static CPU_INIT( z8002 ) cpustate->device = device; cpustate->program = &device->space(AS_PROGRAM); /* If the system decodes STn lines to distinguish between data and program memory fetches, - install the data space. If it doesn't, install the program memory into data memory space. */ + install the data space. If it doesn't, install the program memory into data memory space. */ if (device->has_space(AS_DATA)) cpustate->data = &device->space(AS_DATA); else diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c index 6e8eb867680..c031cfbbf88 100644 --- a/src/emu/imagedev/chd_cd.c +++ b/src/emu/imagedev/chd_cd.c @@ -58,7 +58,7 @@ void cdrom_image_device::device_config_complete() memset(&m_interface, 0, sizeof(m_interface)); memset(&m_device_displayinfo, 0, sizeof(m_device_displayinfo)); } - + m_extension_list = "chd,cue,toc,nrg,gdi,iso,cdr"; image_device_format *format = global_alloc_clear(image_device_format);; diff --git a/src/emu/machine/fdc_pll.h b/src/emu/machine/fdc_pll.h index 932b2c29147..28a1b4efbd0 100644 --- a/src/emu/machine/fdc_pll.h +++ b/src/emu/machine/fdc_pll.h @@ -11,12 +11,12 @@ class fdc_pll_t { public: attotime ctime, period, min_period, max_period, period_adjust_base, phase_adjust; - + attotime write_start_time; attotime write_buffer[32]; int write_position; int freq_hist; - + void set_clock(attotime period); void reset(attotime when); int get_next_bit(attotime &tm, floppy_image_device *floppy, attotime limit); diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index 8214978d637..8210658736a 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -294,7 +294,7 @@ void msm6242_device::update_timer() if (!m_res_out_int_func.isnull() && m_irq_flag == 1) { switch(m_irq_type) - { + { case IRQ_HOUR: callback_ticks += (59 - get_clock_register(RTC_MINUTE)) * (0x8000 * 60); // fall through @@ -471,17 +471,17 @@ WRITE8_MEMBER( msm6242_device::write ) switch(offset) { case MSM6242_REG_CD: - // x--- 30s ADJ - // -x-- IRQ FLAG - // --x- BUSY - // ---x HOLD + // x--- 30s ADJ + // -x-- IRQ FLAG + // --x- BUSY + // ---x HOLD m_reg[0] = data & 0x0f; break; case MSM6242_REG_CE: - // xx-- t0,t1 (timing irq) - // --x- STD - // ---x MASK + // xx-- t0,t1 (timing irq) + // --x- STD + // ---x MASK m_reg[1] = data & 0x0f; if((data & 3) == 0) // MASK & STD = 0 { @@ -497,10 +497,10 @@ WRITE8_MEMBER( msm6242_device::write ) break; case MSM6242_REG_CF: - // x--- TEST - // -x-- 24/12 - // --x- STOP - // ---x RESET + // x--- TEST + // -x-- 24/12 + // --x- STOP + // ---x RESET // the 12/24 mode bit can only be changed when RESET does a 1 -> 0 transition if (((data & 0x01) == 0x00) && (m_reg[2] & 0x01)) diff --git a/src/emu/machine/scsihd.h b/src/emu/machine/scsihd.h index acb15bdecbe..62ae9a15921 100644 --- a/src/emu/machine/scsihd.h +++ b/src/emu/machine/scsihd.h @@ -24,9 +24,9 @@ public: virtual void WriteData( UINT8 *data, int dataLength ); virtual void ReadData( UINT8 *data, int dataLength ); virtual int GetSectorBytes(); - + static struct harddisk_interface hd_intf; - + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/machine/wd_fdc.c b/src/emu/machine/wd_fdc.c index 126231d5b90..063f266979a 100644 --- a/src/emu/machine/wd_fdc.c +++ b/src/emu/machine/wd_fdc.c @@ -900,7 +900,7 @@ void wd_fdc_t::do_cmd_w() void wd_fdc_t::cmd_w(UINT8 val) { if (inverted_bus) val ^= 0xff; - + if(intrq && !(intrq_cond & I_IMM)) { intrq = false; if(!intrq_cb.isnull()) @@ -955,7 +955,7 @@ UINT8 wd_fdc_t::status_r() UINT8 val = status; if (inverted_bus) val ^= 0xff; - + return val; } @@ -981,7 +981,7 @@ UINT8 wd_fdc_t::track_r() { UINT8 val = track; if (inverted_bus) val ^= 0xff; - + return val; } @@ -994,7 +994,7 @@ void wd_fdc_t::do_sector_w() void wd_fdc_t::sector_w(UINT8 val) { if (inverted_bus) val ^= 0xff; - + // No more than one write in flight if(sector_buffer != -1) return; @@ -1007,14 +1007,14 @@ UINT8 wd_fdc_t::sector_r() { UINT8 val = sector; if (inverted_bus) val ^= 0xff; - + return val; } void wd_fdc_t::data_w(UINT8 val) { if (inverted_bus) val ^= 0xff; - + data = val; drop_drq(); } @@ -1025,7 +1025,7 @@ UINT8 wd_fdc_t::data_r() UINT8 val = data; if (inverted_bus) val ^= 0xff; - + return val; } @@ -1231,12 +1231,12 @@ void wd_fdc_t::live_sync() { if(!cur_live.tm.is_never()) { if(cur_live.tm > machine().time()) { - // fprintf(stderr, "%s: Rolling back and replaying (%s)\n", ttsn().cstr(), tts(cur_live.tm).cstr()); + // fprintf(stderr, "%s: Rolling back and replaying (%s)\n", ttsn().cstr(), tts(cur_live.tm).cstr()); rollback(); live_run(machine().time()); pll_commit(floppy, cur_live.tm); } else { - // fprintf(stderr, "%s: Committing (%s)\n", ttsn().cstr(), tts(cur_live.tm).cstr()); + // fprintf(stderr, "%s: Committing (%s)\n", ttsn().cstr(), tts(cur_live.tm).cstr()); pll_commit(floppy, cur_live.tm); if(cur_live.next_state != -1) { cur_live.state = cur_live.next_state; @@ -1440,7 +1440,7 @@ void wd_fdc_t::live_run(attotime limit) if(cur_live.bit_counter & 15) break; int slot = (cur_live.bit_counter >> 4)-1; - // fprintf(stderr, "%s: slot[%d] = %02x crc = %04x\n", tts(cur_live.tm).cstr(), slot, cur_live.data_reg, cur_live.crc); + // fprintf(stderr, "%s: slot[%d] = %02x crc = %04x\n", tts(cur_live.tm).cstr(), slot, cur_live.data_reg, cur_live.crc); cur_live.idbuf[slot] = cur_live.data_reg; if(slot == 5) { live_delay(IDLE); diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h index 88db9dd194b..8b87e7f56b3 100644 --- a/src/emu/machine/wd_fdc.h +++ b/src/emu/machine/wd_fdc.h @@ -35,7 +35,7 @@ * wd2793 normal n y n y n y y 1/2MHz y y analog * wd2795 inverted y n y y n y y 1/2MHz n y analog * wd2797 normal y n y y n y y 1/2MHz n y analog - + * wd1770 normal n n n n y n y 8Mhz n n digital * wd1772 normal n n n n y n y 8MHz n n digital * wd1773 normal n y n n n y y 8MHz n n digital diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c index 09b0916a9e6..ee0503763dd 100644 --- a/src/emu/video/msm6255.c +++ b/src/emu/video/msm6255.c @@ -83,7 +83,7 @@ ADDRESS_MAP_END //************************************************************************** //------------------------------------------------- -// read_byte - +// read_byte - //------------------------------------------------- inline UINT8 msm6255_device::read_byte(UINT16 ma, UINT8 ra) @@ -460,6 +460,6 @@ UINT32 msm6255_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap { bitmap.fill(0, cliprect); } - + return 0; } |
