diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 3ad23fd19ac..0bc9e1c76bb 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -156,12 +156,6 @@ void riot6532_device::timer_end()
     riot6532_w - master I/O write access
 -------------------------------------------------*/
 
-WRITE8_DEVICE_HANDLER( riot6532_w )
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	via->reg_w(offset, data);
-}
-
 WRITE8_MEMBER( riot6532_device::write )
 {
 	reg_w(offset, data);
@@ -247,12 +241,6 @@ void riot6532_device::reg_w(UINT8 offset, UINT8 data)
     riot6532_r - master I/O read access
 -------------------------------------------------*/
 
-READ8_DEVICE_HANDLER( riot6532_r )
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	return via->reg_r(offset);
-}
-
 READ8_MEMBER( riot6532_device::read )
 {
 	return reg_r(offset, space.debugger_access());
@@ -343,12 +331,6 @@ UINT8 riot6532_device::reg_r(UINT8 offset, bool debugger_access)
     porta_in_set - set port A input value
 -------------------------------------------------*/
 
-void riot6532_porta_in_set(device_t *device, UINT8 data, UINT8 mask)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	via->porta_in_set(data, mask);
-}
-
 void riot6532_device::porta_in_set(UINT8 data, UINT8 mask)
 {
 	m_port[0].m_in = (m_port[0].m_in & ~mask) | (data & mask);
@@ -360,12 +342,6 @@ void riot6532_device::porta_in_set(UINT8 data, UINT8 mask)
     portb_in_set - set port B input value
 -------------------------------------------------*/
 
-void riot6532_portb_in_set(device_t *device, UINT8 data, UINT8 mask)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	via->portb_in_set(data, mask);
-}
-
 void riot6532_device::portb_in_set(UINT8 data, UINT8 mask)
 {
 	m_port[1].m_in = (m_port[1].m_in & ~mask) | (data & mask);
@@ -376,12 +352,6 @@ void riot6532_device::portb_in_set(UINT8 data, UINT8 mask)
     porta_in_get - return port A input value
 -------------------------------------------------*/
 
-UINT8 riot6532_porta_in_get(device_t *device)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	return via->porta_in_get();
-}
-
 UINT8 riot6532_device::porta_in_get()
 {
 	return m_port[0].m_in;
@@ -392,12 +362,6 @@ UINT8 riot6532_device::porta_in_get()
     portb_in_get - return port B input value
 -------------------------------------------------*/
 
-UINT8 riot6532_portb_in_get(device_t *device)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	return via->portb_in_get();
-}
-
 UINT8 riot6532_device::portb_in_get()
 {
 	return m_port[1].m_in;
@@ -408,12 +372,6 @@ UINT8 riot6532_device::portb_in_get()
     porta_in_get - return port A output value
 -------------------------------------------------*/
 
-UINT8 riot6532_porta_out_get(device_t *device)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	return via->porta_out_get();
-}
-
 UINT8 riot6532_device::porta_out_get()
 {
 	return m_port[0].m_out;
@@ -424,12 +382,6 @@ UINT8 riot6532_device::porta_out_get()
     portb_in_get - return port B output value
 -------------------------------------------------*/
 
-UINT8 riot6532_portb_out_get(device_t *device)
-{
-	riot6532_device *via = downcast<riot6532_device *>(device);
-	return via->portb_out_get();
-}
-
 UINT8 riot6532_device::portb_out_get()
 {
 	return m_port[1].m_out;
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index 81a406b641e..73df5888b8c 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -113,22 +113,4 @@ private:
 // device type definition
 extern const device_type RIOT6532;
 
-
-
-/***************************************************************************
-    PROTOTYPES
-***************************************************************************/
-
-DECLARE_READ8_DEVICE_HANDLER( riot6532_r );
-DECLARE_WRITE8_DEVICE_HANDLER( riot6532_w );
-
-void riot6532_porta_in_set(device_t *device, UINT8 data, UINT8 mask);
-void riot6532_portb_in_set(device_t *device, UINT8 data, UINT8 mask);
-
-UINT8 riot6532_porta_in_get(device_t *device);
-UINT8 riot6532_portb_in_get(device_t *device);
-
-UINT8 riot6532_porta_out_get(device_t *device);
-UINT8 riot6532_portb_out_get(device_t *device);
-
 #endif
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index ad24f95c733..2c883f74426 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -81,7 +81,7 @@ struct exidy_sound_state
 	UINT8 m_riot_irq_state;
 
 	/* 6532 variables */
-	device_t *m_riot;
+	riot6532_device *m_riot;
 
 	struct sh6840_timer_channel m_sh6840_timer[3];
 	INT16 m_sh6840_volume[3];
@@ -532,7 +532,7 @@ static WRITE8_DEVICE_HANDLER( r6532_porta_w )
 
 	if (state->m_tms != NULL)
 	{
-		logerror("(%f)%s:TMS5220 data write = %02X\n", space.machine().time().as_double(), space.machine().describe_context(), riot6532_porta_out_get(state->m_riot));
+		logerror("(%f)%s:TMS5220 data write = %02X\n", space.machine().time().as_double(), space.machine().describe_context(), state->m_riot->porta_out_get());
 		tms5220_data_w(state->m_tms, space, 0, data);
 	}
 }
@@ -563,7 +563,7 @@ static WRITE8_DEVICE_HANDLER( r6532_portb_w )
 static READ8_DEVICE_HANDLER( r6532_portb_r )
 {
 	exidy_sound_state *state = get_safe_token(device);
-	UINT8 newdata = riot6532_portb_in_get(state->m_riot);
+	UINT8 newdata = state->m_riot->portb_in_get();
 	if (state->m_tms != NULL)
 	{
 		newdata &= ~0x0c;
@@ -843,7 +843,7 @@ static DEVICE_START( venture_common_sh_start )
 
 	DEVICE_START_CALL(common_sh_start);
 
-	state->m_riot = machine.device("riot");
+	state->m_riot = machine.device<riot6532_device>("riot");
 
 	state->m_has_sh8253  = TRUE;
 	state->m_tms = NULL;
@@ -935,7 +935,7 @@ void venture_sound_device::sound_stream_update(sound_stream &stream, stream_samp
 static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8, driver_device )
 	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0780) AM_RAM
-	AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x1003) AM_MIRROR(0x07fc) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
 	AM_RANGE(0x1800, 0x1803) AM_MIRROR(0x07fc) AM_DEVREADWRITE_LEGACY("custom", exidy_sh8253_r, exidy_sh8253_w)
 	AM_RANGE(0x2000, 0x27ff) AM_DEVWRITE_LEGACY("custom", exidy_sound_filter_w)
@@ -977,7 +977,7 @@ static WRITE8_DEVICE_HANDLER( mtrap_voiceio_w )
 		hc55516_digit_w(state->m_cvsd, data & 1);
 
 	if (!(offset & 0x20))
-		riot6532_portb_in_set(state->m_riot, data & 1, 0xff);
+		state->m_riot->portb_in_set(data & 1, 0xff);
 }
 
 
