diff options
Diffstat (limited to 'src/mess')
43 files changed, 179 insertions, 182 deletions
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index d352c553fcf..c7d732f3745 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -35,14 +35,14 @@ 2013/02/27 Robert Tuccitto Palette rebuild due to misaligned data references. Corrected PAL color sequence order. - 2013/03/19 Robert Tuccitto Stripped palette to raw video output + 2013/03/19 Robert Tuccitto Stripped palette to raw video output values removing YIQ/YUV infer data. - 2013/04/02 Robert Tuccitto Corrected rotation values and errors - including duplicate entries for palette. + 2013/04/02 Robert Tuccitto Corrected rotation values and errors + including duplicate entries for palette. 2013/04/07 Robert Tuccitto Address map locations for the XBOARD - added. + added. ***************************************************************************/ @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state ) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank3") /* sc + ac */ AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank4") /* ac */ AM_RANGE(0xe000, 0xffff) AM_ROM - AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */ + AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */ ADDRESS_MAP_END diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index e0c9ad25633..5774191efd2 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -78,7 +78,7 @@ static const gfx_layout apple2gs_text_layout = { - 14,8, /* 14*8 characters */ + 14,8, /* 14*8 characters */ 512, /* 256 characters */ 1, /* 1 bits per pixel */ { 0 }, /* no bitplanes; 1 bit per pixel */ @@ -223,7 +223,7 @@ READ8_MEMBER(apple2gs_state::adbmicro_p2_in) READ8_MEMBER(apple2gs_state::adbmicro_p3_in) { - return 0x7; // don't press IIE capslock/ctrl/shift + return 0x7; // don't press IIE capslock/ctrl/shift } WRITE8_MEMBER(apple2gs_state::adbmicro_p0_out) @@ -255,7 +255,7 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out) if (((data & 0x08) == 0x08) != m_adb_line) { m_adb_dtime = (int)(machine().time().as_ticks(XTAL_3_579545MHz*2) - m_last_adb_time); -// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); +// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); m_last_adb_time = machine().time().as_ticks(XTAL_3_579545MHz*2); m_adb_line = (data & 0x8) ? true : false; } @@ -323,10 +323,10 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) MCFG_CPU_PROGRAM_MAP(apple2gs_map) #if RUN_ADB_MICRO MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL_3_579545MHz) - MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) - MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) - MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) - MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) + MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) + MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) + MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) + MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) #endif MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2gs_state, apple2_interrupt, "screen", 0, 1) MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -393,10 +393,10 @@ static MACHINE_CONFIG_DERIVED( apple2gsr1, apple2gs ) #if RUN_ADB_MICRO MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL_3_579545MHz) - MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) - MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) - MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) - MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) + MCFG_M5074X_PORT0_CALLBACKS(READ8(apple2gs_state, adbmicro_p0_in), WRITE8(apple2gs_state, adbmicro_p0_out)) + MCFG_M5074X_PORT1_CALLBACKS(READ8(apple2gs_state, adbmicro_p1_in), WRITE8(apple2gs_state, adbmicro_p1_out)) + MCFG_M5074X_PORT2_CALLBACKS(READ8(apple2gs_state, adbmicro_p2_in), WRITE8(apple2gs_state, adbmicro_p2_out)) + MCFG_M5074X_PORT3_CALLBACKS(READ8(apple2gs_state, adbmicro_p3_in), WRITE8(apple2gs_state, adbmicro_p3_out)) #endif MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c index 2ce52ab5ab7..97eb01bc4aa 100644 --- a/src/mess/drivers/atom.c +++ b/src/mess/drivers/atom.c @@ -273,7 +273,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atombb_mem, AS_PROGRAM, 8, atom_state ) AM_RANGE(0x0000, 0x3fff) AM_RAM AM_RANGE(0x4000, 0x57ff) AM_RAM AM_SHARE("video_ram") - + AM_RANGE(0x7000, 0x7003) AM_MIRROR(0x3fc) AM_DEVREADWRITE(INS8255_TAG, i8255_device, read, write) AM_RANGE(0x7800, 0x780f) AM_MIRROR(0x3f0) AM_DEVREADWRITE(R6522_TAG, via6522_device, read, write) AM_RANGE(0x8000, 0xbfff) AM_ROM AM_REGION(EXTROM_TAG, 0) @@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( atombb, atom_state ) MCFG_I8255_ADD(INS8255_TAG, ppi_intf) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, atom_centronics_config) MCFG_CASSETTE_ADD(CASSETTE_TAG, atom_cassette_interface) - + /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("16K") diff --git a/src/mess/drivers/fp200.c b/src/mess/drivers/fp200.c index 52a0b6478f3..57fca63399b 100644 --- a/src/mess/drivers/fp200.c +++ b/src/mess/drivers/fp200.c @@ -8,12 +8,12 @@ - What's the LCDC type? Custom? - Unless I've missed something in the schems, this one shouldn't have any sound capability. - - backup RAM. - - Rewrite video emulation from scratch. + - backup RAM. + - Rewrite video emulation from scratch. - Notes: - - on start-up there's a "memory illegal" warning. Enter "RESET" command - to initialize it (thanks to Takeda Toshiya for pointing this out). + Notes: + - on start-up there's a "memory illegal" warning. Enter "RESET" command + to initialize it (thanks to Takeda Toshiya for pointing this out). ***************************************************************************/ diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index bc8c7f62e6b..0ce50a1f33d 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -23,23 +23,23 @@ public: : md_base_state(mconfig, type, tag), m_slotcart(*this, "mdslot") { } - + ioport_port *m_io_ctrlr; ioport_port *m_io_pad3b[4]; ioport_port *m_io_pad6b[2][4]; - + optional_device<md_cart_slot_device> m_slotcart; - + DECLARE_DRIVER_INIT(mess_md_common); DECLARE_DRIVER_INIT(genesis); DECLARE_DRIVER_INIT(md_eur); DECLARE_DRIVER_INIT(md_jpn); - + READ8_MEMBER(mess_md_io_read_data_port); WRITE16_MEMBER(mess_md_io_write_data_port); - DECLARE_MACHINE_START( md_common ); // setup ioport_port - DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers + DECLARE_MACHINE_START( md_common ); // setup ioport_port + DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers DECLARE_MACHINE_RESET( ms_megadriv ); }; @@ -57,7 +57,7 @@ public: optional_device<pico_cart_slot_device> m_picocart; UINT8 m_page_register; - + UINT16 pico_read_penpos(int pen); DECLARE_READ16_HANDLER(pico_68k_io_read); DECLARE_WRITE16_MEMBER(pico_68k_io_write); @@ -303,7 +303,7 @@ INPUT_PORTS_END UINT16 vdp_get_word_from_68k_mem_console(running_machine &machine, UINT32 source, address_space & space68k) { md_cons_state *state = machine.driver_data<md_cons_state>(); - + if (source <= 0x3fffff) { if (state->m_slotcart->get_type() == SEGA_SVP) @@ -338,7 +338,7 @@ MACHINE_START_MEMBER(md_cons_state, md_common) m_io_pad6b[1][i] = ioport(pad6names[1][i]); } - // setup timers for 6 button pads + // setup timers for 6 button pads for (int i = 0; i < 3; i++) m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(FPTR)i); } @@ -346,7 +346,7 @@ MACHINE_START_MEMBER(md_cons_state, md_common) MACHINE_START_MEMBER(md_cons_state, ms_megadriv) { MACHINE_START_CALL_MEMBER( md_common ); - + vdp_get_word_from_68k_mem = vdp_get_word_from_68k_mem_console; // for now m_cartslot is only in MD and not 32x and SegaCD @@ -1070,7 +1070,7 @@ MACHINE_START_MEMBER(pico_state,pico) m_io_pad = ioport("PAD"); m_io_penx = ioport("PENX"); m_io_peny = ioport("PENY"); - + machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000000, 0x7fffff, read16_delegate(FUNC(base_md_cart_slot_device::read),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write),(base_md_cart_slot_device*)m_picocart)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa13000, 0xa130ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a13),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a13),(base_md_cart_slot_device*)m_picocart)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15000, 0xa150ff, read16_delegate(FUNC(base_md_cart_slot_device::read_a15),(base_md_cart_slot_device*)m_picocart), write16_delegate(FUNC(base_md_cart_slot_device::write_a15),(base_md_cart_slot_device*)m_picocart)); diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c index 2a175b3f2da..086df4e2253 100644 --- a/src/mess/drivers/mz3500.c +++ b/src/mess/drivers/mz3500.c @@ -1,27 +1,27 @@ /*************************************************************************** - MZ-3500 (c) 198? Sharp - - preliminary driver by Angelo Salese - - TODO: - - BUSREQ / BUSACK signals. - - master/slave comms aren't perfect (especially noticeable if you change the video DIP) - - Notes: - Sub-CPU test meanings: - * RA (tests RAM, first is work RAM, other two are shared RAM banks) - * VR (tests VRAM) - * CRT interface test: - - 40x20 - - 80x25 - - monochrome attribute test - - 80x25 color test (text B-R-G-W, border: black, blue, red, green, black) - - 40x20 color test (text B-R-G-W, border: black, blue, red, green, black) - * Speaker test - * PR (Printer interface test) - * LP (Light pen test) - * RS (RS-232C interface test) + MZ-3500 (c) 198? Sharp + + preliminary driver by Angelo Salese + + TODO: + - BUSREQ / BUSACK signals. + - master/slave comms aren't perfect (especially noticeable if you change the video DIP) + + Notes: + Sub-CPU test meanings: + * RA (tests RAM, first is work RAM, other two are shared RAM banks) + * VR (tests VRAM) + * CRT interface test: + - 40x20 + - 80x25 + - monochrome attribute test + - 80x25 color test (text B-R-G-W, border: black, blue, red, green, black) + - 40x20 color test (text B-R-G-W, border: black, blue, red, green, black) + * Speaker test + * PR (Printer interface test) + * LP (Light pen test) + * RS (RS-232C interface test) ***************************************************************************/ @@ -153,7 +153,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) UINT8 hires; UINT8 color_mode; -// popmessage("%02x",state->m_crtc[6]); +// popmessage("%02x",state->m_crtc[6]); color_mode = state->m_crtc[4] & 1; width80 = (state->m_crtc[5] & 2) >> 1; @@ -166,7 +166,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) attr = (state->m_video_ram[((addr+x)*2+1) & 0x3ffff] & 0x0f); //if(hires) - // tile <<= 1; + // tile <<= 1; for( yi = 0; yi < lr; yi++) { @@ -187,7 +187,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) { /* TODO: "highlight" */ //if(attr & 4) - // tile_data ^= 0xff; + // tile_data ^= 0xff; if(attr & 1) // VL tile_data |= 8; @@ -602,12 +602,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mz3500_master_io, AS_IO, 8, mz3500_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// ADDRESS_MAP_UNMAP_HIGH +// ADDRESS_MAP_UNMAP_HIGH // AM_RANGE(0xe4, 0xe7) SFD upd765 -// AM_RANGE(0xe8, 0xeb) SFD I/O port and DMAC chip select -// AM_RANGE(0xec, 0xef) irq signal from slave to master CPU +// AM_RANGE(0xe8, 0xeb) SFD I/O port and DMAC chip select +// AM_RANGE(0xec, 0xef) irq signal from slave to master CPU AM_RANGE(0xf4, 0xf5) AM_DEVICE("upd765a", upd765a_device, map) // MFD upd765 -// AM_RANGE(0xf8, 0xfb) MFD I/O port +// AM_RANGE(0xf8, 0xfb) MFD I/O port AM_RANGE(0xf8, 0xf8) AM_READWRITE(mz3500_fdc_r,mz3500_fdc_w) AM_RANGE(0xf9, 0xf9) AM_READ(mz3500_fdc_dma_r) AM_RANGE(0xfc, 0xff) AM_READWRITE(mz3500_io_r,mz3500_io_w) // memory mapper @@ -622,9 +622,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mz3500_slave_io, AS_IO, 8, mz3500_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_UNMAP_HIGH -// AM_RANGE(0x00, 0x0f) f/f and irq to master CPU -// AM_RANGE(0x10, 0x1f) i8251 -// AM_RANGE(0x20, 0x2f) pit8253 +// AM_RANGE(0x00, 0x0f) f/f and irq to master CPU +// AM_RANGE(0x10, 0x1f) i8251 +// AM_RANGE(0x20, 0x2f) pit8253 AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("i8255", i8255_device, read, write) AM_RANGE(0x40, 0x40) AM_READ_PORT("DSW") AM_RANGE(0x50, 0x5f) AM_RAM_WRITE(mz3500_crtc_w) diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c index cbe5dd7b10e..800b1eeb66f 100644 --- a/src/mess/drivers/p8k.c +++ b/src/mess/drivers/p8k.c @@ -85,7 +85,7 @@ public: void fdc_drq(bool state); virtual void machine_start(); - + DECLARE_WRITE_LINE_MEMBER( p8k_daisy_interrupt ); DECLARE_WRITE_LINE_MEMBER( p8k_dma_irq_w ); DECLARE_WRITE16_MEMBER( pk8_sio_0_serial_transmit ); @@ -607,12 +607,12 @@ static ADDRESS_MAP_START(p8k_16_iomap, AS_IO, 16, p8k_state) // AM_RANGE(0x0fef0, 0x0feff) // clock //AM_RANGE(0x0ff80, 0x0ff87) AM_READWRITE_LEGACY(p8k_16_sio0_r, p8k_16_sio0_w) AM_RANGE(0x0ff80, 0x0ff87) AM_READWRITE(portff82_r,portff82_w) - AM_RANGE(0x0ff88, 0x0ff8f) AM_READWRITE(p8k_16_sio1_r, p8k_16_sio1_w) //"z80sio_1", - AM_RANGE(0x0ff90, 0x0ff97) AM_READWRITE(p8k_16_pio0_r, p8k_16_pio0_w) //"z80pio_0", - AM_RANGE(0x0ff98, 0x0ff9f) AM_READWRITE(p8k_16_pio1_r, p8k_16_pio1_w) //"z80pio_1", - AM_RANGE(0x0ffa0, 0x0ffa7) AM_READWRITE(p8k_16_pio2_r, p8k_16_pio2_w) //"z80pio_2", - AM_RANGE(0x0ffa8, 0x0ffaf) AM_READWRITE(p8k_16_ctc0_r, p8k_16_ctc0_w) //"z80ctc_0", - AM_RANGE(0x0ffb0, 0x0ffb7) AM_READWRITE(p8k_16_ctc1_r, p8k_16_ctc1_w) //"z80ctc_1", + AM_RANGE(0x0ff88, 0x0ff8f) AM_READWRITE(p8k_16_sio1_r, p8k_16_sio1_w) //"z80sio_1", + AM_RANGE(0x0ff90, 0x0ff97) AM_READWRITE(p8k_16_pio0_r, p8k_16_pio0_w) //"z80pio_0", + AM_RANGE(0x0ff98, 0x0ff9f) AM_READWRITE(p8k_16_pio1_r, p8k_16_pio1_w) //"z80pio_1", + AM_RANGE(0x0ffa0, 0x0ffa7) AM_READWRITE(p8k_16_pio2_r, p8k_16_pio2_w) //"z80pio_2", + AM_RANGE(0x0ffa8, 0x0ffaf) AM_READWRITE(p8k_16_ctc0_r, p8k_16_ctc0_w) //"z80ctc_0", + AM_RANGE(0x0ffb0, 0x0ffb7) AM_READWRITE(p8k_16_ctc1_r, p8k_16_ctc1_w) //"z80ctc_1", // AM_RANGE(0x0ffc0, 0x0ffc1) // SCR // AM_RANGE(0x0ffc8, 0x0ffc9) // SBR // AM_RANGE(0x0ffd0, 0x0ffd1) // NBR diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c index 1274d374d35..86d0c42eca1 100644 --- a/src/mess/drivers/ql.c +++ b/src/mess/drivers/ql.c @@ -10,7 +10,7 @@ TODO: - - slotify cartridges + - slotify cartridges - microdrive - ZX8301 memory access slowdown - use resnet.h to create palette diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c index d7e0c4a0e26..606e02c4b10 100644 --- a/src/mess/drivers/snes.c +++ b/src/mess/drivers/snes.c @@ -81,7 +81,7 @@ public: DECLARE_WRITE8_MEMBER( pfest94_hi_w ); DECLARE_READ8_MEMBER( pfest94_lo_r ); DECLARE_WRITE8_MEMBER( pfest94_lo_w ); - + DECLARE_READ8_MEMBER( spc_ram_100_r ); DECLARE_WRITE8_MEMBER( spc_ram_100_w ); CUSTOM_INPUT_MEMBER( snes_mouse_speed_input ); @@ -779,7 +779,7 @@ WRITE8_MEMBER( snes_console_state::snesbsx_lo_w ) READ8_MEMBER( snes_console_state::pfest94_hi_r ) { UINT16 address = offset & 0xffff; - + if (offset < 0x400000) { if (address < 0x2000) @@ -827,7 +827,7 @@ WRITE8_MEMBER( snes_console_state::pfest94_hi_w ) READ8_MEMBER( snes_console_state::pfest94_lo_r ) { UINT16 address = offset & 0xffff; - + if (offset < 0x400000) { if (address < 0x2000) @@ -848,7 +848,7 @@ READ8_MEMBER( snes_console_state::pfest94_lo_r ) else return m_cartslot->read_l(space, offset); } - return 0xff; // or open_bus? + return 0xff; // or open_bus? } WRITE8_MEMBER( snes_console_state::pfest94_lo_w ) diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h index fa8baa83b43..60bcbd3fbaf 100644 --- a/src/mess/includes/apollo.h +++ b/src/mess/includes/apollo.h @@ -196,7 +196,7 @@ public: DECLARE_WRITE8_MEMBER( apollo_kbd_putchar ); DECLARE_READ8_MEMBER( apollo_kbd_has_beeper ); DECLARE_READ8_MEMBER( apollo_kbd_is_german ); - DECLARE_WRITE8_MEMBER( terminal_kbd_putchar ); + DECLARE_WRITE8_MEMBER( terminal_kbd_putchar ); DECLARE_READ8_MEMBER( apollo_dma8237_ctape_dack_r ); DECLARE_WRITE8_MEMBER( apollo_dma8237_ctape_dack_w ); DECLARE_READ8_MEMBER( apollo_dma8237_fdc_dack_r ); @@ -205,7 +205,7 @@ public: DECLARE_WRITE8_MEMBER( apollo_dma8237_wdc_dack_w ); DECLARE_WRITE_LINE_MEMBER( apollo_dma8237_out_eop ); DECLARE_WRITE_LINE_MEMBER( apollo_dma_1_hrq_changed ); - DECLARE_WRITE_LINE_MEMBER( apollo_dma_2_hrq_changed ); + DECLARE_WRITE_LINE_MEMBER( apollo_dma_2_hrq_changed ); }; MACHINE_CONFIG_EXTERN( apollo ); diff --git a/src/mess/includes/dccons.h b/src/mess/includes/dccons.h index 3616ab2bfcf..edabd8238cc 100644 --- a/src/mess/includes/dccons.h +++ b/src/mess/includes/dccons.h @@ -34,10 +34,10 @@ public: WRITE64_MEMBER( dc_mess_gdrom_w ); READ64_MEMBER( dc_mess_g1_ctrl_r ); WRITE64_MEMBER( dc_mess_g1_ctrl_w ); - + private: UINT64 PDTRA, PCTRA; - + UINT8 *atapi_regs; emu_timer *atapi_timer; gdrom_device *gdrom; diff --git a/src/mess/includes/kyocera.h b/src/mess/includes/kyocera.h index c5df1b37f7a..9f8e181a3b8 100644 --- a/src/mess/includes/kyocera.h +++ b/src/mess/includes/kyocera.h @@ -38,7 +38,7 @@ #define HD44102_8_TAG "m9" #define HD44102_9_TAG "m10" #define CENTRONICS_TAG "centronics" -#define RS232_TAG "rs232" +#define RS232_TAG "rs232" //#define I8085_TAG "m19" //#define I8155_TAG "m12" diff --git a/src/mess/includes/microtan.h b/src/mess/includes/microtan.h index fcd06f93754..0182750300d 100644 --- a/src/mess/includes/microtan.h +++ b/src/mess/includes/microtan.h @@ -76,7 +76,7 @@ public: DECLARE_WRITE8_MEMBER(via_1_out_ca2); DECLARE_WRITE8_MEMBER(via_1_out_cb2); DECLARE_WRITE_LINE_MEMBER(via_0_irq); - DECLARE_WRITE_LINE_MEMBER(via_1_irq); + DECLARE_WRITE_LINE_MEMBER(via_1_irq); }; diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 3fc965110ff..10f610018b7 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -161,13 +161,13 @@ public: void btl_smb2a_irq(int scanline, int vblank, int blanked); void btl_smb3_irq(int scanline, int vblank, int blanked); void btl_dn_irq(int scanline, int vblank, int blanked); - void shjy3_irq(int scanline, int vblank, int blanked); + void shjy3_irq(int scanline, int vblank, int blanked); void bandai_lz_irq(int scanline, int vblank, int blanked); void namcot_irq(int scanline, int vblank, int blanked); void futuremedia_irq(int scanline, int vblank, int blanked); void nanjing_irq(int scanline, int vblank, int blanked); - void tengen_800032_irq(int scanline, int vblank, int blanked); - + void tengen_800032_irq(int scanline, int vblank, int blanked); + int nes_ppu_vidaccess(int address, int data); void fds_irq(int scanline, int vblank, int blanked); void ppu_nmi(int *ppu_regs); diff --git a/src/mess/includes/pc1350.h b/src/mess/includes/pc1350.h index 335517c7baf..839813a0641 100644 --- a/src/mess/includes/pc1350.h +++ b/src/mess/includes/pc1350.h @@ -37,7 +37,7 @@ public: DECLARE_READ8_MEMBER(pc1350_lcd_read); DECLARE_WRITE8_MEMBER(pc1350_lcd_write); DECLARE_READ8_MEMBER(pc1350_keyboard_line_r); - + virtual void machine_start(); }; diff --git a/src/mess/includes/pc1401.h b/src/mess/includes/pc1401.h index 84b9ab718c7..02c00714835 100644 --- a/src/mess/includes/pc1401.h +++ b/src/mess/includes/pc1401.h @@ -37,7 +37,7 @@ public: DECLARE_READ8_MEMBER(pc1401_inb); DECLARE_READ8_MEMBER(pc1401_lcd_read); DECLARE_WRITE8_MEMBER(pc1401_lcd_write); - + virtual void machine_start(); }; diff --git a/src/mess/includes/pc1403.h b/src/mess/includes/pc1403.h index dd7c61e5093..48febbcb18f 100644 --- a/src/mess/includes/pc1403.h +++ b/src/mess/includes/pc1403.h @@ -41,7 +41,7 @@ public: DECLARE_WRITE8_MEMBER(pc1403_asic_write); DECLARE_READ8_MEMBER(pc1403_lcd_read); DECLARE_WRITE8_MEMBER(pc1403_lcd_write); - virtual void video_start(); + virtual void video_start(); virtual void machine_start(); }; diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index 06876d24fdb..438ac166b43 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -507,7 +507,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { UINT8 data = sc499_dack_r(&space.machine()); -// DLOG2(("dma ctape dack read %02x",data)); +// DLOG2(("dma ctape dack read %02x",data)); // hack for DN3000: select appropriate DMA channel No. dn3000_dma_channel1 = 1; // 1 = ctape, 2 = floppy dma channel @@ -516,7 +516,7 @@ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { } WRITE8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_w ) { -// DLOG2(("dma ctape dack write %02x", data)); +// DLOG2(("dma ctape dack write %02x", data)); sc499_dack_w(&space.machine(), data); // hack for DN3000: select appropriate DMA channel No. @@ -578,7 +578,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_dma_2_hrq_changed ) { // DLOG2(("dma 2 hrq changed state %02x", state)); machine().device(MAINCPU)->execute().set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); - /* Assert HLDA */ + /* Assert HLDA */ dynamic_cast<i8237_device*>(machine().device(APOLLO_DMA2_TAG))->i8237_hlda_w(state); } diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index 21ef0ee8ce3..f6fb7e85ff4 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -2080,7 +2080,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { UINT8 rv = m_glu_regs[offset]; -// printf("MCU reads reg %x\n", offset); +// printf("MCU reads reg %x\n", offset); // the command full flag is cleared by the MCU reading // first the KGS register and then the command register @@ -2088,7 +2088,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { m_glu_regs[GLU_KG_STATUS] &= ~KGS_COMMAND_FULL; m_glu_mcu_read_kgs = false; -// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); +// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); } // prime for the next command register read to clear the command full flag @@ -2104,7 +2104,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) { m_glu_regs[offset] = data; -// printf("MCU writes %02x to reg %x\n", data, offset); +// printf("MCU writes %02x to reg %x\n", data, offset); switch (offset) { @@ -2114,8 +2114,8 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) m_glu_mouse_read_stat = false; // signal next read will be mouse X break; - case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff -// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); + case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff +// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); if (data & 0x80) { m_glu_regs[GLU_KG_STATUS] |= KGS_ANY_KEY_DOWN | KGS_KEYSTROBE; @@ -2125,7 +2125,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) case GLU_DATA: m_glu_regs[GLU_KG_STATUS] |= KGS_DATA_FULL; m_glu_816_read_dstat = false; -// printf("MCU writes %02x to DATA\n", data); +// printf("MCU writes %02x to DATA\n", data); break; } } @@ -2212,7 +2212,7 @@ UINT8 apple2gs_state::keyglu_816_read(UINT8 offset) { m_glu_816_read_dstat = false; m_glu_regs[GLU_KG_STATUS] &= ~KGS_DATA_FULL; -// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); +// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); } return m_glu_regs[GLU_DATA]; @@ -2238,7 +2238,7 @@ void apple2gs_state::keyglu_816_write(UINT8 offset, UINT8 data) break; case GLU_COMMAND: -// printf("816 sets COMMAND to %02x (raise command full)\n", data); +// printf("816 sets COMMAND to %02x (raise command full)\n", data); m_glu_regs[GLU_KG_STATUS] |= KGS_COMMAND_FULL; break; diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c index e522eec32fa..9388bcba6e3 100644 --- a/src/mess/machine/c2040.c +++ b/src/mess/machine/c2040.c @@ -11,7 +11,7 @@ TODO: - - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) + - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) - 2040 DOS 1 FDC rom (jumps to 104d while getting block header) diff --git a/src/mess/machine/dccons.c b/src/mess/machine/dccons.c index bee389bb2ed..50f7713ec5d 100644 --- a/src/mess/machine/dccons.c +++ b/src/mess/machine/dccons.c @@ -64,7 +64,6 @@ void dc_cons_state::gdrom_raise_irq() TIMER_CALLBACK_MEMBER(dc_cons_state::atapi_xfer_end ) { - UINT8 sector_buffer[ 4096 ]; atapi_timer->adjust(attotime::never); @@ -511,7 +510,7 @@ WRITE32_MEMBER(dc_cons_state::atapi_w ) void dc_cons_state::dreamcast_atapi_init() { xfer_mode = ATAPI_XFER_PIO; - + atapi_regs = auto_alloc_array_clear(machine(), UINT8, ATAPI_REG_MAX); atapi_regs[ATAPI_REG_CMDSTATUS] = 0; diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h index 514158e9c1a..b1661e18216 100644 --- a/src/mess/machine/iq151_disc2.h +++ b/src/mess/machine/iq151_disc2.h @@ -31,7 +31,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // iq151cart_interface overrides virtual void read(offs_t offset, UINT8 &data); virtual void io_read(offs_t offset, UINT8 &data); diff --git a/src/mess/machine/isa_aha1542.c b/src/mess/machine/isa_aha1542.c index 9e0056b04f8..bc2763b348d 100644 --- a/src/mess/machine/isa_aha1542.c +++ b/src/mess/machine/isa_aha1542.c @@ -185,7 +185,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const } aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), + device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), device_isa16_card_interface(mconfig, *this) { } diff --git a/src/mess/machine/md_slot.c b/src/mess/machine/md_slot.c index 53e7ed3aab4..113d8bb4ae1 100644 --- a/src/mess/machine/md_slot.c +++ b/src/mess/machine/md_slot.c @@ -1065,7 +1065,7 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32 csum += (ROM8[i] | (ROM8[i + 1] << 8)); csum &= 0xffff; } - + logerror("INTERNAL HEADER\n" ); logerror("===============\n" ); logerror("Console: %.16s\n", console); diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h index b881d1ec8d0..8b1e1580e43 100644 --- a/src/mess/machine/md_slot.h +++ b/src/mess/machine/md_slot.h @@ -99,8 +99,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a13) {} virtual DECLARE_READ16_MEMBER(read_a15) { return 0xffff; } virtual DECLARE_WRITE16_MEMBER(write_a15) {} - - virtual int read_test() { return 0; } // used by Virtua Racing test + + virtual int read_test() { return 0; } // used by Virtua Racing test /* this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly */ virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); }; @@ -186,7 +186,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a15); virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { if (m_cart) m_cart->write_tmss_bank(space, offset, data, mem_mask); }; - virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test + virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test // TODO: this only needs to be public because megasvp copies rom into memory region, so we need to rework that code... //private: diff --git a/src/mess/machine/md_svp.c b/src/mess/machine/md_svp.c index 5bb5db98118..05b0d06284e 100644 --- a/src/mess/machine/md_svp.c +++ b/src/mess/machine/md_svp.c @@ -91,11 +91,11 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) m_emu_status &= ~SSP_PMC_SET; return 0; } - + // just in case if (m_emu_status & SSP_PMC_HAVE_ADDR) m_emu_status &= ~SSP_PMC_HAVE_ADDR; - + if (reg == 4 || (m_svp->state().state_int(SSP_ST) & 0x60)) { #define CADDR ((((mode<<16)&0x7f0000)|addr)<<1) @@ -110,7 +110,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) int inc = get_inc(mode); if (mode & 0x0400) overwrite_write(&dram[addr], d); - else + else dram[addr] = d; m_pmac_write[reg] += inc; } @@ -131,7 +131,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled write mode %04x, [%06x] %04x\n", - reg, mode, CADDR, d); + reg, mode, CADDR, d); } } else @@ -153,27 +153,27 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled read mode %04x, [%06x]\n", - reg, mode, CADDR); + reg, mode, CADDR); d = 0; } } - + // PMC value corresponds to last PMR accessed (not sure). if (write) m_pmc.d = m_pmac_write[reg]; else m_pmc.d = m_pmac_read[reg]; - + return d; } - + return (UINT32)-1; } READ16_MEMBER( md_rom_svp_device::read_pm0 ) { UINT32 d = pm_io(0, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; d = m_xst2; m_xst2 &= ~2; // ? @@ -183,7 +183,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm0 ) WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) { UINT32 r = pm_io(0, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 = data; // ? } @@ -191,7 +191,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) READ16_MEMBER( md_rom_svp_device::read_pm1 ) { UINT32 r = pm_io(1, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM1 acces in non PM mode?\n"); return 0; @@ -200,7 +200,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm1 ) WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) { UINT32 r = pm_io(1, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM1 acces in non PM mode?\n"); } @@ -208,7 +208,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) READ16_MEMBER( md_rom_svp_device::read_pm2 ) { UINT32 r = pm_io(2, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM2 acces in non PM mode?\n"); return 0; @@ -217,7 +217,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm2 ) WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) { UINT32 r = pm_io(2, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM2 acces in non PM mode?\n"); } @@ -225,7 +225,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) READ16_MEMBER( md_rom_svp_device::read_xst ) { UINT32 d = pm_io(3, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; return m_xst; } @@ -233,7 +233,7 @@ READ16_MEMBER( md_rom_svp_device::read_xst ) WRITE16_MEMBER( md_rom_svp_device::write_xst ) { UINT32 r = pm_io(3, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 |= 1; m_xst = data; @@ -251,13 +251,13 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm4 ) READ16_MEMBER( md_rom_svp_device::read_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; return ((m_pmc.w.l << 4) & 0xfff0) | ((m_pmc.w.l >> 4) & 0xf); - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; return m_pmc.w.l; @@ -266,13 +266,13 @@ READ16_MEMBER( md_rom_svp_device::read_pmc ) WRITE16_MEMBER( md_rom_svp_device::write_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; m_pmc.w.h = data; - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; m_pmc.w.l = data; @@ -293,16 +293,16 @@ WRITE16_MEMBER( md_rom_svp_device::write_al ) READ16_MEMBER( md_rom_svp_device::rom_read1 ) { UINT16 *IRAM = (UINT16 *)m_iram; - return IRAM[offset]; + return IRAM[offset]; } READ16_MEMBER( md_rom_svp_device::rom_read2 ) { - return m_rom[offset + 0x800/2]; + return m_rom[offset + 0x800/2]; } -int md_rom_svp_device::read_test() -{ +int md_rom_svp_device::read_test() +{ return m_test_ipt->read(); } @@ -319,8 +319,8 @@ INPUT_PORTS_END //------------------------------------------------- ADDRESS_MAP_START( md_svp_ssp_map, AS_PROGRAM, 16, md_rom_svp_device ) -// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) -// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) +// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) +// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("iram_svp") AM_RANGE(0x0400, 0xffff) AM_ROMBANK("cart_svp") ADDRESS_MAP_END @@ -390,7 +390,7 @@ void md_rom_svp_device::device_start() // IRAM m_iram = auto_alloc_array(machine(), UINT8, 0x800); this->membank("iram_svp")->set_base(m_iram); - // the other bank, "cart_svp", is setup at call_load + // the other bank, "cart_svp", is setup at call_load } READ16_MEMBER(md_rom_svp_device::read) @@ -415,9 +415,9 @@ READ16_MEMBER(md_rom_svp_device::read) a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4); return DRAM[a1]; } - if (offset < 0x200000/2) - return m_rom[offset]; - else + if (offset < 0x200000/2) + return m_rom[offset]; + else { printf("read out of bound\n"); return 0xffff; diff --git a/src/mess/machine/md_svp.h b/src/mess/machine/md_svp.h index d71c977d92d..a27c6980273 100644 --- a/src/mess/machine/md_svp.h +++ b/src/mess/machine/md_svp.h @@ -11,23 +11,23 @@ // ======================> md_rom_svp_device class md_rom_svp_device : public device_t, - public device_md_cart_interface + public device_md_cart_interface { public: // construction/destruction md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + //protected: // device-level overrides virtual void device_start(); virtual machine_config_constructor device_mconfig_additions() const; virtual ioport_constructor device_input_ports() const; virtual void set_bank_to_rom(const char *banktag, UINT32 offset); - + required_device<device_t> m_svp; required_ioport m_test_ipt; - + // reading and writing virtual DECLARE_READ16_MEMBER(read); virtual DECLARE_WRITE16_MEMBER(write); diff --git a/src/mess/machine/nes_ines.c b/src/mess/machine/nes_ines.c index 0a65acdb2bc..6f51bbadb70 100644 --- a/src/mess/machine/nes_ines.c +++ b/src/mess/machine/nes_ines.c @@ -30,7 +30,7 @@ there are 3 dots to every 1 CPU cycle, hence 114 is the number of cycles per sca void nes_state::ffe_irq( int scanline, int vblank, int blanked ) { - // 114 is the number of cycles per scanline + // 114 is the number of cycles per scanline // TODO: change to reflect the actual number of cycles spent if (m_IRQ_enable) { diff --git a/src/mess/machine/nes_pcb.c b/src/mess/machine/nes_pcb.c index c63c1093048..53d12e35339 100644 --- a/src/mess/machine/nes_pcb.c +++ b/src/mess/machine/nes_pcb.c @@ -11740,21 +11740,21 @@ struct nes_pcb_intf {write8_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0), read8_delegate(FUNC(b), DEVICE_SELF, (nes_state *)0)} #define NES_SCANLINE_NULL \ - ppu2c0x_scanline_delegate() + ppu2c0x_scanline_delegate() #define NES_HBLANK_NULL \ - ppu2c0x_hblank_delegate() + ppu2c0x_hblank_delegate() #define NES_HBLANK(a) \ - ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) + ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) #define NES_LATCH_NULL \ - ppu2c0x_latch_delegate() + ppu2c0x_latch_delegate() + + #define NES_LATCH(a) \ + ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - #define NES_LATCH(a) \ - ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - WRITE8_MEMBER(nes_carts_state::dummy_l_w) { logerror("write access, offset: %04x, data: %02x\n", offset + 0x4100, data); diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c index c6cafed8e75..3d8c07c18a2 100644 --- a/src/mess/machine/psxcd.c +++ b/src/mess/machine/psxcd.c @@ -463,7 +463,7 @@ void psxcd_device::cdcmd_setloc() void psxcd_device::cdcmd_play() { if(cmdbuf[0] && m_param_count) - loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); + loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); curpos.w = loc.w; if (!curpos.w) diff --git a/src/mess/machine/sat_slot.c b/src/mess/machine/sat_slot.c index 98fb5d6b61d..c05e15c8b05 100644 --- a/src/mess/machine/sat_slot.c +++ b/src/mess/machine/sat_slot.c @@ -143,7 +143,7 @@ bool sat_cart_slot_device::call_load() fread(ROM, len); // fix endianness.... - for (int i = 0; i < len/4; i ++) + for (int i = 0; i < len/4; i ++) ROM[i] = BITSWAP32(ROM[i],7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); // UINT8 tempa = ROM[i+0]; // UINT8 tempb = ROM[i+1]; diff --git a/src/mess/machine/sns_event.c b/src/mess/machine/sns_event.c index 862fe6d1a4d..53b0f19cf27 100644 --- a/src/mess/machine/sns_event.c +++ b/src/mess/machine/sns_event.c @@ -3,10 +3,10 @@ Super NES/Famicom Event cartridges emulation (for SNES/SFC) Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Visit http://mamedev.org for licensing and usage restrictions. TODO: figure out how the Test Mode switch works... - + ***********************************************************************************************************/ @@ -62,7 +62,7 @@ READ8_MEMBER(sns_pfest94_device::read_l) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x10000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } else { @@ -79,7 +79,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x8000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } // called beyond 0x400000! @@ -93,7 +93,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) { offset &= 0x3fffff; int bank = offset / 0x8000; - return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; } } @@ -279,10 +279,8 @@ void sns_pfest94_device::device_timer(emu_timer &timer, device_timer_id id, int if (!m_count) { m_status |= 2; - pfest94_timer->reset(); + pfest94_timer->reset(); } m_count--; } } - - diff --git a/src/mess/machine/sns_event.h b/src/mess/machine/sns_event.h index 12a1e050f4b..cbe602b4748 100644 --- a/src/mess/machine/sns_event.h +++ b/src/mess/machine/sns_event.h @@ -31,16 +31,16 @@ public: virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_READ8_MEMBER(chip_read); virtual DECLARE_WRITE8_MEMBER(chip_write); - + virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + private: UINT8 m_base_bank; UINT8 m_mask; UINT8 m_status; UINT32 m_count; - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; diff --git a/src/mess/machine/sns_rom.h b/src/mess/machine/sns_rom.h index dbc37d7b6ee..561c3fd0d29 100644 --- a/src/mess/machine/sns_rom.h +++ b/src/mess/machine/sns_rom.h @@ -16,7 +16,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); @@ -147,7 +147,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); diff --git a/src/mess/machine/sns_sufami.h b/src/mess/machine/sns_sufami.h index 874470e9f26..10bbf1abc13 100644 --- a/src/mess/machine/sns_sufami.h +++ b/src/mess/machine/sns_sufami.h @@ -38,7 +38,7 @@ public: // device-level overrides virtual void device_start(); - + // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); }; diff --git a/src/mess/machine/sns_upd.h b/src/mess/machine/sns_upd.h index 770ae9908cf..950c89cd752 100644 --- a/src/mess/machine/sns_upd.h +++ b/src/mess/machine/sns_upd.h @@ -28,7 +28,7 @@ public: virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; @@ -80,7 +80,7 @@ public: virtual DECLARE_READ32_MEMBER(setadsp_prg_r); virtual DECLARE_READ16_MEMBER(setadsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; diff --git a/src/mess/machine/ti99/horizon.c b/src/mess/machine/ti99/horizon.c index 99b9ba7e71d..24670d86986 100644 --- a/src/mess/machine/ti99/horizon.c +++ b/src/mess/machine/ti99/horizon.c @@ -65,7 +65,7 @@ horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this) { } diff --git a/src/mess/machine/wangpc_lic.h b/src/mess/machine/wangpc_lic.h index 7576f0780fc..7a40bec9899 100644 --- a/src/mess/machine/wangpc_lic.h +++ b/src/mess/machine/wangpc_lic.h @@ -39,7 +39,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // device_wangpcbus_card_interface overrides virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h index 2619e92e567..d9993e04ad9 100644 --- a/src/mess/machine/wangpckb.h +++ b/src/mess/machine/wangpckb.h @@ -1,9 +1,9 @@ /********************************************************************** - Wang PC keyboard emulation + Wang PC keyboard emulation - Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. *********************************************************************/ diff --git a/src/mess/mess.lst b/src/mess/mess.lst index 9bccb0ee6b6..3e8858187a2 100644 --- a/src/mess/mess.lst +++ b/src/mess/mess.lst @@ -346,7 +346,7 @@ d110 acrnsys1 // 1979 Acorn System 1 (Microcomputer Kit) atom // 1979 Acorn Atom atomeb // 1979 Acorn Atom -atombb // 1979 Acorn Atom +atombb // 1979 Acorn Atom bbca // 1981 BBC Micro Model A bbcb // 1981 BBC Micro Model B bbcbp // 198? BBC Micro Model B+ 64K diff --git a/src/mess/video/gb.c b/src/mess/video/gb.c index 09eed2936b4..a4eea04d8ff 100644 --- a/src/mess/video/gb.c +++ b/src/mess/video/gb.c @@ -532,7 +532,7 @@ void gb_state::sgb_refresh_border() { UINT8 *map = m_sgb_tile_map + ( ( yidx >> 3 ) * 64 ); UINT16 xindex = 0; - + for( UINT16 xidx = 0; xidx < 64; xidx+=2 ) { if( map[xidx+1] & 0x80 ) /* Vertical flip */ diff --git a/src/mess/video/isa_svga_s3.c b/src/mess/video/isa_svga_s3.c index 6d568ea3921..ac20b742e66 100644 --- a/src/mess/video/isa_svga_s3.c +++ b/src/mess/video/isa_svga_s3.c @@ -108,7 +108,7 @@ void isa16_svga_s3_device::device_reset() /* - * S3 Virge 2D/3D accelerator + * S3 Virge 2D/3D accelerator */ ROM_START( s3virge ) @@ -196,7 +196,7 @@ void isa16_s3virge_device::device_reset() } /* - * S3 ViRGE/DX + * S3 ViRGE/DX */ ROM_START( s3virgedx ) diff --git a/src/mess/video/s3virge.c b/src/mess/video/s3virge.c index f1786b4efe7..338d1d726f1 100644 --- a/src/mess/video/s3virge.c +++ b/src/mess/video/s3virge.c @@ -620,7 +620,7 @@ WRITE8_MEMBER(s3virge_vga_device::mem_w) if (svga.rgb8_en || svga.rgb15_en || svga.rgb16_en || svga.rgb32_en) { - // printf("%08x %02x (%02x %02x) %02X\n",offset,data,vga.sequencer.map_mask,svga.bank_w,(vga.sequencer.data[4] & 0x08)); + // printf("%08x %02x (%02x %02x) %02X\n",offset,data,vga.sequencer.map_mask,svga.bank_w,(vga.sequencer.data[4] & 0x08)); if(offset & 0x10000) return; if(vga.sequencer.data[4] & 0x8) |
