[VM][DEVICE] Use __FASTCALL with interfaces, read_*() ,write_*(), fetch_op() and...

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

diff --git a/source/src/vm/nor.h b/source/src/vm/nor.h
index 1e5b08c..5151d47 100644 (file)
--- a/source/src/vm/nor.h
+++ b/source/src/vm/nor.h
@@ -10,8 +10,8 @@
 #ifndef _NOR_H_
 #define _NOR_H_
 
-#include "vm.h"
-#include "../emu.h"
+//#include "vm.h"
+//#include "../emu.h"
 #include "device.h"
 
 #define SIG_NOR_BIT_0  0x01
@@ -23,29 +23,31 @@
 #define SIG_NOR_BIT_6  0x40
 #define SIG_NOR_BIT_7  0x80
 
+class VM;
+class EMU;
 class NOR : public DEVICE
 {
 private:
        outputs_t outputs;
-       uint32 bits_in;
+       uint32_t bits_in;
        bool prev, first;
        
 public:
-       NOR(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       NOR(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                initialize_output_signals(&outputs);
                bits_in = 0;
                prev = first = true;
+               set_device_name(_T("NOR GATE"));
        }
        ~NOR() {}
        
        // common functions
-       void write_signal(int id, uint32 data, uint32 mask);
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       void __FASTCALL write_signal(int id, uint32_t data, uint32_t mask);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique function
-       void set_context_out(DEVICE* device, int id, uint32 mask)
+       void set_context_out(DEVICE* device, int id, uint32_t mask)
        {
                register_output_signal(&outputs, device, id, mask);
        }