diff --git a/src/devices/video/vid_cl54xx.c b/src/devices/video/vid_cl54xx.c
index ec69b51..dce5548 100644
--- a/src/devices/video/vid_cl54xx.c
+++ b/src/devices/video/vid_cl54xx.c
@@ -9,7 +9,7 @@
  *		Emulation of select Cirrus Logic cards (CL-GD 5428,
  *		CL-GD 5429, 5430, 5434 and 5436 are supported).
  *
- * Version:	@(#)vid_cl54xx.c	1.0.22	2018/10/21
+ * Version:	@(#)vid_cl54xx.c	1.0.23	2018/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -58,7 +58,7 @@
 #include "vid_svga_render.h"
 
 
-#define BIOS_GD5422_PATH	L"video/cirruslogic/1-cl5422.bin"
+#define BIOS_GD5422_PATH	L"video/cirruslogic/cl5422.bin"
 #define BIOS_GD5426_PATH	L"video/cirruslogic/diamond speedstar pro vlb v3.04.bin"
 #define BIOS_GD5428_ISA_PATH	L"video/cirruslogic/gd5428.bin"
 #define BIOS_GD5428_VLB_PATH	L"video/cirruslogic/vlbusjapan.bin"
@@ -196,9 +196,11 @@ typedef struct gd54xx_t
     uint8_t		pci_regs[256];
     uint8_t		int_line;
 
-	uint8_t fc; /*Feature Connector */
-		
-	uint8_t clgd_latch[8];
+    uint8_t		fc;			/* Feature Connector */
+						//FIXME: move to SVGA?  --FvK
+
+    uint8_t		clgd_latch[8];
+
     int			card;
 
     uint32_t		lfb_base;
@@ -210,18 +212,16 @@ typedef struct gd54xx_t
 } gd54xx_t;
 
 
-static void gd543x_mmio_write(uint32_t addr, uint8_t val, void *p);
-static void gd543x_mmio_writew(uint32_t addr, uint16_t val, void *p);
-static void gd543x_mmio_writel(uint32_t addr, uint32_t val, void *p);
-static uint8_t gd543x_mmio_read(uint32_t addr, void *p);
-static uint16_t gd543x_mmio_readw(uint32_t addr, void *p);
-static uint32_t gd543x_mmio_readl(uint32_t addr, void *p);
-
-static void gd54xx_recalc_banking(gd54xx_t *gd54xx);
-
-static void gd543x_recalc_mapping(gd54xx_t *gd54xx);
-
-static void gd54xx_start_blit(uint32_t cpu_dat, int count, gd54xx_t *gd54xx, svga_t *svga);
+static void	gd543x_mmio_write(uint32_t addr, uint8_t val, void *p);
+static void	gd543x_mmio_writew(uint32_t addr, uint16_t val, void *p);
+static void	gd543x_mmio_writel(uint32_t addr, uint32_t val, void *p);
+static uint8_t	gd543x_mmio_read(uint32_t addr, void *p);
+static uint16_t	gd543x_mmio_readw(uint32_t addr, void *p);
+static uint32_t	gd543x_mmio_readl(uint32_t addr, void *p);
+static void	gd54xx_recalc_banking(gd54xx_t *gd54xx);
+static void	gd543x_recalc_mapping(gd54xx_t *gd54xx);
+static void	gd54xx_start_blit(uint32_t cpu_dat, int count,
+				  gd54xx_t *gd54xx, svga_t *svga);
 
 
 /* Returns 1 if the card is a 5434, 5436/46, or 5480. */
@@ -245,10 +245,14 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
     uint8_t o, indx;
     uint32_t o32;
 
-    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1)) 
-	addr ^= 0x60;
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) &&
+	!(svga->miscout & 1)) addr ^= 0x60;
 
     switch (addr) {
+	case 0x3ba:
+	case 0x3da:
+		gd54xx->fc = val;		//FIXME: move to SVGA? --FvK
+		break;
 	case 0x3c0:
 	case 0x3c1:
 		if (!svga->attrff) {
@@ -303,8 +307,8 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
 						svga->seqregs[6] = 0x0f;
 				
 				
-				case 0x08: // Todo EEPROM
-				break;
+				case 0x08:	// Todo EEPROM
+					break;
 					
 				case 0x0a:
 					if (gd54xx_is_5434(svga))
@@ -313,21 +317,20 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
 						}
 					else { /* Hack to force memory size on some GD-542x BIOSes*/
 						val &= 0xe7;
-						switch (gd54xx->vram_size)
-						{
-						case 0x80000:
-							svga->seqregs[0x0a] = val | 0x08;
-						break;
-					
-						case 0x100000:
-							svga->seqregs[0x0a] = val | 0x10;
-						break;
-						
-						case 0x200000:
-							svga->seqregs[0x0a] = val | 0x18;
-						break;
-						}
+						switch (gd54xx->vram_size) {
+							case 0x80000:
+								svga->seqregs[0x0a] = val | 0x08;
+								break;
+
+							case 0x100000:
+								svga->seqregs[0x0a] = val | 0x10;
+								break;
+
+							case 0x200000:
+								svga->seqregs[0x0a] = val | 0x18;
+								break;
 						}
+					}
 					break;
 				case 0x0b: case 0x0c: case 0x0d: case 0x0e: /* VCLK stuff */
 					gd54xx->vclk_n[svga->seqaddr-0x0b] = val;
@@ -365,28 +368,25 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
 						svga->hwcursor.addr = (((svga->vram_display_mask + 1)-0x4000) + ((val & 0x3f) * 256));
 					break;
 				case 0x15:
-				if (gd54xx_is_5434(svga))
-				{
-				/* Hack to force memory size on some GD-543x BIOSes*/
-				val &= 0xf8;
-						switch (gd54xx->vram_size)
-						{				
-						case 0x100000:
-							svga->seqregs[0x15] = val | 0x2;
-						break;
-						
-						case 0x200000:
-							svga->seqregs[0x15] = val | 0x3;
-						break;
-						
-						case 0x400000:
-							svga->seqregs[0x15] = val | 0x4;
-						break;
+					if (gd54xx_is_5434(svga)) {
+						/* Hack to force memory size on some GD-543x BIOSes*/
+						val &= 0xf8;
+						switch (gd54xx->vram_size) {				
+							case 0x100000:
+								svga->seqregs[0x15] = val | 0x2;
+								break;
+
+							case 0x200000:
+								svga->seqregs[0x15] = val | 0x3;
+								break;
+
+							case 0x400000:
+								svga->seqregs[0x15] = val | 0x4;
+								break;
 						}
-				}
-				else
-					return;
-				break;
+					} else
+						return;
+					break;
 				case 0x07:
 					svga->set_reset_disabled = svga->seqregs[7] & 1;
 				case 0x17:
@@ -442,21 +442,18 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
                         break;
                 }
                 return;
-	case 0x3ba: case 0x3da:
-		gd54xx->fc = val ;
-		break;
 	case 0x3cf:
 		if (svga->gdcaddr == 0)
-				gd543x_mmio_write(0xb8000, val, gd54xx);
+			gd543x_mmio_write(0xb8000, val, gd54xx);
 		if (svga->gdcaddr == 1)
-				gd543x_mmio_write(0xb8004, val, gd54xx);
+			gd543x_mmio_write(0xb8004, val, gd54xx);
 	
 		if (svga->gdcaddr == 5) {
 			svga->gdcreg[5] = val;
 			if (svga->gdcreg[0xb] & 0x04)
-					svga->writemode = svga->gdcreg[5] & 7;
+				svga->writemode = svga->gdcreg[5] & 7;
 			else
-					svga->writemode = svga->gdcreg[5] & 3;
+				svga->writemode = svga->gdcreg[5] & 3;
 			svga->readmode = val & 8;
 			svga->chain2_read = val & 0x10;
 			return;
@@ -482,105 +479,104 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
 						svga->writemode = svga->gdcreg[5] & 3;
 					break;
 					
-					case 0x10:
+				case 0x10:
 					gd543x_mmio_write(0xb8001, val, gd54xx);
 					break;
-					case 0x11:
+				case 0x11:
 					gd543x_mmio_write(0xb8005, val, gd54xx);
 					break;
-					case 0x12:
+				case 0x12:
 					gd543x_mmio_write(0xb8002, val, gd54xx);
 					break;
-					case 0x13:
+				case 0x13:
 					gd543x_mmio_write(0xb8006, val, gd54xx);
 					break;
-					case 0x14:
+				case 0x14:
 					gd543x_mmio_write(0xb8003, val, gd54xx);
 					break;
-					case 0x15:
+				case 0x15:
 					gd543x_mmio_write(0xb8007, val, gd54xx);
 					break;
 					
-					case 0x20:
+				case 0x20:
 					gd543x_mmio_write(0xb8008, val, gd54xx);
 					break;
-					case 0x21:
+				case 0x21:
 					gd543x_mmio_write(0xb8009, val, gd54xx);
 					break;
 					case 0x22:
-					gd543x_mmio_write(0xb800a, val, gd54xx);
+				gd543x_mmio_write(0xb800a, val, gd54xx);
 					break;
-					case 0x23:
+				case 0x23:
 					gd543x_mmio_write(0xb800b, val, gd54xx);
 					break;
-					case 0x24:
+				case 0x24:
 					gd543x_mmio_write(0xb800c, val, gd54xx);
 					break;
-					case 0x25:
+				case 0x25:
 					gd543x_mmio_write(0xb800d, val, gd54xx);
 					break;
-					case 0x26:
+				case 0x26:
 					gd543x_mmio_write(0xb800e, val, gd54xx);
 					break;
-					case 0x27:
+				case 0x27:
 					gd543x_mmio_write(0xb800f, val, gd54xx);
 					break;
 	
-					case 0x28:
+				case 0x28:
 					gd543x_mmio_write(0xb8010, val, gd54xx);
 					break;
-					case 0x29:
+				case 0x29:
 					gd543x_mmio_write(0xb8011, val, gd54xx);
 					break;
-					case 0x2a:
+				case 0x2a:
 					gd543x_mmio_write(0xb8012, val, gd54xx);
 					break;
 
-					case 0x2c:
+				case 0x2c:
 					gd543x_mmio_write(0xb8014, val, gd54xx);
 					break;
-					case 0x2d:
+				case 0x2d:
 					gd543x_mmio_write(0xb8015, val, gd54xx);
 					break;
-					case 0x2e:
+				case 0x2e:
 					gd543x_mmio_write(0xb8016, val, gd54xx);
 					break;
 
-					case 0x2f:
+				case 0x2f:
 					gd543x_mmio_write(0xb8017, val, gd54xx);
 					break;
-					case 0x30:
+				case 0x30:
 					gd543x_mmio_write(0xb8018, val, gd54xx);
 					break;
 	
-					case 0x32:
+				case 0x32:
 					gd543x_mmio_write(0xb801a, val, gd54xx);
 					break;
 
-					case 0x33:
+				case 0x33:
 					gd543x_mmio_write(0xb801b, val, gd54xx);
 					break;
 					
-					case 0x31:
+				case 0x31:
 					gd543x_mmio_write(0xb8040, val, gd54xx);
 					break;
 					
-					case 0x34:
+				case 0x34:
 					gd543x_mmio_write(0xb801c, val, gd54xx);
 					break;
 					
-					case 0x35:
+				case 0x35:
 					gd543x_mmio_write(0xb801d, val, gd54xx);
 					break;
 
-					case 0x38:
+				case 0x38:
 					gd543x_mmio_write(0xb8020, val, gd54xx);
 					break;
 
-					case 0x39:
+				case 0x39:
 					gd543x_mmio_write(0xb8021, val, gd54xx);
-					break;						
-					
+					break;
 			}
 			return;
 		}
