[GENERAL] Merge upstream 2018-03-01.

[csp-qt/common_source_project-fm7.git] / source / src / vm / sy6522.h

diff --git a/source/src/vm/sy6522.h b/source/src/vm/sy6522.h
index 9af2a16..b3d273e 100644 (file)
--- a/source/src/vm/sy6522.h
+++ b/source/src/vm/sy6522.h
@@ -26,8 +26,8 @@
 #ifndef _SY6522_H_
 #define _SY6522_H_
 
-#include "vm.h"
-#include "../emu.h"
+//#include "vm.h"
+//#include "../emu.h"
 #include "device.h"
 
 #define SIG_SY6522_PORT_A      0
@@ -37,6 +37,8 @@
 #define SIG_SY6522_PORT_CB1    4
 #define SIG_SY6522_PORT_CB2    5
 
+class VM;
+class EMU;
 class SY6522 : public DEVICE
 {
 private:
@@ -116,7 +118,7 @@ public:
                initialize_output_signals(&outputs_cb2);
                initialize_output_signals(&outputs_irq);
                clock = CPU_CLOCKS;
-               set_device_name(_T("SY6522"));
+               set_device_name(_T("SY6522 VIA"));
        }
        ~SY6522() {}