From 8bbdac17bdd749e55b8c7fe2d5161597555c7ee2 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 25 Jun 2020 06:18:50 +1000 Subject: gridcomp.cpp: fix up flags for grid1101 (MACHINE_TYPE_COMPUTER shouldn't be used directly, the machine has no built-in printer, and it has a modem but no LAN interface) --- src/mame/drivers/gridcomp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index e8e682638db..1948791df49 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -620,7 +620,7 @@ ROM_END ***************************************************************************/ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1982, grid1101, 0, 0, grid1101, gridcomp, gridcomp_state, empty_init, "GRiD Computers", "Compass 1101", MACHINE_TYPE_COMPUTER | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_CONTROLS | MACHINE_NODEVICE_PRINTER | MACHINE_NODEVICE_LAN ) +COMP( 1982, grid1101, 0, 0, grid1101, gridcomp, gridcomp_state, empty_init, "GRiD Computers", "Compass 1101", MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_CONTROLS | MACHINE_NODEVICE_WAN ) COMP( 1982, grid1109, grid1101, 0, grid1109, gridcomp, gridcomp_state, empty_init, "GRiD Computers", "Compass 1109", MACHINE_IS_SKELETON ) COMP( 1984, grid1121, 0, 0, grid1121, gridcomp, gridcomp_state, empty_init, "GRiD Computers", "Compass II 1121", MACHINE_IS_SKELETON ) COMP( 1984, grid1129, grid1121, 0, grid1129, gridcomp, gridcomp_state, empty_init, "GRiD Computers", "Compass II 1129", MACHINE_IS_SKELETON ) -- cgit v1.2.3 From 731fbe19754f6bd13e1c2a6d9c7fcf61f15c6369 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 25 Jun 2020 09:31:07 +1000 Subject: cpu/i960: Log unimplemented IACs --- src/devices/cpu/i960/i960.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp index 9db9d6ab095..81b14d7aa69 100644 --- a/src/devices/cpu/i960/i960.cpp +++ b/src/devices/cpu/i960/i960.cpp @@ -92,10 +92,11 @@ void i960_cpu_device::send_iac(uint32_t adr) switch(iac[0]>>24) { case 0x40: // generate irq + logerror("I960: %x: IAC %08x %08x %08x %08x (generate IRQ)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); break; case 0x41: // test for pending interrupts - // check_irqs() seems to take care of this - // though it may not be entirely accurate + logerror("I960: %x: IAC %08x %08x %08x %08x (test for pending interrupts)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); + // check_irqs() seems to take care of this though it may not be entirely accurate check_irqs(); break; case 0x80: // store SAT & PRCB in memory @@ -103,14 +104,18 @@ void i960_cpu_device::send_iac(uint32_t adr) m_program.write_dword(iac[1]+4, m_PRCB); break; case 0x89: // invalidate internal instruction cache + logerror("I960: %x: IAC %08x %08x %08x %08x (invalidate internal instruction cache)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); // we do not emulate the instruction cache, so this is safe to ignore break; case 0x8F: // enable/disable breakpoints + logerror("I960: %x: IAC %08x %08x %08x %08x (enable/disable breakpoints)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); // processor breakpoints are not emulated, safe to ignore break; case 0x91: // stop processor + logerror("I960: %x: IAC %08x %08x %08x %08x (stop processor)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); break; case 0x92: // continue initialization + logerror("I960: %x: IAC %08x %08x %08x %08x (continue initialization)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); break; case 0x93: // reinit m_SAT = iac[1]; -- cgit v1.2.3 From a335166ec2020954d8c272a26e076080aafa26ba Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 25 Jun 2020 10:54:22 +1000 Subject: -bus/coco/coco_ram.cpp: fix a rather obvious bug in shift/mask -misc. formatting consistency --- src/devices/bus/coco/coco_ram.cpp | 23 +++++++++++----------- src/devices/cpu/i960/i960.cpp | 2 +- src/emu/natkeyboard.cpp | 2 +- src/mame/drivers/gscpm.cpp | 40 ++++++++++++++++++--------------------- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/devices/bus/coco/coco_ram.cpp b/src/devices/bus/coco/coco_ram.cpp index 222f1abedf3..885cc55a34d 100644 --- a/src/devices/bus/coco/coco_ram.cpp +++ b/src/devices/bus/coco/coco_ram.cpp @@ -12,7 +12,7 @@ #include "emu.h" #include "coco_ram.h" -#include "cococart.h" + #include "machine/ram.h" #define STATICRAM_TAG "static_ram" @@ -53,7 +53,7 @@ namespace private: required_device m_staticram; - int m_offset; + u32 m_offset; }; }; @@ -126,19 +126,19 @@ void coco_pak_ram_device::scs_write(offs_t offset, u8 data) { // int idata = data; - switch(offset) + switch (offset) { case 0: - m_offset = ((m_offset & 0xffff00) + data); + m_offset = (m_offset & 0xffff00) | u32(data); break; case 1: - m_offset = ((m_offset & 0xff00ff) + (data << 8)); + m_offset = (m_offset & 0xff00ff) | (u32(data) << 8); break; case 2: - m_offset = ((m_offset & 0x00ffff) + (data << 16)); + m_offset = (m_offset & 0x00ffff) | (u32(data) << 16); break; case 3: - if( m_offset < BUFFER_SIZE ) + if (m_offset < BUFFER_SIZE) { m_staticram->write(m_offset, data); } @@ -161,20 +161,19 @@ u8 coco_pak_ram_device::scs_read(offs_t offset) switch (offset) { case 0: - data = (m_offset) & 0xff; + data = u8(m_offset & 0x00ff); break; case 1: - data = (m_offset & 0xff00ff) >> 8; + data = u8((m_offset >> 8) & 0x00ff); break; case 2: - data = (m_offset & 0xff0000) >> 16; + data = u8((m_offset >> 16) & 0x00ff); break; case 3: - if( m_offset < BUFFER_SIZE ) + if (m_offset < BUFFER_SIZE) { data = m_staticram->read(m_offset); } - break; } diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp index 81b14d7aa69..ae17f211aba 100644 --- a/src/devices/cpu/i960/i960.cpp +++ b/src/devices/cpu/i960/i960.cpp @@ -107,7 +107,7 @@ void i960_cpu_device::send_iac(uint32_t adr) logerror("I960: %x: IAC %08x %08x %08x %08x (invalidate internal instruction cache)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); // we do not emulate the instruction cache, so this is safe to ignore break; - case 0x8F: // enable/disable breakpoints + case 0x8f: // enable/disable breakpoints logerror("I960: %x: IAC %08x %08x %08x %08x (enable/disable breakpoints)\n", m_PIP, iac[0], iac[1], iac[2], iac[3]); // processor breakpoints are not emulated, safe to ignore break; diff --git a/src/emu/natkeyboard.cpp b/src/emu/natkeyboard.cpp index f264754b3a4..110e0462b6d 100644 --- a/src/emu/natkeyboard.cpp +++ b/src/emu/natkeyboard.cpp @@ -881,7 +881,7 @@ const natural_keyboard::keycode_map_entry *natural_keyboard::find_code(char32_t { keycode_map::const_iterator const found(m_keycode_map.find(ch)); if (m_keycode_map.end() == found) return nullptr; - for(const keycode_map_entry &entry : found->second) + for (keycode_map_entry const &entry : found->second) { if (entry.condition.eval()) return &entry; diff --git a/src/mame/drivers/gscpm.cpp b/src/mame/drivers/gscpm.cpp index dffd5427097..ca91dd86fa3 100644 --- a/src/mame/drivers/gscpm.cpp +++ b/src/mame/drivers/gscpm.cpp @@ -81,39 +81,35 @@ void gscpm_state::cflash_w(offs_t offset, uint8_t data) uint8_t gscpm_state::sio_r(offs_t offset) { - switch(offset & 3) + switch (offset & 3) { - case 0x00: - return m_sio->da_r(); - break; - case 0x01: - return m_sio->db_r(); - break; - case 0x02: - return m_sio->ca_r(); - break; - case 0x03: - return m_sio->cb_r(); - break; + case 0x00: + return m_sio->da_r(); + case 0x01: + return m_sio->db_r(); + case 0x02: + return m_sio->ca_r(); + case 0x03: + return m_sio->cb_r(); } return 0x00; // can't happen } void gscpm_state::sio_w(offs_t offset, uint8_t data) { - switch(offset & 3) + switch (offset & 3) { - case 0x00: - m_sio->da_w(data); + case 0x00: + m_sio->da_w(data); break; - case 0x01: - m_sio->db_w(data); + case 0x01: + m_sio->db_w(data); break; - case 0x02: - m_sio->ca_w(data); + case 0x02: + m_sio->ca_w(data); break; - case 0x03: - m_sio->cb_w(data); + case 0x03: + m_sio->cb_w(data); break; } } -- cgit v1.2.3 From f172d7065a7b1ac98760b68fddebfa17598d3383 Mon Sep 17 00:00:00 2001 From: Frank Palazzolo Date: Wed, 24 Jun 2020 20:29:57 -0400 Subject: (Grant Searle drivers) Add license headers --- src/mame/drivers/gs6502.cpp | 3 ++- src/mame/drivers/gs6809.cpp | 3 ++- src/mame/drivers/gscpm.cpp | 5 +++-- src/mame/drivers/gsz80.cpp | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/gs6502.cpp b/src/mame/drivers/gs6502.cpp index 16857a9952a..7b1b214f826 100644 --- a/src/mame/drivers/gs6502.cpp +++ b/src/mame/drivers/gs6502.cpp @@ -1,7 +1,8 @@ +// license:BSD-3-Clause +// copyright-holders:Frank Palazzolo // MAME driver for Grant Searle's Simple 6502 Computer // http://www.searle.wales/ -// Written by Frank Palazzolo - frank@avoidspikes.com #include "emu.h" diff --git a/src/mame/drivers/gs6809.cpp b/src/mame/drivers/gs6809.cpp index a59afac6203..7e951f503fc 100644 --- a/src/mame/drivers/gs6809.cpp +++ b/src/mame/drivers/gs6809.cpp @@ -1,7 +1,8 @@ +// license:BSD-3-Clause +// copyright-holders:Frank Palazzolo // MAME driver for Grant Searle's Simple 6809 Computer // http://www.searle.wales/ -// Written by Frank Palazzolo - frank@avoidspikes.com #include "emu.h" diff --git a/src/mame/drivers/gscpm.cpp b/src/mame/drivers/gscpm.cpp index ca91dd86fa3..46981e9b8f1 100644 --- a/src/mame/drivers/gscpm.cpp +++ b/src/mame/drivers/gscpm.cpp @@ -1,7 +1,8 @@ +// license:BSD-3-Clause +// copyright-holders:Frank Palazzolo // MAME driver for Grant Searle's Simple CP/M Computer -// http://searle.x10host.com/cpm/index.html -// Written by Frank Palazzolo - frank@avoidspikes.com +// http://www.searle.wales/ // This driver uses a compact flash card as a hard disk device. // To create a virtual disk file, use the following (for a 128MB card): diff --git a/src/mame/drivers/gsz80.cpp b/src/mame/drivers/gsz80.cpp index a4340ad38db..ab7310b12ac 100644 --- a/src/mame/drivers/gsz80.cpp +++ b/src/mame/drivers/gsz80.cpp @@ -1,7 +1,8 @@ +// license:BSD-3-Clause +// copyright-holders:Frank Palazzolo // MAME Reference driver for Grant Searle's Simple Z80 Computer // http://www.searle.wales/ -// Written by Frank Palazzolo - frank@avoidspikes.com // All the common emulator stuff is here #include "emu.h" -- cgit v1.2.3