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

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

diff --git a/source/src/vm/multi8/display.h b/source/src/vm/multi8/display.h
index 3492524..d4954ff 100644 (file)
--- a/source/src/vm/multi8/display.h
+++ b/source/src/vm/multi8/display.h
@@ -16,24 +16,26 @@
 
 #define SIG_DISPLAY_I8255_B    0
 
+namespace MULTI8 {
+
 class DISPLAY : public DEVICE
 {
 private:
-       uint8* regs;
-       uint8 pal[8];
+       uint8_t* regs;
+       uint8_t pal[8];
        bool text_wide, text_color;
-       uint8 graph_color, graph_page;
-       uint16 cursor, cblink;
+       uint8_t graph_color, graph_page;
+       uint16_t cursor, cblink;
        bool hsync, vsync, display, blink;
        
-       uint8 screen[200][640];
-       uint8 font[0x800];
-       uint8* vram_b;
-       uint8* vram_r;
-       uint8* vram_g;
-       uint8* vram_t;
-       uint8* vram_a;
-       scrntype palette_pc[8];
+       uint8_t screen[200][640];
+       uint8_t font[0x800];
+       uint8_t* vram_b;
+       uint8_t* vram_r;
+       uint8_t* vram_g;
+       uint8_t* vram_t;
+       uint8_t* vram_a;
+       scrntype_t palette_pc[8];
        
        void draw_graph_color();
        void draw_graph_mono();
@@ -41,20 +43,22 @@ private:
        void draw_text_normal();
        
 public:
-       DISPLAY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       DISPLAY(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("Display"));
+       }
        ~DISPLAY() {}
        
        // common functions
        void initialize();
-       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 event_frame();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
-       void set_vram_ptr(uint8* ptr)
+       void set_vram_ptr(uint8_t* ptr)
        {
                vram_b = ptr + 0x0000;
                vram_r = ptr + 0x4000;
@@ -62,12 +66,13 @@ public:
                vram_t = ptr + 0xc000;
                vram_a = ptr + 0xc800;
        }
-       void set_regs_ptr(uint8* ptr)
+       void set_regs_ptr(uint8_t* ptr)
        {
                regs = ptr;
        }
        void draw_screen();
 };
 
+}
 #endif