@@ -987,7 +987,7 @@ static READ8_DEVICE_HANDLER( mtrap_voiceio_r )
 
 	if (!(offset & 0x80))
 	{
-		UINT8 porta = riot6532_porta_out_get(state->m_riot);
+		UINT8 porta = state->m_riot->porta_out_get();
 		UINT8 data = (porta & 0x06) >> 1;
 		data |= (porta & 0x01) << 2;
 		data |= (porta & 0x08);
@@ -1201,7 +1201,7 @@ void victory_sound_device::sound_stream_update(sound_stream &stream, stream_samp
 
 static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8, driver_device )
 	AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0f00) AM_RAM
-	AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x0ffc) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
 	AM_RANGE(0x3000, 0x3003) AM_MIRROR(0x0ffc) AM_DEVREADWRITE_LEGACY("custom", exidy_sh8253_r, exidy_sh8253_w)
 	AM_RANGE(0x4000, 0x4fff) AM_NOP
diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c
index 4c5bf0f6387..139ef2ede56 100644
--- a/src/mame/audio/starwars.c
+++ b/src/mame/audio/starwars.c
@@ -13,16 +13,6 @@
 #include "includes/starwars.h"
 
 
-
-
-
-SOUND_START( starwars )
-{
-	starwars_state *state = machine.driver_data<starwars_state>();
-	state->m_riot = machine.device("riot");
-}
-
-
 /*************************************
  *
  *  RIOT interfaces
@@ -42,7 +32,7 @@ READ8_MEMBER(starwars_state::r6532_porta_r)
 	/* d1 (out) TMS5220 Not Read        */
 	/* d0 (out) TMS5220 Not Write       */
 	/* Note: bit 4 is always set to avoid sound self test */
