summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/6850acia.cpp13
-rw-r--r--src/devices/machine/6850acia.h2
-rw-r--r--src/devices/machine/bankdev.cpp6
-rw-r--r--src/devices/machine/bankdev.h16
-rw-r--r--src/devices/machine/mc68681.cpp2
5 files changed, 27 insertions, 12 deletions
diff --git a/src/devices/machine/6850acia.cpp b/src/devices/machine/6850acia.cpp
index ccbda9e9878..0671dd04ecc 100644
--- a/src/devices/machine/6850acia.cpp
+++ b/src/devices/machine/6850acia.cpp
@@ -277,6 +277,19 @@ READ8_MEMBER( acia6850_device::data_r )
return m_rdr;
}
+WRITE8_MEMBER( acia6850_device::write )
+{
+ if (BIT(offset, 0))
+ data_w(space, 0, data);
+ else
+ control_w(space, 0, data);
+}
+
+READ8_MEMBER( acia6850_device::read )
+{
+ return BIT(offset, 0) ? data_r(space, 0) : status_r(space, 0);
+}
+
DECLARE_WRITE_LINE_MEMBER( acia6850_device::write_cts )
{
if (state)
diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h
index 8ec75cf5e6e..119dc330ceb 100644
--- a/src/devices/machine/6850acia.h
+++ b/src/devices/machine/6850acia.h
@@ -38,6 +38,8 @@ public:
DECLARE_READ8_MEMBER( status_r );
DECLARE_WRITE8_MEMBER( data_w );
DECLARE_READ8_MEMBER( data_r );
+ DECLARE_WRITE8_MEMBER( write );
+ DECLARE_READ8_MEMBER( read );
DECLARE_WRITE_LINE_MEMBER( write_cts );
DECLARE_WRITE_LINE_MEMBER( write_dcd );
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index 7abd6e9f5c2..c9b2c5fcfe5 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -10,8 +10,8 @@ address_map_bank_device::address_map_bank_device( const machine_config &mconfig,
: device_t(mconfig, ADDRESS_MAP_BANK, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_endianness(ENDIANNESS_NATIVE),
- m_databus_width(0),
- m_addrbus_width(32),
+ m_data_width(0),
+ m_addr_width(32),
m_stride(1),
m_program(nullptr),
m_offset(0)
@@ -83,7 +83,7 @@ READ64_MEMBER(address_map_bank_device::read64)
void address_map_bank_device::device_config_complete()
{
- m_program_config = address_space_config( "program", m_endianness, m_databus_width, m_addrbus_width );
+ m_program_config = address_space_config( "program", m_endianness, m_data_width, m_addr_width );
}
void address_map_bank_device::device_start()
diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h
index c51c46bc686..6c6e036aaa5 100644
--- a/src/devices/machine/bankdev.h
+++ b/src/devices/machine/bankdev.h
@@ -9,11 +9,11 @@
#define MCFG_ADDRESS_MAP_BANK_ENDIANNESS(_endianness) \
address_map_bank_device::set_endianness(*device, _endianness);
-#define MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(_databus_width) \
- address_map_bank_device::set_databus_width(*device, _databus_width);
+#define MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(_data_width) \
+ address_map_bank_device::set_data_width(*device, _data_width);
-#define MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(_addrbus_width) \
- address_map_bank_device::set_addrbus_width(*device, _addrbus_width);
+#define MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(_addr_width) \
+ address_map_bank_device::set_addr_width(*device, _addr_width);
#define MCFG_ADDRESS_MAP_BANK_STRIDE(_stride) \
address_map_bank_device::set_stride(*device, _stride);
@@ -28,8 +28,8 @@ public:
// static configuration helpers
static void set_endianness(device_t &device, endianness_t endianness) { downcast<address_map_bank_device &>(device).m_endianness = endianness; }
- static void set_databus_width(device_t &device, uint8_t databus_width) { downcast<address_map_bank_device &>(device).m_databus_width = databus_width; }
- static void set_addrbus_width(device_t &device, uint8_t addrbus_width) { downcast<address_map_bank_device &>(device).m_addrbus_width = addrbus_width; }
+ static void set_data_width(device_t &device, uint8_t data_width) { downcast<address_map_bank_device &>(device).m_data_width = data_width; }
+ static void set_addr_width(device_t &device, uint8_t addr_width) { downcast<address_map_bank_device &>(device).m_addr_width = addr_width; }
static void set_stride(device_t &device, uint32_t stride) { downcast<address_map_bank_device &>(device).m_stride = stride; }
DECLARE_ADDRESS_MAP(amap8, 8);
@@ -59,8 +59,8 @@ protected:
private:
// internal state
endianness_t m_endianness;
- uint8_t m_databus_width;
- uint8_t m_addrbus_width;
+ uint8_t m_data_width;
+ uint8_t m_addr_width;
uint32_t m_stride;
address_space_config m_program_config;
address_space *m_program;
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index f288a76971c..a75d9acbade 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -26,7 +26,7 @@
#include "emu.h"
#include "mc68681.h"
-#define VERBOSE 1
+//#define VERBOSE 1
//#define LOG_OUTPUT_FUNC printf
#include "logmacro.h"