Update makefile

Author: Robbbert

android-project/app/src/main/AndroidManifest.xml

@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="280"
-      android:versionName="0.280"
+      android:versionCode="281"
+      android:versionName="0.281"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

docs/source/luascript/ref-input.rst

@@ -333,18 +333,12 @@ field.is_digital_joystick (read-only)
     switch.
 field.enabled (read-only)
     A Boolean indicating whether the field is enabled.
-field.optional (read-only)
-    A Boolean indicating whether the field is optional and not required to use
-    the emulated system.
 field.cocktail (read-only)
     A Boolean indicating whether the field is only used when the system is
     configured for a cocktail table cabinet.
 field.toggle (read-only)
     A Boolean indicating whether the field corresponds to a hardware toggle
     switch or push-on, push-off button.
-field.rotated (read-only)
-    A Boolean indicating whether the field corresponds to a control that is
-    rotated relative its standard orientation.
 field.analog_reverse (read-only)
     A Boolean indicating whether the field corresponds to an analog control that
     increases in the opposite direction to the convention (e.g. larger values

makefile

@@ -7,7 +7,7 @@
 ###########################################################################
 
 BARE_VERS := 0.281
-LONG_VERS := $(BARE_VERS).0
+LONG_VERS := $(BARE_VERS).x
 
 ###########################################################################
 #################   BEGIN USER-CONFIGURABLE OPTIONS   #####################

scripts/src/bus.lua

@@ -3465,6 +3465,8 @@ if (BUSES["RS232"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/bus/rs232/exorterm.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/exorterm.h",
+		MAME_DIR .. "src/devices/bus/rs232/heath_h19.cpp",
+		MAME_DIR .. "src/devices/bus/rs232/heath_h19.h",
 		MAME_DIR .. "src/devices/bus/rs232/hlemouse.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/hlemouse.h",
 		MAME_DIR .. "src/devices/bus/rs232/ie15.cpp",

scripts/src/machine.lua

@@ -3081,18 +3081,6 @@ if (MACHINES["RIPPLE_COUNTER"]~=null) then
 	}
 end
 
----------------------------------------------------
---
---@src/devices/machine/roc10937.h,MACHINES["ROC10937"] = true
----------------------------------------------------
-
-if (MACHINES["ROC10937"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/roc10937.cpp",
-		MAME_DIR .. "src/devices/machine/roc10937.h",
-	}
-end
-
 ---------------------------------------------------
 --
 --@src/devices/machine/rp5c01.h,MACHINES["RP5C01"] = true
@@ -5417,19 +5405,3 @@ if (MACHINES["SCI4"]~=null) then
 		MAME_DIR .. "src/devices/machine/sci4.h",
 	}
 end
-
----------------------------------------------------
---
---@src/devices/machine/pl6_fpga.h,MACHINES["HEBER_PLUTO"] = true
---@src/devices/machine/pl6_pic.h,MACHINES["HEBER_PLUTO"] = true
----------------------------------------------------
-if (MACHINES["HEBER_PLUTO"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/pl6_fpga.cpp",
-		MAME_DIR .. "src/devices/machine/pl6_fpga.h",
-		MAME_DIR .. "src/devices/machine/pl6_pic.cpp",
-		MAME_DIR .. "src/devices/machine/pl6_pic.h",
-		MAME_DIR .. "src/devices/machine/pl6_exp.cpp",
-		MAME_DIR .. "src/devices/machine/pl6_exp.h",
-	}
-end

scripts/src/video.lua

@@ -1137,6 +1137,18 @@ if (VIDEOS["RAMDAC"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/video/roc10937.h,VIDEOS["ROC10937"] = true
+---------------------------------------------------
+
+if (VIDEOS["ROC10937"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/roc10937.cpp",
+		MAME_DIR .. "src/devices/video/roc10937.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/devices/video/saa5050.h,VIDEOS["SAA5050"] = true
@@ -1805,15 +1817,3 @@ if (VIDEOS["ST7626"]~=null) then
 		MAME_DIR .. "src/devices/video/st7626.h",
 	}
 end
-
---------------------------------------------------
---
---@src/devices/video/serialvfd.h,VIDEOS["SERIALVFD"] = true
---------------------------------------------------
-
-if (VIDEOS["SERIALVFD"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/video/serialvfd.cpp",
-		MAME_DIR .. "src/devices/video/serialvfd.h",
-	}
-end

src/devices/bus/bbc/analogue/analogue.cpp

@@ -43,6 +43,7 @@ device_bbc_analogue_interface::device_bbc_analogue_interface(const machine_confi
 bbc_analogue_slot_device::bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, BBC_ANALOGUE_SLOT, tag, owner, clock)
 	, device_single_card_slot_interface<device_bbc_analogue_interface>(mconfig, *this)
+	, m_screen(*this, finder_base::DUMMY_TAG)
 	, m_card(nullptr)
 	, m_lpstb_handler(*this)
 {

src/devices/bus/bbc/analogue/analogue.h

@@ -31,6 +31,8 @@
 
 #pragma once
 
+#include "screen.h"
+
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -56,6 +58,8 @@ class bbc_analogue_slot_device : public device_t, public device_single_card_slot
 
 	bbc_analogue_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
 
+	template <typename T> void set_screen(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
+
 	// callbacks
 	auto lpstb_handler() { return m_lpstb_handler.bind(); }
 
@@ -65,6 +69,8 @@ class bbc_analogue_slot_device : public device_t, public device_single_card_slot
 	uint8_t pb_r();
 	void pb_w(uint8_t data);
 
+	optional_device<screen_device> m_screen;
+
 protected:
 	// device_t overrides
 	virtual void device_start() override ATTR_COLD;
@@ -88,6 +94,8 @@ class device_bbc_analogue_interface : public device_interface
 protected:
 	device_bbc_analogue_interface(const machine_config &mconfig, device_t &device);
 
+	screen_device *screen() { return m_slot->m_screen; }
+
 	bbc_analogue_slot_device *const m_slot;
 };
 

src/devices/bus/bbc/analogue/lightpen.cpp

@@ -24,7 +24,6 @@
 
 #include "emu.h"
 #include "lightpen.h"
-#include "screen.h"
 
 
 namespace {
@@ -35,7 +34,6 @@ class bbc_lightpen_device : public device_t, public device_bbc_analogue_interfac
 	bbc_lightpen_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 		: device_t(mconfig, type, tag, owner, clock)
 		, device_bbc_analogue_interface(mconfig, *this)
-		, m_screen(*this, ":screen")
 		, m_light(*this, "LIGHT%u", 0)
 		, m_button(*this, "BUTTON")
 		, m_pen_timer(nullptr)
@@ -58,7 +56,6 @@ class bbc_lightpen_device : public device_t, public device_bbc_analogue_interfac
 	}
 
 private:
-	required_device<screen_device> m_screen;
 	required_ioport_array<2> m_light;
 	required_ioport m_button;
 
@@ -193,11 +190,14 @@ ioport_constructor bbc_stacklr_device::device_input_ports() const
 
 void bbc_lightpen_device::device_start()
 {
-	if (!m_screen->started())
+	if (!screen())
+		fatalerror("Can't find screen device required for %s\n", name());
+
+	if (!screen()->started())
 		throw device_missing_dependencies();
 
 	m_pen_timer = timer_alloc(FUNC(bbc_lightpen_device::update_pen), this);
-	m_pen_timer->adjust(attotime::zero, 0, m_screen->frame_period());
+	m_pen_timer->adjust(attotime::zero, 0, screen()->frame_period());
 
 	m_lpstb_timer = timer_alloc(FUNC(bbc_lightpen_device::lpstb), this);
 }
@@ -211,12 +211,12 @@ TIMER_CALLBACK_MEMBER(bbc_lightpen_device::update_pen)
 {
 	int x_val = m_light[0]->read();
 	int y_val = m_light[1]->read();
-	const rectangle &vis_area = m_screen->visible_area();
+	const rectangle &vis_area = screen()->visible_area();
 
 	int xt = x_val * vis_area.width() / 1024 + vis_area.min_x;
 	int yt = y_val * vis_area.height() / 1024 + vis_area.min_y;
 
-	m_lpstb_timer->adjust(m_screen->time_until_pos(yt, xt));
+	m_lpstb_timer->adjust(screen()->time_until_pos(yt, xt));
 }
 
 TIMER_CALLBACK_MEMBER(bbc_lightpen_device::lpstb)

src/devices/bus/bbc/exp/exp.cpp

@@ -43,6 +43,7 @@ device_bbc_exp_interface::device_bbc_exp_interface(const machine_config &mconfig
 bbc_exp_slot_device::bbc_exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, BBC_EXP_SLOT, tag, owner, clock)
 	, device_single_card_slot_interface<device_bbc_exp_interface>(mconfig, *this)
+	, m_screen(*this, finder_base::DUMMY_TAG)
 	, m_card(nullptr)
 	, m_irq_handler(*this)
 	, m_nmi_handler(*this)