-	UINT8 olddata = riot6532_porta_in_get(machine().device("riot"));
+	UINT8 olddata = m_riot->porta_in_get();
 
 	return (olddata & 0xc0) | 0x10 | (tms5220_readyq_r(machine().device("tms")) << 2);
 }
@@ -85,7 +75,7 @@ const riot6532_interface starwars_riot6532_intf =
 static TIMER_CALLBACK( sound_callback )
 {
 	starwars_state *state = machine.driver_data<starwars_state>();
-	riot6532_porta_in_set(state->m_riot, 0x40, 0x40);
+	state->m_riot->porta_in_set(0x40, 0x40);
 	state->m_main_data = param;
 	machine.scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
 }
@@ -93,7 +83,7 @@ static TIMER_CALLBACK( sound_callback )
 
 READ8_MEMBER(starwars_state::starwars_sin_r)
 {
-	riot6532_porta_in_set(m_riot, 0x00, 0x80);
+	m_riot->porta_in_set(0x00, 0x80);
 	return m_sound_data;
 }
 
@@ -113,23 +103,23 @@ WRITE8_MEMBER(starwars_state::starwars_sout_w)
 
 READ8_MEMBER(starwars_state::starwars_main_read_r)
 {
-	riot6532_porta_in_set(m_riot, 0x00, 0x40);
+	m_riot->porta_in_set(0x00, 0x40);
 	return m_main_data;
 }
 
 
 READ8_MEMBER(starwars_state::starwars_main_ready_flag_r)
 {
-	return riot6532_porta_in_get(m_riot) & 0xc0;    /* only upper two flag bits mapped */
+	return m_riot->porta_in_get() & 0xc0;    /* only upper two flag bits mapped */
 }
 
 static TIMER_CALLBACK( main_callback )
 {
 	starwars_state *state = machine.driver_data<starwars_state>();
-	if (riot6532_porta_in_get(state->m_riot) & 0x80)
+	if (state->m_riot->porta_in_get() & 0x80)
 		logerror("Sound data not read %x\n",state->m_sound_data);
 
-	riot6532_porta_in_set(state->m_riot, 0x80, 0x80);
+	state->m_riot->porta_in_set(0x80, 0x80);
 	state->m_sound_data = param;
 	machine.scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
 }
@@ -142,7 +132,7 @@ WRITE8_MEMBER(starwars_state::starwars_main_wr_w)
 
 WRITE8_MEMBER(starwars_state::starwars_soundrst_w)
 {
-	riot6532_porta_in_set(m_riot, 0x00, 0xc0);
+	m_riot->porta_in_set(0x00, 0xc0);
 
 	/* reset sound CPU here  */
 	m_audiocpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index 09f7047f4b7..b204addbaf2 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -557,7 +557,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, firefox_state )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
 	AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0700) AM_RAM /* RIOT ram */
-	AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x07e0) AM_DEVREADWRITE_LEGACY("riot",riot6532_r, riot6532_w)
+	AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x07e0) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x1000) AM_READ(main_to_sound_r)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_to_main_w)
 	AM_RANGE(0x2000, 0x200f) AM_DEVREADWRITE("pokey1", pokey_device, read, write)
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 9abfa972548..0bcc78d6eed 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -148,13 +148,13 @@ WRITE8_MEMBER(gameplan_state::audio_reset_w)
 
 WRITE8_MEMBER(gameplan_state::audio_cmd_w)
 {
-	riot6532_porta_in_set(m_riot, data, 0x7f);
+	m_riot->porta_in_set(data, 0x7f);
 }
 
 
 WRITE8_MEMBER(gameplan_state::audio_trigger_w)
 {
-	riot6532_porta_in_set(m_riot, data << 7, 0x80);
+	m_riot->porta_in_set(data << 7, 0x80);
 }
 
 
