[Lapetus-cvs] lapetus vdpinit.c,1.6,1.7

[Theo B. <cyb...@us...>]

Update of /cvsroot/lapetus/lapetus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25233

Modified Files:
	vdpinit.c 
Log Message:
-Can now change to resolutions other than 320x224. High resolutions still don't work correctly

Index: vdpinit.c
===================================================================
RCS file: /cvsroot/lapetus/lapetus/vdpinit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vdpinit.c	9 Jan 2008 05:55:59 -0000	1.6
+++ vdpinit.c	13 Jan 2008 01:42:00 -0000	1.7
@@ -44,9 +44,6 @@
    int i;
    u16 EWRR;
 
-   // Make sure VDP2 is in a sane state
-   VDP2_REG_TVMD = res;
-
    if (res & 0x1)
       BIOS_SetClockSpeed(1); // 352
    else
@@ -86,13 +83,16 @@
       default: break;
    }
 
-   if (res & 0xC)
+   if (res & 0xC0)
       vdp2settings.screenheight <<= 1;   
 
    // Clear registers
    for (i = 0; i < 0x200; i+=2)
       *((volatile u16 *)(0x25F80000+i)) = 0x0000;
 
+   // Make sure VDP2 is in a sane state
+   VDP2_REG_TVMD = (u16)res;
+
    // Make sure VDP1 is in a sane state
    VDP1_REG_PTMR = 0;