[GENERAL] Merge upstream 2018-02-27.

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

diff --git a/source/src/vm/upd1990a.h b/source/src/vm/upd1990a.h
index 14201c5..af9b4f3 100644 (file)
--- a/source/src/vm/upd1990a.h
+++ b/source/src/vm/upd1990a.h
@@ -18,8 +18,8 @@
 #define SIG_UPD1990A_C2                5
 #define SIG_UPD1990A_DIN       6
 
-#include "vm.h"
-#include "../emu.h"
+//#include "vm.h"
+//#include "../emu.h"
 #include "device.h"
 
 class UPD1990A : public DEVICE
@@ -29,20 +29,20 @@ private:
        outputs_t outputs_dout;
        outputs_t outputs_tp;
        
-       cur_time_t cur_time;
+       dll_cur_time_t cur_time;
        int register_id_1sec;
        
-       uint8 cmd, mode, tpmode;
-       uint64 shift_data;
+       uint8_t cmd, mode, tpmode;
+       uint64_t shift_data;
        bool clk, stb, din, hold, tp;
-       uint32 dout;
+       uint32_t dout;
        bool dout_changed;
        int register_id_tp;
        
-#ifdef HAS_UPD4990A
-       uint8 shift_cmd;
-#endif
-       
+//#ifdef HAS_UPD4990A
+       uint8_t shift_cmd;
+//#endif
+       bool __HAS_UPD4990A;    
 public:
        UPD1990A(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
@@ -54,29 +54,32 @@ public:
                hold = false;
                dout = 0;
                dout_changed = false;
-#ifdef HAS_UPD4990A
+               __HAS_UPD4990A = false;
+//#ifdef HAS_UPD4990A
                shift_cmd = 0;
-#endif
+//             set_device_name(_T("uPD4990A RTC"));
+//#else
+               set_device_name(_T("uPD1990A RTC"));
+//#endif
        }
        ~UPD1990A() {}
        
        // common functions
        void initialize();
-       void write_signal(int id, uint32 data, uint32 mask);
-       uint32 read_signal(int ch)
+       void write_signal(int id, uint32_t data, uint32_t mask);
+       uint32_t read_signal(int ch)
        {
                return dout;
        }
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       
        // unique functions
-       void set_context_dout(DEVICE* device, int id, uint32 mask)
+       void set_context_dout(DEVICE* device, int id, uint32_t mask)
        {
                register_output_signal(&outputs_dout, device, id, mask);
        }
-       void set_context_tp(DEVICE* device, int id, uint32 mask)
+       void set_context_tp(DEVICE* device, int id, uint32_t mask)
        {
                register_output_signal(&outputs_tp, device, id, mask);
        }