Merge pull request #321 from TC1995/master

Minor fixes to the S3 SDAC.

src/video/vid_s3.c

@@ -8,7 +8,7 @@
  *
  *		S3 emulation.
  *
- * Version:	@(#)vid_s3.c	1.0.17	2018/09/21
+ * Version:	@(#)vid_s3.c	1.0.18	2018/09/22
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -1033,9 +1033,9 @@ void s3_out(uint16_t addr, uint8_t val, void *p)
                 else
                 {
                         if ((svga->crtc[0x55] & 1) || (svga->crtc[0x43] & 2))
-                                sdac_ramdac_out((addr & 3) | 4, val, &s3->ramdac, svga);
+                                sdac_ramdac_out(addr, 1, val, &s3->ramdac, svga);
                         else
-                                sdac_ramdac_out(addr & 3, val, &s3->ramdac, svga);
+                                sdac_ramdac_out(addr, 0, val, &s3->ramdac, svga);
                 }
                 return;
 
@@ -1204,8 +1204,8 @@ uint8_t s3_in(uint16_t addr, void *p)
                 if (s3->chip == S3_TRIO32 || s3->chip == S3_TRIO64)
                         return svga_in(addr, svga);
                 if ((svga->crtc[0x55] & 1) || (svga->crtc[0x43] & 2))
-                        return sdac_ramdac_in((addr & 3) | 4, &s3->ramdac, svga);
+                        return sdac_ramdac_in(addr, 1, &s3->ramdac, svga);
-                return sdac_ramdac_in(addr & 3, &s3->ramdac, svga);
+                return sdac_ramdac_in(addr, 0, &s3->ramdac, svga);
 
                 case 0x3d4:
                 return svga->crtcreg;

src/video/vid_sdac_ramdac.c

@@ -8,7 +8,7 @@
  *
  *		87C716 'SDAC' true colour RAMDAC emulation.
  *
- * Version:	@(#)vid_sdac_ramdac.c	1.0.3	2018/03/21
+ * Version:	@(#)vid_sdac_ramdac.c	1.0.4	2018/03/21
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -69,62 +69,63 @@ static uint8_t sdac_reg_read(sdac_ramdac_t *ramdac, int reg)
         return temp;
 }
 
-void sdac_ramdac_out(uint16_t addr, uint8_t val, sdac_ramdac_t *ramdac, svga_t *svga)
+void sdac_ramdac_out(uint16_t addr, int rs2, uint8_t val, sdac_ramdac_t *ramdac, svga_t *svga)
 {
 	switch (addr)
 	{
-                case 2:
+		case 0x3C6:
+		if (rs2)
+			sdac_control_write(ramdac, svga, val);			
+		else {
 			if (ramdac->magic_count == 4)
 				sdac_control_write(ramdac, svga, val);
 			ramdac->magic_count = 0;			
+		}
 		break;
 		
-                case 3:
+		case 0x3C7:
-                ramdac->magic_count = 0;
+		if (rs2) {
-                break;
-                case 0:
-                ramdac->magic_count = 0;
-                break;
-                case 1:
-                ramdac->magic_count = 0;
-                break;
-
-                case 4:
-                ramdac->windex = val;
-                ramdac->reg_ff = 0;
-                break;
-                case 5:
-                sdac_reg_write(ramdac, ramdac->windex & 0xff, val);
-                break;
-                case 6:
-                sdac_control_write(ramdac, svga, val);
-                break;
-                case 7:
 			ramdac->rindex = val;
 			ramdac->reg_ff = 0;			
+		}
+		else
+			ramdac->magic_count = 0;
+		break;
+		
+		case 0x3C8:
+		if (rs2) {
+			ramdac->windex = val;
+			ramdac->reg_ff = 0;			
+		}
+		else
+			ramdac->magic_count = 0;
+		break;
+		
+		case 0x3C9:
+		if (rs2)
+			sdac_reg_write(ramdac, ramdac->windex & 0xff, val);
+		else
+			ramdac->magic_count = 0;
 		break;
 	}
-        if (!(addr & 4))
+
-        {
+        svga_out(addr, val, svga);
-                if (addr < 2)
-                        svga_out(addr + 0x3c8, val, svga);
-                else
-                        svga_out(addr + 0x3c4, val, svga);
-        }
 }
 
-uint8_t sdac_ramdac_in(uint16_t addr, sdac_ramdac_t *ramdac, svga_t *svga)
+uint8_t sdac_ramdac_in(uint16_t addr, int rs2, sdac_ramdac_t *ramdac, svga_t *svga)
 {
         uint8_t temp;
 	switch (addr)
 	{
-                case 2:
+		case 0x3C6:
+		if (rs2)
+			return ramdac->command;
+		else {
 			if (ramdac->magic_count < 5)
 				ramdac->magic_count++;
 			if (ramdac->magic_count == 4)
 			{
 				temp = 0x70; /*SDAC ID*/
-                        ramdac->rs2 = 1;
 			}
 			if (ramdac->magic_count == 5)
 			{
@@ -132,33 +133,32 @@ uint8_t sdac_ramdac_in(uint16_t addr, sdac_ramdac_t *ramdac, svga_t *svga)
 				ramdac->magic_count = 0;
 			}
 			return temp;			
-                case 3:
+		}
-                ramdac->magic_count=0;
 		break;
-                case 0:
+		
-                ramdac->magic_count=0;
+		case 0x3C7:
-                break;
+		if (rs2)
-                case 1:
+			return ramdac->rindex;
+		else
 			ramdac->magic_count=0;
 		break;
 		
-                case 4:
+		case 0x3C8:
+		if (rs2)
 			return ramdac->windex;
-                case 5:
-                return sdac_reg_read(ramdac, ramdac->rindex & 0xff);
-                case 6:
-                return ramdac->command;
-                case 7:
-                return ramdac->rindex;
-        }
-        if (!(addr & 4))
-        {
-                if (addr < 2)
-                        return svga_in(addr + 0x3c8, svga);
 		else
-                        return svga_in(addr + 0x3c4, svga);
+			ramdac->magic_count=0;
+		break;
+		
+		case 0x3C9:
+		if (rs2)
+			return sdac_reg_read(ramdac, ramdac->rindex & 0xff);
+		else
+			ramdac->magic_count=0;
+		break;
 	}
-        return 0xff;
+	
+        return svga_in(addr, svga);
 }
 
 float sdac_getclock(int clock, void *p)

src/video/vid_sdac_ramdac.h

@@ -13,7 +13,7 @@ typedef struct sdac_ramdac_t
 
 void sdac_init(sdac_ramdac_t *ramdac);
 
-void sdac_ramdac_out(uint16_t addr, uint8_t val, sdac_ramdac_t *ramdac, svga_t *svga);
+void sdac_ramdac_out(uint16_t addr, int rs2, uint8_t val, sdac_ramdac_t *ramdac, svga_t *svga);
-uint8_t sdac_ramdac_in(uint16_t addr, sdac_ramdac_t *ramdac, svga_t *svga);
+uint8_t sdac_ramdac_in(uint16_t addr, int rs2, sdac_ramdac_t *ramdac, svga_t *svga);
 
 float sdac_getclock(int clock, void *p);