@@ -594,7 +590,7 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
 		if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
 			val = (svga->crtc[7] & ~0x10) | (val & 0x10);
 		if ((svga->crtcreg == 0x25) || (svga->crtcreg == 0x27))  
-		return;
+			return;
 		old = svga->crtc[svga->crtcreg];
 		svga->crtc[svga->crtcreg] = val;
 		
@@ -617,24 +613,22 @@ gd54xx_in(uint16_t addr, void *p)
     svga_t *svga = &gd54xx->svga;
     uint8_t indx, temp;
 
-    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3d0) && !(svga->miscout & 1)) 
-	addr ^= 0x60;
+    if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3d0) &&
+	!(svga->miscout & 1)) addr ^= 0x60;
 
     switch (addr) {
 	case 0x3c4:
-	if ((svga->seqregs[6] & 0x17) == 0x12)
-	{
-		temp = svga->seqaddr;
-		if ((temp & 0x1e) == 0x10)
-		{
-			if (temp & 1)
-				temp = ((svga->hwcursor.y & 7) << 5) | 0x11;
-			else
-				temp = ((svga->hwcursor.x & 7) << 5) | 0x10;
+		if ((svga->seqregs[6] & 0x17) == 0x12) {
+			temp = svga->seqaddr;
+			if ((temp & 0x1e) == 0x10) {
+				if (temp & 1)
+					temp = ((svga->hwcursor.y & 7) << 5) | 0x11;
+				else
+					temp = ((svga->hwcursor.x & 7) << 5) | 0x10;
+			}
+			return temp;
 		}
-		return temp;
-	}
-	return svga->seqaddr;
+		return svga->seqaddr;
 	
 	case 0x3c5:
 		if (svga->seqaddr > 5) {
@@ -665,6 +659,18 @@ gd54xx_in(uint16_t addr, void *p)
 			return svga->seqregs[svga->seqaddr & 0x3f];
 		}
 		break;
+
+	case 0x3c6:
+		if (gd54xx->ramdac.state == 4) {
+			gd54xx->ramdac.state = 0;
+			return gd54xx->ramdac.ctrl;
+		}
+		gd54xx->ramdac.state++;
+		break;
+		
+	case 0x3ca:
+		return gd54xx->fc;		//FIXME: move to SVGA? --FvK
+		
 	case 0x3c9:
 		svga->dac_status = 3;
 		indx = (svga->dac_addr - 1) & 0xff;
@@ -692,25 +698,17 @@ gd54xx_in(uint16_t addr, void *p)
                         		return svga->vgapal[indx].b & 0x3f;
                 }
                 return 0xFF;
-	case 0x3C6:
-		if (gd54xx->ramdac.state == 4) {
-			gd54xx->ramdac.state = 0;
-			return gd54xx->ramdac.ctrl;
-		}
-		gd54xx->ramdac.state++;
-		break;
-		
-	case 0x3ca:
-		return gd54xx->fc;
-		
+
 	case 0x3cf:
 		if (svga->gdcaddr > 8) {
 			return svga->gdcreg[svga->gdcaddr & 0x3f];
 		}
 		break;
-	case 0x3D4:
+
+	case 0x3d4:
 		return svga->crtcreg;
-	case 0x3D5:
+
+	case 0x3d5:
 		switch (svga->crtcreg) {
 			case 0x24: /*Attribute controller toggle readback (R)*/
 				return svga->attrff << 7;
@@ -855,12 +853,10 @@ gd54xx_recalctimings(svga_t *svga)
 		switch (gd54xx->ramdac.ctrl & 0xf) {
 			case 0:
 				if (gd54xx->ramdac.ctrl & 0x10) { /* Mixed Mode */
-				svga->render = svga_render_mixed_highres;
-				}
-				else
-				{
-				svga->bpp = 15;
-				svga->render = svga_render_15bpp_highres;
+					svga->render = svga_render_mixed_highres;
+				} else {
+					svga->bpp = 15;
+					svga->render = svga_render_15bpp_highres;
 				}
 				break;
 
@@ -881,11 +877,14 @@ gd54xx_recalctimings(svga_t *svga)
 				}
 				break;
 
-			//case 8: Todo : Grayscale VGA rendering*/
-			//break;
+#if 0
+			case 8:		/* Todo : Grayscale VGA rendering*/
+				break;
 			
-			//case 9: Todo : 3-3-2 8bit RGB*/
-			//break;
+			case 9:		/* Todo : 3-3-2 8bit RGB*/
+				break;
+#endif
+
 			case 0xf:
 				switch (svga->seqregs[7] & CIRRUS_SR7_BPP_MASK) {
 					case CIRRUS_SR7_BPP_32:
@@ -913,7 +912,7 @@ gd54xx_recalctimings(svga_t *svga)
 				break;
 		}
 	} else {
-	/* Default to 5-5-5 Sierra Mode */
+		/* Default to 5-5-5 Sierra Mode */
 		svga->bpp = 15;
 		svga->render = svga_render_15bpp_highres;
 	}
@@ -1071,7 +1070,7 @@ gd54xx_blt_write_w(uint32_t addr, uint16_t val, void *p)
 {
     gd54xx_t *gd54xx = (gd54xx_t *)p;
 
-	gd54xx_start_blit(val, 16, gd54xx, &gd54xx->svga);
+    gd54xx_start_blit(val, 16, gd54xx, &gd54xx->svga);
 }
 
 
@@ -1106,7 +1105,7 @@ gd54xx_write(uint32_t addr, uint8_t val, void *p)
 		gd54xx->blt.sys_buf &= ~(0xff << (gd54xx->blt.sys_cnt * 8));
 		gd54xx->blt.sys_buf |= (val << (gd54xx->blt.sys_cnt * 8));
 		gd54xx->blt.sys_cnt++;
-		if(gd54xx->blt.sys_cnt >= 4) {
+		if (gd54xx->blt.sys_cnt >= 4) {
 			gd54xx_blit_dword(gd54xx, svga);
 			gd54xx->blt.sys_cnt = 0;
 		}
@@ -1115,8 +1114,8 @@ gd54xx_write(uint32_t addr, uint8_t val, void *p)
     }
 
     addr &= svga->banked_mask;
-if (svga->banked_mask != 0x1ffff)
-    addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
+    if (svga->banked_mask != 0x1ffff)
+	addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
 
     svga_write_linear(addr, val, svga);
 }
@@ -1134,14 +1133,14 @@ gd54xx_writew(uint32_t addr, uint16_t val, void *p)
     }
 
     if (gd54xx->blt.sys_tx) {
-	gd54xx_write(addr, val, gd54xx);
+	gd54xx_write(addr, val & 0xff, gd54xx);
 	gd54xx_write(addr+1, val >> 8, gd54xx);
 	return;
     }
 
     addr &= svga->banked_mask;
-if (svga->banked_mask != 0x1ffff)
-    addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
+    if (svga->banked_mask != 0x1ffff)
+	addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
 
     if (svga->writemode < 4)	
     	svga_writew_linear(addr, val, svga);
@@ -1172,8 +1171,8 @@ gd54xx_writel(uint32_t addr, uint32_t val, void *p)
     }
 
     addr &= svga->banked_mask;
-if (svga->banked_mask != 0x1ffff)
-    addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
+    if (svga->banked_mask != 0x1ffff)
+	addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
 
     if (svga->writemode < 4)
 	svga_writel_linear(addr, val, svga);
@@ -1245,8 +1244,8 @@ gd54xx_write_modes45(svga_t *svga, uint8_t val, uint32_t addr)
 static uint8_t
 gd54xx_get_aperture(uint32_t addr)
 {
-	uint32_t ap = addr >> 22;
-	return (uint8_t) (ap & 0x03);
+    uint32_t ap = addr >> 22;
+    return (uint8_t) (ap & 0x03);
 }
 
 
@@ -1442,7 +1441,7 @@ gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *p)
 		gd54xx->blt.sys_buf &= ~(0xff << (gd54xx->blt.sys_cnt * 8));
 		gd54xx->blt.sys_buf |= (val << (gd54xx->blt.sys_cnt * 8));
 		gd54xx->blt.sys_cnt++;
-		if(gd54xx->blt.sys_cnt >= 4) {
+		if (gd54xx->blt.sys_cnt >= 4) {
 			gd54xx_blit_dword(gd54xx, svga);
 			gd54xx->blt.sys_cnt = 0;
 		}
@@ -1634,7 +1633,8 @@ gd54xx_read(uint32_t addr, void *p)
     addr &= svga->banked_mask;
     addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
 
-	addr &= svga->vram_mask;
+    addr &= svga->vram_mask;
+
     return svga_read_linear(addr, svga);
 }
 
@@ -1649,8 +1649,8 @@ gd54xx_readw(uint32_t addr, void *p)
 	return svga_readw(addr, svga);
 
     addr &= svga->banked_mask;
-if (svga->banked_mask != 0x1ffff)
-    addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
+    if (svga->banked_mask != 0x1ffff)
+	addr = (addr & 0x7fff) + gd54xx->bank[(addr >> 15) & 1];
 
     return svga_readw_linear(addr, svga);
 }
