summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-09-26 14:15:42 +1000
committer Vas Crabb <vas@vastheman.com>2021-09-26 14:15:42 +1000
commitb225f4db4a42978ec6d3384716d340cc204c3a56 (patch)
tree925c3a934e542eef41cff9ec3d9a2cd6634a176b /src
parent3066057077c9a1e500f885cc0b1c6bd5dd523b6d (diff)
srcclean in preparation for MAME 0.235, and two small adjustments.
* Reduce repeated directory walking in cleansrc target (substantially improves speed of building the target on Windows). * Disable a validity check using an MSVC language extension when using clang in MSVC ABI mode.
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/a2bus/a2sd.cpp2
-rw-r--r--src/devices/bus/nes/batlab.cpp4
-rw-r--r--src/devices/bus/nes/mmc1.h2
-rw-r--r--src/devices/bus/ti99/gromport/cartridges.cpp24
-rw-r--r--src/devices/cpu/tms32082/mp_ops.cpp48
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp18
-rw-r--r--src/devices/cpu/tx0/tx0.cpp4
-rw-r--r--src/devices/machine/8042kbdc.h2
-rw-r--r--src/devices/machine/smpc.cpp4
-rw-r--r--src/devices/machine/stvcd.cpp4
-rw-r--r--src/devices/sound/ics2115.cpp2
-rw-r--r--src/devices/video/upd3301.cpp38
-rw-r--r--src/devices/video/upd3301.h12
-rw-r--r--src/frontend/mame/ui/viewgfx.cpp2
-rw-r--r--src/lib/formats/rpk.cpp84
-rw-r--r--src/lib/formats/rpk.h28
-rw-r--r--src/mame/drivers/4enraya.cpp4
-rw-r--r--src/mame/drivers/acesp.cpp4
-rw-r--r--src/mame/drivers/agat.cpp8
-rw-r--r--src/mame/drivers/ampoker2.cpp6
-rw-r--r--src/mame/drivers/apple2.cpp8
-rw-r--r--src/mame/drivers/apple2gs.cpp2
-rw-r--r--src/mame/drivers/atarig42.cpp6
-rw-r--r--src/mame/drivers/barni.cpp16
-rw-r--r--src/mame/drivers/cybstorm.cpp4
-rw-r--r--src/mame/drivers/mpu4.cpp4
-rw-r--r--src/mame/drivers/naomi.cpp2
-rw-r--r--src/mame/drivers/pc8001.cpp56
-rw-r--r--src/mame/drivers/pc8801.cpp8
-rw-r--r--src/mame/drivers/rollext.cpp32
-rw-r--r--src/mame/drivers/saturn.cpp4
-rw-r--r--src/mame/drivers/spg2xx_jakks.cpp2
-rw-r--r--src/mame/includes/pc8001.h12
-rw-r--r--src/mame/layout/ace_sp_dmd.lay2
-rw-r--r--src/mame/machine/ace_sp_reelctrl.cpp4
-rw-r--r--src/mame/machine/pc80s31k.cpp134
-rw-r--r--src/mame/machine/pc80s31k.h2
-rw-r--r--src/mame/mame.lst2
-rw-r--r--src/mame/video/sknsspr.cpp2
-rw-r--r--src/osd/modules/debugger/debuggdbstub.cpp2
40 files changed, 302 insertions, 302 deletions
diff --git a/src/devices/bus/a2bus/a2sd.cpp b/src/devices/bus/a2bus/a2sd.cpp
index 7a5208e473f..3f9bd439bc6 100644
--- a/src/devices/bus/a2bus/a2sd.cpp
+++ b/src/devices/bus/a2bus/a2sd.cpp
@@ -9,7 +9,7 @@
AppleIISD has a Xilinx FPGA which implements a minimally hardware
assisted SPI interface, and the SD card is thus driven in SPI
- mode rather than SD.
+ mode rather than SD.
The SPI controller is fixed to SPI Mode 3 only.
(shift on falling CLK edges, shift-then-latch).
diff --git a/src/devices/bus/nes/batlab.cpp b/src/devices/bus/nes/batlab.cpp
index cc39fb95466..7f11696134d 100644
--- a/src/devices/bus/nes/batlab.cpp
+++ b/src/devices/bus/nes/batlab.cpp
@@ -188,7 +188,7 @@ u8 nes_batmap_srrx_device::read_dpcm()
u8 nes_batmap_srrx_device::read_l(offs_t offset)
{
-// LOG_MMC(("batmap_srrx read_l, offset: %04x", offset));
+// LOG_MMC(("batmap_srrx read_l, offset: %04x", offset));
offset += 0x100;
switch (offset & 0x1800)
@@ -204,7 +204,7 @@ u8 nes_batmap_srrx_device::read_l(offs_t offset)
u8 nes_batmap_srrx_device::read_m(offs_t offset)
{
-// LOG_MMC(("batmap_srrx read_m, offset: %04x", offset));
+// LOG_MMC(("batmap_srrx read_m, offset: %04x", offset));
return m_prg[(m_reg * 0x2000 + offset) & (m_prg_size - 1)];
}
diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h
index bc2198c33aa..2cd0a8ec256 100644
--- a/src/devices/bus/nes/mmc1.h
+++ b/src/devices/bus/nes/mmc1.h
@@ -34,7 +34,7 @@ protected:
void set_prg(int prg_base, int prg_mask);
void set_chr(int chr_base, int chr_mask);
virtual void set_prg();
-// virtual void set_prg() { set_prg(0x00, 0x0f); }
+// virtual void set_prg() { set_prg(0x00, 0x0f); }
virtual void set_chr() { set_chr(0x00, 0x1f); }
uint8_t m_reg[4];
diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp
index 7a9ccb95a6d..b4c3655a7e5 100644
--- a/src/devices/bus/ti99/gromport/cartridges.cpp
+++ b/src/devices/bus/ti99/gromport/cartridges.cpp
@@ -62,18 +62,18 @@ enum
static char const *const pcbdefs[] =
{
- "standard", // PCB_STANDARD
- "paged12k", // PCB_PAGED12K
- "paged", // PCB_PAGED16K
- "minimem", // PCB_MINIMEM
- "super", // PCB_SUPER
- "mbx", // PCB_MBX
- "paged379i", // PCB_PAGED379I
- "paged378", // PCB_PAGED378
- "paged377", // PCB_PAGED377
- "pagedcru", // PCB_PAGEDCRU
- "gromemu", // PCB_GROMEMU
- "paged7", // PCB_PAGED7
+ "standard", // PCB_STANDARD
+ "paged12k", // PCB_PAGED12K
+ "paged", // PCB_PAGED16K
+ "minimem", // PCB_MINIMEM
+ "super", // PCB_SUPER
+ "mbx", // PCB_MBX
+ "paged379i", // PCB_PAGED379I
+ "paged378", // PCB_PAGED378
+ "paged377", // PCB_PAGED377
+ "pagedcru", // PCB_PAGEDCRU
+ "gromemu", // PCB_GROMEMU
+ "paged7", // PCB_PAGED7
nullptr
};
diff --git a/src/devices/cpu/tms32082/mp_ops.cpp b/src/devices/cpu/tms32082/mp_ops.cpp
index bbe2b04b6e3..867a5ecf54b 100644
--- a/src/devices/cpu/tms32082/mp_ops.cpp
+++ b/src/devices/cpu/tms32082/mp_ops.cpp
@@ -86,38 +86,38 @@ uint32_t tms32082_mp_device::calculate_cmp(uint32_t src1, uint32_t src2)
uint32_t flags = 0;
// 32-bits (bits 20-29)
- flags |= ((c32) & 1) << 29; // higher than or same (C)
- flags |= ((~c32) & 1) << 28; // lower than (~C)
- flags |= ((~c32 | z32) & 1) << 27; // lower than or same (~C|Z)
- flags |= ((c32 & ~z32) & 1) << 26; // higher than (C&~Z)
- flags |= (((n32 & v32) | (~n32 & ~v32)) & 1) << 25; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n32 & ~v32) | (~n32 & v32)) & 1) << 24; // less than (N&~V)|(~N&V)
+ flags |= ((c32) & 1) << 29; // higher than or same (C)
+ flags |= ((~c32) & 1) << 28; // lower than (~C)
+ flags |= ((~c32 | z32) & 1) << 27; // lower than or same (~C|Z)
+ flags |= ((c32 & ~z32) & 1) << 26; // higher than (C&~Z)
+ flags |= (((n32 & v32) | (~n32 & ~v32)) & 1) << 25; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n32 & ~v32) | (~n32 & v32)) & 1) << 24; // less than (N&~V)|(~N&V)
flags |= (((n32 & ~v32) | (~n32 & v32) | (z32)) & 1) << 23; // less than or equal (N&~V)|(~N&V)|Z
flags |= (((n32 & v32 & ~z32) | (~n32 & ~v32 & ~z32)) & 1) << 22; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z32) & 1) << 21; // not equal (~Z)
- flags |= ((z32) & 1) << 20; // equal (Z)
+ flags |= ((~z32) & 1) << 21; // not equal (~Z)
+ flags |= ((z32) & 1) << 20; // equal (Z)
// 16-bits (bits 10-19)
- flags |= ((c16) & 1) << 19; // higher than or same (C)
- flags |= ((~c16) & 1) << 18; // lower than (~C)
- flags |= ((~c16 | z16) & 1) << 17; // lower than or same (~C|Z)
- flags |= ((c16 & ~z16) & 1) << 16; // higher than (C&~Z)
- flags |= (((n16 & v16) | (~n16 & ~v16)) & 1) << 15; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n16 & ~v16) | (~n16 & v16)) & 1) << 14; // less than (N&~V)|(~N&V)
+ flags |= ((c16) & 1) << 19; // higher than or same (C)
+ flags |= ((~c16) & 1) << 18; // lower than (~C)
+ flags |= ((~c16 | z16) & 1) << 17; // lower than or same (~C|Z)
+ flags |= ((c16 & ~z16) & 1) << 16; // higher than (C&~Z)
+ flags |= (((n16 & v16) | (~n16 & ~v16)) & 1) << 15; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n16 & ~v16) | (~n16 & v16)) & 1) << 14; // less than (N&~V)|(~N&V)
flags |= (((n16 & ~v16) | (~n16 & v16) | (z16)) & 1) << 13; // less than or equal (N&~V)|(~N&V)|Z
flags |= (((n16 & v16 & ~z16) | (~n16 & ~v16 & ~z16)) & 1) << 12; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z16) & 1) << 11; // not equal (~Z)
- flags |= ((z16) & 1) << 10; // equal (Z)
+ flags |= ((~z16) & 1) << 11; // not equal (~Z)
+ flags |= ((z16) & 1) << 10; // equal (Z)
// 8-bits (bits 0-9)
- flags |= ((c8) & 1) << 9; // higher than or same (C)
- flags |= ((~c8) & 1) << 8; // lower than (~C)
- flags |= ((~c8 | z8) & 1) << 7; // lower than or same (~C|Z)
- flags |= ((c8 & ~z8) & 1) << 6; // higher than (C&~Z)
- flags |= (((n8 & v8) | (~n8 & ~v8)) & 1) << 5; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n8 & ~v8) | (~n8 & v8)) & 1) << 4; // less than (N&~V)|(~N&V)
+ flags |= ((c8) & 1) << 9; // higher than or same (C)
+ flags |= ((~c8) & 1) << 8; // lower than (~C)
+ flags |= ((~c8 | z8) & 1) << 7; // lower than or same (~C|Z)
+ flags |= ((c8 & ~z8) & 1) << 6; // higher than (C&~Z)
+ flags |= (((n8 & v8) | (~n8 & ~v8)) & 1) << 5; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n8 & ~v8) | (~n8 & v8)) & 1) << 4; // less than (N&~V)|(~N&V)
flags |= (((n8 & ~v8) | (~n8 & v8) | (z8)) & 1) << 3; // less than or equal (N&~V)|(~N&V)|Z
flags |= (((n8 & v8 & ~z8) | (~n8 & ~v8 & ~z8)) & 1) << 2; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z8) & 1) << 1; // not equal (~Z)
- flags |= ((z8) & 1) << 0; // equal (Z)
+ flags |= ((~z8) & 1) << 1; // not equal (~Z)
+ flags |= ((z8) & 1) << 0; // equal (Z)
return flags;
}
diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp
index 368d058e63f..330627829da 100644
--- a/src/devices/cpu/tms32082/tms32082.cpp
+++ b/src/devices/cpu/tms32082/tms32082.cpp
@@ -92,10 +92,10 @@ void tms32082_mp_device::tc_command_execute(int channel, uint32_t entrypoint)
uint32_t dst_addr = m_program.read_dword(address + 12);
uint32_t src_b_count = m_program.read_word(address + 16);
uint32_t src_a_count = m_program.read_word(address + 18);
- // uint32_t dst_b_count = m_program.read_word(address + 20);
- // uint32_t dst_a_count = m_program.read_word(address + 22);
+ // uint32_t dst_b_count = m_program.read_word(address + 20);
+ // uint32_t dst_a_count = m_program.read_word(address + 22);
uint32_t src_c_count = m_program.read_dword(address + 24);
- // uint32_t dst_c_count = m_program.read_dword(address + 28);
+ // uint32_t dst_c_count = m_program.read_dword(address + 28);
uint32_t src_b_pitch = m_program.read_dword(address + 32);
uint32_t dst_b_pitch = m_program.read_dword(address + 36);
uint32_t src_c_pitch = m_program.read_dword(address + 40);
@@ -152,10 +152,10 @@ void tms32082_mp_device::tc_command_execute(int channel, uint32_t entrypoint)
do
{
- // uint32_t src_addr = m_program.read_dword(address + 8);
- // uint32_t dst_addr = m_program.read_dword(address + 12);
+ // uint32_t src_addr = m_program.read_dword(address + 8);
+ // uint32_t dst_addr = m_program.read_dword(address + 12);
- // int count = pt_options & 0xffff;
+ // int count = pt_options & 0xffff;
stop = (pt_options & 0x80000000) ? true : false;
/*
@@ -305,7 +305,7 @@ void tms32082_mp_device::device_reset()
m_intpen = 0;
m_ie = 0;
- m_pp_status = 0xf0000; // start with all PPs halted
+ m_pp_status = 0xf0000; // start with all PPs halted
}
void tms32082_mp_device::processor_command(uint32_t command)
@@ -329,7 +329,7 @@ void tms32082_mp_device::processor_command(uint32_t command)
}
if (!m_cmd_callback.isnull())
- m_cmd_callback(space(AS_PROGRAM), command);
+ m_cmd_callback(space(AS_PROGRAM), command);
}
uint32_t tms32082_mp_device::read_creg(int reg)
@@ -342,7 +342,7 @@ uint32_t tms32082_mp_device::read_creg(int reg)
case 0x1: // EIP
return m_eip;
- case 0x2: // CONFIG
+ case 0x2: // CONFIG
// Type = 0010: 2 Parallel Processors
// Release = 0011: Production release silicon
return (0x2 << 12) | (0x3 << 4);
diff --git a/src/devices/cpu/tx0/tx0.cpp b/src/devices/cpu/tx0/tx0.cpp
index e6945641040..0b669c48dca 100644
--- a/src/devices/cpu/tx0/tx0.cpp
+++ b/src/devices/cpu/tx0/tx0.cpp
@@ -595,7 +595,7 @@ void tx0_64kw_device::execute_instruction_64kw()
MBR |= m_tbr;
if ((MAR & 0000003) == 2 && ((MAR & 0000600) >> 7) == 1)
- /* LMB and MBL used simultaneously interchange LR and MBR */
+ /* LMB and MBL used simultaneously interchange LR and MBR */
std::swap(LR, MBR);
else if ((MAR & 0000003) == 2)
/* (1.3) LMB = Store the contents of the LR in the MBR. */
@@ -1203,7 +1203,7 @@ void tx0_8kw_device::execute_instruction_8kw()
}
if (((! (MAR & 0000400)) && (MAR & 0000200)) && ((! (MAR & 0000004)) && (MAR & 0000002)))
- /* LMB and MBL used simultaneously interchange LR and MBR */
+ /* LMB and MBL used simultaneously interchange LR and MBR */
std::swap(LR, MBR);
else if ((! (MAR & 0000400)) && (MAR & 0000200))
/* (1.4) MBL = Transfer MBR contents to LR */
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index affee6f6c7a..d28c17c9cf8 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -114,7 +114,7 @@ private:
optional_ioport m_mousebtn_port;
kbdc8042_type_t m_keybtype;
- kbdc8042_interrupt_type_t m_interrupttype;
+ kbdc8042_interrupt_type_t m_interrupttype;
devcb_write_line m_system_reset_cb;
devcb_write_line m_gate_a20_cb;
diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp
index 2a0bb30c311..4f2e9ca8295 100644
--- a/src/devices/machine/smpc.cpp
+++ b/src/devices/machine/smpc.cpp
@@ -598,12 +598,12 @@ void smpc_hle_device::device_timer(emu_timer &timer, device_timer_id id, int par
sf_ack(true); //set hand-shake flag
return;
- case 0x0a: // NETLINKON
+ case 0x0a: // NETLINKON
// TODO: understand where NetLink actually lies and implement delegation accordingly
// (is it really an SH1 device like suggested by the space access or it overlays on CS2 bus?)
popmessage("%s: NetLink enabled", this->tag());
[[fallthrough]];
- case 0x0b: // NETLINKOFF
+ case 0x0b: // NETLINKOFF
break;
case 0x0d: // SYSRES
diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp
index 7b84c069a85..9e62335f448 100644
--- a/src/devices/machine/stvcd.cpp
+++ b/src/devices/machine/stvcd.cpp
@@ -823,7 +823,7 @@ void stvcd_device::cmd_play_disc()
// FIXME: verify implementation with Galaxy Fight
// it calls 10ff ffff ffff ffff, but then it follows up with
// 0x04->0x02->0x06->0x11->0x04->0x02->0x06 command sequence
- // (and current implementation nukes start/end FAD addresses at 0x04).
+ // (and current implementation nukes start/end FAD addresses at 0x04).
// I'm sure that this doesn't work like this, but there could
// be countless possible combinations ...
if(fadstoplay == 0)
@@ -1730,7 +1730,7 @@ void stvcd_device::cmd_get_target_file_info()
// (iso9660 parsing doesn't read beyond the first sector)
if (curdir[temp].firstfad == 0 || curdir[temp].length == 0)
throw emu_fatalerror("File ID not found in XFERTYPE_FILEINFO_1");
-// printf("%08x %08x\n",curdir[temp].firstfad,curdir[temp].length);
+// printf("%08x %08x\n",curdir[temp].firstfad,curdir[temp].length);
// first 4 bytes = FAD
finfbuf[0] = (curdir[temp].firstfad>>24)&0xff;
finfbuf[1] = (curdir[temp].firstfad>>16)&0xff;
diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp
index d97ca8dea9a..0afc0787ed0 100644
--- a/src/devices/sound/ics2115.cpp
+++ b/src/devices/sound/ics2115.cpp
@@ -434,7 +434,7 @@ int ics2115_device::fill_output(ics2115_voice& voice, std::vector<write_stream_v
{
constexpr int RAMP_SHIFT = 6;
const u32 volacc = (voice.vol.acc >> 14) & 0xfff;
- const u16 vlefti = volacc - m_panlaw[255 - voice.vol.pan]; // left index from acc - pan law
+ const u16 vlefti = volacc - m_panlaw[255 - voice.vol.pan]; // left index from acc - pan law
const u16 vrighti = volacc - m_panlaw[voice.vol.pan]; // right index from acc - pan law
//check negative values so no cracks, is it a hardware feature ?
const u16 vleft = vlefti > 0 ? (m_volume[vlefti] * voice.state.ramp >> RAMP_SHIFT) : 0;
diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp
index 1608b3c74a2..ed57a55d760 100644
--- a/src/devices/video/upd3301.cpp
+++ b/src/devices/video/upd3301.cpp
@@ -11,19 +11,19 @@
TODO:
- pinpoint how much of pc8001/pc8801 drawing functions should actually be inherited
- here;
+ here;
- N interrupt (special control character)
- light pen
- reset counters
- proper DMA timing (now the whole screen is transferred at the end of the frame,
accurate timing requires CCLK timer which kills performance)
- - DMA burst mode;
- - cleanup: variable namings should be more verbose
- (i.e. not be a single letter like m_y, m_z, m_b ...);
- - sorcerml (pc8801) has buggy DMA burst mode, causing an underrun (hence a status U interrupt);
- - jettermi (pc8801) expects to colorize its underlying 400 b&w mode by masking with the
- text color attributes here;
- - xak2 (pc8801) throws text garbage on legacy renderer (verify);
+ - DMA burst mode;
+ - cleanup: variable namings should be more verbose
+ (i.e. not be a single letter like m_y, m_z, m_b ...);
+ - sorcerml (pc8801) has buggy DMA burst mode, causing an underrun (hence a status U interrupt);
+ - jettermi (pc8801) expects to colorize its underlying 400 b&w mode by masking with the
+ text color attributes here;
+ - xak2 (pc8801) throws text garbage on legacy renderer (verify);
*/
@@ -187,7 +187,7 @@ void upd3301_device::device_reset()
m_cm = 0;
m_b = 48;
m_reverse_display = false;
-
+
recompute_parameters();
}
@@ -581,7 +581,7 @@ UPD3301_FETCH_ATTRIBUTE( upd3301_device::default_attr_fetch )
u8 attr_end = std::min(attr_row[ex+2], attr_max_size);
// if the target is == 0 then just consider max size instead
// (starfire (pc8001) wants this otherwise will black screen on gameplay)
- if (attr_end == 0)
+ if (attr_end == 0)
attr_end = attr_max_size;
//printf("%04x %d %d [%02x]\n", ex, attr_start, attr_end, attr_value);
@@ -592,7 +592,7 @@ UPD3301_FETCH_ATTRIBUTE( upd3301_device::default_attr_fetch )
if (attr_end == attr_max_size)
break;
}
-
+
return attr_extend_info;
}
@@ -623,14 +623,14 @@ void upd3301_device::draw_scanline()
// - "highlight" should be attribute blinking?
// - is "gpa" actually NEC-ese for attr bus?
// - is sl0 / sl12 NEC names for upper/lower line?
-// int hlgt = 0;
-// int rvv = 0;
-// int vsp = 0;
-// int sl0 = 0;
-// int sl12 = 0;
-// int gpa = 0;
-
-// m_display_cb(m_bitmap, y, sx, cc, lc, hlgt, rvv, vsp, sl0, sl12, csr, gpa);
+// int hlgt = 0;
+// int rvv = 0;
+// int vsp = 0;
+// int sl0 = 0;
+// int sl12 = 0;
+// int gpa = 0;
+
+// m_display_cb(m_bitmap, y, sx, cc, lc, hlgt, rvv, vsp, sl0, sl12, csr, gpa);
m_display_cb(m_bitmap, y, sx, cc, lc, csr, m_attr_blink, extend_attr[sx], m_gfx_mode, is_lowestline);
}
}
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h
index 4388f730d0f..7532dc61c5b 100644
--- a/src/devices/video/upd3301.h
+++ b/src/devices/video/upd3301.h
@@ -56,7 +56,7 @@ class upd3301_device : public device_t,
public device_video_interface
{
public:
-// typedef device_delegate<void (bitmap_rgb32 &bitmap, int y, int sx, uint8_t cc, uint8_t lc, int hlgt, int rvv, int vsp, int sl0, int sl12, int csr, int gpa)> draw_character_delegate;
+// typedef device_delegate<void (bitmap_rgb32 &bitmap, int y, int sx, uint8_t cc, uint8_t lc, int hlgt, int rvv, int vsp, int sl0, int sl12, int csr, int gpa)> draw_character_delegate;
typedef device_delegate<void (bitmap_rgb32 &bitmap, int y, int sx, uint8_t cc, uint8_t lc, int csr, bool attr_blink_on, u16 attr, u8 gfx_mode, bool is_lowerline)> draw_character_delegate;
typedef device_delegate<std::array<u16, 80> (const std::array<u8, 41> attr_row, u8 gfx_mode, int y, u8 attr_fifo_size, u8 row_size)> fetch_attribute_delegate;
@@ -66,7 +66,7 @@ public:
void set_character_width(int value) { m_width = value; }
template <typename... T> void set_display_callback(T &&... args) { m_display_cb.set(std::forward<T>(args)...); }
template <typename... T> void set_attribute_fetch_callback(T &&... args) { m_attr_fetch_cb.set(std::forward<T>(args)...); }
-
+
UPD3301_FETCH_ATTRIBUTE( default_attr_fetch );
auto drq_wr_callback() { return m_write_drq.bind(); }
@@ -154,10 +154,10 @@ private:
int m_z; // horizontal blanking width
// attributes
-// int m_at1; //
-// int m_at0; //
-// int m_sc; //
- u8 m_gfx_mode; // AT1 + AT0 + SC
+// int m_at1; //
+// int m_at0; //
+// int m_sc; //
+ u8 m_gfx_mode; // AT1 + AT0 + SC
int m_attr; // attributes per row
int m_attr_blink; // attribute blink
int m_attr_frame; // attribute blink frame counter
diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp
index 1c263fed451..b10a62aee13 100644
--- a/src/frontend/mame/ui/viewgfx.cpp
+++ b/src/frontend/mame/ui/viewgfx.cpp
@@ -96,7 +96,7 @@ struct ui_gfx_state
int yoffs; // current Y offset
int zoom; // zoom factor, either x or 1/x
bool zoom_frac; // zoom via reciprocal fractions
- bool auto_zoom; // auto-zoom toggle
+ bool auto_zoom; // auto-zoom toggle
uint8_t rotate; // current rotation (orientation) value
uint32_t flags; // render flags
} tilemap;
diff --git a/src/lib/formats/rpk.cpp b/src/lib/formats/rpk.cpp
index a5b146d74aa..6171b6a4cb0 100644
--- a/src/lib/formats/rpk.cpp
+++ b/src/lib/formats/rpk.cpp
@@ -2,48 +2,48 @@
// copyright-holders:Michael Zapf
/***************************************************************************
- rpk.cpp
+ rpk.cpp
- RPK format support
+ RPK format support
- A RPK file ("rompack") contains a collection of dump files and a layout
- file that defines the kind of circuit board (PCB) used in the cartridge
- and the mapping of dumps to sockets on the board.
+ A RPK file ("rompack") contains a collection of dump files and a layout
+ file that defines the kind of circuit board (PCB) used in the cartridge
+ and the mapping of dumps to sockets on the board.
Example:
- <?xml version="1.0" encoding="utf-8"?>
- <romset>
- <resources>
- <rom id="gromimage" file="ed-assmg.bin" />
- </resources>
- <configuration>
- <pcb type="standard">
- <socket id="grom_socket" uses="gromimage"/>
- </pcb>
- </configuration>
- </romset>
+ <?xml version="1.0" encoding="utf-8"?>
+ <romset>
+ <resources>
+ <rom id="gromimage" file="ed-assmg.bin" />
+ </resources>
+ <configuration>
+ <pcb type="standard">
+ <socket id="grom_socket" uses="gromimage"/>
+ </pcb>
+ </configuration>
+ </romset>
DTD:
- <!ELEMENT romset (resources, configuration)>
- <!ELEMENT resources (rom|ram)+>
- <!ELEMENT rom EMPTY>
- <!ELEMENT ram EMPTY>
- <!ELEMENT configuration (pcb)>
- <!ELEMENT pcb (socket)+>
- <!ELEMENT socket EMPTY>
- <!ATTLIST romset version CDATA #IMPLIED>
- <!ATTLIST rom id ID #REQUIRED
- <!ATTLIST rom file CDATA #REQUIRED>
- <!ATTLIST rom crc CDATA #IMPLIED>
- <!ATTLIST rom sha1 CDATA #IMPLIED>
- <!ATTLIST ram id ID #REQUIRED>
- <!ATTLIST ram type (volatile|persistent) #IMPLIED>
- <!ATTLIST ram store (internal|external) #IMPLIED>
- <!ATTLIST ram file CDATA #IMPLIED>
- <!ATTLIST ram length CDATA #REQUIRED>
- <!ATTLIST pcb type CDATA #REQUIRED>
- <!ATTLIST socket id ID #REQUIRED>
- <!ATTLIST socket uses IDREF #REQUIRED>
+ <!ELEMENT romset (resources, configuration)>
+ <!ELEMENT resources (rom|ram)+>
+ <!ELEMENT rom EMPTY>
+ <!ELEMENT ram EMPTY>
+ <!ELEMENT configuration (pcb)>
+ <!ELEMENT pcb (socket)+>
+ <!ELEMENT socket EMPTY>
+ <!ATTLIST romset version CDATA #IMPLIED>
+ <!ATTLIST rom id ID #REQUIRED
+ <!ATTLIST rom file CDATA #REQUIRED>
+ <!ATTLIST rom crc CDATA #IMPLIED>
+ <!ATTLIST rom sha1 CDATA #IMPLIED>
+ <!ATTLIST ram id ID #REQUIRED>
+ <!ATTLIST ram type (volatile|persistent) #IMPLIED>
+ <!ATTLIST ram store (internal|external) #IMPLIED>
+ <!ATTLIST ram file CDATA #IMPLIED>
+ <!ATTLIST ram length CDATA #REQUIRED>
+ <!ATTLIST pcb type CDATA #REQUIRED>
+ <!ATTLIST socket id ID #REQUIRED>
+ <!ATTLIST socket uses IDREF #REQUIRED>
***************************************************************************/
@@ -55,7 +55,7 @@ namespace
{
/***************************************************************************
- TYPE DEFINITIONS
+ TYPE DEFINITIONS
***************************************************************************/
class rpk_category_impl : public std::error_category
@@ -67,7 +67,7 @@ public:
/***************************************************************************
- GLOBAL VARIABLES
+ GLOBAL VARIABLES
***************************************************************************/
rpk_category_impl const f_rpk_category_instance;
@@ -75,7 +75,7 @@ rpk_category_impl const f_rpk_category_instance;
/***************************************************************************
- RPK READER
+ RPK READER
***************************************************************************/
//-------------------------------------------------
@@ -220,7 +220,7 @@ std::error_condition rpk_reader::read(std::unique_ptr<util::random_read> &&strea
/***************************************************************************
- RPK FILE
+ RPK FILE
***************************************************************************/
//-------------------------------------------------
@@ -347,7 +347,7 @@ std::error_condition rpk_file::add_ram_socket(std::string &&id, const util::xml:
/***************************************************************************
- RPK SOCKET
+ RPK SOCKET
***************************************************************************/
//-------------------------------------------------
@@ -416,7 +416,7 @@ std::error_condition rpk_socket::read_file(std::vector<std::uint8_t> &result) co
/***************************************************************************
- RPK EXCEPTION HANDLING
+ RPK EXCEPTION HANDLING
***************************************************************************/
//-------------------------------------------------
diff --git a/src/lib/formats/rpk.h b/src/lib/formats/rpk.h
index 55b6f0a4839..f6e6360c21c 100644
--- a/src/lib/formats/rpk.h
+++ b/src/lib/formats/rpk.h
@@ -2,9 +2,9 @@
// copyright-holders:Michael Zapf
/***************************************************************************
- rpk.h
+ rpk.h
- RPK format support
+ RPK format support
***************************************************************************/
@@ -22,7 +22,7 @@
/***************************************************************************
- TYPE DEFINITIONS
+ TYPE DEFINITIONS
***************************************************************************/
class rpk_reader;
@@ -57,12 +57,12 @@ public:
std::error_condition read_file(std::vector<std::uint8_t> &result) const;
private:
- rpk_file & m_rpk;
- std::string m_id;
- socket_type m_type;
- std::string m_filename;
- std::optional<util::hash_collection> m_hashes;
- std::uint32_t m_length;
+ rpk_file & m_rpk;
+ std::string m_id;
+ socket_type m_type;
+ std::string m_filename;
+ std::optional<util::hash_collection> m_hashes;
+ std::uint32_t m_length;
};
@@ -87,9 +87,9 @@ public:
const std::list<rpk_socket> &sockets() const { return m_sockets; }
private:
- util::archive_file::ptr m_zipfile;
- int m_pcb_type;
- std::list<rpk_socket> m_sockets;
+ util::archive_file::ptr m_zipfile;
+ int m_pcb_type;
+ std::list<rpk_socket> m_sockets;
// accesors
util::archive_file &zipfile() { return *m_zipfile; }
@@ -127,8 +127,8 @@ public:
std::error_condition read(std::unique_ptr<util::random_read> &&stream, rpk_file::ptr &result) const;
private:
- char const *const * m_pcb_types;
- bool m_supports_ram;
+ char const *const * m_pcb_types;
+ bool m_supports_ram;
};
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index ffd8224a931..1cfeb83af07 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -677,10 +677,10 @@ ROM_END
TourVision was a Spanish developer, PCB had TourVision stickers, but this kind of machine was illegal in Spain, so made for the French market instead
- Ariège Amusements was the exclusive distributor of TourVision products until 1991, Paradise Automatique was a spin-off of this distributor
+ Ariège Amusements was the exclusive distributor of TourVision products until 1991, Paradise Automatique was a spin-off of this distributor
and was legally created in 1992 to import/export food vending machines, video games and audiovisual appliances and continued to work with
TourVision.
-
+
A version of this exists (on newer hardware?) with the title 'Lucky Gum' or 'Luck Gum' however the supported game shows no title screen so the title
is unknown.
*/
diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp
index 1f39b35d536..9ad8f15365b 100644
--- a/src/mame/drivers/acesp.cpp
+++ b/src/mame/drivers/acesp.cpp
@@ -116,8 +116,8 @@ void ace_sp_state::ace_sp_map(address_map &map)
// 0x33 - lamp stb
// 0x34 - shift stb
// 0x35 - shift clk
- map(0x36, 0x36).ram().rw(FUNC(ace_sp_state::serial_r), FUNC(ace_sp_state::serial_w)); // 0x36 - sio
-
+ map(0x36, 0x36).ram().rw(FUNC(ace_sp_state::serial_r), FUNC(ace_sp_state::serial_w)); // 0x36 - sio
+
// 0x37 - watchdog?
map(0x0038, 0x003b).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
/* 0x3c */
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 4f7b20828b4..56d5f7b95f7 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -586,19 +586,19 @@ uint8_t agat_base_state::controller_strobe_r()
void agat_base_state::controller_strobe_w(uint8_t data)
{
// 555 monostable one-shot timers; a running timer cannot be restarted
- if (machine().time().as_double() >= m_joystick_x1_time)
+ if (machine().time().as_double() >= m_joystick_x1_time)
{
m_joystick_x1_time = machine().time().as_double() + m_x_calibration * m_joy1x->read();
}
- if (machine().time().as_double() >= m_joystick_y1_time)
+ if (machine().time().as_double() >= m_joystick_y1_time)
{
m_joystick_y1_time = machine().time().as_double() + m_y_calibration * m_joy1y->read();
}
- if (machine().time().as_double() >= m_joystick_x2_time)
+ if (machine().time().as_double() >= m_joystick_x2_time)
{
m_joystick_x2_time = machine().time().as_double() + m_x_calibration * m_joy2x->read();
}
- if (machine().time().as_double() >= m_joystick_y2_time)
+ if (machine().time().as_double() >= m_joystick_y2_time)
{
m_joystick_y2_time = machine().time().as_double() + m_y_calibration * m_joy2y->read();
}
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 17aa59aee8c..349f6f95ad7 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -1323,7 +1323,7 @@ ROM_END
*/
ROM_START( ampkr2jsp )
- ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "3A".
+ ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "3A".
ROM_LOAD( "u6", 0x0000, 0x10000, CRC(183b67a6) SHA1(8d5b1ce401e8783641c666a5b190a1f052f2dfca) )
ROM_REGION( 0x4000, "gfx1", 0 )
@@ -1335,7 +1335,7 @@ ROM_START( ampkr2jsp )
ROM_END
ROM_START( ampkr2jspa )
- ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "zarate".
+ ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "zarate".
ROM_LOAD( "u6", 0x0000, 0x10000, CRC(35aa7c52) SHA1(8aa422b1b86d0366fe4736d97470fc330335ae78) )
ROM_REGION( 0x4000, "gfx1", 0 )
@@ -1346,7 +1346,7 @@ ROM_START( ampkr2jspa )
ROM_END
ROM_START( ampkr2jspb )
- ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "novomatic".
+ ROM_REGION( 0x10000, "maincpu", 0 ) // The set is marked as "novomatic".
ROM_LOAD( "u6", 0x0000, 0x10000, CRC(e2f5ff56) SHA1(ab793a4f15673d6d4447024172f6fa6c61719fe7) )
ROM_REGION( 0x4000, "gfx1", 0 )
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index d43eb3fa842..6020af74499 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -678,19 +678,19 @@ u8 apple2_state::controller_strobe_r()
void apple2_state::controller_strobe_w(u8 data)
{
// 558 monostable one-shot timers; a running timer cannot be restarted
- if (machine().time().as_double() >= m_joystick_x1_time)
+ if (machine().time().as_double() >= m_joystick_x1_time)
{
m_joystick_x1_time = machine().time().as_double() + m_x_calibration * m_gameio->pdl0_r();
}
- if (machine().time().as_double() >= m_joystick_y1_time)
+ if (machine().time().as_double() >= m_joystick_y1_time)
{
m_joystick_y1_time = machine().time().as_double() + m_y_calibration * m_gameio->pdl1_r();
}
- if (machine().time().as_double() >= m_joystick_x2_time)
+ if (machine().time().as_double() >= m_joystick_x2_time)
{
m_joystick_x2_time = machine().time().as_double() + m_x_calibration * m_gameio->pdl2_r();
}
- if (machine().time().as_double() >= m_joystick_y2_time)
+ if (machine().time().as_double() >= m_joystick_y2_time)
{
m_joystick_y2_time = machine().time().as_double() + m_y_calibration * m_gameio->pdl3_r();
}
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index e01bc172779..7df85e9c9cb 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -1543,7 +1543,7 @@ void apple2gs_state::machine_reset()
m_ramrd = false;
m_ramwrt = false;
m_ioudis = true;
- m_newvideo = 0x01; // verified on ROM03 hardware
+ m_newvideo = 0x01; // verified on ROM03 hardware
m_clock_frame = 0;
m_mouse_x = 0x00;
m_mouse_y = 0x00;
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 0fd418de9c8..2a17942f426 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -375,7 +375,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( dangerex )
- PORT_START("IN0") /* e00000 */
+ PORT_START("IN0") /* e00000 */
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_CUSTOM ) // Toggle 0 - D4
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_CUSTOM ) // Toggle 1 - D5
@@ -798,7 +798,7 @@ ROM_END
ROM_START( dangerex )
- ROM_REGION( 0x80004, "maincpu", 0 ) /* 68000 code */
+ ROM_REGION( 0x80004, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "dx8d-0h.8d", 0x00000, 0x20000, CRC(4957b65d) SHA1(de9f187b6496cf96d29c4b1b29887abc2bdf9bf0) )
ROM_LOAD16_BYTE( "dx8c-0l.8c", 0x00001, 0x20000, CRC(aedcb497) SHA1(7e201b7db5c0ff661f782566a6b17299d514c77a) )
ROM_LOAD16_BYTE( "dx9d-1h.9d", 0x40000, 0x20000, CRC(2eb943e2) SHA1(87dbf11720e2938bf5755b13231fc668ab3e0e05) )
@@ -849,7 +849,7 @@ ROM_START( dangerex )
ROM_REGION( 0x800, "eeprom", 0 )
ROM_LOAD( "dx-eeprom.5c", 0x0000, 0x800, CRC(d14e813d) SHA1(b206ce85f7a87986d401d34eafa188b5bffae08c) )
- ROM_REGION( 0x0600, "proms", 0 ) /* microcode for growth renderer */
+ ROM_REGION( 0x0600, "proms", 0 ) /* microcode for growth renderer */
ROM_LOAD( "092-1001.20p", 0x0000, 0x0200, NO_DUMP )
ROM_LOAD( "092-1002.22p", 0x0200, 0x0200, NO_DUMP )
ROM_LOAD( "092-1003.21p", 0x0400, 0x0200, NO_DUMP )
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index d47eec28897..766c226382b 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -218,21 +218,21 @@ void barni_state::barni(machine_config &config)
config.set_default_layout(layout_barni);
PIA6821(config, m_pia1, 0);
-// m_pia1->writepa_handler().set(FUNC(barni_state::pia1_pa_w));
-// m_pia1->writepb_handler().set(FUNC(barni_state::pia1_pb_w));
-// m_pia1->readpa_handler().set(FUNC(barni_state::pia1_pa_r));
+// m_pia1->writepa_handler().set(FUNC(barni_state::pia1_pa_w));
+// m_pia1->writepb_handler().set(FUNC(barni_state::pia1_pb_w));
+// m_pia1->readpa_handler().set(FUNC(barni_state::pia1_pa_r));
PIA6821(config, m_pia2, 0);
-// m_pia2->writepa_handler().set(FUNC(barni_state::pia2_pa_w));
-// m_pia2->writepb_handler().set(FUNC(barni_state::pia2_pb_w));
-// m_pia2->readpa_handler().set(FUNC(barni_state::pia2_pa_r));
+// m_pia2->writepa_handler().set(FUNC(barni_state::pia2_pa_w));
+// m_pia2->writepb_handler().set(FUNC(barni_state::pia2_pb_w));
+// m_pia2->readpa_handler().set(FUNC(barni_state::pia2_pa_r));
MOS6522(config, m_via, 4'000'000 / 4); // to check
m_via->irq_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
m_via->writepa_handler().set(FUNC(barni_state::via_pa_w));
m_via->writepb_handler().set(FUNC(barni_state::via_pb_w));
-// m_via->ca2_handler().set(FUNC(barni_state::via_ca2_w));
-// m_via->cb2_handler().set(FUNC(barni_state::via_cb2_w));
+// m_via->ca2_handler().set(FUNC(barni_state::via_ca2_w));
+// m_via->cb2_handler().set(FUNC(barni_state::via_cb2_w));
// SOUND BOARD
M6802(config, m_audiocpu, 4000000); // guess - crystal value not shown
diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp
index 216fbad30b6..dbd7318286c 100644
--- a/src/mame/drivers/cybstorm.cpp
+++ b/src/mame/drivers/cybstorm.cpp
@@ -12,8 +12,8 @@
Known bugs:
* STAIN effect not 100% correct
- Possible bugs:
- * Tilemap offsets shifted by 1 pixel?
+ Possible bugs:
+ * Tilemap offsets shifted by 1 pixel?
***************************************************************************/
diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp
index acb4be7a6ff..bae54af37e7 100644
--- a/src/mame/drivers/mpu4.cpp
+++ b/src/mame/drivers/mpu4.cpp
@@ -1517,7 +1517,7 @@ ROM_END
BARCREST SAMPLED SOUND
_________________________
- | · |
+ | · |
| · |
| · |
| · |_____________
@@ -1543,7 +1543,7 @@ Just one different byte between the three "Escalera y Tobogan" sets, at address
1268: 0xF4
1269: 0xF5
1270: 0xF6
-May be the game serial number hard-encoded on the EPROM?
+May be the game serial number hard-encoded on the EPROM?
*/
ROM_START( m4esctbg )
ROM_REGION( 0x20000, "maincpu", 0 )
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index e7b4d49ddb4..bf6d54e3fd0 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -5115,7 +5115,7 @@ ROM_START( mushikk )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x4000000, "rom_board", ROMREGION_ERASEFF )
- ROM_LOAD( "epr-24265.ic11", 0x0000000, 0x0400000, CRC(dccb210b) SHA1(35891f97bec251083b2c927e926d73685d750a4d) )
+ ROM_LOAD( "epr-24265.ic11", 0x0000000, 0x0400000, CRC(dccb210b) SHA1(35891f97bec251083b2c927e926d73685d750a4d) )
ROM_LOAD32_WORD( "opr-24266.ic17s", 0x1000000, 0x0800000, CRC(293e5350) SHA1(7107d3378fe3a73e868bc03e0572b19e91152a3b) )
ROM_LOAD32_WORD( "opr-24267.ic18", 0x1000002, 0x0800000, CRC(80798f9a) SHA1(a843a052dce254f9a5a7b7024f21e4e6f8621666) )
ROM_LOAD32_WORD( "opr-24268.ic19s", 0x2000000, 0x0800000, CRC(b512c772) SHA1(f45084f2e242e07e47c25eeeed44624274a95a7e) )
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 1e48dde03ac..9e790f900b4 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -16,24 +16,24 @@
- PCG-1000;
- Intel 8251;
- cassette;
- - dip-switches;
+ - dip-switches;
- PC-8011 (expansion unit)
- PC-8021;
- PC-8031 (mini disk unit, in progress)
- - pc8001mk2sr: verify how much needs to be ported from pc8801.cpp code
- (Has 3 bitplane GVRAM like PC-8801 V1 mode);
- - waitstates & DMA penalty (some games are suspciously fast);
- - buzzer has pretty ugly aliasing in places;
+ - pc8001mk2sr: verify how much needs to be ported from pc8801.cpp code
+ (Has 3 bitplane GVRAM like PC-8801 V1 mode);
+ - waitstates & DMA penalty (some games are suspciously fast);
+ - buzzer has pretty ugly aliasing in places;
Notes:
- pc8001 v1.01 / v1.02 sports a buggy readout of the expansion ROM at PC=17a1:
It expects an header read of 0x41-0x42 at offset $6000-6001, but second read at
PC=0x17aa is just a comparison to $6000 == 0x42, which is impossible at that point
unless external aid is given. This has been fixed in v1.10;
- - Color Magical (pc8001gp:flop5 option 7) transfers two 8 color screens at
- even/odd frame intervals, effectively boosting the number of available colors to 27.
- This trick is kinda flickery even on real HW, no wonder it looks ugly in MAME,
- can it be improved?
+ - Color Magical (pc8001gp:flop5 option 7) transfers two 8 color screens at
+ even/odd frame intervals, effectively boosting the number of available colors to 27.
+ This trick is kinda flickery even on real HW, no wonder it looks ugly in MAME,
+ can it be improved?
*/
@@ -152,7 +152,7 @@ UPD3301_DRAW_CHARACTER_MEMBER( pc8001_base_state::draw_text )
if (reverse ^ m_screen_reverse)
tile ^= 0xff;
-// if (m_width80)
+// if (m_width80)
{
u8 pen;
@@ -170,7 +170,7 @@ UPD3301_DRAW_CHARACTER_MEMBER( pc8001_base_state::draw_text )
pen = tile;
pen = (pen >> (7 - (xi >> (dot_width - 1)))) & 1;
}
-
+
for (int di = 0; di < dot_width; di++)
bitmap.pix(y, res_x + di) = m_crtc_palette->pen(pen ? color : 0);
}
@@ -237,7 +237,7 @@ void pc8001_base_state::port30_w(uint8_t data)
/* color mode */
m_color = BIT(data, 1);
-
+
m_cassette->change_state(BIT(data, 3) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
}
@@ -257,7 +257,7 @@ void pc8001mk2_state::port31_w(uint8_t data)
7 background color
*/
- membank("bank2")->set_entry(data & 1);
+ membank("bank2")->set_entry(data & 1);
}
WRITE_LINE_MEMBER( pc8001_state::write_centronics_busy )
@@ -438,8 +438,8 @@ void pc8001mk2sr_state::port71_w(u8 data)
void pc8001mk2sr_state::pc8001mk2sr_io(address_map &map)
{
- pc8001mk2_io(map);
- map(0x33, 0x33).w(FUNC(pc8001mk2sr_state::port33_w));
+ pc8001mk2_io(map);
+ map(0x33, 0x33).w(FUNC(pc8001mk2sr_state::port33_w));
map(0x71, 0x71).rw(FUNC(pc8001mk2sr_state::port71_r), FUNC(pc8001mk2sr_state::port71_w));
}
@@ -546,13 +546,13 @@ static INPUT_PORTS_START( pc8001 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
-// PORT_START("DSW1")
+// PORT_START("DSW1")
INPUT_PORTS_END
static INPUT_PORTS_START( pc8001mk2 )
- PORT_INCLUDE( pc8001 )
+ PORT_INCLUDE( pc8001 )
- PORT_START("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Boot Mode" )
PORT_DIPSETTING( 0x00, "N-BASIC" )
PORT_DIPSETTING( 0x01, "N80-BASIC" )
@@ -606,7 +606,7 @@ static INPUT_PORTS_START( pc8001mk2 )
INPUT_PORTS_END
static INPUT_PORTS_START( pc8001mk2sr )
- PORT_INCLUDE( pc8001mk2 )
+ PORT_INCLUDE( pc8001mk2 )
PORT_MODIFY("DSW1")
// This is really a tri-state dip on front panel
@@ -690,10 +690,10 @@ void pc8001_state::machine_start()
program.install_readwrite_bank(0x0000, 0x5fff, membank("bank1"));
program.install_readwrite_bank(0x6000, 0xbfff, membank("bank2"));
program.install_readwrite_bank(0x8000, 0xffff, membank("bank3"));
-// membank("bank2")->set_entry(0);
+// membank("bank2")->set_entry(0);
break;
}
-
+
// PC8001 is 15KHz only
set_screen_frequency(false);
}
@@ -707,18 +707,18 @@ void pc8001_state::machine_reset()
void pc8001mk2sr_state::machine_start()
{
- pc8001_state::machine_start();
+ pc8001_state::machine_start();
membank("bank1")->configure_entry(2, m_n80sr_rom->base());
membank("bank2")->configure_entry(2, m_n80sr_rom->base() + 0x6000);
membank("bank2")->configure_entry(3, m_n80sr_rom->base() + 0x8000);
-
+
save_item(NAME(m_n80sr_bank));
}
void pc8001mk2sr_state::machine_reset()
{
- pc8001_state::machine_reset();
+ pc8001_state::machine_reset();
//membank("bank1")->set_entry(2);
//membank("bank2")->set_entry(2);
@@ -728,8 +728,8 @@ void pc8001mk2sr_state::machine_reset()
void pc8001_state::pc8001(machine_config &config)
{
- constexpr XTAL MASTER_CLOCK = XTAL(4'000'000);
- constexpr XTAL VIDEO_CLOCK = XTAL(14'318'181);
+ constexpr XTAL MASTER_CLOCK = XTAL(4'000'000);
+ constexpr XTAL VIDEO_CLOCK = XTAL(14'318'181);
/* basic machine hardware */
Z80(config, m_maincpu, MASTER_CLOCK);
@@ -744,7 +744,7 @@ void pc8001_state::pc8001(machine_config &config)
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_raw(VIDEO_CLOCK, 896, 0, 640, 260, 0, 200);
m_screen->set_screen_update(FUNC(pc8001_state::screen_update));
-// m_screen->set_palette(m_crtc_palette);
+// m_screen->set_palette(m_crtc_palette);
PALETTE(config, m_crtc_palette, palette_device::BRG_3BIT);
@@ -783,7 +783,7 @@ void pc8001_state::pc8001(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- // TODO: unknown clock, is it really a beeper?
+ // TODO: unknown clock, is it really a beeper?
BEEP(config, m_beep, 2400).add_route(ALL_OUTPUTS, "mono", 0.25);
}
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index 8746a52fb41..2e975032af3 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -655,7 +655,7 @@ void pc8801_state::pc8801_alu_w(offs_t offset, uint8_t data)
for(i=0;i<3;i++)
{
logic_op = (m_alu_ctrl1 & (0x11 << i)) >> i;
-
+
switch(logic_op)
{
case 0x00: { m_gvram[i*0x4000 + offset] &= ~data; } break;
@@ -843,7 +843,7 @@ void pc8801_state::pc8801_mem_w(offs_t offset, uint8_t data)
window_offset = (offset & 0x3ff) + (m_window_offset_bank << 8);
// castlex and imenes accesses this
- // TODO: high TVRAM even
+ // TODO: high TVRAM even
// (uPD3301 reads from this instead of the regular work RAM)
if(((window_offset & 0xf000) == 0xf000) && (m_misc_ctrl & 0x10))
pc8801_high_wram_w(window_offset & 0xfff,data);
@@ -2165,7 +2165,7 @@ MACHINE_RESET_MEMBER(pc8801_state,pc8801_clock_speed)
m_maincpu->set_unscaled_clock(m_clock_setting ? XTAL(4'000'000) : XTAL(8'000'000));
// TODO: FDC board shouldn't be connected to the clock setting, verify
-// m_fdccpu->set_unscaled_clock(m_clock_setting ? XTAL(4'000'000) : XTAL(8'000'000));
+// m_fdccpu->set_unscaled_clock(m_clock_setting ? XTAL(4'000'000) : XTAL(8'000'000));
m_baudrate_val = 0;
}
@@ -2240,7 +2240,7 @@ void pc8801_state::pc8801(machine_config &config)
config.set_perfect_quantum(m_maincpu);
config.set_perfect_quantum("pc80s31:fdc_cpu");
-// config.set_maximum_quantum(attotime::from_hz(MASTER_CLOCK/1024));
+// config.set_maximum_quantum(attotime::from_hz(MASTER_CLOCK/1024));
#if USE_PROPER_I8214
I8214(config, I8214_TAG, MASTER_CLOCK);
diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp
index 64b44c8b712..e730e1536f9 100644
--- a/src/mame/drivers/rollext.cpp
+++ b/src/mame/drivers/rollext.cpp
@@ -71,16 +71,16 @@
- TODO:
+ TODO:
- - TMS320C82 parallel processors are not emulated
- * PP0 transfers polygon data from a software FIFO to the graphics processor. This is currently HLE'd.
- * PP1 most likely does sound mixing. This is currently not emulated.
- - 93C66 EEPROM
- - Alpha blending (probably based on palette index like on gaelco3d)
- - Minor Z-buffer issues
- - Wrong textures in a few places (could be a CPU core bug)
- - Networking
+ - TMS320C82 parallel processors are not emulated
+ * PP0 transfers polygon data from a software FIFO to the graphics processor. This is currently HLE'd.
+ * PP1 most likely does sound mixing. This is currently not emulated.
+ - 93C66 EEPROM
+ - Alpha blending (probably based on palette index like on gaelco3d)
+ - Minor Z-buffer issues
+ - Wrong textures in a few places (could be a CPU core bug)
+ - Networking
*/
@@ -193,7 +193,7 @@ void rollext_renderer::render_texture_scan(int32_t scanline, const extent_t &ext
int ty = tex_origin_y + (int)(v);
-#if BILINEAR
+#if BILINEAR
float intu, intv;
int fracu = modff(u, &intu) * 255.0f;
@@ -470,7 +470,7 @@ uint32_t rollext_state::a0000000_r(offs_t offset, uint32_t mem_mask)
data |= m_in[0]->read() << 16;
data |= m_in[1]->read();
- data |= 0x200; // 0 causes inf loop
+ data |= 0x200; // 0 causes inf loop
// -------- ---x---- -------- -------- ADC channel 0
// -------- --x----- -------- -------- ADC channel 1?
@@ -485,7 +485,7 @@ uint32_t rollext_state::a0000000_r(offs_t offset, uint32_t mem_mask)
case 1:
uint32_t data = 0;
data |= m_in[2]->read();
- return data;
+ return data;
}
return 0xffffffff;
@@ -538,7 +538,7 @@ void rollext_state::cmd_callback(address_space &space, uint32_t data)
if (command & 0x00004000)
{
// simulate PP behavior for now...
- space.write_dword(0x00000084, 3);
+ space.write_dword(0x00000084, 3);
m_renderer->m_fb_current ^= 1;
m_renderer->clear_fb();
@@ -559,7 +559,7 @@ void rollext_state::cmd_callback(address_space &space, uint32_t data)
}
void rollext_state::palette_w(offs_t offset, uint32_t data, uint32_t mem_mask)
-{
+{
if (ACCESSING_BITS_16_31)
{
m_renderer->palette_write((offset * 2) + 1, data >> 16);
@@ -609,7 +609,7 @@ void rollext_state::memmap(address_map &map)
static INPUT_PORTS_START(rollext)
PORT_START("INPUTS1")
- PORT_SERVICE_NO_TOGGLE(0x8, IP_ACTIVE_LOW) // test button
+ PORT_SERVICE_NO_TOGGLE(0x8, IP_ACTIVE_LOW) // test button
PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_VOLUME_DOWN)
PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_SERVICE1)
PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_VOLUME_UP)
@@ -668,7 +668,7 @@ void rollext_state::fifo_ptr_w(offs_t offset, uint32_t data, uint32_t mem_mask)
}
m_maincpu->space().write_dword(0x600ffffc, oldnum + consume_num);
m_maincpu->space().write_dword(0x00000090, 0);
- }
+ }
}
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index 3605cc72880..3e1b93d9c51 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -483,12 +483,12 @@ private:
enum {
REGION_NTSC_0 = 0,
REGION_NTSC_JAPAN,
-// REGION_NTSC_TAIWAN,
+// REGION_NTSC_TAIWAN,
REGION_NTSC_KOREA,
REGION_NTSC_3,
REGION_NTSC_USA, // & Canada, Mexico
REGION_NTSC_BRAZIL,
-// REGION_NTSC_KOREA,
+// REGION_NTSC_KOREA,
REGION_NTSC_TAIWAN, // & Philippines
REGION_NTSC_7,
REGION_PAL_8,
diff --git a/src/mame/drivers/spg2xx_jakks.cpp b/src/mame/drivers/spg2xx_jakks.cpp
index da3125d5e32..7deed4f8473 100644
--- a/src/mame/drivers/spg2xx_jakks.cpp
+++ b/src/mame/drivers/spg2xx_jakks.cpp
@@ -216,7 +216,7 @@ CONS( 2004, jak_mpacw,0, 0, jakks_mpac, jak_mpac, jakks_state, empty_init, "JA
// This was available in 2 different case styles, initially an underwater / jellyfish themed one, then later
// reissued in a 'SpongeBob head' style case reminiscent of the undumpable 2003 SpongeBob plug and play but
// with 2 buttons in the top left corner instead of 1
-//
+//
// The software on both versions of Jellyfish Dodge is believed to be the same, the build date can be seen in
// the 'hidden' test mode.
//
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 6a68ab80321..d2c4ed50e8f 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -92,7 +92,7 @@ protected:
void pc8001_map(address_map &map);
virtual void machine_start() override;
- virtual void machine_reset() override;
+ virtual void machine_reset() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -123,7 +123,7 @@ public:
pc8001mk2_state(const machine_config &mconfig, device_type type, const char *tag)
: pc8001_state(mconfig, type, tag)
, m_kanji_rom(*this, "kanji")
- , m_dsw(*this, "DSW%d", 1U)
+ , m_dsw(*this, "DSW%d", 1U)
{ }
void pc8001mk2(machine_config &config);
@@ -133,7 +133,7 @@ protected:
void pc8001mk2_map(address_map &map);
required_memory_region m_kanji_rom;
- required_ioport_array<2> m_dsw;
+ required_ioport_array<2> m_dsw;
private:
void port31_w(uint8_t data);
};
@@ -150,10 +150,10 @@ public:
private:
virtual void machine_start() override;
- virtual void machine_reset() override;
- void pc8001mk2sr_io(address_map &map);
+ virtual void machine_reset() override;
+ void pc8001mk2sr_io(address_map &map);
- required_memory_region m_n80sr_rom;
+ required_memory_region m_n80sr_rom;
void port33_w(u8 data);
u8 port71_r();
diff --git a/src/mame/layout/ace_sp_dmd.lay b/src/mame/layout/ace_sp_dmd.lay
index e00e8abeabd..d3876c787e2 100644
--- a/src/mame/layout/ace_sp_dmd.lay
+++ b/src/mame/layout/ace_sp_dmd.lay
@@ -14,7 +14,7 @@ license:CC0
<color state="0" red="0.125" green="0.125" blue="0.125" />
</disk>
</element>
-
+
<group name="dmd">
<repeat count="24">
<param name="s" start="0" increment="64" />
diff --git a/src/mame/machine/ace_sp_reelctrl.cpp b/src/mame/machine/ace_sp_reelctrl.cpp
index b4fd316b235..dbec9211045 100644
--- a/src/mame/machine/ace_sp_reelctrl.cpp
+++ b/src/mame/machine/ace_sp_reelctrl.cpp
@@ -42,7 +42,7 @@ void ace_sp_reelctrl_base_device::device_add_mconfig(machine_config &config)
}
ROM_START( ace_sp_reelctrl )
- ROM_REGION16_BE( 0x0800, "mcu", 0 )
+ ROM_REGION16_BE( 0x0800, "mcu", 0 )
ROM_LOAD( "ace reel mcu v9 _space_.bin", 0, 0x0800, CRC(d7b91fe0) SHA1(44f78da8138caf4f79f1e8e9a2abe53d79c0fe79) ) // MC68705P3 internal ROM
ROM_END
@@ -52,7 +52,7 @@ const tiny_rom_entry *ace_sp_reelctrl_device::device_rom_region() const
}
ROM_START( ace_sp_reelctrl_pcp )
- ROM_REGION16_BE( 0x0800, "mcu", 0 )
+ ROM_REGION16_BE( 0x0800, "mcu", 0 )
ROM_LOAD( "pcp reel mcu fcr 1 _space_.bin", 0, 0x0800, CRC(1c8019bf) SHA1(d1d6ea68d9aace4a4ea0de212f17426bccfe5856) ) // MC68705P3 internal ROM
ROM_END
diff --git a/src/mame/machine/pc80s31k.cpp b/src/mame/machine/pc80s31k.cpp
index 317a9edd988..eb05acb8cfd 100644
--- a/src/mame/machine/pc80s31k.cpp
+++ b/src/mame/machine/pc80s31k.cpp
@@ -2,34 +2,34 @@
// copyright-holders:Angelo Salese, Olivier Galibert
/**************************************************************************************************
- NEC PC-80S31(K) Mini Disk Unit
-
- Z80 + μPD765 + PPI that connects in cross with an host PPI
-
- "Mini" as compared to the PC-8881 8-inch floppy I/F
-
- Design is decidedly derived from Epson TF-20 and friends,
- cfr. devices/bus/epson_sio/tf20.cpp
-
- TODO:
- - What's PC-80S32? Is it the 88VA version or a different beast?
- - PC=0x7dd reads from FDC bit 3 in ST3 (twosid_r fn),
- expecting a bit 3 high for all the PC8001 games otherwise keeps looping and eventually dies.
- Are those incorrectly identified as 2DD? Hacked to work for now;
- - set_input_line_vector fn doesn't work properly when issued from a device_reset,
- we currently just implement the irq_callback instead;
- - Bus option;
- - Cascade mode, i.e. the CN2 connector used to accept a second disk unit for drive 2 & 3;
- - pc80s31k: verify that irq vector write (I/O port $f0) belongs here or just
- whatever PC88VA uses.
- - printer interface (used for debugging? 4-bit serial?)
- - Pinpoint what host I/O ports $f6, $f7 truly are
+ NEC PC-80S31(K) Mini Disk Unit
+
+ Z80 + μPD765 + PPI that connects in cross with an host PPI
+
+ "Mini" as compared to the PC-8881 8-inch floppy I/F
+
+ Design is decidedly derived from Epson TF-20 and friends,
+ cfr. devices/bus/epson_sio/tf20.cpp
+
+ TODO:
+ - What's PC-80S32? Is it the 88VA version or a different beast?
+ - PC=0x7dd reads from FDC bit 3 in ST3 (twosid_r fn),
+ expecting a bit 3 high for all the PC8001 games otherwise keeps looping and eventually dies.
+ Are those incorrectly identified as 2DD? Hacked to work for now;
+ - set_input_line_vector fn doesn't work properly when issued from a device_reset,
+ we currently just implement the irq_callback instead;
+ - Bus option;
+ - Cascade mode, i.e. the CN2 connector used to accept a second disk unit for drive 2 & 3;
+ - pc80s31k: verify that irq vector write (I/O port $f0) belongs here or just
+ whatever PC88VA uses.
+ - printer interface (used for debugging? 4-bit serial?)
+ - Pinpoint what host I/O ports $f6, $f7 truly are
(direct FDC access from this device or a different beast? cfr. play6lim with pc8001mk2)
- filemst tries to access undocumented I/O port $09 at PC=5000:
- \- If that's 0 then it tries to read a vector at [0x8000];
- \- It then tries to read at memory [0xc0ff], set the value read in [0xf012];
- \- Expects that ROM [0x0000] is not equal to 0xc3;
- Bottom line: Is it trying to access some custom HW?
+ \- If that's 0 then it tries to read a vector at [0x8000];
+ \- It then tries to read at memory [0xc0ff], set the value read in [0xf012];
+ \- Expects that ROM [0x0000] is not equal to 0xc3;
+ Bottom line: Is it trying to access some custom HW?
===================================================================================================
@@ -37,29 +37,29 @@ PCB (PC-80S31K)
===================================================================================================
- |--------------------------------------|
- | P1 P2 P3 X1 |
- | |
- | CN2 |
+ |--------------------------------------|
+ | P1 P2 P3 X1 |
+ | |
+ | CN2 |
| B6102C022 |
| FD1 FD2 (**) |
| | | |
| CN1 ------- D765AC D2364EC (*)|
- | (*)|
- | D8255AC-2 B6101C017 D780C-1 |
- | |
- |--------------------------------------|
-
- PCB is marked PC-80S31KFDC NEC-14T
- P1, P2, P3 are power supplies (+5V, +12V, -5V for P1, lacks -5V for the other two)
- μPD2364EC is at position IC13, it's a 8192 size ROM. (***)
- (*) are μPD41416C
- (**) marked as JP, unpopulated x 3;
- μPB6101/2 are bipolar TTL gate arrays, presumably
- Cannot read marking of X1 (8 MHz?)
-
- (***) Given this, we guess that PC80S31 is the 2D version while the 'K
- variant is the 2D/2DD/2HD version.
+ | (*)|
+ | D8255AC-2 B6101C017 D780C-1 |
+ | |
+ |--------------------------------------|
+
+ PCB is marked PC-80S31KFDC NEC-14T
+ P1, P2, P3 are power supplies (+5V, +12V, -5V for P1, lacks -5V for the other two)
+ μPD2364EC is at position IC13, it's a 8192 size ROM. (***)
+ (*) are μPD41416C
+ (**) marked as JP, unpopulated x 3;
+ μPB6101/2 are bipolar TTL gate arrays, presumably
+ Cannot read marking of X1 (8 MHz?)
+
+ (***) Given this, we guess that PC80S31 is the 2D version while the 'K
+ variant is the 2D/2DD/2HD version.
===================================================================================================
@@ -67,7 +67,7 @@ Command Protocol
===================================================================================================
-Command & parameters are normally communicated from Host via port B
+Command & parameters are normally communicated from Host via port B
(read on port A on FDC side)
An RPi implementation can be seen at https://github.com/MinatsuT/RPi_PC-80S31
@@ -93,10 +93,10 @@ An RPi implementation can be seen at https://github.com/MinatsuT/RPi_PC-80S31
%7 destination sector number +1
[0x05] Format
%1 drive number
-[0x06] Send result status to Host
+[0x06] Send result status to Host
x--- ---- I/O complete
- -x-- ---- has unread buffer
- ---- ---x error occurred
+ -x-- ---- has unread buffer
+ ---- ---x error occurred
[0x07] Drive status
[0x0b] Send memory data
%1-%2 address start
@@ -110,12 +110,12 @@ An RPi implementation can be seen at https://github.com/MinatsuT/RPi_PC-80S31
(picks up number of sector etc. from previous issued commands?)
[0x14] Device status
x--- ---- ESIG: error
- -x-- ---- WPDR: write protected
- --x- ---- RDY: ready
- ---x ---- TRK0: track 0
- ---- x--- DSDR: double sided drive
- ---- -x-- HDDR: head
- ---- --xx DS1, DS2: drive select
+ -x-- ---- WPDR: write protected
+ --x- ---- RDY: ready
+ ---x ---- TRK0: track 0
+ ---- x--- DSDR: double sided drive
+ ---- -x-- HDDR: head
+ ---- --xx DS1, DS2: drive select
(same as 765 ST3?)
[0x17] Mode change
%1 ---- xxxx mode select
@@ -133,7 +133,7 @@ Used as a communication protocol flags
(swap 4-bit nibbles and r/w direction for FDC side, all bits are active high):
x--- ---- (w) ATN AtenTioN:
host sends a command to FDC, interrupts current one
- (looks unconnected the other way around?)
+ (looks unconnected the other way around?)
-x-- ---- (w) DAC DAta aCcepted:
host just picked up data from FDC
--x- ---- (w) RFD Ready For Data:
@@ -231,11 +231,11 @@ void pc80s31_device::fdc_io(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
-// map(0x09, 0x09).r accessed by filemst (pc8801), cfr. notes
+// map(0x09, 0x09).r accessed by filemst (pc8801), cfr. notes
-// map(0xf0, 0xf0).w(FUNC(pc8801_state::fdc_irq_vector_w)); // Interrupt Opcode Port
-// map(0xf4, 0xf4).w(FUNC(pc8801_state::fdc_drive_mode_w)); // Drive mode, 2d, 2dd, 2hd
-// map(0xf6, 0xf6).nopw(); // printer related
+// map(0xf0, 0xf0).w(FUNC(pc8801_state::fdc_irq_vector_w)); // Interrupt Opcode Port
+// map(0xf4, 0xf4).w(FUNC(pc8801_state::fdc_drive_mode_w)); // Drive mode, 2d, 2dd, 2hd
+// map(0xf6, 0xf6).nopw(); // printer related
map(0xf7, 0xf7).nopw(); // printer port output
map(0xf8, 0xf8).rw(FUNC(pc80s31_device::terminal_count_r), FUNC(pc80s31_device::motor_control_w));
map(0xfa, 0xfb).m(m_fdc, FUNC(upd765a_device::map));
@@ -301,7 +301,7 @@ void pc80s31_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_fdc->tc_w(false);
- // several games tries to scan invalid IDs from their structures, if this hits then
+ // several games tries to scan invalid IDs from their structures, if this hits then
// it's possibly an attempt to scan a missing sector from the floppy structure.
// cfr. acrojet: the third read data command issued tries to access a CHRN of (0, 0, 16, 256)
// and checks at PC=500B if any of these status flags are satisfied:
@@ -313,7 +313,7 @@ void pc80s31_device::device_timer(emu_timer &timer, device_timer_id id, int para
if ((u8)m_fdc_cpu->state_int(Z80_HALT) == 1)
{
logerror("%s: attempt to trigger TC while in HALT state (read ID copy protection warning)\n", machine().describe_context());
-// throw emu_fatalerror("copy protection hit");
+// throw emu_fatalerror("copy protection hit");
}
}
@@ -324,7 +324,7 @@ void pc80s31_device::device_timer(emu_timer &timer, device_timer_id id, int para
void pc80s31_device::device_start()
{
m_tc_zero_timer = timer_alloc(0);
-
+
save_item(NAME(m_irq_vector));
}
@@ -357,14 +357,14 @@ void pc80s31_device::device_reset()
template <unsigned N> u8 pc80s31_device::latch_r()
{
const int port_mask = N & 4 ? 0x0f : 0xff;
-// machine().scheduler().synchronize();
+// machine().scheduler().synchronize();
return m_latch[N]->read() & port_mask;
}
template <unsigned N> void pc80s31_device::latch_w(u8 data)
{
const int lower_nibble = N & 4;
-// machine().scheduler().synchronize();
+// machine().scheduler().synchronize();
if (lower_nibble)
{
LOG("%s: %s port C write %02x (ATN=%d DAC=%d RFD=%d DAV=%d)\n"
@@ -398,14 +398,14 @@ void pc80s31_device::motor_control_w(uint8_t data)
{
// FIXME: on pc80s31k device (particularly on later releases) this stays always on
// babylon: just spins indefinitely at PC=6d8 (using the internal routines),
- // waiting for DAV or ATN being on. Never hits the port until a flag is issued.
+ // waiting for DAV or ATN being on. Never hits the port until a flag is issued.
// prajator: on idle times it spins at PC=7060, waiting for ATN and keep issuing a 0xff here.
// valis2: calls PC=7009 subroutine for idle, waits for ATN on.
// It eventually writes a 0 here, not before an extremely long time
// (~10000 frames!)
m_floppy[0]->get_device()->mon_w(!(data & 1));
m_floppy[1]->get_device()->mon_w(!(data & 2));
-
+
// TODO: according to docs a value of 0x07 enables precompensation to tracks 0-19, 0xf enables it on 20-39
}
diff --git a/src/mame/machine/pc80s31k.h b/src/mame/machine/pc80s31k.h
index a1f9209e75e..b21d2845daf 100644
--- a/src/mame/machine/pc80s31k.h
+++ b/src/mame/machine/pc80s31k.h
@@ -60,7 +60,7 @@ private:
u8 terminal_count_r(address_space &space);
void motor_control_w(u8 data);
-
+
emu_timer *m_tc_zero_timer;
IRQ_CALLBACK_MEMBER(irq_cb);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 13b19ca5586..9cfd3faacb6 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -33857,7 +33857,7 @@ pc6601 //
@source:pc8001.cpp
pc8001 // 1979
pc8001mk2 // 1983
-pc8001mk2sr // 1985
+pc8001mk2sr // 1985
@source:pc8401a.cpp
pc8401a // roms needed
diff --git a/src/mame/video/sknsspr.cpp b/src/mame/video/sknsspr.cpp
index 518e2a4bfb5..d474ff0d8da 100644
--- a/src/mame/video/sknsspr.cpp
+++ b/src/mame/video/sknsspr.cpp
@@ -156,7 +156,7 @@ void sknsspr_device::skns_sprite_kludge(int x, int y)
while(ys < sy && yd >= clip.min_y)
#define z_draw_pixel() \
- u8 val = src[(xs >> 16) & 0x3f]; \
+ u8 val = src[(xs >> 16) & 0x3f]; \
if(val) \
bitmap.pix(yd>>16, xd>>16) = val + colour;
diff --git a/src/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp
index 55f09087f35..9f26fb2c778 100644
--- a/src/osd/modules/debugger/debuggdbstub.cpp
+++ b/src/osd/modules/debugger/debuggdbstub.cpp
@@ -421,7 +421,7 @@ class debug_gdbstub : public osd_module, public debug_module
public:
debug_gdbstub()
: osd_module(OSD_DEBUG_PROVIDER, "gdbstub"), debug_module(),
- m_readbuf_state(PACKET_START),
+ m_readbuf_state(PACKET_START),
m_machine(nullptr),
m_maincpu(nullptr),
m_state(nullptr),