@@ -224,7 +224,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gameplan_audio_map, AS_PROGRAM, 8, gameplan_state )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM  /* 6532 internal RAM */
-	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
 	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
 	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w)
@@ -235,7 +235,7 @@ ADDRESS_MAP_END
 /* same as Gameplan, but larger ROM */
 static ADDRESS_MAP_START( leprechn_audio_map, AS_PROGRAM, 8, gameplan_state )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM  /* 6532 internal RAM */
-	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w)
 	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_DEVREAD_LEGACY("aysnd", ay8910_r)
 	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_DEVWRITE_LEGACY("aysnd", ay8910_data_w)
@@ -973,8 +973,6 @@ static const ay8910_interface ay8910_config =
 
 MACHINE_START_MEMBER(gameplan_state,gameplan)
 {
-	m_riot = machine().device("riot");
-
 	/* register for save states */
 	save_item(NAME(m_current_port));
 	save_item(NAME(m_video_x));
diff --git a/src/mame/drivers/spectra.c b/src/mame/drivers/spectra.c
index e26bfec34b1..9f74e3d574a 100644
--- a/src/mame/drivers/spectra.c
+++ b/src/mame/drivers/spectra.c
@@ -61,7 +61,7 @@ static ADDRESS_MAP_START( spectra_map, AS_PROGRAM, 8, spectra_state )
 	ADDRESS_MAP_GLOBAL_MASK(0xfff)
 	AM_RANGE(0x0000, 0x00ff) AM_RAM AM_SHARE("ram") // battery backed, 2x 5101L
 	AM_RANGE(0x0100, 0x017f) AM_RAM // RIOT RAM
-	AM_RANGE(0x0180, 0x019f) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x0180, 0x019f) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x0400, 0x0fff) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index d19dad14380..d51c7ead3b1 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -200,7 +200,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, starwars_state )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(starwars_sout_w)
 	AM_RANGE(0x0800, 0x0fff) AM_READ(starwars_sin_r)        /* SIN Read */
 	AM_RANGE(0x1000, 0x107f) AM_RAM                         /* 6532 ram */
-	AM_RANGE(0x1080, 0x109f) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x1080, 0x109f) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x1800, 0x183f) AM_WRITE(quad_pokeyn_w)
 	AM_RANGE(0x2000, 0x27ff) AM_RAM                         /* program RAM */
 	AM_RANGE(0x4000, 0x7fff) AM_ROM                         /* sound roms */
@@ -348,7 +348,6 @@ static MACHINE_CONFIG_START( starwars, starwars_state )
 	MCFG_VIDEO_START(avg_starwars)
 
 	/* sound hardware */
-	MCFG_SOUND_START(starwars)
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
 	MCFG_POKEY_ADD("pokey1", MASTER_CLOCK / 8)
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index c6cef59aab5..38955af6573 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -338,7 +338,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, tomcat_state )
 	AM_RANGE(0x3000, 0x30df) AM_WRITE(soundlatches_w)
 	AM_RANGE(0x30e0, 0x30e0) AM_NOP // COINRD Inputs: D7 = Coin L, D6 = Coin R, D5 = SOUNDFLAG
 	AM_RANGE(0x5000, 0x507f) AM_RAM // 6532 ram
-	AM_RANGE(0x5080, 0x509f) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x5080, 0x509f) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x6000, 0x601f) AM_DEVREADWRITE("pokey1", pokey_device, read, write)
 	AM_RANGE(0x7000, 0x701f) AM_DEVREADWRITE("pokey2", pokey_device, read, write)
 	AM_RANGE(0x8000, 0xffff) AM_NOP // main sound program rom
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 354611e9fe3..30b9172b31e 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -58,9 +58,9 @@ READ8_MEMBER(tourtabl_state::tourtabl_get_databus_contents)
 static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tourtabl_state )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_DEVREADWRITE("tia_video", tia_video_device, read, write)
 	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM
-	AM_RANGE(0x0280, 0x029f) AM_DEVREADWRITE_LEGACY("riot1", riot6532_r, riot6532_w)
+	AM_RANGE(0x0280, 0x029f) AM_DEVREADWRITE("riot1", riot6532_device, read, write)
 	AM_RANGE(0x0400, 0x047f) AM_RAM