@@ -1690,165 +1690,165 @@ gd543x_mmio_write(uint32_t addr, uint8_t val, void *p)
 	
     if (gd543x_do_mmio(svga, addr)) {
 	switch (addr & 0xff) {
-	case 0x00:
-		if (gd54xx_is_5434(svga))
+		case 0x00:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0xffffff00) | val;
-		else
+			else
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0xff00) | val;
-		break;
-	case 0x01:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x01:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0xffff00ff) | (val << 8);
-		else
+			else
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0x00ff) | (val << 8);
-		break;
-	case 0x02:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x02:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0xff00ffff) | (val << 16);
-		break;
-	case 0x03:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x03:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.bg_col = (gd54xx->blt.bg_col & 0x00ffffff) | (val << 24);
-		break;
+			break;
 
-	case 0x04:
-		if (gd54xx_is_5434(svga))
+		case 0x04:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0xffffff00) | val;
-		else
+			else
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0xff00) | val;
-		break;
-	case 0x05:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x05:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0xffff00ff) | (val << 8);
-		else
+			else
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0x00ff) | (val << 8);
-		break;
-	case 0x06:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x06:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0xff00ffff) | (val << 16);
-		break;
-	case 0x07:
-		if (gd54xx_is_5434(svga))
+			break;
+		case 0x07:
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.fg_col = (gd54xx->blt.fg_col & 0x00ffffff) | (val << 24);
-		break;
+			break;
 
-	case 0x08:
-		gd54xx->blt.width = (gd54xx->blt.width & 0xff00) | val;
-		break;
-	case 0x09:
-		gd54xx->blt.width = (gd54xx->blt.width & 0x00ff) | (val << 8);
-		if (gd54xx_is_5434(svga))
+		case 0x08:
+			gd54xx->blt.width = (gd54xx->blt.width & 0xff00) | val;
+			break;
+		case 0x09:
+			gd54xx->blt.width = (gd54xx->blt.width & 0x00ff) | (val << 8);
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.width &= 0x1fff;
-		else
+			else
 				gd54xx->blt.width &= 0x07ff;
-		break;
-	case 0x0a:
-		gd54xx->blt.height = (gd54xx->blt.height & 0xff00) | val;
-		break;
-	case 0x0b:
-		gd54xx->blt.height = (gd54xx->blt.height & 0x00ff) | (val << 8);
-		gd54xx->blt.height &= 0x03ff;
-		break;
-	case 0x0c:
-		gd54xx->blt.dst_pitch = (gd54xx->blt.dst_pitch & 0xff00) | val;
-		break;
-	case 0x0d:
-		gd54xx->blt.dst_pitch = (gd54xx->blt.dst_pitch & 0x00ff) | (val << 8);
-		break;
-	case 0x0e:
-		gd54xx->blt.src_pitch = (gd54xx->blt.src_pitch & 0xff00) | val;
-		break;
-	case 0x0f:
-		gd54xx->blt.src_pitch = (gd54xx->blt.src_pitch & 0x00ff) | (val << 8);
-		break;
+			break;
+		case 0x0a:
+			gd54xx->blt.height = (gd54xx->blt.height & 0xff00) | val;
+			break;
+		case 0x0b:
+			gd54xx->blt.height = (gd54xx->blt.height & 0x00ff) | (val << 8);
+			gd54xx->blt.height &= 0x03ff;
+			break;
+		case 0x0c:
+			gd54xx->blt.dst_pitch = (gd54xx->blt.dst_pitch & 0xff00) | val;
+			break;
+		case 0x0d:
+			gd54xx->blt.dst_pitch = (gd54xx->blt.dst_pitch & 0x00ff) | (val << 8);
+			break;
+		case 0x0e:
+			gd54xx->blt.src_pitch = (gd54xx->blt.src_pitch & 0xff00) | val;
+			break;
+		case 0x0f:
+			gd54xx->blt.src_pitch = (gd54xx->blt.src_pitch & 0x00ff) | (val << 8);
+			break;
 
-	case 0x10:
-		gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0xffff00) | val;
-		break;
-	case 0x11:
-		gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0xff00ff) | (val << 8);
-		break;
-	case 0x12:
-		gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0x00ffff) | (val << 16);
-		if (gd54xx_is_5434(svga))
+		case 0x10:
+			gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0xffff00) | val;
+			break;
+			case 0x11:
+			gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0xff00ff) | (val << 8);
+			break;
+		case 0x12:
+			gd54xx->blt.dst_addr = (gd54xx->blt.dst_addr & 0x00ffff) | (val << 16);
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.dst_addr &= 0x3fffff;
-		else
+			else
 				gd54xx->blt.dst_addr &= 0x1fffff;
-			
-		if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) && (gd54xx->blt.status & CIRRUS_BLT_AUTOSTART)) {
-			if (gd54xx->blt.mode == CIRRUS_BLTMODE_MEMSYSSRC) {
-				gd54xx->blt.sys_tx = 1;
-				gd54xx->blt.sys_cnt = 0;
-				gd54xx->blt.sys_buf = 0;
-				gd54xx->blt.pixel_cnt = gd54xx->blt.scan_cnt = 0;
-				gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr;
-				gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr;						
-			} else
-				gd54xx_start_blit(0, -1, gd54xx, svga);
-		}
-		break;
 
-	case 0x14:
-		gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0xffff00) | val;
-		break;
-	case 0x15:
-		gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0xff00ff) | (val << 8);
-		break;
-	case 0x16:
-		gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0x00ffff) | (val << 16);
-		if (gd54xx_is_5434(svga))
+			if ((svga->crtc[0x27] >= CIRRUS_ID_CLGD5436) && (gd54xx->blt.status & CIRRUS_BLT_AUTOSTART)) {
+				if (gd54xx->blt.mode == CIRRUS_BLTMODE_MEMSYSSRC) {
+					gd54xx->blt.sys_tx = 1;
+					gd54xx->blt.sys_cnt = 0;
+					gd54xx->blt.sys_buf = 0;
+					gd54xx->blt.pixel_cnt = gd54xx->blt.scan_cnt = 0;
+					gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr;
+					gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr;						
+				} else
+					gd54xx_start_blit(0, -1, gd54xx, svga);
+			}
+			break;
+
+		case 0x14:
+			gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0xffff00) | val;
+			break;
+		case 0x15:
+			gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0xff00ff) | (val << 8);
+			break;
+		case 0x16:
+			gd54xx->blt.src_addr = (gd54xx->blt.src_addr & 0x00ffff) | (val << 16);
+			if (gd54xx_is_5434(svga))
 				gd54xx->blt.src_addr &= 0x3fffff;
-		else
+			else
 				gd54xx->blt.src_addr &= 0x1fffff;
-		break;
+			break;
 
-	case 0x17:
-		gd54xx->blt.mask = val;
-		break;
-	case 0x18:
-		gd54xx->blt.mode = val;
-		break;
+		case 0x17:
+			gd54xx->blt.mask = val;
+			break;
+		case 0x18:
+			gd54xx->blt.mode = val;
+			break;
 
-	case 0x1a:
-		gd54xx->blt.rop = val;
-		break;
+		case 0x1a:
+			gd54xx->blt.rop = val;
+			break;
 
-	case 0x1b:
-		if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5436)	
-			gd54xx->blt.modeext = val;
-		break;		
+		case 0x1b:
+			if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5436)	
+				gd54xx->blt.modeext = val;
+			break;		
 		
-	case 0x1c:
-		gd54xx->blt.trans_col = (gd54xx->blt.trans_col & 0xff00) | val;
-		break;
+		case 0x1c:
+			gd54xx->blt.trans_col = (gd54xx->blt.trans_col & 0xff00) | val;
+			break;
 		
-	case 0x1d:	
-		gd54xx->blt.trans_col = (gd54xx->blt.trans_col & 0x00ff) | (val << 8);
-		break;
+		case 0x1d:	
+			gd54xx->blt.trans_col = (gd54xx->blt.trans_col & 0x00ff) | (val << 8);
+			break;
 		
-	case 0x20:
-		gd54xx->blt.trans_mask = (gd54xx->blt.trans_mask & 0xff00) | val;
-		break;
+		case 0x20:
+			gd54xx->blt.trans_mask = (gd54xx->blt.trans_mask & 0xff00) | val;
+			break;
 		
-	case 0x21:
-		gd54xx->blt.trans_mask = (gd54xx->blt.trans_mask & 0x00ff) | (val << 8);
-		break;
+		case 0x21:
+			gd54xx->blt.trans_mask = (gd54xx->blt.trans_mask & 0x00ff) | (val << 8);
+			break;
 		
-	case 0x40:
-		gd54xx->blt.status = val;
-		if (gd54xx->blt.status & CIRRUS_BLT_START) {
-			if (gd54xx->blt.mode == CIRRUS_BLTMODE_MEMSYSSRC) {
-				gd54xx->blt.sys_tx = 1;
-				gd54xx->blt.sys_cnt = 0;
-				gd54xx->blt.sys_buf = 0;
-				gd54xx->blt.pixel_cnt = gd54xx->blt.scan_cnt = 0;
-				gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr;
-				gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr;						
-			} else
-				gd54xx_start_blit(0, -1, gd54xx, svga);
-		}
-		break;
-	}		
+		case 0x40:
+			gd54xx->blt.status = val;
+			if (gd54xx->blt.status & CIRRUS_BLT_START) {
+				if (gd54xx->blt.mode == CIRRUS_BLTMODE_MEMSYSSRC) {
+					gd54xx->blt.sys_tx = 1;
+					gd54xx->blt.sys_cnt = 0;
+					gd54xx->blt.sys_buf = 0;
+					gd54xx->blt.pixel_cnt = gd54xx->blt.scan_cnt = 0;
+					gd54xx->blt.src_addr_backup = gd54xx->blt.src_addr;
+					gd54xx->blt.dst_addr_backup = gd54xx->blt.dst_addr;						
+				} else
+					gd54xx_start_blit(0, -1, gd54xx, svga);
+			}
+			break;
+		}		
     } else if (gd54xx->mmio_vram_overlap)
 	gd54xx_write(addr, val, gd54xx);
 }
@@ -2327,6 +2327,7 @@ gd54xx_init(const device_t *info)
 	case CIRRUS_ID_CLGD5424:
 		romfn = BIOS_GD5422_PATH;
 		break;
