diff options
Diffstat (limited to 'src/mame')
71 files changed, 526 insertions, 518 deletions
diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h index d1202918ac2..c2954dae928 100644 --- a/src/mame/audio/cage.h +++ b/src/mame/audio/cage.h @@ -79,7 +79,7 @@ private: required_memory_bank m_bootbank; required_memory_bank m_mainbank; - + required_memory_region m_bootrom; required_memory_region m_mainrom; diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index cb88437cc90..b72d8a61b3a 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -706,7 +706,7 @@ ROM_START( marvice ) ROM_REGION( 0x800, "unk", ROMREGION_ERASEFF ) // nvram contents, should be x4 in size ROM_LOAD( "mk48z02b-20.u13", 0x0000, 0x0800, BAD_DUMP CRC(e6079615) SHA1(f528b2a600ab047ad7f87f4dbae65a7e4cd10f8c) ) - + DISK_REGION( "laserdisc" ) DISK_IMAGE_READONLY( "marvice", 0, NO_DUMP ) ROM_END diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index bd8377301a3..9b88907458d 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -109,7 +109,7 @@ public: , m_floppy0(*this, "fdc:0") , m_floppy1(*this, "fdc:1") { } - + void amust(machine_config &config); void init_amust(); diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index eace0ec89f9..3baceec044c 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -12,13 +12,13 @@ - ROM 00/01: original motherboard, 256K of RAM (banks 00/01/E0/E1 only), FPI chip manages fast/slow side - ROM 03: revised motherboard, 1M of RAM (banks 00/01/->0F/E0/E1), CYA chip replaces FPI - Expanded IIe: ROM 00/01 motherboard in a IIe case with a IIe keyboard rather than ADB - - FF6ACF is speed test in ROM - Diags: - A138 = scanline interrupt test (raster is too long to pass this) - A179 = pass - A17C = fail 1 - A0F1 = fail 2 + + FF6ACF is speed test in ROM + Diags: + A138 = scanline interrupt test (raster is too long to pass this) + A179 = pass + A17C = fail 1 + A0F1 = fail 2 ***************************************************************************/ @@ -88,9 +88,9 @@ // various timing standards #define A2GS_MASTER_CLOCK (XTAL(28'636'363)) -#define A2GS_14M (A2GS_MASTER_CLOCK/2) -#define A2GS_7M (A2GS_MASTER_CLOCK/4) -#define A2GS_1M (A2GS_MASTER_CLOCK/28) +#define A2GS_14M (A2GS_MASTER_CLOCK/2) +#define A2GS_7M (A2GS_MASTER_CLOCK/4) +#define A2GS_1M (A2GS_MASTER_CLOCK/28) #define A2GS_CPU_TAG "maincpu" #define A2GS_ADBMCU_TAG "adbmicro" @@ -102,8 +102,8 @@ #define A2GS_AUXUPPER_TAG "inhaux" #define A2GS_00UPPER_TAG "inh00" #define A2GS_01UPPER_TAG "inh01" -#define A2GS_IWM_TAG "fdc" // must be "fdc" or sonydriv pukes -#define A2GS_DOC_TAG "doc" +#define A2GS_IWM_TAG "fdc" // must be "fdc" or sonydriv pukes +#define A2GS_DOC_TAG "doc" #define A2GS_VIDEO_TAG "a2video" #define SCC_TAG "scc" #define RS232A_TAG "printer" @@ -117,9 +117,9 @@ #define A2GS_LCAUX_TAG "lcaux" #define A2GS_LC00_TAG "lc00" #define A2GS_LC01_TAG "lc01" -#define A2GS_B0CXXX_TAG "bnk0atc" -#define A2GS_B01_TAG "bnk1at0" -#define A2GS_B1CXXX_TAG "bnk1atc" +#define A2GS_B0CXXX_TAG "bnk0atc" +#define A2GS_B01_TAG "bnk1at0" +#define A2GS_B1CXXX_TAG "bnk1atc" #define A2GS_B00000_TAG "b0r00bank" #define A2GS_B00200_TAG "b0r02bank" #define A2GS_B00400_TAG "b0r04bank" @@ -255,8 +255,8 @@ public: enum glu_sys_status { - GLU_STATUS_CMDFULL = 0x01, - GLU_STATUS_MOUSEXY = 0x02, + GLU_STATUS_CMDFULL = 0x01, + GLU_STATUS_MOUSEXY = 0x02, GLU_STATUS_KEYDATIRQEN = 0x04, GLU_STATUS_KEYDATIRQ = 0x08, GLU_STATUS_DATAIRQEN = 0x10, @@ -267,21 +267,21 @@ public: enum shadow_reg_bits { - SHAD_IOLC = 0x40, // I/O and language card inhibit for banks 00/01 - SHAD_TXTPG2 = 0x20, // inhibits text-page 2 shadowing in both banks (ROM 03 h/w only) - SHAD_AUXHIRES = 0x10, // inhibits bank 01 hi-res region shadowing - SHAD_SUPERHIRES = 0x08, // inhibits bank 01 super-hi-res region shadowing - SHAD_HIRESPG2 = 0x04, // inhibits hi-res page 2 shadowing in both banks - SHAD_HIRESPG1 = 0x02, // inhibits hi-res page 1 shadowing in both banks - SHAD_TXTPG1 = 0x01 // inhibits text-page 1 shadowing in both banks + SHAD_IOLC = 0x40, // I/O and language card inhibit for banks 00/01 + SHAD_TXTPG2 = 0x20, // inhibits text-page 2 shadowing in both banks (ROM 03 h/w only) + SHAD_AUXHIRES = 0x10, // inhibits bank 01 hi-res region shadowing + SHAD_SUPERHIRES = 0x08, // inhibits bank 01 super-hi-res region shadowing + SHAD_HIRESPG2 = 0x04, // inhibits hi-res page 2 shadowing in both banks + SHAD_HIRESPG1 = 0x02, // inhibits hi-res page 1 shadowing in both banks + SHAD_TXTPG1 = 0x01 // inhibits text-page 1 shadowing in both banks }; enum speed_reg_bits { - SPEED_HIGH = 0x80, // full 2.8 MHz speed when set, Apple II 1 MHz when clear - SPEED_POWERON = 0x40, // ROM 03 only; indicates machine turned on by power switch (as opposed to ?) - SPEED_ALLBANKS = 0x10, // enables bank 0/1 shadowing in all banks (not supported) - SPEED_DISKIISL7 = 0x08, // enable Disk II motor on detect for slot 7 + SPEED_HIGH = 0x80, // full 2.8 MHz speed when set, Apple II 1 MHz when clear + SPEED_POWERON = 0x40, // ROM 03 only; indicates machine turned on by power switch (as opposed to ?) + SPEED_ALLBANKS = 0x10, // enables bank 0/1 shadowing in all banks (not supported) + SPEED_DISKIISL7 = 0x08, // enable Disk II motor on detect for slot 7 SPEED_DISKIISL6 = 0x04, // enable Disk II motor on detect for slot 6 SPEED_DISKIISL5 = 0x02, // enable Disk II motor on detect for slot 5 SPEED_DISKIISL4 = 0x01 // enable Disk II motor on detect for slot 4 @@ -289,43 +289,43 @@ public: enum disk_reg_bits { - DISKREG_35HEADSEL = 0x80, // head select for 3.5" "dumb" Sony drives - DISKREG_35ENABLE = 0x40 // 1 to enable 3.5" drives, 0 to chain through to 5.25" + DISKREG_35HEADSEL = 0x80, // head select for 3.5" "dumb" Sony drives + DISKREG_35ENABLE = 0x40 // 1 to enable 3.5" drives, 0 to chain through to 5.25" }; enum irq_sources { - IRQS_DOC = 0, - IRQS_SCAN = 1, - IRQS_ADB = 2, - IRQS_VBL = 3, - IRQS_SECOND = 4, - IRQS_QTRSEC = 5, - IRQS_SLOT = 6, - IRQS_SCC = 7 + IRQS_DOC = 0, + IRQS_SCAN = 1, + IRQS_ADB = 2, + IRQS_VBL = 3, + IRQS_SECOND = 4, + IRQS_QTRSEC = 5, + IRQS_SLOT = 6, + IRQS_SCC = 7 }; enum intflag_bits { - INTFLAG_IRQASSERTED = 0x01, + INTFLAG_IRQASSERTED = 0x01, INTFLAG_M2MOUSEMOVE = 0x02, - INTFLAG_M2MOUSESW = 0x04, - INTFLAG_VBL = 0x08, - INTFLAG_QUARTER = 0x10, - INTFLAG_AN3 = 0x20, + INTFLAG_M2MOUSESW = 0x04, + INTFLAG_VBL = 0x08, + INTFLAG_QUARTER = 0x10, + INTFLAG_AN3 = 0x20, INTFLAG_MOUSEDOWNLAST = 0x40, - INTFLAG_MOUSEDOWN = 0x80 + INTFLAG_MOUSEDOWN = 0x80 }; enum vgcint_bits { - VGCINT_EXTERNALEN = 0x01, - VGCINT_SCANLINEEN = 0x02, + VGCINT_EXTERNALEN = 0x01, + VGCINT_SCANLINEEN = 0x02, VGCINT_SECONDENABLE = 0x04, - VGCINT_EXTERNAL = 0x10, - VGCINT_SCANLINE = 0x20, - VGCINT_SECOND = 0x40, - VGCINT_ANYVGCINT = 0x80 + VGCINT_EXTERNAL = 0x10, + VGCINT_SCANLINE = 0x20, + VGCINT_SECOND = 0x40, + VGCINT_ANYVGCINT = 0x80 }; enum apple2gs_clock_mode @@ -391,7 +391,7 @@ public: int apple2_fdc_has_525(); void apple2_iwm_setdiskreg(uint8_t data); - uint8_t m_diskreg; // move into private when we can + uint8_t m_diskreg; // move into private when we can void rom1_init() { m_is_rom3 = false; } void rom3_init() { m_is_rom3 = true; } @@ -612,7 +612,7 @@ private: // FF6ACF is speed test routine in ROM 3 #define slow_cycle() \ -{ \ +{ \ if (m_last_speed) \ {\ m_slow_counter += 0x0003cccc; \ @@ -710,20 +710,20 @@ WRITE_LINE_MEMBER(apple2gs_state::a2bus_inh_w) // this facilitates the documented behavior from the Firmware Reference. READ8_MEMBER(apple2gs_state::apple2gs_read_vector) { - // when IOLC shadowing is enabled, vector fetches always go to ROM, - // regardless of the language card config. - if (!(m_shadow & SHAD_IOLC)) - { - return m_maincpu->space(AS_PROGRAM).read_byte(offset | 0xFFFFE0); - } - else // else vector fetches from bank 0 RAM - { - return m_maincpu->space(AS_PROGRAM).read_byte((offset & 0xffff) | 0xFFE0); - } + // when IOLC shadowing is enabled, vector fetches always go to ROM, + // regardless of the language card config. + if (!(m_shadow & SHAD_IOLC)) + { + return m_maincpu->space(AS_PROGRAM).read_byte(offset | 0xFFFFE0); + } + else // else vector fetches from bank 0 RAM + { + return m_maincpu->space(AS_PROGRAM).read_byte((offset & 0xffff) | 0xFFE0); + } } /*************************************************************************** - ADB MCU simulation + ADB MCU simulation ***************************************************************************/ #if !RUN_ADB_MICRO READ_LINE_MEMBER(apple2gs_state::ay3600_shift_r) @@ -909,7 +909,7 @@ void apple2gs_state::adb_do_command() case 0x13: /* mystery command 0x13 */ break; - case 0x84: // ACS demo disk #2 has a bug and writes this accidentally to $C026 + case 0x84: // ACS demo disk #2 has a bug and writes this accidentally to $C026 break; case 0xb0: case 0xb1: case 0xb2: case 0xb3: @@ -1038,7 +1038,7 @@ void apple2gs_state::adb_write_datareg(uint8_t data) /* ignore for now */ break; - case 0x84: // ACS demo disk #2 has a bug and writes this accidentally to $C026 + case 0x84: // ACS demo disk #2 has a bug and writes this accidentally to $C026 break; case 0xb0: case 0xb1: case 0xb2: case 0xb3: @@ -1049,7 +1049,7 @@ void apple2gs_state::adb_write_datareg(uint8_t data) m_adb_command_length = 2; break; - case 0xe2: // Jam Session sends this when starting a song + case 0xe2: // Jam Session sends this when starting a song break; case 0xf2: @@ -1199,12 +1199,12 @@ void apple2gs_state::machine_start() m_inh_bank = 0; m_nvram->set_base(m_clock_bram, sizeof(m_clock_bram)); - + // setup speaker toggle volumes. this should be done mathematically probably, // but these ad-hoc values aren't too bad. - static const int16_t lvlTable[16] = + static const int16_t lvlTable[16] = { - 0x0000, 0x03ff, 0x04ff, 0x05ff, 0x06ff, 0x07ff, 0x08ff, 0x09ff, + 0x0000, 0x03ff, 0x04ff, 0x05ff, 0x06ff, 0x07ff, 0x08ff, 0x09ff, 0x0aff, 0x0bff, 0x0cff, 0x0fff, 0x1fff, 0x3fff, 0x5fff, 0x7fff }; m_speaker->set_levels(16, lvlTable); @@ -1430,7 +1430,7 @@ void apple2gs_state::machine_reset() // RESEARCH: how does RESET affect LC state and aux banking states? auxbank_update(); update_slotrom_banks(); - + // with all the banking reset, now reset the CPU m_maincpu->reset(); } @@ -1571,7 +1571,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2gs_state::apple2_interrupt) } } } - else if (scanline == (192+BORDER_TOP+1)) + else if (scanline == (192+BORDER_TOP+1)) { m_adbmicro->set_input_line(1, ASSERT_LINE); } @@ -1613,7 +1613,7 @@ PALETTE_INIT_MEMBER(apple2gs_state, apple2gs) uint32_t apple2gs_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return m_video->screen_update_GS(screen, bitmap, cliprect); -} +} /*************************************************************************** I/O @@ -2061,9 +2061,9 @@ READ8_MEMBER(apple2gs_state::c000_r) #if RUN_ADB_MICRO return keyglu_816_read(GLU_C010); #else - ret = m_transchar | (m_anykeydown ? 0x80 : 0x00); - m_strobe = 0; - return ret; + ret = m_transchar | (m_anykeydown ? 0x80 : 0x00); + m_strobe = 0; + return ret; #endif case 0x11: // read LCRAM2 (LC Dxxx bank) @@ -2111,10 +2111,10 @@ READ8_MEMBER(apple2gs_state::c000_r) case 0x1f: // read 80COL return m_video->m_80col ? 0x80 : 0x00; - case 0x22: // TEXTCOL + case 0x22: // TEXTCOL return m_textcol; - case 0x23: // VGCINT + case 0x23: // VGCINT return m_vgcint; #if RUN_ADB_MICRO case 0x24: // MOUSEDATA */ @@ -2187,18 +2187,18 @@ READ8_MEMBER(apple2gs_state::c000_r) return adb_read_kmstatus(); #endif - case 0x29: // NEWVIDEO + case 0x29: // NEWVIDEO return m_video->m_newvideo; - case 0x2d: // SLOTROMSEL + case 0x2d: // SLOTROMSEL return m_slotromsel; - case 0x2e: // VERTCNT + case 0x2e: // VERTCNT return get_vpos() >> 1; - case 0x2f: // HORIZCNT + case 0x2f: // HORIZCNT ret = m_screen->hpos() / 11; - if (ret > 0) + if (ret > 0) { ret += 0x40; } @@ -2209,23 +2209,23 @@ READ8_MEMBER(apple2gs_state::c000_r) } return ret; - case 0x31: // DISKREG + case 0x31: // DISKREG return m_diskreg; case 0x33: // CLOCKDATA return m_clkdata; - case 0x34: // BORDERCOL + case 0x34: // BORDERCOL return m_clock_control; - case 0x35: // SHADOW + case 0x35: // SHADOW return m_shadow; - case 0x36: // SPEED/CYAREG + case 0x36: // SPEED/CYAREG return m_speed; case 0x38: // SCCBREG - return m_scc->cb_r(space, 0); + return m_scc->cb_r(space, 0); case 0x39: // SCCAREG return m_scc->ca_r(space, 0); @@ -2261,12 +2261,12 @@ READ8_MEMBER(apple2gs_state::c000_r) return m_sndglu_addr & 0xff; case 0x3f: // SOUNDADRH - return (m_sndglu_addr >> 8) & 0xff; + return (m_sndglu_addr >> 8) & 0xff; - case 0x41: // INTEN + case 0x41: // INTEN return m_inten; - case 0x46: // INTFLAG + case 0x46: // INTFLAG return (m_an3 ? INTFLAG_AN3 : 0x00) | m_intflag; case 0x60: // button 3 on IIgs @@ -2422,17 +2422,17 @@ WRITE8_MEMBER(apple2gs_state::c000_w) case 0x20: break; - case 0x21: // MONOCHROME + case 0x21: // MONOCHROME m_video->m_monochrome = data; break; - case 0x22: // TEXTCOL + case 0x22: // TEXTCOL m_textcol = data; m_video->m_GSfg = (data >> 4) & 0xf; m_video->m_GSbg = data & 0xf; break; - case 0x23: // VGCINT + case 0x23: // VGCINT if ((m_vgcint & VGCINT_SECOND) && !(data & VGCINT_SECOND)) { lower_irq(IRQS_SECOND); @@ -2472,20 +2472,20 @@ WRITE8_MEMBER(apple2gs_state::c000_w) break; #endif - case 0x29: // NEWVIDEO + case 0x29: // NEWVIDEO m_video->m_newvideo = data; break; - case 0x2d: // SLOTROMSEL + case 0x2d: // SLOTROMSEL m_slotromsel = data; break; - case 0x31: // DISKREG + case 0x31: // DISKREG m_diskreg = data; apple2_iwm_setdiskreg(m_diskreg); break; - case 0x32: // VGCINTCLEAR + case 0x32: // VGCINTCLEAR //printf("%02x to VGCINTCLEAR\n", data); // one second if ((m_vgcint & VGCINT_SECOND) && !(data & VGCINT_SECOND)) @@ -2507,11 +2507,11 @@ WRITE8_MEMBER(apple2gs_state::c000_w) } break; - case 0x33: // CLOCKDATA + case 0x33: // CLOCKDATA m_clkdata = data; break; - case 0x34: // CLOCKCTL + case 0x34: // CLOCKCTL m_clock_control = data & 0x7f; m_video->m_GSborder = data & 0xf; if (data & 0x80) @@ -2520,7 +2520,7 @@ WRITE8_MEMBER(apple2gs_state::c000_w) } break; - case 0x35: // SHADOW + case 0x35: // SHADOW m_shadow = data; // handle I/O and language card inhibit bits here @@ -2536,7 +2536,7 @@ WRITE8_MEMBER(apple2gs_state::c000_w) } break; - case 0x36: // SPEED + case 0x36: // SPEED m_speed = data; if (m_speed & SPEED_ALLBANKS) @@ -2596,7 +2596,7 @@ WRITE8_MEMBER(apple2gs_state::c000_w) m_sndglu_addr |= data<<8; break; - case 0x41: // INTEN + case 0x41: // INTEN m_inten = data & 0x1f; if (!(data & 0x10)) { @@ -2609,13 +2609,13 @@ WRITE8_MEMBER(apple2gs_state::c000_w) //printf("%02x to INTEN, now %02x\n", data, m_vgcint); break; - case 0x47: // CLRVBLINT + case 0x47: // CLRVBLINT m_intflag &= ~INTFLAG_VBL; lower_irq(IRQS_VBL); lower_irq(IRQS_QTRSEC); break; - case 0x68: // STATEREG + case 0x68: // STATEREG m_altzp = (data & 0x80); m_page2 = (data & 0x40); m_ramrd = (data & 0x20); @@ -2764,11 +2764,11 @@ uint8_t apple2gs_state::read_slot_rom(address_space &space, int slotbias, int of { int slotnum = ((offset>>8) & 0xf) + slotbias; -// printf("read_slot_rom: sl %d offs %x, cnxx_slot %d\n", slotnum, offset, m_cnxx_slot); +// printf("read_slot_rom: sl %d offs %x, cnxx_slot %d\n", slotnum, offset, m_cnxx_slot); if (m_slotdevice[slotnum] != nullptr) { -// printf("slotdevice is not null\n"); +// printf("slotdevice is not null\n"); if ((m_cnxx_slot == CNXX_UNCLAIMED) && (m_slotdevice[slotnum]->take_c800()) && (!machine().side_effects_disabled())) { m_cnxx_slot = slotnum; @@ -2810,9 +2810,9 @@ uint8_t apple2gs_state::read_int_rom(address_space &space, int slotbias, int off return m_rom[slotbias + offset]; } -READ8_MEMBER(apple2gs_state::c100_r) -{ - int slot = ((offset>>8) & 0xf) + 1; +READ8_MEMBER(apple2gs_state::c100_r) +{ + int slot = ((offset>>8) & 0xf) + 1; slow_cycle(); @@ -2825,15 +2825,15 @@ READ8_MEMBER(apple2gs_state::c100_r) return read_slot_rom(space, 1, offset); } -WRITE8_MEMBER(apple2gs_state::c100_w) -{ - int slot = ((offset>>8) & 0xf) + 1; +WRITE8_MEMBER(apple2gs_state::c100_w) +{ + int slot = ((offset>>8) & 0xf) + 1; slow_cycle(); if ((m_slotromsel & (1 << slot))) { - write_slot_rom(space, 1, offset, data); + write_slot_rom(space, 1, offset, data); } } @@ -2843,9 +2843,9 @@ READ8_MEMBER(apple2gs_state::c400_int_r) { slow_cycle(); return read_int_rom(sp READ8_MEMBER(apple2gs_state::c300_r) { slow_cycle(); return read_slot_rom(space, 3, offset); } WRITE8_MEMBER(apple2gs_state::c300_w) { slow_cycle(); write_slot_rom(space, 3, offset, data); } -READ8_MEMBER(apple2gs_state::c400_r) -{ - int slot = ((offset>>8) & 0xf) + 4; +READ8_MEMBER(apple2gs_state::c400_r) +{ + int slot = ((offset>>8) & 0xf) + 4; slow_cycle(); @@ -2854,18 +2854,18 @@ READ8_MEMBER(apple2gs_state::c400_r) return read_int_rom(space, 0x3c400, offset); } - return read_slot_rom(space, 4, offset); + return read_slot_rom(space, 4, offset); } -WRITE8_MEMBER(apple2gs_state::c400_w) -{ - int slot = ((offset>>8) & 0xf) + 1; +WRITE8_MEMBER(apple2gs_state::c400_w) +{ + int slot = ((offset>>8) & 0xf) + 1; slow_cycle(); if ((m_slotromsel & (1 << slot))) { - write_slot_rom(space, 4, offset, data); + write_slot_rom(space, 4, offset, data); } } @@ -2898,12 +2898,12 @@ READ8_MEMBER(apple2gs_state::c800_int_r) update_slotrom_banks(); return m_rom[offset + 0x3c800]; } - + if (m_cnxx_slot == CNXX_INTROM) { return m_rom[offset + 0x3c800]; } - + return read_floatingbus(); } @@ -3283,10 +3283,10 @@ uint8_t apple2gs_state::read_floatingbus() READ8_MEMBER(apple2gs_state::ram0000_r) { slow_cycle(); return m_ram_ptr[offset]; } WRITE8_MEMBER(apple2gs_state::ram0000_w) { slow_cycle(); m_ram_ptr[offset] = data; } READ8_MEMBER(apple2gs_state::auxram0000_r) { slow_cycle(); return m_ram_ptr[offset+0x10000]; } -WRITE8_MEMBER(apple2gs_state::auxram0000_w) +WRITE8_MEMBER(apple2gs_state::auxram0000_w) { slow_cycle(); - m_ram_ptr[offset+0x10000] = data; + m_ram_ptr[offset+0x10000] = data; if ((offset >= 0x9e00) && (offset <= 0x9fff)) { @@ -3304,21 +3304,21 @@ WRITE8_MEMBER(apple2gs_state::b0ram0000_w) { m_ram_ptr[offset+0x20000] = data; } READ8_MEMBER( apple2gs_state::b0ram0200_r) { return m_ram_ptr[offset+0x20200]; } WRITE8_MEMBER(apple2gs_state::b0ram0200_w) { m_ram_ptr[offset+0x20200] = data; } READ8_MEMBER( apple2gs_state::b0ram0400_r) { return m_ram_ptr[offset+0x20400]; } -WRITE8_MEMBER(apple2gs_state::b0ram0400_w) -{ - m_ram_ptr[offset+0x20400] = data; - if (!(m_shadow & SHAD_TXTPG1)) +WRITE8_MEMBER(apple2gs_state::b0ram0400_w) +{ + m_ram_ptr[offset+0x20400] = data; + if (!(m_shadow & SHAD_TXTPG1)) { slow_cycle(); m_ram_ptr[offset+0x0400] = data; } } READ8_MEMBER( apple2gs_state::b0ram0800_r) { return m_ram_ptr[offset+0x20800]; } -WRITE8_MEMBER(apple2gs_state::b0ram0800_w) -{ - m_ram_ptr[offset+0x20800] = data; +WRITE8_MEMBER(apple2gs_state::b0ram0800_w) +{ + m_ram_ptr[offset+0x20800] = data; - if (offset < 0x400) // TODO: ROM 03 + if (offset < 0x400) // TODO: ROM 03 { if ((!(m_shadow & SHAD_TXTPG2)) && (m_is_rom3)) { @@ -3328,9 +3328,9 @@ WRITE8_MEMBER(apple2gs_state::b0ram0800_w) } } READ8_MEMBER( apple2gs_state::b0ram2000_r) { return m_ram_ptr[offset+0x22000]; } -WRITE8_MEMBER(apple2gs_state::b0ram2000_w) -{ - m_ram_ptr[offset+0x22000] = data; +WRITE8_MEMBER(apple2gs_state::b0ram2000_w) +{ + m_ram_ptr[offset+0x22000] = data; if (!(m_shadow & SHAD_HIRESPG1)) { slow_cycle(); @@ -3338,9 +3338,9 @@ WRITE8_MEMBER(apple2gs_state::b0ram2000_w) } } READ8_MEMBER( apple2gs_state::b0ram4000_r) { return m_ram_ptr[offset+0x24000]; } -WRITE8_MEMBER(apple2gs_state::b0ram4000_w) -{ - m_ram_ptr[offset+0x24000] = data; +WRITE8_MEMBER(apple2gs_state::b0ram4000_w) +{ + m_ram_ptr[offset+0x24000] = data; if (offset < 0x2000) { if (!(m_shadow & SHAD_HIRESPG2)) @@ -3356,9 +3356,9 @@ WRITE8_MEMBER(apple2gs_state::b1ram0000_w) { m_ram_ptr[offset+0x30000] = data; } READ8_MEMBER( apple2gs_state::b1ram0200_r) { return m_ram_ptr[offset+0x30200]; } WRITE8_MEMBER(apple2gs_state::b1ram0200_w) { m_ram_ptr[offset+0x30200] = data; } READ8_MEMBER( apple2gs_state::b1ram0400_r) { return m_ram_ptr[offset+0x30400]; } -WRITE8_MEMBER(apple2gs_state::b1ram0400_w) -{ - m_ram_ptr[offset+0x30400] = data; +WRITE8_MEMBER(apple2gs_state::b1ram0400_w) +{ + m_ram_ptr[offset+0x30400] = data; if (!(m_shadow & SHAD_TXTPG1)) { slow_cycle(); @@ -3366,9 +3366,9 @@ WRITE8_MEMBER(apple2gs_state::b1ram0400_w) } } READ8_MEMBER( apple2gs_state::b1ram0800_r) { return m_ram_ptr[offset+0x30800]; } -WRITE8_MEMBER(apple2gs_state::b1ram0800_w) -{ - m_ram_ptr[offset+0x30800] = data; +WRITE8_MEMBER(apple2gs_state::b1ram0800_w) +{ + m_ram_ptr[offset+0x30800] = data; if (offset < 0x400) { slow_cycle(); @@ -3376,18 +3376,18 @@ WRITE8_MEMBER(apple2gs_state::b1ram0800_w) } } READ8_MEMBER( apple2gs_state::b1ram2000_r) { return m_ram_ptr[offset+0x32000]; } -WRITE8_MEMBER(apple2gs_state::b1ram2000_w) +WRITE8_MEMBER(apple2gs_state::b1ram2000_w) { - m_ram_ptr[offset+0x32000] = data; + m_ram_ptr[offset+0x32000] = data; if ((!(m_shadow & SHAD_HIRESPG1) && !(m_shadow & SHAD_AUXHIRES)) || (!(m_shadow & SHAD_SUPERHIRES))) { auxram0000_w(space, offset+0x2000, data); } } READ8_MEMBER( apple2gs_state::b1ram4000_r) { return m_ram_ptr[offset+0x34000]; } -WRITE8_MEMBER(apple2gs_state::b1ram4000_w) -{ - m_ram_ptr[offset+0x34000] = data; +WRITE8_MEMBER(apple2gs_state::b1ram4000_w) +{ + m_ram_ptr[offset+0x34000] = data; if (offset < 0x2000) { if (!(m_shadow & SHAD_HIRESPG2) && !(m_shadow & SHAD_AUXHIRES)) @@ -3404,38 +3404,38 @@ WRITE8_MEMBER(apple2gs_state::b1ram4000_w) } } -READ8_MEMBER(apple2gs_state::bank0_c000_r) -{ +READ8_MEMBER(apple2gs_state::bank0_c000_r) +{ if (m_ramrd) { return m_ram_ptr[offset + 0x3c000]; } - return m_ram_ptr[offset + 0x2c000]; + return m_ram_ptr[offset + 0x2c000]; } -WRITE8_MEMBER(apple2gs_state::bank0_c000_w) -{ +WRITE8_MEMBER(apple2gs_state::bank0_c000_w) +{ if (m_ramwrt) { m_ram_ptr[offset + 0x3c000] = data; return; } - m_ram_ptr[offset + 0x2c000] = data; + m_ram_ptr[offset + 0x2c000] = data; } READ8_MEMBER(apple2gs_state::bank1_0000_r) { return m_ram_ptr[offset + 0x30000]; } WRITE8_MEMBER(apple2gs_state::bank1_0000_w) { m_ram_ptr[offset + 0x30000] = data; } READ8_MEMBER(apple2gs_state::bank1_c000_r) { return m_ram_ptr[offset + 0x3c000]; } WRITE8_MEMBER(apple2gs_state::bank1_c000_w) { m_ram_ptr[offset + 0x3c000] = data; } -WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) -{ - m_ram_ptr[offset + 0x30000] = data; +WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) +{ + m_ram_ptr[offset + 0x30000] = data; switch (offset>>8) { - case 0x04: // text page 1 + case 0x04: // text page 1 case 0x05: case 0x06: case 0x07: @@ -3446,7 +3446,7 @@ WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) } break; - case 0x08: // text page 2 (only shadowable on ROM 03) + case 0x08: // text page 2 (only shadowable on ROM 03) case 0x09: case 0x0a: case 0x0b: @@ -3465,10 +3465,10 @@ WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) if ((!(m_shadow & SHAD_HIRESPG1) && !(m_shadow & SHAD_AUXHIRES)) || (!(m_shadow & SHAD_SUPERHIRES))) { slow_cycle(); - m_ram_ptr[offset + 0x10000] = data; + m_ram_ptr[offset + 0x10000] = data; } break; - + // hi-res page 2 case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: @@ -3477,7 +3477,7 @@ WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) if ((!(m_shadow & SHAD_HIRESPG2) && !(m_shadow & SHAD_AUXHIRES)) || (!(m_shadow & SHAD_SUPERHIRES))) { slow_cycle(); - m_ram_ptr[offset + 0x10000] = data; + m_ram_ptr[offset + 0x10000] = data; } break; @@ -3485,7 +3485,7 @@ WRITE8_MEMBER(apple2gs_state::bank1_0000_sh_w) if ((offset >= 0x6000) && (offset <= 0x9fff)) { if (!(m_shadow & SHAD_SUPERHIRES)) - { + { auxram0000_w(space, offset, data); } } @@ -3689,10 +3689,10 @@ void apple2gs_state::a2gs_es5503_map(address_map &map) } /*************************************************************************** - ADB microcontroller + KEYGLU emulation + ADB microcontroller + KEYGLU emulation - Huge thanks to Neil Parker's writeup on the ADB microcontroller! - http://www.llx.com/~nparker/a2/adb.html + Huge thanks to Neil Parker's writeup on the ADB microcontroller! + http://www.llx.com/~nparker/a2/adb.html ***************************************************************************/ READ8_MEMBER(apple2gs_state::adbmicro_p0_in) @@ -3789,9 +3789,9 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out) { if (((data & 0x08) == 0x08) != m_adb_line) { -// m_adb_dtime = (int)(machine().time().as_ticks(XTAL(3'579'545)*2) - m_last_adb_time); -// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); -// m_last_adb_time = machine().time().as_ticks(XTAL(3'579'545)*2); +// m_adb_dtime = (int)(machine().time().as_ticks(XTAL(3'579'545)*2) - m_last_adb_time); +// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime); +// m_last_adb_time = machine().time().as_ticks(XTAL(3'579'545)*2); m_adb_line = (data & 0x8) ? true : false; } } @@ -3952,7 +3952,7 @@ uint8_t apple2gs_state::keyglu_816_read(uint8_t offset) { m_glu_816_read_dstat = false; m_glu_regs[GLU_KG_STATUS] &= ~KGS_DATA_FULL; -// keyglu_regen_irqs(); +// keyglu_regen_irqs(); // printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); } return m_glu_regs[GLU_DATA]; @@ -4527,7 +4527,7 @@ static void apple2_cards(device_slot_interface &device) device.option_add("ezcgi9938", A2BUS_EZCGI_9938); /* E-Z Color Graphics Interface (TMS9938) */ device.option_add("ezcgi9958", A2BUS_EZCGI_9958); /* E-Z Color Graphics Interface (TMS9958) */ // device.option_add("magicmusician", A2BUS_MAGICMUSICIAN); /* Magic Musician Card */ -// device.option_add("pcxport", A2BUS_PCXPORTER); /* Applied Engineering PC Transporter */ +// device.option_add("pcxport", A2BUS_PCXPORTER); /* Applied Engineering PC Transporter */ } MACHINE_CONFIG_START( apple2gs_state::apple2gs ) @@ -4936,7 +4936,7 @@ ROM_START(apple2gsr0p2) // 3/10/1986 Cortland prototype, boots as "Apple //'ing ROM_LOAD( "341-0132-d.e12", 0x000, 0x800, CRC(c506efb9) SHA1(8e14e85c645187504ec9d162b3ea614a0c421d32) ) ROM_END -/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ COMP( 1989, apple2gs, 0, apple2, apple2gs, apple2gs, apple2gs_state, rom3_init, "Apple Computer", "Apple IIgs (ROM03)", MACHINE_SUPPORTS_SAVE ) COMP( 198?, apple2gsr3p, apple2gs, 0, apple2gs, apple2gs, apple2gs_state, rom3_init, "Apple Computer", "Apple IIgs (ROM03 prototype)", MACHINE_NOT_WORKING ) COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, rom1_init, "Apple Computer", "Apple IIgs (ROM01)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index ddbe81ffdba..00aba7bc985 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -1915,7 +1915,7 @@ GFXDECODE_END **************************************************************************/ // TODO: irq generation is unknown, as usual with Jaleco/NMK HW -// - irq 1 is comms related, presumably the bridge chip is capable of sending the irq signal at given times. +// - irq 1 is comms related, presumably the bridge chip is capable of sending the irq signal at given times. // Wild Pilot of course doesn't need it. // - irq 2/4 controls gameplay speed, currently unknown about the timing // - 2 updates palettes while 4 is vblank? @@ -1925,12 +1925,12 @@ GFXDECODE_END TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::bigrun_scanline) { int scanline = param; - + if(m_screen->frame_number() & 1) { if(scanline == 240) m_cpu1->set_input_line(1, HOLD_LINE); - + return; } diff --git a/src/mame/drivers/cms.cpp b/src/mame/drivers/cms.cpp index c57a4b50635..4d9090a0577 100644 --- a/src/mame/drivers/cms.cpp +++ b/src/mame/drivers/cms.cpp @@ -104,7 +104,7 @@ WRITE8_MEMBER(cms_state::map_select_w) m_map_select = (data & 0x03) << 2; logerror("map select %02x\n", data); //if (m_map_select == 0x00) - // m_bank1->set_entry(m_page_select); + // m_bank1->set_entry(m_page_select); //else m_bank1->set_entry(m_map_select); } diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 0bbbc8dc8b5..b3ff0541096 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -10391,43 +10391,43 @@ ROM_END /* 05/13/92 MSTREET-6 - - There are quite a few variations of this board. The main differences seem to be the amount and size of roms around the 68k. - Some variations have an additional "patch" rom and palce or gal that patches various chunks of code over the main program roms. - This adds the usual "rainbow edition" style gameplay hacks, such as air fireballs, change character mid-game, etc. - The boards can be run without the patch rom by removing it and the pal/gal and linking pins 1-19, 2-18, 11-16 of the empty gal socket. - (There is also a jumper that can be soldered instead for the third connection.) - - Luckily one of my boards has an unprotected gal so I was able to decode the rom patching: - - patch rom program space - -------------------------------------- - 0x00000-0x07fff -> 0x000000-0x007fff - 0x08000-0x27fff -> 0x030000-0x04ffff - 0x28000-0x37fff -> 0x170000-0x17ffff - - Gfx: - There are six 8Mbit roms which match the official sf2ce set almost exactly (7 bytes diff in one rom). - There are also another two 2Mbit roms which contain very near identical data. - Not sure why the bootleg hardware needs this or how it should be represented in emulation. - There is also a 512Kbit rom that's purpose is unknown (possibly related to priority according to notes in other bootleg sets). - - Sound: - YM2151 is clone marked "KA51". + + There are quite a few variations of this board. The main differences seem to be the amount and size of roms around the 68k. + Some variations have an additional "patch" rom and palce or gal that patches various chunks of code over the main program roms. + This adds the usual "rainbow edition" style gameplay hacks, such as air fireballs, change character mid-game, etc. + The boards can be run without the patch rom by removing it and the pal/gal and linking pins 1-19, 2-18, 11-16 of the empty gal socket. + (There is also a jumper that can be soldered instead for the third connection.) + + Luckily one of my boards has an unprotected gal so I was able to decode the rom patching: + + patch rom program space + -------------------------------------- + 0x00000-0x07fff -> 0x000000-0x007fff + 0x08000-0x27fff -> 0x030000-0x04ffff + 0x28000-0x37fff -> 0x170000-0x17ffff + + Gfx: + There are six 8Mbit roms which match the official sf2ce set almost exactly (7 bytes diff in one rom). + There are also another two 2Mbit roms which contain very near identical data. + Not sure why the bootleg hardware needs this or how it should be represented in emulation. + There is also a 512Kbit rom that's purpose is unknown (possibly related to priority according to notes in other bootleg sets). + + Sound: + YM2151 is clone marked "KA51". YM3012 is clone marked "KA12". - MSM6295 is clone marked "TD735". - - Other: - All roms have nonsense markings such as KM418C256, KM416C256 etc. - Obviously they are not Samsung soj/tsop FPM DRAMs ;) - Main clock is 10MHz, rather than usual 12MHZ for champion edition. - Sets b and c: - Turbo mode on SW(C):1. - Press start to change character mid-game. (bug: screen goes dark when changing character, happens in attract mode as well). + MSM6295 is clone marked "TD735". + + Other: + All roms have nonsense markings such as KM418C256, KM416C256 etc. + Obviously they are not Samsung soj/tsop FPM DRAMs ;) + Main clock is 10MHz, rather than usual 12MHZ for champion edition. + Sets b and c: + Turbo mode on SW(C):1. + Press start to change character mid-game. (bug: screen goes dark when changing character, happens in attract mode as well). */ ROM_START( sf2cems6a ) /* 920313 USA (this set matches "sf2ceuab4" in FBA) */ - ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68k code */ + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68k code */ ROM_LOAD16_WORD_SWAP( "ms6.u196", 0x000000, 0x100000, CRC(596609d4) SHA1(4d876e6e44554eccbd0c5ea2d2d09e5024af0f9f) ) // == sf2m3: u196chp + u222chp (interleaved) ROM_LOAD16_WORD_SWAP( "ms6.u10", 0x100000, 0x80000, CRC(ed4186bd) SHA1(f3dfe91d8f4384275190b0d86488843c1161d86f) ) // == sf2ce: s92_21a.6f 1st half doubled, also == sf2dkot2: turboii.21 @@ -10450,25 +10450,25 @@ ROM_START( sf2cems6a ) /* 920313 USA (this set matches "sf2ceuab4" in FBA) */ ROM_CONTINUE( 0x400004, 0x20000 ) // 1st half == ms6.u19 0x00000-0x20000, 2nd half == ms6.u19 0x80000-0xa0000 ROMX_LOAD( "ms6.u29", 0x400002, 0x20000, CRC(e4eca601) SHA1(acee4988f12a037a3b50f3923892fdac65f35805), ROM_GROUPWORD | ROM_SKIP(6) ) // == sf2m8: yyc-8.9 + yyc-9.8 (interleaved) ROM_CONTINUE( 0x400006, 0x20000 ) // 1st half != ms6.u18 0x00000-0x20000 (4 bytes diff), 2nd half == ms6.u18 0x80000-0xa0000 - + ROM_REGION( 0x18000, "audiocpu", 0 ) /* z80 code */ ROM_LOAD( "ms6.u191", 0x00000, 0x08000, CRC(08f6b60e) SHA1(8258fcaca4ac419312531eec67079b97f471179c) ) // == sf2ce: s92_09.11a ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x40000, "oki", 0 ) /* samples */ ROM_LOAD( "ms6.u210", 0x00000, 0x40000, CRC(6cfffb11) SHA1(995526183ffd35f92e9096500a3fe6237faaa2dd) ) // == sf2ce: s92_18.11c + s92_19.12c, also == sf2amf2: fun-u210.bin, sf2rules: voice.u210, sf2m8: b-16.6 - + ROM_REGION( 0x10000, "user1", 0 ) /* unknown, priority? */ ROM_LOAD( "ms6.u133", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) // == loads other bootleg sets ROM_END ROM_START( sf2cems6b ) /* 920322 USA */ - ROM_REGION( 0x40000, "patch", 0 ) /* patch rom */ + ROM_REGION( 0x40000, "patch", 0 ) /* patch rom */ ROM_LOAD16_WORD_SWAP( "ms6b.u0", 0x00000, 0x40000, CRC(b6f3724b) SHA1(aa8eea819fdaf205ca068067a4624715a8cf6c8c) ) - + ROM_REGION( 0x0200, "patchpld", 0 ) /* patch pld gal16v8 */ ROM_LOAD( "ms6b.44", 0x0000, 0x0117, CRC(8ceec769) SHA1(d646ed075182f3724c0c581065665b1c99ce180d) ) - + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68k code */ ROM_LOAD16_WORD_SWAP( "ms6b.u196", 0x000000, 0x100000, CRC(435153d5) SHA1(3f6f318a9b3def8d62ee576dbaaef623d55c1c64) ) ROM_LOAD16_WORD_SWAP( "ms6b.u10", 0x100000, 0x40000, CRC(c812b7b2) SHA1(23ed0e1bd8b2015b39ad5e452dff0e372df0d5c9) ) @@ -10501,22 +10501,22 @@ ROM_START( sf2cems6b ) /* 920322 USA */ ROM_REGION( 0x40000, "oki", 0 ) /* samples */ ROM_LOAD( "ms6.u210", 0x00000, 0x40000, CRC(6cfffb11) SHA1(995526183ffd35f92e9096500a3fe6237faaa2dd) ) - + ROM_REGION( 0x10000, "user1", 0 ) /* unknown, priority? */ ROM_LOAD( "ms6.u133", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) ROM_END ROM_START( sf2cems6c ) /* 920322 USA */ - ROM_REGION( 0x40000, "patch", 0 ) /* patch rom */ + ROM_REGION( 0x40000, "patch", 0 ) /* patch rom */ ROM_LOAD16_WORD_SWAP( "ms6c.u0", 0x00000, 0x40000, CRC(04088b61) SHA1(03c361a0c9c70c21ef53351d5f975b06f51ce2e0) ) - + ROM_REGION( 0x0200, "patchpld", 0 ) /* patch pld palce16v8, protected, using gal dump from sf2cems6b */ ROM_LOAD( "ms6b.44", 0x0000, 0x0117, CRC(8ceec769) SHA1(d646ed075182f3724c0c581065665b1c99ce180d) ) - + ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68k code */ ROM_LOAD16_WORD_SWAP( "ms6b.u196", 0x000000, 0x100000, CRC(435153d5) SHA1(3f6f318a9b3def8d62ee576dbaaef623d55c1c64) ) ROM_LOAD16_WORD_SWAP( "ms6b.u10", 0x100000, 0x40000, CRC(c812b7b2) SHA1(23ed0e1bd8b2015b39ad5e452dff0e372df0d5c9) ) - + ROM_COPY( "patch", 0x00000, 0x000000, 0x8000 ) ROM_COPY( "patch", 0x08000, 0x030000, 0x20000 ) ROM_COPY( "patch", 0x28000, 0x170000, 0x10000 ) @@ -10545,7 +10545,7 @@ ROM_START( sf2cems6c ) /* 920322 USA */ ROM_REGION( 0x40000, "oki", 0 ) /* samples */ ROM_LOAD( "ms6.u210", 0x00000, 0x40000, CRC(6cfffb11) SHA1(995526183ffd35f92e9096500a3fe6237faaa2dd) ) - + ROM_REGION( 0x10000, "user1", 0 ) /* unknown, priority? */ ROM_LOAD( "ms6.u133", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) ROM_END diff --git a/src/mame/drivers/decstation.cpp b/src/mame/drivers/decstation.cpp index b7596a3f4d0..43d4973902c 100644 --- a/src/mame/drivers/decstation.cpp +++ b/src/mame/drivers/decstation.cpp @@ -4,55 +4,55 @@ decstation.cpp: MIPS-based DECstation family - WANTED: all boot ROM dumps except 5000/133, all TURBOchannel card ROM dumps - - NOTE: after all the spew of failing tests (it really wants a VT102 terminal), - press 'q' at the MORE prompt and wait a few seconds for the PROM monitor to appear. - Type 'ls' for a list of commands (this is a very UNIX-flavored PROM monitor). - - Machine types: - DECstation 3100 (PMAX/KN01): - 16.67 MHz R2000 with FPU and MMU - 24 MiB max RAM - Serial: DEC "DZ" quad-UART (DC7085 gate array) - SCSI: DEC "SII" SCSI interface (DC7061 gate array) - Ethernet: AMD7990 "LANCE" controller - Monochrome or color video on-board - PMIN/KN01: - Cheaper PMAX, 12.5 MHz R2000, same as PMAX - - Personal DECstation 5000/xx (MAXine/KN02BA): - 20, 25, or 33 MHz R3000 or 100 MHz R4000 - 40 MiB max RAM - Serial: DEC "DZ" quad-UART for keyboard/mouse, SCC8530 for modem/printer - SCSI: NCR53C94 - Ethernet: AMD7990 "LANCE" controller - Audio: AMD AM79C30 - Color 1024x768 8bpp video on-board - 2 TURBOchannel slots - - DECstation 5000/1xx: (3MIN/KN02DA): - 20, 25, or 33 MHz R3000 or 100 MHz R4000 - 128 MiB max RAM - Serial: 2x SCC8530 - SCSI: NCR53C94 - Ethernet: AMD7990 "LANCE" controller - No on-board video - 3 TURBOchannel slots - - DECstation 5000/200: (3MAX/KN02): - 25 MHz R3000 - 480 MiB max RAM - Serial: DEC "DZ" quad-UART - SCSI: NCR53C94 - Ethernet: AMD7990 "LANCE" controllor - - DECstation 5000/240, 5000/261 (3MAX+/KN03) - 40 MHz R3400, or 120 MHz R4400. - 480 MiB max RAM - Serial: 2x SCC8530 - SCSI: NCR53C94 - Ethernet: AMD7990 "LANCE" controller + WANTED: all boot ROM dumps except 5000/133, all TURBOchannel card ROM dumps + + NOTE: after all the spew of failing tests (it really wants a VT102 terminal), + press 'q' at the MORE prompt and wait a few seconds for the PROM monitor to appear. + Type 'ls' for a list of commands (this is a very UNIX-flavored PROM monitor). + + Machine types: + DECstation 3100 (PMAX/KN01): + 16.67 MHz R2000 with FPU and MMU + 24 MiB max RAM + Serial: DEC "DZ" quad-UART (DC7085 gate array) + SCSI: DEC "SII" SCSI interface (DC7061 gate array) + Ethernet: AMD7990 "LANCE" controller + Monochrome or color video on-board + PMIN/KN01: + Cheaper PMAX, 12.5 MHz R2000, same as PMAX + + Personal DECstation 5000/xx (MAXine/KN02BA): + 20, 25, or 33 MHz R3000 or 100 MHz R4000 + 40 MiB max RAM + Serial: DEC "DZ" quad-UART for keyboard/mouse, SCC8530 for modem/printer + SCSI: NCR53C94 + Ethernet: AMD7990 "LANCE" controller + Audio: AMD AM79C30 + Color 1024x768 8bpp video on-board + 2 TURBOchannel slots + + DECstation 5000/1xx: (3MIN/KN02DA): + 20, 25, or 33 MHz R3000 or 100 MHz R4000 + 128 MiB max RAM + Serial: 2x SCC8530 + SCSI: NCR53C94 + Ethernet: AMD7990 "LANCE" controller + No on-board video + 3 TURBOchannel slots + + DECstation 5000/200: (3MAX/KN02): + 25 MHz R3000 + 480 MiB max RAM + Serial: DEC "DZ" quad-UART + SCSI: NCR53C94 + Ethernet: AMD7990 "LANCE" controllor + + DECstation 5000/240, 5000/261 (3MAX+/KN03) + 40 MHz R3400, or 120 MHz R4400. + 480 MiB max RAM + Serial: 2x SCC8530 + SCSI: NCR53C94 + Ethernet: AMD7990 "LANCE" controller ****************************************************************************/ @@ -95,7 +95,7 @@ protected: private: virtual void machine_start() override; virtual void machine_reset() override; - + required_device<cpu_device> m_maincpu; required_device<dec_ioga_device> m_ioga; required_device<mc146818_device> m_rtc; @@ -145,20 +145,20 @@ READ32_MEMBER(decstation_state::cfb_r) switch (addr) { - case 0x3c03e0: return 1; // ROM width - case 0x3c03e4: return 4; // ROM stride - case 0x3c03e8: return 1; // ROM size in 8 KiB units - case 0x3c03ec: return 1; // card address space in 4 MiB units + case 0x3c03e0: return 1; // ROM width + case 0x3c03e4: return 4; // ROM stride + case 0x3c03e8: return 1; // ROM size in 8 KiB units + case 0x3c03ec: return 1; // card address space in 4 MiB units case 0x3c03f0: return 0x55555555; // TURBOchannel ID bytes case 0x3c03f4: return 0x00000000; case 0x3c03f8: return 0xaaaaaaaa; case 0x3c03fc: return 0xffffffff; - case 0x3c0470: return 0; // does card support parity? + case 0x3c0470: return 0; // does card support parity? } return 0xffffffff; } - + WRITE32_MEMBER(decstation_state::cfb_w) { logerror("cfb: %08x (mask %08x) @ %x\n", data, mem_mask, offset); @@ -182,7 +182,7 @@ void decstation_state::machine_reset() void decstation_state::decstation_map(address_map &map) { - map(0x00000000, 0x07ffffff).ram(); // full 128 MB + map(0x00000000, 0x07ffffff).ram(); // full 128 MB map(0x10000000, 0x103cffff).rw(FUNC(decstation_state::cfb_r), FUNC(decstation_state::cfb_w)); map(0x1c000000, 0x1c07ffff).m(m_ioga, FUNC(dec_ioga_device::map)); map(0x1c100000, 0x1c100003).rw(m_scc0, FUNC(z80scc_device::ca_r), FUNC(z80scc_device::ca_w)).umask32(0x0000ff00); diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index a78a52eecb2..e6980a3cd56 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -187,7 +187,7 @@ public: void vfxsd(machine_config &config); void eps(machine_config &config); void vfx32(machine_config &config); - + void init_eps(); void init_common(); void init_sq1(); diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index 3f5a33108b6..e6210099af1 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -99,7 +99,7 @@ public: {} void gimix(machine_config &config); - + DECLARE_INPUT_CHANGED_MEMBER(drive_size_cb); private: diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index df1666d6807..8eab017dd26 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -9407,7 +9407,7 @@ MACHINE_CONFIG_START(unkch_state::feverch) MCFG_I8255_IN_PORTA_CB(IOPORT("IN3")) MCFG_I8255_IN_PORTB_CB(IOPORT("IN4")) MCFG_I8255_IN_PORTC_CB(IOPORT("DSW1")) - + MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("DSW4")) MCFG_I8255_IN_PORTB_CB(IOPORT("DSW2")) diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index f3d7b1a5ab7..3a659c2f8ec 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -67,7 +67,7 @@ public: m_palette(*this, "palette") { } void gpworld(machine_config &config); - + void init_gpworld(); private: diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 2ae2eb70c9a..061ac9ecfbd 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -206,7 +206,7 @@ public: void hp9845a(machine_config &config); void hp9835a(machine_config &config); - + private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp index 83384cd66ae..0df760d6446 100644 --- a/src/mame/drivers/inderp.cpp +++ b/src/mame/drivers/inderp.cpp @@ -234,9 +234,9 @@ ROM_END ROM_START(topaz) ROM_REGION(0x1800, "roms", 0) - ROM_LOAD("topaz0.bin", 0x0400, 0x0400, CRC(d047aee0) SHA1(b2bc2e9fb088006fd3b7eb080feaa1eac479af58)) - ROM_LOAD("topaz1.bin", 0x0800, 0x0400, CRC(72a423c2) SHA1(e3ba5d581739fc0871901f861a7692fd86e0f6aa)) - ROM_LOAD("topaz2.bin", 0x0c00, 0x0400, CRC(b8d2e7c6) SHA1(e19bec04fab15536fea51c4298c6a4cb3817630c)) + ROM_LOAD("topaz0.bin", 0x0400, 0x0400, CRC(d047aee0) SHA1(b2bc2e9fb088006fd3b7eb080feaa1eac479af58)) + ROM_LOAD("topaz1.bin", 0x0800, 0x0400, CRC(72a423c2) SHA1(e3ba5d581739fc0871901f861a7692fd86e0f6aa)) + ROM_LOAD("topaz2.bin", 0x0c00, 0x0400, CRC(b8d2e7c6) SHA1(e19bec04fab15536fea51c4298c6a4cb3817630c)) ROM_END GAME( 1979, centauri, 0, inderp, inderp, inderp_state, empty_init, ROT0, "Inder", "Centaur (Inder)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp index 9ecef54cfbd..e3b06771e59 100644 --- a/src/mame/drivers/ironhors.cpp +++ b/src/mame/drivers/ironhors.cpp @@ -392,10 +392,10 @@ MACHINE_CONFIG_START(ironhors_state::ironhors) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(61) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(32*8, 32*8) -// MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) +// MCFG_SCREEN_REFRESH_RATE(61) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(32*8, 32*8) +// MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) MCFG_SCREEN_RAW_PARAMS(18432000/4,296,8,256-8,255,16,240) // pixel clock is a guesswork MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update) diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp index ab091f72d7e..2fd63643477 100644 --- a/src/mame/drivers/jpms80.cpp +++ b/src/mame/drivers/jpms80.cpp @@ -54,7 +54,7 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + void jpms80(machine_config &config); void init_jpms80(); diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp index b61a2563cd0..3e522cc34c1 100644 --- a/src/mame/drivers/jpmsys7.cpp +++ b/src/mame/drivers/jpmsys7.cpp @@ -34,8 +34,8 @@ public: { } void jpmsys7(machine_config &config); - -private: + +private: void jpmsys7_map(address_map &map); // devices diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index 827561807d5..c2ca16cb545 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -77,9 +77,9 @@ public: , m_p_ram(*this, "ram") , m_p_chargen(*this, "chargen") { } - + void jupiter3(machine_config &config); - + void init_jupiter3(); private: diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp index 92c48c9296a..ca037f814a6 100644 --- a/src/mame/drivers/konamigv.cpp +++ b/src/mame/drivers/konamigv.cpp @@ -159,7 +159,7 @@ protected: void konamigv_map(address_map &map); virtual void machine_start() override; - + DECLARE_WRITE16_MEMBER(btc_trackball_w); DECLARE_READ16_MEMBER(tokimeki_serial_r); DECLARE_WRITE16_MEMBER(tokimeki_serial_w); diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp index 96945bb8852..a7789452380 100644 --- a/src/mame/drivers/m6805evs.cpp +++ b/src/mame/drivers/m6805evs.cpp @@ -107,7 +107,7 @@ MACHINE_CONFIG_START(m6805evs_state::m6805evs) MCFG_DEVICE_ADD("maincpu", M6805, XTAL(4'000'000)) // Needs a 13-bits address bus wide version of the cpu -// MCFG_DEVICE_PROGRAM_MAP(mem_map) +// MCFG_DEVICE_PROGRAM_MAP(mem_map) MACHINE_CONFIG_END ROM_START(m6805evs) diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp index 1f9a088992f..6894782c4b7 100644 --- a/src/mame/drivers/mvme147.cpp +++ b/src/mame/drivers/mvme147.cpp @@ -197,7 +197,7 @@ mvme147_state(const machine_config &mconfig, device_type type, const char *tag) , m_sccterm2(*this, "scc2") { } - + void mvme147(machine_config &config); private: diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp index 7646bfaf9b0..51f2b561365 100644 --- a/src/mame/drivers/mz2500.cpp +++ b/src/mame/drivers/mz2500.cpp @@ -624,7 +624,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_bank_data_w) { m_bank_val[m_bank_addr] = data & 0x3f; m_rambank[m_bank_addr]->set_bank(m_bank_val[m_bank_addr]); - + // if((data*2) >= 0x70) // printf("%s %02x\n",bank_name[m_bank_addr],m_bank_val[m_bank_addr]*2); @@ -837,7 +837,7 @@ READ8_MEMBER(mz2500_state::rmw_r) { // TODO: correct? if(m_cg_reg[0x0e] == 0x3) - return 0xff; + return 0xff; int plane; m_cg_latch[0] = m_cgram[offset+0x0000]; //B @@ -856,7 +856,7 @@ WRITE8_MEMBER(mz2500_state::rmw_w) { // TODO: correct? if(m_cg_reg[0x0e] == 0x3) - return; + return; if((m_cg_reg[0x05] & 0xc0) == 0x00) //replace { @@ -1818,7 +1818,7 @@ MACHINE_CONFIG_START(mz2500_state::mz2500) MCFG_ADDRESS_BANK("rambank5") MCFG_ADDRESS_BANK("rambank6") MCFG_ADDRESS_BANK("rambank7") - + MCFG_DEVICE_ADD("i8255_0", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, mz2500_state, mz2500_porta_r)) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz2500_state, mz2500_porta_w)) diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp index 49af5159f11..64c4d4256d6 100644 --- a/src/mame/drivers/mzr8105.cpp +++ b/src/mame/drivers/mzr8105.cpp @@ -179,7 +179,7 @@ mzr8105_state(const machine_config &mconfig, device_type type, const char *tag) } void mzr8105(machine_config &config); - + private: void mzr8105_mem(address_map &map); required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index 5acf7d69597..f890c2b7d3c 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -44,9 +44,9 @@ known issues: Bubble Trouble (Golly Ghost II) - no artwork - Metal Hawk - - tilemap issues (ex : Result and stage select screen) - - ROZ wraparound isn't implemented + Metal Hawk + - tilemap issues (ex : Result and stage select screen) + - ROZ wraparound isn't implemented The Namco System II board is a 5 ( only 4 are emulated ) CPU system. The complete system consists of two boards: CPU + GRAPHICS. It contains a large diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 1d30616c4f9..0b1516068e2 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -1444,7 +1444,7 @@ public: void timecrs2(machine_config &config); void init_s23(); - + render_t m_render; const uint16_t *m_tmlrom; const uint8_t *m_tmhrom; diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp index a727a83f58b..ce19b83dc51 100644 --- a/src/mame/drivers/ngen.cpp +++ b/src/mame/drivers/ngen.cpp @@ -129,17 +129,17 @@ protected: DECLARE_WRITE8_MEMBER( dma_1_dack_w ) { } DECLARE_WRITE8_MEMBER( dma_2_dack_w ) { } DECLARE_WRITE8_MEMBER( dma_3_dack_w ) { popmessage("IOW3: data %02x",data); } - + MC6845_UPDATE_ROW(crtc_update_row); DECLARE_WRITE_LINE_MEMBER(timer_clk_out); - + DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); void ngen386_io(address_map &map); void ngen386_mem(address_map &map); void ngen386i_mem(address_map &map); - + optional_device<i80186_cpu_device> m_maincpu; optional_device<i386_device> m_i386cpu; required_device<mc6845_device> m_crtc; diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index d37be5b8d16..b709fca668c 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -19,7 +19,7 @@ hooked up by the current z80 core - PC-88VA stock version has two bogus opcodes. One is at 0xf0b15, another at 0xf0b31. Making a patch for the latter makes the system to jump into a "DIP-Switch" display. - bp f0b31,pc=0xf0b36,g + bp f0b31,pc=0xf0b36,g - unemulated upd71071 demand mode. - Fix floppy motor hook-up; @@ -540,10 +540,10 @@ WRITE8_MEMBER(pc88va_state::idp_command_w) void pc88va_state::tsp_sprite_enable(uint32_t spr_offset, uint16_t sw_bit) { uint32_t target_offset = (spr_offset & 0xffff)/2; -// address_space &space = m_maincpu->space(AS_PROGRAM); +// address_space &space = m_maincpu->space(AS_PROGRAM); -// space.write_word(spr_offset, space.read_word(spr_offset) & ~0x200); -// space.write_word(spr_offset, space.read_word(spr_offset) | (sw_bit & 0x200)); +// space.write_word(spr_offset, space.read_word(spr_offset) & ~0x200); +// space.write_word(spr_offset, space.read_word(spr_offset) | (sw_bit & 0x200)); m_tvram[target_offset] = (m_tvram[target_offset] & ~0x200) | (sw_bit & 0x200); } @@ -764,7 +764,7 @@ WRITE16_MEMBER(pc88va_state::bios_bank_w) ---- ---- ---- xxxx RBC0 (0xe0000 - 0xeffff ROM bank) */ COMBINE_DATA(&m_bank_reg); - + /* SMBC */ m_sysbank->set_bank((m_bank_reg & 0xf00) >> 8); @@ -1667,7 +1667,7 @@ MACHINE_CONFIG_START(pc88va_state::pc88va) MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(16) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(18+4) MCFG_ADDRESS_MAP_BANK_STRIDE(0x40000) - + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ym", YM2203, 3993600) //unknown clock / divider MCFG_SOUND_ROUTE(0, "mono", 0.25) diff --git a/src/mame/drivers/ps2sony.cpp b/src/mame/drivers/ps2sony.cpp index 0af9d1e9540..dd137f097fb 100644 --- a/src/mame/drivers/ps2sony.cpp +++ b/src/mame/drivers/ps2sony.cpp @@ -209,11 +209,11 @@ public: , m_screen(*this, "screen") , m_ram(*this, "ram") , m_iop_ram(*this, "iop_ram") - , m_sp_ram(*this, "sp_ram") - , m_vu0_imem(*this, "vu0imem") - , m_vu0_dmem(*this, "vu0dmem") - , m_vu1_imem(*this, "vu1imem") - , m_vu1_dmem(*this, "vu1dmem") + , m_sp_ram(*this, "sp_ram") + , m_vu0_imem(*this, "vu0imem") + , m_vu0_dmem(*this, "vu0dmem") + , m_vu1_imem(*this, "vu1imem") + , m_vu1_dmem(*this, "vu1dmem") , m_vblank_timer(nullptr) { } @@ -223,41 +223,41 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(vblank); - DECLARE_READ32_MEMBER(ipu_r); - DECLARE_WRITE32_MEMBER(ipu_w); - DECLARE_READ64_MEMBER(vif0_fifo_r); - DECLARE_WRITE64_MEMBER(vif0_fifo_w); - DECLARE_READ64_MEMBER(gif_fifo_r); - DECLARE_WRITE64_MEMBER(gif_fifo_w); - DECLARE_READ64_MEMBER(ipu_fifo_r); - DECLARE_WRITE64_MEMBER(ipu_fifo_w); - DECLARE_WRITE8_MEMBER(debug_w); - DECLARE_READ32_MEMBER(unk_f430_r); - DECLARE_WRITE32_MEMBER(unk_f430_w); - DECLARE_READ32_MEMBER(unk_f440_r); - DECLARE_WRITE32_MEMBER(unk_f440_w); - DECLARE_READ32_MEMBER(unk_f520_r); - DECLARE_READ64_MEMBER(board_id_r); - - DECLARE_WRITE64_MEMBER(ee_iop_ram_w); - DECLARE_READ64_MEMBER(ee_iop_ram_r); - DECLARE_WRITE32_MEMBER(iop_debug_w); + DECLARE_READ32_MEMBER(ipu_r); + DECLARE_WRITE32_MEMBER(ipu_w); + DECLARE_READ64_MEMBER(vif0_fifo_r); + DECLARE_WRITE64_MEMBER(vif0_fifo_w); + DECLARE_READ64_MEMBER(gif_fifo_r); + DECLARE_WRITE64_MEMBER(gif_fifo_w); + DECLARE_READ64_MEMBER(ipu_fifo_r); + DECLARE_WRITE64_MEMBER(ipu_fifo_w); + DECLARE_WRITE8_MEMBER(debug_w); + DECLARE_READ32_MEMBER(unk_f430_r); + DECLARE_WRITE32_MEMBER(unk_f430_w); + DECLARE_READ32_MEMBER(unk_f440_r); + DECLARE_WRITE32_MEMBER(unk_f440_w); + DECLARE_READ32_MEMBER(unk_f520_r); + DECLARE_READ64_MEMBER(board_id_r); + + DECLARE_WRITE64_MEMBER(ee_iop_ram_w); + DECLARE_READ64_MEMBER(ee_iop_ram_r); + DECLARE_WRITE32_MEMBER(iop_debug_w); DECLARE_WRITE_LINE_MEMBER(iop_timer_irq); - void mem_map(address_map &map); - void iop_map(address_map &map); + void mem_map(address_map &map); + void iop_map(address_map &map); - required_device<cpu_device> m_maincpu; - required_device<iop_device> m_iop; + required_device<cpu_device> m_maincpu; + required_device<iop_device> m_iop; required_device_array<ps2_timer_device, 4> m_timer; required_device<ps2_dmac_device> m_dmac; required_device<ps2_intc_device> m_intc; - required_device<ps2_sif_device> m_sif; + required_device<ps2_sif_device> m_sif; required_device<iop_timer_device> m_iop_timer; required_device<iop_dma_device> m_iop_dma; required_device<iop_intc_device> m_iop_intc; @@ -268,15 +268,15 @@ protected: required_device<sonyvu0_device> m_vu0; required_device<sonyvu1_device> m_vu1; required_device_array<ps2_pad_device, 2> m_pad; - required_device<ps2_mc_device> m_mc; - required_device<screen_device> m_screen; - required_shared_ptr<uint64_t> m_ram; - required_shared_ptr<uint32_t> m_iop_ram; - required_shared_ptr<uint64_t> m_sp_ram; - required_shared_ptr<uint64_t> m_vu0_imem; - required_shared_ptr<uint64_t> m_vu0_dmem; - required_shared_ptr<uint64_t> m_vu1_imem; - required_shared_ptr<uint64_t> m_vu1_dmem; + required_device<ps2_mc_device> m_mc; + required_device<screen_device> m_screen; + required_shared_ptr<uint64_t> m_ram; + required_shared_ptr<uint32_t> m_iop_ram; + required_shared_ptr<uint64_t> m_sp_ram; + required_shared_ptr<uint64_t> m_vu0_imem; + required_shared_ptr<uint64_t> m_vu0_dmem; + required_shared_ptr<uint64_t> m_vu1_imem; + required_shared_ptr<uint64_t> m_vu1_dmem; uint32_t m_unk_f430_reg; uint32_t m_unk_f440_counter; @@ -551,7 +551,7 @@ void ps2sony_state::machine_reset() memset(m_ipu_out_fifo, 0, sizeof(uint64_t)*0x1000); m_ipu_out_fifo_index = 0; - m_vblank_timer->adjust(m_screen->time_until_pos(0), 1); + m_vblank_timer->adjust(m_screen->time_until_pos(0), 1); } TIMER_CALLBACK_MEMBER(ps2sony_state::vblank) @@ -576,7 +576,7 @@ TIMER_CALLBACK_MEMBER(ps2sony_state::vblank) WRITE8_MEMBER(ps2sony_state::debug_w) { - printf("%c", (char)data); + printf("%c", (char)data); } WRITE64_MEMBER(ps2sony_state::ee_iop_ram_w) @@ -679,56 +679,56 @@ uint32_t ps2sony_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma void ps2sony_state::mem_map(address_map &map) { map(0x00000000, 0x01ffffff).mirror(0xe000000).ram().share(m_ram); // 32 MB RAM - map(0x10000000, 0x100007ff).rw(m_timer[0], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); - map(0x10000800, 0x10000fff).rw(m_timer[1], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); - map(0x10001000, 0x100017ff).rw(m_timer[2], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); - map(0x10001800, 0x10001fff).rw(m_timer[3], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); - map(0x10002000, 0x10002fff).rw(FUNC(ps2sony_state::ipu_r), FUNC(ps2sony_state::ipu_w)).umask64(0x00000000ffffffff); - map(0x10003000, 0x100030af).rw(m_gs, FUNC(ps2_gs_device::gif_r), FUNC(ps2_gs_device::gif_w)); - map(0x10004000, 0x1000400f).mirror(0xff0).rw(FUNC(ps2sony_state::vif0_fifo_r), FUNC(ps2sony_state::vif0_fifo_w)); - map(0x10005000, 0x1000500f).mirror(0xff0).rw(m_vu1, FUNC(sonyvu1_device::vif_r), FUNC(sonyvu1_device::vif_w)); - map(0x10006000, 0x1000600f).mirror(0xff0).rw(FUNC(ps2sony_state::gif_fifo_r), FUNC(ps2sony_state::gif_fifo_w)); - map(0x10007000, 0x1000701f).mirror(0xfe0).rw(FUNC(ps2sony_state::ipu_fifo_r), FUNC(ps2sony_state::ipu_fifo_w)); - map(0x10008000, 0x1000dfff).rw(m_dmac, FUNC(ps2_dmac_device::channel_r), FUNC(ps2_dmac_device::channel_w)).umask64(0x00000000ffffffff);; - map(0x1000e000, 0x1000efff).rw(m_dmac, FUNC(ps2_dmac_device::read), FUNC(ps2_dmac_device::write)).umask64(0x00000000ffffffff); - map(0x1000f000, 0x1000f017).rw(m_intc, FUNC(ps2_intc_device::read), FUNC(ps2_intc_device::write)).umask64(0x00000000ffffffff); - map(0x1000f130, 0x1000f137).nopr(); - map(0x1000f180, 0x1000f187).w(FUNC(ps2sony_state::debug_w)).umask64(0x00000000000000ff); - map(0x1000f200, 0x1000f24f).rw(m_sif, FUNC(ps2_sif_device::ee_r), FUNC(ps2_sif_device::ee_w)).umask64(0x00000000ffffffff); - map(0x1000f430, 0x1000f437).rw(FUNC(ps2sony_state::unk_f430_r), FUNC(ps2sony_state::unk_f430_w)).umask64(0x00000000ffffffff); // Unknown - map(0x1000f440, 0x1000f447).rw(FUNC(ps2sony_state::unk_f440_r), FUNC(ps2sony_state::unk_f440_w)).umask64(0x00000000ffffffff); // Unknown - map(0x1000f520, 0x1000f523).r(m_dmac, FUNC(ps2_dmac_device::disable_mask_r)).umask64(0x00000000ffffffff); - map(0x1000f590, 0x1000f593).w(m_dmac, FUNC(ps2_dmac_device::disable_mask_w)).umask64(0x00000000ffffffff); - map(0x11000000, 0x11000fff).mirror(0x3000).ram().share(m_vu0_imem); - map(0x11004000, 0x11004fff).mirror(0x3000).ram().share(m_vu0_dmem); - map(0x11008000, 0x1100bfff).ram().share(m_vu1_imem); - map(0x1100c000, 0x1100ffff).ram().share(m_vu1_dmem); - map(0x12000000, 0x120003ff).mirror(0xc00).rw(m_gs, FUNC(ps2_gs_device::priv_regs0_r), FUNC(ps2_gs_device::priv_regs0_w)); - map(0x12001000, 0x120013ff).mirror(0xc00).rw(m_gs, FUNC(ps2_gs_device::priv_regs1_r), FUNC(ps2_gs_device::priv_regs1_w)); - map(0x1c000000, 0x1c1fffff).rw(FUNC(ps2sony_state::ee_iop_ram_r), FUNC(ps2sony_state::ee_iop_ram_w)); // IOP has 2MB EDO RAM per Wikipedia, and writes go up to this point - map(0x1f803800, 0x1f803807).r(FUNC(ps2sony_state::board_id_r)); - map(0x1fc00000, 0x1fffffff).rom().region("bios", 0); - - map(0x70000000, 0x70003fff).ram().share(m_sp_ram); // 16KB Scratchpad RAM + map(0x10000000, 0x100007ff).rw(m_timer[0], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); + map(0x10000800, 0x10000fff).rw(m_timer[1], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); + map(0x10001000, 0x100017ff).rw(m_timer[2], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); + map(0x10001800, 0x10001fff).rw(m_timer[3], FUNC(ps2_timer_device::read), FUNC(ps2_timer_device::write)).umask64(0x00000000ffffffff); + map(0x10002000, 0x10002fff).rw(FUNC(ps2sony_state::ipu_r), FUNC(ps2sony_state::ipu_w)).umask64(0x00000000ffffffff); + map(0x10003000, 0x100030af).rw(m_gs, FUNC(ps2_gs_device::gif_r), FUNC(ps2_gs_device::gif_w)); + map(0x10004000, 0x1000400f).mirror(0xff0).rw(FUNC(ps2sony_state::vif0_fifo_r), FUNC(ps2sony_state::vif0_fifo_w)); + map(0x10005000, 0x1000500f).mirror(0xff0).rw(m_vu1, FUNC(sonyvu1_device::vif_r), FUNC(sonyvu1_device::vif_w)); + map(0x10006000, 0x1000600f).mirror(0xff0).rw(FUNC(ps2sony_state::gif_fifo_r), FUNC(ps2sony_state::gif_fifo_w)); + map(0x10007000, 0x1000701f).mirror(0xfe0).rw(FUNC(ps2sony_state::ipu_fifo_r), FUNC(ps2sony_state::ipu_fifo_w)); + map(0x10008000, 0x1000dfff).rw(m_dmac, FUNC(ps2_dmac_device::channel_r), FUNC(ps2_dmac_device::channel_w)).umask64(0x00000000ffffffff);; + map(0x1000e000, 0x1000efff).rw(m_dmac, FUNC(ps2_dmac_device::read), FUNC(ps2_dmac_device::write)).umask64(0x00000000ffffffff); + map(0x1000f000, 0x1000f017).rw(m_intc, FUNC(ps2_intc_device::read), FUNC(ps2_intc_device::write)).umask64(0x00000000ffffffff); + map(0x1000f130, 0x1000f137).nopr(); + map(0x1000f180, 0x1000f187).w(FUNC(ps2sony_state::debug_w)).umask64(0x00000000000000ff); + map(0x1000f200, 0x1000f24f).rw(m_sif, FUNC(ps2_sif_device::ee_r), FUNC(ps2_sif_device::ee_w)).umask64(0x00000000ffffffff); + map(0x1000f430, 0x1000f437).rw(FUNC(ps2sony_state::unk_f430_r), FUNC(ps2sony_state::unk_f430_w)).umask64(0x00000000ffffffff); // Unknown + map(0x1000f440, 0x1000f447).rw(FUNC(ps2sony_state::unk_f440_r), FUNC(ps2sony_state::unk_f440_w)).umask64(0x00000000ffffffff); // Unknown + map(0x1000f520, 0x1000f523).r(m_dmac, FUNC(ps2_dmac_device::disable_mask_r)).umask64(0x00000000ffffffff); + map(0x1000f590, 0x1000f593).w(m_dmac, FUNC(ps2_dmac_device::disable_mask_w)).umask64(0x00000000ffffffff); + map(0x11000000, 0x11000fff).mirror(0x3000).ram().share(m_vu0_imem); + map(0x11004000, 0x11004fff).mirror(0x3000).ram().share(m_vu0_dmem); + map(0x11008000, 0x1100bfff).ram().share(m_vu1_imem); + map(0x1100c000, 0x1100ffff).ram().share(m_vu1_dmem); + map(0x12000000, 0x120003ff).mirror(0xc00).rw(m_gs, FUNC(ps2_gs_device::priv_regs0_r), FUNC(ps2_gs_device::priv_regs0_w)); + map(0x12001000, 0x120013ff).mirror(0xc00).rw(m_gs, FUNC(ps2_gs_device::priv_regs1_r), FUNC(ps2_gs_device::priv_regs1_w)); + map(0x1c000000, 0x1c1fffff).rw(FUNC(ps2sony_state::ee_iop_ram_r), FUNC(ps2sony_state::ee_iop_ram_w)); // IOP has 2MB EDO RAM per Wikipedia, and writes go up to this point + map(0x1f803800, 0x1f803807).r(FUNC(ps2sony_state::board_id_r)); + map(0x1fc00000, 0x1fffffff).rom().region("bios", 0); + + map(0x70000000, 0x70003fff).ram().share(m_sp_ram); // 16KB Scratchpad RAM } void ps2sony_state::iop_map(address_map &map) { - map(0x00000000, 0x001fffff).ram().share(m_iop_ram); - map(0x1d000000, 0x1d00004f).rw(m_sif, FUNC(ps2_sif_device::iop_r), FUNC(ps2_sif_device::iop_w)); - map(0x1e000000, 0x1e003fff).nopr(); - map(0x1f402000, 0x1f40201f).rw(m_iop_cdvd, FUNC(iop_cdvd_device::read), FUNC(iop_cdvd_device::write)); - map(0x1f801070, 0x1f80107b).rw(m_iop_intc, FUNC(iop_intc_device::read), FUNC(iop_intc_device::write)); - map(0x1f801080, 0x1f8010f7).rw(m_iop_dma, FUNC(iop_dma_device::bank0_r), FUNC(iop_dma_device::bank0_w)); - map(0x1f801450, 0x1f801453).noprw(); - map(0x1f8014a0, 0x1f8014af).rw(m_iop_timer, FUNC(iop_timer_device::read), FUNC(iop_timer_device::write)); - map(0x1f801500, 0x1f801577).rw(m_iop_dma, FUNC(iop_dma_device::bank1_r), FUNC(iop_dma_device::bank1_w)); - map(0x1f801578, 0x1f80157b).noprw(); - map(0x1f802070, 0x1f802073).w(FUNC(ps2sony_state::iop_debug_w)).nopr(); - map(0x1f808200, 0x1f8082ff).rw(m_iop_sio2, FUNC(iop_sio2_device::read), FUNC(iop_sio2_device::write)); - map(0x1f900000, 0x1f9007ff).rw(m_iop_spu, FUNC(iop_spu_device::read), FUNC(iop_spu_device::write)); - map(0x1fc00000, 0x1fffffff).rom().region("bios", 0); - map(0x1ffe0130, 0x1ffe0133).nopw(); + map(0x00000000, 0x001fffff).ram().share(m_iop_ram); + map(0x1d000000, 0x1d00004f).rw(m_sif, FUNC(ps2_sif_device::iop_r), FUNC(ps2_sif_device::iop_w)); + map(0x1e000000, 0x1e003fff).nopr(); + map(0x1f402000, 0x1f40201f).rw(m_iop_cdvd, FUNC(iop_cdvd_device::read), FUNC(iop_cdvd_device::write)); + map(0x1f801070, 0x1f80107b).rw(m_iop_intc, FUNC(iop_intc_device::read), FUNC(iop_intc_device::write)); + map(0x1f801080, 0x1f8010f7).rw(m_iop_dma, FUNC(iop_dma_device::bank0_r), FUNC(iop_dma_device::bank0_w)); + map(0x1f801450, 0x1f801453).noprw(); + map(0x1f8014a0, 0x1f8014af).rw(m_iop_timer, FUNC(iop_timer_device::read), FUNC(iop_timer_device::write)); + map(0x1f801500, 0x1f801577).rw(m_iop_dma, FUNC(iop_dma_device::bank1_r), FUNC(iop_dma_device::bank1_w)); + map(0x1f801578, 0x1f80157b).noprw(); + map(0x1f802070, 0x1f802073).w(FUNC(ps2sony_state::iop_debug_w)).nopr(); + map(0x1f808200, 0x1f8082ff).rw(m_iop_sio2, FUNC(iop_sio2_device::read), FUNC(iop_sio2_device::write)); + map(0x1f900000, 0x1f9007ff).rw(m_iop_spu, FUNC(iop_spu_device::read), FUNC(iop_spu_device::write)); + map(0x1fc00000, 0x1fffffff).rom().region("bios", 0); + map(0x1ffe0130, 0x1ffe0133).nopw(); } static INPUT_PORTS_START( ps2sony ) diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp index fdc42f64015..37fdc944bb8 100644 --- a/src/mame/drivers/taitottl.cpp +++ b/src/mame/drivers/taitottl.cpp @@ -100,7 +100,7 @@ private: // devices required_device<netlist_mame_device> m_maincpu; required_device<fixedfreq_device> m_video; - + // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index d14aaccbdf6..9363b3af5aa 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -1903,7 +1903,7 @@ MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_SCREEN_SIZE(0x160, 0xf0) MCFG_SCREEN_VISIBLE_AREA(0, 0x160-1, 0, 0xf0-1) MCFG_SCREEN_UPDATE_DRIVER(stepstag_state, screen_update_stepstag_left) -// MCFG_SCREEN_PALETTE("lpalette") +// MCFG_SCREEN_PALETTE("lpalette") MCFG_SCREEN_ADD("mscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1911,7 +1911,7 @@ MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_SCREEN_SIZE(0x160, 0xf0) MCFG_SCREEN_VISIBLE_AREA(0, 0x160-1, 0, 0xf0-1) MCFG_SCREEN_UPDATE_DRIVER(stepstag_state, screen_update_stepstag_mid) -// MCFG_SCREEN_PALETTE("mpalette") +// MCFG_SCREEN_PALETTE("mpalette") MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(30) @@ -2664,7 +2664,7 @@ ROM_START( vjdash ) ROM_FILL( 6, 1, 0x01 ) ROM_FILL( 0x100, 1, 0x60 ) ROM_FILL( 0x101, 1, 0xfe ) - + ROM_REGION( 0x0c00000, "sprites_left", ROMREGION_ERASE ) // left screen sprites ROM_LOAD( "vjdash-01", 0x000000, 0x400000, NO_DUMP ) ROM_LOAD( "vjdash-02", 0x400000, 0x400000, NO_DUMP ) @@ -2770,7 +2770,7 @@ ROM_START( step3 ) ROM_FILL( 6, 1, 0x01 ) ROM_FILL( 0x100, 1, 0x60 ) ROM_FILL( 0x101, 1, 0xfe ) - + ROM_REGION( 0x100000, "sub", 0 ) // 68000 ROM_LOAD16_BYTE( "vj98348_step3_11_v1.1", 0x00000, 0x80000, CRC(9c36aef5) SHA1(bbac48c2c7949a6f8a6ec83515e94a343c88d1b6) ) ROM_LOAD16_BYTE( "vj98348_step3_14_v1.1", 0x00001, 0x80000, CRC(b86be557) SHA1(49dbd6ef1c50adcf3386d5423da8ae7685649c46) ) diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index a2d6d7bd3a5..20ea3c93015 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -68,7 +68,7 @@ private: K052109_CB_MEMBER(tile_callback); K051960_CB_MEMBER(sprite_callback); DECLARE_WRITE8_MEMBER(banking_callback); - + void main_map(address_map &map); void sound_map(address_map &map); }; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 9a1deaf771e..cb07767640b 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -46,7 +46,7 @@ protected: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - + /* misc */ uint8_t m_pri; int vblank_level; @@ -61,7 +61,7 @@ protected: uint16_t m_fg_scrollx; uint16_t m_fg_scrolly; uint16_t m_bg_tilebase; - + uint16_t m_bg0_dx; uint16_t m_bg1_dx[2]; uint16_t m_sprite_xoff; @@ -83,7 +83,7 @@ private: required_shared_ptr<uint16_t> m_fg_videoram; // required_shared_ptr<uint16_t> m_spriteram; required_device<buffered_spriteram16_device> m_spriteram; - + /* devices */ required_device<cpu_device> m_audiocpu; required_device<okim6295_device> m_oki; diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index d48166d1b89..5b38e95e279 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -57,7 +57,7 @@ protected: tilemap_t *m_pf2_layer; tilemap_t *m_pf1_layer; tilemap_t *m_text_layer; - + DECLARE_WRITE16_MEMBER(text_w); DECLARE_WRITE16_MEMBER(bank_w); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 1e6ecd925cd..745a0b478de 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -94,7 +94,7 @@ protected: std::unique_ptr<uint16_t[]> m_spriteram16_buffered[2]; // all but dragngun std::unique_ptr<uint16_t[]> m_pf_rowscroll[4]; // common -private: +private: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; @@ -111,7 +111,7 @@ public: { } void captaven(machine_config &config); - + void init_captaven(); private: diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 6189e28b068..d27dd420bb0 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -31,7 +31,7 @@ public: { } void dietgo(machine_config &config); - + void init_dietgo(); private: diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index d6940b7c3ad..2a883ca09c9 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -107,7 +107,7 @@ protected: DECLARE_WRITE8_MEMBER(dynax_blit_romregion_w); DECLARE_WRITE8_MEMBER(dynax_extra_scrollx_w); DECLARE_WRITE8_MEMBER(dynax_extra_scrolly_w); - + void hanamai_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i ); DECLARE_MACHINE_START(dynax); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index a1b16819dd3..91be7edd4cc 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -51,7 +51,7 @@ public: m_sprite_enable(*this, "sprite_enable"), m_color_latch(*this, "color_latch"), m_characterram(*this, "characterram") { } - + void base(machine_config &config); void mtrap(machine_config &config); void venture(machine_config &config); diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 87414669048..bc5d61da401 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -30,7 +30,7 @@ public: void bbprot(machine_config &config); void fitfight(machine_config &config); - + void init_hotmindff(); void init_fitfight(); void init_histryma(); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index b4fbc1a74a0..b9484adf493 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -67,7 +67,7 @@ public: void init_stooges(); void init_qbert(); void init_qbertqub(); - + DECLARE_CUSTOM_INPUT_MEMBER(analog_delta_r); DECLARE_CUSTOM_INPUT_MEMBER(stooges_joystick_r); diff --git a/src/mame/includes/mz2500.h b/src/mame/includes/mz2500.h index 743214dbc9c..04f707b33ef 100644 --- a/src/mame/includes/mz2500.h +++ b/src/mame/includes/mz2500.h @@ -205,7 +205,7 @@ private: void mz2500_reconfigure_screen(); uint8_t pal_256_param(int index, int param); void reset_banks(uint8_t type); - + void mz2500_io(address_map &map); void mz2500_map(address_map &map); void mz2500_bank_window_map(address_map &map); diff --git a/src/mame/includes/pc8801.h b/src/mame/includes/pc8801.h index a39b90b4d90..e788cb976a1 100644 --- a/src/mame/includes/pc8801.h +++ b/src/mame/includes/pc8801.h @@ -3,7 +3,7 @@ /******************************************************************************************** PC-8801 (c) 1981 NEC - + ********************************************************************************************/ #pragma once diff --git a/src/mame/includes/pc88va.h b/src/mame/includes/pc88va.h index e45c864202d..5e88ebcd74d 100644 --- a/src/mame/includes/pc88va.h +++ b/src/mame/includes/pc88va.h @@ -3,7 +3,7 @@ /******************************************************************************************** PC-88VA (c) 1987 NEC - + ********************************************************************************************/ #pragma once @@ -61,7 +61,7 @@ public: m_tvram(*this, "tvram"), m_gvram(*this, "gvram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") + m_palette(*this, "palette") { } void pc88va(machine_config &config); diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index 915a0848bad..1467ef92cb6 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -63,7 +63,7 @@ protected: DECLARE_READ16_MEMBER(adc_r); DECLARE_WRITE16_MEMBER(adc_w); DECLARE_WRITE16_MEMBER(iocontrol_w); - + // video updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 1a02f6b5704..03ee0bf053a 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -214,7 +214,7 @@ private: uint32_t screen_update_stepstag_mid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_stepstag_main(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); -// inline int mypal(int x); +// inline int mypal(int x); void stepstag_map(address_map &map); void stepstag_sub_map(address_map &map); diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index b9822f27105..a687e9da518 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -193,7 +193,7 @@ private: DECLARE_WRITE8_MEMBER(pwrkick_coin_lockout_w); DECLARE_WRITE_LINE_MEMBER(toaplan2_reset); - + void batrider_68k_mem(address_map &map); void batrider_dma_mem(address_map &map); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index e96866ee2e4..d0164c3fffc 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -127,7 +127,7 @@ private: void tubep_second_map(address_map &map); void tubep_second_portmap(address_map &map); void tubep_sound_map(address_map &map); - void tubep_sound_portmap(address_map &map); - + void tubep_sound_portmap(address_map &map); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index 3cbb101bf88..1af826313da 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -68,7 +68,7 @@ public: m_8n5(0), m_400_460(0) { } - + void mk83(machine_config &config); void xerox820(machine_config &config); diff --git a/src/mame/layout/intlc44.lay b/src/mame/layout/intlc44.lay index 55502dafa78..a294da1dde9 100644 --- a/src/mame/layout/intlc44.lay +++ b/src/mame/layout/intlc44.lay @@ -2,7 +2,7 @@ <!-- license:CC0 copyright-holders:Vas Crabb -Intel INTELLEC® 4/MOD 40 layout +Intel INTELLEC® 4/MOD 4 layout --> <mamelayout version="2"> <element name="background"> diff --git a/src/mame/layout/vgmplay.lay b/src/mame/layout/vgmplay.lay index 7123bd6b2af..81a719488a3 100644 --- a/src/mame/layout/vgmplay.lay +++ b/src/mame/layout/vgmplay.lay @@ -120,7 +120,7 @@ <cpanel name="led_act_21" element="act_led"><bounds x="31" y="16" width="2" height="2" /></cpanel> <cpanel name="led_act_22" element="act_led"><bounds x="31" y="19" width="2" height="2" /></cpanel> <cpanel name="led_act_23" element="act_led"><bounds x="31" y="22" width="2" height="2" /></cpanel> - + <cpanel name="led_act_24" element="act_led"><bounds x="46" y="1" width="2" height="2" /></cpanel> <cpanel name="led_act_25" element="act_led"><bounds x="46" y="4" width="2" height="2" /></cpanel> @@ -150,7 +150,7 @@ <cpanel element="act_label_k053260"><bounds x="34" y="16.2" width="10" height="1.6" /></cpanel> <cpanel element="act_label_k054539"><bounds x="34" y="19.2" width="10" height="1.6" /></cpanel> <cpanel element="act_label_ga20"><bounds x="34" y="22.2" width="10" height="1.6" /></cpanel> - + <cpanel element="act_label_rf5c68"><bounds x="49" y="1.2" width="10" height="1.6" /></cpanel> <cpanel element="act_label_rf5c164"><bounds x="49" y="4.2" width="10" height="1.6" /></cpanel> </group> diff --git a/src/mame/machine/cbm_snqk.h b/src/mame/machine/cbm_snqk.h index 25fbcab989b..5d19d453df2 100644 --- a/src/mame/machine/cbm_snqk.h +++ b/src/mame/machine/cbm_snqk.h @@ -6,16 +6,23 @@ ***********************************************/ -#ifndef __CBM_SNQK_H__ -#define __CBM_SNQK_H__ +#ifndef MAME_MACHINE_CBM_SNQK_H +#define MAME_MACHINE_CBM_SNQK_H + +#pragma once #include "imagedev/snapquik.h" #define CBM_QUICKLOAD_DELAY_SECONDS 3 -image_init_result general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, - address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, uint16_t hiaddress) ); +image_init_result general_cbm_loadsnap( + device_image_interface &image, + const char *file_type, + int snapshot_size, + address_space &space, + offs_t offset, + void (*cbm_sethiaddress)(address_space &space, uint16_t hiaddress)); -void cbm_quick_sethiaddress( address_space &space, uint16_t hiaddress ); +void cbm_quick_sethiaddress(address_space &space, uint16_t hiaddress); -#endif /* __CBM_SNQK_H__ */ +#endif // MAME_MACHINE_CBM_SNQK_H diff --git a/src/mame/machine/cedar_magnet_board.cpp b/src/mame/machine/cedar_magnet_board.cpp index 700dbf8d193..8eeffb690dc 100644 --- a/src/mame/machine/cedar_magnet_board.cpp +++ b/src/mame/machine/cedar_magnet_board.cpp @@ -86,4 +86,4 @@ void cedar_magnet_board_interface::interface_pre_start() m_halt_clear_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::halt_clear_callback), this)); m_reset_assert_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::reset_assert_callback), this)); m_reset_clear_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::reset_clear_callback), this)); -}
\ No newline at end of file +} diff --git a/src/mame/machine/coleco.h b/src/mame/machine/coleco.h index b6022b164c9..41b71564383 100644 --- a/src/mame/machine/coleco.h +++ b/src/mame/machine/coleco.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young -#pragma once +#ifndef MAME_MACHINE_COLECO_H +#define MAME_MACHINE_COLECO_H -#ifndef __COLECO_CONTROLLERS__ -#define __COLECO_CONTROLLERS__ +#pragma once INPUT_PORTS_EXTERN( coleco ); -#endif +#endif // MAME_MACHINE_COLECO_H diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h index 99f786908b2..158784a1198 100644 --- a/src/mame/machine/cuda.h +++ b/src/mame/machine/cuda.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#pragma once +#ifndef MAME_MACHINE_CUDA_H +#define MAME_MACHINE_CUDA_H -#ifndef __CUDA_H__ -#define __CUDA_H__ +#pragma once //************************************************************************** @@ -138,4 +138,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(CUDA, cuda_device) -#endif +#endif // MAME_MACHINE_CUDA_H diff --git a/src/mame/machine/decioga.cpp b/src/mame/machine/decioga.cpp index a65338f7fcd..b870e728bc1 100644 --- a/src/mame/machine/decioga.cpp +++ b/src/mame/machine/decioga.cpp @@ -7,6 +7,7 @@ * a multi-channel DMA engine. */ +#include "emu.h" #include "decioga.h" DEFINE_DEVICE_TYPE(DECSTATION_IOGA, dec_ioga_device, "decioga", "DECstation I/O Gate Array") @@ -56,14 +57,14 @@ WRITE32_MEMBER(dec_ioga_device::csr_w) READ32_MEMBER(dec_ioga_device::intr_r) { uint32_t rv = m_intr; - m_intr &= ~0x20; // 5000/133 boot ROM tests that reading clears this bit + m_intr &= ~0x20; // 5000/133 boot ROM tests that reading clears this bit //printf("m_intr = %08x\n", m_intr); return rv; } WRITE32_MEMBER(dec_ioga_device::intr_w) { - m_intr &= ~data; // clear bits on write + m_intr &= ~data; // clear bits on write } READ32_MEMBER(dec_ioga_device::imsk_r) @@ -80,6 +81,6 @@ WRITE_LINE_MEMBER(dec_ioga_device::rtc_irq_w) { if (state == ASSERT_LINE) { - m_intr |= 0x20; // tested by 5000/133 boot ROM circa BFC027C8 + m_intr |= 0x20; // tested by 5000/133 boot ROM circa BFC027C8 } -}
\ No newline at end of file +} diff --git a/src/mame/machine/decioga.h b/src/mame/machine/decioga.h index c014f5dd440..5e446f9ba2a 100644 --- a/src/mame/machine/decioga.h +++ b/src/mame/machine/decioga.h @@ -6,23 +6,16 @@ * * */ - #ifndef MAME_MACHINE_DECIOGA_H #define MAME_MACHINE_DECIOGA_H #pragma once -#include "emu.h" class dec_ioga_device : public device_t { public: - dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner) - : dec_ioga_device(mconfig, tag, owner, (uint32_t)0) - { - } - - dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); void map(address_map &map); @@ -30,8 +23,8 @@ public: DECLARE_WRITE_LINE_MEMBER(rtc_irq_w); protected: - virtual void device_start() override; - virtual void device_reset() override; + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(csr_r); DECLARE_WRITE32_MEMBER(csr_w); @@ -45,4 +38,4 @@ private: DECLARE_DEVICE_TYPE(DECSTATION_IOGA, dec_ioga_device) -#endif // MAME_MACHINE_DECIOGA_H
\ No newline at end of file +#endif // MAME_MACHINE_DECIOGA_H diff --git a/src/mame/machine/msx_switched.h b/src/mame/machine/msx_switched.h index 9db37baec61..7db1874d1af 100644 --- a/src/mame/machine/msx_switched.h +++ b/src/mame/machine/msx_switched.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#ifndef __MSX_SWITCHED_H -#define __MSX_SWITCHED_H +#ifndef MAME_MACHINE_MSX_SWITCHED_H +#define MAME_MACHINE_MSX_SWITCHED_H + +#pragma once class msx_switched_interface @@ -11,4 +13,4 @@ public: virtual DECLARE_WRITE8_MEMBER(switched_write) = 0; }; -#endif +#endif // MAME_MACHINE_MSX_SWITCHED_H diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index 038b34d7d7d..bfb3ea1e192 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -885,7 +885,7 @@ void namcos2_shared_state::c169_roz_unpack_params(const uint16_t *source, roz_pa void namcos2_shared_state::c169_roz_draw_helper(screen_device &screen, bitmap_ind16 &bitmap, tilemap_t &tmap, const rectangle &clip, const roz_parameters ¶ms) { if (m_gametype != NAMCOFL_SPEED_RACER && m_gametype != NAMCOFL_FINAL_LAP_R) -// if (m_gametype != NAMCOFL_FINAL_LAP_R) // Fix speedrcr some title animations, but broke at road scene +// if (m_gametype != NAMCOFL_FINAL_LAP_R) // Fix speedrcr some title animations, but broke at road scene { uint32_t size_mask = params.size - 1; bitmap_ind16 &srcbitmap = tmap.pixmap(); diff --git a/src/mame/machine/spec_snqk.h b/src/mame/machine/spec_snqk.h index ebf829e4f91..be6bb6e080d 100644 --- a/src/mame/machine/spec_snqk.h +++ b/src/mame/machine/spec_snqk.h @@ -6,8 +6,10 @@ * ****************************************************************************/ -#ifndef __SPEC_SNQK_H__ -#define __SPEC_SNQK_H__ +#ifndef MAME_MACHINE_SPEC_SNQK_H +#define MAME_MACHINE_SPEC_SNQK_H + +#pragma once #include "imagedev/snapquik.h" @@ -162,4 +164,4 @@ enum SPECTRUM_Z80_SNAPSHOT_TYPE { #define RAW_HDR 9 #define RAW_SIZE (RAW_HDR + 3*SPECTRUM_BANK) -#endif /* __SPEC_SNQK_H__ */ +#endif // MAME_MACHINE_SPEC_SNQK_H diff --git a/src/mame/machine/subsino.h b/src/mame/machine/subsino.h index 8b68bd1902a..2f4b227c4ef 100644 --- a/src/mame/machine/subsino.h +++ b/src/mame/machine/subsino.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood, Angelo Salese, Roberto Fresca -#ifndef __MACHINE_SUBSINO__ -#define __MACHINE_SUBSINO__ +#ifndef MAME_MACHINE_SUBSINO_H +#define MAME_MACHINE_SUBSINO_H + +#pragma once extern const uint8_t crsbingo_xors[8]; @@ -16,4 +18,4 @@ void victor21_bitswaps(uint8_t *decrypt, int i); void subsino_decrypt(running_machine& machine, void (*bitswaps)(uint8_t *decrypt, int i), const uint8_t *xors, int size); -#endif +#endif // MAME_MACHINE_SUBSINO_H diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 7e591af3052..50134a236e7 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -224,13 +224,13 @@ INTERRUPT_GEN_MEMBER(trs80_state::rtc_interrupt) // While we're here, let's countdown the motor timeout too. // Let's not... LDOS often freezes -// if (m_timeout) -// { -// m_timeout--; -// if (m_timeout == 0) -// if (m_floppy) -// m_floppy->mon_w(1); // motor off -// } +// if (m_timeout) +// { +// m_timeout--; +// if (m_timeout == 0) +// if (m_floppy) +// m_floppy->mon_w(1); // motor off +// } } diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h index 051942566f5..2c499d7e4c8 100644 --- a/src/mame/machine/x68k_hdc.h +++ b/src/mame/machine/x68k_hdc.h @@ -84,7 +84,7 @@ class x68k_hdc_image_device : public device_t, }; enum sasi_status : u8 - { + { SASI_STATUS_MSG = 1 << 4, // MSG SASI_STATUS_CD = 1 << 3, // C/D (Command/Data) SASI_STATUS_IO = 1 << 2, // I/O diff --git a/src/mame/video/amigaaga.h b/src/mame/video/amigaaga.h index 3d99cc47a21..e45baac243f 100644 --- a/src/mame/video/amigaaga.h +++ b/src/mame/video/amigaaga.h @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi, Mariusz Wojcieszek +#ifndef MAME_VIDEO_AMIGAAGA_H +#define MAME_VIDEO_AMIGAAGA_H -#ifndef __AMIGAAGA_H__ -#define __AMIGAAGA_H__ +#pragma once void amiga_aga_palette_write(running_machine &machine, int color_reg, uint16_t data); -#endif /* __AMIGA_H__ */ +#endif // MAME_VIDEO_AMIGAAGA_H diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp index 52e6886463f..907eaf35b21 100644 --- a/src/mame/video/apple2.cpp +++ b/src/mame/video/apple2.cpp @@ -106,7 +106,7 @@ void a2_video_device::device_start() save_item(NAME(m_altcharset)); save_item(NAME(m_an2)); save_item(NAME(m_80store)); - save_item(NAME(m_monohgr)); + save_item(NAME(m_monohgr)); save_item(NAME(m_GSfg)); save_item(NAME(m_GSbg)); save_item(NAME(m_GSborder)); diff --git a/src/mame/video/argus.cpp b/src/mame/video/argus.cpp index f8077e64f7b..deded6f1c51 100644 --- a/src/mame/video/argus.cpp +++ b/src/mame/video/argus.cpp @@ -254,7 +254,7 @@ void argus_state::reset_common() VIDEO_START_MEMBER(argus_state,argus) { /* info offset w h col row */ -// m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 4096, 32); // full 65536 width tilemap +// m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 4096, 32); // full 65536 width tilemap m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 1024/16, 32); m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::argus_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_tx_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(argus_state::get_tx_tile_info<3>),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp index 350e70d3bb3..91ecd99365d 100644 --- a/src/mame/video/cischeat.cpp +++ b/src/mame/video/cischeat.cpp @@ -591,7 +591,7 @@ void cischeat_state::cischeat_draw_sprites(bitmap_ind16 &bitmap , const rectangl sx -= 0x800; if(sy & 0x400) sy -= 0x800; - + /* use fixed point values (16.16), for accuracy */ sx <<= 16; sy <<= 16; diff --git a/src/mame/video/konami_helper.h b/src/mame/video/konami_helper.h index b664a79345c..fc6fa2c64e2 100644 --- a/src/mame/video/konami_helper.h +++ b/src/mame/video/konami_helper.h @@ -1,18 +1,18 @@ // license:BSD-3-Clause // copyright-holders:David Haywood /* Konami video helper functions */ +#ifndef MAME_VIDEO_KONAMI_HELPER_H +#define MAME_VIDEO_KONAMI_HELPER_H #pragma once -#ifndef __KONAMI_HELPER_H__ -#define __KONAMI_HELPER_H__ void konami_decode_gfx(device_gfx_interface &gfxdecode, int gfx_index, uint8_t *data, uint32_t total, const gfx_layout *layout, int bpp); -/* helper function to sort three tile layers by priority order */ +// helper function to sort three tile layers by priority order void konami_sortlayers3(int *layer, int *pri); -/* helper function to sort four tile layers by priority order */ +// helper function to sort four tile layers by priority order void konami_sortlayers4(int *layer, int *pri); -/* helper function to sort five tile layers by priority order */ +// helper function to sort five tile layers by priority order void konami_sortlayers5(int *layer, int *pri); -#endif +#endif // MAME_VIDEO_KONAMI_HELPER_H diff --git a/src/mame/video/namco_c116.cpp b/src/mame/video/namco_c116.cpp index c1e205551ac..2f519eba05d 100644 --- a/src/mame/video/namco_c116.cpp +++ b/src/mame/video/namco_c116.cpp @@ -147,7 +147,7 @@ WRITE8_MEMBER(namco_c116_device::write) RAM = &m_ram_b[0]; break; default: // case 0x1800 (internal registers) - { /* notes from namcos2.cpp */ + { /* notes from namcos2.cpp */ /* registers 0-3: clipping */ /* register 4: ? */ diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp index e0ae10e1e30..0ec94693195 100644 --- a/src/mame/video/powervr2.cpp +++ b/src/mame/video/powervr2.cpp @@ -229,10 +229,10 @@ inline uint32_t powervr2_device::float_argb_to_packed_argb(float argb[4]) { } inline void powervr2_device::packed_argb_to_float_argb(float dst[4], uint32_t in) { - dst[0] = (in >> 24) / 256.0f; - dst[1] = ((in >> 16) & 0xff) / 256.0f; - dst[2] = ((in >> 8) & 0xff) / 256.0f; - dst[3] = (in & 0xff) / 256.0f; + dst[0] = (in >> 24) / 256.0f; + dst[1] = ((in >> 16) & 0xff) / 256.0f; + dst[2] = ((in >> 8) & 0xff) / 256.0f; + dst[3] = (in & 0xff) / 256.0f; } // All 64 blending modes, 3 top bits are source mode, 3 bottom bits are destination mode @@ -1841,7 +1841,7 @@ void powervr2_device::process_ta_fifo() memcpy(poly_base_color, tafifo_buff + 4, 4 * sizeof(float)); memset(poly_offs_color, 0, sizeof(poly_offs_color)); } - memcpy(poly_last_mode_2_base_color, poly_base_color, sizeof(poly_last_mode_2_base_color)); + memcpy(poly_last_mode_2_base_color, poly_base_color, sizeof(poly_last_mode_2_base_color)); break; case 3: memcpy(poly_base_color, poly_last_mode_2_base_color, sizeof(poly_base_color)); @@ -2035,9 +2035,9 @@ void powervr2_device::process_ta_fifo() int idx; for (idx = 0; idx < 4; idx++) { memcpy(tv[idx].b, poly_base_color, - sizeof(tv[idx].b)); + sizeof(tv[idx].b)); memcpy(tv[idx].o, poly_offs_color, - sizeof(tv[idx].o)); + sizeof(tv[idx].o)); } ts = &rd->strips[rd->strips_size++]; @@ -2072,12 +2072,12 @@ void powervr2_device::process_ta_fifo() // floating-point color if (have_16_byte_header) { memcpy(vert_base_color, tafifo_buff + 8, - sizeof(vert_base_color)); + sizeof(vert_base_color)); memcpy(vert_offset_color, tafifo_buff + 12, - sizeof(vert_offset_color)); + sizeof(vert_offset_color)); } else { memcpy(vert_base_color, tafifo_buff + 4, - sizeof(vert_base_color)); + sizeof(vert_base_color)); } break; case 2: diff --git a/src/mame/video/taito_helper.h b/src/mame/video/taito_helper.h index 7bdafaffa31..88f7e86b196 100644 --- a/src/mame/video/taito_helper.h +++ b/src/mame/video/taito_helper.h @@ -1,13 +1,13 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#pragma once +#ifndef MAME_VIDEO_TAITO_HELPER_H +#define MAME_VIDEO_TAITO_HELPER_H +#pragma once -#ifndef __TAITO_HELPER_H__ -#define __TAITO_HELPER_H__ -/* These scanline drawing routines, currently used by the pc080sn, tc0080vco, tc0150rod and tc0480scp devices, were lifted from Taito F3: optimise / merge ? */ +// These scanline drawing routines, currently used by the pc080sn, tc0080vco, tc0150rod and tc0480scp devices, were lifted from Taito F3: optimise/merge? -void taitoic_drawscanline( bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, const uint16_t *src, int transparent, uint32_t orient, bitmap_ind8 &priority, int pri); +void taitoic_drawscanline(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, const uint16_t *src, int transparent, uint32_t orient, bitmap_ind8 &priority, int pri); -#endif +#endif // MAME_VIDEO_TAITO_HELPER_H diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index ad860cf729c..2472576049c 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -762,7 +762,7 @@ VIDEO_START_MEMBER(roundup5_state,roundup5) m_tx_layer->set_transparent_pen(0); m_gfxdecode->gfx(1)->set_source(m_tx_gfxram.get()); - + save_pointer(NAME(m_tx_gfxram), 0x20000); save_pointer(NAME(m_bg_gfxram), 0x20000); } diff --git a/src/mame/video/tetrisp2.cpp b/src/mame/video/tetrisp2.cpp index 828df0169bc..769cba99e62 100644 --- a/src/mame/video/tetrisp2.cpp +++ b/src/mame/video/tetrisp2.cpp @@ -877,12 +877,12 @@ void stepstag_state::convert_yuv422_to_rgb888(palette_device *paldev, uint16_t * gf = std::max(gf,0.0); bf = std::min(bf,255.0); bf = std::max(bf,0.0); - + uint8_t r = (uint8_t)rf; uint8_t g = (uint8_t)gf; uint8_t b = (uint8_t)bf; - - paldev->set_pen_color(offset/4, r, g, b); + + paldev->set_pen_color(offset/4, r, g, b); } WRITE16_MEMBER(stepstag_state::stepstag_palette_left_w) |