--- previous/src/video.c	2018/04/24 19:27:35	1.1.1.2
+++ previous/src/video.c	2018/04/24 19:31:21	1.1.1.4
@@ -5,111 +5,58 @@
   your option any later version. Read the file gpl.txt for details.
 
 */
-const char Video_fileid[] = "Hatari video.c : " __DATE__ " " __TIME__;
+const char Video_fileid[] = "Previous video.c : " __DATE__ " " __TIME__;
 
+#include <stdbool.h>
 #include <SDL_endian.h>
 
-#include "main.h"
 #include "configuration.h"
-#include "cycles.h"
 #include "cycInt.h"
 #include "ioMem.h"
 #include "m68000.h"
-#include "memorySnapShot.h"
 #include "screen.h"
-#include "screenSnapShot.h"
 #include "shortcut.h"
 #include "nextMemory.h"
 #include "video.h"
-#include "avi_record.h"
-
+#include "dma.h"
+#include "sysReg.h"
+#include "tmc.h"
+#include "nd_sdl.h"
 
 /*--------------------------------------------------------------*/
 /* Local functions prototypes                                   */
 /*--------------------------------------------------------------*/
 
 
-
-static void	Video_DrawScreen(void);
-
-
-
-int nScanlinesPerFrame = 400;                   /* Number of scan lines per frame */
-int nCyclesPerLine = 512;
-
-/*-----------------------------------------------------------------------*/
-/**
- * Save/Restore snapshot of local variables('MemorySnapShot_Store' handles type)
- */
-void Video_MemorySnapShot_Capture(bool bSave)
-{
-}
-
-
 /*-----------------------------------------------------------------------*/
 /**
  * Reset video chip
  */
-void Video_Reset(void)
-{
+void Video_Reset(void) {
 	Video_StartInterrupts(0);
+    nd_start_interrupts();
 }
 
+#define NEXT_VBL_FREQ 68
 
-/*-----------------------------------------------------------------------*/
 /**
- * Reset the GLUE chip responsible for generating the H/V sync signals.
- * When the 68000 RESET instruction is called, frequency and resolution
- * should be reset to 0.
+ * Start VBL interrupt
  */
-void Video_Reset_Glue(void)
-{
-}
-
-
-
-
-
-void	Video_GetPosition ( int *pFrameCycles , int *pHBL , int *pLineCycles )
-{
+void Video_StartInterrupts ( int PendingCyclesOver ) {
+    CycInt_AddRelativeInterruptUs((1000*1000)/NEXT_VBL_FREQ, 0, INTERRUPT_VIDEO_VBL);
 }
 
-
-
-
-/*-----------------------------------------------------------------------*/
-/**
- * Clear raster line table to store changes in palette/resolution on a line
- * basic. Called once on VBL interrupt.
- */
-void Video_SetScreenRasters(void)
-{
-}
-
-
-
-
-/*-----------------------------------------------------------------------*/
-/**
- * Draw screen (either with ST/STE shifter drawing functions or with
- * Videl drawing functions)
- */
-static void Video_DrawScreen(void)
-{
-Screen_Draw();
-}
-
-
-
 /**
- * Add some video interrupts to handle the first HBL and the first Timer B
+ * Generate vertical video retrace interrupt
  */
-void Video_StartInterrupts ( int PendingCyclesOver )
-{
-	int CyclesPerVBL;
-	
-        CyclesPerVBL = CYCLES_PER_FRAME;
-        CycInt_AddRelativeInterrupt(CyclesPerVBL, INT_CPU_CYCLE, INTERRUPT_VIDEO_VBL);
+static void Video_InterruptHandler(void) {
+	if (ConfigureParams.System.bTurbo) {
+		tmc_video_interrupt();
+	} else if (ConfigureParams.System.bColor) {
+        color_video_interrupt();
+    } else {
+        dma_video_interrupt();
+    }
 }
 
 
@@ -118,12 +65,14 @@ void Video_StartInterrupts ( int Pending
  * VBL interrupt : set new interrupts, draw screen, generate sound,
  * reset counters, ...
  */
-void Video_InterruptHandler_VBL ( void )
-{
+static bool statusBarToggle;
+void Video_InterruptHandler_VBL ( void ) {
 	CycInt_AcknowledgeInterrupt();
-	Video_DrawScreen();
-        Main_EventHandler();
-        CycInt_AddRelativeInterrupt(CYCLES_PER_FRAME, INT_CPU_CYCLE, INTERRUPT_VIDEO_VBL);
+    host_blank(0, MAIN_DISPLAY, true);
+    if(statusBarToggle) Update_StatusBar();
+    statusBarToggle = !statusBarToggle;
+    Video_InterruptHandler();
+    CycInt_AddRelativeInterruptUs((1000*1000)/NEXT_VBL_FREQ, 0, INTERRUPT_VIDEO_VBL);
 }