+
 	case CIRRUS_ID_CLGD5426:
 		romfn = BIOS_GD5426_PATH;
 		break;
@@ -2381,12 +2382,12 @@ gd54xx_init(const device_t *info)
     }
 
     vram = device_get_config_int("memory");
-        if (vram)
-			gd54xx->vram_size = vram << 20;	
-		else
-			gd54xx->vram_size = 512 << 10;
-			
+    if (vram)
+	gd54xx->vram_size = vram << 20;	
+    else
+	gd54xx->vram_size = 512 << 10;
     gd54xx->vram_mask = gd54xx->vram_size - 1;
+
     if (romfn)
 	rom_init(&gd54xx->bios_rom, romfn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
@@ -2430,10 +2431,40 @@ gd54xx_init(const device_t *info)
     return gd54xx;
 }
 
+
+static void
+gd54xx_close(void *p)
+{
+    gd54xx_t *gd54xx = (gd54xx_t *)p;
+	
+    svga_close(&gd54xx->svga);
+    
+    free(gd54xx);
+}
+
+
+static void
+gd54xx_speed_changed(void *p)
+{
+    gd54xx_t *gd54xx = (gd54xx_t *)p;
+    
+    svga_recalctimings(&gd54xx->svga);
+}
+
+
+static void
+gd54xx_force_redraw(void *p)
+{
+    gd54xx_t *gd54xx = (gd54xx_t *)p;
+
+    gd54xx->svga.fullchange = changeframecount;
+}
+
+
 static int
 gd5422_available(void)
 {
-        return rom_present(BIOS_GD5422_PATH);
+    return rom_present(BIOS_GD5422_PATH);
 }
 
 static int
@@ -2508,33 +2539,6 @@ gd5480_available(void)
     return rom_present(BIOS_GD5480_PATH);
 }
 
-void
-gd54xx_close(void *p)
-{
-    gd54xx_t *gd54xx = (gd54xx_t *)p;
-	
-    svga_close(&gd54xx->svga);
-    
-    free(gd54xx);
-}
-
-
-void
-gd54xx_speed_changed(void *p)
-{
-    gd54xx_t *gd54xx = (gd54xx_t *)p;
-    
-    svga_recalctimings(&gd54xx->svga);
-}
-
-
-void
-gd54xx_force_redraw(void *p)
-{
-    gd54xx_t *gd54xx = (gd54xx_t *)p;
-
-    gd54xx->svga.fullchange = changeframecount;
-}
 
 static const device_config_t gd5422_config[] =
 {
@@ -2624,33 +2628,28 @@ static const video_timings_t cl_gd_isa_timing = {VID_ISA,3,3,6,8,8,12};
 static const video_timings_t cl_gd_vlb_timing = {VID_BUS,4,4,8,10,10,20};
 static const video_timings_t cl_gd_pci_timing = {VID_BUS,4,4,8,10,10,20};
 
-const device_t gd5422_isa_device =
-{
-        "Cirrus Logic GD-5422",
-        DEVICE_AT | DEVICE_ISA,
-	CIRRUS_ID_CLGD5422,
-        gd54xx_init, 
-	gd54xx_close,
-	NULL,
-        gd5422_available,
-        gd54xx_speed_changed,
-        gd54xx_force_redraw,
-	&cl_gd_isa_timing,
-	gd5422_config,
+const device_t gd5422_isa_device = {
+    "Cirrus Logic GD-5422",
+    DEVICE_AT | DEVICE_ISA,
+    CIRRUS_ID_CLGD5422,
+    gd54xx_init, gd54xx_close, NULL,
+    gd5422_available,
+    gd54xx_speed_changed,
+    gd54xx_force_redraw,
+    &cl_gd_isa_timing,
+    gd5422_config,
 };
-const device_t gd5424_vlb_device =
-{
-        "Cirrus Logic GD-5424",
-        DEVICE_VLB,
-	CIRRUS_ID_CLGD5424,
-        gd54xx_init, 
-	gd54xx_close,
-	NULL,
-        gd5422_available,
-        gd54xx_speed_changed,
-        gd54xx_force_redraw,
-	&cl_gd_vlb_timing,
-	gd5422_config,
+
+const device_t gd5424_vlb_device = {
+    "Cirrus Logic GD-5424",
+    DEVICE_VLB,
+    CIRRUS_ID_CLGD5424,
+    gd54xx_init, gd54xx_close, NULL,
+    gd5422_available,
+    gd54xx_speed_changed,
+    gd54xx_force_redraw,
+    &cl_gd_vlb_timing,
+    gd5422_config,
 };
 
 const device_t gd5426_vlb_device = {
diff --git a/src/devices/video/vid_svga_render.c b/src/devices/video/vid_svga_render.c
index 59da475..656e695 100644
--- a/src/devices/video/vid_svga_render.c
+++ b/src/devices/video/vid_svga_render.c
@@ -8,7 +8,7 @@
  *
  *		SVGA renderers.
  *
- * Version:	@(#)vid_svga_render.c	1.0.12	2018/10/19
+ * Version:	@(#)vid_svga_render.c	1.0.13	2018/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -47,904 +47,896 @@
 #include "vid_svga_render.h"
 
 
-void svga_render_blank(svga_t *svga)
+void
+svga_render_blank(svga_t *svga)
 {
-        int x, xx;
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int x, xx;
 
-        if (svga->firstline_draw == 2000) 
-                svga->firstline_draw = svga->displine;
-        svga->lastline_draw = svga->displine;
-        
-        for (x = 0; x < svga->hdisp; x++)
-        {
-                switch (svga->seqregs[1] & 9)
-                {
-                        case 0:
-                        for (xx = 0; xx < 9; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 9) + xx + 32 + x_add] = 0;
-                        break;
-                        case 1:
-                        for (xx = 0; xx < 8; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 8) + xx + 32 + x_add] = 0;
-                        break;
-                        case 8:
-                        for (xx = 0; xx < 18; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 18) + xx + 32 + x_add] = 0;
-                        break;
-                        case 9:
-                        for (xx = 0; xx < 16; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 16) + xx + 32 + x_add] = 0;
-                        break;
-                }
-        }
+    if (svga->firstline_draw == 2000) 
+	svga->firstline_draw = svga->displine;
+    svga->lastline_draw = svga->displine;
+	
+    for (x = 0; x < svga->hdisp; x++) {
+	switch (svga->seqregs[1] & 9) {
+		case 0:
+			for (xx = 0; xx < 9; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 9) + xx + 32 + x_add] = 0;
+			break;
+
+		case 1:
+			for (xx = 0; xx < 8; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 8) + xx + 32 + x_add] = 0;
+			break;
+
+		case 8:
+			for (xx = 0; xx < 18; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 18) + xx + 32 + x_add] = 0;
+			break;
+
+		case 9:
+			for (xx = 0; xx < 16; xx++) ((uint32_t *)buffer32->line[svga->displine + y_add])[(x * 16) + xx + 32 + x_add] = 0;
+			break;
+	}
+    }
 }
 
