OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[VM][General] Merge Upstream 20180530.
[csp-qt/common_source_project-fm7.git]
/
source
/
src
/
vm
/
mz2500
/
mz2500.h
diff --git
a/source/src/vm/mz2500/mz2500.h
b/source/src/vm/mz2500/mz2500.h
index
21a26c8
..
52a8c9d
100644
(file)
--- a/
source/src/vm/mz2500/mz2500.h
+++ b/
source/src/vm/mz2500/mz2500.h
@@
-38,12
+38,10
@@
// device informations for win32
#define USE_SPECIAL_RESET
// device informations for win32
#define USE_SPECIAL_RESET
-#define USE_DRIVE_TYPE 2
#define USE_FLOPPY_DISK 4
#define USE_TAPE 1
#define USE_TAPE_BUTTON
#define USE_HARD_DISK 2
#define USE_FLOPPY_DISK 4
#define USE_TAPE 1
#define USE_TAPE_BUTTON
#define USE_HARD_DISK 2
-#define OPEN_HARD_DISK_IN_RESET
#define USE_SOCKET
#define USE_SHIFT_NUMPAD_KEY
#define USE_ALT_F10_KEY
#define USE_SOCKET
#define USE_SHIFT_NUMPAD_KEY
#define USE_ALT_F10_KEY
@@
-84,7
+82,7
@@
class IO;
class MB8877;
class PCM1BIT;
class RP5C01;
class MB8877;
class PCM1BIT;
class RP5C01;
-class S
C
SI_HDD;
+class S
A
SI_HDD;
class SCSI_HOST;
class W3100A;
class YM2203;
class SCSI_HOST;
class W3100A;
class YM2203;
@@
-125,7
+123,7
@@
protected:
MB8877* fdc;
PCM1BIT* pcm;
RP5C01* rtc;
MB8877* fdc;
PCM1BIT* pcm;
RP5C01* rtc;
- S
C
SI_HDD* sasi_hdd;
+ S
A
SI_HDD* sasi_hdd;
SCSI_HOST* sasi_host;
W3100A* w3100a;
YM2203* opn;
SCSI_HOST* sasi_host;
W3100A* w3100a;
YM2203* opn;
@@
-150,13
+148,6
@@
protected:
SERIAL* serial;
TIMER* timer;
SERIAL* serial;
TIMER* timer;
-#if defined(OPEN_HARD_DISK_IN_RESET)
- _TCHAR hd_file_path[2][_MAX_PATH];
-#endif
- void open_hard_disk_tmp(int drv, const _TCHAR* file_path);
- void close_hard_disk_tmp(int drv);
- bool is_hard_disk_inserted_tmp(int drv);
-
// monitor type cache
int monitor_type;
// monitor type cache
int monitor_type;