[VM][UPD7810] Fix FTBFS.

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

diff --git a/source/src/vm/upd71071.h b/source/src/vm/upd71071.h
index f7e1843..b3f308d 100644 (file)
--- a/source/src/vm/upd71071.h
+++ b/source/src/vm/upd71071.h
@@ -10,8 +10,8 @@
 #ifndef _UPD71071_H_
 #define _UPD71071_H_
 
-#include "vm.h"
-#include "../emu.h"
+//#include "vm.h"
+//#include "../emu.h"
 #include "device.h"
 
 #define SIG_UPD71071_CH0       0
@@ -23,44 +23,54 @@ class UPD71071 : public DEVICE
 {
 private:
        DEVICE* d_mem;
-#ifdef SINGLE_MODE_DMA
+//#ifdef SINGLE_MODE_DMA
        DEVICE* d_dma;
-#endif
+//#endif
        outputs_t outputs_tc;
        
        struct {
                DEVICE* dev;
-               uint32 areg, bareg;
-               uint16 creg, bcreg;
-               uint8 mode;
+               uint32_t areg, bareg;
+               uint16_t creg, bcreg;
+               uint8_t mode;
        } dma[4];
        
-       uint8 b16, selch, base;
-       uint16 cmd, tmp;
-       uint8 req, sreq, mask, tc;
-       
+       uint8_t b16, selch, base;
+       uint16_t cmd, tmp;
+       uint8_t req, sreq, mask, tc;
+
+       bool _SINGLE_MODE_DMA;
 public:
-       UPD71071(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       UPD71071(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
+               // TIP: if((DEVICE::prev_device == NULL) || (DEVICE::this_device_id == 0)) DEVICE must be DUMMY.
+               // And, at this device, should not be FIRST DEVICE. 20170613 Ohta.
+               DEVICE *__dev = this;
+               while((__dev->prev_device != NULL) && (__dev->this_device_id > 0)) {
+                       __dev = __dev->prev_device;
+               }
                for(int i = 0; i < 4; i++) {
-                       dma[i].dev = vm->dummy;
+                       //dma[i].dev = vm->dummy;
+                       dma[i].dev = __dev;
                }
-#ifdef SINGLE_MODE_DMA
+               d_mem = __dev;
+//#ifdef SINGLE_MODE_DMA
                d_dma = NULL;
-#endif
-               init_output_signals(&outputs_tc);
+//#endif
+               _SINGLE_MODE_DMA = false;
+               initialize_output_signals(&outputs_tc);
+               set_device_name(_T("uPD71071 DMAC"));
        }
        ~UPD71071() {}
        
        // common functions
+       void initialize();
        void reset();
-       void write_io8(uint32 addr, uint32 data);
-       uint32 read_io8(uint32 addr);
-       void write_signal(int id, uint32 data, uint32 mask);
+       void write_io8(uint32_t addr, uint32_t data);
+       uint32_t read_io8(uint32_t addr);
+       void write_signal(int id, uint32_t data, uint32_t mask);
        void do_dma();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
-       
+       bool process_state(FILEIO* state_fio, bool loading);
        // unique functions
        void set_context_memory(DEVICE* device)
        {
@@ -82,13 +92,13 @@ public:
        {
                dma[3].dev = device;
        }
-#ifdef SINGLE_MODE_DMA
+//#ifdef SINGLE_MODE_DMA
        void set_context_child_dma(DEVICE* device)
        {
                d_dma = device;
        }
-#endif
-       void set_context_tc(DEVICE* device, int id, uint32 mask)
+//#endif
+       void set_context_tc(DEVICE* device, int id, uint32_t mask)
        {
                register_output_signal(&outputs_tc, device, id, mask);
        }