-void svga_render_text_40(svga_t *svga)
+
+void
+svga_render_text_40(svga_t *svga)
 {     
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int xinc = (svga->seqregs[1] & 1) ? 16 : 18;
+    uint8_t chr, attr, dat;
+    uint32_t charaddr;
+    int bg, fg, x, xx;
+    int drawcursor;
+    uint32_t *p;
 
-        if (svga->firstline_draw == 2000) 
-                svga->firstline_draw = svga->displine;
-        svga->lastline_draw = svga->displine;
-        
-        if (svga->fullchange)
-        {
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
-                int x, xx;
-                int drawcursor;
-                uint8_t chr, attr, dat;
-                uint32_t charaddr;
-                int fg, bg;
-                int xinc = (svga->seqregs[1] & 1) ? 16 : 18;
-                
-                for (x = 0; x < svga->hdisp; x += xinc)
-                {
-                        drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
-                        chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-                        attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
-                        if (attr & 8) charaddr = svga->charsetb + (chr * 128);
-                        else          charaddr = svga->charseta + (chr * 128);
+    if (svga->firstline_draw == 2000) 
+	svga->firstline_draw = svga->displine;
+    svga->lastline_draw = svga->displine;
+	
+    if (svga->fullchange) {
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
 
-                        if (drawcursor) 
-                        { 
-                                bg = svga->pallook[svga->egapal[attr & 15]]; 
-                                fg = svga->pallook[svga->egapal[attr >> 4]]; 
-                        }
-                        else
-                        {
-                                fg = svga->pallook[svga->egapal[attr & 15]];
-                                bg = svga->pallook[svga->egapal[attr >> 4]];
-                                if (attr & 0x80 && svga->attrregs[0x10] & 8)
-                                {
-                                        bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
-                                        if (svga->blink & 16) 
-                                                fg = bg;
-                                }
-                        }
+	for (x = 0; x < svga->hdisp; x += xinc) {
+		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		if (attr & 8)
+			charaddr = svga->charsetb + (chr * 128);
+		else
+			charaddr = svga->charseta + (chr * 128);
 
-                        dat = svga->vram[charaddr + (svga->sc << 2)];
-                        if (svga->seqregs[1] & 1) 
-                        { 
-                                for (xx = 0; xx < 16; xx += 2) 
-                                        p[xx] = p[xx + 1] = (dat & (0x80 >> (xx >> 1))) ? fg : bg;
-                        }
-                        else
-                        {
-                                for (xx = 0; xx < 16; xx += 2)
-                                        p[xx] = p[xx + 1] = (dat & (0x80 >> (xx >> 1))) ? fg : bg;
-                                if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
-                                        p[16] = p[17] = bg;
-                                else                  
-                                        p[16] = p[17] = (dat & 1) ? fg : bg;
-                        }
-                        svga->ma += 4; 
-                        p += xinc;
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
+		if (drawcursor) { 
+			bg = svga->pallook[svga->egapal[attr & 15]]; 
+			fg = svga->pallook[svga->egapal[attr >> 4]]; 
+		} else {
+			fg = svga->pallook[svga->egapal[attr & 15]];
+			bg = svga->pallook[svga->egapal[attr >> 4]];
+			if (attr & 0x80 && svga->attrregs[0x10] & 8) {
+				bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+				if (svga->blink & 16) 
+					fg = bg;
+			}
+		}
+
+		dat = svga->vram[charaddr + (svga->sc << 2)];
+		if (svga->seqregs[1] & 1) { 
+			for (xx = 0; xx < 16; xx += 2) 
+				p[xx] = p[xx + 1] = (dat & (0x80 >> (xx >> 1))) ? fg : bg;
+		} else {
+			for (xx = 0; xx < 16; xx += 2)
+				p[xx] = p[xx + 1] = (dat & (0x80 >> (xx >> 1))) ? fg : bg;
+			if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4))
+				p[16] = p[17] = bg;
+			else		  
+				p[16] = p[17] = (dat & 1) ? fg : bg;
+		}
+		svga->ma += 4; 
+		p += xinc;
+	}
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_text_80(svga_t *svga)
+
+void
+svga_render_text_80(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int xinc = (svga->seqregs[1] & 1) ? 8 : 9;
+    uint8_t chr, attr, dat;
+    uint32_t charaddr;
+    int bg, fg, x, xx;
+    int drawcursor;
+    uint32_t *p;
 
-        if (svga->firstline_draw == 2000) 
-                svga->firstline_draw = svga->displine;
-        svga->lastline_draw = svga->displine;
-        
-        if (svga->fullchange)
-        {
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
-                int x, xx;
-                int drawcursor;
-                uint8_t chr, attr, dat;
-                uint32_t charaddr;
-                int fg, bg;
-                int xinc = (svga->seqregs[1] & 1) ? 8 : 9;
+    if (svga->firstline_draw == 2000) 
+	svga->firstline_draw = svga->displine;
+    svga->lastline_draw = svga->displine;
+	
+    if (svga->fullchange) {
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
 
-                for (x = 0; x < svga->hdisp; x += xinc)
-                {
-                        drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
-                        chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-                        attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+	for (x = 0; x < svga->hdisp; x += xinc) {
+		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
 
+		if (attr & 8)
+			charaddr = svga->charsetb + (chr * 128);
+		else
+			charaddr = svga->charseta + (chr * 128);
 
-                        if (attr & 8) charaddr = svga->charsetb + (chr * 128);
-                        else          charaddr = svga->charseta + (chr * 128);
+		if (drawcursor) { 
+			bg = svga->pallook[svga->egapal[attr & 15]]; 
+			fg = svga->pallook[svga->egapal[attr >> 4]]; 
+		} else {
+			fg = svga->pallook[svga->egapal[attr & 15]];
+			bg = svga->pallook[svga->egapal[attr >> 4]];
 
-                        if (drawcursor) 
-                        { 
-                                bg = svga->pallook[svga->egapal[attr & 15]]; 
-                                fg = svga->pallook[svga->egapal[attr >> 4]]; 
-                        }
-                        else
-                        {
-                                fg = svga->pallook[svga->egapal[attr & 15]];
-                                bg = svga->pallook[svga->egapal[attr >> 4]];
-                                if (attr & 0x80 && svga->attrregs[0x10] & 8)
-                                {
-                                        bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
-                                        if (svga->blink & 16) 
-                                                fg = bg;
-                                }
-                        }
+			if (attr & 0x80 && svga->attrregs[0x10] & 8) {
+				bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+				if (svga->blink & 16) 
+					fg = bg;
+			}
+		}
 
-                        dat = svga->vram[charaddr + (svga->sc << 2)];
-                        if (svga->seqregs[1] & 1) 
-                        { 
-                                for (xx = 0; xx < 8; xx++) 
-                                        p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                        }
-                        else
-                        {
-                                for (xx = 0; xx < 8; xx++) 
-                                        p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                                if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
-                                        p[8] = bg;
-                                else                  
-                                        p[8] = (dat & 1) ? fg : bg;
-                        }
-                        svga->ma += 4; 
-                        p += xinc;
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
+		dat = svga->vram[charaddr + (svga->sc << 2)];
+		if (svga->seqregs[1] & 1) { 
+			for (xx = 0; xx < 8; xx++) 
+				p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+		} else {
+			for (xx = 0; xx < 8; xx++) 
+				p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+			if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
+				p[8] = bg;
+			else		  
+				p[8] = (dat & 1) ? fg : bg;
+		}
+		svga->ma += 4; 
+		p += xinc;
+	}
+
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_text_80_ksc5601(svga_t *svga)
+
+void
+svga_render_text_80_ksc5601(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int xinc = (svga->seqregs[1] & 1) ? 8 : 9;
+    uint8_t chr, attr, dat, nextchr;
+    uint32_t charaddr;
+    int bg, fg, x, xx;
+    int drawcursor;
+    uint32_t *p;
 
-        if (svga->firstline_draw == 2000) 
-                svga->firstline_draw = svga->displine;
-        svga->lastline_draw = svga->displine;
-        
-        if (svga->fullchange)
-        {
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
-                int x, xx;
-                int drawcursor;
-                uint8_t chr, attr, dat, nextchr;
-                uint32_t charaddr;
-                int fg, bg;
-                int xinc = (svga->seqregs[1] & 1) ? 8 : 9;
+    if (svga->firstline_draw == 2000) 
+	svga->firstline_draw = svga->displine;
+    svga->lastline_draw = svga->displine;
 
-                for (x = 0; x < svga->hdisp; x += xinc)
-                {
-                        drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
-                        chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
-			nextchr = svga->vram[((svga->ma + 4) << 1) & svga->vram_display_mask];
-                        attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+    if (svga->fullchange) {
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[32 + x_add];
+
+	for (x = 0; x < svga->hdisp; x += xinc) {
+		drawcursor = ((svga->ma == svga->ca) && svga->con && svga->cursoron);
+		chr  = svga->vram[(svga->ma << 1) & svga->vram_display_mask];
+		nextchr = svga->vram[((svga->ma + 4) << 1) & svga->vram_display_mask];
+		attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+
+		if (drawcursor) { 
+			bg = svga->pallook[svga->egapal[attr & 15]]; 
+			fg = svga->pallook[svga->egapal[attr >> 4]]; 
+		} else {
+			fg = svga->pallook[svga->egapal[attr & 15]];
+			bg = svga->pallook[svga->egapal[attr >> 4]];
+
+			if (attr & 0x80 && svga->attrregs[0x10] & 8) {
+				bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+				if (svga->blink & 16) 
+					fg = bg;
+			}
+		}
+
+		if(x + xinc < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80)) {
+			if ((chr == 0xc9 || chr == 0xfe) && (nextchr > 0xa0 && nextchr < 0xff))
+				dat = fontdatksc5601_user[(chr == 0xfe ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc];
+			else if (nextchr & 0x80)
+				dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->sc];
+			else
+				dat = 0xff;
+		} else {
+			if (attr & 8)
+				charaddr = svga->charsetb + (chr * 128);
+			else
+				charaddr = svga->charseta + (chr * 128);
+
+			dat = svga->vram[charaddr + (svga->sc << 2)];
+		}
+
+		if (svga->seqregs[1] & 1) { 
+			for (xx = 0; xx < 8; xx++) 
+				p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+		} else {
+			for (xx = 0; xx < 8; xx++) 
+				p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+			if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
+				p[8] = bg;
+			else		  
+				p[8] = (dat & 1) ? fg : bg;
+		}
+		svga->ma += 4; 
+		p += xinc;
+
+		if(x + xinc < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80)) {
+			attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+
+			if (drawcursor) { 
+				bg = svga->pallook[svga->egapal[attr & 15]]; 
+				fg = svga->pallook[svga->egapal[attr >> 4]]; 
+			} else {
+				fg = svga->pallook[svga->egapal[attr & 15]];
+				bg = svga->pallook[svga->egapal[attr >> 4]];
+
+				if (attr & 0x80 && svga->attrregs[0x10] & 8) {
+					bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
+					if (svga->blink & 16) 
+						fg = bg;
+				}
+			}
+
+			if ((chr == 0xc9 || chr == 0xfe) && (nextchr > 0xa0 && nextchr < 0xff))
+				dat = fontdatksc5601_user[(chr == 0xfe ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc + 16];
+			else if (nextchr & 0x80)
+				dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->sc + 16];
+			else
+				dat = 0xff;
+
+			if (svga->seqregs[1] & 1) { 
+				for (xx = 0; xx < 8; xx++) 
+					p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+			} else {
+				for (xx = 0; xx < 8; xx++) 
+					p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
+				if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
+					p[8] = bg;
+				else		  
+					p[8] = (dat & 1) ? fg : bg;
+			}
+
+			svga->ma += 4; 
+			p += xinc;
+			x += xinc;
+		}
+	}
+
+	svga->ma &= svga->vram_display_mask;
+    }
+}
 
 
-                        if (drawcursor) 
-                        { 
-                                bg = svga->pallook[svga->egapal[attr & 15]]; 
-                                fg = svga->pallook[svga->egapal[attr >> 4]]; 
-                        }
-                        else
-                        {
-                                fg = svga->pallook[svga->egapal[attr & 15]];
-                                bg = svga->pallook[svga->egapal[attr >> 4]];
-                                if (attr & 0x80 && svga->attrregs[0x10] & 8)
-                                {
-                                        bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
-                                        if (svga->blink & 16) 
-                                                fg = bg;
-                                }
-                        }
+void
+svga_render_2bpp_lowres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int changed_offset, x;
+    int offset;
+    uint8_t dat[2];
+    uint32_t *p;
 
-                        if(x + xinc < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80))
-                        {
-                                if((chr == 0xc9 || chr == 0xfe) && (nextchr > 0xa0 && nextchr < 0xff))
-                                        dat = fontdatksc5601_user[(chr == 0xfe ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc];
-                                else if(nextchr & 0x80)
-                                        dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->sc];
-				else
-					dat = 0xff;
-                        }
-                        else
-                        {
-                                if (attr & 8) charaddr = svga->charsetb + (chr * 128);
-                                else          charaddr = svga->charseta + (chr * 128);
+    changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+
+    if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+	offset = ((8 - svga->scrollcache) << 1) + 16;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+		
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+		       
+	for (x = 0; x <= svga->hdisp; x += 16) {
+		dat[0] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000];
+		dat[1] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000 + 1];
+		svga->ma += 4; 
+		svga->ma &= svga->vram_display_mask;
+
+		p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+		p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+		p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+		p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
+		p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+		p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+		p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+		p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
+
+		p += 16;
+	}
+    }
+}
+
+
+void
+svga_render_2bpp_highres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int changed_offset;
+    int offset, x;
+    uint8_t dat[2];
+    uint32_t *p;
+
+    changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+
+    if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+	offset = (8 - svga->scrollcache) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat[0] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000];
+		dat[1] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000 + 1];
+		svga->ma += 4; 
+		svga->ma &= svga->vram_display_mask;
+
+		p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
+		p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
+		p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
+		p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
+		p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
+		p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
+		p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
+		p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
+
+		p += 8;
+	}
+    }
+}
+
+
+void
+svga_render_4bpp_lowres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int offset, x;
+    uint32_t *p;
+    uint8_t edat[4], dat;
+    uint32_t *eptr = (uint32_t *)edat;
+
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = ((8 - svga->scrollcache) << 1) + 16;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 16) {
+		*eptr = *(uint32_t *)(&svga->vram[svga->ma]);			
+
+		svga->ma += 4; 
+		svga->ma &= svga->vram_display_mask;
+
+		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+		p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+		p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+		p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+		p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+
+		p += 16;
+	}
+    }
+}
+
+
+void
+svga_render_4bpp_highres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int changed_offset;
+    int offset, x;
+    uint32_t *p;
+    uint8_t edat[4], dat;
+    uint32_t *eptr = (uint32_t *)edat;
+
+    changed_offset = (svga->ma + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
+		
+    if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+	offset = (8 - svga->scrollcache) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		*eptr = *(uint32_t *)(&svga->vram[svga->ma | ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000]);
+		svga->ma += 4;
+		svga->ma &= svga->vram_display_mask;
+
+		dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
+		p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
+		p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
+		p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+		dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
+		p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
+		p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
+
+		p += 8;
+	}
+    }
+}
+
+
+void
+svga_render_8bpp_lowres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
+
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - (svga->scrollcache & 6)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+
+		p[0] = p[1] = svga->pallook[dat & 0xff];
+		p[2] = p[3] = svga->pallook[(dat >> 8) & 0xff];
+		p[4] = p[5] = svga->pallook[(dat >> 16) & 0xff];
+		p[6] = p[7] = svga->pallook[(dat >> 24) & 0xff];
+		
+		svga->ma += 4;
+		p += 8;
+	}
+	svga->ma &= svga->vram_display_mask;
+    }
+}
+
+
+void
+svga_render_8bpp_highres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
+
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+		p[0] = svga->pallook[dat & 0xff];
+		p[1] = svga->pallook[(dat >> 8) & 0xff];
+		p[2] = svga->pallook[(dat >> 16) & 0xff];
+		p[3] = svga->pallook[(dat >> 24) & 0xff];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
+		p[4] = svga->pallook[dat & 0xff];
+		p[5] = svga->pallook[(dat >> 8) & 0xff];
+		p[6] = svga->pallook[(dat >> 16) & 0xff];
+		p[7] = svga->pallook[(dat >> 24) & 0xff];
+		
+		svga->ma += 8;
+		p += 8;
+	}
+	svga->ma &= svga->vram_display_mask;
+    }
+}
+
+
+void
+svga_render_15bpp_lowres(svga_t *svga)
+{
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
+
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - (svga->scrollcache & 6)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+	
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
  
-                                dat = svga->vram[charaddr + (svga->sc << 2)];
-                        }
-                        if (svga->seqregs[1] & 1) 
-                        { 
-                                for (xx = 0; xx < 8; xx++) 
-                                        p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                        }
-                        else
-                        {
-                                for (xx = 0; xx < 8; xx++) 
-                                        p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                                if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
-                                        p[8] = bg;
-                                else                  
-                                        p[8] = (dat & 1) ? fg : bg;
-                        }
-                        svga->ma += 4; 
-                        p += xinc;
+	for (x = 0; x <= svga->hdisp; x += 4) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-			if(x + xinc < svga->hdisp && (chr & (nextchr | svga->ksc5601_sbyte_mask) & 0x80))
-                        {
-                                attr = svga->vram[((svga->ma << 1) + 1) & svga->vram_display_mask];
+		p[x]     = video_15to32[dat & 0xffff];
+		p[x + 1] = video_15to32[dat >> 16];
 
-                                if (drawcursor) 
-                                { 
-                                        bg = svga->pallook[svga->egapal[attr & 15]]; 
-                                        fg = svga->pallook[svga->egapal[attr >> 4]]; 
-                                }
-                                else
-                                {
-                                        fg = svga->pallook[svga->egapal[attr & 15]];
-                                        bg = svga->pallook[svga->egapal[attr >> 4]];
-                                        if (attr & 0x80 && svga->attrregs[0x10] & 8)
-                                        {
-                                                bg = svga->pallook[svga->egapal[(attr >> 4) & 7]];
-                                                if (svga->blink & 16) 
-                                                        fg = bg;
-                                        }
-                                }
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
 
-                                if((chr == 0xc9 || chr == 0xfe) && (nextchr > 0xa0 && nextchr < 0xff))
-                                        dat = fontdatksc5601_user[(chr == 0xfe ? 96 : 0) + (nextchr & 0x7F) - 0x20].chr[svga->sc + 16];
-				else if(nextchr & 0x80)
-                                        dat = fontdatksc5601[((chr & 0x7F) << 7) | (nextchr & 0x7F)].chr[svga->sc + 16];
-                                else
-					dat = 0xff;
-                                if (svga->seqregs[1] & 1) 
-                                { 
-                                        for (xx = 0; xx < 8; xx++) 
-                                                p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                                }
-                                else
-                                {
-                                        for (xx = 0; xx < 8; xx++) 
-                                                p[xx] = (dat & (0x80 >> xx)) ? fg : bg;
-                                        if ((chr & ~0x1F) != 0xC0 || !(svga->attrregs[0x10] & 4)) 
-                                                p[8] = bg;
-                                        else                  
-                                                p[8] = (dat & 1) ? fg : bg;
-                                }
-
-                                svga->ma += 4; 
-                                p += xinc;
-                                x += xinc;
-                        }
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
+		p[x]     = video_15to32[dat & 0xffff];
+		p[x + 1] = video_15to32[dat >> 16];
+	}
+	svga->ma += x << 1; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_2bpp_lowres(svga_t *svga)
+
+void
+svga_render_15bpp_highres(svga_t *svga)
 {
-        int changed_offset;
-        
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-	changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
-                
-        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = ((8 - svga->scrollcache) << 1) + 16;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-                       
-                for (x = 0; x <= svga->hdisp; x += 16)
-                {
-                        uint8_t dat[2];
-                        
-                        dat[0] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000];
-                        dat[1] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000 + 1];
-                        svga->ma += 4; 
-                        svga->ma &= svga->vram_display_mask;
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                        p[0]  = p[1]  = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-                        p[2]  = p[3]  = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-                        p[4]  = p[5]  = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-                        p[6]  = p[7]  = svga->pallook[svga->egapal[dat[0] & 3]];
-                        p[8]  = p[9]  = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-                        p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-                        p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-                        p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
 
