--- hatari/src/uae-cpu/hatari-glue.c	2019/04/01 07:10:05	1.1.1.4
+++ hatari/src/uae-cpu/hatari-glue.c	2019/04/01 07:10:40	1.1.1.6
@@ -1,3 +1,14 @@
+/*
+  Hatari - hatari-glue.c
+
+  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.
+
+  This file contains some code to glue the UAE CPU core to the rest of the
+  emulator and Hatari's "illegal" opcodes.
+*/
+static char rcsid[] = "Hatari $Id: hatari-glue.c,v 1.1.1.6 2019/04/01 07:10:40 root Exp $";
+
 
 #include <stdio.h>
 
@@ -6,14 +17,12 @@
 #include "../includes/tos.h"
 #include "../includes/gemdos.h"
 #include "../includes/cart.h"
+#include "../includes/vdi.h"
+#include "../includes/stMemory.h"
 
-#ifndef UAESYSDEPS
 #include "sysdeps.h"
-#endif
-#ifndef UAEMEMORY
-#include "memory.h"
-#endif
 #include "maccess.h"
+#include "memory.h"
 #include "newcpu.h"
 
 #ifndef FALSE
@@ -27,6 +36,8 @@ int address_space_24 = TRUE;
 int cpu_level = 0;              /* 68000 (default) */
 int cpu_compatible = FALSE;
 
+int requestedInterrupt = -1;
+
 long STmem_size = 0x400000;     /* 4MB */
 long TTmem_size = 0;
 
@@ -34,21 +45,17 @@ long TTmem_size = 0;
 /* Reset custom chips */
 void customreset(void)
 {
-#if 0    /* Disabled since WinSTon ignores the RESET instruction, too */
-  /* Taken from Reset_ST in reset.c: */
-  Int_Reset();                           /* Reset interrupts */
-  MFP_Reset();                           /* Setup MFP chip */
-  Video_Reset();                         /* Reset video */
-  PSG_Reset();                           /* Reset PSG */
-  Sound_Reset();                         /* Reset Sound */
-  IKBD_Reset(FALSE);                     /* Keyboard */
-  Screen_Reset();                        /* Reset screen */
-
-  /* And VBL interrupt, MUST always be one interrupt ready to trigger */
-  Int_AddAbsoluteInterrupt(CYCLES_ENDLINE,INTERRUPT_VIDEO_ENDLINE);
-  Int_AddAbsoluteInterrupt(CYCLES_HBL,INTERRUPT_VIDEO_HBL);
-  Int_AddAbsoluteInterrupt(CYCLES_PER_FRAME,INTERRUPT_VIDEO_VBL);
-#endif
+  requestedInterrupt = -1;
+}
+
+
+/* Return interrupt number (1 - 7), -1 means no interrupt. */
+int intlev(void)
+{
+  int ret = requestedInterrupt;
+  requestedInterrupt = -1;
+
+  return ret;
 }
 
 
@@ -111,9 +118,10 @@ unsigned long OpCode_ConnectedDrive(uae_
   return 4;
 }
 
+
 /* ----------------------------------------------------------------------- */
 /*
-  Re-direct execution to old GEM calls, used in 'cart.s'
+  Re-direct execution to old GEMDOS calls, used in 'cart.s'
 */
 unsigned long OpCode_OldGemDos(uae_u32 opcode)
 {
@@ -122,6 +130,7 @@ unsigned long OpCode_OldGemDos(uae_u32 o
   return 4;
 }
 
+
 /* ----------------------------------------------------------------------- */
 /*
   Intercept GEMDOS calls (setup vector $84)
@@ -133,17 +142,28 @@ unsigned long OpCode_OldGemDos(uae_u32 o
 */
 unsigned long OpCode_GemDos(uae_u32 opcode)
 {
+  if(!bInitGemDOS)
+  {
+    /* Init on boot - see cartimg.c */
+    GemDOS_Boot();
 
-  if(!bInitGemDOS)     
-    GemDOS_Boot();      /* Init on boot - see cartimg.c */    
-  else 
+    /* We use this to get pointer to Line-A structure details
+     * (to fix for extended VDI res) */
+    LineABase = regs.regs[0];  /* D0 */
+    FontBase = regs.regs[9];   /* A1 */
+    VDI_LineA();
+  }
+  else
+  {
     GemDOS_OpCode();    /* handler code in gemdos.c */
+  }
 
- m68k_incpc(2);
- fill_prefetch_0();
- return 4;
+  m68k_incpc(2);
+  fill_prefetch_0();
+  return 4;
 }
 
+
 /* ----------------------------------------------------------------------- */
 /*
   Modify TimerD in GEMDos to gain more desktop performance
@@ -157,11 +177,27 @@ unsigned long OpCode_GemDos(uae_u32 opco
 */
 unsigned long OpCode_TimerD(uae_u32 opcode)
 {
- /*fprintf(stderr, "OpCode_TimerD handled\n");*/
- m68k_dreg(regs,0)=3;	/* 3 = Select Timer D */
- m68k_dreg(regs,1)=7;	/* 1 = /4 for 9600 baud(used /200) */
- m68k_dreg(regs,2)=100;	/* 2 = 9600 baud(100) */
- m68k_incpc(2);
- fill_prefetch_0();
- return 4;
+  /*fprintf(stderr, "OpCode_TimerD handled\n");*/
+  m68k_dreg(regs,0)=3;	/* 3 = Select Timer D */
+  m68k_dreg(regs,1)=7;	/* 1 = /4 for 9600 baud(used /200) */
+  m68k_dreg(regs,2)=100;	/* 2 = 9600 baud(100) */
+  m68k_incpc(2);
+  fill_prefetch_0();
+  return 4;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/*
+  This is called after completion of each VDI call
+*/
+unsigned long OpCode_VDI(uae_u32 opcode)
+{
+  VDI_Complete();
+
+  /* Set PC back to where originated from to continue instruction decoding */
+  m68k_setpc(VDI_OldPC);
+
+  fill_prefetch_0();
+  return 4;
 }