From 274254c4bdd27a5ccf2f449e62f6bcc3dee990a3 Mon Sep 17 00:00:00 2001
From: Curt Coder <curtcoder@mail.com>
Date: Fri, 22 May 2015 22:02:14 +0300
Subject: [PATCH] (MESS) interpod: Refactored to use the new 6532. (nw)

---
 src/emu/bus/cbmiec/interpod.c | 6 +++---
 src/emu/bus/cbmiec/interpod.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/emu/bus/cbmiec/interpod.c b/src/emu/bus/cbmiec/interpod.c
index 3354022508e..0326210bb54 100644
--- a/src/emu/bus/cbmiec/interpod.c
+++ b/src/emu/bus/cbmiec/interpod.c
@@ -109,8 +109,8 @@ 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(R6532_TAG, riot6532_device, read, write)
+	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x3b80) AM_DEVICE(R6532_TAG, mos6532_t, ram_map)
+	AM_RANGE(0x0400, 0x041f) AM_MIRROR(0x3be0) AM_DEVICE(R6532_TAG, mos6532_t, io_map)
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x9ffe) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, status_r, control_w)
 	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x9ffe) AM_DEVREADWRITE(MC6850_TAG, acia6850_device, data_r, data_w)
 	AM_RANGE(0x4000, 0x47ff) AM_MIRROR(0xb800) AM_ROM AM_REGION(R6502_TAG, 0)
@@ -127,7 +127,7 @@ static MACHINE_CONFIG_FRAGMENT( interpod )
 	MCFG_CPU_PROGRAM_MAP(interpod_mem)
 
 	MCFG_DEVICE_ADD(R6522_TAG, VIA6522, 1000000)
-	MCFG_DEVICE_ADD(R6532_TAG, RIOT6532, 1000000)
+	MCFG_DEVICE_ADD(R6532_TAG, MOS6532n, 1000000)
 	MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
 
 	MCFG_CBM_IEEE488_ADD(NULL)
diff --git a/src/emu/bus/cbmiec/interpod.h b/src/emu/bus/cbmiec/interpod.h
index d2fee65fb3a..36c7852defb 100644
--- a/src/emu/bus/cbmiec/interpod.h
+++ b/src/emu/bus/cbmiec/interpod.h
@@ -16,7 +16,7 @@
 #include "bus/ieee488/ieee488.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/6522via.h"
-#include "machine/6532riot.h"
+#include "machine/mos6530n.h"
 #include "machine/6850acia.h"
 
 
@@ -45,7 +45,7 @@
 // ======================> interpod_device
 
 class interpod_device :  public device_t,
-							public device_cbm_iec_interface
+						 public device_cbm_iec_interface
 {
 public:
 	// construction/destruction
@@ -62,7 +62,7 @@ protected:
 
 	required_device<cpu_device> m_maincpu;
 	required_device<via6522_device> m_via;
-	required_device<riot6532_device> m_riot;
+	required_device<mos6532_t> m_riot;
 	required_device<acia6850_device> m_acia;
 	required_device<ieee488_device> m_ieee;
 };