source org: move dedicated dave soundchip to enterprise folder

scripts/src/sound.lua

@@ -1466,18 +1466,6 @@ if (SOUNDS["MM5837"]~=null) then
 	}
 end
 
----------------------------------------------------
--- Intelligent Designs DAVE
---@src/devices/sound/dave.h,SOUNDS["DAVE"] = true
----------------------------------------------------
-
-if (SOUNDS["DAVE"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/sound/dave.cpp",
-		MAME_DIR .. "src/devices/sound/dave.h",
-	}
-end
-
 ---------------------------------------------------
 -- Toshiba TA7630
 --@src/devices/sound/ta7630.h,SOUNDS["TA7630"] = true

src/mame/enterprise/dave.cpp

@@ -57,16 +57,16 @@ void dave_device::io_map(address_map &map)
 //  dave_device - constructor
 //-------------------------------------------------
 
-dave_device::dave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+dave_device::dave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	: device_t(mconfig, DAVE, tag, owner, clock),
+	device_t(mconfig, DAVE, tag, owner, clock),
-		device_memory_interface(mconfig, *this),
+	device_memory_interface(mconfig, *this),
-		device_sound_interface(mconfig, *this),
+	device_sound_interface(mconfig, *this),
-		m_program_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, address_map_constructor(FUNC(dave_device::program_map), this)),
+	m_program_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, address_map_constructor(FUNC(dave_device::program_map), this)),
-		m_io_space_config("io", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(dave_device::io_map), this)),
+	m_io_space_config("io", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(dave_device::io_map), this)),
-		m_write_irq(*this),
+	m_write_irq(*this),
-		m_write_lh(*this),
+	m_write_lh(*this),
-		m_write_rh(*this),
+	m_write_rh(*this),
-		m_irq_status(0)
+	m_irq_status(0)
 {
 }
 
@@ -503,7 +503,6 @@ void dave_device::io_w(offs_t offset, uint8_t data)
 			}
 
 
-
 			/* turn L.H audio output into D/A, outputting value in R8 */
 			if (data & (1<<3))
 			{

src/mame/enterprise/dave.h

@@ -37,6 +37,7 @@ public:
 
 	void io_map(address_map &map) ATTR_COLD;
 	void program_map(address_map &map) ATTR_COLD;
+
 protected:
 	// device-level overrides
 	virtual void device_start() override ATTR_COLD;
@@ -106,9 +107,6 @@ private:
 	/* these are the current channel volumes in MAME form */
 	int m_mame_volumes[8];
 
-	/* update step */
-	//int m_update_step;
-
 	sound_stream *m_sound_stream_var;
 };
 

src/mame/enterprise/ep64.cpp

@@ -159,7 +159,8 @@ Notes: (All IC's shown)
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "machine/ram.h"
-#include "sound/dave.h"
+
+#include "dave.h"
 #include "nick.h"
 
 #include "softlist_dev.h"
@@ -595,6 +596,7 @@ void ep64_state::ep64(machine_config &config)
 	// sound hardware
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
+
 	DAVE(config, m_dave, XTAL(8'000'000));
 	m_dave->set_addrmap(AS_PROGRAM, &ep64_state::dave_64k_mem);
 	m_dave->set_addrmap(AS_IO, &ep64_state::dave_io);

src/mame/enterprise/nick.cpp

@@ -73,7 +73,7 @@
 //  DEVICE DEFINITIONS
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(NICK, nick_device, "nick", "NICK")
+DEFINE_DEVICE_TYPE(NICK, nick_device, "nick", "Intelligent Designs NICK")
 
 
 void nick_device::vram_map(address_map &map)
@@ -105,20 +105,20 @@ void nick_device::nick_map(address_map &map)
 //  nick_device - constructor
 //-------------------------------------------------
 
-nick_device::nick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nick_device::nick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	: device_t(mconfig, NICK, tag, owner, clock),
+	device_t(mconfig, NICK, tag, owner, clock),
-		device_memory_interface(mconfig, *this),
+	device_memory_interface(mconfig, *this),
-		device_video_interface(mconfig, *this),
+	device_video_interface(mconfig, *this),
-		m_space_config("vram", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(nick_device::nick_map), this)),
+	m_space_config("vram", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(nick_device::nick_map), this)),
-		m_write_virq(*this),
+	m_write_virq(*this),
-		m_scanline_count(0),
+	m_scanline_count(0),
-		m_FIXBIAS(0),
+	m_FIXBIAS(0),
-		m_BORDER(0),
+	m_BORDER(0),
-		m_LPL(0),
+	m_LPL(0),
-		m_LPH(0),
+	m_LPH(0),
-		m_LD1(0),
+	m_LD1(0),
-		m_LD2(0),
+	m_LD2(0),
-		m_virq(CLEAR_LINE)
+	m_virq(CLEAR_LINE)
 {
 	memset(&m_LPT, 0x00, sizeof(m_LPT));
 }
@@ -508,7 +508,6 @@ void nick_device::write_pixels(uint8_t data_byte, uint8_t char_idx)
 			}
 #endif
 
-
 			write_pixels2color(pen_offs, (pen_offs | 0x01), data);
 		}
 		break;
@@ -598,8 +597,6 @@ void nick_device::write_pixels(uint8_t data_byte, uint8_t char_idx)
 			write_pixel(pal_idx);
 			write_pixel(pal_idx);
 			write_pixel(pal_idx);
-
-
 		}
 		break;
 	}
@@ -661,7 +658,6 @@ void nick_device::write_pixels_lpixel(uint8_t data_byte, uint8_t char_idx)
 			}
 #endif
 
-
 			write_pixels2color_lpixel(pen_offs, (pen_offs | 0x01), data);
 		}
 		break;
@@ -765,8 +761,6 @@ void nick_device::write_pixels_lpixel(uint8_t data_byte, uint8_t char_idx)
 			write_pixel(pal_idx);
 			write_pixel(pal_idx);
 			write_pixel(pal_idx);
-
-
 		}
 		break;
 	}

src/mame/enterprise/nick.h

@@ -75,6 +75,7 @@ public:
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	void nick_map(address_map &map) ATTR_COLD;
+
 protected:
 	// device-level overrides
 	virtual void device_start() override ATTR_COLD;