--- uae/src/cia.c	2018/04/24 16:40:00	1.1.1.3
+++ uae/src/cia.c	2018/04/24 16:56:38	1.1.1.9
@@ -14,8 +14,6 @@
 #include "config.h"
 #include "options.h"
 #include "threaddep/penguin.h"
-#include "gensound.h"
-#include "sounddep/sound.h"
 #include "events.h"
 #include "memory.h"
 #include "custom.h"
@@ -229,11 +227,8 @@ void CIA_handler(void)
     CIA_calctimers();
 }
 
-void diskindex_handler(void)
+void cia_diskindex(void)
 {
-    eventtab[ev_diskindex].evtime += cycles - eventtab[ev_diskindex].oldcycles;
-    eventtab[ev_diskindex].oldcycles = cycles;
-/*    printf(".\n");*/
     ciabicr |= 0x10;
     RethinkICRB();
 }
@@ -310,55 +305,57 @@ static uae_u8 ReadCIAA(unsigned int addr
 {
     unsigned int tmp;
 
-    switch(addr & 0xf){
-     case 0:
+    switch(addr & 0xf) {
+    case 0:
 	if (currprefs.use_serial && (serstat < 0)) /* Only read status when needed */
 	    serstat=serial_readstatus();		/* and only once per frame */
 
 	tmp = (DISK_status() & 0x3C);
-	if ((JSEM_ISMOUSE (0, currprefs.fake_joystick) && !buttonstate[0])
-	    || (!JSEM_ISMOUSE (0, currprefs.fake_joystick) && !(joy0button & 1)))
+	if ((JSEM_ISMOUSE (0, &currprefs) && !buttonstate[0])
+	    || (!JSEM_ISMOUSE (0, &currprefs) && !(joy0button & 1)))
 	    tmp |= 0x40;
 	if (!(joy1button & 1))
 	    tmp |= 0x80;
 	return tmp;
-     case 1:
-	return ciaaprb;
-     case 2:
+    case 1:
+	/* Returning 0xFF is necessary for Tie Break - otherwise its joystick
+	   code won't work.  */
+	return prtopen ? ciaaprb : 0xFF;
+    case 2:
 	return ciaadra;
-     case 3:
+    case 3:
 	return ciaadrb;
-     case 4:
+    case 4:
 	return ciaata & 0xff;
-     case 5:
+    case 5:
 	return ciaata >> 8;
-     case 6:
+    case 6:
 	return ciaatb & 0xff;
-     case 7:
+    case 7:
 	return ciaatb >> 8;
-     case 8:
+    case 8:
 	if (ciaatlatch) {
 	    ciaatlatch = 0;
 	    return ciaatol & 0xff;
 	} else
 	    return ciaatod & 0xff;
-     case 9:
+    case 9:
 	if (ciaatlatch)
 	    return (ciaatol >> 8) & 0xff;
 	else
 	    return (ciaatod >> 8) & 0xff;
-     case 10:
+    case 10:
 	ciaatlatch = 1;
 	ciaatol = ciaatod; /* ??? only if not already latched? */
 	return (ciaatol >> 16) & 0xff;
-     case 12:
+    case 12:
 	if (ciaasdr == 1) ciaasdr_unread = 2;
 	return ciaasdr;
-     case 13:
+    case 13:
 	tmp = ciaaicr; ciaaicr = 0; RethinkICRA(); return tmp;
-     case 14:
+    case 14:
 	return ciaacra;
-     case 15:
+    case 15:
 	return ciaacrb;
     }
     return 0;
@@ -368,48 +365,50 @@ static uae_u8 ReadCIAB(unsigned int addr
 {
     unsigned int tmp;
 
-    switch(addr & 0xf){
-     case 0:
+    switch(addr & 0xf) {
+    case 0:
 	if (currprefs.use_serial && serstat < 0) /* Only read status when needed */
 	    serstat=serial_readstatus();	 /* and only once per frame      */
-	return ciabpra;
-     case 1:
+	/* Returning some 1 bits is necessary for Tie Break - otherwise its joystick
+	   code won't work.  */
+	return ciabpra | (prtopen ? 0 : 3);
+    case 1:
 	return ciabprb;
-     case 2:
+    case 2:
 	return ciabdra;
-     case 3:
+    case 3:
 	return ciabdrb;
-     case 4:
+    case 4:
 	return ciabta & 0xff;
-     case 5:
+    case 5:
 	return ciabta >> 8;
-     case 6:
+    case 6:
 	return ciabtb & 0xff;
-     case 7:
+    case 7:
 	return ciabtb >> 8;
-     case 8:
+    case 8:
 	if (ciabtlatch) {
 	    ciabtlatch = 0;
 	    return ciabtol & 0xff;
 	} else
 	    return ciabtod & 0xff;
-     case 9:
+    case 9:
 	if (ciabtlatch)
 	    return (ciabtol >> 8) & 0xff;
 	else
 	    return (ciabtod >> 8) & 0xff;
-     case 10:
+    case 10:
 	ciabtlatch = 1;
 	ciabtol = ciabtod;
 	return (ciabtol >> 16) & 0xff;
-     case 12:
+    case 12:
 	return ciabsdr;
-     case 13:
+    case 13:
 	tmp = ciabicr; ciabicr = 0; RethinkICRB();
 	return tmp;
-     case 14:
+    case 14:
 	return ciabcra;
-     case 15:
+    case 15:
 	return ciabcrb;
     }
     return 0;
@@ -418,8 +417,8 @@ static uae_u8 ReadCIAB(unsigned int addr
 static void WriteCIAA(uae_u16 addr,uae_u8 val)
 {
     int oldled, oldovl;
-    switch(addr & 0xf){
-     case 0:
+    switch(addr & 0xf) {
+    case 0:
 	oldovl = ciaapra & 1;
 	oldled = ciaapra & 2;
 	ciaapra = (ciaapra & ~0x3) | (val & 0x3); LED(ciaapra & 0x2);
@@ -431,11 +430,11 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	    map_banks(oldovl || ersatzkickfile ? &chipmem_bank : &kickmem_bank, 0, 32);
 	}
 	break;
-     case 1:
+    case 1:
 	ciaaprb = val;
 	if (prtopen==1) {
 #ifndef __DOS__
-	    fprintf (prttmp,"%c",val);
+	    fprintf (prttmp, "%c",val);
 #else
 	    fputc (val, prttmp);
 	    fflush (prttmp);
@@ -450,9 +449,9 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	    }
 	} else {
 #if defined(__unix) && !defined(__BEOS__) && !defined(__DOS__)
-	    prttmp=(FILE *)popen ((char *)prtname,"w");
+	    prttmp = (FILE *)popen ((const char *)currprefs.prtname, "w");
 #else
-	    prttmp=(FILE *)fopen ((char *)prtname,"wb");
+	    prttmp = (FILE *)fopen ((const char *)currprefs.prtname, "wb");
 #endif
 	    if (prttmp != NULL) {
 		prtopen = 1;
@@ -466,16 +465,16 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	ciaaicr |= 0x10;
 	break;
-     case 2:
+    case 2:
 	ciaadra = val; break;
-     case 3:
+    case 3:
 	ciaadrb = val; break;
-     case 4:
+    case 4:
 	CIA_update();
 	ciaala = (ciaala & 0xff00) | val;
 	CIA_calctimers();
 	break;
-     case 5:
+    case 5:
 	CIA_update();
 	ciaala = (ciaala & 0xff) | (val << 8);
 	if ((ciaacra & 1) == 0)
@@ -486,12 +485,12 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	CIA_calctimers();
 	break;
-     case 6:
+    case 6:
 	CIA_update();
 	ciaalb = (ciaalb & 0xff00) | val;
 	CIA_calctimers();
 	break;
-     case 7:
+    case 7:
 	CIA_update();
 	ciaalb = (ciaalb & 0xff) | (val << 8);
 	if ((ciaacrb & 1) == 0)
@@ -502,38 +501,38 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	CIA_calctimers();
 	break;
-     case 8:
-	if (ciaacrb & 0x80){
+    case 8:
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff) | val;
 	} else {
 	    ciaatod = (ciaatod & ~0xff) | val;
 	    ciaatodon = 1;
 	}
 	break;
-     case 9:
-	if (ciaacrb & 0x80){
+    case 9:
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff00) | (val << 8);
 	} else {
 	    ciaatod = (ciaatod & ~0xff00) | (val << 8);
 	    ciaatodon = 0;
 	}
 	break;
-     case 10:
-	if (ciaacrb & 0x80){
+    case 10:
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff0000) | (val << 16);
 	} else {
 	    ciaatod = (ciaatod & ~0xff0000) | (val << 16);
 	    ciaatodon = 0;
 	}
 	break;
-     case 12:
+    case 12:
 	ciaasdr = val; break;
-     case 13:
+    case 13:
 	setclr(&ciaaimask,val); break; /* ??? call RethinkICR() ? */
-     case 14:
+    case 14:
 	CIA_update();
 	ciaacra = val;
-	if (ciaacra & 0x10){
+	if (ciaacra & 0x10) {
 	    ciaacra &= ~0x10;
 	    ciaata = ciaala;
 	}
@@ -542,10 +541,10 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	CIA_calctimers();
 	break;
-     case 15:
+    case 15:
 	CIA_update();
 	ciaacrb = val;
-	if (ciaacrb & 0x10){
+	if (ciaacrb & 0x10) {
 	    ciaacrb &= ~0x10;
 	    ciaatb = ciaalb;
 	}
@@ -557,26 +556,26 @@ static void WriteCIAA(uae_u16 addr,uae_u
 static void WriteCIAB(uae_u16 addr,uae_u8 val)
 {
     int oldval;
-    switch(addr & 0xf){
-     case 0:
+    switch(addr & 0xf) {
+    case 0:
 	if (currprefs.use_serial) {
-	  oldval = ciabpra;
-	  ciabpra  = serial_writestatus(oldval,val);
+	    oldval = ciabpra;
+	    ciabpra  = serial_writestatus(oldval,val);
 	} else
-	  ciabpra  = val;
+	    ciabpra  = val;
 	break;
-     case 1:
+    case 1:
 	ciabprb = val; DISK_select(val); break;
-     case 2:
+    case 2:
 	ciabdra = val; break;
-     case 3:
+    case 3:
 	ciabdrb = val; break;
-     case 4:
+    case 4:
 	CIA_update();
 	ciabla = (ciabla & 0xff00) | val;
 	CIA_calctimers();
 	break;
-     case 5:
+    case 5:
 	CIA_update();
 	ciabla = (ciabla & 0xff) | (val << 8);
 	if ((ciabcra & 1) == 0)
@@ -587,12 +586,12 @@ static void WriteCIAB(uae_u16 addr,uae_u
 	}
 	CIA_calctimers();
 	break;
-     case 6:
+    case 6:
 	CIA_update();
 	ciablb = (ciablb & 0xff00) | val;
 	CIA_calctimers();
 	break;
-     case 7:
+    case 7:
 	CIA_update();
 	ciablb = (ciablb & 0xff) | (val << 8);
 	if ((ciabcrb & 1) == 0)
@@ -603,49 +602,49 @@ static void WriteCIAB(uae_u16 addr,uae_u
 	}
 	CIA_calctimers();
 	break;
-     case 8:
-	if (ciabcrb & 0x80){
+    case 8:
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff) | val;
 	} else {
 	    ciabtod = (ciabtod & ~0xff) | val;
 	    ciabtodon = 1;
 	}
 	break;
-     case 9:
-	if (ciabcrb & 0x80){
+    case 9:
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff00) | (val << 8);
 	} else {
 	    ciabtod = (ciabtod & ~0xff00) | (val << 8);
 	    ciabtodon = 0;
 	}
 	break;
-     case 10:
-	if (ciabcrb & 0x80){
+    case 10:
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff0000) | (val << 16);
 	} else {
 	    ciabtod = (ciabtod & ~0xff0000) | (val << 16);
 	    ciabtodon = 0;
 	}
 	break;
-     case 12:
+    case 12:
 	ciabsdr = val;
 	break;
-     case 13:
+    case 13:
 	setclr(&ciabimask,val);
 	break;
-     case 14:
+    case 14:
 	CIA_update();
 	ciabcra = val;
-	if (ciabcra & 0x10){
+	if (ciabcra & 0x10) {
 	    ciabcra &= ~0x10;
 	    ciabta = ciabla;
 	}
 	CIA_calctimers();
 	break;
-     case 15:
+    case 15:
 	CIA_update();
 	ciabcrb = val;
-	if (ciabcrb & 0x10){
+	if (ciabcrb & 0x10) {
 	    ciabcrb &= ~0x10;
 	    ciabtb = ciablb;
 	}
@@ -702,16 +701,19 @@ addrbank cia_bank = {
 
 uae_u32 REGPARAM2 cia_lget (uaecptr addr)
 {
-    return cia_bget(addr+3);
+    special_mem |= S_READ;
+    return cia_bget (addr + 3);
 }
 
 uae_u32 REGPARAM2 cia_wget (uaecptr addr)
 {
-    return cia_bget(addr+1);
+    special_mem |= S_READ;
+    return cia_bget (addr + 1);
 }
 
 uae_u32 REGPARAM2 cia_bget (uaecptr addr)
 {
+    special_mem |= S_READ;
     if ((addr & 0x3001) == 0x2001)
 	return ReadCIAA((addr & 0xF00) >> 8);
     if ((addr & 0x3001) == 0x1000)
@@ -721,20 +723,23 @@ uae_u32 REGPARAM2 cia_bget (uaecptr addr
 
 void REGPARAM2 cia_lput (uaecptr addr, uae_u32 value)
 {
-    cia_bput(addr+3,value); /* FIXME ? */
+    special_mem |= S_WRITE;
+    cia_bput (addr + 3, value); /* FIXME ? */
 }
 
 void REGPARAM2 cia_wput (uaecptr addr, uae_u32 value)
 {
-    cia_bput(addr+1,value);
+    special_mem |= S_WRITE;
+    cia_bput (addr + 1, value);
 }
 
 void REGPARAM2 cia_bput (uaecptr addr, uae_u32 value)
 {
+    special_mem |= S_WRITE;
     if ((addr & 0x3001) == 0x2001)
-	WriteCIAA((addr & 0xF00) >> 8,value);
+	WriteCIAA ((addr & 0xF00) >> 8, value);
     if ((addr & 0x3001) == 0x1000)
-	WriteCIAB((addr & 0xF00) >> 8,value);
+	WriteCIAB ((addr & 0xF00) >> 8, value);
 }
 
 /* battclock memory access */
@@ -754,58 +759,64 @@ addrbank clock_bank = {
 
 uae_u32 REGPARAM2 clock_lget (uaecptr addr)
 {
-    return clock_bget(addr+3);
+    special_mem |= S_READ;
+    return clock_bget (addr + 3);
 }
 
 uae_u32 REGPARAM2 clock_wget (uaecptr addr)
 {
-    return clock_bget(addr+1);
+    special_mem |= S_READ;
+    return clock_bget (addr + 1);
 }
 
 uae_u32 REGPARAM2 clock_bget (uaecptr addr)
 {
-    time_t t=time(0);
+    time_t t = time(0);
     struct tm *ct;
-    ct=localtime(&t);
-    switch (addr & 0x3f)
-    {
-     case 0x03: return ct->tm_sec % 10;
-     case 0x07: return ct->tm_sec / 10;
-     case 0x0b: return ct->tm_min % 10;
-     case 0x0f: return ct->tm_min / 10;
-     case 0x13: return ct->tm_hour % 10;
-     case 0x17: return ct->tm_hour / 10;
-     case 0x1b: return ct->tm_mday % 10;
-     case 0x1f: return ct->tm_mday / 10;
-     case 0x23: return (ct->tm_mon+1) % 10;
-     case 0x27: return (ct->tm_mon+1) / 10;
-     case 0x2b: return ct->tm_year % 10;
-     case 0x2f: return ct->tm_year / 10;
-
-     case 0x33: return ct->tm_wday;  /*Hack by -=SR=- */
-     case 0x37: return clock_control_d;
-     case 0x3b: return clock_control_e;
-     case 0x3f: return clock_control_f;
+
+    ct = localtime (&t);
+    special_mem |= S_READ;
+
+    switch (addr & 0x3f) {
+    case 0x03: return ct->tm_sec % 10;
+    case 0x07: return ct->tm_sec / 10;
+    case 0x0b: return ct->tm_min % 10;
+    case 0x0f: return ct->tm_min / 10;
+    case 0x13: return ct->tm_hour % 10;
+    case 0x17: return ct->tm_hour / 10;
+    case 0x1b: return ct->tm_mday % 10;
+    case 0x1f: return ct->tm_mday / 10;
+    case 0x23: return (ct->tm_mon+1) % 10;
+    case 0x27: return (ct->tm_mon+1) / 10;
+    case 0x2b: return ct->tm_year % 10;
+    case 0x2f: return ct->tm_year / 10;
+
+    case 0x33: return ct->tm_wday;  /*Hack by -=SR=- */
+    case 0x37: return clock_control_d;
+    case 0x3b: return clock_control_e;
+    case 0x3f: return clock_control_f;
     }
     return 0;
 }
 
 void REGPARAM2 clock_lput (uaecptr addr, uae_u32 value)
 {
+    special_mem |= S_WRITE;
     /* No way */
 }
 
 void REGPARAM2 clock_wput (uaecptr addr, uae_u32 value)
 {
+    special_mem |= S_WRITE;
     /* No way */
 }
 
 void REGPARAM2 clock_bput (uaecptr addr, uae_u32 value)
 {
-    switch (addr & 0x3f)
-    {
-     case 0x37: clock_control_d=value; break;
-     case 0x3b: clock_control_e=value; break;
-     case 0x3f: clock_control_f=value; break;
+    special_mem |= S_WRITE;
+    switch (addr & 0x3f) {
+    case 0x37: clock_control_d = value; break;
+    case 0x3b: clock_control_e = value; break;
+    case 0x3f: clock_control_f = value; break;
     }
 }