--- hatari/src/includes/mfp.h	2019/04/01 07:09:16	1.1.1.1
+++ hatari/src/includes/mfp.h	2019/04/01 07:11:32	1.1.1.3
@@ -1,9 +1,15 @@
 /*
-  Hatari
+  Hatari - mfp.h
+
+  This file is distributed under the GNU Public License, version 2 or at your
+  option any later version. Read the file gpl.txt for details.
 */
 
-// List of MFP interrupts (GPIP is General Purpose I/O Interrupt Port)
-#define  MFP_EXCEPT_GPIP7           15  // Highest Priority
+#ifndef HATARI_MFP_H
+#define HATARI_MFP_H
+
+/* List of MFP interrupts (GPIP is General Purpose I/O Interrupt Port) */
+#define  MFP_EXCEPT_GPIP7           15  /* Highest Priority */
 #define  MFP_EXCEPT_GPIP6           14
 #define  MFP_EXCEPT_TIMERA          13
 #define  MFP_EXCEPT_RECBUFFULL      12
@@ -13,24 +19,26 @@
 #define  MFP_EXCEPT_TIMERB          8
 
 #define  MFP_EXCEPT_GPIP5      7
-#define  MFP_EXCEPT_KEYBOARD   6
+#define  MFP_EXCEPT_ACIA       6
 #define  MFP_EXCEPT_TIMERC     5
 #define  MFP_EXCEPT_TIMERD     4
 #define  MFP_EXCEPT_GPIP3      3
 #define  MFP_EXCEPT_GPIP2      2
 #define  MFP_EXCEPT_GPIP1      1
-#define  MFP_EXCEPT_GPIP0      0  // Lowest Priority
+#define  MFP_EXCEPT_GPIP0      0  /* Lowest Priority */
 
-// MFP register defines
+/* MFP register defines */
 #define  MFP_TIMER_GPIP7_BIT  0x80
 #define  MFP_TIMER_A_BIT      0x20
+#define  MFP_RCVBUFFULL_BIT   0x10
+#define  MFP_TRNBUFEMPTY_BIT  0x04
 #define  MFP_TIMER_B_BIT      0x01
 #define  MFP_FDCHDC_BIT       0x80
-#define  MFP_KEYBOARD_BIT     0x40
-#define MFP_TIMER_C_BIT       0x20
-#define MFP_TIMER_D_BIT       0x10
+#define  MFP_ACIA_BIT         0x40
+#define  MFP_TIMER_C_BIT      0x20
+#define  MFP_TIMER_D_BIT      0x10
 
-// MFP Registers
+/* MFP Registers */
 extern unsigned char MFP_GPIP;
 extern unsigned char MFP_AER,MFP_DDR;
 extern unsigned char MFP_IERA,MFP_IERB;
@@ -45,6 +53,7 @@ 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 void MFP_Reset(void);
 extern void MFP_MemorySnapShot_Capture(BOOL bSave);
@@ -65,3 +74,5 @@ extern void MFP_InterruptHandler_TimerA(
 extern void MFP_InterruptHandler_TimerB(void);
 extern void MFP_InterruptHandler_TimerC(void);
 extern void MFP_InterruptHandler_TimerD(void);
+
+#endif