From 9ce44eaf8e266dd0eee2d080e62ae3d3750e3a6a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 28 May 2023 04:12:45 +1000 Subject: srcclean in preparation for MAME 0.255 branch --- hash/n64.xml | 4 +- hash/spectrum_cass.xml | 6 +- src/devices/bus/ata/atapicdr.cpp | 4 +- src/devices/bus/ata/gdrom.cpp | 10 +- src/devices/bus/ata/gdrom.h | 2 +- src/devices/bus/nscsi/cd.cpp | 2 +- src/devices/bus/spectrum/neogs.cpp | 2 +- src/devices/cpu/i386/i386.cpp | 22 ++-- src/devices/cpu/m68000/tmp68301.cpp | 2 +- src/devices/cpu/powerpc/ppccom.h | 2 +- src/devices/imagedev/cdromimg.h | 2 +- src/devices/machine/i82371eb_acpi.cpp | 10 +- src/devices/machine/i82371eb_acpi.h | 4 +- src/devices/machine/i82371eb_ide.cpp | 4 +- src/devices/machine/i82371eb_ide.h | 2 +- src/devices/machine/i82371eb_isa.cpp | 10 +- src/devices/machine/i82371eb_isa.h | 4 +- src/devices/machine/i82371eb_usb.cpp | 8 +- src/devices/machine/i82371eb_usb.h | 6 +- src/devices/machine/i82443bx_host.cpp | 10 +- src/devices/machine/i82443bx_host.h | 12 +-- src/devices/machine/mpc106.cpp | 2 +- src/devices/machine/t10mmc.cpp | 2 +- src/devices/machine/tc9223.cpp | 2 +- src/devices/machine/tc9223.h | 15 ++- src/devices/sound/nn71003f.h | 2 +- src/devices/video/zr36110.cpp | 2 +- src/devices/video/zr36110.h | 2 +- src/emu/diimage.cpp | 4 +- src/mame/funworld/funworld.cpp | 12 +-- src/mame/kaypro/kaypro.cpp | 2 +- src/mame/misc/xtom3d.cpp | 6 +- src/mame/nintendo/n64_gateway.cpp | 186 +++++++++++++++++----------------- src/mame/psion/psionhc.cpp | 108 ++++++++++---------- src/mame/shared/xbox_nv2a.cpp | 8 +- src/mame/skeleton/bolsaint.cpp | 4 +- src/mame/yamaha/ympcs30.cpp | 8 +- src/mame/yamaha/ymps400.cpp | 12 +-- 38 files changed, 251 insertions(+), 254 deletions(-) diff --git a/hash/n64.xml b/hash/n64.xml index 9aa24a3b4da..d216f305ab1 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -3227,7 +3227,7 @@ Requires [16KB EEPROM] 200? Marigul @@ -4964,7 +4964,7 @@ Doesn't recognize start button pressed on title screen - diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 2ec156a197f..ed9f1a6b22c 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -67680,7 +67680,7 @@ Side B - Game 1: The Dragonstar Trilogy Part III (Delta 4 Software) - + The Dragonstar Trilogy - Part III (Delta 4) 1984 @@ -99867,7 +99867,7 @@ Lacks game introduction, bad dump or alternate version? - + Merlin (The Guild) 1992 @@ -99878,7 +99878,7 @@ Lacks game introduction, bad dump or alternate version? - + Merlin (Adventure Workshop) 1992 diff --git a/src/devices/bus/ata/atapicdr.cpp b/src/devices/bus/ata/atapicdr.cpp index 5a6741c258a..17f26855090 100644 --- a/src/devices/bus/ata/atapicdr.cpp +++ b/src/devices/bus/ata/atapicdr.cpp @@ -52,7 +52,7 @@ void atapi_cdrom_device::device_add_mconfig(machine_config &config) GDROM(config, "image").set_interface("cdrom"); else CDROM(config, "image").set_interface("cdrom"); - CDDA(config, "cdda").set_cdrom_tag("image"); + CDDA(config, "cdda").set_cdrom_tag("image"); } void atapi_cdrom_device::device_start() @@ -132,7 +132,7 @@ void atapi_fixed_dvdrom_device::device_reset() void atapi_cdrom_device::process_buffer() { - if( m_sequence_counter != m_image->sequence_counter() ) + if( m_sequence_counter != m_image->sequence_counter() ) { m_media_change = true; m_sequence_counter = m_image->sequence_counter(); diff --git a/src/devices/bus/ata/gdrom.cpp b/src/devices/bus/ata/gdrom.cpp index 9d0f5c49dec..fb927b8d55a 100644 --- a/src/devices/bus/ata/gdrom.cpp +++ b/src/devices/bus/ata/gdrom.cpp @@ -245,7 +245,7 @@ void gdrom_device::ExecCommand() // TODO: it's supposed to write a single and a double density TOC request //if (command[1]) - // throw emu_fatalerror("Double density unsupported"); + // throw emu_fatalerror("Double density unsupported"); u16 allocation_length = SCSILengthFromUINT16( &command[ 3 ] ); LOGCMD("READ_TOC 14h %02x %02x %d\n", command[1], command[2], allocation_length @@ -581,7 +581,7 @@ void gdrom_device::ReadData( uint8_t *data, int dataLength ) tstart = m_image->get_track_start(i - 1) + 150; //if ((command[1]&2)>>1) - // tstart = cdrom_file::lba_to_msf(tstart); + // tstart = cdrom_file::lba_to_msf(tstart); data[dptr++] = (tstart>>16) & 0xff; data[dptr++] = (tstart>>8) & 0xff; data[dptr++] = (tstart & 0xff); @@ -599,7 +599,7 @@ void gdrom_device::ReadData( uint8_t *data, int dataLength ) data[dptr++] = 0; const u32 tend = m_image->get_track_start(0xaa) + 150; //if ((command[1]&2)>>1) - // tstart = cdrom_file::lba_to_msf(tstart); + // tstart = cdrom_file::lba_to_msf(tstart); data[dptr++] = m_image->get_adr_control(0xaa) | 1; data[dptr++] = (tend>>16) & 0xff; data[dptr++] = (tend>>8) & 0xff; @@ -863,8 +863,8 @@ void gdrom_device::signature() //bool gdrom_device::set_features() //{ // TODO: DSC, likely tested by Check-GD programs -// m_status |= IDE_STATUS_DSC; -// return atapi_cdrom_device::set_features(); +// m_status |= IDE_STATUS_DSC; +// return atapi_cdrom_device::set_features(); //} WRITE_LINE_MEMBER(gdrom_device::cdda_end_mark_cb) diff --git a/src/devices/bus/ata/gdrom.h b/src/devices/bus/ata/gdrom.h index 7467d1dff20..7e6c714d993 100644 --- a/src/devices/bus/ata/gdrom.h +++ b/src/devices/bus/ata/gdrom.h @@ -32,7 +32,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; -// virtual bool set_features() override; +// virtual bool set_features() override; // TODO: how GDROM determines ready flag? // cfr. dc.xml [GDROM READY] for a list of SW that wants this on. virtual bool is_ready() override { return true; } diff --git a/src/devices/bus/nscsi/cd.cpp b/src/devices/bus/nscsi/cd.cpp index 21a8658f3fb..c38f9906e0c 100644 --- a/src/devices/bus/nscsi/cd.cpp +++ b/src/devices/bus/nscsi/cd.cpp @@ -193,7 +193,7 @@ void nscsi_cdrom_device::scsi_command() int blocks; // check for media change - if( sequence_counter != image->sequence_counter() && (scsi_cmdbuf[0] != SC_INQUIRY)) + if( sequence_counter != image->sequence_counter() && (scsi_cmdbuf[0] != SC_INQUIRY)) { // clear media change condition cur_sector = -1; diff --git a/src/devices/bus/spectrum/neogs.cpp b/src/devices/bus/spectrum/neogs.cpp index b3028dbc4ef..871a192b7b0 100644 --- a/src/devices/bus/spectrum/neogs.cpp +++ b/src/devices/bus/spectrum/neogs.cpp @@ -52,7 +52,7 @@ namespace bus::spectrum::zxbus { namespace { -#define TIMINGS_PERFECT 1 +#define TIMINGS_PERFECT 1 ROM_START( neogs ) ROM_REGION(0x80000, "maincpu", 0) diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index e69aae44994..a082d979ade 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/src/devices/cpu/i386/i386.cpp @@ -28,17 +28,17 @@ #include "debug/debugcpu.h" #include "debug/express.h" -#define LOG_MSR (1U << 1) -#define LOG_INVALID_OPCODE (1U << 2) -#define LOG_LIMIT_CHECK (1U << 3) -#define LOG_UNEMULATED (1U << 4) -#define LOG_PM_EVENTS (1U << 5) -#define LOG_PM_FAULT_GP (1U << 6) -#define LOG_PM_FAULT_SS (1U << 7) -#define LOG_PM_FAULT_NP (1U << 8) -#define LOG_PM_FAULT_TS (1U << 9) -#define LOG_PM_FAULT_DF (1U << 10) -#define LOG_PM_FAULT_UD (1U << 11) +#define LOG_MSR (1U << 1) +#define LOG_INVALID_OPCODE (1U << 2) +#define LOG_LIMIT_CHECK (1U << 3) +#define LOG_UNEMULATED (1U << 4) +#define LOG_PM_EVENTS (1U << 5) +#define LOG_PM_FAULT_GP (1U << 6) +#define LOG_PM_FAULT_SS (1U << 7) +#define LOG_PM_FAULT_NP (1U << 8) +#define LOG_PM_FAULT_TS (1U << 9) +#define LOG_PM_FAULT_DF (1U << 10) +#define LOG_PM_FAULT_UD (1U << 11) //#define VERBOSE (LOG_PM_FAULT_GP) #include "logmacro.h" diff --git a/src/devices/cpu/m68000/tmp68301.cpp b/src/devices/cpu/m68000/tmp68301.cpp index 9f6c92d7b45..f85697e4440 100644 --- a/src/devices/cpu/m68000/tmp68301.cpp +++ b/src/devices/cpu/m68000/tmp68301.cpp @@ -483,7 +483,7 @@ void tmp68301_device::iisr_w(offs_t, u16 data, u16 mem_mask) s = s + ' ' + interrupt_slot_names[i]; if(s.empty()) s = " (none)"; - // logerror("interrupt in service%s\n", s); + // logerror("interrupt in service%s\n", s); } void tmp68301_device::ivnr_w(u8 data) diff --git a/src/devices/cpu/powerpc/ppccom.h b/src/devices/cpu/powerpc/ppccom.h index e92143e8fa7..00852c48b57 100644 --- a/src/devices/cpu/powerpc/ppccom.h +++ b/src/devices/cpu/powerpc/ppccom.h @@ -64,7 +64,7 @@ #define PPCCAP_MFIOC 0x40 /* TRUE if we have memory-forced I/O controller interface accesses */ #define PPCCAP_601BAT 0x80 /* TRUE if we're doing 601-style BATs (unified I/D, different bit layout) */ #define PPCCAP_604_MMU 0x100 /* TRUE if we have 604-class MMU features */ -#define PPCCAP_750_TLB 0x200 /* TRUE if we have the extended 740/750 series TLB */ +#define PPCCAP_750_TLB 0x200 /* TRUE if we have the extended 740/750 series TLB */ /* exception types */ enum diff --git a/src/devices/imagedev/cdromimg.h b/src/devices/imagedev/cdromimg.h index d06ba80de51..6e222703672 100644 --- a/src/devices/imagedev/cdromimg.h +++ b/src/devices/imagedev/cdromimg.h @@ -82,7 +82,7 @@ protected: // device_image_interface implementation virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } - void setup_current_preset_image(); + void setup_current_preset_image(); bool m_gd_compat; bool m_dvd_compat; diff --git a/src/devices/machine/i82371eb_acpi.cpp b/src/devices/machine/i82371eb_acpi.cpp index 2d5255ec604..5a6fe84af00 100644 --- a/src/devices/machine/i82371eb_acpi.cpp +++ b/src/devices/machine/i82371eb_acpi.cpp @@ -4,8 +4,8 @@ PIIX4E ACPI interface - TODO: - - PIIX4 / PIIX4M dispatches + TODO: + - PIIX4 / PIIX4M dispatches **************************************************************************************************/ @@ -66,7 +66,7 @@ void i82371eb_acpi_device::io_map(address_map &map) void i82371eb_acpi_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) { -// printf("%08llx %08llx %08llx %04llx %04llx %04llx\n", memory_window_start, memory_window_end, memory_offset ,io_window_start, io_window_end, io_offset); +// printf("%08llx %08llx %08llx %04llx %04llx %04llx\n", memory_window_start, memory_window_end, memory_offset ,io_window_start, io_window_end, io_offset); if (io_offset != 0) throw emu_fatalerror("I82371EB_ACPI io_offset != 0 (%04llx)", io_offset); @@ -109,7 +109,7 @@ void i82371eb_acpi_device::device_start() void i82371eb_acpi_device::device_reset() { pci_device::device_reset(); - + command = 0x0000; status = 0x0280; m_pmiose = false; @@ -151,7 +151,7 @@ void i82371eb_acpi_device::devresa_w(offs_t offset, u32 data, u32 mem_mask) { COMBINE_DATA(&m_devresa); LOGIO("devresa w %08x\n", m_devresa); -// remap_cb(); +// remap_cb(); } u32 i82371eb_acpi_device::smbba_r() diff --git a/src/devices/machine/i82371eb_acpi.h b/src/devices/machine/i82371eb_acpi.h index e3e77a576c0..0cb3f7fb315 100644 --- a/src/devices/machine/i82371eb_acpi.h +++ b/src/devices/machine/i82371eb_acpi.h @@ -10,7 +10,7 @@ #include "lpc-acpi.h" #include "pci-smbus.h" -class i82371eb_acpi_device : public pci_device +class i82371eb_acpi_device : public pci_device { public: i82371eb_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -20,7 +20,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; -// virtual void reset_all_mappings() override; +// virtual void reset_all_mappings() override; virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; diff --git a/src/devices/machine/i82371eb_ide.cpp b/src/devices/machine/i82371eb_ide.cpp index d3f78fd238b..f938a94e884 100644 --- a/src/devices/machine/i82371eb_ide.cpp +++ b/src/devices/machine/i82371eb_ide.cpp @@ -4,8 +4,8 @@ PIIX4E IDE interface - TODO: - - i82371ab PIIX4 / i82371mb PIIX4M dispatches + TODO: + - i82371ab PIIX4 / i82371mb PIIX4M dispatches **************************************************************************************************/ diff --git a/src/devices/machine/i82371eb_ide.h b/src/devices/machine/i82371eb_ide.h index 08d627e5c74..66f08e3330e 100644 --- a/src/devices/machine/i82371eb_ide.h +++ b/src/devices/machine/i82371eb_ide.h @@ -8,7 +8,7 @@ #include "machine/i82371sb.h" -class i82371eb_ide_device : public i82371sb_ide_device +class i82371eb_ide_device : public i82371sb_ide_device { public: template diff --git a/src/devices/machine/i82371eb_isa.cpp b/src/devices/machine/i82371eb_isa.cpp index a265112c48b..bb7473a0af4 100644 --- a/src/devices/machine/i82371eb_isa.cpp +++ b/src/devices/machine/i82371eb_isa.cpp @@ -4,9 +4,9 @@ PIIX4E ISA interface - TODO: - - i82371ab PIIX4 / i82371mb PIIX4M dispatches - - pinpoint actual differences wrt i82371sb (definitely EISA, then ...?) + TODO: + - i82371ab PIIX4 / i82371mb PIIX4M dispatches + - pinpoint actual differences wrt i82371sb (definitely EISA, then ...?) **************************************************************************************************/ @@ -43,7 +43,7 @@ i82371eb_isa_device::i82371eb_isa_device(const machine_config &mconfig, const ch void i82371eb_isa_device::config_map(address_map &map) { i82371sb_isa_device::config_map(map); -// map(0x90, 0x91) PDMACFG -// map(0xb0, 0xb0) GENCFG +// map(0x90, 0x91) PDMACFG +// map(0xb0, 0xb0) GENCFG } diff --git a/src/devices/machine/i82371eb_isa.h b/src/devices/machine/i82371eb_isa.h index e25494388eb..56b9412051b 100644 --- a/src/devices/machine/i82371eb_isa.h +++ b/src/devices/machine/i82371eb_isa.h @@ -8,7 +8,7 @@ #include "machine/i82371sb.h" -class i82371eb_isa_device : public i82371sb_isa_device +class i82371eb_isa_device : public i82371sb_isa_device { public: template @@ -17,7 +17,7 @@ public: { set_cpu_tag(std::forward(cpu_tag)); } - + i82371eb_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); private: diff --git a/src/devices/machine/i82371eb_usb.cpp b/src/devices/machine/i82371eb_usb.cpp index 66fbb2712fa..4a3a74caadd 100644 --- a/src/devices/machine/i82371eb_usb.cpp +++ b/src/devices/machine/i82371eb_usb.cpp @@ -4,8 +4,8 @@ PIIX4E USB interface - TODO: - - Actual USB ports; + TODO: + - Actual USB ports; **************************************************************************************************/ @@ -57,7 +57,7 @@ void i82371eb_usb_device::io_map(address_map &map) void i82371eb_usb_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) { -// io_space->install_device(0, 0x03ff, *this, &i82371eb_usb_device::io_map); +// io_space->install_device(0, 0x03ff, *this, &i82371eb_usb_device::io_map); } void i82371eb_usb_device::device_start() @@ -75,7 +75,7 @@ void i82371eb_usb_device::device_start() void i82371eb_usb_device::device_reset() { pci_device::device_reset(); - + command = 0x0000; status = 0x0280; } diff --git a/src/devices/machine/i82371eb_usb.h b/src/devices/machine/i82371eb_usb.h index 1eb27003672..ea27406d93b 100644 --- a/src/devices/machine/i82371eb_usb.h +++ b/src/devices/machine/i82371eb_usb.h @@ -8,7 +8,7 @@ #include "pci.h" -class i82371eb_usb_device : public pci_device +class i82371eb_usb_device : public pci_device { public: i82371eb_usb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -18,7 +18,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; -// virtual void reset_all_mappings() override; +// virtual void reset_all_mappings() override; virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; @@ -26,7 +26,7 @@ protected: virtual void config_map(address_map &map) override; void io_map(address_map &map); - + private: u8 unmap_log_r(offs_t offset); void unmap_log_w(offs_t offset, u8 data); diff --git a/src/devices/machine/i82443bx_host.cpp b/src/devices/machine/i82443bx_host.cpp index ff7114a8a5a..96b228993d2 100644 --- a/src/devices/machine/i82443bx_host.cpp +++ b/src/devices/machine/i82443bx_host.cpp @@ -4,8 +4,8 @@ Intel 440BX 82443BX Host section - TODO: - - better subclassing leap, we currently use i82339hx base for convenience + TODO: + - better subclassing leap, we currently use i82339hx base for convenience **************************************************************************************************/ @@ -44,7 +44,7 @@ void i82443bx_host_device::config_map(address_map &map) map(0x34, 0x34).r(FUNC(i82443bx_host_device::capptr_r)); -// map(0x50, 0x53).lr32(NAME([this] () { return machine().rand(); })); +// map(0x50, 0x53).lr32(NAME([this] () { return machine().rand(); })); // TODO: no DRT, moved as DRTC / DWTC in dword format to $e0/$e8 map(0x68, 0x68).rw(FUNC(i82443bx_host_device::fdhc_r), FUNC(i82443bx_host_device::fdhc_w)); @@ -65,7 +65,7 @@ void i82443bx_host_device::device_start() // TODO: size add_map(8*1024*1024, M_MEM, FUNC(i82443bx_host_device::apbase_map)); - + save_item(NAME(m_fdhc)); save_pointer(NAME(m_bspad), 8); } @@ -131,7 +131,7 @@ DEFINE_DEVICE_TYPE(I82443BX_BRIDGE, i82443bx_bridge_device, "i82443bx_bridge", " i82443bx_bridge_device::i82443bx_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_bridge_device(mconfig, I82443BX_BRIDGE, tag, owner, clock) -// , m_vga(*this, finder_base::DUMMY_TAG) +// , m_vga(*this, finder_base::DUMMY_TAG) { set_ids_bridge(0x80867191, 0x00); } diff --git a/src/devices/machine/i82443bx_host.h b/src/devices/machine/i82443bx_host.h index 94edc0488e8..a2a1716de27 100644 --- a/src/devices/machine/i82443bx_host.h +++ b/src/devices/machine/i82443bx_host.h @@ -46,14 +46,14 @@ class i82443bx_bridge_device : public pci_bridge_device { public: /*template sis630_bridge_device( - const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, - T &&gui_tag + const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, + T &&gui_tag ) : sis630_bridge_device(mconfig, tag, owner, clock) { - // either 0001 or 6001 as device ID - set_ids_bridge(0x10396001, 0x00); - //set_multifunction_device(true); - //m_vga.set_tag(std::forward(gui_tag)); + // either 0001 or 6001 as device ID + set_ids_bridge(0x10396001, 0x00); + //set_multifunction_device(true); + //m_vga.set_tag(std::forward(gui_tag)); }*/ i82443bx_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/machine/mpc106.cpp b/src/devices/machine/mpc106.cpp index 61bcfe3cba3..f3c1045cfa0 100755 --- a/src/devices/machine/mpc106.cpp +++ b/src/devices/machine/mpc106.cpp @@ -21,7 +21,7 @@ enum AS_PCI_IO = 2 }; -constexpr u32 PICR1_LE_MODE = 0x00000020; // Host CPU is little-endian if set, big-endian if clear +constexpr u32 PICR1_LE_MODE = 0x00000020; // Host CPU is little-endian if set, big-endian if clear DEFINE_DEVICE_TYPE(MPC106, mpc106_host_device, "mpc106", "Motorola MPC106 PCI Bridge/Memory Controller") diff --git a/src/devices/machine/t10mmc.cpp b/src/devices/machine/t10mmc.cpp index 18e995cf8fd..7af508ff70d 100644 --- a/src/devices/machine/t10mmc.cpp +++ b/src/devices/machine/t10mmc.cpp @@ -866,7 +866,7 @@ void t10mmc::ReadData( uint8_t *data, int dataLength ) case T10SPC_CMD_MODE_SENSE_6: case T10SPC_CMD_MODE_SENSE_10: - // m_device->logerror("T10MMC: MODE SENSE page code = %x, PC = %x\n", command[2] & 0x3f, (command[2]&0xc0)>>6); + // m_device->logerror("T10MMC: MODE SENSE page code = %x, PC = %x\n", command[2] & 0x3f, (command[2]&0xc0)>>6); memset(data, 0, SCSILengthFromUINT16( &command[ 7 ] )); diff --git a/src/devices/machine/tc9223.cpp b/src/devices/machine/tc9223.cpp index 77e6ba1ffa5..b13859cfbad 100644 --- a/src/devices/machine/tc9223.cpp +++ b/src/devices/machine/tc9223.cpp @@ -20,7 +20,7 @@ void tc9223_device::device_start() save_item(NAME(m_shift)); save_item(NAME(m_stb)); save_item(NAME(m_clk)); - save_item(NAME(m_dat)); + save_item(NAME(m_dat)); } void tc9223_device::device_reset() diff --git a/src/devices/machine/tc9223.h b/src/devices/machine/tc9223.h index bede4fdf280..bac0d07d691 100644 --- a/src/devices/machine/tc9223.h +++ b/src/devices/machine/tc9223.h @@ -2,10 +2,8 @@ // copyright-holders:Olivier Galibert // TC9223P/TC9223F PLL-based frequency synthesizer - - -#ifndef DEVICES_MACHINE_TC9223_H -#define DEVICES_MACHINE_TC9223_H +#ifndef MAME_MACHINE_TC9223_H +#define MAME_MACHINE_TC9223_H #pragma once @@ -19,15 +17,14 @@ public: void clk_w(int state); protected: - void device_start() override; - void device_reset() override; + virtual void device_start() override; + virtual void device_reset() override; private: u16 m_shift; - int m_stb, m_clk, m_dat; + u8 m_stb, m_clk, m_dat; }; DECLARE_DEVICE_TYPE(TC9223, tc9223_device) -#endif - +#endif // MAME_MACHINE_TC9223_H diff --git a/src/devices/sound/nn71003f.h b/src/devices/sound/nn71003f.h index d2c8b860fa1..870125e723e 100644 --- a/src/devices/sound/nn71003f.h +++ b/src/devices/sound/nn71003f.h @@ -25,7 +25,7 @@ public: void sclk_w(int state); void mosi_w(int state); auto miso_cb() { return m_miso.bind(); } - + protected: virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/video/zr36110.cpp b/src/devices/video/zr36110.cpp index 745ee96a79a..abe4d5661a8 100644 --- a/src/devices/video/zr36110.cpp +++ b/src/devices/video/zr36110.cpp @@ -258,7 +258,7 @@ void zr36110_device::setupx_w(u16 data) void zr36110_device::cmd8_w(u8 data) { - // LOG("cmd_w %02x\n", data); + // LOG("cmd_w %02x\n", data); if(m_cmd_phase) { m_cmd |= data; diff --git a/src/devices/video/zr36110.h b/src/devices/video/zr36110.h index 9785da7f656..0f96e5dd3d1 100644 --- a/src/devices/video/zr36110.h +++ b/src/devices/video/zr36110.h @@ -71,7 +71,7 @@ private: S_DNEXT = 0x7, S_END = 0x8 }; - + devcb_write_line m_drq_w; devcb_write_line m_sp_frm_w[2]; devcb_write_line m_sp_dat_w[2]; diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index c7fb8706228..e6e763ce923 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -149,7 +149,7 @@ void device_image_interface::check_preset_images() set_image_tag(); set_user_loadable(false); } - } + } } //------------------------------------------------- @@ -238,7 +238,7 @@ void device_image_interface::switch_preset_image(int id) } id--; } - + return; } diff --git a/src/mame/funworld/funworld.cpp b/src/mame/funworld/funworld.cpp index 5537e3f5b3d..8b140dd0502 100644 --- a/src/mame/funworld/funworld.cpp +++ b/src/mame/funworld/funworld.cpp @@ -6572,7 +6572,7 @@ ROM_END /* Jolly Joker (Otti Karl logo) Original Impera program. - + Both sets have graphics ROMs data interleaved inside the second half of a 16bit 27C210 EPROM. The second set has full garbage in the first half. @@ -7095,7 +7095,7 @@ ROM_END Mega Card (MC3). Ver. 0053. Fun World, 1992. - + Poker game with encrypted CPU: F - 10/03/1992. */ @@ -7643,8 +7643,8 @@ ROM_START( novoplaya ) ROM_LOAD( "np4-ch2_9250.bin", 0x0000, 0x8000, CRC(7223471c) SHA1(785c6af6cf7e06978bc178a5c1c6b21f9db58a88) ) ROM_LOAD( "np4-ch1_9250.bin", 0x8000, 0x8000, CRC(c57bac23) SHA1(5b329ece7a0682b8ef5f9a13abb0312f7c885339) ) -// ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM -// ROM_LOAD( "novoplaya_nvram.bin", 0x0000, 0x0800, CRC(92019972) SHA1(e6d1e231cd2ce27e718ed9482dbe9ddc8612eb67) ) +// ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM +// ROM_LOAD( "novoplaya_nvram.bin", 0x0000, 0x0800, CRC(92019972) SHA1(e6d1e231cd2ce27e718ed9482dbe9ddc8612eb67) ) ROM_REGION( 0x0200, "proms", 0 ) // PLD addresses the 2nd half ROM_LOAD( "n82s147an.bin", 0x0000, 0x0200, CRC(8992aa4d) SHA1(5a0649bff66e7cab1bcbadcdfc74c77a747cc58f) ) @@ -7664,8 +7664,8 @@ ROM_START( novoplayb ) ROM_REGION( 0x0800, "ds1220", 0 ) // Dallas DS1220 to analize. ROM_LOAD( "ds1220.bin", 0x0000, 0x0800, CRC(f6c65329) SHA1(b64ca34661b9690aa9b69a20a7f6683954bbe76a) ) -// ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM -// ROM_LOAD( "novoplayb_nvram.bin", 0x0000, 0x0800, CRC(92019972) SHA1(e6d1e231cd2ce27e718ed9482dbe9ddc8612eb67) ) +// ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM +// ROM_LOAD( "novoplayb_nvram.bin", 0x0000, 0x0800, CRC(92019972) SHA1(e6d1e231cd2ce27e718ed9482dbe9ddc8612eb67) ) ROM_REGION( 0x0200, "proms", 0 ) // PLD addresses the 2nd half ROM_LOAD( "am27s29.bin", 0x0000, 0x0200, CRC(8992aa4d) SHA1(5a0649bff66e7cab1bcbadcdfc74c77a747cc58f) ) diff --git a/src/mame/kaypro/kaypro.cpp b/src/mame/kaypro/kaypro.cpp index c68a599cd79..08343833f7a 100644 --- a/src/mame/kaypro/kaypro.cpp +++ b/src/mame/kaypro/kaypro.cpp @@ -121,7 +121,7 @@ void kaypro84_state::kaypro484_io(address_map &map) { kaypro10_io(map); map(0x20, 0x23).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write)); - map(0x24, 0x24).mirror(3).rw(FUNC(kaypro84_state::rtc_r), FUNC(kaypro84_state::rtc_w)); + map(0x24, 0x24).mirror(3).rw(FUNC(kaypro84_state::rtc_r), FUNC(kaypro84_state::rtc_w)); } diff --git a/src/mame/misc/xtom3d.cpp b/src/mame/misc/xtom3d.cpp index d91e6325728..5a9b5729626 100644 --- a/src/mame/misc/xtom3d.cpp +++ b/src/mame/misc/xtom3d.cpp @@ -319,7 +319,7 @@ private: // DECLARE_WRITE_LINE_MEMBER(vblank_assert); static void romdisk_config(device_t *device); -// static void cdrom_config(device_t *device); +// static void cdrom_config(device_t *device); }; @@ -370,7 +370,7 @@ void xtom3d_state::xtom3d(machine_config &config) ide.irq_sec().set("pci:07.0", FUNC(i82371eb_isa_device::pc_mirq0_w)); ide.subdevice("ide1")->slot(0).set_default_option("cdrom"); -// ide.subdevice("ide1")->slot(0).set_fixed(true); +// ide.subdevice("ide1")->slot(0).set_fixed(true); ide.subdevice("ide2")->slot(0).set_default_option(nullptr); @@ -426,7 +426,7 @@ ROM_END // provided dump is half size and definitely don't seem sane, // just assume they didn't change that part -// ROM_LOAD( "bios.u22", 0x000000, 0x010000, BAD_DUMP CRC(574bb327) SHA1(c24484e9b304b9d570c5ead6be768f563d5c389f) ) +// ROM_LOAD( "bios.u22", 0x000000, 0x010000, BAD_DUMP CRC(574bb327) SHA1(c24484e9b304b9d570c5ead6be768f563d5c389f) ) #define PUMPITUP_BIOS \ ROM_REGION32_LE(0x20000, "pci:07.0", 0) \ diff --git a/src/mame/nintendo/n64_gateway.cpp b/src/mame/nintendo/n64_gateway.cpp index 6e18f7f384c..8eb6ab3369c 100644 --- a/src/mame/nintendo/n64_gateway.cpp +++ b/src/mame/nintendo/n64_gateway.cpp @@ -4,46 +4,46 @@ Nintendo Gateway 64 LodgeNet was a pay-per-view system that allowed television, movie and video - game rentals on hotels starting in 1993. They entered an agreement with - Nintendo to allow the rental of their games on airplanes and hotels for a - moderate fee. - - The LodgeNet 64 system was exclusively used in hotels, and consisted of a - set-top box with a customized N64 system inside. You could choose one of - several games via a TV-driven menu, which would then be downloaded to your - room's system, and you would be charged a fee for one hour of playtime. - - The games were different from their retail counterparts; Games had to have - their multiplayer modes, accessories and game save support removed, plus have - additional support for the system's "halt" functions, so they would be allowed - on the system. The game controllers were custom, with additional buttons for - use with their rental system and a reset button, and did not allow the use of - Rumble Paks or Memory Paks. While the hardware allowed temporary save files, - these would be deleted from the system with a special utility before a new game - was loaded. These files were stored in encrypted format in the LodgeNet - servers, and were decrypted after being downloaded to the system. An extra file - with additional info about the game, its encryption code, and EEPROM settings - was also present. - - While the development info released mentions a requirement for PAL versions of - the games, none are currently known to exist. - - 38 Nintendo 64 titles were made available on the service, and 31 are currently - dumped. The following games have not been found: - - - Extreme-G - - Forsaken 64 - - Iggy's Reckin' Balls - - Milo's Astro Lanes - - Namco Museum 64 - - San Francisco Rush: Extreme Racing - - Turok 2: Seeds of Evil - - These games will function, but the actual LodgeNet system is not emulated, - so the extra controller buttons and other system functions are not - implemented. - - The existing roms are decrypted, and should be considered bad dumps. + game rentals on hotels starting in 1993. They entered an agreement with + Nintendo to allow the rental of their games on airplanes and hotels for a + moderate fee. + + The LodgeNet 64 system was exclusively used in hotels, and consisted of a + set-top box with a customized N64 system inside. You could choose one of + several games via a TV-driven menu, which would then be downloaded to your + room's system, and you would be charged a fee for one hour of playtime. + + The games were different from their retail counterparts; Games had to have + their multiplayer modes, accessories and game save support removed, plus have + additional support for the system's "halt" functions, so they would be allowed + on the system. The game controllers were custom, with additional buttons for + use with their rental system and a reset button, and did not allow the use of + Rumble Paks or Memory Paks. While the hardware allowed temporary save files, + these would be deleted from the system with a special utility before a new game + was loaded. These files were stored in encrypted format in the LodgeNet + servers, and were decrypted after being downloaded to the system. An extra file + with additional info about the game, its encryption code, and EEPROM settings + was also present. + + While the development info released mentions a requirement for PAL versions of + the games, none are currently known to exist. + + 38 Nintendo 64 titles were made available on the service, and 31 are currently + dumped. The following games have not been found: + + - Extreme-G + - Forsaken 64 + - Iggy's Reckin' Balls + - Milo's Astro Lanes + - Namco Museum 64 + - San Francisco Rush: Extreme Racing + - Turok 2: Seeds of Evil + + These games will function, but the actual LodgeNet system is not emulated, + so the extra controller buttons and other system functions are not + implemented. + + The existing roms are decrypted, and should be considered bad dumps. TODO: - Set-top box part; @@ -73,12 +73,12 @@ public: n64_state(mconfig, type, tag) { } - void n64_lodgenet_map(address_map &map); - void n64_lodgenet(machine_config &config); + void n64_lodgenet_map(address_map &map); + void n64_lodgenet(machine_config &config); private: void n64_map(address_map &map); - DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); + DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); void rsp_imem_map(address_map &map); void rsp_dmem_map(address_map &map); @@ -104,7 +104,7 @@ void n64_gateway_state::n64_lodgenet_map(address_map &map) map(0x1fc00000, 0x1fc007bf).rom().region("user1", 0); // PIF ROM map(0x1fc007c0, 0x1fc007ff).rw("rcp", FUNC(n64_periphs::pif_ram_r), FUNC(n64_periphs::pif_ram_w)); - // map(0x0ff70000, 0x0ff70003) Host HALT control + // map(0x0ff70000, 0x0ff70003) Host HALT control } void n64_gateway_state::rsp_imem_map(address_map &map) @@ -124,35 +124,35 @@ static INPUT_PORTS_START( n64_lodgenet ) PORT_CONFNAME(0x0003, 0x0001, "Controller Port 0 Device") PORT_CONFSETTING(0x00, "None") PORT_CONFSETTING(0x01, "Joypad") -// PORT_CONFSETTING(0x02, "Mouse") - PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) -// PORT_CONFNAME(0x000C, 0x0000, "Controller Port 1 Device") -// PORT_CONFSETTING(0x00, "None") -// PORT_CONFSETTING(0x04, "Joypad") -// PORT_CONFSETTING(0x08, "Mouse") -// PORT_CONFNAME(0x0030, 0x0000, "Controller Port 2 Device") -// PORT_CONFSETTING(0x00, "None") -// PORT_CONFSETTING(0x10, "Joypad") -// PORT_CONFSETTING(0x20, "Mouse") -// PORT_CONFNAME(0x00C0, 0x0000, "Controller Port 3 Device") -// PORT_CONFSETTING(0x00, "None") -// PORT_CONFSETTING(0x40, "Joypad") -// PORT_CONFSETTING(0x80, "Mouse") - - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) - -// PORT_CONFNAME(0x0100, 0x0000, "Disk Drive") -// PORT_CONFSETTING(0x0000, "Retail") -// PORT_CONFSETTING(0x0100, "Development") +// PORT_CONFSETTING(0x02, "Mouse") + PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) +// PORT_CONFNAME(0x000C, 0x0000, "Controller Port 1 Device") +// PORT_CONFSETTING(0x00, "None") +// PORT_CONFSETTING(0x04, "Joypad") +// PORT_CONFSETTING(0x08, "Mouse") +// PORT_CONFNAME(0x0030, 0x0000, "Controller Port 2 Device") +// PORT_CONFSETTING(0x00, "None") +// PORT_CONFSETTING(0x10, "Joypad") +// PORT_CONFSETTING(0x20, "Mouse") +// PORT_CONFNAME(0x00C0, 0x0000, "Controller Port 3 Device") +// PORT_CONFSETTING(0x00, "None") +// PORT_CONFSETTING(0x40, "Joypad") +// PORT_CONFSETTING(0x80, "Mouse") + + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) + +// PORT_CONFNAME(0x0100, 0x0000, "Disk Drive") +// PORT_CONFSETTING(0x0000, "Retail") +// PORT_CONFSETTING(0x0100, "Development") // - PORT_CONFNAME(0xC000, 0x8000, "EEPROM Size") - PORT_CONFSETTING(0x0000, "None") - PORT_CONFSETTING(0x8000, "4KB") - PORT_CONFSETTING(0xC000, "16KB") + PORT_CONFNAME(0xC000, 0x8000, "EEPROM Size") + PORT_CONFSETTING(0x0000, "None") + PORT_CONFSETTING(0x8000, "4KB") + PORT_CONFSETTING(0xC000, "16KB") //Player 1 - // TODO: extra buttons + // TODO: extra buttons PORT_START("P1") PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Button A / Left Click") PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Button B / Right Click") @@ -177,63 +177,63 @@ static INPUT_PORTS_START( n64_lodgenet ) PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) PORT_REVERSE PORT_START("P1_MOUSE_X") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P1_MOUSE_Y") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) //Player 2 PORT_START("P2") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P2_ANALOG_X") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P2_ANALOG_Y") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P2_MOUSE_X") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P2_MOUSE_Y") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) //Player 3 PORT_START("P3") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P3_ANALOG_X") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P3_ANALOG_Y") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P3_MOUSE_X") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P3_MOUSE_Y") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) //Player 4 PORT_START("P4") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P4_ANALOG_X") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P4_ANALOG_Y") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P4_MOUSE_X") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("P4_MOUSE_Y") - PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("RESET") PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) - // no reset button available -// PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Warm Reset") PORT_CODE(KEYCODE_3) + // no reset button available +// PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Warm Reset") PORT_CODE(KEYCODE_3) INPUT_PORTS_END @@ -319,8 +319,8 @@ void n64_gateway_state::n64_lodgenet(machine_config &config) //m_vr4300->set_icache_size(16384); //m_vr4300->set_dcache_size(8192); //m_vr4300->set_system_clock(62500000); - m_vr4300->set_addrmap(AS_PROGRAM, &n64_gateway_state::n64_lodgenet_map); -// m_vr4300->set_vblank_int("screen", FUNC(n64_console_state::n64_reset_poll)); + m_vr4300->set_addrmap(AS_PROGRAM, &n64_gateway_state::n64_lodgenet_map); +// m_vr4300->set_vblank_int("screen", FUNC(n64_console_state::n64_reset_poll)); RSP(config, m_rsp, 62500000); m_rsp->set_force_no_drc(false); @@ -359,9 +359,9 @@ void n64_gateway_state::n64_lodgenet(machine_config &config) } ROM_START( n64_lodgenet ) - ROM_REGION( 0x20000, "gateway64", ROMREGION_ERASEFF ) - // unknown CPU/controller, likely multiple ROMs for set-top box & game data receiver. - ROM_LOAD( "gateway64.bios", 0, 0x20000, NO_DUMP ) + ROM_REGION( 0x20000, "gateway64", ROMREGION_ERASEFF ) + // unknown CPU/controller, likely multiple ROMs for set-top box & game data receiver. + ROM_LOAD( "gateway64.bios", 0, 0x20000, NO_DUMP ) ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF ) /* dummy region for R4300 */ diff --git a/src/mame/psion/psionhc.cpp b/src/mame/psion/psionhc.cpp index 3810bc8e699..88312ec1e67 100644 --- a/src/mame/psion/psionhc.cpp +++ b/src/mame/psion/psionhc.cpp @@ -191,68 +191,68 @@ static INPUT_PORTS_START( psionhc_uk ) INPUT_PORTS_END //static INPUT_PORTS_START( psionhc_num ) -// PORT_START("COL0") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') PORT_NAME("No") -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_NAME(UTF8_UP) -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_NAME(UTF8_DOWN) -// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(0x08) PORT_NAME("Del") -// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_NAME("C") -// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('+') -// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Off") +// PORT_START("COL0") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') PORT_NAME("No") +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_NAME(UTF8_UP) +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_NAME(UTF8_DOWN) +// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(0x08) PORT_NAME("Del") +// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_NAME("C") +// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('+') +// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Off") // -// PORT_START("COL1") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('*') -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('%') -// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Info") -// PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL1") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('*') +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('%') +// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Info") +// PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL2") -// PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL2") +// PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL3") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_NAME("F1") -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_NAME("F2") -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_NAME("F3") -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_NAME("F4") -// PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL3") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_NAME("F1") +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_NAME("F2") +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_NAME("F3") +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_NAME("F4") +// PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL4") -// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_NAME("Shift") -// PORT_BIT(0xbf, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL4") +// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_NAME("Shift") +// PORT_BIT(0xbf, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL5") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_NAME(UTF8_LEFT) -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') -// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') -// PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL5") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_NAME(UTF8_LEFT) +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') +// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') +// PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL6") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)// -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_NAME(UTF8_RIGHT) -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') -// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') -// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') -// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Backlight") -// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL6") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)// +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_NAME(UTF8_RIGHT) +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') +// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') +// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') +// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Backlight") +// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("COL7") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("Enter") -// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') PORT_NAME("Yes") -// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') -// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') -// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') -// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) -// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Contrast") -// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_START("COL7") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("Enter") +// PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') PORT_NAME("Yes") +// PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') +// PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') +// PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') +// PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) +// PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Contrast") +// PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) // -// PORT_START("ON_OFF") -// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_NAME("On Off") PORT_CHANGED_MEMBER(DEVICE_SELF, psionhc_state, key_on, 0) +// PORT_START("ON_OFF") +// PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_NAME("On Off") PORT_CHANGED_MEMBER(DEVICE_SELF, psionhc_state, key_on, 0) //INPUT_PORTS_END INPUT_CHANGED_MEMBER(psionhc_state::key_on) diff --git a/src/mame/shared/xbox_nv2a.cpp b/src/mame/shared/xbox_nv2a.cpp index b6c95a33fda..eae15b72090 100644 --- a/src/mame/shared/xbox_nv2a.cpp +++ b/src/mame/shared/xbox_nv2a.cpp @@ -2513,10 +2513,10 @@ void nv2a_renderer::compute_supersample_factors(float &horizontal, float &vertic void nv2a_renderer::convert_vertices(vertex_nv *source, nv2avertex_t *destination) { /* - FIXME: GCC 13.1 errored this without the static on "vert". I believe this is a real bug, but I don't - know enough about what this code is doing to be confident. + FIXME: GCC 13.1 errored this without the static on "vert". I believe this is a real bug, but I don't + know enough about what this code is doing to be confident. - In member function ‘void vertex_program_simulator::set_data(vertex_nv*, vertex_nv*)’, + In member function ‘void vertex_program_simulator::set_data(vertex_nv*, vertex_nv*)’, inlined from ‘void vertex_program_simulator::process(int, vertex_nv*, vertex_nv*, int)’ at ../../../../../src/mame/shared/xbox_nv2a.cpp:643:10, inlined from ‘void nv2a_renderer::convert_vertices(vertex_nv*, nv2avertex_t*)’ at ../../../../../src/mame/shared/xbox_nv2a.cpp:2546:29: ../../../../../src/mame/shared/xbox_nv2a.cpp:449:16: error: storing the address of local variable ‘vert’ in ‘*&this_144(D)->vertexprogram.exec.vertex_program_simulator::output’ [-Werror=dangling-pointer=] @@ -4765,7 +4765,7 @@ void nv2a_renderer::combiner_compute_alpha_outputs(int id, int stage_number) WRITE_LINE_MEMBER(nv2a_renderer::vblank_callback) { - LOGMASKED(LOG_NV2A_VERBOSE, "vblank_callback\n\r"); + LOGMASKED(LOG_NV2A_VERBOSE, "vblank_callback\n\r"); if ((state != 0) && (puller_waiting == 1)) { puller_waiting = 0; puller_timer_work(0); diff --git a/src/mame/skeleton/bolsaint.cpp b/src/mame/skeleton/bolsaint.cpp index 3d61acf149b..cab28e1c68d 100644 --- a/src/mame/skeleton/bolsaint.cpp +++ b/src/mame/skeleton/bolsaint.cpp @@ -67,11 +67,11 @@ void bolsaint_state::bolsaint(machine_config &config) SPEAKER(config, "mono").front_center(); // There is a jumper on the sound PCB for selecting between 16KHz and 32KHz, - // but is fixed (soldered) for 32KHz + // but is fixed (soldered) for 32KHz OKIM6376(config, m_okim6376, 5.0000_MHz_XTAL/8/2).add_route(ALL_OUTPUTS, "mono", 1.0); // Guess } -// Bolsa Internacional (Euro). +// Bolsa Internacional (Euro). // Only two units were ever made for the euro-adapted version (there's a previous version which only supports pesetas). ROM_START(bolsaint) ROM_REGION(0x080000, "maincpu", 0) diff --git a/src/mame/yamaha/ympcs30.cpp b/src/mame/yamaha/ympcs30.cpp index ca63ee8d76d..508810173e8 100644 --- a/src/mame/yamaha/ympcs30.cpp +++ b/src/mame/yamaha/ympcs30.cpp @@ -3,11 +3,11 @@ /* - Skeleton driver for Yamaha PortaSound PCS-30 keyboard with Playcard support + Skeleton driver for Yamaha PortaSound PCS-30 keyboard with Playcard support - CPU: Toshiba TMPZ84C00P (Z80 clone) - Sound: Yamaha YM2142 (GE8) - Other: Yamaha YM3514 (64 pins) + CPU: Toshiba TMPZ84C00P (Z80 clone) + Sound: Yamaha YM2142 (GE8) + Other: Yamaha YM3514 (64 pins) */ diff --git a/src/mame/yamaha/ymps400.cpp b/src/mame/yamaha/ymps400.cpp index 697dbdfefac..c8f75e70c66 100644 --- a/src/mame/yamaha/ymps400.cpp +++ b/src/mame/yamaha/ymps400.cpp @@ -3,14 +3,14 @@ /* - Skeleton driver for Yamaha PortaSound PS-400 keyboard + Skeleton driver for Yamaha PortaSound PS-400 keyboard - IC1: Yamaha YM1034 (KAP2) "key assigner" - IC2: Yamaha YM1019 (GE4) sound chip - IC16: Toshiba TMP80C39P-6 - IC18: Toshiba TMM2332P mask ROM + IC1: Yamaha YM1034 (KAP2) "key assigner" + IC2: Yamaha YM1019 (GE4) sound chip + IC16: Toshiba TMP80C39P-6 + IC18: Toshiba TMM2332P mask ROM - Service manual/schematic: https://elektrotanya.com/yamaha_ps_400.pdf/download.html + Service manual/schematic: https://elektrotanya.com/yamaha_ps_400.pdf/download.html */ -- cgit v1.2.3