-                        p += 16;
-                }
-        }
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		p[x]     = video_15to32[dat & 0xffff];
+		p[x + 1] = video_15to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+		p[x + 2] = video_15to32[dat & 0xffff];
+		p[x + 3] = video_15to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+		p[x + 4] = video_15to32[dat & 0xffff];
+		p[x + 5] = video_15to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+		p[x + 6] = video_15to32[dat & 0xffff];
+		p[x + 7] = video_15to32[dat >> 16];
+	}
+	svga->ma += x << 1; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_2bpp_highres(svga_t *svga)
+
+void
+svga_render_mixed_highres(svga_t *svga)
 {
-        int changed_offset;
-        
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-	changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
-                                
-        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - svga->scrollcache) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-                       
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint8_t dat[2];
-                        
-                        dat[0] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000];
-                        dat[1] = svga->vram[(svga->ma << 1) + ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000 + 1];
-                        svga->ma += 4; 
-                        svga->ma &= svga->vram_display_mask;
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                        p[0] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
-                        p[1] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
-                        p[2] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
-                        p[3] = svga->pallook[svga->egapal[dat[0] & 3]];
-                        p[4] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
-                        p[5] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
-                        p[6] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
-                        p[7] = svga->pallook[svga->egapal[dat[1] & 3]];
-                        
-                        p += 8;
-                }
-        }
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		if (dat & 0x8000)
+			p[x] = svga->pallook[dat & 0xff];
+		else
+			p[x]     = video_15to32[dat & 0x7fff];
+
+		if ((dat >> 16) & 0x8000)
+			p[x + 1] = svga->pallook[(dat >> 16) & 0xff];
+		else
+			p[x + 1] = video_15to32[(dat >> 16) & 0x7fff];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+
+	    	if (dat & 0x8000)
+			p[x + 2] = svga->pallook[dat & 0xff];
+		else
+			p[x + 2]     = video_15to32[dat & 0x7fff];
+
+		if ((dat >> 16) & 0x8000)
+			p[x + 3] = svga->pallook[(dat >> 16) & 0xff];
+		else
+			p[x + 3] = video_15to32[(dat >> 16) & 0x7fff];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+		if (dat & 0x8000)
+			p[x + 4] = svga->pallook[dat & 0xff];
+		else
+			p[x + 4]     = video_15to32[dat & 0x7fff];
+
+		if ((dat >> 16) & 0x8000)
+			p[x + 5] = svga->pallook[(dat >> 16) & 0xff];
+		else
+			p[x + 5] = video_15to32[(dat >> 16) & 0x7fff];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+		if (dat & 0x8000)
+			p[x + 6] = svga->pallook[dat & 0xff];
+		else
+			p[x + 6]     = video_15to32[dat & 0x7fff];
+
+		if ((dat >> 16) & 0x8000)
+			p[x + 7] = svga->pallook[(dat >> 16) & 0xff];
+		else
+			p[x + 7] = video_15to32[(dat >> 16) & 0x7fff];
+	}
+	svga->ma += x << 1; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_4bpp_lowres(svga_t *svga)
+
+void
+svga_render_16bpp_lowres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = ((8 - svga->scrollcache) << 1) + 16;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - (svga->scrollcache & 6)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                for (x = 0; x <= svga->hdisp; x += 16)
-                {
-                        uint8_t edat[4];
-			uint32_t *eptr = (uint32_t *)edat;
-                        uint8_t dat;
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
 
-                        *eptr = *(uint32_t *)(&svga->vram[svga->ma]);                        
+	for (x = 0; x <= svga->hdisp; x += 4) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
 
-                        svga->ma += 4; 
-                        svga->ma &= svga->vram_display_mask;
+		p[x]     = video_16to32[dat & 0xffff];
+		p[x + 1] = video_16to32[dat >> 16];
 
-                        dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-                        p[0]  = p[1]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[2]  = p[3]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-                        p[4]  = p[5]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[6]  = p[7]  = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-                        p[8]  = p[9]  = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[10] = p[11] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-                        p[12] = p[13] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[14] = p[15] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                                                
-                        p += 16;
-                }
-        }
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+
+		p[x]     = video_16to32[dat & 0xffff];
+		p[x + 1] = video_16to32[dat >> 16];
+	}
+	svga->ma += x << 1; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_4bpp_highres(svga_t *svga)
+
+void
+svga_render_16bpp_highres(svga_t *svga)
 {
-        int changed_offset;
-        
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-	changed_offset = (svga->ma + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
-                
-        if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - svga->scrollcache) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-        
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-                
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint8_t edat[4];
-			uint32_t *eptr = (uint32_t *)edat;
-                        uint8_t dat;
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-			*eptr = *(uint32_t *)(&svga->vram[svga->ma | ((svga->sc & ~svga->crtc[0x17] & 3)) * 0x8000]);
-                        svga->ma += 4;
-                        svga->ma &= svga->vram_display_mask;
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
 
-                        dat = edatlookup[edat[0] >> 6][edat[1] >> 6] | (edatlookup[edat[2] >> 6][edat[3] >> 6] << 2);
-                        p[0] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[1] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[(edat[0] >> 4) & 3][(edat[1] >> 4) & 3] | (edatlookup[(edat[2] >> 4) & 3][(edat[3] >> 4) & 3] << 2);
-                        p[2] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[3] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[(edat[0] >> 2) & 3][(edat[1] >> 2) & 3] | (edatlookup[(edat[2] >> 2) & 3][(edat[3] >> 2) & 3] << 2);
-                        p[4] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[5] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        dat = edatlookup[edat[0] & 3][edat[1] & 3] | (edatlookup[edat[2] & 3][edat[3] & 3] << 2);
-                        p[6] = svga->pallook[svga->egapal[(dat >> 4) & svga->plane_mask]];
-                        p[7] = svga->pallook[svga->egapal[dat & svga->plane_mask]];
-                        
-                        p += 8;
-                }
-        }
+	for (x = 0; x <= svga->hdisp; x += 8) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+		p[x]     = video_16to32[dat & 0xffff];
+		p[x + 1] = video_16to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
+		p[x + 2] = video_16to32[dat & 0xffff];
+		p[x + 3] = video_16to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
+		p[x + 4] = video_16to32[dat & 0xffff];
+		p[x + 5] = video_16to32[dat >> 16];
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
+		p[x + 6] = video_16to32[dat & 0xffff];
+		p[x + 7] = video_16to32[dat >> 16];
+	}
+
+	svga->ma += x << 1; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_8bpp_lowres(svga_t *svga)
+
+void
+svga_render_24bpp_lowres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - (svga->scrollcache & 6)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-                                                                
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-                        
-                        p[0] = p[1] = svga->pallook[dat & 0xff];
-                        p[2] = p[3] = svga->pallook[(dat >> 8) & 0xff];
-                        p[4] = p[5] = svga->pallook[(dat >> 16) & 0xff];
-                        p[6] = p[7] = svga->pallook[(dat >> 24) & 0xff];
-                        
-                        svga->ma += 4;
-                        p += 8;
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	offset = (8 - (svga->scrollcache & 6)) + 24;
+
+	for (x = 0; x <= svga->hdisp; x++) {
+		dat = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
+		svga->ma += 3; 
+		svga->ma &= svga->vram_display_mask;
+		((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + offset + x_add] = ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + 1 + offset + x_add] = dat;
+	}
+    }
 }
 
