diff options
author | Vas Crabb <vas@vastheman.com> | 2021-04-25 14:29:59 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2021-04-25 14:29:59 +1000 |
commit | 7118633dfdc23bb5cbaa2e3866043ed651d5e618 (patch) | |
tree | 1e6526e143c40714bc6b1e40ea13103bd94a56bb | |
parent | 0072a83aedd50a7f97bd10f43e5d3b0bd8215e7a (diff) |
srcclean in preparation for branching release
49 files changed, 277 insertions, 277 deletions
diff --git a/hash/megadriv.xml b/hash/megadriv.xml index 6e271a1b890..6e5e8a5dca6 100644 --- a/hash/megadriv.xml +++ b/hash/megadriv.xml @@ -17158,8 +17158,8 @@ but dumps still have to be confirmed. <dataarea name="sram" size="16384"> </dataarea> </part> - </software> - + </software> + <software name="prostrfs"> <description>Pro Striker Final Stage (Jpn)</description> <year>1995</year> diff --git a/hash/pc98.xml b/hash/pc98.xml index ec0a871d519..55bd6a4bb31 100644 --- a/hash/pc98.xml +++ b/hash/pc98.xml @@ -6095,7 +6095,7 @@ only have some part of Windows file and a Video driver(CLGD?). <publisher>アスキー (ASCII)</publisher> <info name="alt_title" value="バランス オブ パワー" /> <info name="release" value="198810xx" /> - <!-- 1988 game but runs DOS 6.20, lolwut? --> + <!-- 1988 game but runs DOS 6.20, lolwut? --> <!-- disk A may be just an user disk created with disk B via SETUP.EXE --> <part name="flop1" interface="floppy_5_25"> <feature name="part_id" value="Disk A"/> @@ -26193,7 +26193,7 @@ only have some part of Windows file and a Video driver(CLGD?). </software> <!-- boot OK --> - <software name="kingdung" supported="yes" > + <software name="kingdung" supported="yes"> <description>King's Dungeon - The Story of Heroes</description> <year>1992</year> <publisher>ソフトプラン (Soft Plan)</publisher> diff --git a/hash/singingstarkaraoke_cart.xml b/hash/singingstarkaraoke_cart.xml index 16c41d8721d..52265a01be2 100644 --- a/hash/singingstarkaraoke_cart.xml +++ b/hash/singingstarkaraoke_cart.xml @@ -4,7 +4,7 @@ license:CC0 --> <softwarelist name="singingstarkaraoke_cart" description="Taikee Singing Star Karaoke cartridges"> - + <software name="karaokd1" supported="no"> <description>Karao Kids Songs 1 (Spain)</description> <year>200?</year> diff --git a/src/devices/bus/cbus/pc9801_cbus.cpp b/src/devices/bus/cbus/pc9801_cbus.cpp index b92b58b19fc..649676d31f1 100644 --- a/src/devices/bus/cbus/pc9801_cbus.cpp +++ b/src/devices/bus/cbus/pc9801_cbus.cpp @@ -4,10 +4,10 @@ C-bus slot interface for PC-98xx family - a.k.a. NEC version of the ISA bus. + a.k.a. NEC version of the ISA bus. - TODO: - - stub interface, checkout what actually belongs here. + TODO: + - stub interface, checkout what actually belongs here. **********************************************************************/ diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 0f72fece59d..c949aafc9db 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -273,7 +273,7 @@ coco_fdc_device_base::coco_fdc_device_base(const machine_config &mconfig, device void coco_fdc_device_base::device_start() { coco_family_fdc_device_base::device_start(); - + install_readwrite_handler(0xFF74, 0xFF76, read8sm_delegate(*this, FUNC(coco_fdc_device_base::ff74_read)), write8sm_delegate(*this, FUNC(coco_fdc_device_base::ff74_write))); diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 73043bacca6..78504c0e3f4 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -78,8 +78,8 @@ enum SMOUSE, /* Smart Mouse */ SOULBLAD, /* Soul Blade */ SQUIRRELK, /* Squirrel King */ - SRAM_ARG96, /* Futbol Argentino 96 (Argentina) (hack of J. League Pro Striker 2) */ - TC2000, /* TC 2000 (Argentina, protected) */ + SRAM_ARG96, /* Futbol Argentino 96 (Argentina) (hack of J. League Pro Striker 2) */ + TC2000, /* TC 2000 (Argentina, protected) */ TEKKENSP, /* Tekken Special */ TOPFIGHTER, /* Top Fighter 2000 MK VIII */ diff --git a/src/devices/bus/thomson/cd90_015.cpp b/src/devices/bus/thomson/cd90_015.cpp index 8b37650cf86..d62b0c0e338 100644 --- a/src/devices/bus/thomson/cd90_015.cpp +++ b/src/devices/bus/thomson/cd90_015.cpp @@ -115,6 +115,6 @@ u8 cd90_015_device::motor_r() if(m_floppy[i]->get_device() && !m_floppy[i]->get_device()->mon_r()) res &= ~(1 << i); if(!machine().side_effects_disabled()) - logerror("motor_r %x\n", res); + logerror("motor_r %x\n", res); return res; } diff --git a/src/devices/bus/thomson/cd90_351.cpp b/src/devices/bus/thomson/cd90_351.cpp index e57d15db8d0..ca543d2b596 100644 --- a/src/devices/bus/thomson/cd90_351.cpp +++ b/src/devices/bus/thomson/cd90_351.cpp @@ -60,7 +60,7 @@ const tiny_rom_entry *cd90_351_device::device_rom_region() const void cd90_351_device::floppy_drives(device_slot_interface &device) { device.option_add("dd90_352", FLOPPY_35_DD); - // device.option_add("qd90_280", FLOPPY_28_QDD); + // device.option_add("qd90_280", FLOPPY_28_QDD); } void cd90_351_device::floppy_formats(format_registration &fr) @@ -391,7 +391,7 @@ void cd90_351_device::sync() case S_IDLE: m_last_sync = next_sync; break; - + case S_WAIT_HEADER_SYNC: { if(read_one_bit(next_sync, next_flux_change)) return; @@ -452,8 +452,8 @@ void cd90_351_device::sync() m_state = S_WAIT_SECTOR_SYNC; } break; - - + + case S_WAIT_SECTOR_SYNC: { if(read_one_bit(next_sync, next_flux_change)) return; @@ -471,7 +471,7 @@ void cd90_351_device::sync() m_state = S_WAIT_HEADER_SYNC; break; } - + case S_READ_SECTOR: if(read_one_bit(next_sync, next_flux_change)) return; diff --git a/src/devices/bus/thomson/cd90_351.h b/src/devices/bus/thomson/cd90_351.h index 0d5957ad203..2afba932b49 100644 --- a/src/devices/bus/thomson/cd90_351.h +++ b/src/devices/bus/thomson/cd90_351.h @@ -62,7 +62,7 @@ private: C2_STEP = 0x10, C2_MTON = 0x04, C2_DRS1 = 0x02, - C2_DRS0 = 0x01, + C2_DRS0 = 0x01, }; enum { diff --git a/src/devices/machine/generalplus_gpl16250soc.cpp b/src/devices/machine/generalplus_gpl16250soc.cpp index 1deceda4ce8..80990745f81 100644 --- a/src/devices/machine/generalplus_gpl16250soc.cpp +++ b/src/devices/machine/generalplus_gpl16250soc.cpp @@ -254,9 +254,9 @@ void sunplus_gcm394_base_device::trigger_systemm_dma(int channel) mem.write_word(0x4abe7, 0x4841); // camp rock IRQ? wait hack //if (mem.read_word(0x37244) == 0x4845) - // mem.write_word(0x37244, 0x4840); // hannah montana guitar force service mode + // mem.write_word(0x37244, 0x4840); // hannah montana guitar force service mode + - // clear params after operation diff --git a/src/devices/machine/mc6843.cpp b/src/devices/machine/mc6843.cpp index caf637c2eb3..695c26a1500 100644 --- a/src/devices/machine/mc6843.cpp +++ b/src/devices/machine/mc6843.cpp @@ -82,7 +82,7 @@ void mc6843_device::map(address_map &map) map(4, 4).rw(FUNC(mc6843_device::strb_r), FUNC(mc6843_device::sar_w)); map(5, 5).w (FUNC(mc6843_device::gcr_w)); map(6, 6).w (FUNC(mc6843_device::ccr_w)); - map(7, 7).w (FUNC(mc6843_device::ltar_w)); + map(7, 7).w (FUNC(mc6843_device::ltar_w)); } void mc6843_device::set_floppy(floppy_image_device *floppy) @@ -396,7 +396,7 @@ void mc6843_device::run(bool timeout, bool ready, bool index) case S_STZ_STEP: if(m_floppy && !m_floppy->trk00_r()) { m_floppy->stp_w(0); - m_floppy->stp_w(1); + m_floppy->stp_w(1); } m_step_count --; m_state = S_STZ_STEP_WAIT; @@ -428,7 +428,7 @@ void mc6843_device::run(bool timeout, bool ready, bool index) case S_SEEK_STEP: if(m_floppy) { m_floppy->stp_w(0); - m_floppy->stp_w(1); + m_floppy->stp_w(1); } m_step_count --; m_state = S_SEEK_STEP_WAIT; @@ -467,7 +467,7 @@ void mc6843_device::run(bool timeout, bool ready, bool index) } else m_state = S_SRW_START; break; - + case S_SRW_HEAD_SETTLING: if(timeout) { m_head_loaded = true; @@ -490,7 +490,7 @@ void mc6843_device::run(bool timeout, bool ready, bool index) } else m_state = S_FFW_START; break; - + case S_FFW_HEAD_SETTLING: if(timeout) { m_head_loaded = true; @@ -508,14 +508,14 @@ void mc6843_device::run(bool timeout, bool ready, bool index) m_stra &= ~SA_BUSY; m_state = S_IDLE; isr_raise(I_RWCE); - return; + return; case S_IDAM_BAD_CRC: m_strb |= SB_CRC | SB_SAERR; m_stra &= ~SA_BUSY; m_state = S_IDLE; isr_raise(I_RWCE | I_STRB); - return; + return; case S_IDAM_FOUND: if(m_cmr & 0x20) @@ -535,7 +535,7 @@ void mc6843_device::run(bool timeout, bool ready, bool index) m_state = S_IDLE; isr_raise(I_RWCE | I_STRB); logerror("not found\n"); - return; + return; case S_DAM_NOT_FOUND: m_strb |= SB_DMERR; @@ -738,7 +738,7 @@ void mc6843_device::live_run(attotime limit) live_delay(L_IDLE); return; - } else + } else m_cur_live.state = L_IDAM_CHECK_SECTOR; } break; @@ -903,7 +903,7 @@ void mc6843_device::live_run(attotime limit) } m_cur_live.state = L_DAM_WRITE; break; - } + } case L_FFW_BYTE: if(!m_dor_loaded) diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h index 03482d79375..a9acaf377ac 100644 --- a/src/devices/machine/mc6843.h +++ b/src/devices/machine/mc6843.h @@ -88,7 +88,7 @@ private: S_FFW_WAIT_READY, S_FFW_HEAD_SETTLING, S_FFW_START, - + S_IDAM_BAD_TRACK, S_IDAM_BAD_CRC, S_IDAM_FOUND, diff --git a/src/devices/sound/swp30.cpp b/src/devices/sound/swp30.cpp index e7ce8534993..6c42e62536c 100644 --- a/src/devices/sound/swp30.cpp +++ b/src/devices/sound/swp30.cpp @@ -804,8 +804,8 @@ void swp30_device::snd_w(offs_t offset, u16 data) preg = util::string_format("lf%02x", (slot-0x3e) + 2*chan); else preg = util::string_format("%02x.%02x", chan, slot); - // if((slot >= 0xa && slot <= 0xd) || (slot >= 0x2c && slot <= 0x2f)) - // machine().debug_break(); + // if((slot >= 0xa && slot <= 0xd) || (slot >= 0x2c && slot <= 0x2f)) + // machine().debug_break(); logerror("snd_w [%04x %04x] %-5s, %04x\n", offset, offset*2, preg, data); } @@ -869,7 +869,7 @@ void swp30_device::sound_stream_update(sound_stream &stream, std::vector<read_st } break; } - + case 2: // 8-bits linear samp = read_byte(base_address + spos) << 8; break; diff --git a/src/devices/sound/y8950.cpp b/src/devices/sound/y8950.cpp index 922308b960a..7b75cd12b1e 100644 --- a/src/devices/sound/y8950.cpp +++ b/src/devices/sound/y8950.cpp @@ -53,16 +53,16 @@ u8 y8950_device::data_r() u8 result = 0xff; switch (m_address) { - case 0x05: // keyboard in + case 0x05: // keyboard in result = m_keyboard_read_handler(0); break; - case 0x09: // ADPCM data + case 0x09: // ADPCM data case 0x1a: result = m_adpcm_b.read(m_address - 0x07); break; - case 0x19: // I/O data + case 0x19: // I/O data result = m_io_read_handler(0); break; @@ -107,21 +107,21 @@ void y8950_device::data_w(u8 value) // handle special addresses switch (m_address) { - case 0x04: // IRQ control + case 0x04: // IRQ control m_fm.write(m_address, value); combine_status(); break; - case 0x06: // keyboard out + case 0x06: // keyboard out m_keyboard_write_handler(0, value); break; - case 0x08: // split FM/ADPCM-B + case 0x08: // split FM/ADPCM-B m_adpcm_b.write(m_address - 0x07, (value & 0x0f) | 0x80); m_fm.write(m_address, value & 0xc0); break; - case 0x07: // ADPCM-B registers + case 0x07: // ADPCM-B registers case 0x09: case 0x0a: case 0x0b: @@ -138,15 +138,15 @@ void y8950_device::data_w(u8 value) m_adpcm_b.write(m_address - 0x07, value); break; - case 0x18: // I/O direction + case 0x18: // I/O direction m_io_ddr = value & 0x0f; break; - case 0x19: // I/O data + case 0x19: // I/O data m_io_write_handler(0, value & m_io_ddr); break; - default: // everything else to FM + default: // everything else to FM m_fm.write(m_address, value); break; } diff --git a/src/devices/sound/y8950.h b/src/devices/sound/y8950.h index d3285ee835d..6ded01b31c2 100644 --- a/src/devices/sound/y8950.h +++ b/src/devices/sound/y8950.h @@ -36,13 +36,13 @@ public: auto io_write() { return m_io_write_handler.bind(); } // read access - u8 status_r(); // A0=0 - u8 data_r(); // A0=1 + u8 status_r(); // A0=0 + u8 data_r(); // A0=1 u8 read(offs_t offset); // write access - void address_w(u8 data); // A0=0 - void data_w(u8 data); // A0=1 + void address_w(u8 data); // A0=0 + void data_w(u8 data); // A0=1 void write(offs_t offset, u8 data); protected: diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp index a8e0bf4ab7a..4403bb13863 100644 --- a/src/devices/sound/ym2151.cpp +++ b/src/devices/sound/ym2151.cpp @@ -44,7 +44,7 @@ u8 ym2151_device::read(offs_t offset) logerror("Unexpected read from YM2151 offset %d\n", offset & 3); break; - case 1: // status port, YM2203 compatible + case 1: // status port, YM2203 compatible result = m_fm.status(); break; } diff --git a/src/devices/sound/ym2203.cpp b/src/devices/sound/ym2203.cpp index d2e5e61fb03..a29a47aeec7 100644 --- a/src/devices/sound/ym2203.cpp +++ b/src/devices/sound/ym2203.cpp @@ -35,7 +35,7 @@ u8 ym2203_device::read(offs_t offset) u8 result = 0; switch (offset & 1) { - case 0: // status port + case 0: // status port result = m_fm.status(); break; diff --git a/src/devices/sound/ym2413.h b/src/devices/sound/ym2413.h index 9cea40d1d00..dfa29f58197 100644 --- a/src/devices/sound/ym2413.h +++ b/src/devices/sound/ym2413.h @@ -25,8 +25,8 @@ public: // no read access present // write access - void address_w(u8 data); // A0=0 - void data_w(u8 data); // A0=1 + void address_w(u8 data); // A0=0 + void data_w(u8 data); // A0=1 void write(offs_t offset, u8 data); protected: diff --git a/src/devices/sound/ym2608.cpp b/src/devices/sound/ym2608.cpp index 35cdff227c8..bd83dfb873c 100644 --- a/src/devices/sound/ym2608.cpp +++ b/src/devices/sound/ym2608.cpp @@ -54,7 +54,7 @@ u8 ym2608_device::read(offs_t offset) u8 result = 0; switch (offset & 3) { - case 0: // status port, YM2203 compatible + case 0: // status port, YM2203 compatible result = m_fm.status() & (fm_engine::STATUS_TIMERA | fm_engine::STATUS_TIMERB | fm_engine::STATUS_BUSY); break; @@ -65,7 +65,7 @@ u8 ym2608_device::read(offs_t offset) result = 1; // ID code break; - case 2: // status port, extended + case 2: // status port, extended m_stream->update(); result = combine_status(); break; diff --git a/src/devices/sound/ym2610.cpp b/src/devices/sound/ym2610.cpp index 9c5b3d6a499..d3a1210c232 100644 --- a/src/devices/sound/ym2610.cpp +++ b/src/devices/sound/ym2610.cpp @@ -56,7 +56,7 @@ u8 ym2610_device::read(offs_t offset) u8 result = 0; switch (offset & 3) { - case 0: // status port, YM2203 compatible + case 0: // status port, YM2203 compatible result = m_fm.status() & (fm_engine::STATUS_TIMERA | fm_engine::STATUS_TIMERB | fm_engine::STATUS_BUSY); break; @@ -67,7 +67,7 @@ u8 ym2610_device::read(offs_t offset) result = 1; // ID code break; - case 2: // status port, extended + case 2: // status port, extended m_stream->update(); result = m_eos_status & m_flag_mask; break; diff --git a/src/devices/sound/ym2612.cpp b/src/devices/sound/ym2612.cpp index e97a431cc29..231ea7d49f8 100644 --- a/src/devices/sound/ym2612.cpp +++ b/src/devices/sound/ym2612.cpp @@ -47,7 +47,7 @@ u8 ym2612_device::read(offs_t offset) u8 result = 0; switch (offset & 3) { - case 0: // status port, YM2203 compatible + case 0: // status port, YM2203 compatible result = m_fm.status(); break; diff --git a/src/devices/sound/ym3526.h b/src/devices/sound/ym3526.h index 496936befc9..d07edb9a292 100644 --- a/src/devices/sound/ym3526.h +++ b/src/devices/sound/ym3526.h @@ -26,12 +26,12 @@ public: auto irq_handler() { return m_fm.irq_handler(); } // read access - u8 status_r(); // A0=0 + u8 status_r(); // A0=0 u8 read(offs_t offset); // write access - void address_w(u8 data); // A0=0 - void data_w(u8 data); // A0=1 + void address_w(u8 data); // A0=0 + void data_w(u8 data); // A0=1 void write(offs_t offset, u8 data); protected: diff --git a/src/devices/sound/ym3812.h b/src/devices/sound/ym3812.h index 4e6c89afde3..331fc776b33 100644 --- a/src/devices/sound/ym3812.h +++ b/src/devices/sound/ym3812.h @@ -26,12 +26,12 @@ public: auto irq_handler() { return m_fm.irq_handler(); } // read access - u8 status_r(); // A0=0 + u8 status_r(); // A0=0 u8 read(offs_t offset); // write access - void address_w(u8 data); // A0=0 - void data_w(u8 data); // A0=1 + void address_w(u8 data); // A0=0 + void data_w(u8 data); // A0=1 void write(offs_t offset, u8 data); protected: diff --git a/src/devices/sound/ymf262.cpp b/src/devices/sound/ymf262.cpp index a7c77f743c7..e6b9782cb87 100644 --- a/src/devices/sound/ymf262.cpp +++ b/src/devices/sound/ymf262.cpp @@ -35,11 +35,11 @@ u8 ymf262_device::read(offs_t offset) u8 result = 0x00; switch (offset & 3) { - case 0: // status port (A0=0, A1=0) + case 0: // status port (A0=0, A1=0) result = m_fm.status(); break; - default: // datasheet says anything else is not guaranteed + default: // datasheet says anything else is not guaranteed logerror("Unexpected read from YMF262 offset %d\n", offset & 3); break; } @@ -56,7 +56,7 @@ void ymf262_device::write(offs_t offset, u8 value) { switch (offset & 1) { - case 0: // address ports - A1 references upper bank + case 0: // address ports - A1 references upper bank m_address = value | (BIT(offset, 1) << 8); // tests reveal that in compatibility mode, upper bit is masked diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 8a2a015cd1a..746207e8ef5 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -23,7 +23,7 @@ - A5105 has a FIFO bug with the RDAT, should be a lot larger when it scrolls up. Can be fixed with a DRDY mechanism for RDAT/WDAT; - Some later SWs on PC-98 throws "Invalid command byte 05" (zettmj on Epson logo), - actual undocumented command to reset something? + actual undocumented command to reset something? - honor visible area - wide mode (32-bit access) diff --git a/src/emu/emumem_mview.cpp b/src/emu/emumem_mview.cpp index 3ff595ac274..83280460cc7 100644 --- a/src/emu/emumem_mview.cpp +++ b/src/emu/emumem_mview.cpp @@ -664,7 +664,7 @@ void memory_view::disable() m_handler_write->select_a(-1); if(m_space) - m_space->invalidate_caches(read_or_write::READWRITE); + m_space->invalidate_caches(read_or_write::READWRITE); } void memory_view::select(int slot) diff --git a/src/mame/drivers/basf7100.cpp b/src/mame/drivers/basf7100.cpp index bef21fd0e44..d9717965406 100644 --- a/src/mame/drivers/basf7100.cpp +++ b/src/mame/drivers/basf7100.cpp @@ -4,7 +4,7 @@ BASF 7100 - This system is based on (or even identical to) the DigiLog Microterm II + This system is based on (or even identical to) the DigiLog Microterm II Models: - 7120: 24k disk controller memory, 3x 5.25" single sided @@ -39,9 +39,9 @@ TODO: - Dump real character ROM - - Improve video emulation - - Find documentation for switches S2, S3, S4 (might be app. specific) - - Serial interrupts, flags, control + - Improve video emulation + - Find documentation for switches S2, S3, S4 (might be app. specific) + - Serial interrupts, flags, control Notes: - Runs the BOS operating system, possibly also CP/M? @@ -192,13 +192,13 @@ void basf7100_state::io_map(address_map &map) map(0x12, 0x12).w("brg0", FUNC(com8116_device::stt_str_w)); // or str_stt_w map(0x14, 0x15).rw(m_usart[1], FUNC(i8251_device::read), FUNC(i8251_device::write)); map(0x16, 0x16).w("brg1", FUNC(com8116_device::stt_str_w)); // or str_stt_w -// map(0x17, 0x17) rs232 flags/control +// map(0x17, 0x17) rs232 flags/control map(0x18, 0x18).lr8(NAME([this] () -> uint8_t { return m_int_flags; })); map(0x1c, 0x1c).portr("S1"); map(0x1d, 0x1d).portr("S2"); map(0x1e, 0x1e).portr("S3"); map(0x1f, 0x1f).portr("S4"); -// map(0xb0, 0xb3) display hardware clear +// map(0xb0, 0xb3) display hardware clear map(0xb8, 0xbb).rw(m_ppi[3], FUNC(i8255_device::read), FUNC(i8255_device::write)); map(0xbc, 0xbf).lr8(NAME([this] (offs_t offset) -> uint8_t { return m_ppi[4]->read(offset ^ 3); })); map(0xbc, 0xbf).lw8(NAME([this] (offs_t offset, uint8_t data) { m_ppi[4]->write(offset ^ 3, data); })); @@ -511,7 +511,7 @@ void basf7100_state::fdc_ctrl_w(uint8_t data) if (data != 0x08) logerror("fdc_ctrl_w: %04x\n", data); - + floppy_image_device *floppy = nullptr; if ((data & 0x03) < 3) @@ -559,7 +559,7 @@ void basf7100_state::mmio_w(offs_t offset, uint8_t data) IRQ_CALLBACK_MEMBER( basf7100_state::maincpu_irq_callback ) { uint32_t vector = 0; - + vector |= m_pic->acknowledge() << 16; vector |= m_pic->acknowledge(); vector |= m_pic->acknowledge() << 8; @@ -712,11 +712,11 @@ ROM_START( basf7120 ) ROM_REGION(0x400, "fdccpu", 0) ROM_LOAD("19-2130-2h.u45", 0x000, 0x400, CRC(cb077c69) SHA1(dfa16082b88275442c48082aeb5f62fe1238ae3e)) // 2708 - + ROM_REGION(0x50, "floppy_pal", 0) ROM_LOAD("19-2131-1.u23", 0x00, 0x28, CRC(f37ed4bc) SHA1(824b4405f396c262cf8116f85eb0b548eabb4c04)) // PAL10L8MJ ROM_LOAD("19-2132-1.u24", 0x28, 0x28, CRC(b918ff18) SHA1(c6d7cd9642ed32e56b5c1df1ddf3afe09d744ebc)) // PAL10L8MJ - + ROM_REGION(0x100, "prom", 0) ROM_LOAD("video.30", 0x000, 0x100, CRC(89175ac9) SHA1(69b2055bee87e11cc74c70cef2f2bebcbd0004c9)) // N82S129N (label missing) diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp index 4d247528af6..cac9af136cc 100644 --- a/src/mame/drivers/calomega.cpp +++ b/src/mame/drivers/calomega.cpp @@ -446,33 +446,33 @@ [2021-04-24] General improvements... - - The PIAs set for each MACHINE_CONFIG were made independent. - - All the PIAs lines were adapted according to the needs of each platform. - - All the interrupts were set/placed as indicated in the schematics (903/905). - - A global hopper was added, currently assigned to platform 906-III, + - The PIAs set for each MACHINE_CONFIG were made independent. + - All the PIAs lines were adapted according to the needs of each platform. + - All the interrupts were set/placed as indicated in the schematics (903/905). + - A global hopper was added, currently assigned to platform 906-III, but it can be used by other platforms. - - Worked proper inputs for system 903: Cal Omega - Game 15.7 (Double-Draw Poker). - The game was promoted to WORKING. - - Worked proper inputs for system 905: Cal Omega - Game 15.9 (Wild Double-Up). - The game was promoted to WORKING. - - Worked proper inputs for system 905: Cal Omega - Game 17.2 (Double Double Poker). - The game was promoted to WORKING. + - Worked proper inputs for system 903: Cal Omega - Game 15.7 (Double-Draw Poker). + The game was promoted to WORKING. + - Worked proper inputs for system 905: Cal Omega - Game 15.9 (Wild Double-Up). + The game was promoted to WORKING. + - Worked proper inputs for system 905: Cal Omega - Game 17.2 (Double Double Poker). + The game was promoted to WORKING. [2021-04-21] 906-III improvements... - - Proper inputs for the IWC poker games. - - Fixed/Improved the interrupts system. - - Preliminary button-lamps support. - - Simplified and partially cleaned the code. - - Added technical notes. + - Proper inputs for the IWC poker games. + - Fixed/Improved the interrupts system. + - Preliminary button-lamps support. + - Simplified and partially cleaned the code. + - Added technical notes. [2021-04-20] - Reworked a lot of things to get the 906-III platform playable. - - Switched to Rockwell R65C02 CPU. + - Switched to Rockwell R65C02 CPU. - Added missing 906-III inputs, timers, clocks and connections. - Renamed Game 51.08 to CEI 51.08 (CEI 906-III Poker). The game is promoted to WORKING. @@ -679,7 +679,7 @@ - 906-III: Proper PIATs 65C24 devices. - 906-III: GFX banks, proper banks selector. - 906-III: EX and Turbo+ platforms support. - - Hopper support. + - Hopper support. - Parent/clone relationship. - Fix lamps. @@ -689,10 +689,10 @@ #include "emu.h" #include "includes/calomega.h" -#define MASTER_CLOCK XTAL(10'000'000) -#define CPU_CLOCK (MASTER_CLOCK/16) -#define UART_CLOCK (MASTER_CLOCK/16) -#define SND_CLOCK (MASTER_CLOCK/8) +#define MASTER_CLOCK XTAL(10'000'000) +#define CPU_CLOCK (MASTER_CLOCK/16) +#define UART_CLOCK (MASTER_CLOCK/16) +#define SND_CLOCK (MASTER_CLOCK/8) /************************************************** @@ -721,18 +721,18 @@ uint8_t calomega_state::s903_mux_port_r() void calomega_state::s903_mux_w(uint8_t data) { - // bit 7 - bit 6 -bit 5 -bit 4 -> Mux. Scan Lines - m_s903_mux_data = data ^ 0xf0; // inverted + // bit 7 - bit 6 -bit 5 -bit 4 -> Mux. Scan Lines + m_s903_mux_data = data ^ 0xf0; // inverted - // bit 0 - bit 1 -> Hopper + // bit 0 - bit 1 -> Hopper m_hopper->motor_w(BIT(~data, 0) && BIT(~data, 1)); - // bit2 - bit3 -> No connected + // bit2 - bit3 -> No connected } uint8_t calomega_state::s905_mux_port_r() { - switch( m_s905_mux_data & 0x0f ) // bits 0-3 + switch( m_s905_mux_data & 0x0f ) // bits 0-3 { case 0x01: return m_in0_0->read(); case 0x02: return m_in0_1->read(); @@ -746,13 +746,13 @@ uint8_t calomega_state::s905_mux_port_r() void calomega_state::s905_mux_w(uint8_t data) { // Lower nibble - m_s905_mux_data = data ^ 0x0f; // inverted + m_s905_mux_data = data ^ 0x0f; // inverted /* Upper nibble - PIA_1_PB_4 - N.C. - PIA_1_PB_5 - Hopper1. - PIA_1_PB_6 - Hopper2. - PIA_1_PB_7 - Lockout. + PIA_1_PB_4 - N.C. + PIA_1_PB_5 - Hopper1. + PIA_1_PB_6 - Hopper2. + PIA_1_PB_7 - Lockout. */ m_hopper->motor_w(BIT(~data, 5) && BIT(~data, 6)); m_lockout = BIT(data, 7); @@ -783,7 +783,7 @@ void calomega_state::pia0_bout_w(uint8_t data) uint8_t calomega_state::pia1_ain_r() { - //popmessage("hopper out: %x", m_in0_1->read() & 0x80); + //popmessage("hopper out: %x", m_in0_1->read() & 0x80); switch( m_s905_mux_data & 0x03 ) // bits 0-3 { case 0x00: return m_in0_0->read(); @@ -884,7 +884,7 @@ WRITE_LINE_MEMBER(calomega_state::vblank1_w) WRITE_LINE_MEMBER(calomega_state::vblank2_w) { m_vblank = state; - m_pia[1]->read(0); + m_pia[1]->read(0); m_pia[1]->read(0); m_pia[1]->cb1_w(state); // logerror("V_BLANK_2 event : state=%d\n", m_vblank); @@ -1026,7 +1026,7 @@ void calomega_state::sys905_map(address_map &map) void calomega_state::sys906_map(address_map &map) { - map(0x0000, 0x1fff).ram().share("nvram"); + map(0x0000, 0x1fff).ram().share("nvram"); map(0x280c, 0x280f).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x2810, 0x2811).rw(m_acia6850_0, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0x2824, 0x2827).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); @@ -2298,11 +2298,11 @@ static INPUT_PORTS_START( comg159 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + // For System 905, SW1 uses the whole PIA1 portA. PORT_START("SW1") // settings (PIA1) - PORT_DIPNAME( 0x01, 0x01, "Game Type" ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x01, 0x01, "Game Type" ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, "Hold" ) PORT_DIPSETTING( 0x00, "Discard" ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2") @@ -2314,7 +2314,7 @@ static INPUT_PORTS_START( comg159 ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x30, 0x30, "Pay Table" ) PORT_DIPLOCATION("SW1:5,6") + PORT_DIPNAME( 0x30, 0x30, "Pay Table" ) PORT_DIPLOCATION("SW1:5,6") PORT_DIPSETTING( 0x30, "250/100/25/10/8/5/4/3/2/1" ) PORT_DIPSETTING( 0x20, "500/200/40/10/8/5/4/3/2/1" ) PORT_DIPSETTING( 0x00, "500/250/50/20/8/6/4/3/2/1" ) @@ -2366,11 +2366,11 @@ static INPUT_PORTS_START( comg172 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + // For System 905, SW1 uses the whole PIA1 portA. PORT_START("SW1") // settings (PIA1) - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:2") @@ -2689,7 +2689,7 @@ static INPUT_PORTS_START( stand906 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_STAND ) PORT_NAME("Stand / DVTR") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN0-1") //PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_IMPULSE(10) PORT_NAME("Coin Out") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", ticket_dispenser_device, line_r) @@ -2787,7 +2787,7 @@ static INPUT_PORTS_START( cas21iwc ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN0-1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_IMPULSE(2) PORT_NAME("Coin Out (Fichas Salida)") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_H) PORT_NAME("Hopper Height (Peso Tolva)") PORT_TOGGLE @@ -2810,7 +2810,7 @@ static INPUT_PORTS_START( cas21iwc ) PORT_START("IN0-3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_D) PORT_NAME("Drop Door (Cajon Abierto)") PORT_TOGGLE - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet (Apostar)") + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet (Apostar)") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_8) PORT_NAME("Attendant (Asistente)") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2883,7 +2883,7 @@ static INPUT_PORTS_START( pokeriwc ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_STAND ) PORT_NAME("Stand (Plantar)/ DVTR (Desviar)") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN0-1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) PORT_IMPULSE(2) PORT_NAME("Coin Out (Fichas Salida)") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_H) PORT_NAME("Hopper Weight (Peso Tolva)") PORT_TOGGLE @@ -2906,7 +2906,7 @@ static INPUT_PORTS_START( pokeriwc ) PORT_START("IN0-3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_D) PORT_NAME("Drop Door (Cajon Abierto)") PORT_TOGGLE - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet (Apostar)") + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet (Apostar)") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_8) PORT_NAME("Attendant (Asistente)") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_0) PORT_NAME("Prog Hit (Pozo Acumulado)") @@ -3243,13 +3243,13 @@ void calomega_state::sys903(machine_config &config) PIA6821(config, m_pia[1], 0); m_pia[1]->readpa_handler().set_ioport("SW1"); - m_pia[1]->readpb_handler().set(FUNC(calomega_state::dummy_pia_r)); // Debug: so much need to read????? :) + m_pia[1]->readpb_handler().set(FUNC(calomega_state::dummy_pia_r)); // Debug: so much need to read????? :) m_pia[1]->writepa_handler().set(FUNC(calomega_state::lamps_903b_w)); m_pia[1]->writepb_handler().set(FUNC(calomega_state::s903_mux_w)); // Mux. Scan Lines.(Upper nibble) - Hopper b0-b1 (Lower Nibble). - m_pia[1]->ca2_handler().set(FUNC(calomega_state::dummy_pia_line_w)); // - m_pia[1]->cb2_handler().set(FUNC(calomega_state::dummy_pia_line_w)); // + m_pia[1]->ca2_handler().set(FUNC(calomega_state::dummy_pia_line_w)); // + m_pia[1]->cb2_handler().set(FUNC(calomega_state::dummy_pia_line_w)); // m_pia[1]->readcb1_handler().set(FUNC(calomega_state::vblank_r)); // V_BLANK Interrupt Ack. (CPU -> PIA) - m_pia[1]->irqb_handler().set_inputline("maincpu", M6502_IRQ_LINE); // V_BLANK Interrupt Event. (PIA -> CPU) + m_pia[1]->irqb_handler().set_inputline("maincpu", M6502_IRQ_LINE); // V_BLANK Interrupt Event. (PIA -> CPU) // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -3283,7 +3283,7 @@ void calomega_state::sys903(machine_config &config) aciabaud.signal_handler().set(FUNC(calomega_state::write_acia_clock)); TIMER(config, "timer_0").configure_periodic(FUNC(calomega_state::timer_0), attotime::from_hz(550*2)); // (time*2) - Each timer pulse -> half period - + HOPPER(config, m_hopper, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH ); } @@ -3324,7 +3324,7 @@ void calomega_state::sys905(machine_config &config) PIA6821(config.replace(), m_pia[0], 0); m_pia[0]->readpa_handler().set(FUNC(calomega_state::s905_mux_port_r)); // Mux. Button read. - m_pia[0]->writepa_handler().set(FUNC(calomega_state::dummy_pia_w)); // Bit 7 & 6 as output. (Watchdog & Bat. Test control) - Ignored + m_pia[0]->writepa_handler().set(FUNC(calomega_state::dummy_pia_w)); // Bit 7 & 6 as output. (Watchdog & Bat. Test control) - Ignored m_pia[0]->writepb_handler().set(FUNC(calomega_state::lamps_905_w)); // Full Lamps - OK. m_pia[0]->readcb1_handler().set(FUNC(calomega_state::vblank_r)); // V_BLANK Interrupt Ack. (CPU -> PIA) m_pia[0]->cb2_handler().set(FUNC(calomega_state::dummy_pia_line_w)); // No connected (from schematics). @@ -3332,7 +3332,7 @@ void calomega_state::sys905(machine_config &config) PIA6821(config.replace(), m_pia[1], 0); m_pia[1]->readpa_handler().set_ioport("SW1"); // Full port. - //m_pia[1]->readpb_handler().set(FUNC(calomega_state::dummy_pia_r)); // Debug: so much need to read????? :) + //m_pia[1]->readpb_handler().set(FUNC(calomega_state::dummy_pia_r)); // Debug: so much need to read????? :) //m_pia[1]->writepa_handler().set(FUNC(calomega_state::dummy_pia_w)); // Debug: to assign lamps/counters/solenids/hopper???? m_pia[1]->writepb_handler().set(FUNC(calomega_state::s905_mux_w)); // Mux. Scan Lines.(Lower Nibble). Hopper & Coin Lockout (Upper nibble). m_pia[1]->readcb1_handler().set(FUNC(calomega_state::timer_r)); // Timer Interrupt Ack. (CPU -> PIA) @@ -3353,7 +3353,7 @@ void calomega_state::sys906(machine_config &config) sys903(config); // basic machine hardware - R65C02(config.replace(), m_maincpu, CPU_CLOCK); // confirmed + R65C02(config.replace(), m_maincpu, CPU_CLOCK); // confirmed m_maincpu->set_addrmap(AS_PROGRAM, &calomega_state::sys906_map); screen_device &screen(SCREEN(config.replace(), "screen", SCREEN_TYPE_RASTER)); @@ -3361,8 +3361,8 @@ void calomega_state::sys906(machine_config &config) screen.set_vblank_time(ATTOSECONDS_IN_USEC(100)); screen.set_size((39+1)*8, (31+1)*8); // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1). screen.set_visarea(0*8, 32*8-1, 0*8, 31*8-1); // Taken from MC6845 init, registers 01 & 06. - screen.set_screen_update(FUNC(calomega_state::screen_update_calomega)); - + screen.set_screen_update(FUNC(calomega_state::screen_update_calomega)); + screen.screen_vblank().set(FUNC(calomega_state::vblank2_w)); PIA6821(config.replace(), m_pia[0], 0); m_pia[0]->readpa_handler().set_ioport("SW1"); // Bit 7 - CGBANK ???? input?-output? @@ -3386,8 +3386,8 @@ void calomega_state::sys906(machine_config &config) m_gfxdecode->set_info(gfx_sys906); // sound hardware - ay8912_device &ay8912(AY8912(config.replace(), "ay8912", SND_CLOCK)); // confirmed - ay8912.port_a_read_callback().set_ioport("SW2"); // from schematics + ay8912_device &ay8912(AY8912(config.replace(), "ay8912", SND_CLOCK)); // confirmed + ay8912.port_a_read_callback().set_ioport("SW2"); // from schematics ay8912.add_route(ALL_OUTPUTS, "mono", 0.75); TIMER(config.replace(), "timer_0").configure_periodic(FUNC(calomega_state::timer_2), attotime::from_hz(380*2)); // (time*2) - Each timer pulse -> half period @@ -4478,14 +4478,14 @@ void calomega_state::init_cas21iwc() { uint8_t *PRGROM = memregion( "maincpu" )->base(); - PRGROM[0xB603] = 0xff; // Checksum flag. No changes for now. + PRGROM[0xB603] = 0xff; // Checksum flag. No changes for now. } void calomega_state::init_pokeriwc() { uint8_t *PRGROM = memregion( "maincpu" )->base(); - PRGROM[0x8000] = 0xa2; // Checksum flag. No changes for now. + PRGROM[0x8000] = 0xa2; // Checksum flag. No changes for now. } void calomega_state::init_any() @@ -4493,32 +4493,32 @@ void calomega_state::init_any() uint8_t *PRGROM = memregion( "maincpu" )->base(); PRGROM[0x2e30] = 0xe0; //fix bad dump - PRGROM[0x2e31] = 0x12; - PRGROM[0x2e32] = 0x90; - PRGROM[0x2e33] = 0xf2; - PRGROM[0x2e34] = 0xad; - PRGROM[0x2e35] = 0xc4; - PRGROM[0x2e36] = 0x08; - PRGROM[0x2e37] = 0x29; - PRGROM[0x2e38] = 0x80; - PRGROM[0x2e39] = 0xd0; - PRGROM[0x2e3a] = 0x13; - PRGROM[0x2e3b] = 0xa0; - PRGROM[0x2e3c] = 0x00; - PRGROM[0x2e3d] = 0xa2; - PRGROM[0x2e3e] = 0x04; - PRGROM[0x2e3f] = 0xb9; - PRGROM[0x2e40] = 0x61; - - PRGROM[0x2dd6] = 0x10; - PRGROM[0x2dd7] = 0x99; - PRGROM[0x2dd8] = 0x60; - PRGROM[0x2dd9] = 0x11; - PRGROM[0x2ddd] = 0x99; - - - - + PRGROM[0x2e31] = 0x12; + PRGROM[0x2e32] = 0x90; + PRGROM[0x2e33] = 0xf2; + PRGROM[0x2e34] = 0xad; + PRGROM[0x2e35] = 0xc4; + PRGROM[0x2e36] = 0x08; + PRGROM[0x2e37] = 0x29; + PRGROM[0x2e38] = 0x80; + PRGROM[0x2e39] = 0xd0; + PRGROM[0x2e3a] = 0x13; + PRGROM[0x2e3b] = 0xa0; + PRGROM[0x2e3c] = 0x00; + PRGROM[0x2e3d] = 0xa2; + PRGROM[0x2e3e] = 0x04; + PRGROM[0x2e3f] = 0xb9; + PRGROM[0x2e40] = 0x61; + + PRGROM[0x2dd6] = 0x10; + PRGROM[0x2dd7] = 0x99; + PRGROM[0x2dd8] = 0x60; + PRGROM[0x2dd9] = 0x11; + PRGROM[0x2ddd] = 0x99; + + + + } diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index d354b057cc3..c8d8f07fbfb 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -695,7 +695,7 @@ void combatsc_state::combatsc(machine_config &config) WATCHDOG_TIMER(config, "watchdog"); KONAMI_007452_MATH(config, "k007452"); - + /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // m_screen->set_refresh_hz(60); diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index bba5e533fdc..2d0ffa46362 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -207,7 +207,7 @@ void flkatck_state::flkatck(machine_config &config) config.set_maximum_quantum(attotime::from_hz(600)); WATCHDOG_TIMER(config, m_watchdog); - + KONAMI_007452_MATH(config, "k007452"); /* video hardware */ diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp index 7f6918de7b9..5d10fd7c3a5 100644 --- a/src/mame/drivers/funkyjet.cpp +++ b/src/mame/drivers/funkyjet.cpp @@ -3,7 +3,7 @@ /*************************************************************************** All game use a DE-0372-0 PCB (see below for layout) - + Funky Jet (c) 1992 Data East / Mitchell Corporation Sotsugyo Shousho (c) 1995 Mitchell Corporation diff --git a/src/mame/drivers/junior80.cpp b/src/mame/drivers/junior80.cpp index 9e694978fd3..71738afd1c2 100644 --- a/src/mame/drivers/junior80.cpp +++ b/src/mame/drivers/junior80.cpp @@ -111,7 +111,7 @@ programmed in rom and from os like this: port A input with interrupt, port B - o - i8253 programmed in rom and from os like: channel 0 unprogrammed, channel 1: clock divider for 9600 bps clock channel 2: clock divider for sound generator -when the os loads, channel 0 is programmed like channel 1 +when the os loads, channel 0 is programmed like channel 1 *************************************************************************** diff --git a/src/mame/drivers/max80.cpp b/src/mame/drivers/max80.cpp index 4c402c4d753..2fd5458806c 100644 --- a/src/mame/drivers/max80.cpp +++ b/src/mame/drivers/max80.cpp @@ -83,8 +83,8 @@ public: max80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") -// , m_p_chargen(*this, "chargen") -// , m_vram(*this, "videoram") +// , m_p_chargen(*this, "chargen") +// , m_vram(*this, "videoram") , m_palette(*this, "palette") , m_pio(*this, "pio") , m_crtc(*this, "crtc") @@ -99,7 +99,7 @@ public: , m_floppy2(*this, "fdc:2") , m_floppy3(*this, "fdc:3") , m_io_keyboard(*this, "LINE%u", 0) -// , m_mainram(*this, RAM_TAG) +// , m_mainram(*this, RAM_TAG) { } void max80(machine_config &config); @@ -149,7 +149,7 @@ private: required_device<floppy_connector> m_floppy2; required_device<floppy_connector> m_floppy3; required_ioport_array<8> m_io_keyboard; -// optional_device<ram_device> m_mainram; +// optional_device<ram_device> m_mainram; }; @@ -379,10 +379,10 @@ void max80_state::pio_pb_w(offs_t offset, u8 data) void max80_state::machine_start() { -// save_item(NAME(m_irq)); -// save_item(NAME(m_size_store)); -// save_item(NAME(m_drq_off)); -// save_item(NAME(m_intrq_off)); +// save_item(NAME(m_irq)); +// save_item(NAME(m_size_store)); +// save_item(NAME(m_drq_off)); +// save_item(NAME(m_intrq_off)); } diff --git a/src/mame/drivers/nes_clone.cpp b/src/mame/drivers/nes_clone.cpp index 5a8de850f96..5d7e072e94f 100644 --- a/src/mame/drivers/nes_clone.cpp +++ b/src/mame/drivers/nes_clone.cpp @@ -559,7 +559,7 @@ void nes_clone_dancexpt_state::nes_clone_dancexpt_map(address_map &map) map(0x5000, 0x5000).w(FUNC(nes_clone_dancexpt_state::mapper_5000_w)); map(0x5100, 0x5100).w(FUNC(nes_clone_dancexpt_state::mapper_5100_w)); map(0x5200, 0x5200).w(FUNC(nes_clone_dancexpt_state::mapper_5200_w)); - + map(0x8000, 0xbfff).bankr("prgrom"); map(0xc000, 0xffff).rom().region("maincpu", 0x1c000); } @@ -1276,21 +1276,21 @@ CONS( 200?, vtvppong, 0, 0, nes_clone_vtvppong, nes_clone, nes_clone_vtvpp CONS( 200?, pjoypj001, 0, 0, nes_clone, nes_clone, nes_clone_state, init_nes_clone, "Trump Grand", "PowerJoy (PJ001, NES based plug & play)", MACHINE_NOT_WORKING ) -// +// /* - Dancing Export by Daidaixing (aka TimeTop) + Dancing Export by Daidaixing (aka TimeTop) - (notes from Sean Riddle regarding missing sound) - There are two globs on the main PCB, the bigger one next to a label that says NT6561. - Also two 32-pin COBs, one marked 27C020 and the other 27C010 (both dumped) + (notes from Sean Riddle regarding missing sound) + There are two globs on the main PCB, the bigger one next to a label that says NT6561. + Also two 32-pin COBs, one marked 27C020 and the other 27C010 (both dumped) - Finally, a daughterboard with 1 glob. - The daughterboard has 10 traces going to it; power, ground, and 7 from the smaller glob. - The 10th trace looks like the audio output. + Finally, a daughterboard with 1 glob. + The daughterboard has 10 traces going to it; power, ground, and 7 from the smaller glob. + The 10th trace looks like the audio output. - I assume the daughterboard has a microcontroller for sound - I'm not sure what the smaller glob is, but it looks like it sends commands to the daughterboard. + I assume the daughterboard has a microcontroller for sound + I'm not sure what the smaller glob is, but it looks like it sends commands to the daughterboard. */ CONS( 200?, dancexpt, 0, 0, nes_clone_dancexpt, dancexpt, nes_clone_dancexpt_state, init_nes_clone, "Daidaixing", "Dancing Expert", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp index e21224fffc9..40f6b218055 100644 --- a/src/mame/drivers/pc88va.cpp +++ b/src/mame/drivers/pc88va.cpp @@ -21,7 +21,7 @@ bp f0b31,pc=0xf0b36,g Update: it never reaches latter with V30->V50 CPU switch fix; - Fix floppy motor hook-up (floppy believes to be always in even if empty drive); - - Support for PC8801 compatible mode & PC80S31K (floppy interface); + - Support for PC8801 compatible mode & PC80S31K (floppy interface); ********************************************************************************************/ diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 86df47a29c7..861a097c6e8 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -12,23 +12,23 @@ - Finish DIP-Switches support; - text scrolling, upd52611 (cfr. clipping in edge & arcus2, madoum* too?); - AGDC emulation, upd72120; - - CMT support (-13/-36 cbus only, identify which models mounted it off the bat); + - CMT support (-13/-36 cbus only, identify which models mounted it off the bat); - Write a PC80S31K device for 2d type floppies - (also used on PC-8801 and PC-88VA, it's the FDC + Z80 sub-system); - - Anything post-PC9801E/F/M should overwrite "speaker_device" to actually use a - dac_bit_interface instead (cfr. DAC1BIT in SW list); - - clean-ups & split into separate devices and driver flavours; + (also used on PC-8801 and PC-88VA, it's the FDC + Z80 sub-system); + - Anything post-PC9801E/F/M should overwrite "speaker_device" to actually use a + dac_bit_interface instead (cfr. DAC1BIT in SW list); + - clean-ups & split into separate devices and driver flavours; - derive romsets by default options (cfr. 3.5 2HD floppies vs. default 5.25, 2D/2DD etc.); - Remove kludge for POR bit in a20_ctrl_w fn; - - floppy sounds never silences when drive is idle (disabled for the time being); + - floppy sounds never silences when drive is idle (disabled for the time being); - TODO (PC-9801F) - - kanji port 0xa9 readback is broken for several games (balpower, lovelyho). + TODO (PC-9801F) + - kanji port 0xa9 readback is broken for several games (balpower, lovelyho). TODO (PC-9801RS): - several unemulated extra f/f features; - keyboard shift doesn't seem to disable properly (fixed by now?); - - Several games hangs with stuck note by misfired/not catched up -26 / -86 irq; + - Several games hangs with stuck note by misfired/not catched up -26 / -86 irq; - clean-up duplicate code; TODO (PC-9821): @@ -39,24 +39,24 @@ TODO (PC-9821AS) - IPL ROM banking contradicts greatly from the other machines; - TODO (PC-386M): + TODO (PC-386M): - "ERR:BR" at boot (BIOS loader error). - Executes some code in text VRAM area (PC=$a006e), trying to setup a writeable RAM bank - (shadow RAM even?) to IPL window, I/O $c06 seems to be the control port for it; + Executes some code in text VRAM area (PC=$a006e), trying to setup a writeable RAM bank + (shadow RAM even?) to IPL window, I/O $c06 seems to be the control port for it; - TODO: (PC-486SE/PC-486MU): - - Verify ROM bankswitch; - On PC-486SE sets up what is normally IPL bankswitch at PC=0xf5115, successive opcode - is a jmp 0xf8000, pretty unlikely it delays bankswitch so assume it reloads - the same bank. - - Fix POR/ROM bankswitch on soft resets. - - Eventually errors with a ERR:VR (GFX VRAM); + TODO: (PC-486SE/PC-486MU): + - Verify ROM bankswitch; + On PC-486SE sets up what is normally IPL bankswitch at PC=0xf5115, successive opcode + is a jmp 0xf8000, pretty unlikely it delays bankswitch so assume it reloads + the same bank. + - Fix POR/ROM bankswitch on soft resets. + - Eventually errors with a ERR:VR (GFX VRAM); TODO: (PC-9821AP) - No way to exit the initial loop. Code looks broken, bad dump? - TODO: (PC-9821Xa16/PC-9821Ra20/PC-9821Ra333) - - "MICON ERROR" at POST (generic HW fault, PCI?); + TODO: (PC-9821Xa16/PC-9821Ra20/PC-9821Ra333) + - "MICON ERROR" at POST (generic HW fault, PCI?); =================================================================================================== @@ -240,8 +240,8 @@ For more info (e.g. optional hardware), see http://www.geocities.jp/retro_zzz/machines/nec/9801/mdl98cpu.html - Epson Series - http://www.pc-9800.net/db_epson/desk_index.htm + Epson Series + http://www.pc-9800.net/db_epson/desk_index.htm PC-9821 Series @@ -2566,13 +2566,13 @@ void pc9801_state::pc9821ra333(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &pc9801_state::pc9821_map); m_maincpu->set_addrmap(AS_IO, &pc9801_state::pc9821_io); m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); - + // 128KB CPU cache RAM // Trident TGUI9682XGi + integrated 98 gfx card // 3x cbus + 2x PCI slots // 6GB HDD // built-in ethernet 100BASE-TX/10BASE-T - + } // Epson clones @@ -2582,10 +2582,10 @@ void pc9801_state::pc9821ra333(machine_config &config) void pc9801_state::pc386m(machine_config &config) { pc9801rs(config); -// I386SX(config.replace(), m_maincpu, 16000000); // i386SX 16MHz, switchable to 10/6 MHz -// m_maincpu->set_addrmap(AS_PROGRAM, &pc9801_state::pc9801rs_map); -// m_maincpu->set_addrmap(AS_IO, &pc9801_state::pc9801rs_io); -// m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); +// I386SX(config.replace(), m_maincpu, 16000000); // i386SX 16MHz, switchable to 10/6 MHz +// m_maincpu->set_addrmap(AS_PROGRAM, &pc9801_state::pc9801rs_map); +// m_maincpu->set_addrmap(AS_IO, &pc9801_state::pc9801rs_io); +// m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); // RAM: 640KB + 14.6MB max // 2 3.5 floppy drives // ... @@ -2599,7 +2599,7 @@ void pc9801_state::pc486se(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &pc9801_state::pc9821_map); m_maincpu->set_addrmap(AS_IO, &pc9801_state::pc9821as_io); m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); - + pc9801_pit_clock(config, xtal/8); // unknown, passes "ERR:TM" test // RAM: 1.6 MB (!) + 17.6 max @@ -2615,7 +2615,7 @@ void pc9801_state::pc486mu(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &pc9801_state::pc9821_map); m_maincpu->set_addrmap(AS_IO, &pc9801_state::pc9821as_io); m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb)); - + pc9801_pit_clock(config, xtal/8); // unknown, passes "ERR:TM" test // CL-GD5428 @@ -2888,7 +2888,7 @@ ROM_START( pc9821ap2 ) ROM_SYSTEM_BIOS(1, "phd0102", "PHD0102") ROMX_LOAD( "phd0102.rom", 0x000000, 0x80000, CRC(3036774c) SHA1(59856a348f156adf5eca06326f967aca54ff871c), ROM_BIOS(1) ) - ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) + ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) // TODO: identify ROM banks ROM_COPY( "biosrom", 0x20000, 0x10000, 0x08000 ) ROM_COPY( "biosrom", 0x30000, 0x18000, 0x18000 ) @@ -2996,7 +2996,7 @@ ROM_START( pc9821ra20 ) ROM_REGION( 0x80000, "chargen", 0 ) ROM_LOAD( "font.rom", 0x00000, 0x46800, BAD_DUMP CRC(a61c0649) SHA1(554b87377d176830d21bd03964dc71f8e98676b1) ) - + LOAD_KANJI_ROMS LOAD_IDE_ROM ROM_END @@ -3022,7 +3022,7 @@ ROM_START( pc9821ra333 ) ROM_REGION( 0x80000, "chargen", 0 ) ROM_LOAD( "font.rom", 0x00000, 0x46800, BAD_DUMP CRC(a61c0649) SHA1(554b87377d176830d21bd03964dc71f8e98676b1) ) - + LOAD_KANJI_ROMS LOAD_IDE_ROM ROM_END @@ -3099,7 +3099,7 @@ ROM_START( pc486se ) ROM_COPY( "biosrom", 0x08000, 0x00000, 0x08000 ) // tests this area at PC=0xf5149 ROM_COPY( "biosrom", 0x00000, 0x10000, 0x08000 ) ROM_COPY( "biosrom", 0x10000, 0x08000, 0x08000 ) -// ROM_FILL( 0x18000, 0x08000, 0x90) // untested by BIOS +// ROM_FILL( 0x18000, 0x08000, 0x90) // untested by BIOS ROM_COPY( "biosrom", 0x10000, 0x20000, 0x08000 ) // PC=f5113 bankswitch into same area, correct? ROM_COPY( "biosrom", 0x18000, 0x28000, 0x08000 ) @@ -3115,20 +3115,20 @@ Epson PC-486MU i486SX-33 @ 33 8MB RAM 3.5'2DD/2HDx2, 2xCD-ROM -CBus: 3 slots +CBus: 3 slots */ ROM_START( pc486mu ) ROM_REGION16_LE( 0x20000, "biosrom", ROMREGION_ERASEFF ) ROM_LOAD( "pc-486mu_hn27c1024.bin", 0x00000, 0x20000, CRC(113268e1) SHA1(2a630abc825b2808f9f8fb65c6cb1fb7e7f6c710)) -// ROM_LOAD( "bios_486mu.rom", 0x00000, 0x18000, BAD_DUMP CRC(57b5d701) SHA1(15029800842e93e07615b0fd91fb9f2bfe3e3c24)) +// ROM_LOAD( "bios_486mu.rom", 0x00000, 0x18000, BAD_DUMP CRC(57b5d701) SHA1(15029800842e93e07615b0fd91fb9f2bfe3e3c24)) ROM_REGION16_LE( 0x30000, "ipl", ROMREGION_ERASEFF ) // backported from pc486se ROM_COPY( "biosrom", 0x08000, 0x00000, 0x08000 ) ROM_COPY( "biosrom", 0x00000, 0x10000, 0x08000 ) ROM_COPY( "biosrom", 0x10000, 0x08000, 0x08000 ) -// ROM_FILL( 0x18000, 0x08000, 0x90) // untested by BIOS +// ROM_FILL( 0x18000, 0x08000, 0x90) // untested by BIOS ROM_COPY( "biosrom", 0x10000, 0x20000, 0x08000 ) ROM_COPY( "biosrom", 0x18000, 0x28000, 0x08000 ) @@ -3273,7 +3273,7 @@ void pc9801_state::init_pc9801vm_kanji() } // For simpilicity's sake we arbitrarily group those with whatever romset came first historically. -// This is also repeated in SW list reports: you'd have to use an "On RS class xxx" format to indicate a bug report +// This is also repeated in SW list reports: you'd have to use an "On RS class xxx" format to indicate a bug report // specifically happening for a family group. This will be hopefully put into stone with driver splits at some point in future. // "vanilla" class (i86, E/F/M) @@ -3311,7 +3311,7 @@ COMP( 1993, pc9801bx2, pc9801rs, 0, pc9801bx2, pc9801rs, pc9801_state, init_pc9 // Epson class COMP( 1990, pc386m, 0, 0, pc386m, pc9801rs, pc9801_state, init_pc9801_kanji, "Epson", "PC-386M", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) COMP( 1994, pc486mu, 0, 0, pc486mu, pc9821, pc9801_state, init_pc9801_kanji, "Epson", "PC-486MU", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) -COMP( 1993, pc486se, pc486mu, 0, pc486se, pc9801rs, pc9801_state, init_pc9801_kanji, "Epson", "PC-486SE", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) +COMP( 1993, pc486se, pc486mu, 0, pc486se, pc9801rs, pc9801_state, init_pc9801_kanji, "Epson", "PC-486SE", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) // PC9821 class // TODO: unknown real model of parent, given the BIOS rom size wrt the others it may be better suited as a "98Multi" or even a FA class? diff --git a/src/mame/drivers/roland_cm32p.cpp b/src/mame/drivers/roland_cm32p.cpp index 295c44b54f2..655a1252a0d 100644 --- a/src/mame/drivers/roland_cm32p.cpp +++ b/src/mame/drivers/roland_cm32p.cpp @@ -402,13 +402,13 @@ DEVICE_IMAGE_LOAD_MEMBER(cm32p_state::card_load) return image_init_result::FAIL; } - pcmcard->rom_alloc(0x080000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // cards are up to 512K + pcmcard->rom_alloc(0x080000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // cards are up to 512K pcmcard->common_load_rom(pcmcard->get_rom_base(), size, "rom"); u8* base = pcmcard->get_rom_base(); if (size < 0x080000) { uint32_t mirror = (1 << (31 - count_leading_zeros(size))); - if (mirror < 0x020000) // due to how address descrambling works, we can currently only do mirroring for 128K pages + if (mirror < 0x020000) // due to how address descrambling works, we can currently only do mirroring for 128K pages mirror = 0x020000; for (uint32_t ofs = mirror; ofs < 0x080000; ofs += mirror) memcpy(base + ofs, base, mirror); diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index d3499286413..8cc7b0fc7aa 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -10951,12 +10951,12 @@ ROM_START( daiohp2 ) /* Found on the same P0-072-2 PCB as the previous Daioh pro ROM_LOAD( "se_1.u70", 0x080000, 0x080000, CRC(593c3c58) SHA1(475fb530a6d23269cb0aea6e294291c7463b57a2) ) ROM_REGION( 0xc00, "pals", 0 ) - ROM_LOAD( "fa-023.u35", 0x000000, 0x117, CRC(f187ea2d) SHA1(d2f05b42c0bbc6dc711c525b2a63d4de3ac9de03) ) - ROM_LOAD( "fa-024.u36", 0x000200, 0x117, CRC(02c87697) SHA1(5ff985ba88f4de677cf13626c95eee0b59fbb96a) ) - ROM_LOAD( "fa-022.u14", 0x000400, 0x117, CRC(f780fd0e) SHA1(58513fdef8bff5bb32f7de04d2d5f1446c66d108) ) - ROM_LOAD( "fa-020.u206", 0x000600, 0x117, CRC(cd2cd02c) SHA1(150fdacfc44ea5a2f61c1cf626011d43b75ad618) ) - ROM_LOAD( "fa-025.u76", 0x000800, 0x117, CRC(875c0c81) SHA1(8c259b75f40bf8ad2971648e4bd3284ef5da30d5) ) - ROM_LOAD( "fa-021.u116", 0x000a00, 0x117, CRC(e335cf2e) SHA1(35f6fa2fb2da1dc5b1fad93f44947f76d6ef35aa) ) + ROM_LOAD( "fa-023.u35", 0x000000, 0x117, CRC(f187ea2d) SHA1(d2f05b42c0bbc6dc711c525b2a63d4de3ac9de03) ) + ROM_LOAD( "fa-024.u36", 0x000200, 0x117, CRC(02c87697) SHA1(5ff985ba88f4de677cf13626c95eee0b59fbb96a) ) + ROM_LOAD( "fa-022.u14", 0x000400, 0x117, CRC(f780fd0e) SHA1(58513fdef8bff5bb32f7de04d2d5f1446c66d108) ) + ROM_LOAD( "fa-020.u206", 0x000600, 0x117, CRC(cd2cd02c) SHA1(150fdacfc44ea5a2f61c1cf626011d43b75ad618) ) + ROM_LOAD( "fa-025.u76", 0x000800, 0x117, CRC(875c0c81) SHA1(8c259b75f40bf8ad2971648e4bd3284ef5da30d5) ) + ROM_LOAD( "fa-021.u116", 0x000a00, 0x117, CRC(e335cf2e) SHA1(35f6fa2fb2da1dc5b1fad93f44947f76d6ef35aa) ) ROM_END ROM_START( daiohc ) /* Found on a 93111A PCB - same PCB as War of Areo & J. J. Squawkers */ diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp index 634585520c0..67f6922125c 100644 --- a/src/mame/drivers/wecleman.cpp +++ b/src/mame/drivers/wecleman.cpp @@ -1057,7 +1057,7 @@ void wecleman_state::wecleman(machine_config &config) adc.vin_callback().set(FUNC(wecleman_state::selected_ip_r)); KONAMI_007452_MATH(config, "k007452"); - + /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); m_screen->set_refresh_hz(60); diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index e0e511c57f2..9bfdfb6bc8a 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -83,11 +83,11 @@ private: void lamps_903b_w(uint8_t data); void lamps_905_w(uint8_t data); void dummy_pia_w(uint8_t data); - + DECLARE_READ_LINE_MEMBER(timer_r); DECLARE_READ_LINE_MEMBER(vblank_r); - DECLARE_READ_LINE_MEMBER(dummy_pia_line_r); - + DECLARE_READ_LINE_MEMBER(dummy_pia_line_r); + DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w); DECLARE_WRITE_LINE_MEMBER(vblank0_w); DECLARE_WRITE_LINE_MEMBER(vblank1_w); @@ -100,9 +100,9 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(timer_0); TIMER_DEVICE_CALLBACK_MEMBER(timer_1); TIMER_DEVICE_CALLBACK_MEMBER(timer_2); - + TILE_GET_INFO_MEMBER(get_bg_tile_info); - + uint32_t screen_update_calomega(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void calomega_palette(palette_device &palette) const; @@ -122,7 +122,7 @@ private: required_shared_ptr<uint8_t> m_videoram; required_shared_ptr<uint8_t> m_colorram; - + required_device<ticket_dispenser_device> m_hopper; optional_ioport m_in0; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index b29c52bff00..48fb41e2194 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -38,7 +38,7 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette") { } - + /* memory pointers */ std::unique_ptr<uint8_t[]> m_buffered_spriteram; std::unique_ptr<uint8_t[]> m_buffered_spriteram_2; diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 2e55288714b..a36a95f6da5 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -630,7 +630,7 @@ protected: required_device<nanoreseau_device> m_nanoreseau; required_ioport m_nanoreseau_config; memory_view m_extension_view; - + void mo5nr_map(address_map &map); void mo5nr_game_init(); diff --git a/src/mame/layout/j6impuls.lay b/src/mame/layout/j6impuls.lay index 0d21cda689b..b4919554e2c 100644 --- a/src/mame/layout/j6impuls.lay +++ b/src/mame/layout/j6impuls.lay @@ -3449,4 +3449,4 @@ </element> </repeat> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/j6impuls15.lay b/src/mame/layout/j6impuls15.lay index fb333701d34..9edd417d6fe 100644 --- a/src/mame/layout/j6impuls15.lay +++ b/src/mame/layout/j6impuls15.lay @@ -3461,4 +3461,4 @@ </element> </repeat> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/machine/basf7100_kbd.cpp b/src/mame/machine/basf7100_kbd.cpp index 8b893ee9f47..147d208c913 100644 --- a/src/mame/machine/basf7100_kbd.cpp +++ b/src/mame/machine/basf7100_kbd.cpp @@ -4,17 +4,17 @@ BASF 7100 Keyboard (HLE) - Keytronics keyboard hardware: A65-01966-003 PCB-201 F - BASF part number 19-4203-01 + Keytronics keyboard hardware: A65-01966-003 PCB-201 F + BASF part number 19-4203-01 - Hardware: - - 30293E-054 20-04592-054 (possibly PIC1650) - - 1 KB ROM (contains translation tables) - - Speaker + Hardware: + - 30293E-054 20-04592-054 (possibly PIC1650) + - 1 KB ROM (contains translation tables) + - Speaker - TODO: - - Extract internal ROM from MCU and convert to LLE - - Speaker + TODO: + - Extract internal ROM from MCU and convert to LLE + - Speaker ***************************************************************************/ diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index 23148954c31..53658209496 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -127,9 +127,9 @@ void egret_device::send_port(uint8_t offset, uint8_t data) { case 0: // port A /* printf("ADB:%d DFAC:%d PowerEnable:%d\n", - (data & 0x80) ? 1 : 0, - (data & 0x10) ? 1 : 0, - (data & 0x02) ? 1 : 0);*/ + (data & 0x80) ? 1 : 0, + (data & 0x10) ? 1 : 0, + (data & 0x02) ? 1 : 0);*/ #if USE_BUS_ADB // the line goes to a mosfet pulling the adb data line to graound, hence the inversion @@ -140,15 +140,15 @@ void egret_device::send_port(uint8_t offset, uint8_t data) { m_adb_dtime = (int)(machine().time().as_ticks(1000000) - last_adb_time); /* - if (data & 0x80) - { - printf("EG ADB: 1->0 time %d\n", m_adb_dtime); - } - else - { - printf("EG ADB: 0->1 time %d\n", m_adb_dtime); - } - */ + if (data & 0x80) + { + printf("EG ADB: 1->0 time %d\n", m_adb_dtime); + } + else + { + printf("EG ADB: 0->1 time %d\n", m_adb_dtime); + } + */ // allow the linechange handler to override us adb_in = (data & 0x80) ? true : false; diff --git a/src/mame/machine/k007452.cpp b/src/mame/machine/k007452.cpp index 20d4ac450af..6644e2aa436 100644 --- a/src/mame/machine/k007452.cpp +++ b/src/mame/machine/k007452.cpp @@ -38,7 +38,7 @@ u8 k007452_device::read(offs_t offset) case 1: return u8((m_multiply_result >> 8) & 0xff); case 2: return u8(m_divide_remainder & 0xff); case 3: return u8((m_divide_remainder >> 8) & 0xff); - case 4: return u8(m_divide_quotient & 0xff); + case 4: return u8(m_divide_quotient & 0xff); case 5: return u8((m_divide_quotient >> 8) & 0xff); default: return 0; } diff --git a/src/mame/video/battlane.cpp b/src/mame/video/battlane.cpp index 7e3b010a22a..b2370d742fc 100644 --- a/src/mame/video/battlane.cpp +++ b/src/mame/video/battlane.cpp @@ -79,11 +79,11 @@ void battlane_state::battlane_bitmap_w(offs_t offset, uint8_t data) void battlane_state::battlane_video_ctrl_w(uint8_t data) { /* - Video control register + Video control register - 0x80 = low bit of blue component (taken when writing to palette) - 0x0e = Bitmap plane (bank?) select (0-7) - 0x01 = Scroll MSB + 0x80 = low bit of blue component (taken when writing to palette) + 0x0e = Bitmap plane (bank?) select (0-7) + 0x01 = Scroll MSB */ m_video_ctrl = data; diff --git a/src/osd/modules/sound/pulse_sound.cpp b/src/osd/modules/sound/pulse_sound.cpp index fcee6c206e2..7bb3f8c2a02 100644 --- a/src/osd/modules/sound/pulse_sound.cpp +++ b/src/osd/modules/sound/pulse_sound.cpp @@ -108,7 +108,7 @@ char sound_pulse::peek_main() return -1; } generic_error("peek_main: read"); - } + } return c; } @@ -130,7 +130,7 @@ char sound_pulse::get_main() ::exit(1); } generic_error("get_main: read"); - } + } return c; } @@ -147,7 +147,7 @@ void sound_pulse::send_main(char c) ::exit(1); } generic_error("send_main: write"); - } + } } void sound_pulse::send_sub(char c) @@ -163,7 +163,7 @@ void sound_pulse::send_sub(char c) ::exit(1); } generic_error("send_sub: write"); - } + } } void sound_pulse::make_pipes() @@ -325,7 +325,7 @@ void sound_pulse::update_audio_stream(bool is_throttled, const s16 *buffer, int buf.cpos = 0; buf.data.resize(samples_this_frame); memcpy(buf.data.data(), buffer, samples_this_frame*4); - m_last_sample = buf.data.back(); + m_last_sample = buf.data.back(); if(m_buffers.size() > 10) // If there way too many buffers, drop some so only 10 are left (roughly 0.2s) @@ -360,7 +360,7 @@ void sound_pulse::set_mastervolume(int attenuation) if(!m_stream) return; - + std::unique_lock<std::mutex> lock(m_mutex); if(m_setting_volume) { m_new_volume = true; |