[VM] TRY:Use namespace {VMNAME} to separate around VMs. This feature still apply...

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

diff --git a/source/src/vm/fm7/fm7_display.h b/source/src/vm/fm7/fm7_display.h
index fe468cc..b148680 100644 (file)
--- a/source/src/vm/fm7/fm7_display.h
+++ b/source/src/vm/fm7/fm7_display.h
@@ -26,14 +26,19 @@
 
 class DEVICE;
 class MC6809;
-class FM7_MAINIO;
-class KEYBOARD;
-class KANJIROM;
 class MB61VH010;
 #if defined(_FM77L4)
 class HD46505;
 #endif
 
+namespace FM7 {
+       class FM7_MAINIO;
+       class KEYBOARD;
+       class KANJIROM;
+}
+
+namespace FM7 {
+
 class DISPLAY: public DEVICE
 {
 private:
@@ -52,7 +57,7 @@ protected:
        void (DISPLAY::*write_cpu_func_table[512])(uint32_t, uint8_t);
        void (DISPLAY::*write_dma_func_table[512])(uint32_t, uint8_t);
        
-       int clr_count;
+       bool delay_busy;
        bool screen_update_flag;
        bool crt_flag_bak;
        
@@ -300,10 +305,10 @@ protected:
        uint8_t subsys_ram[0x2000];
        uint8_t cgram_bank;
        bool kanji_level2;
-       KANJIROM *kanjiclass1;
-       KANJIROM *kanjiclass2;
+       FM7::KANJIROM *kanjiclass1;
+       FM7::KANJIROM *kanjiclass2;
 #elif defined(_FM77_VARIANTS)
-       KANJIROM *kanjiclass1;
+       FM7::KANJIROM *kanjiclass1;
 #endif
        bool force_update;
        bool vram_wrote_shadow;
@@ -316,13 +321,13 @@ protected:
        bool use_alu;
        MB61VH010 *alu;
 #endif 
-       FM7_MAINIO *mainio;
-       MC6809 *subcpu;
-       KEYBOARD *keyboard;
+       FM7::FM7_MAINIO *mainio;
+       FM7::KEYBOARD *keyboard;
        bool vram_wrote;
 #if defined(_FM77L4)
        HD46505 *l4crtc;
 #endif
+       MC6809 *subcpu;
        
 #if defined(USE_GREEN_DISPLAY)
        void GETVRAM_8_200L_GREEN(int yoff, scrntype_t *p, scrntype_t *px, bool window_inv = false, bool scan_line = false);
@@ -437,9 +442,7 @@ public:
        void draw_screen();
        void event_frame();
        void event_vline(int v, int clock);
-       void save_state(FILEIO *state_fio);
-       bool load_state(FILEIO *state_fio);
-       void decl_state(void);
+       bool process_state(FILEIO *state_fio, bool loading);
        
        int get_screen_mode(void) {
                return display_mode;
@@ -459,21 +462,21 @@ public:
 #if defined(_FM77_VARIANTS) || \
     defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX) || \
     defined(_FM77AV20) || defined(_FM77AV20EX) || defined(_FM77AV20SX)
-               kanjiclass1 = (KANJIROM *)p;
+               kanjiclass1 = (FM7::KANJIROM *)p;
 #endif
        }
        void set_context_kanjiclass2(DEVICE *p) {
 #if defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX)|| \
     defined(_FM77AV20) || defined(_FM77AV20EX) || defined(_FM77AV20SX)
-               kanjiclass2 = (KANJIROM *)p;
+               kanjiclass2 = (FM7::KANJIROM *)p;
                if(p != NULL) kanji_level2 = true;
 #endif
        }
        void set_context_mainio(DEVICE *p) {
-               mainio = (FM7_MAINIO *)p;
+               mainio = (FM7::FM7_MAINIO *)p;
        }
        void set_context_keyboard(DEVICE *p) {
-               keyboard = (KEYBOARD *)p;
+               keyboard = (FM7::KEYBOARD *)p;
        }
        void set_context_subcpu(DEVICE *p) {
                subcpu = (MC6809 *)p;
@@ -490,4 +493,6 @@ public:
 #endif
 };  
 
+}
+
 #endif //  _CSP_FM7_DISPLAY_H