--- hatari/src/cpu/savestate.h	2019/04/09 08:49:24	1.1
+++ hatari/src/cpu/savestate.h	2019/04/09 08:55:25	1.1.1.2
@@ -10,12 +10,29 @@
 /* functions to save byte,word or long word
  * independent of CPU's endianess */
 
+#ifdef WINUAE_FOR_HATARI
+extern void save_u64(uae_u64 data);
 extern void save_u32(uae_u32 data);
 extern void save_u16(uae_u16 data);
+extern void save_u8(uae_u8 data);
+extern uae_u64 restore_u64(void);
 extern uae_u32 restore_u32(void);
 extern uae_u16 restore_u16(void);
+extern uae_u8 restore_u8(void);
 
-/*extern void save_u64_func (uae_u8 **, uae_u64);
+#else
+
+extern void save_store_pos_func (uae_u8 **);
+extern void save_store_size_func (uae_u8 **);
+extern void restore_store_pos_func (uae_u8 **);
+extern void restore_store_size_func (uae_u8 **);
+
+#define save_store_pos() save_store_pos_func (&dst)
+#define save_store_size() save_store_size_func (&dst)
+#define restore_store_pos() restore_store_pos_func (&src)
+#define restore_store_size() restore_store_size_func (&src)
+
+extern void save_u64_func (uae_u8 **, uae_u64);
 extern void save_u32_func (uae_u8 **, uae_u32);
 extern void save_u16_func (uae_u8 **, uae_u16);
 extern void save_u8_func (uae_u8 **, uae_u8);
@@ -24,11 +41,22 @@ extern uae_u64 restore_u64_func (uae_u8
 extern uae_u32 restore_u32_func (uae_u8 **);
 extern uae_u16 restore_u16_func (uae_u8 **);
 extern uae_u8 restore_u8_func (uae_u8 **);
-*/
+#endif
+
 extern void save_string_func (uae_u8 **, const TCHAR*);
 extern TCHAR *restore_string_func (uae_u8 **);
 
-/*
+#define SAVESTATE_PATH 0
+#define SAVESTATE_PATH_FLOPPY 1
+#define SAVESTATE_PATH_VDIR 2
+#define SAVESTATE_PATH_HDF 3
+#define SAVESTATE_PATH_HD 4
+#define SAVESTATE_PATH_CD 5
+
+extern void save_path_func (uae_u8 **, const TCHAR*, int type);
+extern TCHAR *restore_path_func (uae_u8 **, int type);
+
+#ifndef WINUAE_FOR_HATARI
 #define save_u64(x) save_u64_func (&dst, (x))
 #define save_u32(x) save_u32_func (&dst, (x))
 #define save_u16(x) save_u16_func (&dst, (x))
@@ -38,10 +66,15 @@ extern TCHAR *restore_string_func (uae_u
 #define restore_u32() restore_u32_func (&src)
 #define restore_u16() restore_u16_func (&src)
 #define restore_u8() restore_u8_func (&src)
+#endif
 
 #define save_string(x) save_string_func (&dst, (x))
 #define restore_string() restore_string_func (&src)
-*/
+
+#define save_path(x, p) save_path_func (&dst, (x), p)
+#define restore_path(p) restore_path_func (&src, p)
+
+
 /* save, restore and initialize routines for Amiga's subsystems */
 
 extern uae_u8 *restore_cpu (uae_u8 *);
@@ -49,6 +82,8 @@ extern void restore_cpu_finish (void);
 extern uae_u8 *save_cpu (int *, uae_u8 *);
 extern uae_u8 *restore_cpu_extra (uae_u8 *);
 extern uae_u8 *save_cpu_extra (int *, uae_u8 *);
+extern uae_u8 *save_cpu_trace (int *, uae_u8 *);
+extern uae_u8 *restore_cpu_trace (uae_u8 *);
 
 extern uae_u8 *restore_mmu (uae_u8 *);
 extern uae_u8 *save_mmu (int *, uae_u8 *);
@@ -57,9 +92,11 @@ extern uae_u8 *restore_fpu (uae_u8 *);
 extern uae_u8 *save_fpu (int *, uae_u8 *);
 
 extern uae_u8 *restore_disk (int, uae_u8 *);
