From c25e62f25e36609b2a7d60d86f719a2e31f88f66 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 26 Dec 2021 13:33:56 +1100 Subject: srcclean, remove a vestigial thing, and a little cleanup --- hash/apple2_flop_orig.xml | 26 ++-- hash/ibm5170_cdrom.xml | 18 +-- hash/spectrum_cass.xml | 48 +++---- src/devices/bus/isa/xsu_cards.cpp | 4 +- src/devices/bus/vme/vme_cp31.cpp | 10 +- src/devices/cpu/mcs51/mcs51.h | 4 +- src/devices/cpu/sparc/sparc.cpp | 36 +++--- src/devices/machine/bq4847.cpp | 30 ++--- src/devices/machine/dl11.cpp | 6 +- src/devices/machine/dl11.h | 6 +- src/devices/machine/glukrs.cpp | 6 +- src/devices/machine/glukrs.h | 22 ++-- src/devices/machine/scnxx562.cpp | 2 +- src/devices/machine/spi_sdcard.cpp | 4 +- src/devices/machine/tsconfdma.cpp | 252 ++++++++++++++++++------------------- src/devices/machine/tsconfdma.h | 72 +++++------ src/devices/sound/aica.cpp | 4 +- src/mame/drivers/a2600.cpp | 10 +- src/mame/drivers/apple2gs.cpp | 2 +- src/mame/drivers/compucranes.cpp | 2 +- src/mame/drivers/dvk_kcgd.cpp | 18 +-- src/mame/drivers/gaelco.cpp | 116 ++++++++--------- src/mame/drivers/gkigt.cpp | 2 +- src/mame/drivers/goldnpkr.cpp | 2 +- src/mame/drivers/microdar.cpp | 2 +- src/mame/drivers/pc.cpp | 2 +- src/mame/drivers/pdp11.cpp | 4 +- src/mame/drivers/rfslotspcpent.cpp | 2 +- src/mame/drivers/shaolins.cpp | 8 +- src/mame/drivers/tsconf.cpp | 30 ++--- src/mame/drivers/z80clock.cpp | 8 ++ src/mame/includes/a2600.h | 1 - src/mame/includes/tsconf.h | 6 +- src/mame/machine/gaelcrpt.h | 3 +- 34 files changed, 387 insertions(+), 381 deletions(-) diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index efd5d377a8b..a62abd10473 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -16940,7 +16940,7 @@ license:CC0 Apple SuperDrive (G7287), will not work due to incompatibilities created by the copy protection. --> - + @@ -16957,7 +16957,7 @@ license:CC0 - + @@ -16974,7 +16974,7 @@ license:CC0 - + @@ -16991,7 +16991,7 @@ license:CC0 - + @@ -17008,7 +17008,7 @@ license:CC0 - + @@ -17201,7 +17201,7 @@ license:CC0 - + @@ -17234,7 +17234,7 @@ license:CC0 - + @@ -17251,7 +17251,7 @@ license:CC0 - + @@ -17268,7 +17268,7 @@ license:CC0 - + @@ -17308,7 +17308,7 @@ license:CC0 - + @@ -17325,7 +17325,7 @@ license:CC0 - + @@ -17342,7 +17342,7 @@ license:CC0 - + @@ -18389,7 +18389,7 @@ license:CC0 - + diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml index 31d35705712..a0cff30f50e 100644 --- a/hash/ibm5170_cdrom.xml +++ b/hash/ibm5170_cdrom.xml @@ -400,10 +400,10 @@ license:CC0 - + Alien Odyssey (US) 1995 Philips / Argonaut Software LTD @@ -2155,11 +2155,11 @@ license:CC0 - + Ignition (US) 1997 Interplay diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 909bd5004f4..f1b09c3d7e4 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -43610,7 +43610,7 @@ license:CC0 - + Avenger (1986, Gremlin) (set 2, small case, Erbe Serie Leyenda) 1988 @@ -43620,7 +43620,7 @@ license:CC0 - + Avenger (1986, Gremlin) (set 3, Kixx) @@ -43660,7 +43660,7 @@ license:CC0 - + Avoir (set 2) 1985 @@ -44452,28 +44452,28 @@ license:CC0 Backpackers Guide To The Universe 1984 Fantasy Software - + - + - + Backpackers Guide To The Universe (Paxman) 1984 Paxman Promotions - + - + @@ -65253,7 +65253,7 @@ license:CC0 - + Election (1984, Mastertronic) 1984 Mastertronic @@ -92612,7 +92612,7 @@ license:CC0 - + Flunky 1987 @@ -92623,7 +92623,7 @@ license:CC0 - + Mad Flunky (set 1, Alternative) 1987 @@ -92776,7 +92776,7 @@ license:CC0 - + Mad Mix Game (set 1, Spanish, SLS 208) @@ -92810,8 +92810,8 @@ license:CC0 - - + + Mad Nurse @@ -92840,7 +92840,7 @@ license:CC0 - + Madcap Manor (set 2, bugfix) 1985 @@ -92856,7 +92856,7 @@ license:CC0 - + Madhatter @@ -96060,7 +96060,7 @@ license:CC0 - + Meteor (1983, Hofacker Verlag) @@ -97561,7 +97561,7 @@ license:CC0 - + @@ -98180,7 +98180,7 @@ license:CC0 - + @@ -109597,7 +109597,7 @@ license:CC0 - + Prohibition (set 2, Players) 1987 @@ -109608,7 +109608,7 @@ license:CC0 - + Project Future (Currys) @@ -109716,7 +109716,7 @@ license:CC0 - + Project Stealth Fighter (set 3, Kixx) 19?? @@ -109742,7 +109742,7 @@ license:CC0 - + Projector 1 @@ -135814,7 +135814,7 @@ license:CC0 - + Treble Chance Gold diff --git a/src/devices/bus/isa/xsu_cards.cpp b/src/devices/bus/isa/xsu_cards.cpp index 8b246625e0e..3be4e40a67c 100644 --- a/src/devices/bus/isa/xsu_cards.cpp +++ b/src/devices/bus/isa/xsu_cards.cpp @@ -68,8 +68,8 @@ void ec184x_isa8_cards(device_slot_interface &device) device.option_add("ec1840.0004", ISA8_LPT); device.option_add("ec1841.0002", ISA8_EC1841_0002); // CGA with downloadable font device.option_add("ec1841.0003", ISA8_EC1841_0003); // FDC + mouse port -// device.option_add("ec1840.0004", ISA8_EC1840_0004); // BSC-like serial ports + parallel port -// device.option_add("ec1841.0010", ISA8_EC1841_0010); // 8089-based HDC +// device.option_add("ec1840.0004", ISA8_EC1840_0004); // BSC-like serial ports + parallel port +// device.option_add("ec1841.0010", ISA8_EC1841_0010); // 8089-based HDC device.option_add("mda", ISA8_MDA); device.option_add("hdc", ISA8_HDC_EC1841); device.option_add("pccom", ISA8_COM); diff --git a/src/devices/bus/vme/vme_cp31.cpp b/src/devices/bus/vme/vme_cp31.cpp index 7c4659d2bdd..2f960bbcd3c 100644 --- a/src/devices/bus/vme/vme_cp31.cpp +++ b/src/devices/bus/vme/vme_cp31.cpp @@ -65,8 +65,8 @@ void vme_cp31_card_device::cp31_mem(address_map &map) { map.unmap_value_high(); map(0x00000000, 0x001fffff).ram().share("dram"); // local bus DRAM, 4 MB -// map(0x08010000, 0x08011fff).ram(); // unknown -- accessed by cp31dssp -// map(0xfca03500, 0xfca0350f).unmaprw(); // ISCSI-1 board on VME bus +// map(0x08010000, 0x08011fff).ram(); // unknown -- accessed by cp31dssp +// map(0xfca03500, 0xfca0350f).unmaprw(); // ISCSI-1 board on VME bus map(0xff000000, 0xff03ffff).rom().region("user1", 0); map(0xff040000, 0xff07ffff).ram(); // onboard SRAM map(0xff800000, 0xff80001f).rw(m_mpcc, FUNC(mpcc68561_device::read), FUNC(mpcc68561_device::write)); @@ -74,8 +74,8 @@ void vme_cp31_card_device::cp31_mem(address_map &map) map(0xff800800, 0xff80080f).rw(m_bim, FUNC(bim68153_device::read), FUNC(bim68153_device::write)).umask32(0xff00ff00); map(0xff800a00, 0xff800a1f).rw(m_rtc, FUNC(rtc62421_device::read), FUNC(rtc62421_device::write)); map(0xff800c00, 0xff800dff).rw(m_pit1, FUNC(pit68230_device::read), FUNC(pit68230_device::write)); -// map(0xff800400, 0xff800xxx) // TIC? -- shows up in cp31dssp log -// map(0xff800e00, 0xff800xxx) // PIT3? +// map(0xff800400, 0xff800xxx) // TIC? -- shows up in cp31dssp log +// map(0xff800e00, 0xff800xxx) // PIT3? } static DEVICE_INPUT_DEFAULTS_START( terminal ) @@ -180,7 +180,7 @@ void vme_cp31_card_device::device_add_mconfig(machine_config &config) m_pit1->pa_in_callback().set_ioport("SA1"); m_pit1->pb_out_callback().set(*this, FUNC(vme_cp31_card_device::pit1_pb_w)); m_pit1->pc_in_callback().set(*this, FUNC(vme_cp31_card_device::pit1_pc_r)); -// m_pit1->pc_out_callback().set(*this, FUNC(vme_cp31_card_device::pit1_pc_w)); +// m_pit1->pc_out_callback().set(*this, FUNC(vme_cp31_card_device::pit1_pc_w)); m_pit1->timer_irq_callback().set(m_bim, FUNC(bim68153_device::int2_w)); m_pit1->port_irq_callback().set(m_bim, FUNC(bim68153_device::int3_w)); diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index d13ce60ab66..f050ce8d210 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -158,7 +158,7 @@ protected: /* Serial Port TX/RX Callbacks */ devcb_write8 m_serial_tx_cb; //Call back function when sending data out of serial port devcb_read8 m_serial_rx_cb; //Call back function to retrieve data when receiving serial port data - + /* DS5002FP */ struct { uint8_t previous_ta; /* Previous Timed Access value */ @@ -168,7 +168,7 @@ protected: uint8_t mcon; /* bootstrap loader MCON register */ uint8_t rpctl; /* bootstrap loader RPCTL register */ uint8_t crc; /* bootstrap loader CRC register */ - int32_t rnr_delay; /* delay before new random number available */ + int32_t rnr_delay; /* delay before new random number available */ } m_ds5002fp; // for the debugger diff --git a/src/devices/cpu/sparc/sparc.cpp b/src/devices/cpu/sparc/sparc.cpp index b3fba10df1d..7e61b496a71 100644 --- a/src/devices/cpu/sparc/sparc.cpp +++ b/src/devices/cpu/sparc/sparc.cpp @@ -28,25 +28,25 @@ #include "softfloat3/source/include/softfloat.h" -#define LOG_BIU_CTRL (1U << 1) -#define LOG_LOCK_CTRL (1U << 2) -#define LOG_LOCK_CTRL_SAVE (1U << 3) -#define LOG_CACHE_STATUS (1U << 4) -#define LOG_RESTORE_LOCK_CTRL (1U << 5) -#define LOG_SYSTEM_CTRL (1U << 6) -#define LOG_SAME_PAGE_MASK (1U << 7) -#define LOG_ADDR_RANGE (1U << 8) -#define LOG_ADDR_MASK (1U << 9) -#define LOG_WAIT_STATE (1U << 10) -#define LOG_TIMER (1U << 11) -#define LOG_TIMER_PRELOAD (1U << 12) +#define LOG_BIU_CTRL (1U << 1) +#define LOG_LOCK_CTRL (1U << 2) +#define LOG_LOCK_CTRL_SAVE (1U << 3) +#define LOG_CACHE_STATUS (1U << 4) +#define LOG_RESTORE_LOCK_CTRL (1U << 5) +#define LOG_SYSTEM_CTRL (1U << 6) +#define LOG_SAME_PAGE_MASK (1U << 7) +#define LOG_ADDR_RANGE (1U << 8) +#define LOG_ADDR_MASK (1U << 9) +#define LOG_WAIT_STATE (1U << 10) +#define LOG_TIMER (1U << 11) +#define LOG_TIMER_PRELOAD (1U << 12) #define LOG_UNMAPPED (1U << 13) -#define LOG_ICACHE_LOCK (1U << 14) -#define LOG_ICACHE_TAG (1U << 15) -#define LOG_ICACHE_DATA (1U << 16) -#define LOG_DCACHE_LOCK (1U << 17) -#define LOG_DCACHE_TAG (1U << 18) -#define LOG_DCACHE_DATA (1U << 19) +#define LOG_ICACHE_LOCK (1U << 14) +#define LOG_ICACHE_TAG (1U << 15) +#define LOG_ICACHE_DATA (1U << 16) +#define LOG_DCACHE_LOCK (1U << 17) +#define LOG_DCACHE_TAG (1U << 18) +#define LOG_DCACHE_DATA (1U << 19) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/bq4847.cpp b/src/devices/machine/bq4847.cpp index dc983873d68..3be75106707 100644 --- a/src/devices/machine/bq4847.cpp +++ b/src/devices/machine/bq4847.cpp @@ -1,22 +1,22 @@ // license:BSD-3-Clause // copyright-holders:Michael Zapf /* - Texas Instruments/Benchmarq BQ4847 Real-time clock + Texas Instruments/Benchmarq BQ4847 Real-time clock - Although featuring a similar interface, this chip is sufficiently - different from the BQ4842/BQ4852 that a separate implementation - makes sense. + Although featuring a similar interface, this chip is sufficiently + different from the BQ4842/BQ4852 that a separate implementation + makes sense. - This chip is functionally equivalent to the BQ4845; it does not support - a backup battery. Most datasheets about the BQ4847 are incomplete and - refer to the BQ4845. + This chip is functionally equivalent to the BQ4845; it does not support + a backup battery. Most datasheets about the BQ4847 are incomplete and + refer to the BQ4845. - Supports 24h/12h and Daylight saving - Supports leap years + Supports 24h/12h and Daylight saving + Supports leap years - No internal memory, only clock registers + No internal memory, only clock registers - Michael Zapf, April 2020 + Michael Zapf, April 2020 */ #include "emu.h" #include "bq4847.h" @@ -153,11 +153,11 @@ bool bq4847_device::increment_bcd(uint8_t& bcdnumber, uint8_t limit, uint8_t min } /* - Update cycle, called every second - The BQ RTCs use BCD representation + Update cycle, called every second + The BQ RTCs use BCD representation - TODO: We may not be able to use the parent class advance methods, since we - have to work with BCD (even with invalid values). Check this. + TODO: We may not be able to use the parent class advance methods, since we + have to work with BCD (even with invalid values). Check this. */ TIMER_CALLBACK_MEMBER(bq4847_device::update_callback) { diff --git a/src/devices/machine/dl11.cpp b/src/devices/machine/dl11.cpp index a0a09b9f0ab..cde90816cc3 100644 --- a/src/devices/machine/dl11.cpp +++ b/src/devices/machine/dl11.cpp @@ -2,11 +2,11 @@ // copyright-holders:Sergey Svishchev /*************************************************************************** - DEC DL11-type SLU (serial line unit). + DEC DL11-type SLU (serial line unit). - Frame format is not software-configurable; hardcoded to 8N1 for now. + Frame format is not software-configurable; hardcoded to 8N1 for now. - http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/hardware/micronotes/numerical/micronote33.txt + http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/hardware/micronotes/numerical/micronote33.txt ***************************************************************************/ diff --git a/src/devices/machine/dl11.h b/src/devices/machine/dl11.h index 51b297a34b4..37dd3d9c614 100644 --- a/src/devices/machine/dl11.h +++ b/src/devices/machine/dl11.h @@ -2,7 +2,7 @@ // copyright-holders:Sergey Svishchev /*************************************************************************** - DEC DL11-type SLU (serial line unit) + DEC DL11-type SLU (serial line unit) ***************************************************************************/ @@ -82,8 +82,8 @@ private: devcb_write_line m_write_rxrdy; devcb_write_line m_write_txrdy; - line_state m_rxrdy; - line_state m_txrdy; + line_state m_rxrdy; + line_state m_txrdy; int m_rxc; int m_txc; diff --git a/src/devices/machine/glukrs.cpp b/src/devices/machine/glukrs.cpp index e5cbf3f1424..515f448dbb9 100644 --- a/src/devices/machine/glukrs.cpp +++ b/src/devices/machine/glukrs.cpp @@ -13,9 +13,9 @@ #include "glukrs.h" glukrs_device::glukrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, GLUKRS, tag, owner, clock), - device_rtc_interface(mconfig, *this), - m_nvram(*this, "nvram") {} + : device_t(mconfig, GLUKRS, tag, owner, clock), + device_rtc_interface(mconfig, *this), + m_nvram(*this, "nvram") {} void glukrs_device::device_add_mconfig(machine_config &config) { diff --git a/src/devices/machine/glukrs.h b/src/devices/machine/glukrs.h index fc088bc779e..74c581ff068 100644 --- a/src/devices/machine/glukrs.h +++ b/src/devices/machine/glukrs.h @@ -10,25 +10,25 @@ #include "dirtc.h" class glukrs_device : public device_t, - public device_rtc_interface + public device_rtc_interface { public: - glukrs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 32'768); + glukrs_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 32'768); - u8 read(offs_t address); - void write(offs_t address, u8 data); + u8 read(offs_t address); + void write(offs_t address, u8 data); - TIMER_CALLBACK_MEMBER(timer_callback); + TIMER_CALLBACK_MEMBER(timer_callback); protected: - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: - u8 m_cmos[0x100]; - required_device m_nvram; - emu_timer *m_timer; + u8 m_cmos[0x100]; + required_device m_nvram; + emu_timer *m_timer; }; DECLARE_DEVICE_TYPE(GLUKRS, glukrs_device) diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp index 865ef9810fc..c01de5be1f7 100644 --- a/src/devices/machine/scnxx562.cpp +++ b/src/devices/machine/scnxx562.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders: Joakim Larsson Edstrom /*************************************************************************** diff --git a/src/devices/machine/spi_sdcard.cpp b/src/devices/machine/spi_sdcard.cpp index d238317c789..34ce85649d8 100644 --- a/src/devices/machine/spi_sdcard.cpp +++ b/src/devices/machine/spi_sdcard.cpp @@ -244,7 +244,7 @@ void spi_sdcard_device::do_command() } break; - case 8: // CMD8 - SEND_IF_COND (SD v2 only) + case 8: // CMD8 - SEND_IF_COND (SD v2 only) m_data[0] = 0x01; m_data[1] = 0; m_data[2] = 0; @@ -253,7 +253,7 @@ void spi_sdcard_device::do_command() send_data(5, SD_STATE_IDLE); break; - case 10: // CMD10 - SEND_CID + case 10: // CMD10 - SEND_CID m_data[0] = 0x01; // initial R1 response m_data[1] = 0x00; // throwaway byte before data transfer m_data[2] = 0xfe; // data token diff --git a/src/devices/machine/tsconfdma.cpp b/src/devices/machine/tsconfdma.cpp index 5ba61e33cd3..cf5d4a5c1df 100644 --- a/src/devices/machine/tsconfdma.cpp +++ b/src/devices/machine/tsconfdma.cpp @@ -10,185 +10,185 @@ #include "tsconfdma.h" tsconfdma_device::tsconfdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, TSCONF_DMA, tag, owner, clock), - m_in_mreq_cb(*this), - m_out_mreq_cb(*this), - m_in_mspi_cb(*this), - m_out_cram_cb(*this) + : device_t(mconfig, TSCONF_DMA, tag, owner, clock), + m_in_mreq_cb(*this), + m_out_mreq_cb(*this), + m_in_mspi_cb(*this), + m_out_cram_cb(*this) { } void tsconfdma_device::device_start() { - m_in_mreq_cb.resolve_safe(0); - m_out_mreq_cb.resolve_safe(); - m_in_mspi_cb.resolve_safe(0); - m_out_cram_cb.resolve_safe(); - - save_item(NAME(m_ready)); - save_item(NAME(m_address_s)); - save_item(NAME(m_address_d)); - save_item(NAME(m_block_len)); - save_item(NAME(m_block_num)); - save_item(NAME(m_align_s)); - save_item(NAME(m_align_d)); - save_item(NAME(m_align)); + m_in_mreq_cb.resolve_safe(0); + m_out_mreq_cb.resolve_safe(); + m_in_mspi_cb.resolve_safe(0); + m_out_cram_cb.resolve_safe(); + + save_item(NAME(m_ready)); + save_item(NAME(m_address_s)); + save_item(NAME(m_address_d)); + save_item(NAME(m_block_len)); + save_item(NAME(m_block_num)); + save_item(NAME(m_align_s)); + save_item(NAME(m_align_d)); + save_item(NAME(m_align)); } void tsconfdma_device::device_reset() { - m_block_num = 0; - m_ready = ASSERT_LINE; + m_block_num = 0; + m_ready = ASSERT_LINE; } int tsconfdma_device::is_ready() { - return m_ready; + return m_ready; } void tsconfdma_device::set_saddr_l(u8 addr_l) { - m_address_s = (m_address_s & 0xffffff00) | (addr_l & 0xfe); + m_address_s = (m_address_s & 0xffffff00) | (addr_l & 0xfe); } void tsconfdma_device::set_saddr_h(u8 addr_h) { - m_address_s = (m_address_s & 0xffffc0ff) | ((addr_h & 0x3f) << 8); + m_address_s = (m_address_s & 0xffffc0ff) | ((addr_h & 0x3f) << 8); } void tsconfdma_device::set_saddr_x(u8 addr_x) { - m_address_s = (m_address_s & 0x0003fff) | (addr_x << 14); + m_address_s = (m_address_s & 0x0003fff) | (addr_x << 14); } void tsconfdma_device::set_daddr_l(u8 addr_l) { - m_address_d = (m_address_d & 0xffffff00) | (addr_l & 0xfe); + m_address_d = (m_address_d & 0xffffff00) | (addr_l & 0xfe); } void tsconfdma_device::set_daddr_h(u8 addr_h) { - m_address_d = (m_address_d & 0xffffc0ff) | ((addr_h & 0x3f) << 8); + m_address_d = (m_address_d & 0xffffc0ff) | ((addr_h & 0x3f) << 8); } void tsconfdma_device::set_daddr_x(u8 addr_x) { - m_address_d = (m_address_d & 0x0003fff) | (addr_x << 14); + m_address_d = (m_address_d & 0x0003fff) | (addr_x << 14); } void tsconfdma_device::set_block_len(u8 len) { - // 1..256 - m_block_len = len; + // 1..256 + m_block_len = len; } void tsconfdma_device::set_block_num_l(u8 num_l) { - m_block_num = (m_block_num & 0xff00) | num_l; + m_block_num = (m_block_num & 0xff00) | num_l; } void tsconfdma_device::set_block_num_h(u8 num_h) { - // 1..1025 * 2 - m_block_num = (m_block_num & 0x00ff) | ((num_h & 0x03) << 8); + // 1..1025 * 2 + m_block_num = (m_block_num & 0x00ff) | ((num_h & 0x03) << 8); } void tsconfdma_device::start_tx(u8 dev, bool s_align, bool d_align, bool align_opt) { - m_ready = CLEAR_LINE; - m_align = align_opt ? 512 : 256; - - // TODO Transfers 2 byte/cycle at 7MHz - switch (dev) - { - case 0b0001: // Mem -> Mem - for (u16 block = 0; block <= m_block_num; block++) - { - auto s_addr = m_address_s; - auto d_addr = m_address_d; - for (u16 len = 0; len <= m_block_len; len++) - { - m_out_mreq_cb(d_addr, m_in_mreq_cb(s_addr)); - s_addr += 2; - d_addr += 2; - } - m_address_s = s_align ? (m_address_s + m_align) : s_addr; - m_address_d = d_align ? (m_address_d + m_align) : d_addr; - } - break; - - case 0b0010: // SPI -> Mem - for (u16 block = 0; block <= m_block_num; block++) - { - auto d_addr = m_address_d; - for (u16 len = 0; len <= m_block_len; len++) - { - m_out_mreq_cb(d_addr, m_in_mspi_cb()); - d_addr += 2; - } - m_address_d = d_align ? (m_address_d + m_align) : d_addr; - } - break; - - case 0b0100: // Fill - for (u16 block = 0; block <= m_block_num; block++) - { - u16 data = m_in_mreq_cb(m_address_s); - auto d_addr = m_address_d; - for (u16 len = 0; len <= m_block_len; len++) - { - m_out_mreq_cb(d_addr, data); - d_addr += 2; - } - m_address_d = d_align ? (m_address_d + m_align) : d_addr; - } - break; - - case 0b1001: // Blt -> Mem - for (u16 block = 0; block <= m_block_num; block++) - { - auto s_addr = m_address_s; - auto d_addr = m_address_d; - for (u16 len = 0; len <= m_block_len; len++) - { - u16 d_val = m_in_mreq_cb(d_addr); - if (d_val != 0) - { - m_out_mreq_cb(d_addr, m_in_mreq_cb(s_addr)); - } - s_addr += 2; - d_addr += 2; - } - m_address_s = s_align ? (m_address_s + m_align) : s_addr; - m_address_d = d_align ? (m_address_d + m_align) : d_addr; - } - break; - - case 0b1100: // RAM -> CRAM - for (u16 block = 0; block <= m_block_num; block++) - { - auto s_addr = m_address_s; - auto d_addr = m_address_d; - for (u16 len = 0; len <= m_block_len; len++) - { - m_out_cram_cb(d_addr, m_in_mreq_cb(s_addr)); - s_addr += 2; - d_addr += 2; - } - m_address_s = s_align ? (m_address_s + m_align) : s_addr; - m_address_d = d_align ? (m_address_d + m_align) : d_addr; - } - break; - - //case 0b1101: // RAM -> SFILE - // break; - - default: - logerror("'tsdma': TX %02X: %06X (%02X:%04X) -> %06X\n", dev, m_address_s, m_block_len, m_block_num, m_address_d); - break; - } - - m_ready = ASSERT_LINE; + m_ready = CLEAR_LINE; + m_align = align_opt ? 512 : 256; + + // TODO Transfers 2 byte/cycle at 7MHz + switch (dev) + { + case 0b0001: // Mem -> Mem + for (u16 block = 0; block <= m_block_num; block++) + { + auto s_addr = m_address_s; + auto d_addr = m_address_d; + for (u16 len = 0; len <= m_block_len; len++) + { + m_out_mreq_cb(d_addr, m_in_mreq_cb(s_addr)); + s_addr += 2; + d_addr += 2; + } + m_address_s = s_align ? (m_address_s + m_align) : s_addr; + m_address_d = d_align ? (m_address_d + m_align) : d_addr; + } + break; + + case 0b0010: // SPI -> Mem + for (u16 block = 0; block <= m_block_num; block++) + { + auto d_addr = m_address_d; + for (u16 len = 0; len <= m_block_len; len++) + { + m_out_mreq_cb(d_addr, m_in_mspi_cb()); + d_addr += 2; + } + m_address_d = d_align ? (m_address_d + m_align) : d_addr; + } + break; + + case 0b0100: // Fill + for (u16 block = 0; block <= m_block_num; block++) + { + u16 data = m_in_mreq_cb(m_address_s); + auto d_addr = m_address_d; + for (u16 len = 0; len <= m_block_len; len++) + { + m_out_mreq_cb(d_addr, data); + d_addr += 2; + } + m_address_d = d_align ? (m_address_d + m_align) : d_addr; + } + break; + + case 0b1001: // Blt -> Mem + for (u16 block = 0; block <= m_block_num; block++) + { + auto s_addr = m_address_s; + auto d_addr = m_address_d; + for (u16 len = 0; len <= m_block_len; len++) + { + u16 d_val = m_in_mreq_cb(d_addr); + if (d_val != 0) + { + m_out_mreq_cb(d_addr, m_in_mreq_cb(s_addr)); + } + s_addr += 2; + d_addr += 2; + } + m_address_s = s_align ? (m_address_s + m_align) : s_addr; + m_address_d = d_align ? (m_address_d + m_align) : d_addr; + } + break; + + case 0b1100: // RAM -> CRAM + for (u16 block = 0; block <= m_block_num; block++) + { + auto s_addr = m_address_s; + auto d_addr = m_address_d; + for (u16 len = 0; len <= m_block_len; len++) + { + m_out_cram_cb(d_addr, m_in_mreq_cb(s_addr)); + s_addr += 2; + d_addr += 2; + } + m_address_s = s_align ? (m_address_s + m_align) : s_addr; + m_address_d = d_align ? (m_address_d + m_align) : d_addr; + } + break; + + //case 0b1101: // RAM -> SFILE + // break; + + default: + logerror("'tsdma': TX %02X: %06X (%02X:%04X) -> %06X\n", dev, m_address_s, m_block_len, m_block_num, m_address_d); + break; + } + + m_ready = ASSERT_LINE; } // device type definition diff --git a/src/devices/machine/tsconfdma.h b/src/devices/machine/tsconfdma.h index dc8c246b83a..4643fccfe43 100644 --- a/src/devices/machine/tsconfdma.h +++ b/src/devices/machine/tsconfdma.h @@ -14,44 +14,44 @@ class tsconfdma_device : public device_t { public: - tsconfdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - auto in_mreq_callback() { return m_in_mreq_cb.bind(); } - auto out_mreq_callback() { return m_out_mreq_cb.bind(); } - auto in_spireq_callback() { return m_in_mspi_cb.bind(); } - auto out_cram_callback() { return m_out_cram_cb.bind(); } - - int is_ready(); - - void set_saddr_l(uint8_t addr_l); - void set_saddr_h(uint8_t addr_h); - void set_saddr_x(uint8_t addr_x); - void set_daddr_l(uint8_t addr_l); - void set_daddr_h(uint8_t addr_h); - void set_daddr_x(uint8_t addr_x); - void set_block_len(uint8_t len); - void set_block_num_l(uint8_t num_l); - void set_block_num_h(uint8_t num_h); - void start_tx(uint8_t dev, bool s_align, bool d_align, bool blitting_opt); + tsconfdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + auto in_mreq_callback() { return m_in_mreq_cb.bind(); } + auto out_mreq_callback() { return m_out_mreq_cb.bind(); } + auto in_spireq_callback() { return m_in_mspi_cb.bind(); } + auto out_cram_callback() { return m_out_cram_cb.bind(); } + + int is_ready(); + + void set_saddr_l(uint8_t addr_l); + void set_saddr_h(uint8_t addr_h); + void set_saddr_x(uint8_t addr_x); + void set_daddr_l(uint8_t addr_l); + void set_daddr_h(uint8_t addr_h); + void set_daddr_x(uint8_t addr_x); + void set_block_len(uint8_t len); + void set_block_num_l(uint8_t num_l); + void set_block_num_h(uint8_t num_h); + void start_tx(uint8_t dev, bool s_align, bool d_align, bool blitting_opt); private: - virtual void device_start() override; - virtual void device_reset() override; - - devcb_read16 m_in_mreq_cb; - devcb_write16 m_out_mreq_cb; - devcb_read16 m_in_mspi_cb; - devcb_write16 m_out_cram_cb; - - u8 m_ready; - - offs_t m_address_s; - offs_t m_address_d; - u8 m_block_len; - u16 m_block_num; - bool m_align_s; - bool m_align_d; - u16 m_align; + virtual void device_start() override; + virtual void device_reset() override; + + devcb_read16 m_in_mreq_cb; + devcb_write16 m_out_mreq_cb; + devcb_read16 m_in_mspi_cb; + devcb_write16 m_out_cram_cb; + + u8 m_ready; + + offs_t m_address_s; + offs_t m_address_d; + u8 m_block_len; + u16 m_block_num; + bool m_align_s; + bool m_align_d; + u16 m_align; }; DECLARE_DEVICE_TYPE(TSCONF_DMA, tsconfdma_device) diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp index 597a52ad126..9351f6ede5f 100644 --- a/src/devices/sound/aica.cpp +++ b/src/devices/sound/aica.cpp @@ -14,9 +14,9 @@ - Some minor other tweeks (no EGHOLD, slighly more capable DSP) TODO: - - Convert I/O registers to space addresses; + - Convert I/O registers to space addresses; - Timebases are based on 44100KHz case? - - Derive from SCSP device; + - Derive from SCSP device; */ #include "emu.h" diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index 377f5f65a36..04ee74672d8 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -128,20 +128,14 @@ void a2600_pop_state::memory_map(address_map &map) // 6507 has 13-bit address sp } -void a2600_pop_state::banked_map(address_map &map) -{ - map(0x00000, 0x02ffff).rom().region("maincpu", 0); -} - - // read returns number of empty game rom slots uint8_t a2600_pop_state::rom_switch_r(offs_t offset) { - return 5; // Max 47 games, 5 empty slots => 42 games + return 5; // Max 47 games, 5 empty slots => 42 games } -// Rom switch +// Rom switch void a2600_pop_state::rom_switch_w(offs_t offset, uint8_t data) { m_bank->set_entry(data & 0x7f); diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp index 3cab9619ba9..be179e29849 100644 --- a/src/mame/drivers/apple2gs.cpp +++ b/src/mame/drivers/apple2gs.cpp @@ -4809,7 +4809,7 @@ void apple2gs_state::apple2gs(machine_config &config) applefdintf_device::add_35(config, m_floppy[2]); applefdintf_device::add_35(config, m_floppy[3]); - SOFTWARE_LIST(config, "flop_gs_clean").set_original("apple2gs_flop_clcracked"); // GS-specific cleanly cracked disks + SOFTWARE_LIST(config, "flop_gs_clean").set_original("apple2gs_flop_clcracked"); // GS-specific cleanly cracked disks SOFTWARE_LIST(config, "flop_gs_orig").set_compatible("apple2gs_flop_orig"); // Original disks for GS SOFTWARE_LIST(config, "flop_gs_misc").set_compatible("apple2gs_flop_misc"); // Legacy software list pre-June 2021 and defaced cracks SOFTWARE_LIST(config, "flop_a2_clean").set_compatible("apple2_flop_clcracked"); // Apple II series cleanly cracked diff --git a/src/mame/drivers/compucranes.cpp b/src/mame/drivers/compucranes.cpp index f560a66eabe..a240b6ae9c2 100644 --- a/src/mame/drivers/compucranes.cpp +++ b/src/mame/drivers/compucranes.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders: /*************************************************************************** diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index b478e4dd500..5412f8cf08d 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -171,7 +171,7 @@ void kcgd_state::kcgd_mem(address_map &map) // future static const z80_daisy_config daisy_chain[] = { -// { "pic" }, +// { "pic" }, { "dl11kbd" }, { "dl11host" }, { nullptr } @@ -215,8 +215,8 @@ void kcgd_state::machine_start() m_tmpclip = rectangle(0, KCGD_DISP_HORZ - 1, 0, KCGD_DISP_VERT - 1); m_tmpbmp.allocate(KCGD_DISP_HORZ, KCGD_DISP_VERT); // future -// m_vsync_on_timer = timer_alloc(TIMER_ID_VSYNC); -// m_vsync_on_timer->adjust(m_screen->time_until_pos(0, 0), 0, m_screen->frame_period()); +// m_vsync_on_timer = timer_alloc(TIMER_ID_VSYNC); +// m_vsync_on_timer->adjust(m_screen->time_until_pos(0, 0), 0, m_screen->frame_period()); m_500hz_timer = timer_alloc(TIMER_ID_500HZ); m_500hz_timer->adjust(attotime::from_hz(500), 0, attotime::from_hz(500)); } @@ -393,7 +393,7 @@ void kcgd_state::kcgd(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &kcgd_state::kcgd_mem); m_maincpu->set_initial_mode(0100000); // future -// m_maincpu->set_daisy_config(daisy_chain); +// m_maincpu->set_daisy_config(daisy_chain); timer_device &scantimer(TIMER(config, "scantimer")); scantimer.configure_periodic(FUNC(kcgd_state::scanline_callback), attotime::from_hz(50 * 28 * 11)); @@ -417,9 +417,9 @@ void kcgd_state::kcgd(machine_config &config) m_dl11host->set_txvec(0364); m_dl11host->txd_wr_callback().set(m_rs232, FUNC(rs232_port_device::write_txd)); // future -// m_dl11host->rts_wr_callback().set(m_rs232, FUNC(rs232_port_device::write_rts)); -// m_dl11host->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); -// m_dl11host->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11host->rts_wr_callback().set(m_rs232, FUNC(rs232_port_device::write_rts)); +// m_dl11host->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11host->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); RS232_PORT(config, m_rs232, default_rs232_devices, "null_modem"); m_rs232->rxd_handler().set(m_dl11host, FUNC(dl11_device::rx_w)); @@ -432,8 +432,8 @@ void kcgd_state::kcgd(machine_config &config) m_dl11kbd->set_txvec(064); m_dl11kbd->txd_wr_callback().set(m_ms7004, FUNC(ms7004_device::write_rxd)); // future -// m_dl11kbd->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); -// m_dl11kbd->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11kbd->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11kbd->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); MS7004(config, m_ms7004, 0); m_ms7004->tx_handler().set(m_dl11kbd, FUNC(dl11_device::rx_w)); diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 55d6a421674..1336e3e187e 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -22,70 +22,70 @@ Year Game PCB NOTES ------------------------------------------------------------- Note about 57.42 'FRAMERATE_922804' screen refresh - frequency and protection checks. + frequency and protection checks. - In thoop there's a timing loop at 0x49e-4ac. It's + In thoop there's a timing loop at 0x49e-4ac. It's counting frames between interrupt-triggers. - 0x49e writes the count to 0xffdb62. + 0x49e writes the count to 0xffdb62. While fighting the second-stage boss, when the pink - things fly out, 0x8970 is called. 0x8988 fetches - from 0xffdb62. If the value is > 0xdd1 (via 0x898a) - or < 0xdb1 (via 0x8992), then 0x89ac sets 0xffdc45 - to 5. - - At 60hz the value returned is 0xd29, which causes - the fail condition to trigger. Values >=57.3 or - <=57.7 give a result within the required range. The - failure is not obvious at this point. - - While fighting the third boss, 0xc2e8 is called. - After passing checks to know exactly when to trigger - (specifically, after the boss is defeated and the - power-up animation is finishes), 0xc350 checks if + things fly out, 0x8970 is called. 0x8988 fetches + from 0xffdb62. If the value is > 0xdd1 (via 0x898a) + or < 0xdb1 (via 0x8992), then 0x89ac sets 0xffdc45 + to 5. + + At 60hz the value returned is 0xd29, which causes + the fail condition to trigger. Values >=57.3 or + <=57.7 give a result within the required range. The + failure is not obvious at this point. + + While fighting the third boss, 0xc2e8 is called. + After passing checks to know exactly when to trigger + (specifically, after the boss is defeated and the + power-up animation is finishes), 0xc350 checks if 0xffdc45 is 5. If it is, then we reach 0xc368, which - 0xc368 sets 0xffe08e to 0x27. Again the failure is - not obvious at this point. - - 0xffe08e is checked during player respawn after - losing a life or continuing at 0x16d00, with an - explicit compare against 0x27, if this condition is - met, then the game will intentionally corrupt memory - and crash. - - Many of these checks are done with obfuscated code - to hide the target addresses eg. - - writing 0x27 to 0xffe08e - 00C35C: lea $ffc92b.l, A4 - 00C362: adda.l #$1763, A4 - 00C368: move.b #$27, (A4) - - This makes it more difficult to find where the checks - are being performed as an additional layer of - security - - Squash has a similar timing loop, but with the - expected values adjusted due to the different 68000 - clock on the otherwise identical Squash PCB (10Mhz on - Squash vs. 12Mhz on Thunder Hoop) In the case of - Squash the most obvious sign of failure is bad - 'Insert Coin' sprites at the bottom of the screen - after a continue. - - A refresh rate of 57.42, while not yet accurately - measured, allows a video of thoop to stay in sync with - MAME over a 10 minute period. - - No checks have been observed in Biomechanical Toy, - the Maniac Square prototype, or the Last KM prototype. - - Big Karnak runs on a different board type and does fail - if the CPU clock is set to 10Mhz rather than 12Mhz, it - also has additional checks which may still fail and - need more extensive research to determine exactly what - is being timed. + 0xc368 sets 0xffe08e to 0x27. Again the failure is + not obvious at this point. + + 0xffe08e is checked during player respawn after + losing a life or continuing at 0x16d00, with an + explicit compare against 0x27, if this condition is + met, then the game will intentionally corrupt memory + and crash. + + Many of these checks are done with obfuscated code + to hide the target addresses eg. + + writing 0x27 to 0xffe08e + 00C35C: lea $ffc92b.l, A4 + 00C362: adda.l #$1763, A4 + 00C368: move.b #$27, (A4) + + This makes it more difficult to find where the checks + are being performed as an additional layer of + security + + Squash has a similar timing loop, but with the + expected values adjusted due to the different 68000 + clock on the otherwise identical Squash PCB (10Mhz on + Squash vs. 12Mhz on Thunder Hoop) In the case of + Squash the most obvious sign of failure is bad + 'Insert Coin' sprites at the bottom of the screen + after a continue. + + A refresh rate of 57.42, while not yet accurately + measured, allows a video of thoop to stay in sync with + MAME over a 10 minute period. + + No checks have been observed in Biomechanical Toy, + the Maniac Square prototype, or the Last KM prototype. + + Big Karnak runs on a different board type and does fail + if the CPU clock is set to 10Mhz rather than 12Mhz, it + also has additional checks which may still fail and + need more extensive research to determine exactly what + is being timed. ***************************************************************************/ diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index 4c4abedfa42..5b64c9106d7 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -249,7 +249,7 @@ void igt_gameking_state::igt_gameking_map(address_map &map) map(0x2801001c, 0x2801001f).nopw(); map(0x28010030, 0x28010033).r(FUNC(igt_gameking_state::uart_status_r)); // channel D map(0x28010034, 0x28010037).w(FUNC(igt_gameking_state::uart_w)); // channel D - map(0x28020000, 0x280205ff).flags(i960_cpu_device::BURST).ram(); // CMOS? + map(0x28020000, 0x280205ff).flags(i960_cpu_device::BURST).ram(); // CMOS? // map(0x28020000, 0x2802007f).r(FUNC(igt_gameking_state::igt_gk_28010008_r)).nopw(); map(0x28030000, 0x28030003).portr("IN0"); // map(0x28040000, 0x2804007f).rw("quart2", FUNC(sc28c94_device::read), FUNC(sc28c94_device::write)).umask32(0x00ff00ff); diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index d788e433d0a..b36f0775a6f 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -5402,7 +5402,7 @@ ROM_START( adpoker ) ROM_END - + /**************************************** BUENA SUERTE SETS ****************************************/ /* diff --git a/src/mame/drivers/microdar.cpp b/src/mame/drivers/microdar.cpp index cb46b2f3093..e19b407280a 100644 --- a/src/mame/drivers/microdar.cpp +++ b/src/mame/drivers/microdar.cpp @@ -261,7 +261,7 @@ ROM_END /* Info about "Far West": The sound contains shooting samples and a small sample of the Rawhide main theme. - Background layout (four shooting targets as food cans with led circles), see https://youtu.be/YVxThMwhvKQ + Background layout (four shooting targets as food cans with led circles), see https://youtu.be/YVxThMwhvKQ o o o o o o o o o o o o <- 16 LEDs diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp index ce568f7e340..0542fe3798b 100644 --- a/src/mame/drivers/pc.cpp +++ b/src/mame/drivers/pc.cpp @@ -1746,7 +1746,7 @@ Desktop? void pc_state::ec1847(machine_config &config) { pccga(config); -// subdevice("isa1")->set_default_option("hercules"); +// subdevice("isa1")->set_default_option("hercules"); } ROM_START( ec1847 ) diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp index 54198082944..88fd1160838 100644 --- a/src/mame/drivers/pdp11.cpp +++ b/src/mame/drivers/pdp11.cpp @@ -345,8 +345,8 @@ void pdp11_state::pdp11(machine_config &config) m_dl11->set_txvec(064); m_dl11->txd_wr_callback().set(m_rs232, FUNC(rs232_port_device::write_txd)); // future -// m_dl11->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); -// m_dl11->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11->txrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); +// m_dl11->rxrdy_wr_callback().set_inputline(m_maincpu, T11_IRQ0); RS232_PORT(config, m_rs232, default_rs232_devices, "terminal"); m_rs232->rxd_handler().set(m_dl11, FUNC(dl11_device::rx_w)); diff --git a/src/mame/drivers/rfslotspcpent.cpp b/src/mame/drivers/rfslotspcpent.cpp index a395aa23d54..1d7bf6445de 100644 --- a/src/mame/drivers/rfslotspcpent.cpp +++ b/src/mame/drivers/rfslotspcpent.cpp @@ -257,7 +257,7 @@ ROM_START( rfsantafeg ) ROM_REGION(0x4000, "pics", 0) /* - PCB counters (contadores) R.F. 53430106 + PCB counters (contadores) R.F. 53430106 -PIC18F2580 -Xtal 12.00 MHz -SEEPROM 82C251 diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp index d0e883325de..d10413f94cb 100644 --- a/src/mame/drivers/shaolins.cpp +++ b/src/mame/drivers/shaolins.cpp @@ -295,10 +295,10 @@ void shaolins_state::shaolins(machine_config &config) /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); -// m_screen->set_refresh_hz(60); -// m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); -// m_screen->set_size(32*8, 32*8); -// m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); +// m_screen->set_refresh_hz(60); +// m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); +// m_screen->set_size(32*8, 32*8); +// m_screen->set_visarea(0*8, 32*8-1, 2*8, 30*8-1); // Pixel clock is / 3 the master clock (6'144'000) // Refresh rate is 60.606060 Hz, with 40 vblank lines m_screen->set_raw(MASTER_CLOCK / 3, 384, 0, 256, 264, 16, 240); diff --git a/src/mame/drivers/tsconf.cpp b/src/mame/drivers/tsconf.cpp index b727b91301d..2819b467bbb 100644 --- a/src/mame/drivers/tsconf.cpp +++ b/src/mame/drivers/tsconf.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Andrei I. Holub /*************************************************************************** - + TS-Configuration (ZX Evolution) machine driver. Implementation: Revision C / 5-bit VDAC @@ -17,7 +17,7 @@ - Floppy (WDC1793) Beta-disk compatible interface, IDE (one channel, up to 2 devices on master/slave mode), SD(HC) card, RS232; - Sound: AY, Beeper, Covox (PWM); - Real-time clock. - + Features (TS-Configuration): - Resolutions: 360x288, 320x240, 320x200, 256x192 - Hardware scrolled graphic planes @@ -25,16 +25,16 @@ - Programmable color RAM with RGB555 color space and 256 cells - Text mode with loadable font and hardware vertical scroll - Up to 256 graphic screens - + - Up to 85 sprites per line - Sprites sized from 8x8 to 64x64 pixels - Up to 3 sprite planes - Up to 2 tile planes with 8x8 pixels tiles - Up to 16 palettes for sprites per line - Up to 4 palettes for tiles per line for each tile plane - + - DRAM-to-Device, Device-to-DRAM and DRAM-to-DRAM DMA Controller - + Refs: ZxEvo: http://nedopc.com/zxevo/zxevo_eng.php Principal scheme (rev. C) :: http://nedopc.com/zxevo/zxevo_sch_revc.pdf @@ -43,7 +43,7 @@ https://github.com/tslabs/zx-evo/raw/master/pentevo/docs/TSconf/TSconf.xls FAQ-RUS: https://forum.tslabs.info/viewtopic.php?f=35&t=157 ROM: https://github.com/tslabs/zx-evo/blob/master/pentevo/rom/bin/ts-bios.rom (validated on: 2021-12-14) - + HowTo: # Use ts-bios.rom above. You also need tr-dos roms which simpliest(?) to get from pentagon. # Create SD image "wc.img" @@ -55,7 +55,7 @@ # Change "Reset To: BD boot.$c" # Reset (F3) # Enable keyboard: MAME Setup (Tab) > Keyboard Mode > AT Keyboard: Enabled - + TODO: - Interrupts - Sprites @@ -66,7 +66,7 @@ - Ram cache - VDos - Many more... - + ****************************************************************************/ #include "emu.h" @@ -145,8 +145,8 @@ void tsconf_state::tsconf_bank_w(offs_t offset, u8 data) static const gfx_layout spectrum_charlayout = { 8, 8, /* 8 x 8 characters */ - 96, /* 96 characters */ - 1, /* 1 bits per pixel */ + 96, /* 96 characters */ + 1, /* 1 bits per pixel */ {0}, /* no bitplanes */ /* x offsets */ {STEP8(0, 1)}, @@ -231,12 +231,12 @@ void tsconf_state::machine_reset() m_regs[FMAPS] &= 0xef; // xxx0xxxx m_regs[SYS_CONFIG] = 0x00; m_regs[MEM_CONFIG] = 0x04; - m_regs[HS_INT] = 0x01; // 00000001 + m_regs[HS_INT] = 0x01; // 00000001 m_regs[VS_INT_L] = 0x00; // 00000001 m_regs[VS_INT_H] = 0x00; // 0000xxx0 - // FDDVirt = 0x00; // 0000xxx0 + // FDDVirt = 0x00; // 0000xxx0 m_regs[INT_MASK] = 0x01; // xxxxx001 - // CacheConfig = 0x01; // xxxxx001 + // CacheConfig = 0x01; // xxxxx001 if (m_beta->started()) m_beta->enable(); @@ -292,5 +292,5 @@ ROM_START(tsconf) ROM_LOAD("ts-bios.rom", 0x010000, 0x10000, CRC(b060b0d9) SHA1(820d3539de115141daff220a3cb733fc880d1bab)) ROM_END -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 2011, tsconf, spec128, 0, tsconf, spec_plus, tsconf_state, empty_init, "NedoPC, TS-Labs", "ZX Evolution TS-Configuration", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_TIMING ) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 2011, tsconf, spec128, 0, tsconf, spec_plus, tsconf_state, empty_init, "NedoPC, TS-Labs", "ZX Evolution TS-Configuration", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_TIMING ) diff --git a/src/mame/drivers/z80clock.cpp b/src/mame/drivers/z80clock.cpp index ce91c062413..e7613b39bc7 100644 --- a/src/mame/drivers/z80clock.cpp +++ b/src/mame/drivers/z80clock.cpp @@ -14,6 +14,7 @@ TODO: ****************************************************************************/ #include "emu.h" + #include "bus/generic/carts.h" #include "bus/generic/slot.h" #include "bus/rs232/rs232.h" @@ -25,10 +26,15 @@ TODO: #include "machine/z80daisy.h" #include "machine/z80sio.h" #include "sound/spkrdev.h" + #include "softlist.h" #include "speaker.h" + #include "z80clock.lh" + +namespace { + class z80clock_state : public driver_device { public: @@ -432,4 +438,6 @@ INPUT_PORTS_END ROM_START( z80clock ) ROM_END +} // anonymous namespace + COMP(2020, z80clock, 0, 0, z80clock, z80clock, z80clock_state, empty_init, "Tom Storey", "Z80 based, triple time zone clock", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/includes/a2600.h b/src/mame/includes/a2600.h index e507c26cf84..654a97e4ef2 100644 --- a/src/mame/includes/a2600.h +++ b/src/mame/includes/a2600.h @@ -128,7 +128,6 @@ protected: private: void memory_map(address_map &map); - void banked_map(address_map &map); uint8_t rom_switch_r(offs_t offset); void rom_switch_w(offs_t offset, uint8_t data); diff --git a/src/mame/includes/tsconf.h b/src/mame/includes/tsconf.h index d8700b3f7ae..4a19a75c64f 100644 --- a/src/mame/includes/tsconf.h +++ b/src/mame/includes/tsconf.h @@ -10,14 +10,18 @@ #pragma once +#include "spectrum.h" + #include "machine/beta.h" + #include "machine/glukrs.h" #include "machine/pckeybrd.h" #include "machine/spi_sdcard.h" #include "machine/tsconfdma.h" -#include "spectrum.h" + #include "tilemap.h" + class tsconf_state : public spectrum_128_state { public: diff --git a/src/mame/machine/gaelcrpt.h b/src/mame/machine/gaelcrpt.h index c3d71374a4c..2ce4367132a 100644 --- a/src/mame/machine/gaelcrpt.h +++ b/src/mame/machine/gaelcrpt.h @@ -14,7 +14,8 @@ class gaelco_vram_encryption_device : public device_t public: // construction/destruction gaelco_vram_encryption_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - void set_params(uint8_t param1, uint16_t param2) { m_param1 = param1; m_param2 = param2; } + + void set_params(uint8_t param1, uint16_t param2) { m_param1 = param1; m_param2 = param2; } uint16_t gaelco_decrypt(cpu_device &cpu, int offset, int data); -- cgit v1.2.3