cherry-pick fixes from mainline and clean up some stuff (nw)

README.md

@@ -55,12 +55,12 @@ Visual Studio builds are also possible, but you still need [build environment](h
 In order to generate solution and project files just run:
 
 ```
-make vs2015
+make vs2017
 ```
 or use this command to build it directly using msbuild
 
 ```
-make vs2015 MSBUILD=1
+make vs2017 MSBUILD=1
 ```
 
 

docs/source/initialsetup/compilingmame.rst

@@ -38,7 +38,7 @@ Here are specific notes about compiling MAME for Microsoft Windows.
 
 * You will need to download the toolset from that link to begin. Periodically, these tools are updated and newer versions of MAME from that point on will **require** updated tools to compile.
 
-* You can do compilation on Visual Studio 2015 (if installed on your PC) by using **make vs2015**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
+* You can do compilation on Visual Studio 2017 (if installed on your PC) by using **make vs2017**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
 
 * Make sure you get SDL 2 2.0.3 or 2.0.4 as earlier versions are buggy.
 

src/devices/bus/hp_hil/hlekbd.cpp

@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Sergey Svishchev
+#include "emu.h"
 #include "hlekbd.h"
 
 #include "machine/keyboard.ipp"

src/devices/cpu/mcs40/mcs40.h

@@ -248,7 +248,7 @@ class i4004_cpu_device : public mcs40_cpu_device_base
 {
 public:
 	// configuration helpers
-	auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); }
+	using mcs40_cpu_device_base::sync_cb;
 	auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<0>(); }
 	template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
 
@@ -269,11 +269,6 @@ protected:
 	virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
 	virtual void do_cycle2(u8 opr, u8 opa, u8 arg) override;
 	virtual u8 do_io(u8 opr, u8 opa) override;
-
-	// configuration helpers
-	using mcs40_cpu_device_base::sync_cb;
-	using mcs40_cpu_device_base::cm_rom_cb;
-	using mcs40_cpu_device_base::cm_ram_cb;
 };
 
 
@@ -281,11 +276,10 @@ class i4040_cpu_device : public i4004_cpu_device
 {
 public:
 	// configuration helpers
-	auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); }
 	template <unsigned N> auto cm_rom_cb() { return mcs40_cpu_device_base::cm_rom_cb<N>(); }
 	template <unsigned N> auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb<N>(); }
 	auto cy_cb() { return i4004_cpu_device::cy_cb(); }
-	auto stp_ack_cb() { return i4004_cpu_device::stp_ack_cb(); }
+	using mcs40_cpu_device_base::stp_ack_cb;
 
 	i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
 
@@ -299,13 +293,6 @@ protected:
 
 	// mcs40_cpu_device_base implementation
 	virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
-
-	// configuration helpers
-	using mcs40_cpu_device_base::sync_cb;
-	using mcs40_cpu_device_base::cm_rom_cb;
-	using mcs40_cpu_device_base::cm_ram_cb;
-	using mcs40_cpu_device_base::cy_cb;
-	using mcs40_cpu_device_base::stp_ack_cb;
 };
 
 

src/devices/cpu/mips/ps2vif1.cpp

@@ -14,8 +14,6 @@
 #include "emu.h"
 #include "ps2vif1.h"
 
-#include "ps2vu.h"
-#include "video/ps2gs.h"
 #include "video/ps2gif.h"
 
 DEFINE_DEVICE_TYPE(SONYPS2_VIF1, ps2_vif1_device, "ps2vif1", "PlayStation 2 VIF1")

src/devices/cpu/mips/ps2vif1.h

@@ -14,8 +14,10 @@
 
 #pragma once
 
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_vif1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vu.h"
 
 class ps2_vif1_device : public device_t, public device_execute_interface
 {

src/devices/cpu/mips/ps2vu.cpp

@@ -12,8 +12,6 @@
 #include "emu.h"
 #include "ps2vu.h"
 
-#include "ps2vif1.h"
-#include "video/ps2gs.h"
 #include "video/ps2gif.h"
 #include "vudasm.h"
 #include "debugger.h"

src/devices/cpu/mips/ps2vu.h

@@ -14,8 +14,11 @@
 
 #pragma once
 
-class ps2_gs_device;
-class ps2_vif1_device;
+class sonyvu0_device;
+class sonyvu1_device;
+
+#include "video/ps2gs.h"
+#include "ps2vif1.h"
 
 enum
 {

src/devices/machine/ps2dma.cpp

@@ -12,7 +12,6 @@
 #include "emu.h"
 #include "ps2dma.h"
 
-#include "ps2sif.h"
 #include "cpu/mips/mips3.h"
 #include "cpu/mips/ps2vif1.h"
 #include "video/ps2gif.h"

src/devices/machine/ps2dma.h

@@ -16,8 +16,7 @@
 
 #include "cpu/mips/ps2vu.h"
 #include "video/ps2gs.h"
-
-class ps2_sif_device;
+#include "ps2sif.h"
 
 class ps2_dmac_device : public device_t, public device_execute_interface
 {

src/devices/machine/ps2intc.cpp

@@ -12,9 +12,6 @@
 #include "emu.h"
 #include "ps2intc.h"
 
-#include "cpu/mips/ps2vu.h"
-
-
 DEFINE_DEVICE_TYPE(SONYPS2_INTC, ps2_intc_device, "ps2intc", "PlayStation 2 EE INTC")
 
 ps2_intc_device::ps2_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)

src/devices/machine/ps2intc.h

@@ -14,6 +14,8 @@
 
 #pragma once
 
+class ps2_intc_device;
+
 #include "cpu/mips/mips3.h"
 
 class ps2_intc_device : public device_t

src/devices/machine/ps2mc.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-
 class ps2_mc_device : public device_t
 {
 public:

src/devices/machine/ps2pad.h

@@ -14,7 +14,6 @@
 
 #pragma once
 
-
 class ps2_pad_device : public device_t
 {
 public:

src/devices/video/ps2gif.cpp

@@ -12,9 +12,6 @@
 #include "emu.h"
 #include "ps2gif.h"
 
-#include "ps2gs.h"
-#include "cpu/mips/ps2vu.h"
-
 DEFINE_DEVICE_TYPE(SONYPS2_GIF, ps2_gif_device, "ps2gif", "Playstation 2 GIF")
 
 ps2_gif_device::ps2_gif_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)

src/devices/video/ps2gif.h

@@ -14,8 +14,10 @@
 
 #pragma once
 
-class ps2_gs_device;
-class sonyvu1_device;
+class ps2_gif_device;
+
+#include "ps2gs.h"
+#include "cpu/mips/ps2vu.h"
 
 class ps2_gif_device : public device_t, public device_execute_interface
 {

src/devices/video/ps2gs.cpp

@@ -12,11 +12,6 @@
 #include "emu.h"
 #include "ps2gs.h"
 
-#include "ps2gif.h"
-#include "machine/ps2intc.h"
-#include "cpu/mips/ps2vu.h"
-
-
 DEFINE_DEVICE_TYPE(SONYPS2_GS, ps2_gs_device, "ps2gs", "Playstation 2 GS")
 
 /*static*/ const size_t ps2_gs_device::FORMAT_PIXEL_WIDTHS[] = {

src/devices/video/ps2gs.h

@@ -14,10 +14,11 @@
 
 #pragma once
 
+class ps2_gs_device;
 
-class ps2_intc_device;
-class ps2_gif_device;
-class sonyvu1_device;
+#include "ps2gif.h"
+#include "machine/ps2intc.h"
+#include "cpu/mips/ps2vu.h"
 
 class ps2_gs_device : public device_t
 {