-	AM_RANGE(0x0500, 0x051f) AM_DEVREADWRITE_LEGACY("riot2", riot6532_r, riot6532_w)
+	AM_RANGE(0x0500, 0x051f) AM_DEVREADWRITE("riot2", riot6532_device, read, write)
 	AM_RANGE(0x0800, 0x1fff) AM_ROM
 	AM_RANGE(0xe800, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index c9b15644c0d..a7ede2cc2de 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -7,6 +7,7 @@ driver by Chris Moore
 ***************************************************************************/
 
 #include "machine/6522via.h"
+#include "machine/6532riot.h"
 
 #define GAMEPLAN_MAIN_MASTER_CLOCK       (XTAL_3_579545MHz)
 #define GAMEPLAN_AUDIO_MASTER_CLOCK      (XTAL_3_579545MHz)
@@ -29,6 +30,7 @@ public:
 			m_trvquest_question(*this, "trvquest_q"),
 			m_maincpu(*this, "maincpu"),
 			m_audiocpu(*this, "audiocpu"),
+			m_riot(*this, "riot"),
 			m_via_0(*this, "via6522_0"),
 			m_via_1(*this, "via6522_1"),
 			m_via_2(*this, "via6522_2") { }
@@ -49,7 +51,7 @@ public:
 	/* devices */
 	required_device<cpu_device> m_maincpu;
 	optional_device<cpu_device> m_audiocpu;
-	device_t *m_riot;
+	optional_device<riot6532_device> m_riot;
 	required_device<via6522_device> m_via_0;
 	required_device<via6522_device> m_via_1;
 	required_device<via6522_device> m_via_2;
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h
index 324035e043c..a6289ee733a 100644
--- a/src/mame/includes/starwars.h
+++ b/src/mame/includes/starwars.h
@@ -12,13 +12,14 @@ class starwars_state : public driver_device
 public:
 	starwars_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
+		m_riot(*this, "riot"),
 		m_mathram(*this, "mathram"),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu")  { }
 
 	UINT8 m_sound_data;
 	UINT8 m_main_data;
-	device_t *m_riot;
+	required_device<riot6532_device> m_riot;
 	UINT8 *m_slapstic_source;
 	UINT8 *m_slapstic_base;
 	UINT8 m_slapstic_current_bank;
@@ -85,4 +86,3 @@ void starwars_mproc_reset(running_machine &machine);
 /*----------- defined in audio/starwars.c -----------*/
 
 extern const riot6532_interface starwars_riot6532_intf;
-SOUND_START( starwars );
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index c7d732f3745..99e951df0f3 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -68,7 +68,7 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
 	AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_READWRITE(a7800_MARIA_r, a7800_MARIA_w)
 	AM_RANGE(0x0040, 0x00ff) AM_READ_BANK("bank5") AM_WRITE(a7800_RAM0_w)   /* RAM (6116 block 0) */
 	AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("bank6")    /* RAM (6116 block 1) */
-	AM_RANGE(0x0280, 0x02ff) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x0280, 0x02ff) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x0450, 0x045f) /*XBOARD POKEY1*/
 	AM_RANGE(0x0460, 0x046f) /*XBOARD POKEY2*/
 	AM_RANGE(0x0470, 0x047f) /*XBOARD CTRL*/
diff --git a/src/mess/drivers/aim65.c b/src/mess/drivers/aim65.c
index 539224b1344..b4f2cafd520 100644
--- a/src/mess/drivers/aim65.c
+++ b/src/mess/drivers/aim65.c
@@ -35,7 +35,7 @@ static ADDRESS_MAP_START( aim65_mem, AS_PROGRAM, 8, aim65_state )
 	AM_RANGE( 0x1000, 0x9fff ) AM_NOP /* User available expansions */
 	AM_RANGE( 0xa000, 0xa00f ) AM_MIRROR(0x3f0) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) // user via
 	AM_RANGE( 0xa400, 0xa47f ) AM_RAM /* RIOT RAM */