-void svga_render_8bpp_highres(svga_t *svga)
+
+void
+svga_render_24bpp_highres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-                                                                
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint32_t dat;
-                        dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-                        p[0] = svga->pallook[dat & 0xff];
-                        p[1] = svga->pallook[(dat >> 8) & 0xff];
-                        p[2] = svga->pallook[(dat >> 16) & 0xff];
-                        p[3] = svga->pallook[(dat >> 24) & 0xff];
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
 
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + 4) & svga->vram_display_mask]);
-                        p[4] = svga->pallook[dat & 0xff];
-                        p[5] = svga->pallook[(dat >> 8) & 0xff];
-                        p[6] = svga->pallook[(dat >> 16) & 0xff];
-                        p[7] = svga->pallook[(dat >> 24) & 0xff];
-                        
-                        svga->ma += 8;
-                        p += 8;
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
+	for (x = 0; x <= svga->hdisp; x += 4) {
+		dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
+		p[x] = dat & 0xffffff;
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
+		p[x + 1] = dat & 0xffffff;
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
+		p[x + 2] = dat & 0xffffff;
+
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
+		p[x + 3] = dat & 0xffffff;
+
+		svga->ma += 12;
+	}
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_15bpp_lowres(svga_t *svga)
+
+void
+svga_render_32bpp_lowres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    int x, offset;
+    uint32_t fg;
 
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - (svga->scrollcache & 6)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-               
-                for (x = 0; x <= svga->hdisp; x += 4)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
+    if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
 
-                        p[x]     = video_15to32[dat & 0xffff];
-                        p[x + 1] = video_15to32[dat >> 16];
+	offset = (8 - (svga->scrollcache & 6)) + 24;
 
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-
-                        p[x]     = video_15to32[dat & 0xffff];
-                        p[x + 1] = video_15to32[dat >> 16];
-                }
-                svga->ma += x << 1; 
-                svga->ma &= svga->vram_display_mask;
-        }
+	for (x = 0; x <= svga->hdisp; x++) {
+		fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
+		svga->ma += 4; 
+		svga->ma &= svga->vram_display_mask;
+		((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + offset + x_add] = ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + 1 + offset + x_add] = fg;
+	}
+    }
 }
 
-void svga_render_15bpp_highres(svga_t *svga)
-{
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-                        p[x]     = video_15to32[dat & 0xffff];
-                        p[x + 1] = video_15to32[dat >> 16];
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-                        p[x + 2] = video_15to32[dat & 0xffff];
-                        p[x + 3] = video_15to32[dat >> 16];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-                        p[x + 4] = video_15to32[dat & 0xffff];
-                        p[x + 5] = video_15to32[dat >> 16];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-                        p[x + 6] = video_15to32[dat & 0xffff];
-                        p[x + 7] = video_15to32[dat >> 16];
-                }
-                svga->ma += x << 1; 
-                svga->ma &= svga->vram_display_mask;
-        }
-}
-
-void svga_render_mixed_highres(svga_t *svga)
-{
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-						if (dat & 0x8000)
-							p[x] = svga->pallook[dat & 0xff];
-						else
-							p[x]     = video_15to32[dat & 0x7fff];
-                        if ((dat >> 16) & 0x8000)						
-							p[x + 1] = svga->pallook[(dat >> 16) & 0xff];
-						else
-							p[x + 1] = video_15to32[(dat >> 16) & 0x7fff];
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-						
-                    	if (dat & 0x8000)
-							p[x + 2] = svga->pallook[dat & 0xff];
-						else
-							p[x + 2]     = video_15to32[dat & 0x7fff];
-                        if ((dat >> 16) & 0x8000)						
-							p[x + 3] = svga->pallook[(dat >> 16) & 0xff];
-						else
-							p[x + 3] = video_15to32[(dat >> 16) & 0x7fff];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-						if (dat & 0x8000)
-							p[x + 4] = svga->pallook[dat & 0xff];
-						else
-							p[x + 4]     = video_15to32[dat & 0x7fff];
-                        if ((dat >> 16) & 0x8000)						
-							p[x + 5] = svga->pallook[(dat >> 16) & 0xff];
-						else
-							p[x + 5] = video_15to32[(dat >> 16) & 0x7fff];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-						if (dat & 0x8000)
-							p[x + 6] = svga->pallook[dat & 0xff];
-						else
-							p[x + 6]     = video_15to32[dat & 0x7fff];
-                        if ((dat >> 16) & 0x8000)						
-							p[x + 7] = svga->pallook[(dat >> 16) & 0xff];
-						else
-							p[x + 7] = video_15to32[(dat >> 16) & 0x7fff];
-                }
-                svga->ma += x << 1; 
-                svga->ma &= svga->vram_display_mask;
-        }
-}
-
-void svga_render_16bpp_lowres(svga_t *svga)
-{
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - (svga->scrollcache & 6)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-               
-                for (x = 0; x <= svga->hdisp; x += 4)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-
-                        p[x]     = video_16to32[dat & 0xffff];
-                        p[x + 1] = video_16to32[dat >> 16];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-
-                        p[x]     = video_16to32[dat & 0xffff];
-                        p[x + 1] = video_16to32[dat >> 16];
-                }
-                svga->ma += x << 1; 
-                svga->ma &= svga->vram_display_mask;
-        }
-}
-
-void svga_render_16bpp_highres(svga_t *svga)
-{
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                for (x = 0; x <= svga->hdisp; x += 8)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1)) & svga->vram_display_mask]);
-                        p[x]     = video_16to32[dat & 0xffff];
-                        p[x + 1] = video_16to32[dat >> 16];
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 4) & svga->vram_display_mask]);
-                        p[x + 2] = video_16to32[dat & 0xffff];
-                        p[x + 3] = video_16to32[dat >> 16];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 8) & svga->vram_display_mask]);
-                        p[x + 4] = video_16to32[dat & 0xffff];
-                        p[x + 5] = video_16to32[dat >> 16];
-
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 1) + 12) & svga->vram_display_mask]);
-                        p[x + 6] = video_16to32[dat & 0xffff];
-                        p[x + 7] = video_16to32[dat >> 16];
-                }
-                svga->ma += x << 1; 
-                svga->ma &= svga->vram_display_mask;
-        }
-}
-
-void svga_render_24bpp_lowres(svga_t *svga)
-{
-        int x, offset;
-        uint32_t fg;
-        
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                offset = (8 - (svga->scrollcache & 6)) + 24;
-
-                for (x = 0; x <= svga->hdisp; x++)
-                {
-                        fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-                        svga->ma += 3; 
-                        svga->ma &= svga->vram_display_mask;
-                        ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + offset + x_add] = ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + 1 + offset + x_add] = fg;
-                }
-        }
-}
-
-void svga_render_24bpp_highres(svga_t *svga)
-{
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                for (x = 0; x <= svga->hdisp; x += 4)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[svga->ma & svga->vram_display_mask]);
-                        p[x] = dat & 0xffffff;
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + 3) & svga->vram_display_mask]);
-                        p[x + 1] = dat & 0xffffff;
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + 6) & svga->vram_display_mask]);
-                        p[x + 2] = dat & 0xffffff;
-                        
-                        dat = *(uint32_t *)(&svga->vram[(svga->ma + 9) & svga->vram_display_mask]);
-                        p[x + 3] = dat & 0xffffff;
-                        
-                        svga->ma += 12;
-                }
-                svga->ma &= svga->vram_display_mask;
-        }
-}
-
-void svga_render_32bpp_lowres(svga_t *svga)
-{
-        int x, offset;
-        uint32_t fg;
-        
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
-
-        if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange)
-        {
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
-
-                offset = (8 - (svga->scrollcache & 6)) + 24;
-
-                for (x = 0; x <= svga->hdisp; x++)
-                {
-                        fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
-                        svga->ma += 4; 
-                        svga->ma &= svga->vram_display_mask;
-                        ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + offset + x_add] = ((uint32_t *)buffer32->line[svga->displine + y_add])[(x << 1) + 1 + offset + x_add] = fg;
-                }
-        }
-}
 
 /*72%
   91%*/
