Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-29 03:20:50 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Cleaned up some recent commits.

Browse Source 
Only functional change is nltool counting lines from 1 rather than zero to match text editors.
This commit is contained in:
Vas Crabb 2023-11-03 03:30:41 +11:00
parent 0922c7efe5
commit 31a13d70e9
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/bus/nabupc/fdc.cpp
View File

@ -9,10 +9,12 @@
#include "emu.h" #include "emu.h"
#include "fdc.h" #include "fdc.h"
#include "formats/nabupc_dsk.h"
#include "imagedev/floppy.h" #include "imagedev/floppy.h"
#include "machine/wd_fdc.h" #include "machine/wd_fdc.h"
#include "formats/nabupc_dsk.h"
//************************************************************************** //**************************************************************************
// NABU PC FDC DEVICE // NABU PC FDC DEVICE
//************************************************************************** //**************************************************************************
@ -39,6 +41,7 @@ protected:
// optional information overrides // optional information overrides
virtual void device_add_mconfig(machine_config &config) override; virtual void device_add_mconfig(machine_config &config) override;
private: private:
void ds_w(uint8_t data); void ds_w(uint8_t data);

3
src/devices/bus/nubus/8lc.cpp
View File

@ -36,9 +36,10 @@
#include "emu.h" #include "emu.h"
#include "8lc.h" #include "8lc.h"
#include "video/tms34061.h"
#include "emupal.h" #include "emupal.h"
#include "screen.h" #include "screen.h"
#include "video/tms34061.h"
#define LOG_REGISTERS (1U << 1) #define LOG_REGISTERS (1U << 1)
#define LOG_RAMDAC (1U << 2) #define LOG_RAMDAC (1U << 2)

2
src/devices/cpu/evolution/evod.cpp
View File

@ -97,7 +97,7 @@ offs_t evolution_disassembler::disassemble(std::ostream &stream, offs_t pc, cons
while((opcode & instructions[i].mask) != instructions[i].value) while((opcode & instructions[i].mask) != instructions[i].value)
i++; i++;
instructions[i].fct(stream, opcode, instructions[i].size >= 2 ? opcodes.r16(pc+1) : 0, pc); instructions[i].fct(stream, opcode, (instructions[i].size >= 2) ? opcodes.r16(pc+1) : 0, pc);
return instructions[i].size; return instructions[i].size;
} }

2
src/devices/cpu/evolution/evod.h
View File

@ -24,7 +24,7 @@ private:
u16 value; u16 value;
u16 mask; u16 mask;
int size; int size;
std::function<void (std::ostream &, u16, u16, u32)> fct; void (*fct)(std::ostream &, u16, u16, u32);
}; };
static const char *const regs[]; static const char *const regs[];

8
src/lib/formats/nabupc_dsk.cpp
View File

@ -23,17 +23,17 @@ const nabupc_format::format nabupc_format::formats[] =
{ // 200k 40 track single sided double density (nabu) { // 200k 40 track single sided double density (nabu)
floppy_image::FF_525, floppy_image::SSDD, floppy_image::FF_525, floppy_image::SSDD,
40, 1, 32, 22, 80, 40, 1, 32, 22, 80,
{0x00, 0x28, 0x00, 0x03, 0x07, 0x00, 0xC2, 0x00, 0x5F, 0x00, 0xE0, 0x00, 0x00, 0x18, 0x01, 0x00, 0x03, 0x07} {0x00, 0x28, 0x00, 0x03, 0x07, 0x00, 0xc2, 0x00, 0x5f, 0x00, 0xe0, 0x00, 0x00, 0x18, 0x01, 0x00, 0x03, 0x07}
}, },
{ // 400k 40 track double sided double density (nabu) { // 400k 40 track double sided double density (nabu)
floppy_image::FF_525, floppy_image::DSDD, floppy_image::FF_525, floppy_image::DSDD,
40, 2, 32, 22, 80, 40, 2, 32, 22, 80,
{0x01, 0x28, 0x00, 0x04, 0x0F, 0x01, 0xC4, 0x00, 0xBF, 0x00, 0xE0, 0x00, 0x00, 0x30, 0x01, 0x00, 0x03, 0x07} {0x01, 0x28, 0x00, 0x04, 0x0f, 0x01, 0xc4, 0x00, 0xbf, 0x00, 0xe0, 0x00, 0x00, 0x30, 0x01, 0x00, 0x03, 0x07}
}, },
{ // 800k 80 track double sided double density (nabu) { // 800k 80 track double sided double density (nabu)
floppy_image::FF_35, floppy_image::DSDD, floppy_image::FF_35, floppy_image::DSDD,
80, 2, 32, 22, 80, 80, 2, 32, 22, 80,
{0x02, 0x28, 0x00, 0x04, 0x0F, 0x00, 0x8C, 0x01, 0x7F, 0x01, 0xFC, 0x00, 0x00, 0x61, 0x01, 0x00, 0x03, 0x07} {0x02, 0x28, 0x00, 0x04, 0x0f, 0x00, 0x8c, 0x01, 0x7f, 0x01, 0xfc, 0x00, 0x00, 0x61, 0x01, 0x00, 0x03, 0x07}
}, },
{} {}
}; };
@ -213,7 +213,7 @@ const char *nabupc_format::name() const noexcept
const char *nabupc_format::description() const noexcept const char *nabupc_format::description() const noexcept
{ {
return "NABU PC CPM Disk Image"; return "NABU PC CP/M Disk Image";
} }
const char *nabupc_format::extensions() const noexcept const char *nabupc_format::extensions() const noexcept

8
src/lib/netlist/tools/nl_convert.cpp
View File

@ -333,17 +333,17 @@ double nl_convert_base_t::get_sp_val(const pstring &sin) const
void nl_convert_spice_t::convert_block(const str_list &contents) void nl_convert_spice_t::convert_block(const str_list &contents)
{ {
int linenumber = 0; int linenumber = 1;
for (const auto &line : contents) for (const auto &line : contents)
{ {
try try
{ {
process_line(line); process_line(line);
} }
catch (plib::pexception &e) catch (const plib::pexception &e)
{ {
fprintf(stderr, "Error on line: <%d>\n", linenumber); fprintf(stderr, "Error on line: <%d>\n", linenumber);
throw(e); throw;
} }
linenumber++; linenumber++;
} }
@ -528,7 +528,7 @@ void nl_convert_spice_t::process_line(const pstring &line)
else if (plib::startsWith(tt[0], "RA")) else if (plib::startsWith(tt[0], "RA"))
{ {
val = get_sp_val(tt.back()); val = get_sp_val(tt.back());
for( unsigned int res = 2; res < tt.size(); res++) for (unsigned int res = 2; res < tt.size(); res++)
{ {
pstring devname = plib::pfmt("{}.{}")(tt[0], res); pstring devname = plib::pfmt("{}.{}")(tt[0], res);
add_device("RES", devname, val); add_device("RES", devname, val);