[VM][WIP] Use namespace to devices per VMs.

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

diff --git a/source/src/vm/hc40/io.h b/source/src/vm/hc40/io.h
index 417b1f5..f943273 100644 (file)
--- a/source/src/vm/hc40/io.h
+++ b/source/src/vm/hc40/io.h
@@ -7,8 +7,8 @@
        [ i/o ]
 */
 
-#ifndef _IO_H_
-#define _IO_H_
+#ifndef _HC40_IO_H_
+#define _HC40_IO_H_
 
 #include "../vm.h"
 #include "../../emu.h"
@@ -19,42 +19,44 @@
 
 class FIFO;
 
+namespace HC40 {
+       
 class IO : public DEVICE
 {
 private:
        DEVICE *d_cpu, *d_mem, *d_tf20, *d_beep, *d_drec;
-       uint8* ram;
+       uint8_t* ram;
        
        // registers
        void update_intr();
-       uint32 cur_clock;
-       uint8 bcr, slbcr;
-       uint8 isr, ier;
-       uint8 bankr;
-       uint8 ioctlr;
-       uint32 icrc, icrb;
+       uint32_t cur_clock;
+       uint8_t bcr, slbcr;
+       uint8_t isr, ier;
+       uint8_t bankr;
+       uint8_t ioctlr;
+       uint32_t icrc, icrb;
        bool ear;
-       uint8 vadr, yoff;
+       uint8_t vadr, yoff;
        
        // sub cpu
-       void send_to_7508(uint8 val);
-       uint8 rec_from_7508();
+       void send_to_7508(uint8_t val);
+       uint8_t rec_from_7508();
        FIFO *cmd_buf, *rsp_buf;
        // rtc
-       cur_time_t cur_time;
+       dll_cur_time_t cur_time;
        int register_id_1sec;
        bool onesec_intr, onesec_intr_enb;
        bool alarm_intr, alarm_intr_enb;
-       uint8 alarm[6];
+       uint8_t alarm[6];
        // keyboard
        void update_key(int code);
        FIFO *key_buf;
        bool kb_intr_enb;
        bool kb_rep_enb, kb_caps;
-       uint8 kb_rep_spd1, kb_rep_spd2;
+       uint8_t kb_rep_spd1, kb_rep_spd2;
        // art
        FIFO *art_buf;
-       uint8 artsr, artdir;
+       uint8_t artsr, artdir;
        bool txen, rxen, dsr;
        int register_id_art;
        // beep
@@ -63,15 +65,18 @@ private:
        bool res_z80, res_7508;
        
        // externam ram disk
-       uint8 ext[0x40000];
-       uint32 extar;
-       uint8 extcr;
+       uint8_t ext[0x40000];
+       uint32_t extar;
+       uint8_t extcr;
        
        // display
-       scrntype pd, pb;
+       scrntype_t pd, pb;
        
 public:
-       IO(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       IO(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("I/O Bus"));
+       }
        ~IO() {}
        
        // common functions
@@ -79,21 +84,20 @@ public:
        void release();
        void reset();
        void sysreset();
-       void write_signal(int id, uint32 data, uint32 mask);
+       void write_signal(int id, uint32_t data, uint32_t mask);
        void event_frame();
        void event_callback(int event_id, int err);
-       void write_io8(uint32 addr, uint32 data);
-       uint32 read_io8(uint32 addr);
-       uint32 intr_ack();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       void write_io8(uint32_t addr, uint32_t data);
+       uint32_t read_io8(uint32_t addr);
+       uint32_t get_intr_ack();
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
        void set_context_cpu(DEVICE* device)
        {
                d_cpu = device;
        }
-       void set_context_mem(DEVICE* device, uint8* ptr)
+       void set_context_mem(DEVICE* device, uint8_t* ptr)
        {
                d_mem = device;
                ram = ptr;
@@ -115,4 +119,5 @@ public:
        void key_up(int code);
 };
 
+}
 #endif