-void svga_render_32bpp_highres(svga_t *svga)
+void
+svga_render_32bpp_highres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
+    if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                for (x = 0; x <= svga->hdisp; x++)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-                        p[x] = dat & 0xffffff;
-                }
-                svga->ma += 4; 
-                svga->ma &= svga->vram_display_mask;
-        }
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x++) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		p[x] = dat & 0xffffff;
+	}
+
+	svga->ma += 4; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_ABGR8888_highres(svga_t *svga)
+
+void
+svga_render_ABGR8888_highres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
+    if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                for (x = 0; x <= svga->hdisp; x++)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-                        p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
-                }
-                svga->ma += 4; 
-                svga->ma &= svga->vram_display_mask;
-        }
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x++) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		p[x] = ((dat & 0xff0000) >> 16) | (dat & 0x00ff00) | ((dat & 0x0000ff) << 16);
+	}
+
+	svga->ma += 4; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
 
-void svga_render_RGBA8888_highres(svga_t *svga)
+
+void
+svga_render_RGBA8888_highres(svga_t *svga)
 {
-	int y_add = enable_overscan ? (overscan_y >> 1) : 0;
-	int x_add = enable_overscan ? 8 : 0;
+    int y_add = enable_overscan ? (overscan_y >> 1) : 0;
+    int x_add = enable_overscan ? 8 : 0;
+    uint32_t *p, dat;
+    int offset, x;
 
-        if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange)
-        {
-                int x;
-                int offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
-                uint32_t *p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
-                
-                if (svga->firstline_draw == 2000) 
-                        svga->firstline_draw = svga->displine;
-                svga->lastline_draw = svga->displine;
+    if (svga->changedvram[svga->ma >> 12] ||  svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
+	offset = (8 - ((svga->scrollcache & 6) >> 1)) + 24;
+	p = &((uint32_t *)buffer32->line[svga->displine + y_add])[offset + x_add];
 
-                for (x = 0; x <= svga->hdisp; x++)
-                {
-                        uint32_t dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
-                        p[x] = dat >> 8;
-                }
-                svga->ma += 4; 
-svga->ma &= svga->vram_display_mask;
-        }
+	if (svga->firstline_draw == 2000) 
+		svga->firstline_draw = svga->displine;
+	svga->lastline_draw = svga->displine;
+
+	for (x = 0; x <= svga->hdisp; x++) {
+		dat = *(uint32_t *)(&svga->vram[(svga->ma + (x << 2)) & svga->vram_display_mask]);
+		p[x] = dat >> 8;
+	}
+
+	svga->ma += 4; 
+	svga->ma &= svga->vram_display_mask;
+    }
 }
diff --git a/src/devices/video/vid_svga_render.h b/src/devices/video/vid_svga_render.h
index 7069abe..9163902 100644
--- a/src/devices/video/vid_svga_render.h
+++ b/src/devices/video/vid_svga_render.h
@@ -8,7 +8,7 @@
  *
  *		Definitions for the SVGA renderers.
  *
- * Version:	@(#)vid_svga_render.h	1.0.2	2018/03/12
+ * Version:	@(#)vid_svga_render.h	1.0.3	2018/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -40,43 +40,41 @@
 # define VIDEO_SVGA_RENDER_H
 
 
-extern int firstline_draw, lastline_draw;
-extern int displine;
-extern int sc;
+extern int	firstline_draw, lastline_draw;
+extern int	displine;
+extern int	sc;
+extern uint32_t	ma, ca;
+extern int	con, cursoron, cgablink;
+extern int	scrollcache;
+extern uint8_t	edatlookup[4][4];
 
-extern uint32_t ma, ca;
-extern int con, cursoron, cgablink;
 
-extern int scrollcache;
+extern void	svga_render_blank(svga_t *svga);
+extern void	svga_render_text_40(svga_t *svga);
+extern void	svga_render_text_80(svga_t *svga);
+extern void	svga_render_text_80_ksc5601(svga_t *svga);
 
-extern uint8_t edatlookup[4][4];
+extern void	svga_render_2bpp_lowres(svga_t *svga);
+extern void	svga_render_2bpp_highres(svga_t *svga);
+extern void	svga_render_4bpp_lowres(svga_t *svga);
+extern void	svga_render_4bpp_highres(svga_t *svga);
+extern void	svga_render_8bpp_lowres(svga_t *svga);
+extern void	svga_render_8bpp_highres(svga_t *svga);
+extern void	svga_render_15bpp_lowres(svga_t *svga);
+extern void	svga_render_15bpp_highres(svga_t *svga);
+extern void	svga_render_16bpp_lowres(svga_t *svga);
+extern void	svga_render_16bpp_highres(svga_t *svga);
+extern void	svga_render_24bpp_lowres(svga_t *svga);
+extern void	svga_render_24bpp_highres(svga_t *svga);
+extern void	svga_render_32bpp_lowres(svga_t *svga);
+extern void	svga_render_32bpp_highres(svga_t *svga);
+extern void	svga_render_ABGR8888_lowres(svga_t *svga);
+extern void	svga_render_ABGR8888_highres(svga_t *svga);
+extern void	svga_render_RGBA8888_lowres(svga_t *svga);
+extern void	svga_render_RGBA8888_highres(svga_t *svga);
+extern void	svga_render_mixed_highres(svga_t *svga);
 
-void svga_render_blank(svga_t *svga);
-void svga_render_text_40(svga_t *svga);
-void svga_render_text_80(svga_t *svga);
-void svga_render_text_80_ksc5601(svga_t *svga);
-
-void svga_render_2bpp_lowres(svga_t *svga);
-void svga_render_2bpp_highres(svga_t *svga);
-void svga_render_4bpp_lowres(svga_t *svga);
-void svga_render_4bpp_highres(svga_t *svga);
-void svga_render_8bpp_lowres(svga_t *svga);
-void svga_render_8bpp_highres(svga_t *svga);
-void svga_render_15bpp_lowres(svga_t *svga);
-void svga_render_15bpp_highres(svga_t *svga);
-void svga_render_mixed_highres(svga_t *svga);
-void svga_render_16bpp_lowres(svga_t *svga);
-void svga_render_16bpp_highres(svga_t *svga);
-void svga_render_24bpp_lowres(svga_t *svga);
-void svga_render_24bpp_highres(svga_t *svga);
-void svga_render_32bpp_lowres(svga_t *svga);
-void svga_render_32bpp_highres(svga_t *svga);
-void svga_render_ABGR8888_lowres(svga_t *svga);
-void svga_render_ABGR8888_highres(svga_t *svga);
-void svga_render_RGBA8888_lowres(svga_t *svga);
-void svga_render_RGBA8888_highres(svga_t *svga);
-
-extern void (*svga_render)(svga_t *svga);
+extern void	(*svga_render)(svga_t *svga);
 
 
 #endif	/*VIDEO_SVGA_RENDER_H*/
diff --git a/src/devices/video/video.h b/src/devices/video/video.h
index be4e38a..4326fc3 100644
--- a/src/devices/video/video.h
+++ b/src/devices/video/video.h
@@ -8,7 +8,7 @@
  *
  *		Definitions for the video controller module.
  *
- * Version:	@(#)video.h	1.0.19	2018/10/16
+ * Version:	@(#)video.h	1.0.20	2018/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
diff --git a/src/devices/video/video_dev.c b/src/devices/video/video_dev.c
index ea1c677..92e097c 100644
--- a/src/devices/video/video_dev.c
+++ b/src/devices/video/video_dev.c
@@ -12,7 +12,7 @@
  *		"extern" reference to its device into the video.h file,
  *		and add an entry for it into the table here.
  *
- * Version:	@(#)video_dev.c	1.0.25	2018/10/20
+ * Version:	@(#)video_dev.c	1.0.26	2018/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -85,7 +85,7 @@ static const struct {
 #endif
     { "superega",		&sega_device			},
 #if defined(DEV_BRANCH)
-    { "cl_gd5422_isa",     	&gd5422_isa_device		},
+    { "cl_gd5422_isa",		&gd5422_isa_device		},
 #endif
     { "cl_gd5428_isa",		&gd5428_isa_device		},
     { "cl_gd5429_isa",		&gd5429_isa_device		},
@@ -141,7 +141,7 @@ static const struct {
     { "mach64gx_vlb",		&mach64gx_vlb_device		},
     { "et4000w32p_vlb",		&et4000w32p_cardex_vlb_device	},
 #if defined(DEV_BRANCH)
-    { "cl_gd5424_vlb",     	&gd5424_vlb_device		},
+    { "cl_gd5424_vlb",		&gd5424_vlb_device		},
 #endif
     { "cl_gd5429_vlb",		&gd5429_vlb_device		},
     { "cl_gd5434_vlb",		&gd5434_vlb_device		},