-	AM_RANGE( 0xa480, 0xa497 ) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE( 0xa480, 0xa497 ) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE( 0xa498, 0xa7ff ) AM_NOP /* Not available */
 	AM_RANGE( 0xa800, 0xa80f ) AM_MIRROR(0x3f0) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) // system via
 	AM_RANGE( 0xac00, 0xac03 ) AM_DEVREADWRITE("pia6821", pia6821_device, read, write)
diff --git a/src/mess/drivers/beta.c b/src/mess/drivers/beta.c
index e697fb80a0d..444d5ffcc1a 100644
--- a/src/mess/drivers/beta.c
+++ b/src/mess/drivers/beta.c
@@ -34,7 +34,7 @@
 
 static ADDRESS_MAP_START( beta_mem, AS_PROGRAM, 8, beta_state )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x7f00) AM_RAM // 6532 RAM
-	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x7f00) AM_DEVREADWRITE_LEGACY(M6532_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x7f00) AM_DEVREADWRITE(M6532_TAG, riot6532_device, read, write)
 	AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x7800) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mess/drivers/junior.c b/src/mess/drivers/junior.c
index 1d6babb41c1..077c1c7dcdd 100644
--- a/src/mess/drivers/junior.c
+++ b/src/mess/drivers/junior.c
@@ -61,7 +61,7 @@ static ADDRESS_MAP_START(junior_mem, AS_PROGRAM, 8, junior_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x03ff) AM_RAM // 1K RAM
 	AM_RANGE(0x1a00, 0x1a7f) AM_RAM // 6532 RAM
-	AM_RANGE(0x1a80, 0x1aff) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)
+	AM_RANGE(0x1a80, 0x1aff) AM_DEVREADWRITE("riot", riot6532_device, read, write)
 	AM_RANGE(0x1c00, 0x1fff) AM_ROM // Monitor
 ADDRESS_MAP_END
 
@@ -143,7 +143,7 @@ READ8_MEMBER( junior_state::junior_riot_a_r )
 
 READ8_MEMBER( junior_state::junior_riot_b_r )
 {
-	if ( riot6532_portb_out_get(m_riot) & 0x20 )
+	if ( m_riot->portb_out_get() & 0x20 )
 		return 0xFF;
 
 	return 0x7F;
diff --git a/src/mess/drivers/sym1.c b/src/mess/drivers/sym1.c
index 9fb8f16de46..eecf3a278b3 100644
--- a/src/mess/drivers/sym1.c
+++ b/src/mess/drivers/sym1.c
@@ -39,7 +39,7 @@ static ADDRESS_MAP_START( sym1_map, AS_PROGRAM, 8, sym1_state )
 	AM_RANGE(0x0c00, 0x0fff) AM_RAMBANK("bank4") AM_SHARE("ram_3k")
 	AM_RANGE(0x8000, 0x8fff) AM_ROM AM_SHARE("monitor")       /* U20 Monitor ROM */
 	AM_RANGE(0xa000, 0xa00f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write)      /* U25 VIA #1 */
-	AM_RANGE(0xa400, 0xa40f) AM_DEVREADWRITE_LEGACY("riot", riot6532_r, riot6532_w)  /* U27 RIOT */
+	AM_RANGE(0xa400, 0xa40f) AM_DEVREADWRITE("riot", riot6532_device, read, write)  /* U27 RIOT */
 	AM_RANGE(0xa600, 0xa67f) AM_RAMBANK("bank5") AM_SHARE("riot_ram")  /* U27 RIOT RAM */
 	AM_RANGE(0xa800, 0xa80f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write)      /* U28 VIA #2 */
 	AM_RANGE(0xac00, 0xac0f) AM_DEVREADWRITE("via6522_2", via6522_device, read, write)      /* U29 VIA #3 */
diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c
index 9388bcba6e3..db67b72a04d 100644
--- a/src/mess/machine/c2040.c
+++ b/src/mess/machine/c2040.c
@@ -256,8 +256,8 @@ static ADDRESS_MAP_START( c2040_main_mem, AS_PROGRAM, 8, c2040_device )
 	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_RAM // 6532 #1
 	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM // 6532 #2
-	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_0_TAG, riot6532_r, riot6532_w)
-	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_1_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_0_TAG, riot6532_device, read, write)
+	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_1_TAG, riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
 	AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
