diff options
author | Vas Crabb <vas@vastheman.com> | 2019-11-24 13:52:11 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-11-24 13:52:11 +1100 |
commit | e64edf6c7127fb8291a157026f3ac72e38c78d80 (patch) | |
tree | 092564456a138ad98775b989ea6073e4c75a7abd /src/devices | |
parent | 6e8748952730a23a507c415c92398205238d1367 (diff) |
srcclean and indentation cleanup (nw)
Diffstat (limited to 'src/devices')
28 files changed, 419 insertions, 419 deletions
diff --git a/src/devices/bus/bbc/exp/autocue.cpp b/src/devices/bus/bbc/exp/autocue.cpp index 929f4eb2eaa..8b8e1e5cd71 100644 --- a/src/devices/bus/bbc/exp/autocue.cpp +++ b/src/devices/bus/bbc/exp/autocue.cpp @@ -97,4 +97,4 @@ void bbc_autocue_device::jim_w(offs_t offset, uint8_t data) { m_ram[(m_ram_page << 8) | offset] = data; } -}
\ No newline at end of file +} diff --git a/src/devices/bus/bbc/internal/aries.cpp b/src/devices/bus/bbc/internal/aries.cpp index 6bda361d7bd..1ee29009129 100644 --- a/src/devices/bus/bbc/internal/aries.cpp +++ b/src/devices/bus/bbc/internal/aries.cpp @@ -294,7 +294,7 @@ uint8_t bbc_ariesb32_device::ram_r(offs_t offset) void bbc_ariesb32_device::ram_w(offs_t offset, uint8_t data) { //if ((offset & 0xff) == 0x00) - // logerror("ram_w: %04x = %02x\n", offset, data); + // logerror("ram_w: %04x = %02x\n", offset, data); if (m_shadow && offset >= 0x3000) m_ram[offset - 0x3000] = data; else @@ -324,7 +324,7 @@ uint8_t bbc_ariesb32_device::paged_r(offs_t offset) void bbc_ariesb32_device::paged_w(offs_t offset, uint8_t data) { //if ((offset & 0xff) == 0x00) - // logerror("paged_w: %04x = %02x\n", offset | 0x8000, data); + // logerror("paged_w: %04x = %02x\n", offset | 0x8000, data); if (m_rom[m_romsel]) { m_rom[m_romsel]->write(offset, data); diff --git a/src/devices/bus/bbc/internal/integrab.cpp b/src/devices/bus/bbc/internal/integrab.cpp index 0bba0add02c..63134bc765b 100644 --- a/src/devices/bus/bbc/internal/integrab.cpp +++ b/src/devices/bus/bbc/internal/integrab.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Nigel Barnes /********************************************************************** @@ -169,19 +169,19 @@ uint8_t bbc_integrab_device::romsel_r(offs_t offset) void bbc_integrab_device::romsel_w(offs_t offset, uint8_t data) { /* - ROMSEL & ROMID - Bits 0,3 ROMNUM Sideways ROM/RAM select bits - Bits 4,5 Not used - Bit 6 PRVEN Private RAM enable - Bit 7 MEMSEL Shadow/Main RAM toggle - - RAMSEL & RAMID - Bits 0,1 AUX0,1 Not used but must be preserved - Bits 2,3 Not used - Bit 4 PRVS8 Private RAM 8K area select (&9000-&AFFF) - Bit 5 PRVS4 Private RAM 4K area select (&8000-&8FFF) - Bit 6 PRVS1 Private RAM 1K area select (&8000-&83FF) - Bit 7 SHEN Shadow RAM enable bit + ROMSEL & ROMID + Bits 0,3 ROMNUM Sideways ROM/RAM select bits + Bits 4,5 Not used + Bit 6 PRVEN Private RAM enable + Bit 7 MEMSEL Shadow/Main RAM toggle + + RAMSEL & RAMID + Bits 0,1 AUX0,1 Not used but must be preserved + Bits 2,3 Not used + Bit 4 PRVS8 Private RAM 8K area select (&9000-&AFFF) + Bit 5 PRVS4 Private RAM 4K area select (&8000-&8FFF) + Bit 6 PRVS1 Private RAM 1K area select (&8000-&83FF) + Bit 7 SHEN Shadow RAM enable bit */ switch (offset & 0x0c) { diff --git a/src/devices/bus/bbc/internal/stl4m32.cpp b/src/devices/bus/bbc/internal/stl4m32.cpp index bd5e3e0d40e..5d3782c36ac 100644 --- a/src/devices/bus/bbc/internal/stl4m32.cpp +++ b/src/devices/bus/bbc/internal/stl4m32.cpp @@ -281,7 +281,7 @@ uint8_t bbc_stl4m32_device::mos_r(offs_t offset) //if (BIT(m_shadow, 7) && offset >= 0x2000) //{ - // data = m_ram[offset]; + // data = m_ram[offset]; //} //else //{ @@ -298,6 +298,6 @@ void bbc_stl4m32_device::mos_w(offs_t offset, uint8_t data) //if (BIT(m_romsel, 7) && offset >= 0x2000) //{ - // m_ram[offset] = data; + // m_ram[offset] = data; //} -}
\ No newline at end of file +} diff --git a/src/devices/bus/isa/eis_hgb107x.h b/src/devices/bus/isa/eis_hgb107x.h index 711f385278f..8156633df9f 100644 --- a/src/devices/bus/isa/eis_hgb107x.h +++ b/src/devices/bus/isa/eis_hgb107x.h @@ -75,7 +75,7 @@ private: ATTR_FOREG = 0x07, ATTR_ULINE = 0x01, }; - + required_device<mc6845_device> m_crtc; MC6845_UPDATE_ROW( crtc_update_row ); diff --git a/src/devices/bus/isa/eis_twib.cpp b/src/devices/bus/isa/eis_twib.cpp index 8902ead74ef..5d465cef327 100644 --- a/src/devices/bus/isa/eis_twib.cpp +++ b/src/devices/bus/isa/eis_twib.cpp @@ -36,7 +36,7 @@ | IC4 IC3 Resistor DIL IC6 ooooo o5 o5 IC9 P2|| |- BNC(3270) | 74LS00 74LS00 1234567890 74LS86 ooooo 1o o4 1o o4 74LS245 ||--- | SW1 DIP 2o o3 2o o3 ____| - +----------------------------------------------------------------------------------|o___| + +----------------------------------------------------------------------------------|o___| ||||||||||||||||||||||||| | Notes | ------------------------------------------------------------------------------ | @@ -49,7 +49,7 @@ ------------------- This is a passive ISA8 board that should be fitted into an Ericsson PC (epc) and driven by suitable software. It was replaced by the ISA16 SAD8852 intelligent TWIB - board for WS286 and higher a few years later. + board for WS286 and higher a few years later. */ @@ -246,7 +246,7 @@ void isa8_eistwib_device::device_reset() int base = m_sw1->read(); if (!m_installed) { - LOG("Installing twib device at %04x\n", base); + LOG("Installing twib device at %04x\n", base); m_isa->install_device( base, base + 0x0f, read8_delegate(*this, FUNC( isa8_eistwib_device::twib_r )), diff --git a/src/devices/bus/sbus/cgsix.h b/src/devices/bus/sbus/cgsix.h index 47423f1e724..71acec329a9 100644 --- a/src/devices/bus/sbus/cgsix.h +++ b/src/devices/bus/sbus/cgsix.h @@ -82,23 +82,23 @@ protected: enum { - THC_MISC_IRQ_BIT = 4, - THC_MISC_IRQEN_BIT = 5, - THC_MISC_CURRES_BIT = 6, - THC_MISC_SYNCEN_BIT = 7, - THC_MISC_VSYNC_BIT = 8, - THC_MISC_SYNC_BIT = 9, - THC_MISC_ENVID_BIT = 10, - THC_MISC_RESET_BIT = 12, + THC_MISC_IRQ_BIT = 4, + THC_MISC_IRQEN_BIT = 5, + THC_MISC_CURRES_BIT = 6, + THC_MISC_SYNCEN_BIT = 7, + THC_MISC_VSYNC_BIT = 8, + THC_MISC_SYNC_BIT = 9, + THC_MISC_ENVID_BIT = 10, + THC_MISC_RESET_BIT = 12, THC_MISC_REV = 0x00010000, - THC_MISC_WRITE_MASK = 0x000014ff + THC_MISC_WRITE_MASK = 0x000014ff }; enum { - FBC_CONFIG_FBID = 0x60000000, - FBC_CONFIG_VERSION = 0x00100000, - FBC_CONFIG_MASK = 0x000f3fff + FBC_CONFIG_FBID = 0x60000000, + FBC_CONFIG_VERSION = 0x00100000, + FBC_CONFIG_MASK = 0x000f3fff }; enum @@ -257,7 +257,7 @@ protected: enum { - FBC_CONFIG = 0x000/4, + FBC_CONFIG = 0x000/4, FBC_MISC = 0x004/4, FBC_CLIP_CHECK = 0x008/4, diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h index 366e27c9e5e..91d1922c577 100644 --- a/src/devices/bus/spectrum/exp.h +++ b/src/devices/bus/spectrum/exp.h @@ -8,7 +8,7 @@ Pinout: - 48K 128K/+2 +2A/+2B/+3/3B + 48K 128K/+2 +2A/+2B/+3/3B A B A B A B A15 1 A14 A15 1 A14 A15 1 A14 diff --git a/src/devices/bus/spectrum/mface.cpp b/src/devices/bus/spectrum/mface.cpp index 1417c5db58c..8e26277de8a 100644 --- a/src/devices/bus/spectrum/mface.cpp +++ b/src/devices/bus/spectrum/mface.cpp @@ -2,81 +2,81 @@ // copyright-holders:Nigel Barnes /********************************************************************* - Romantic Robot Multiface One/128/3 - ---------------------------------- - - " MULTI-PURPOSE INTERFACE FOR THE ZX SPECTRUM " - - MULTIFACE ONE comprises three interfaces in one box: - 1) Fully universal and 100% automatic SAVE facility for tape, microdrive, wafadrive, Beta, - Discovery and indirectly (via tape) for other disc systems - 2) Joystick interface – Kempston compatible (IN 31) - 3) 8K RAM extension – fully accessible, usable as a RAM disk, buffer etc. Also used by - MULTIFACE for MULTI TOOLKIT routines, buffer & other purposes. - - © Romantic Robot UK Ltd 1985 - - - Multiface One - ------------- - Many versions exist, a very good source of info is: https://x128.speccy.cz/multiface/multiface.htm - - Summary: - Earliest version has 2KB of RAM, composite video output, and no toolkit (pokes only). - Next version has 8KB of RAM, composite video output, and basic toolkit (including pokes). - Latest and most common version dropped the composite video output, added an enable/disable switch, and full-featured toolkit. - A special (and rare) version supports the Kempston Disc interface but drops Beta support. (not sold in stores, available only on request). - At some point during "early" revisions, the page out port changed from 0x5f to 0x1f. - Various clone/hacked rom versions are known to exist as well. - - Roms: - The MUxx in the rom name is pcb revision (silkscreen marking). - The two hex digits are the rom checksum. - With the MF menu on-screen, press Symbol Shift + A (STOP) to see checksum, space to return. - - The enable/disable switch became necessary on later versions as games had started including checks to detect presence of the interface. - eg. Renegade ("The Hit Squad" re-release) whilst loading, reads from 0x9f specifically to cause the MF (if present) to page in and crash the machine. - Todo: confirm exact operation of disable switch. - - As mentioned in the user instructions, there is a "joystick disable" jumper inside the unit which must be cut to allow Beta disk compatibility. - The joystick is not actually disabled but rather just data bus bits D6 + D7 are held hi-z for any reads of kempston range 0b000xxxxx. - - rom maps to 0x0000 - ram maps to 0x2000 - - I/O R/W early ver late ver - ---------+-----+-----------+----------- - page in R 0x9f 0x9f - page out R 0x5f 0x1f - nmi reset W 0x5f 0x1f - joystick R 0x1f 0x1f - - - Multiface 128 - ------------- - 128K/+2 support (also works with 48K) - DISCiPLE/Plus D disc support - No joystick port - Software enable/disable - "Hypertape" recording (?) - - Todo ... - - - Multiface 3 - ----------- - +2A/+2B/+3/3B support (doesn't work with 48K/128K/+2) - +3 disk support - - Todo ... - - - Multiprint - ---------- - Version ? multiface with Centronics printer interface - - Todo ... - + Romantic Robot Multiface One/128/3 + ---------------------------------- + + " MULTI-PURPOSE INTERFACE FOR THE ZX SPECTRUM " + + MULTIFACE ONE comprises three interfaces in one box: + 1) Fully universal and 100% automatic SAVE facility for tape, microdrive, wafadrive, Beta, + Discovery and indirectly (via tape) for other disc systems + 2) Joystick interface – Kempston compatible (IN 31) + 3) 8K RAM extension – fully accessible, usable as a RAM disk, buffer etc. Also used by + MULTIFACE for MULTI TOOLKIT routines, buffer & other purposes. + + © Romantic Robot UK Ltd 1985 + + + Multiface One + ------------- + Many versions exist, a very good source of info is: https://x128.speccy.cz/multiface/multiface.htm + + Summary: + Earliest version has 2KB of RAM, composite video output, and no toolkit (pokes only). + Next version has 8KB of RAM, composite video output, and basic toolkit (including pokes). + Latest and most common version dropped the composite video output, added an enable/disable switch, and full-featured toolkit. + A special (and rare) version supports the Kempston Disc interface but drops Beta support. (not sold in stores, available only on request). + At some point during "early" revisions, the page out port changed from 0x5f to 0x1f. + Various clone/hacked rom versions are known to exist as well. + + Roms: + The MUxx in the rom name is pcb revision (silkscreen marking). + The two hex digits are the rom checksum. + With the MF menu on-screen, press Symbol Shift + A (STOP) to see checksum, space to return. + + The enable/disable switch became necessary on later versions as games had started including checks to detect presence of the interface. + eg. Renegade ("The Hit Squad" re-release) whilst loading, reads from 0x9f specifically to cause the MF (if present) to page in and crash the machine. + Todo: confirm exact operation of disable switch. + + As mentioned in the user instructions, there is a "joystick disable" jumper inside the unit which must be cut to allow Beta disk compatibility. + The joystick is not actually disabled but rather just data bus bits D6 + D7 are held hi-z for any reads of kempston range 0b000xxxxx. + + rom maps to 0x0000 + ram maps to 0x2000 + + I/O R/W early ver late ver + ---------+-----+-----------+----------- + page in R 0x9f 0x9f + page out R 0x5f 0x1f + nmi reset W 0x5f 0x1f + joystick R 0x1f 0x1f + + + Multiface 128 + ------------- + 128K/+2 support (also works with 48K) + DISCiPLE/Plus D disc support + No joystick port + Software enable/disable + "Hypertape" recording (?) + + Todo ... + + + Multiface 3 + ----------- + +2A/+2B/+3/3B support (doesn't work with 48K/128K/+2) + +3 disk support + + Todo ... + + + Multiprint + ---------- + Version ? multiface with Centronics printer interface + + Todo ... + *********************************************************************/ @@ -105,13 +105,13 @@ INPUT_PORTS_END INPUT_PORTS_START( mface1 ) PORT_INCLUDE( mface ) - + PORT_START("CONFIG") PORT_CONFNAME(0x01, 0x00, "Joystick Enable Jumper") PORT_CONFSETTING(0x00, "Closed") PORT_CONFSETTING(0x01, "Open") PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) - + PORT_START("JOY") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_8WAY @@ -153,17 +153,17 @@ ROM_END /* Todo ... - ROM_SYSTEM_BIOS(?, "mu12cb", "MU12 CB") // Very early version, 2KB RAM, page out port 0x5F - ROMX_LOAD("mf1_12_cb.rom", 0x0000, 0x2000, CRC(c88fbf9f) SHA1(c3018d1b495b8bc0a135038db0987de7091c9d4c), ROM_BIOS(?)) + ROM_SYSTEM_BIOS(?, "mu12cb", "MU12 CB") // Very early version, 2KB RAM, page out port 0x5F + ROMX_LOAD("mf1_12_cb.rom", 0x0000, 0x2000, CRC(c88fbf9f) SHA1(c3018d1b495b8bc0a135038db0987de7091c9d4c), ROM_BIOS(?)) - ROM_SYSTEM_BIOS(?, "mu2023", "MU 2.0 23") // pokes only (no toolkit), page out port 0x5F - ROMX_LOAD("mf1_20_23.rom", 0x0000, 0x2000, CRC(d4ae8953) SHA1(b442eb634a72fb63f1ccbbd0021a7a581152888d), ROM_BIOS(?)) + ROM_SYSTEM_BIOS(?, "mu2023", "MU 2.0 23") // pokes only (no toolkit), page out port 0x5F + ROMX_LOAD("mf1_20_23.rom", 0x0000, 0x2000, CRC(d4ae8953) SHA1(b442eb634a72fb63f1ccbbd0021a7a581152888d), ROM_BIOS(?)) - ROM_SYSTEM_BIOS(?, "mu2090", "MU 2.0, 90") // pokes only or full toolkit? NO DUMP? - ROMX_LOAD("mf1_20_90.rom", 0x0000, 0x2000, CRC(2eaf8e41) SHA1(?), ROM_BIOS(?)) + ROM_SYSTEM_BIOS(?, "mu2090", "MU 2.0, 90") // pokes only or full toolkit? NO DUMP? + ROMX_LOAD("mf1_20_90.rom", 0x0000, 0x2000, CRC(2eaf8e41) SHA1(?), ROM_BIOS(?)) - ROM_SYSTEM_BIOS(?, "v24", "MU ?? 93 (Brazilian clone)") // NO DUMP? - ROMX_LOAD("mf1_bc_fe.rom", 0x0000, 0x2000, CRC(8c17113b) SHA1(?), ROM_BIOS(?)) + ROM_SYSTEM_BIOS(?, "v24", "MU ?? 93 (Brazilian clone)") // NO DUMP? + ROMX_LOAD("mf1_bc_fe.rom", 0x0000, 0x2000, CRC(8c17113b) SHA1(?), ROM_BIOS(?)) */ ROM_START(mface128) @@ -304,7 +304,7 @@ void spectrum_mface_base_device::pre_opcode_fetch(offs_t offset) uint8_t spectrum_mface1_device::iorq_r(offs_t offset) { uint8_t data = m_exp->iorq_r(offset); - + if (!machine().side_effects_disabled()) { switch (offset & 0xff) @@ -392,7 +392,7 @@ void spectrum_mface1_device::iorq_w(offs_t offset, uint8_t data) m_slot->nmi_w(CLEAR_LINE); break; } - + m_exp->iorq_w(offset, data); } @@ -451,7 +451,7 @@ INPUT_CHANGED_MEMBER(spectrum_mface1_device::magic_button) { if (newval && !oldval) // key released { - + } else // key pressed { diff --git a/src/devices/bus/spectrum/mface.h b/src/devices/bus/spectrum/mface.h index 9f3d89ae6dc..7d5ed5b2145 100644 --- a/src/devices/bus/spectrum/mface.h +++ b/src/devices/bus/spectrum/mface.h @@ -54,7 +54,7 @@ class spectrum_mface1_device : public spectrum_mface_base_device { public: spectrum_mface1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - + DECLARE_INPUT_CHANGED_MEMBER(magic_button) override; protected: @@ -64,7 +64,7 @@ protected: virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - + private: required_ioport m_joy; required_ioport m_hwconfig; diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp index 10fb90e1b93..49868413649 100644 --- a/src/devices/bus/spectrum/mgt.cpp +++ b/src/devices/bus/spectrum/mgt.cpp @@ -2,141 +2,141 @@ // copyright-holders:TwistedTom /********************************************************************** - DISCiPLE Multi-purpose Interface - +D Disk and Printer Interface - - Miles Gordon Technology, UK, 1986-1990 (also produced the Sam Coupé home computer.) - - DISCiPLE was MGT's first disk interface, a large plastic base that sat under the Spectrum, similar to Sinclair's official Interface 1. - +D was MGT's second (and last) disk interface, a cost and feature reduced version of the Disciple, a small metal-cased, - stand-alone unit which connects to ZX Spectrum's expansion slot via a ribbon cable. - A second Datel version of the +D exists (following the closure of MGT, it was licensed and produced by Datel.) - Many unofficial versions of +D exist and modern versions are still seen today as DIY-style projects/kits. - It's said the device's design and roms were officially released into the public domain at some point? - - DISCiPLE features: - 8KB ROM - 8KB RAM - single floppy disk interface (2 drives) - Centronics parallel printer interface - "magic button" style memory snapshot grabber - 2 ATARI joystick ports (Sinclair 1/Kempston, Sinclair 2) - 2 network connectors (Interface 1 compatible, 3.5mm mono jack) - inhibit button (to lock out the interface) - pass-through expansion connector (to chain other devices) - - +D features: - same as DISCiPLE - lost the joystick/network ports, inhibit button and pass-through expansion connector - - DISCiPLE's official DOS was "GDOS". - +D's official DOS was "G+DOS". - Both of these were later superseded by "SAM DOS" (used by MGT's Sam Coupé.) - A 3rd party company SD Software released an alternative DOS "UNI-DOS" for both interfaces. (consisting of a disk and replacement ROM) - - FDD support: - - DISCiPLE's manual states any Shugart 400 SD/DD drive should work: - "The disciple will accept 5.25" or 3.5" drives, whether they are 40 track or 80 track, - single sided or double sided, single density or double density." - - +D's manual states any Shugart 400 DD drive should work (but not SD) - "we recommend 3.5" or 5.25" 80-track double sided and double density drives, - which will give you up to 780K of storage per drive. But Shugart - 400-type 3" drives will also work." - - +D only: Pin 26 /DDEN of the WD1772 is tied to ground, so permanent DD mode. - DISCiPLE only: /DDEN can be directly controlled via s/w by an IO write to 0x1f, bit 2. - - Disks use "MGT filesystem". - A good description available at https://faqwiki.zxnet.co.uk/wiki/MGT_filesystem - - Disk format is 512 bytes/sector, 10 sectors/track - 40 track, 1 side = 204,800 bytes (512*10*40*1) - 40 track, 2 side = 409,600 bytes - 80 track, 1 side = 409,600 bytes - 80 track, 2 side = 819,200 bytes <-- only this one supported so far - - .mgt files work ok - .img files don't work (not in coupedsk.cpp) - - The DOS must be loaded from a "System Disk" which is itself created from "System Tape" which was supplied with the unit. - The ROM provides just the RUN command, which boots the system disk and loads the full DOS. - Presumably the unit wasn't supplied with a system disk due to wide range of drives that can be used? (3", 3.5", 5.25") - The DOS survives a reset, so reloading of system disk is only required after full power cycle. - - A few useful commands: - RUN Boots the system - CAT 1 Displays catalogue (drive 1) - CAT 1! Displays shortened catalogue (drive 1) - SAVE D1 "filename" Saves file - VERIFY D1 "filename" Confirms save has been made - LOAD D1 "filename" Loads file (except Snapshot files) - LOAD D1 "filename" S Loads 48K Snapshot file - LOAD D1 "filename" K Loads 128K Snapshot file - LOAD D1 "filename" SCREEN$ Loads screen file - LOAD Pn Loads the program (from its number) - ERASE D1 "file" TO "new file" Renames a file - ERASE D1 "filename" Erases a file - SAVE D1 "file" TO D2 Copies a file from drive1 to drive2 - FORMAT D1 Formats disc in drive 1 - FORMAT D1 TO 2 Formats drive 1; copies from 2 to 1 - - DISCiPLE snapshot button: - Caps Shift + button system freezes with a multi-coloured border effect - then, key 3 save current SCREEN - 4 save 48K PROGRAM - 5 save 128K PROGRAM - Caps Shift + number saves to drive 2 (or 1 if running from 2) - - +D snapshot button: - button system freezes with a multi-coloured border effect (don't need to hold caps shift) - then, key 3 save current SCREEN - 4 save 48K PROGRAM - 5 save 128K PROGRAM - X do nothing, return to running program - Caps Shift + number saves to drive 2 (or 1 if running from 2) - - DISCiPLE GDOS versions: - The rom/system disk versions must match, - v2 rom: use system disk/system tape ver 2, 2b, 2c - v3 rom: use system disk/system tape ver 3a, 3b or 3d - - +D G+DOS versions: - a v1 (-non a) exists but has yet to be found/dumped, - from "pick-poke-it" user manual: - "A few PLUS D users are still using Version 1 of the ROM which was used in PLUS D's sold in December 1987-January 1988. - ... check the serial number on the bottom of your PLUS D. If it's a 4-figure number commencing with 1, - then you have a PLUS D with the Version 1 ROM." - - DISCiPLE only curiosities: - The pass-through expansion connector has 4 extra pins (1 top/bottom each end) - so 2x30 pins compared to ususal 2x28 of Spectrum expansion slot. - Presumably this was intended for some unique expansion device that never appeared? - One of these extra pins can be directly controlled via s/w by an IO write to 0x1f, bit 5. - 2 other pins appear to be able to override the /ce signal from PAL ic9 to the rom. - 4th pin is unused. - - The design allows for use of a larger 27128 (16KB) rom, - with the highest address line A13 controllable via s/w by an IO write to 0x1f, bit 3. - No larger roms seem to exist (or perhaps not yet found...?) - Some 16KB dumps can be found but these are combined dumps of the 8KB rom and 8KB ram (with the full DOS loaded). - - - Current status: - -------------- - - DISCiPLE - GDOS v3: all ok, occassional "no system file" when loading system disk, ok on 2nd attempt - GDOS v2: all ok - UNIDOS: all ok - - +D - G+DOS: all ok - UNIDOS: all ok - - - Not working with 128K/+2 yet... + DISCiPLE Multi-purpose Interface + +D Disk and Printer Interface + + Miles Gordon Technology, UK, 1986-1990 (also produced the Sam Coupé home computer.) + + DISCiPLE was MGT's first disk interface, a large plastic base that sat under the Spectrum, similar to Sinclair's official Interface 1. + +D was MGT's second (and last) disk interface, a cost and feature reduced version of the Disciple, a small metal-cased, + stand-alone unit which connects to ZX Spectrum's expansion slot via a ribbon cable. + A second Datel version of the +D exists (following the closure of MGT, it was licensed and produced by Datel.) + Many unofficial versions of +D exist and modern versions are still seen today as DIY-style projects/kits. + It's said the device's design and roms were officially released into the public domain at some point? + + DISCiPLE features: + 8KB ROM + 8KB RAM + single floppy disk interface (2 drives) + Centronics parallel printer interface + "magic button" style memory snapshot grabber + 2 ATARI joystick ports (Sinclair 1/Kempston, Sinclair 2) + 2 network connectors (Interface 1 compatible, 3.5mm mono jack) + inhibit button (to lock out the interface) + pass-through expansion connector (to chain other devices) + + +D features: + same as DISCiPLE + lost the joystick/network ports, inhibit button and pass-through expansion connector + + DISCiPLE's official DOS was "GDOS". + +D's official DOS was "G+DOS". + Both of these were later superseded by "SAM DOS" (used by MGT's Sam Coupé.) + A 3rd party company SD Software released an alternative DOS "UNI-DOS" for both interfaces. (consisting of a disk and replacement ROM) + + FDD support: + + DISCiPLE's manual states any Shugart 400 SD/DD drive should work: + "The disciple will accept 5.25" or 3.5" drives, whether they are 40 track or 80 track, + single sided or double sided, single density or double density." + + +D's manual states any Shugart 400 DD drive should work (but not SD) + "we recommend 3.5" or 5.25" 80-track double sided and double density drives, + which will give you up to 780K of storage per drive. But Shugart + 400-type 3" drives will also work." + + +D only: Pin 26 /DDEN of the WD1772 is tied to ground, so permanent DD mode. + DISCiPLE only: /DDEN can be directly controlled via s/w by an IO write to 0x1f, bit 2. + + Disks use "MGT filesystem". + A good description available at https://faqwiki.zxnet.co.uk/wiki/MGT_filesystem + + Disk format is 512 bytes/sector, 10 sectors/track + 40 track, 1 side = 204,800 bytes (512*10*40*1) + 40 track, 2 side = 409,600 bytes + 80 track, 1 side = 409,600 bytes + 80 track, 2 side = 819,200 bytes <-- only this one supported so far + + .mgt files work ok + .img files don't work (not in coupedsk.cpp) + + The DOS must be loaded from a "System Disk" which is itself created from "System Tape" which was supplied with the unit. + The ROM provides just the RUN command, which boots the system disk and loads the full DOS. + Presumably the unit wasn't supplied with a system disk due to wide range of drives that can be used? (3", 3.5", 5.25") + The DOS survives a reset, so reloading of system disk is only required after full power cycle. + + A few useful commands: + RUN Boots the system + CAT 1 Displays catalogue (drive 1) + CAT 1! Displays shortened catalogue (drive 1) + SAVE D1 "filename" Saves file + VERIFY D1 "filename" Confirms save has been made + LOAD D1 "filename" Loads file (except Snapshot files) + LOAD D1 "filename" S Loads 48K Snapshot file + LOAD D1 "filename" K Loads 128K Snapshot file + LOAD D1 "filename" SCREEN$ Loads screen file + LOAD Pn Loads the program (from its number) + ERASE D1 "file" TO "new file" Renames a file + ERASE D1 "filename" Erases a file + SAVE D1 "file" TO D2 Copies a file from drive1 to drive2 + FORMAT D1 Formats disc in drive 1 + FORMAT D1 TO 2 Formats drive 1; copies from 2 to 1 + + DISCiPLE snapshot button: + Caps Shift + button system freezes with a multi-coloured border effect + then, key 3 save current SCREEN + 4 save 48K PROGRAM + 5 save 128K PROGRAM + Caps Shift + number saves to drive 2 (or 1 if running from 2) + + +D snapshot button: + button system freezes with a multi-coloured border effect (don't need to hold caps shift) + then, key 3 save current SCREEN + 4 save 48K PROGRAM + 5 save 128K PROGRAM + X do nothing, return to running program + Caps Shift + number saves to drive 2 (or 1 if running from 2) + + DISCiPLE GDOS versions: + The rom/system disk versions must match, + v2 rom: use system disk/system tape ver 2, 2b, 2c + v3 rom: use system disk/system tape ver 3a, 3b or 3d + + +D G+DOS versions: + a v1 (-non a) exists but has yet to be found/dumped, + from "pick-poke-it" user manual: + "A few PLUS D users are still using Version 1 of the ROM which was used in PLUS D's sold in December 1987-January 1988. + ... check the serial number on the bottom of your PLUS D. If it's a 4-figure number commencing with 1, + then you have a PLUS D with the Version 1 ROM." + + DISCiPLE only curiosities: + The pass-through expansion connector has 4 extra pins (1 top/bottom each end) + so 2x30 pins compared to ususal 2x28 of Spectrum expansion slot. + Presumably this was intended for some unique expansion device that never appeared? + One of these extra pins can be directly controlled via s/w by an IO write to 0x1f, bit 5. + 2 other pins appear to be able to override the /ce signal from PAL ic9 to the rom. + 4th pin is unused. + + The design allows for use of a larger 27128 (16KB) rom, + with the highest address line A13 controllable via s/w by an IO write to 0x1f, bit 3. + No larger roms seem to exist (or perhaps not yet found...?) + Some 16KB dumps can be found but these are combined dumps of the 8KB rom and 8KB ram (with the full DOS loaded). + + + Current status: + -------------- + + DISCiPLE + GDOS v3: all ok, occassional "no system file" when loading system disk, ok on 2nd attempt + GDOS v2: all ok + UNIDOS: all ok + + +D + G+DOS: all ok + UNIDOS: all ok + + + Not working with 128K/+2 yet... **********************************************************************/ @@ -167,17 +167,17 @@ INPUT_PORTS_END INPUT_PORTS_START(disciple) PORT_INCLUDE(plusd) - + // Joystick 1 (right-hand) is both Kempston (port 0x1f) and Sinclair 1 (keys 6,7,8,9,0) // Joystick 2 (left-hand) is Sinclair 2 (keys 1,2,3,4,5) - + PORT_START("JOY1") /* Sinclair 1 (keys 6,7,8,9,0) 0xeffe , Kempston 0x1f */ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) PORT_NAME("Kempston\\Sinclair P1 Button 1") PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Kempston\\Sinclair P1 Up") PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Kempston\\Sinclair P1 Down") PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Kempston\\Sinclair P1 Right") PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_8WAY PORT_PLAYER(1) PORT_NAME("Kempston\\Sinclair P1 Left") - + PORT_START("JOY2") /* Sinclair 2 (keys 1,2,3,4,5) 0xf7fe */ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_8WAY PORT_PLAYER(2) PORT_NAME("Sinclair P2 Left") PORT_CODE(KEYCODE_4_PAD) PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(2) PORT_NAME("Sinclair P2 Right") PORT_CODE(KEYCODE_6_PAD) @@ -223,15 +223,15 @@ FLOPPY_FORMATS_END ROM_START(plusd) ROM_REGION(0x2000, "rom", 0) - + ROM_DEFAULT_BIOS("gdos") - + ROM_SYSTEM_BIOS(0, "gdos", "G+DOS v1a") ROMX_LOAD("plusd_g.rom", 0x0000, 0x2000, CRC(569f7e55) SHA1(6b841dc5797ef7eb219ad455cd1e434ca3b9d30d), ROM_BIOS(0)) - + ROM_SYSTEM_BIOS(1, "unidos", "UNI-DOS v2") ROMX_LOAD("plusd_uni.rom", 0x0000, 0x2000, CRC(60920496) SHA1(399c8c7c8335bc59849a2182c32347603fd0288a), ROM_BIOS(1)) - + ROM_REGION( 0x200, "plds", 0 ) ROM_LOAD( "alice_pal20l8.ic4", 0x000, 0x144, CRC(60135856) SHA1(41273f13a3680b29ba84ae1e85829482c783c55e) ) ROM_END @@ -242,18 +242,18 @@ ROM_END ROM_START(disciple) ROM_REGION(0x2000, "rom", 0) - + ROM_DEFAULT_BIOS("gdos") - + ROM_SYSTEM_BIOS(0, "gdos", "GDOS v3") ROMX_LOAD("disciple_g.rom", 0x0000, 0x2000, CRC(82047489) SHA1(9a75ed4b293f968985be4c9aa893cd88276d1ced), ROM_BIOS(0)) - + ROM_SYSTEM_BIOS(1, "gdos2", "GDOS v2") ROMX_LOAD("disciple_g2.rom", 0x0000, 0x2000, CRC(9d971781) SHA1(a03e67e4ee275a85153843f42269fa980875d551), ROM_BIOS(1)) - + ROM_SYSTEM_BIOS(2, "unidos", "UNI-DOS v2") ROMX_LOAD("disciple_uni.rom", 0x0000, 0x2000, CRC(1fe7f4fa) SHA1(6277abe6358c99ab894795536a1eb9393f25b9b1), ROM_BIOS(2)) - + ROM_REGION( 0x400, "plds", 0 ) ROM_LOAD( "pal20l8.ic8", 0x000, 0x144, CRC(e53b2fcc) SHA1(85ce9634890d41be37cd9e0252698e5350a4c9c9) ) ROM_LOAD( "pal20l8.ic9", 0x200, 0x144, CRC(43ff2e38) SHA1(b872377ea9f91b29a811b0d484699ffe87bdf9fd) ) @@ -268,11 +268,11 @@ void spectrum_plusd_device::device_add_mconfig(machine_config &config) WD1772(config, m_fdc, 8_MHz_XTAL); FLOPPY_CONNECTOR(config, "fdc:0", plusd_floppies, "35dd", spectrum_plusd_device::floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, "fdc:1", plusd_floppies, "35dd", spectrum_plusd_device::floppy_formats).enable_sound(true); - + /* printer port */ CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->busy_handler().set(FUNC(spectrum_plusd_device::busy_w)); - + /* software list */ SOFTWARE_LIST(config, "flop_list").set_original("spectrum_mgt_flop"); } @@ -280,7 +280,7 @@ void spectrum_plusd_device::device_add_mconfig(machine_config &config) void spectrum_disciple_device::device_add_mconfig(machine_config &config) { spectrum_plusd_device::device_add_mconfig(config); - + /* pass-through */ SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr); m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w)); @@ -411,7 +411,7 @@ uint8_t spectrum_plusd_device::iorq_r(offs_t offset) data = m_centronics_busy ? 0x80 : 0x00; break; } - + return data; } @@ -512,7 +512,7 @@ READ_LINE_MEMBER(spectrum_disciple_device::romcs) void spectrum_disciple_device::pre_opcode_fetch(offs_t offset) { m_exp->pre_opcode_fetch(offset); - + if (!machine().side_effects_disabled()) { switch (offset) @@ -559,7 +559,7 @@ uint8_t spectrum_disciple_device::iorq_r(offs_t offset) data = m_joy2->read() | (0xff ^ 0x1f); break; } - + return data; } @@ -606,7 +606,7 @@ void spectrum_disciple_device::iorq_w(offs_t offset, uint8_t data) m_centronics->write_data7(BIT(data, 7)); break; } - + m_exp->iorq_w(offset, data); } @@ -641,7 +641,7 @@ uint8_t spectrum_disciple_device::mreq_r(offs_t offset) } } } - + if (m_exp->romcs()) data &= m_exp->mreq_r(offset); @@ -671,7 +671,7 @@ void spectrum_disciple_device::mreq_w(offs_t offset, uint8_t data) } } } - + if (m_exp->romcs()) m_exp->mreq_w(offset, data); } diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index dee27a04b9d..bbc69da6eb2 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -2,10 +2,10 @@ // copyright-holders:TwistedTom /********************************************************************** - DISCiPLE Multi-purpose Interface - +D Disk and Printer Interface - - (Miles Gordon Technology) + DISCiPLE Multi-purpose Interface + +D Disk and Printer Interface + + (Miles Gordon Technology) **********************************************************************/ @@ -30,7 +30,7 @@ class spectrum_plusd_device: public device_t, public device_spectrum_expansion_i public: // construction/destruction spectrum_plusd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - + DECLARE_FLOPPY_FORMATS(floppy_formats); DECLARE_INPUT_CHANGED_MEMBER(snapshot_button); diff --git a/src/devices/bus/ti99/colorbus/colorbus.cpp b/src/devices/bus/ti99/colorbus/colorbus.cpp index a54b41c9f70..76c0781f3f2 100644 --- a/src/devices/bus/ti99/colorbus/colorbus.cpp +++ b/src/devices/bus/ti99/colorbus/colorbus.cpp @@ -58,7 +58,7 @@ void v9938_colorbus_device::device_start() /*****************************************************************************/ device_v9938_colorbus_interface::device_v9938_colorbus_interface(const machine_config &mconfig, device_t &device) - : device_interface(device, "v9938colorbus"), + : device_interface(device, "v9938colorbus"), m_colorbus(nullptr) { } diff --git a/src/devices/bus/ti99/joyport/joyport.cpp b/src/devices/bus/ti99/joyport/joyport.cpp index 38e3eccbf3a..0505c524ef8 100644 --- a/src/devices/bus/ti99/joyport/joyport.cpp +++ b/src/devices/bus/ti99/joyport/joyport.cpp @@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE_NS(TI99_JOYPORT, bus::ti99::joyport, joyport_device, "ti99_jo namespace bus { namespace ti99 { namespace joyport { device_ti99_joyport_interface::device_ti99_joyport_interface(const machine_config &config, device_t &device) - : device_interface(device, "ti99joyport"), + : device_interface(device, "ti99joyport"), m_joyport(nullptr) { } diff --git a/src/devices/cpu/sparc/sparc.h b/src/devices/cpu/sparc/sparc.h index 67f1b339e0b..36230466649 100644 --- a/src/devices/cpu/sparc/sparc.h +++ b/src/devices/cpu/sparc/sparc.h @@ -334,10 +334,10 @@ enum SPARC_PS, SPARC_FSR, - SPARC_F0, SPARC_F1, SPARC_F2, SPARC_F3, SPARC_F4, SPARC_F5, SPARC_F6, SPARC_F7, - SPARC_F8, SPARC_F9, SPARC_F10, SPARC_F11, SPARC_F12, SPARC_F13, SPARC_F14, SPARC_F15, - SPARC_F16, SPARC_F17, SPARC_F18, SPARC_F19, SPARC_F20, SPARC_F21, SPARC_F22, SPARC_F23, - SPARC_F24, SPARC_F25, SPARC_F26, SPARC_F27, SPARC_F28, SPARC_F29, SPARC_F30, SPARC_F31, + SPARC_F0, SPARC_F1, SPARC_F2, SPARC_F3, SPARC_F4, SPARC_F5, SPARC_F6, SPARC_F7, + SPARC_F8, SPARC_F9, SPARC_F10, SPARC_F11, SPARC_F12, SPARC_F13, SPARC_F14, SPARC_F15, + SPARC_F16, SPARC_F17, SPARC_F18, SPARC_F19, SPARC_F20, SPARC_F21, SPARC_F22, SPARC_F23, + SPARC_F24, SPARC_F25, SPARC_F26, SPARC_F27, SPARC_F28, SPARC_F29, SPARC_F30, SPARC_F31, SPARC_R0, SPARC_R1, SPARC_R2, SPARC_R3, SPARC_R4, SPARC_R5, SPARC_R6, SPARC_R7, SPARC_R8, SPARC_R9, SPARC_R10, SPARC_R11, SPARC_R12, SPARC_R13, SPARC_R14, SPARC_R15, SPARC_R16, SPARC_R17, SPARC_R18, SPARC_R19, SPARC_R20, SPARC_R21, SPARC_R22, SPARC_R23, SPARC_R24, SPARC_R25, SPARC_R26, SPARC_R27, SPARC_R28, SPARC_R29, SPARC_R30, SPARC_R31, diff --git a/src/devices/cpu/sparc/sparcdefs.h b/src/devices/cpu/sparc/sparcdefs.h index 82c48b2bf36..49464a5fc53 100644 --- a/src/devices/cpu/sparc/sparcdefs.h +++ b/src/devices/cpu/sparc/sparcdefs.h @@ -390,95 +390,95 @@ #define SDIVCC (OP3 == OP3_SDIVCC) #define FSR_CEXC_MASK 0x0000001f -#define FSR_CEXC_NXC 0x00000001 -#define FSR_CEXC_DZC 0x00000002 -#define FSR_CEXC_UFC 0x00000004 -#define FSR_CEXC_OFC 0x00000008 -#define FSR_CEXC_NVC 0x00000010 +#define FSR_CEXC_NXC 0x00000001 +#define FSR_CEXC_DZC 0x00000002 +#define FSR_CEXC_UFC 0x00000004 +#define FSR_CEXC_OFC 0x00000008 +#define FSR_CEXC_NVC 0x00000010 -#define FSR_AEXC_SHIFT 5 +#define FSR_AEXC_SHIFT 5 #define FSR_AEXC_MASK 0x000003e0 -#define FSR_AEXC_NXA 0x00000020 -#define FSR_AEXC_DZA 0x00000040 -#define FSR_AEXC_UFA 0x00000080 -#define FSR_AEXC_OFA 0x00000100 -#define FSR_AEXC_NVA 0x00000200 - -#define FSR_FCC_SHIFT 10 -#define FSR_FCC_MASK 0x00000c00 -#define FSR_FCC_EQ 0x00000000 -#define FSR_FCC_LT 0x00000400 -#define FSR_FCC_GT 0x00000800 -#define FSR_FCC_UO 0x00000c00 - -#define FSR_QNE 0x00002000 - -#define FSR_FTT_MASK 0x0001c000 -#define FSR_FTT_NONE 0x00000000 -#define FSR_FTT_IEEE 0x00004000 -#define FSR_FTT_UNFIN 0x00008000 -#define FSR_FTT_UNIMP 0x0000c000 -#define FSR_FTT_SEQ 0x00010000 - -#define FSR_VER 0x00020000 - -#define FSR_NS 0x00400000 - -#define FSR_TEM_SHIFT 23 -#define FSR_TEM_MASK 0x0f800000 -#define FSR_TEM_NXM 0x00800000 -#define FSR_TEM_DZM 0x01000000 -#define FSR_TEM_UFM 0x02000000 -#define FSR_TEM_OFM 0x04000000 -#define FSR_TEM_NVM 0x08000000 - -#define FSR_RD_SHIFT 30 -#define FSR_RD_MASK 0xc0000000 -#define FSR_RD_NEAR 0x00000000 -#define FSR_RD_ZERO 0x40000000 -#define FSR_RD_UP 0x80000000 -#define FSR_RD_DOWN 0xc0000000 - -#define FSR_RESV_MASK 0x30301000 +#define FSR_AEXC_NXA 0x00000020 +#define FSR_AEXC_DZA 0x00000040 +#define FSR_AEXC_UFA 0x00000080 +#define FSR_AEXC_OFA 0x00000100 +#define FSR_AEXC_NVA 0x00000200 + +#define FSR_FCC_SHIFT 10 +#define FSR_FCC_MASK 0x00000c00 +#define FSR_FCC_EQ 0x00000000 +#define FSR_FCC_LT 0x00000400 +#define FSR_FCC_GT 0x00000800 +#define FSR_FCC_UO 0x00000c00 + +#define FSR_QNE 0x00002000 + +#define FSR_FTT_MASK 0x0001c000 +#define FSR_FTT_NONE 0x00000000 +#define FSR_FTT_IEEE 0x00004000 +#define FSR_FTT_UNFIN 0x00008000 +#define FSR_FTT_UNIMP 0x0000c000 +#define FSR_FTT_SEQ 0x00010000 + +#define FSR_VER 0x00020000 + +#define FSR_NS 0x00400000 + +#define FSR_TEM_SHIFT 23 +#define FSR_TEM_MASK 0x0f800000 +#define FSR_TEM_NXM 0x00800000 +#define FSR_TEM_DZM 0x01000000 +#define FSR_TEM_UFM 0x02000000 +#define FSR_TEM_OFM 0x04000000 +#define FSR_TEM_NVM 0x08000000 + +#define FSR_RD_SHIFT 30 +#define FSR_RD_MASK 0xc0000000 +#define FSR_RD_NEAR 0x00000000 +#define FSR_RD_ZERO 0x40000000 +#define FSR_RD_UP 0x80000000 +#define FSR_RD_DOWN 0xc0000000 + +#define FSR_RESV_MASK 0x30301000 // FPop1 -#define FPOP_FMOVS 0x001 -#define FPOP_FNEGS 0x005 -#define FPOP_FABSS 0x009 -#define FPOP_FSQRTS 0x029 -#define FPOP_FSQRTD 0x02a -#define FPOP_FSQRTX 0x02b -#define FPOP_FADDS 0x041 -#define FPOP_FADDD 0x042 -#define FPOP_FADDX 0x043 -#define FPOP_FSUBS 0x045 -#define FPOP_FSUBD 0x046 -#define FPOP_FSUBX 0x047 -#define FPOP_FMULS 0x049 -#define FPOP_FMULD 0x04a -#define FPOP_FMULX 0x04b -#define FPOP_FDIVS 0x04d -#define FPOP_FDIVD 0x04e -#define FPOP_FDIVX 0x04f -#define FPOP_FITOS 0x0c4 -#define FPOP_FDTOS 0x0c6 -#define FPOP_FXTOS 0x0c7 -#define FPOP_FITOD 0x0c8 -#define FPOP_FSTOD 0x0c9 -#define FPOP_FXTOD 0x0cb -#define FPOP_FITOX 0x0cc -#define FPOP_FSTOX 0x0cd -#define FPOP_FDTOX 0x0ce -#define FPOP_FSTOI 0x0d1 -#define FPOP_FDTOI 0x0d2 -#define FPOP_FXTOI 0x0d3 +#define FPOP_FMOVS 0x001 +#define FPOP_FNEGS 0x005 +#define FPOP_FABSS 0x009 +#define FPOP_FSQRTS 0x029 +#define FPOP_FSQRTD 0x02a +#define FPOP_FSQRTX 0x02b +#define FPOP_FADDS 0x041 +#define FPOP_FADDD 0x042 +#define FPOP_FADDX 0x043 +#define FPOP_FSUBS 0x045 +#define FPOP_FSUBD 0x046 +#define FPOP_FSUBX 0x047 +#define FPOP_FMULS 0x049 +#define FPOP_FMULD 0x04a +#define FPOP_FMULX 0x04b +#define FPOP_FDIVS 0x04d +#define FPOP_FDIVD 0x04e +#define FPOP_FDIVX 0x04f +#define FPOP_FITOS 0x0c4 +#define FPOP_FDTOS 0x0c6 +#define FPOP_FXTOS 0x0c7 +#define FPOP_FITOD 0x0c8 +#define FPOP_FSTOD 0x0c9 +#define FPOP_FXTOD 0x0cb +#define FPOP_FITOX 0x0cc +#define FPOP_FSTOX 0x0cd +#define FPOP_FDTOX 0x0ce +#define FPOP_FSTOI 0x0d1 +#define FPOP_FDTOI 0x0d2 +#define FPOP_FXTOI 0x0d3 // FPop2 -#define FPOP_FCMPS 0x051 -#define FPOP_FCMPD 0x052 -#define FPOP_FCMPX 0x053 -#define FPOP_FCMPES 0x055 -#define FPOP_FCMPED 0x056 -#define FPOP_FCMPEX 0x057 +#define FPOP_FCMPS 0x051 +#define FPOP_FCMPD 0x052 +#define FPOP_FCMPX 0x053 +#define FPOP_FCMPES 0x055 +#define FPOP_FCMPED 0x056 +#define FPOP_FCMPEX 0x057 #endif // CPU_SPARC_SPARC_DEFS_H diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp index 8ba1388f879..53a19a70be8 100644 --- a/src/devices/machine/mb8421.cpp +++ b/src/devices/machine/mb8421.cpp @@ -13,7 +13,7 @@ IDT71321 is function compatible, but not pin compatible with MB8421 IDT7130 is 1KB variation of IDT71321 - CY7C131 is similar as IDT7130 + CY7C131 is similar as IDT7130 **********************************************************************/ diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h index 1cf992f50d2..f112f1e1484 100644 --- a/src/devices/machine/mb8421.h +++ b/src/devices/machine/mb8421.h @@ -6,9 +6,9 @@ Fujitsu MB8421/22/31/32-90/-90L/-90LL/-12/-12L/-12LL CMOS 16K-bit (2KB) dual-port SRAM (pinouts : see below) - IDT 71321 16K-bit (2Kx8) dual port SRAM - IDT 7130 8K-bit (1Kx8) dual port SRAM - Cypress CY7C131 8K-bit (1Kx8) dual port SRAM + IDT 71321 16K-bit (2Kx8) dual port SRAM + IDT 7130 8K-bit (1Kx8) dual port SRAM + Cypress CY7C131 8K-bit (1Kx8) dual port SRAM *********************************************************************** _____________ diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 886510ea24f..6d2225fe9fc 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -233,7 +233,7 @@ public: , m_in(*this, "IN") , m_cpu_device(nullptr) , m_last(*this, "m_last", 0) -// , m_supply(*this) +// , m_supply(*this) { auto *nl = dynamic_cast<netlist_mame_device::netlist_mame_t *>(&state()); if (nl != nullptr) diff --git a/src/devices/machine/swtpc8212.cpp b/src/devices/machine/swtpc8212.cpp index db7feb6e037..3625e7a6225 100644 --- a/src/devices/machine/swtpc8212.cpp +++ b/src/devices/machine/swtpc8212.cpp @@ -121,17 +121,17 @@ in mind that it is an ASCII terminal so try an ISO-8859-1 locale, and also that it has no tabs so it needs tab to space translation. swtp|ct8212|southwest technical products ct8212, - cols#82, lines#24, - bel=^G, civis=^E, clear=^L, cnorm=^U, cr=\r, - cub=^\^D%p1%c, cub1=^D, cud=^\^B%p1%c, cud1=^B, - cuf1=^R, cup=^K%p2%{32}%+%c%p1%{32}%+%c, - cuu=^\^A%p1%c, cuu1=^A, dch1=^\^H, dl1=^Z, ed=^V, el=^F, - el1=^\^F, home=^P, hpa=^\^W%p1%{32}%+%c, ich1=^\^X, - il1=^\^Y, ind=^N, - is2=^_^A$<250>^\^R$<50>^^^D^^^T^_^J\040^^^G^^^O^^^Z^]^W^I^R, - kbs=^H, kcub1=^B, kcud1=^N, kcuf1=^F, kcuu1=^P, khome=^A, - ll=^C, mc4=^]^G, mc5=^]^K, nel=\r\n, ri=^O, rmir=, rmso=^^^F, - smir=, smso=^^^V, vpa=^\^G%p1%{32}%+%c, + cols#82, lines#24, + bel=^G, civis=^E, clear=^L, cnorm=^U, cr=\r, + cub=^\^D%p1%c, cub1=^D, cud=^\^B%p1%c, cud1=^B, + cuf1=^R, cup=^K%p2%{32}%+%c%p1%{32}%+%c, + cuu=^\^A%p1%c, cuu1=^A, dch1=^\^H, dl1=^Z, ed=^V, el=^F, + el1=^\^F, home=^P, hpa=^\^W%p1%{32}%+%c, ich1=^\^X, + il1=^\^Y, ind=^N, + is2=^_^A$<250>^\^R$<50>^^^D^^^T^_^J\040^^^G^^^O^^^Z^]^W^I^R, + kbs=^H, kcub1=^B, kcud1=^N, kcuf1=^F, kcuu1=^P, khome=^A, + ll=^C, mc4=^]^G, mc5=^]^K, nel=\r\n, ri=^O, rmir=, rmso=^^^F, + smir=, smso=^^^V, vpa=^\^G%p1%{32}%+%c, ****************************************************************************/ diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp index d2353fd26a5..c0e6de5636f 100644 --- a/src/devices/machine/wd_fdc.cpp +++ b/src/devices/machine/wd_fdc.cpp @@ -2898,7 +2898,7 @@ wd1772_device::wd1772_device(const machine_config &mconfig, const char *tag, dev head_control = false; motor_control = true; ready_hooked = false; - + /* Sam Coupe/+D/Disciple expect a 0xd0 force interrupt command to cause a spin-up. eg. +D issues 2x 0xd0, then waits for index pulses to start, bails out with no disk error if that doesn't happen. Not sure if other chips should do this too? */ diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp index 1240b11852b..142c82349bb 100644 --- a/src/devices/sound/c352.cpp +++ b/src/devices/sound/c352.cpp @@ -23,7 +23,7 @@ //#define VERBOSE 1 #include "logmacro.h" -#define C352_LOG_PCM (0) +#define C352_LOG_PCM (0) #if C352_LOG_PCM #include <map> diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp index a0adfb0d788..8e141206b99 100644 --- a/src/devices/sound/k007232.cpp +++ b/src/devices/sound/k007232.cpp @@ -6,20 +6,20 @@ /* Changelog, Hiromitsu Shioya 02/05/2002 - fixed start address decode timing. (sample loop bug.) + fixed start address decode timing. (sample loop bug.) Changelog, Mish, August 1999: - Removed interface support for different memory regions per channel. - Removed interface support for differing channel volume. + Removed interface support for different memory regions per channel. + Removed interface support for differing channel volume. - Added bankswitching. - Added support for multiple chips. + Added bankswitching. + Added support for multiple chips. - (NB: Should different memory regions per channel be needed, the bankswitching function can set this up). + (NB: Should different memory regions per channel be needed, the bankswitching function can set this up). Chanelog, Nicola, August 1999: - Added Support for the k007232_VOL() macro. - Added external port callback, and functions to set the volume of the channels + Added Support for the k007232_VOL() macro. + Added external port callback, and functions to set the volume of the channels */ @@ -27,8 +27,8 @@ #include "k007232.h" #include "wavwrite.h" -#define K007232_LOG_PCM (0) -#define BASE_SHIFT (12) +#define K007232_LOG_PCM (0) +#define BASE_SHIFT (12) DEFINE_DEVICE_TYPE(K007232, k007232_device, "k007232", "K007232 PCM Controller") diff --git a/src/devices/sound/multipcm.h b/src/devices/sound/multipcm.h index 3f888b8b021..626f4c99670 100644 --- a/src/devices/sound/multipcm.h +++ b/src/devices/sound/multipcm.h @@ -5,7 +5,7 @@ #pragma once -#define MULTIPCM_LOG_SAMPLES 0 +#define MULTIPCM_LOG_SAMPLES 0 #if MULTIPCM_LOG_SAMPLES #include <map> diff --git a/src/devices/video/bt45x.cpp b/src/devices/video/bt45x.cpp index 5f7dc2ae2e3..5b159c5a1c7 100644 --- a/src/devices/video/bt45x.cpp +++ b/src/devices/video/bt45x.cpp @@ -37,7 +37,7 @@ #include "bt45x.h" #define LOG_READS (1U << 0) -#define LOG_WRITES (1U << 1) +#define LOG_WRITES (1U << 1) #define VERBOSE (0) diff --git a/src/devices/video/ppu2c0x_vt.cpp b/src/devices/video/ppu2c0x_vt.cpp index 5e46f84ed0f..c91092d9ec1 100644 --- a/src/devices/video/ppu2c0x_vt.cpp +++ b/src/devices/video/ppu2c0x_vt.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(PPU_VT03, ppu_vt03_device, "ppu_vt03", "VT03 PPU (NTSC)") DEFINE_DEVICE_TYPE(PPU_VT03PAL, ppu_vt03pal_device, "ppu_vt03pal", "VT03 PPU (PAL)") -ppu_vt03_device::ppu_vt03_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +ppu_vt03_device::ppu_vt03_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : ppu2c0x_device(mconfig, type, tag, owner, clock), m_is_pal(false), m_is_50hz(false), diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp index 5230fdff8d1..da628720c3a 100644 --- a/src/devices/video/snes_ppu.cpp +++ b/src/devices/video/snes_ppu.cpp @@ -1611,13 +1611,13 @@ uint8_t snes_ppu_device::read_object( uint16_t address ) { uint8_t n = (address & 0x1f) << 2; return (BIT(m_objects[n + 0].x, 8) << 0) | - (BIT(m_objects[n + 1].x, 8) << 2) | - (BIT(m_objects[n + 2].x, 8) << 4) | - (BIT(m_objects[n + 3].x, 8) << 6) | - (m_objects[n + 0].size << 1) | - (m_objects[n + 1].size << 3) | - (m_objects[n + 2].size << 5) | - (m_objects[n + 3].size << 7); + (BIT(m_objects[n + 1].x, 8) << 2) | + (BIT(m_objects[n + 2].x, 8) << 4) | + (BIT(m_objects[n + 3].x, 8) << 6) | + (m_objects[n + 0].size << 1) | + (m_objects[n + 1].size << 3) | + (m_objects[n + 2].size << 5) | + (m_objects[n + 3].size << 7); } } @@ -1746,7 +1746,7 @@ uint16_t snes_ppu_device::direct_color(uint16_t palette, uint16_t group) void snes_ppu_device::set_current_vert(uint16_t value) { - m_beam.current_vert = value; + m_beam.current_vert = value; } void snes_ppu_device::cache_background() diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h index 31f2b99af64..0906526d6db 100644 --- a/src/devices/video/snes_ppu.h +++ b/src/devices/video/snes_ppu.h @@ -73,7 +73,7 @@ public: m_interlace = 1; m_oam.interlace = 0; } - void set_current_vert(uint16_t value); + void set_current_vert(uint16_t value); protected: /* offset-per-tile modes */ |