--- hatari/src/includes/mfp.h	2019/04/01 07:11:32	1.1.1.3
+++ hatari/src/includes/mfp.h	2019/04/01 07:13:43	1.1.1.7
@@ -39,40 +39,61 @@
 #define  MFP_TIMER_D_BIT      0x10
 
 /* MFP Registers */
-extern unsigned char MFP_GPIP;
-extern unsigned char MFP_AER,MFP_DDR;
-extern unsigned char MFP_IERA,MFP_IERB;
-extern unsigned char MFP_IPRA,MFP_IPRB;
-extern unsigned char MFP_ISRA,MFP_ISRB;
-extern unsigned char MFP_IMRA,MFP_IMRB;
-extern unsigned char MFP_VR;
-extern unsigned char MFP_TACR,MFP_TBCR,MFP_TCDCR;
-extern unsigned char MFP_TADR,MFP_TBDR;
-extern unsigned char MFP_TCDR,MFP_TDDR;
-extern unsigned char MFP_TA_MAINCOUNTER;
-extern unsigned char MFP_TB_MAINCOUNTER;
-extern unsigned char MFP_TC_MAINCOUNTER;
-extern unsigned char MFP_TD_MAINCOUNTER;
-extern BOOL bAppliedTimerDPatch;
+extern Uint8 MFP_GPIP;
+extern Uint8 MFP_IERA,MFP_IERB;
+extern Uint8 MFP_IPRA,MFP_IPRB;
+extern Uint8 MFP_TACR,MFP_TBCR;
+extern Uint8 MFP_VR;
 
 extern void MFP_Reset(void);
 extern void MFP_MemorySnapShot_Capture(BOOL bSave);
 extern void MFP_CheckPendingInterrupts(void);
-extern void MFP_UpdateFlags(void);
-extern void MFP_InputOnChannel(unsigned char Bit,unsigned char EnableBit,unsigned char *pPendingReg);
+extern void MFP_InputOnChannel(Uint8 Bit, Uint8 EnableBit, Uint8 *pPendingReg);
 extern void MFP_TimerA_EventCount_Interrupt(void);
 extern void MFP_TimerB_EventCount_Interrupt(void);
-extern void MFP_StartTimerA(void);
-extern void MFP_ReadTimerA(void);
-extern void MFP_StartTimerB(void);
-extern void MFP_ReadTimerB(void);
-extern void MFP_StartTimerC(void);
-extern void MFP_ReadTimerC(void);
-extern void MFP_StartTimerD(void);
-extern void MFP_ReadTimerD(void);
 extern void MFP_InterruptHandler_TimerA(void);
 extern void MFP_InterruptHandler_TimerB(void);
 extern void MFP_InterruptHandler_TimerC(void);
 extern void MFP_InterruptHandler_TimerD(void);
 
+extern void MFP_GPIP_ReadByte(void);
+extern void MFP_ActiveEdge_ReadByte(void);
+extern void MFP_DataDirection_ReadByte(void);
+extern void MFP_EnableA_ReadByte(void);
+extern void MFP_EnableB_ReadByte(void);
+extern void MFP_PendingA_ReadByte(void);
+extern void MFP_PendingB_ReadByte(void);
+extern void MFP_InServiceA_ReadByte(void);
+extern void MFP_InServiceB_ReadByte(void);
+extern void MFP_MaskA_ReadByte(void);
+extern void MFP_MaskB_ReadByte(void);
+extern void MFP_VectorReg_ReadByte(void);
+extern void MFP_TimerACtrl_ReadByte(void);
+extern void MFP_TimerBCtrl_ReadByte(void);
+extern void MFP_TimerCDCtrl_ReadByte(void);
+extern void MFP_TimerAData_ReadByte(void);
+extern void MFP_TimerBData_ReadByte(void);
+extern void MFP_TimerCData_ReadByte(void);
+extern void MFP_TimerDData_ReadByte(void);
+
+extern void MFP_GPIP_WriteByte(void);
+extern void MFP_ActiveEdge_WriteByte(void);
+extern void MFP_DataDirection_WriteByte(void);
+extern void MFP_EnableA_WriteByte(void);
+extern void MFP_EnableB_WriteByte(void);
+extern void MFP_PendingA_WriteByte(void);
+extern void MFP_PendingB_WriteByte(void);
+extern void MFP_InServiceA_WriteByte(void);
+extern void MFP_InServiceB_WriteByte(void);
+extern void MFP_MaskA_WriteByte(void);
+extern void MFP_MaskB_WriteByte(void);
+extern void MFP_VectorReg_WriteByte(void);
+extern void MFP_TimerACtrl_WriteByte(void);
+extern void MFP_TimerBCtrl_WriteByte(void);
+extern void MFP_TimerCDCtrl_WriteByte(void);
+extern void MFP_TimerAData_WriteByte(void);
+extern void MFP_TimerBData_WriteByte(void);
+extern void MFP_TimerCData_WriteByte(void);
+extern void MFP_TimerDData_WriteByte(void);
+
 #endif