summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mos6529.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/mos6529.cpp')
-rw-r--r--src/devices/machine/mos6529.cpp29
1 files changed, 12 insertions, 17 deletions
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index d3e3c5a7764..a1487f13921 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -9,13 +9,8 @@
#include "emu.h"
#include "mos6529.h"
-
-
-//**************************************************************************
-// MACROS / CONSTANTS
-//**************************************************************************
-
-#define LOG 0
+//#define VERBOSE 1
+#include "logmacro.h"
@@ -24,7 +19,7 @@
//**************************************************************************
// device type definition
-const device_type MOS6529 = device_creator<mos6529_device>;
+DEFINE_DEVICE_TYPE(MOS6529, mos6529_device, "mos6529", "MOS 6529")
@@ -37,7 +32,7 @@ const device_type MOS6529 = device_creator<mos6529_device>;
//-------------------------------------------------
mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock, "mos6529", __FILE__),
+ : device_t(mconfig, MOS6529, tag, owner, clock),
m_input(0),
m_p0_handler(*this),
m_p1_handler(*this),
@@ -85,12 +80,12 @@ READ8_MEMBER( mos6529_device::read )
WRITE8_MEMBER( mos6529_device::write )
{
- m_p0_handler((data>>0)&1);
- m_p1_handler((data>>1)&1);
- m_p2_handler((data>>2)&1);
- m_p3_handler((data>>3)&1);
- m_p4_handler((data>>4)&1);
- m_p5_handler((data>>5)&1);
- m_p6_handler((data>>6)&1);
- m_p7_handler((data>>7)&1);
+ m_p0_handler(BIT(data, 0));
+ m_p1_handler(BIT(data, 1));
+ m_p2_handler(BIT(data, 2));
+ m_p3_handler(BIT(data, 3));
+ m_p4_handler(BIT(data, 4));
+ m_p5_handler(BIT(data, 5));
+ m_p6_handler(BIT(data, 6));
+ m_p7_handler(BIT(data, 7));
}