@@ -290,8 +290,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( c8050_main_mem, AS_PROGRAM, 8, c2040_device )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_RAM // 6532 #1
 	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM // 6532 #2
-	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_0_TAG, riot6532_r, riot6532_w)
-	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_1_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_0_TAG, riot6532_device, read, write)
+	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_1_TAG, riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
 	AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
@@ -1693,7 +1693,7 @@ void c2040_device::ieee488_atn(int state)
 	update_ieee_signals();
 
 	// set RIOT PA7
-	riot6532_porta_in_set(m_riot1, !state << 7, 0x80);
+	m_riot1->porta_in_set(!state << 7, 0x80);
 }
 
 
diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c
index 3b0ff0f41a5..9c31b546746 100644
--- a/src/mess/machine/c8280.c
+++ b/src/mess/machine/c8280.c
@@ -86,8 +86,8 @@ const rom_entry *c8280_device::device_rom_region() const
 static ADDRESS_MAP_START( c8280_main_mem, AS_PROGRAM, 8, c8280_device )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x100) AM_RAM // 6532 #1
 	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x100) AM_RAM // 6532 #2
-	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0xd60) AM_DEVREADWRITE_LEGACY(M6532_0_TAG, riot6532_r, riot6532_w)
-	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0xd60) AM_DEVREADWRITE_LEGACY(M6532_1_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0xd60) AM_DEVREADWRITE(M6532_0_TAG, riot6532_device, read, write)
+	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0xd60) AM_DEVREADWRITE(M6532_1_TAG, riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0xc00) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0xc00) AM_RAM AM_SHARE("share2")
 	AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0xc00) AM_RAM AM_SHARE("share3")
@@ -455,7 +455,7 @@ void c8280_device::ieee488_atn(int state)
 	update_ieee_signals();
 
 	// set RIOT PA7
-	riot6532_porta_in_set(m_riot1, !state << 7, 0x80);
+	m_riot1->porta_in_set(!state << 7, 0x80);
 }
 
 
diff --git a/src/mess/machine/d9060.c b/src/mess/machine/d9060.c
index d695e4aece6..22ac77d1667 100644
--- a/src/mess/machine/d9060.c
+++ b/src/mess/machine/d9060.c
@@ -89,8 +89,8 @@ const rom_entry *base_d9060_device::device_rom_region() const
 static ADDRESS_MAP_START( d9060_main_mem, AS_PROGRAM, 8, base_d9060_device )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_RAM // 6532 #1
 	AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM // 6532 #2
-	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_0_TAG, riot6532_r, riot6532_w)
-	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE_LEGACY(M6532_1_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_0_TAG, riot6532_device, read, write)
+	AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x0d60) AM_DEVREADWRITE(M6532_1_TAG, riot6532_device, read, write)
 	AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share1")
 	AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
 	AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
@@ -559,7 +559,7 @@ void base_d9060_device::ieee488_atn(int state)
 	update_ieee_signals();
 
 	// set RIOT PA7
-	riot6532_porta_in_set(m_riot1, !state << 7, 0x80);
+	m_riot1->porta_in_set(!state << 7, 0x80);
 }
 
 
diff --git a/src/mess/machine/interpod.c b/src/mess/machine/interpod.c
index c6066e999ed..a39f11fe7cf 100644
--- a/src/mess/machine/interpod.c
+++ b/src/mess/machine/interpod.c
@@ -111,7 +111,7 @@ const rom_entry *interpod_device::device_rom_region() const
 
 static ADDRESS_MAP_START( interpod_mem, AS_PROGRAM, 8, interpod_device )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x3b80) AM_RAM // 6532
-	AM_RANGE(0x0400, 0x041f) AM_MIRROR(0x3be0) AM_DEVREADWRITE_LEGACY(R6532_TAG, riot6532_r, riot6532_w)
+	AM_RANGE(0x0400, 0x041f) AM_MIRROR(0x3be0) AM_DEVREADWRITE(R6532_TAG, riot6532_device, read, write)
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x9ffe) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, status_read, control_write)
 	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x9ffe) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, data_read, data_write)
 	AM_RANGE(0x4000, 0x47ff) AM_MIRROR(0xb800) AM_ROM AM_REGION(R6502_TAG, 0)