[VM][General] Apply Upstream 2018-10-07.Still WIP.

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

diff --git a/source/src/vm/fmr50/fmr50.h b/source/src/vm/fmr50/fmr50.h
index 9f5c711..17355dd 100644 (file)
--- a/source/src/vm/fmr50/fmr50.h
+++ b/source/src/vm/fmr50/fmr50.h
@@ -78,9 +78,6 @@
 #define USE_CPU_TYPE           2
 #define USE_FLOPPY_DISK                4
 #define USE_HARD_DISK          7
-#define NOTIFY_KEY_DOWN
-#define USE_SHIFT_NUMPAD_KEY
-#define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
 #define USE_AUTO_KEY_NUMPAD
@@ -103,9 +100,6 @@ static const _TCHAR *sound_device_caption[] = {
        _T("Beep"), _T("Noise (FDD)"),
 };
 #endif
-
-
-class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -130,14 +124,16 @@ class SCSI_HDD;
 class SCSI_HOST;
 class UPD71071;
 
-class BIOS;
-class CMOS;
-class FLOPPY;
-class KEYBOARD;
-class FMR50_MEMORY;
-//class SERIAL;
-class SCSI;
-class TIMER;
+namespace FMR50 {
+       class BIOS;
+       class CMOS;
+       class FLOPPY;
+       class KEYBOARD;
+       class MEMORY;
+       //class SERIAL;
+       class SCSI;
+       class TIMER;
+}
 
 class VM : public VM_TEMPLATE
 {
@@ -169,14 +165,14 @@ protected:
        SCSI_HOST* scsi_host;
        UPD71071* dma;
        
-       BIOS* bios;
-       CMOS* cmos;
-       FLOPPY* floppy;
-       KEYBOARD* keyboard;
-       FMR50_MEMORY* memory;
-       SCSI* scsi;
-//     SERIAL* serial;
-       TIMER* timer;
+       FMR50::BIOS* bios;
+       FMR50::CMOS* cmos;
+       FMR50::FLOPPY* floppy;
+       FMR50::KEYBOARD* keyboard;
+       FMR50::MEMORY* memory;
+       FMR50::SCSI* scsi;
+//     FMR50::SERIAL* serial;
+       FMR50::TIMER* timer;
        
 public:
        // ----------------------------------------
@@ -193,6 +189,10 @@ public:
        // drive virtual machine
        void reset();
        void run();
+       double get_frame_rate()
+       {
+               return FRAMES_PER_SEC;
+       }
        
 #ifdef USE_DEBUGGER
        // debugger