diff options
| author | 2012-08-20 06:39:53 +0000 | |
|---|---|---|
| committer | 2012-08-20 06:39:53 +0000 | |
| commit | f54800c1f3f89877f977f1598edc07b93de2b509 (patch) | |
| tree | 7ab593d4ac62979cf0de70500ece0bd66df80222 /src/emu | |
| parent | 1c13d140992aabea30a322bb26d0fe8c0133cd3f (diff) | |
Clean-ups and version bumpmame0146u5
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/h83002/h8ops.h | 6 | ||||
| -rw-r--r-- | src/emu/cpu/h83002/h8speriph.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/v30mz/v30mz.c | 8 | ||||
| -rw-r--r-- | src/emu/cpu/v810/v810.c | 2 | ||||
| -rw-r--r-- | src/emu/emuopts.c | 2 | ||||
| -rw-r--r-- | src/emu/emuopts.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/msm6242.c | 28 | ||||
| -rw-r--r-- | src/emu/machine/z80ctc.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/z80ctc.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/z80pio.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/z80sio.h | 2 | ||||
| -rw-r--r-- | src/emu/romload.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/dac.c | 8 | ||||
| -rw-r--r-- | src/emu/ui.c | 4 | ||||
| -rw-r--r-- | src/emu/video/huc6202.c | 10 | ||||
| -rw-r--r-- | src/emu/video/huc6260.c | 30 | ||||
| -rw-r--r-- | src/emu/video/huc6260.h | 2 | ||||
| -rw-r--r-- | src/emu/video/huc6270.c | 32 | ||||
| -rw-r--r-- | src/emu/video/huc6270.h | 4 | ||||
| -rw-r--r-- | src/emu/video/saa5050.c | 2 | ||||
| -rw-r--r-- | src/emu/video/v9938.h | 4 |
21 files changed, 78 insertions, 78 deletions
diff --git a/src/emu/cpu/h83002/h8ops.h b/src/emu/cpu/h83002/h8ops.h index d436c09f7de..707d6abdb93 100644 --- a/src/emu/cpu/h83002/h8ops.h +++ b/src/emu/cpu/h83002/h8ops.h @@ -1,5 +1,5 @@ /* - + H8/3xx: Unknown opcode (PC=1c966) 10f - not a valid H8 or H8S opcode, either bad dump or banked ROM maygayep.c ep_cfallc @@ -13,8 +13,8 @@ H8/3xx: Unknown opcode (PC=8f91) aeb - ADD.L ERs, ERd maygayep.c ep_hogmnc H8/3xx: Unknown opcode (PC=20000) 6b6e - MOV.B @ERs, Rd -maygayep.c ep_wordf - +maygayep.c ep_wordf + */ static UINT32 udata32, address24; diff --git a/src/emu/cpu/h83002/h8speriph.c b/src/emu/cpu/h83002/h8speriph.c index e4120ffd15a..516aa01bc21 100644 --- a/src/emu/cpu/h83002/h8speriph.c +++ b/src/emu/cpu/h83002/h8speriph.c @@ -1591,7 +1591,7 @@ UINT8 h8s_onchip_reg_read_8_ddr(h83xx_state *h8, int offset) { int port = (offset - H8S_IO_P1DR); data = h8->drs[port] & h8->ddrs[port]; - data |= (h8->io->read_byte(H8_PORT_1 + port) & (h8->ddrs[port] ^ 0xff)); + data |= (h8->io->read_byte(H8_PORT_1 + port) & (h8->ddrs[port] ^ 0xff)); } break; diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index 4484a465d24..7ee243d0ff4 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -155,7 +155,7 @@ void v30mz_cpu_device::device_start() save_item(NAME(m_seg_prefix_next)); // Register state for debugger -// state_add( NEC_PC, "PC", m_PC ).callimport().callexport().formatstr("%04X"); +// state_add( NEC_PC, "PC", m_PC ).callimport().callexport().formatstr("%04X"); state_add( NEC_IP, "IP", m_ip ).callimport().callexport().formatstr("%04X"); state_add( NEC_SP, "SP", m_regs.w[SP] ).callimport().callexport().formatstr("%04X"); state_add( NEC_AW, "AW", m_regs.w[AW] ).callimport().callexport().formatstr("%04X"); @@ -1369,7 +1369,7 @@ void v30mz_cpu_device::execute_run() DEF_r8b(); ADDB(); RegByte(m_dst); - CLKM(1,2); + CLKM(1,2); break; case 0x03: // i_add_r16w @@ -2781,7 +2781,7 @@ void v30mz_cpu_device::execute_run() ANDW(); CLK(1); break; - + case 0xaa: // i_stosb i_stosb(); break; @@ -3295,7 +3295,7 @@ void v30mz_cpu_device::execute_run() m_sregs[CS] = tmp1; m_ip = tmp; - CLK(7); + CLK(7); } break; diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index 5ae880effeb..a848c365163 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -993,7 +993,7 @@ static UINT32 opBSU(v810_state *cpustate,UINT32 op) UINT32 dsttmp,tmp; UINT8 srctmp; -// printf("BDST %08x BSRC %08x SIZE %08x DST %08x SRC %08x\n",cpustate->R26,cpustate->R27,cpustate->R28,cpustate->R29,cpustate->R30); +// printf("BDST %08x BSRC %08x SIZE %08x DST %08x SRC %08x\n",cpustate->R26,cpustate->R27,cpustate->R28,cpustate->R29,cpustate->R30); dstbit = cpustate->R26; srcbit = cpustate->R27; diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 0e26dfac56f..acfcd83b971 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -193,7 +193,7 @@ const options_entry emu_options::s_option_entries[] = { OPTION_UI_FONT, "default", OPTION_STRING, "specify a font to use" }, { OPTION_RAMSIZE ";ram", NULL, OPTION_STRING, "size of RAM (if supported by driver)" }, { OPTION_CONFIRM_QUIT, "0", OPTION_BOOLEAN, "display confirm quit screen on exit" }, - { OPTION_UI_MOUSE, "0", OPTION_BOOLEAN, "display ui mouse cursor" }, + { OPTION_UI_MOUSE, "0", OPTION_BOOLEAN, "display ui mouse cursor" }, { NULL } }; diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 3f74b687b15..1de4aa8faee 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -348,7 +348,7 @@ public: const char *ui_font() const { return value(OPTION_UI_FONT); } const char *ram_size() const { return value(OPTION_RAMSIZE); } - bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); } + bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); } bool ui_mouse() const { return bool_value(OPTION_UI_MOUSE); } // device-specific options diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index f081cff0627..d11c00def79 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -252,11 +252,11 @@ WRITE8_MEMBER( msm6242_device::write ) 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; @@ -279,10 +279,10 @@ WRITE8_MEMBER( msm6242_device::write ) 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 @@ -304,11 +304,11 @@ WRITE8_MEMBER( msm6242_device::write ) 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/z80ctc.c b/src/emu/machine/z80ctc.c index 9466e442392..a17f90ee964 100644 --- a/src/emu/machine/z80ctc.c +++ b/src/emu/machine/z80ctc.c @@ -108,7 +108,7 @@ WRITE8_MEMBER( z80ctc_device::write ) //------------------------------------------------- // trg0-3 - standard write line handlers for each -// trigger +// trigger //------------------------------------------------- WRITE_LINE_MEMBER( z80ctc_device::trg0 ) { trigger(0, state); } diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h index 567dfb677c3..066a4266462 100644 --- a/src/emu/machine/z80ctc.h +++ b/src/emu/machine/z80ctc.h @@ -78,7 +78,7 @@ public: UINT8 read(int ch) { return m_channel[ch].read(); } void write(int ch, UINT8 data) { m_channel[ch].write(data); } void trigger(int ch, UINT8 data) { m_channel[ch].trigger(data); } - + // read/write handlers DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 203522ca8da..5f0388a50f2 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -117,7 +117,7 @@ public: UINT8 port_b_read() { return port_read(PORT_B); } void port_a_write(UINT8 data) { port_write(PORT_A, data); } void port_b_write(UINT8 data) { port_write(PORT_B, data); } - + // standard read/write, with C/D in bit 1, B/A in bit 0 DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h index 2c62ebefafc..501431d3bf1 100644 --- a/src/emu/machine/z80sio.h +++ b/src/emu/machine/z80sio.h @@ -66,7 +66,7 @@ public: void set_cts(int ch, int state) { m_channel[ch].set_cts(state); } void set_dcd(int ch, int state) { m_channel[ch].set_dcd(state); } void receive_data(int ch, int data) { m_channel[ch].receive_data(data); } - + // standard read/write, with C/D in bit 1, B/A in bit 0 DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/emu/romload.c b/src/emu/romload.c index 67ae2c249de..f16c27bbe22 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -1493,7 +1493,7 @@ int rom_load_warnings(running_machine &machine) /*------------------------------------------------- - software_load_warnings_message - return the + software_load_warnings_message - return the software load warnings we generated -------------------------------------------------*/ diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c index 3a4af9040ef..887676ac9c4 100644 --- a/src/emu/sound/dac.c +++ b/src/emu/sound/dac.c @@ -63,8 +63,8 @@ dac_device::dac_device(const machine_config &mconfig, const char *tag, device_t //------------------------------------------------- -// write_unsigned8 - write an 8-bit value, -// keeping the scaled result unsigned +// write_unsigned8 - write an 8-bit value, +// keeping the scaled result unsigned //------------------------------------------------- WRITE8_MEMBER( dac_device::write_unsigned8 ) @@ -74,8 +74,8 @@ WRITE8_MEMBER( dac_device::write_unsigned8 ) //------------------------------------------------- -// write_signed8 - write an 8-bit value, -// keeping the scaled result signed +// write_signed8 - write an 8-bit value, +// keeping the scaled result signed //------------------------------------------------- WRITE8_MEMBER( dac_device::write_signed8 ) diff --git a/src/emu/ui.c b/src/emu/ui.c index e5541f416e4..8a5c60c7e3b 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -437,7 +437,7 @@ void ui_update_and_render(running_machine &machine, render_container *container) else popup_text_end = 0; - if (ui_mouse_show || (machine.options().ui_mouse() && ui_is_menu_active())) + if (ui_mouse_show || (machine.options().ui_mouse() && ui_is_menu_active())) { INT32 mouse_target_x, mouse_target_y; int mouse_button; @@ -915,7 +915,7 @@ void ui_show_menu(void) /*------------------------------------------------- - ui_show_mouse - change mouse status + ui_show_mouse - change mouse status -------------------------------------------------*/ void ui_show_mouse(bool status) diff --git a/src/emu/video/huc6202.c b/src/emu/video/huc6202.c index 514acd0c099..07833a70d3a 100644 --- a/src/emu/video/huc6202.c +++ b/src/emu/video/huc6202.c @@ -106,10 +106,10 @@ READ16_MEMBER( huc6202_device::next_pixel ) break; case 2: /* Back - BG0 + SP1 => BG0 - Front - BG0 + BG1 => BG0 - BG1 + SP0 => BG1 - SP0 + SP1 => SP0 - */ + BG0 + BG1 => BG0 + BG1 + SP0 => BG1 + SP0 + SP1 => SP0 + */ if ( data_1 > huc6270_device::HUC6270_SPRITE ) { if ( data_0 > huc6270_device::HUC6270_SPRITE ) @@ -201,7 +201,7 @@ READ8_MEMBER( huc6202_device::read ) break; case 0x01: /* Priority register #1 */ - data = ( m_prio[2].prio_type << 2 ) | + data = ( m_prio[2].prio_type << 2 ) | ( m_prio[2].dev0_enabled ? 0x01 : 0 ) | ( m_prio[2].dev1_enabled ? 0x02 : 0 ) | ( m_prio[3].prio_type << 6 ) | diff --git a/src/emu/video/huc6260.c b/src/emu/video/huc6260.c index 53b3c0d5930..a543c28ce35 100644 --- a/src/emu/video/huc6260.c +++ b/src/emu/video/huc6260.c @@ -98,23 +98,23 @@ void huc6260_device::device_timer(emu_timer &timer, device_timer_id id, int para { case HUC6260_HSYNC_START: /* Start of HSync */ m_hsync_changed( 0 ); -// if ( v == 0 ) -// { -// /* Check if the screen should be resized */ -// m_height = HUC6260_LPF - ( m_blur ? 1 : 0 ); -// if ( m_height != video_screen_get_height( m_screen ) ) -// { -// rectangle visible_area; +// if ( v == 0 ) +// { +// /* Check if the screen should be resized */ +// m_height = HUC6260_LPF - ( m_blur ? 1 : 0 ); +// if ( m_height != video_screen_get_height( m_screen ) ) +// { +// rectangle visible_area; // -// /* TODO: Set proper visible area parameters */ -// visible_area.min_x = 64; -// visible_area.min_y = 18; -// visible_area.max_x = 64 + 1024 + 64 - 1; -// visible_area.max_y = 18 + 242 - 1; +// /* TODO: Set proper visible area parameters */ +// visible_area.min_x = 64; +// visible_area.min_y = 18; +// visible_area.max_x = 64 + 1024 + 64 - 1; +// visible_area.max_y = 18 + 242 - 1; // -// video_screen_configure( m_screen, HUC6260_WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS( device->clock / ( HUC6260_WPF * m_height ) ) ); -// } -// } +// video_screen_configure( m_screen, HUC6260_WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS( device->clock / ( HUC6260_WPF * m_height ) ) ); +// } +// } break; case 0: /* End of HSync */ diff --git a/src/emu/video/huc6260.h b/src/emu/video/huc6260.h index e4f1a64a906..1f2ce0cdaaa 100644 --- a/src/emu/video/huc6260.h +++ b/src/emu/video/huc6260.h @@ -47,7 +47,7 @@ struct _huc6260_interface devcb_write_line hsync_changed; }; - + class huc6260_device : public device_t, public huc6260_interface { diff --git a/src/emu/video/huc6270.c b/src/emu/video/huc6270.c index c6cfbd3b2ee..76b9f3e5bdd 100644 --- a/src/emu/video/huc6270.c +++ b/src/emu/video/huc6270.c @@ -115,7 +115,7 @@ huc6270_device::huc6270_device(const machine_config &mconfig, const char *tag, d /* - Read one row of tile data from video ram + Read one row of tile data from video ram */ inline void huc6270_device::fetch_bat_tile_row() { @@ -308,8 +308,8 @@ inline void huc6270_device::handle_vblank() } /* Should we initiate a VRAM->SATB DMA transfer. - The timing for this is incorrect. - */ + The timing for this is incorrect. + */ if ( m_dvssr_written || ( m_dcr & 0x10 ) ) { int i; @@ -488,7 +488,7 @@ READ16_MEMBER( huc6270_device::next_pixel ) //inline READ16_MEMBER( huc6270_device::time_until_next_event ) //{ -// return m_horz_to_go * 8 + m_horz_steps; +// return m_horz_to_go * 8 + m_horz_steps; //} @@ -512,8 +512,8 @@ WRITE_LINE_MEMBER( huc6270_device::vsync_changed ) handle_vblank(); /* Should we perform VRAM-VRAM dma. - The timing for this is incorrect. - */ + The timing for this is incorrect. + */ if ( m_dma_enabled ) { int desr_inc = ( m_dcr & 0x0008 ) ? -1 : +1; @@ -649,11 +649,11 @@ WRITE8_MEMBER( huc6270_device::write ) case RCR: /* raster compare register LSB */ m_rcr = ( m_rcr & 0x0300 ) | data; //printf("%s: RCR set to %03x\n", machine().describe_context(), m_rcr); -// if ( m_raster_count == m_rcr && m_cr & 0x04 ) -// { -// m_status |= HUC6270_RR; -// m_irq_changed( ASSERT_LINE ); -// } +// if ( m_raster_count == m_rcr && m_cr & 0x04 ) +// { +// m_status |= HUC6270_RR; +// m_irq_changed( ASSERT_LINE ); +// } //if (LOG) printf("%04x: RCR (%03x) written at %d,%d\n", activecpu_get_pc(), huc6270->m_rcr, video_screen_get_vpos(device->machine->primary_screen), video_screen_get_hpos(device->machine->primary_screen) ); break; @@ -740,11 +740,11 @@ WRITE8_MEMBER( huc6270_device::write ) case RCR: /* raster compare register MSB */ m_rcr = ( m_rcr & 0x00FF ) | ( ( data & 0x03 ) << 8 ); //printf("%s: RCR set to %03x\n", machine().describe_context(), m_rcr); -// if ( m_raster_count == m_rcr && m_cr & 0x04 ) -// { -// m_status |= HUC6270_RR; -// m_irq_changed( ASSERT_LINE ); -// } +// if ( m_raster_count == m_rcr && m_cr & 0x04 ) +// { +// m_status |= HUC6270_RR; +// m_irq_changed( ASSERT_LINE ); +// } break; case BXR: /* background x-scroll register MSB */ diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h index e6765382846..0d5686a1049 100644 --- a/src/emu/video/huc6270.h +++ b/src/emu/video/huc6270.h @@ -128,8 +128,8 @@ private: UINT16 m_bat_column; UINT8 m_bat_tile_row[8]; /* Internal sprite attribute table. SATB DMA is used to transfer data - from VRAM to this internal table. - */ + from VRAM to this internal table. + */ UINT16 m_sat[4*64]; int m_sprites_this_line; int m_sprite_row_index; diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c index 2236bf1085d..0a11f045718 100644 --- a/src/emu/video/saa5050.c +++ b/src/emu/video/saa5050.c @@ -215,7 +215,7 @@ void saa5050_update( device_t *device, bitmap_ind16 &bitmap, const rectangle &cl for (sy = 0; sy <= saa5050->y; sy++) { bool dblhi = false; - + /* Set start of line state */ saa5050->flags = 0; saa5050->prvchr = 32; diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 1cf9280d242..83eda9a8042 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -132,8 +132,8 @@ private: template<typename _PixelType, int _Width> void mode_graphic5(const pen_t *pens, _PixelType *ln, int line); template<typename _PixelType, int _Width> void mode_graphic6(const pen_t *pens, _PixelType *ln, int line); template<typename _PixelType, int _Width> void mode_graphic7(const pen_t *pens, _PixelType *ln, int line); -// template<typename _PixelType, int _Width> void mode_yae(const pen_t *pens, _PixelType *ln, int line); -// template<typename _PixelType, int _Width> void mode_yjk(const pen_t *pens, _PixelType *ln, int line); +// template<typename _PixelType, int _Width> void mode_yae(const pen_t *pens, _PixelType *ln, int line); +// template<typename _PixelType, int _Width> void mode_yjk(const pen_t *pens, _PixelType *ln, int line); template<typename _PixelType, int _Width> void mode_unknown(const pen_t *pens, _PixelType *ln, int line); template<typename _PixelType, int _Width> void default_draw_sprite(const pen_t *pens, _PixelType *ln, UINT8 *col); template<typename _PixelType, int _Width> void graphic5_draw_sprite(const pen_t *pens, _PixelType *ln, UINT8 *col); |