-extern uae_u8 *save_disk (int, int *, uae_u8 *);
+extern uae_u8 *save_disk (int, int *, uae_u8 *, bool);
 extern uae_u8 *restore_floppy (uae_u8 *src);
 extern uae_u8 *save_floppy (int *len, uae_u8 *);
+extern uae_u8 *save_disk2 (int num, int *len, uae_u8 *dstptr);
+extern uae_u8 *restore_disk2 (int num,uae_u8 *src);
 extern void DISK_save_custom  (uae_u32 *pdskpt, uae_u16 *pdsklen, uae_u16 *pdsksync, uae_u16 *pdskbytr);
 extern void DISK_restore_custom  (uae_u32 pdskpt, uae_u16 pdsklength, uae_u16 pdskbytr);
 extern void restore_disk_finish (void);
@@ -75,15 +112,23 @@ extern uae_u8 *save_custom_sprite (int n
 extern uae_u8 *restore_custom_agacolors (uae_u8 *src);
 extern uae_u8 *save_custom_agacolors (int *len, uae_u8 *);
 
+extern uae_u8 *restore_custom_event_delay (uae_u8 *src);
+extern uae_u8 *save_custom_event_delay (int *len, uae_u8 *dstptr);
+
 extern uae_u8 *restore_blitter (uae_u8 *src);
 extern uae_u8 *save_blitter (int *len, uae_u8 *);
+extern uae_u8 *restore_blitter_new (uae_u8 *src);
+extern uae_u8 *save_blitter_new (int *len, uae_u8 *);
 extern void restore_blitter_finish (void);
 
 extern uae_u8 *restore_audio (int, uae_u8 *);
 extern uae_u8 *save_audio (int, int *, uae_u8 *);
+extern void restore_audio_finish (void);
 
 extern uae_u8 *restore_cia (int, uae_u8 *);
 extern uae_u8 *save_cia (int, int *, uae_u8 *);
+extern void restore_cia_finish (void);
+extern void restore_cia_start (void);
 
 extern uae_u8 *restore_expansion (uae_u8 *);
 extern uae_u8 *save_expansion (int *, uae_u8 *);
@@ -93,18 +138,26 @@ extern uae_u8 *save_p96 (int *, uae_u8 *
 extern void restore_p96_finish (void);
 
 extern uae_u8 *restore_keyboard (uae_u8 *);
-extern uae_u8 *save_keyboard (int *);
+extern uae_u8 *save_keyboard (int *,uae_u8*);
 
 extern uae_u8 *restore_akiko (uae_u8 *src);
-extern uae_u8 *save_akiko (int *len);
+extern uae_u8 *save_akiko (int *len, uae_u8*);
 extern void restore_akiko_finish (void);
 
 extern uae_u8 *restore_cdtv (uae_u8 *src);
-extern uae_u8 *save_cdtv (int *len);
+extern uae_u8 *save_cdtv (int *len, uae_u8*);
 extern void restore_cdtv_finish (void);
 
-extern uae_u8 *restore_dmac (uae_u8 *src);
-extern uae_u8 *save_dmac (int *len);
+extern uae_u8 *restore_cdtv_dmac (uae_u8 *src);
+extern uae_u8 *save_cdtv_dmac (int *len, uae_u8*);
+extern uae_u8 *restore_scsi_dmac (int wdtype, uae_u8 *src);
+extern uae_u8 *save_scsi_dmac (int wdtype, int *len, uae_u8*);
+
+extern uae_u8 *save_scsi_device (int wdtype, int num, int *len, uae_u8 *dstptr);
+extern uae_u8 *restore_scsi_device (int wdtype, uae_u8 *src);
+
+extern uae_u8 *save_scsidev (int num, int *len, uae_u8 *dstptr);
+extern uae_u8 *restore_scsidev (uae_u8 *src);
 
 extern uae_u8 *restore_filesys (uae_u8 *src);
 extern uae_u8 *save_filesys (int num, int *len);
@@ -113,24 +166,40 @@ extern uae_u8 *save_filesys_common (int
 extern int save_filesys_cando(void);
 
 extern uae_u8 *restore_gayle(uae_u8 *src);
-extern uae_u8 *save_gayle (int *len);
-extern uae_u8 *restore_ide (uae_u8 *src);
-extern uae_u8 *save_ide (int num, int *len);
+extern uae_u8 *save_gayle (int *len, uae_u8*);
+extern uae_u8 *restore_gayle_ide (uae_u8 *src);
+extern uae_u8 *save_gayle_ide (int num, int *len, uae_u8*);
 
 extern uae_u8 *save_cd (int num, int *len);
 extern uae_u8 *restore_cd (int, uae_u8 *src);
+extern void restore_cd_finish (void);
 
-extern uae_u8 *save_configuration (int *len);
+extern uae_u8 *save_configuration (int *len, bool fullconfig);
 extern uae_u8 *restore_configuration (uae_u8 *src);
 extern uae_u8 *save_log (int, int *len);
-extern uae_u8 *restore_log (uae_u8 *src);
+//extern uae_u8 *restore_log (uae_u8 *src);
 
 extern uae_u8 *restore_input (uae_u8 *src);
 extern uae_u8 *save_input (int *len, uae_u8 *dstptr);
 
+extern uae_u8 *restore_inputstate (uae_u8 *src);
+extern uae_u8 *save_inputstate (int *len, uae_u8 *dstptr);
+extern void clear_inputstate (void);
+
+extern uae_u8 *save_a2065 (int *len, uae_u8 *dstptr);
+extern uae_u8 *restore_a2065 (uae_u8 *src);
+extern void restore_a2065_finish (void);
+
+extern uae_u8 *restore_debug_memwatch (uae_u8 *src);
+extern uae_u8 *save_debug_memwatch (int *len, uae_u8 *dstptr);
+extern void restore_debug_memwatch_finish (void);
+
+extern uae_u8 *save_cycles (int *len, uae_u8 *dstptr);
+extern uae_u8 *restore_cycles (uae_u8 *src);
+
 extern void restore_cram (int, size_t);
 extern void restore_bram (int, size_t);
-extern void restore_fram (int, size_t);
+extern void restore_fram (int, size_t, int);
 extern void restore_zram (int, size_t, int);
 extern void restore_bootrom (int, size_t);
 extern void restore_pram (int, size_t);
@@ -141,7 +210,7 @@ extern void restore_ram (size_t, uae_u8*
 
 extern uae_u8 *save_cram (int *);
 extern uae_u8 *save_bram (int *);
-extern uae_u8 *save_fram (int *);
+extern uae_u8 *save_fram (int *, int);
 extern uae_u8 *save_zram (int *, int);
 extern uae_u8 *save_bootrom (int *);
 extern uae_u8 *save_pram (int *);
@@ -156,14 +225,18 @@ extern uae_u8 *save_action_replay (int *
 extern uae_u8 *restore_hrtmon (uae_u8 *);
 extern uae_u8 *save_hrtmon (int *, uae_u8 *);
 
-extern void savestate_initsave (const TCHAR *filename, int docompress, int nodialogs);
+extern void savestate_initsave (const TCHAR *filename, int docompress, int nodialogs, bool save);
 extern int save_state (const TCHAR *filename, const TCHAR *description);
 extern void restore_state (const TCHAR *filename);
 extern void savestate_restore_finish (void);
+extern void savestate_memorysave (void);
+
 
 extern void custom_save_state (void);
 extern void custom_prepare_savestate (void);
 
+extern bool savestate_check (void);
+
 #define STATE_SAVE 1
 #define STATE_RESTORE 2
 #define STATE_DOSAVE 4
@@ -175,6 +248,11 @@ extern int savestate_state;
 extern TCHAR savestate_fname[MAX_DPATH];
 extern struct zfile *savestate_file;
 
+STATIC_INLINE bool isrestore (void)
+{
+	return savestate_state == STATE_RESTORE || savestate_state == STATE_REWIND;
+}
+
 extern void savestate_quick (int slot, int save);
 
 extern void savestate_capture (int);
@@ -183,4 +261,5 @@ extern void savestate_init (void);
 extern void savestate_rewind (void);
 extern int savestate_dorewind (int);
 extern void savestate_listrewind (void);
-
+extern void statefile_save_recording (const TCHAR*);
+extern void savestate_capture_request (void);