fix various things. checkpointed the alphatpc16, will credit before next release (nw)

plugins/boot.lua

@@ -14,9 +14,9 @@ function lfs.env_replace(str)
 	end
 
 	if pathsep == '\\' then
-		str = str:gsub("%%(%w+)%%", dorep)
+		str = str:gsub("%%([%w_]+)%%", dorep)
 	else
-		str = str:gsub("%$(%w+)", dorep)
+		str = str:gsub("%$([%w_]+)", dorep)
 	end
 	return str
 end

scripts/target/mame/mess.lua

@@ -3541,6 +3541,7 @@ files {
 createMESSProjects(_target, _subtarget, "ta")
 files {
 	MAME_DIR .. "src/mame/drivers/alphatpx.cpp",
+	MAME_DIR .. "src/mame/drivers/alphatpc16.cpp",
 	MAME_DIR .. "src/mame/drivers/alphatro.cpp",
 }
 

src/devices/cpu/i86/i186.h

@@ -21,6 +21,7 @@ public:
 	auto tmrout0_handler() { return m_out_tmrout0_func.bind(); }
 	auto tmrout1_handler() { return m_out_tmrout1_func.bind(); }
 	auto irmx_irq_cb() { return m_irmx_irq_cb.bind(); }
+	template <typename... T> void set_irmx_irq_ack(T &&... args) { m_irmx_irq_ack.set(std::forward<T>(args)...); }
 
 	IRQ_CALLBACK_MEMBER(int_callback);
 	IRQ_CALLBACK_MEMBER(inta_callback);
@@ -32,7 +33,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(int1_w) { external_int(1, state); }
 	DECLARE_WRITE_LINE_MEMBER(int2_w) { external_int(2, state); }
 	DECLARE_WRITE_LINE_MEMBER(int3_w) { external_int(3, state); }
-	template <typename... T> void set_irmx_irq_ack(T &&... args) { m_irmx_irq_ack.set(std::forward<T>(args)...); }
 
 	// device_memory_interface overrides
 	virtual space_config_vector memory_space_config() const override;

src/devices/video/ef9345.cpp

@@ -845,7 +845,7 @@ void ef9345_device::ef9345_exec(uint8_t cmd)
 			if (cmd&1)
 			{
 				if ((m_registers[7] & 0x80) == 0x00) { m_registers[7] |= 0x80; return; }
-				m_registers[7] &= 0x80;
+				m_registers[7] &= ~0x80;
 				inc_x(7);
 			}
 			break;

src/frontend/mame/luaengine.cpp

@@ -1498,13 +1498,11 @@ void lua_engine::initialize()
  * #log - entry count
  */
 
-	auto text_buffer_type = sol().registry().create_simple_usertype<wrap_textbuf>("new", sol::no_constructor);
-	text_buffer_type.set("__metatable", [](){});
-	text_buffer_type.set("__newindex", [](){});
-	text_buffer_type.set("__index", [](wrap_textbuf &buf, int index) { return text_buffer_get_seqnum_line(buf.textbuf, index - 1); });
-	text_buffer_type.set("__len", [](wrap_textbuf &buf) { return text_buffer_num_lines(buf.textbuf) + text_buffer_line_index_to_seqnum(buf.textbuf, 0) - 1; });
-	sol().registry().set_usertype("text_buffer", text_buffer_type);
-
+ 	sol().registry().new_usertype<wrap_textbuf>("text_buffer", "new", sol::no_constructor,
+			"__metatable", [](){},
+			"__newindex", [](){},
+			"__index", [](wrap_textbuf &buf, int index) { return text_buffer_get_seqnum_line(buf.textbuf, index - 1); },
+			"__len", [](wrap_textbuf &buf) { return text_buffer_num_lines(buf.textbuf) + text_buffer_line_index_to_seqnum(buf.textbuf, 0) - 1; });
 
 /*  device_debug library (requires debugger to be active)
  *

src/mame/drivers/alphatpc16.cpp

@@ -0,0 +1,202 @@
+// license:BSD-3-Clause
+// copyright-holders:Carl
+
+#include "emu.h"
+
+#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "video/ef9345.h"
+#include "machine/z80dart.h"
+#include "machine/pic8259.h"
+#include "machine/timer.h"
+#include "machine/ram.h"
+#include "sound/beep.h"
+#include "cpu/mcs48/mcs48.h"
+#include "cpu/z80/z80.h"
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
+class alphatpc16_state : public driver_device
+{
+public:
+	alphatpc16_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_pic8259(*this, "pic8259"),
+		m_ef9345(*this, "ef9345"),
+		m_beep(*this, "beeper"),
+		m_wdfdc(*this, "wdfdc"),
+		m_ram(*this, RAM_TAG)
+	{ }
+
+public:
+	void alphatpc16(machine_config &config);
+
+private:
+	virtual void machine_start() override;
+
+	void apc16_io(address_map &map);
+	void apc16_map(address_map &map);
+	void apc16_z80_io(address_map &map);
+	void apc16_z80_map(address_map &map);
+	void ef9345(address_map &map);
+
+	DECLARE_READ8_MEMBER(p1_r);
+	DECLARE_WRITE8_MEMBER(p1_w);
+	DECLARE_READ8_MEMBER(p2_r);
+	DECLARE_WRITE8_MEMBER(p2_w);
+	DECLARE_READ8_MEMBER(host_scsi_r);
+	DECLARE_WRITE8_MEMBER(host_scsi_w);
+	DECLARE_READ8_MEMBER(flop_scsi_r);
+	DECLARE_WRITE8_MEMBER(flop_scsi_w);
+
+	required_device<cpu_device> m_maincpu;
+	required_device<pic8259_device> m_pic8259;
+	required_device<ef9345_device> m_ef9345;
+	required_device<beep_device> m_beep;
+	required_device<wd1770_device> m_wdfdc;
+	required_device<ram_device> m_ram;
+
+	u8 m_p1, m_p2;
+};
+
+void alphatpc16_state::machine_start()
+{
+	m_maincpu->space(AS_PROGRAM).install_ram(0, m_ram->size() - 1, m_ram->pointer());
+}
+
+WRITE8_MEMBER(alphatpc16_state::p1_w)
+{
+	if((data == 0xff) && !BIT(m_p2, 7))
+		m_p2 &= ~3; //??
+	m_p1 = data;
+}
+
+READ8_MEMBER(alphatpc16_state::p1_r)
+{
+	return m_p1;
+}
+
+WRITE8_MEMBER(alphatpc16_state::p2_w)
+{
+	m_beep->set_state(!BIT(data, 3));
+	m_pic8259->ir0_w(BIT(data, 5));
+	m_p2 = data;
+}
+
+READ8_MEMBER(alphatpc16_state::p2_r)
+{
+	return m_p2;
+}
+
+WRITE8_MEMBER(alphatpc16_state::host_scsi_w)
+{
+}
+
+READ8_MEMBER(alphatpc16_state::host_scsi_r)
+{
+	return 0;
+}
+
+WRITE8_MEMBER(alphatpc16_state::flop_scsi_w)
+{
+}
+
+READ8_MEMBER(alphatpc16_state::flop_scsi_r)
+{
+	return 0;
+}
+
+void alphatpc16_state::apc16_map(address_map &map)
+{
+	map(0x80020, 0x8002f).rw(m_ef9345, FUNC(ef9345_device::data_r), FUNC(ef9345_device::data_w));
+	map(0x82000, 0x82001).rw("i8741", FUNC(upi41_cpu_device::upi41_master_r), FUNC(upi41_cpu_device::upi41_master_w));
+	map(0x84000, 0x84003).rw("z80dart", FUNC(z80dart_device::ba_cd_r), FUNC(z80dart_device::ba_cd_w));
+	map(0x86000, 0x86001).rw(m_pic8259, FUNC(pic8259_device::read), FUNC(pic8259_device::write));
+	map(0x8a000, 0x8a003).rw(FUNC(alphatpc16_state::host_scsi_r), FUNC(alphatpc16_state::host_scsi_w));
+	map(0xf0000, 0xfffff).rom().region("bios", 0);
+}
+
+void alphatpc16_state::apc16_io(address_map &map)
+{
+}
+
+void alphatpc16_state::apc16_z80_map(address_map &map)
+{
+	map(0x0000, 0x3fff).rom().region("flop", 0);
+	map(0x4000, 0x47ff).ram();
+}
+
+void alphatpc16_state::apc16_z80_io(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x20, 0x23).rw(m_wdfdc, FUNC(wd1770_device::read), FUNC(wd1770_device::write));
+	map(0x62, 0x63)	.rw(FUNC(alphatpc16_state::flop_scsi_r), FUNC(alphatpc16_state::flop_scsi_w));
+}
+
+static INPUT_PORTS_START( alphatpc16 )
+INPUT_PORTS_END
+
+void alphatpc16_state::alphatpc16(machine_config &config)
+{
+	/* basic machine hardware */
+	I8088(config, m_maincpu, 15_MHz_XTAL / 3);
+	m_maincpu->set_addrmap(AS_PROGRAM, &alphatpc16_state::apc16_map);
+	m_maincpu->set_addrmap(AS_IO, &alphatpc16_state::apc16_io);
+	m_maincpu->set_irq_acknowledge_callback(m_pic8259, FUNC(pic8259_device::inta_cb));
+
+	PIC8259(config, m_pic8259, 0);
+	m_pic8259->out_int_callback().set_inputline(m_maincpu, 0);
+
+	z80dart_device &dart(Z80DART(config, "z80dart", 15_MHz_XTAL / 3)); // clock?
+	dart.out_int_callback().set(m_pic8259, FUNC(pic8259_device::ir7_w));
+
+	cpu_device& z80(Z80(config, "z80", 8_MHz_XTAL / 2));
+	z80.set_addrmap(AS_PROGRAM, &alphatpc16_state::apc16_z80_map);
+	z80.set_addrmap(AS_IO, &alphatpc16_state::apc16_z80_io);
+	WD1770(config, m_wdfdc, 8_MHz_XTAL);
+
+	i8741a_device& i8741(I8741A(config, "i8741", 4.608_MHz_XTAL));
+	i8741.p1_in_cb().set(FUNC(alphatpc16_state::p1_r));
+	i8741.p1_out_cb().set(FUNC(alphatpc16_state::p1_w));
+	i8741.p2_in_cb().set(FUNC(alphatpc16_state::p2_r));
+	i8741.p2_out_cb().set(FUNC(alphatpc16_state::p2_w));
+
+	SPEAKER(config, "mono").front_center();
+	BEEP(config, "beeper", 1000).add_route(ALL_OUTPUTS, "mono", 1.00); // Unknown freq
+
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	screen.set_refresh_hz(50);
+	screen.set_screen_update(m_ef9345, FUNC(ef9345_device::screen_update));
+	screen.set_size(492, 270);
+	screen.set_visarea(00, 492-1, 00, 270-1);
+	PALETTE(config, "palette").set_entries(8);
+
+	EF9345(config, m_ef9345, 0);
+	m_ef9345->set_palette_tag("palette");
+
+	TIMER(config, "scanline").configure_scanline(NAME([this](timer_device &t, void *ptr, s32 p){m_ef9345->update_scanline((uint16_t)p);}), screen, 0, 10);
+
+	// these are supported by the bios, they may not have been available on real hardware
+	RAM(config, m_ram).set_default_size("64K").set_extra_options("128K,192K,256K,384K,448K,512K");
+}
+
+ROM_START( alphatpc16 )
+	ROM_REGION(0x10000,"bios", 0)
+	ROM_LOAD("cdae03_04_16.bin", 0x0000, 0x8000, CRC(0ff5b549) SHA1(f5612e7864c06da586087645fed97c78e84a5d04))
+	ROM_LOAD("cdae02_07_15.bin", 0x8000, 0x8000, CRC(22fd3acb) SHA1(ddab380dd15326ca699d6b4b7f4bf7c1a9d498ea))
+
+	ROM_REGION(0x400, "i8741", 0)
+	ROM_LOAD("d8741ad.bin", 0x000, 0x400, CRC(e71d5d9f) SHA1(deda490491d3ee08f47bd23bb29dc92b3806d3f2))
+
+	ROM_REGION(0x4000, "flop", 0)
+	ROM_LOAD("cdae04_03_21.bin", 0x0000, 0x4000, CRC(11bc6551) SHA1(28c1f02fdc040035aba249c4ad21de9b5ec95298))
+
+	ROM_REGION( 0x4000, "ef9345", 0 )
+	ROM_LOAD( "charset.rom", 0x0000, 0x2000, BAD_DUMP CRC(b2f49eb3) SHA1(d0ef530be33bfc296314e7152302d95fdf9520fc) )                // from dcvg5k
+ROM_END
+
+COMP( 198?, alphatpc16,  0, 0, alphatpc16, alphatpc16, alphatpc16_state, empty_init, "Triumph-Adler", "alphatronic PC-16",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+

src/mame/mame.lst

@@ -1169,6 +1169,9 @@ alphatp2u
 alphatp3                        // 1982 Triumph-Adler
 alphatp30
 
+@source:alphatpc16.cpp
+alphatpc16
+
 @source:alphatro.cpp
 alphatro                        //
 alphatron                       //

src/mame/mess.flt

@@ -41,6 +41,7 @@ alesis_qs.cpp
 alfaskop41xx.cpp
 alphasma.cpp
 alphatpx.cpp
+alphatpc16.cpp
 alphatro.cpp
 altair.cpp
 alto1.cpp