--- hatari/src/includes/floppy.h	2019/04/01 07:13:44	1.1.1.6
+++ hatari/src/includes/floppy.h	2019/04/09 08:50:29	1.1.1.9
@@ -8,37 +8,51 @@
 #ifndef HATARI_FLOPPY_H
 #define HATARI_FLOPPY_H
 
+#include "configuration.h"
+
+
+
+#define MAX_FLOPPYDRIVES    2					/* A: and B: */
+#define NUMBYTESPERSECTOR 512					/* All supported disk images are 512 bytes per sector */
+
+#define	FLOPPY_DRIVE_TRANSITION_STATE_INSERT		1
+#define	FLOPPY_DRIVE_TRANSITION_STATE_EJECT		2
+#define	FLOPPY_DRIVE_TRANSITION_DELAY_VBL		18	/* min of 16 VBLs */
+
 /* Structure for each drive connected as emulation */
 typedef struct
 {
-  Uint8 *pBuffer;
-  char szFileName[FILENAME_MAX];
-  int nImageBytes;
-  BOOL bDiskInserted;
-  BOOL bMediaChanged;
-  BOOL bContentsChanged;
-  BOOL bOKToSave;
-} EMULATION_DRIVE;
+	Uint8 *pBuffer;
+	char sFileName[FILENAME_MAX];
+	int nImageBytes;
+	bool bDiskInserted;
+	bool bContentsChanged;
+	bool bOKToSave;
 
-#define NUM_EMULATION_DRIVES  2            /* A:, B: */
-#define NUMBYTESPERSECTOR    512           /* All disks are 512 bytes per sector */
+	/* For the emulation of the WPRT bit when a disk is changed */
+	int TransitionState1;
+	int TransitionState1_VBL;
+	int TransitionState2;
+	int TransitionState2_VBL;
+} EMULATION_DRIVE;
 
-extern EMULATION_DRIVE EmulationDrives[NUM_EMULATION_DRIVES];
+extern EMULATION_DRIVE EmulationDrives[MAX_FLOPPYDRIVES];
 extern int nBootDrive;
 
+
 extern void Floppy_Init(void);
 extern void Floppy_UnInit(void);
-extern void Floppy_MemorySnapShot_Capture(BOOL bSave);
+extern void Floppy_Reset(void);
+extern void Floppy_MemorySnapShot_Capture(bool bSave);
 extern void Floppy_GetBootDrive(void);
-extern BOOL Floppy_IsWriteProtected(int Drive);
-extern BOOL Floppy_InsertDiskIntoDrive(int Drive, char *pszFileName, int maxlen);
-extern char* Floppy_ZipInsertDiskIntoDrive(int Drive, const char *pszFileName, const char *pszZipPath);
-extern void Floppy_EjectDiskFromDrive(int Drive,BOOL bInformUser);
-extern void Floppy_EjectBothDrives(void);
-extern void Floppy_FindDiskDetails(const Uint8 *pBuffer, int nImageBytes, unsigned short *pnSectorsPerTrack, unsigned short *pnSides);
-extern BOOL Floppy_ReadSectors(int Drive, Uint8 *pBuffer, unsigned short Sector, unsigned short Track, unsigned short Side, short Count, int *pnSectorsPerTrack);
-extern BOOL Floppy_WriteSectors(int Drive, Uint8 *pBuffer, unsigned short Sector, unsigned short Track, unsigned short Side, short Count, int *pnSectorsPerTrack);
-extern int Floppy_GetPhysicalSectorsPerTrack(int Drive);
-extern BOOL Floppy_ReadPhysicalSector(int Drive,char *pBuffer,unsigned short int Sector,unsigned short int Track,unsigned short int Side,unsigned short int Count);
+extern bool Floppy_IsWriteProtected(int Drive);
+extern const char* Floppy_SetDiskFileNameNone(int Drive);
+extern const char* Floppy_SetDiskFileName(int Drive, const char *pszFileName, const char *pszZipPath);
+extern int Floppy_DriveTransitionUpdateState ( int Drive );
+extern bool Floppy_InsertDiskIntoDrive(int Drive);
+extern bool Floppy_EjectDiskFromDrive(int Drive);
+extern void Floppy_FindDiskDetails(const Uint8 *pBuffer, int nImageBytes, Uint16 *pnSectorsPerTrack, Uint16 *pnSides);
+extern bool Floppy_ReadSectors(int Drive, Uint8 *pBuffer, Uint16 Sector, Uint16 Track, Uint16 Side, short Count, int *pnSectorsPerTrack, int *pSectorSize);
+extern bool Floppy_WriteSectors(int Drive, Uint8 *pBuffer, Uint16 Sector, Uint16 Track, Uint16 Side, short Count, int *pnSectorsPerTrack, int *pSectorSize);
 
 #endif