Now up to date with current dev version.

Changes since v0.7 :
- Major CPU reorganisation. This has possibly broken some stuff, though I fixed all the regressions I could find
- Lazy flags. This brought 10% speed improvement at one point, but that's probably been lost now
- 430 VX chipset emulation
- IDT Winchip emulation (currently sans MMX). Timing is probably wrong
- Fixed a few FPU bugs
- Timer reorganisation
- Sound reorganisation
- Other general reorganisation
- AdLib Gold emulation
- Windows Sound System emulation
- Pro Audio Spectrum 16 emulation. This currently works with most DOS stuff, but not in Windows
- Major improvements to GUS emulation. Has the downside that it now conflicts with SB emulation, so probably best to not enable both simultaneously
- New graphics cards :
  - ATI-18800 (VGA Edge-16)
  - ATI-28800 (VGA Charger)
  - ATI Mach64GX (Graphics Pro Turbo). Quite a few features missing, but Windows doesn't seem to use half the features of this card
  - Cirrus Logic CL-GD5429. Blitter is a bit broken
  - Oak OTI-067
  - S3 Trio64 (Number Nine 9FX)
  - S3 Virge. Only framebuffer stuff at the minute, Windows won't recognise the card
  - Trident TGUI-9440
  - VGA. Doesn't work yet
- Beginnings of 3DFX emulation, however this is in extremely early stages and doesn't do anything useful
- Fixed DMA bug stopping floppy drives working in Windows 3.x
- Fixed some other stuff probably
- Broke some other stuff probably as well

src/vid_cga.c

@@ -1,8 +1,15 @@
 /*CGA emulation*/
+#include <math.h>
 #include "ibm.h"
+#include "io.h"
+#include "mem.h"
+#include "timer.h"
 #include "video.h"
+#include "vid_cga.h"
 
-void cga_out(uint16_t addr, uint8_t val)
+void cga_recalctimings();
+
+void cga_out(uint16_t addr, uint8_t val, void *priv)
 {
         uint8_t old;
 //        pclog("CGA_OUT %04X %02X\n", addr, val);
@@ -32,7 +39,7 @@ void cga_out(uint16_t addr, uint8_t val)
         }
 }
 
-uint8_t cga_in(uint16_t addr)
+uint8_t cga_in(uint16_t addr, void *priv)
 {
 //        pclog("CGA_IN %04X\n", addr);
         switch (addr)
@@ -49,7 +56,7 @@ uint8_t cga_in(uint16_t addr)
 
 extern uint8_t charbuffer[256];
 
-void cga_write(uint32_t addr, uint8_t val)
+void cga_write(uint32_t addr, uint8_t val, void *priv)
 {
 //        pclog("CGA_WRITE %04X %02X\n", addr, val);
         vram[addr&0x3FFF]=val;
@@ -58,7 +65,7 @@ void cga_write(uint32_t addr, uint8_t val)
         cycles -= 4;
 }
 
-uint8_t cga_read(uint32_t addr)
+uint8_t cga_read(uint32_t addr, void *priv)
 {
         cycles -= 4;        
         charbuffer[ ((int)(((dispontime - vidtime) * 2) / CGACONST)) & 0xfc] = vram[addr&0x3FFF];
@@ -69,22 +76,25 @@ uint8_t cga_read(uint32_t addr)
 
 void cga_recalctimings()
 {
+	double _dispontime, _dispofftime;
         pclog("Recalc - %i %i %i\n", crtc[0], crtc[1], cgamode & 1);
         if (cgamode&1)
         {
                 disptime=crtc[0]+1;
-                dispontime=crtc[1];
+                _dispontime=crtc[1];
         }
         else
         {
                 disptime=(crtc[0]+1)<<1;
-                dispontime=crtc[1]<<1;
+                _dispontime=crtc[1]<<1;
         }
-        dispofftime=disptime-dispontime;
+        _dispofftime=disptime-_dispontime;
 //        printf("%i %f %f %f  %i %i\n",cgamode&1,disptime,dispontime,dispofftime,crtc[0],crtc[1]);
-        dispontime*=CGACONST;
-        dispofftime*=CGACONST;
+        _dispontime*=CGACONST;
+        _dispofftime*=CGACONST;
 //        printf("Timings - on %f off %f frame %f second %f\n",dispontime,dispofftime,(dispontime+dispofftime)*262.0,(dispontime+dispofftime)*262.0*59.92);
+	dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
+	dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
 }
 
 static int linepos,displine;
@@ -92,7 +102,7 @@ static int sc,vc;
 static int cgadispon;
 static int con,coff,cursoron,cgablink;
 static int vsynctime,vadj;
-static uint16_t ma,maback,ca;
+static uint16_t ma,maback;
 static int oddeven = 0;
 
 static int ntsc_col[8][8]=
@@ -117,7 +127,7 @@ void cga_poll()
         int x,c;
         int oldvc;
         uint8_t chr,attr;
-        uint16_t dat,dat2,dat3,dat4;
+        uint16_t dat;
         int cols[4];
         int col;
         int oldsc;
@@ -467,7 +477,7 @@ int cga_init()
                 i_filt[c]=512.0*cos((3.14*(cga_tint+c*4)/16.0) - 33.0/180.0);
                 q_filt[c]=512.0*sin((3.14*(cga_tint+c*4)/16.0) - 33.0/180.0);
         }
-        mem_sethandler(0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL);
+        mem_sethandler(0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL,  NULL);
         return 0;
 }