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

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

diff --git a/source/src/vm/fm7/fm8_mainio.h b/source/src/vm/fm7/fm8_mainio.h
index f231d4a..b8f3e61 100644 (file)
--- a/source/src/vm/fm7/fm8_mainio.h
+++ b/source/src/vm/fm7/fm8_mainio.h
@@ -13,10 +13,14 @@
 
 #include "./fm7_mainio.h"
 
-class BUBBLECASETTE;
+namespace FM7 {
+       class BUBBLECASETTE;
+}
+
+namespace FM7 {
 class FM8_MAINIO : public FM7_MAINIO {
  protected:
-       BUBBLECASETTE *bubble_casette[2];
+       FM7::BUBBLECASETTE *bubble_casette[2];
        uint8_t get_port_fd00(void) override;
        void set_port_fd02(uint8_t val) override;
        uint8_t get_irqstat_fd03(void) override;
@@ -43,10 +47,8 @@ class FM8_MAINIO : public FM7_MAINIO {
        void set_opn_cmd(int index, uint8_t cmd) override;
        uint8_t get_extirq_whg(void) override;
        uint8_t get_extirq_thg(void) override;
-       void opn_note_on(int index) override;
-
 public:
-       FM8_MAINIO(VM* parent_vm, EMU* parent_emu);
+       FM8_MAINIO(VM_TEMPLATE* parent_vm, EMU* parent_emu);
        ~FM8_MAINIO();
        
        void write_data8(uint32_t addr, uint32_t data);
@@ -59,7 +61,7 @@ public:
        void update_config();
        void save_state(FILEIO *state_fio) override;
        bool load_state(FILEIO *state_fio) override;
-       void decl_state(void) override;
+       bool decl_state(FILEIO *state_fio, bool loading) override;
 
        void set_context_kanjirom_class2(DEVICE *p)
        {
@@ -82,4 +84,6 @@ public:
                bubble_casette[drive] = p;
        }
 };     
+
+}
 #endif