use write sequencer function

[16.git] / src / lib / modex16.c

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 0d10603776a3b35de763651a6d1a274fa78e3998..0aa6904b1daa289ca79646d456cb9a4f5122ef17 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -129,20 +129,23 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 //     0xe317            /* turn on byte mode */\r
 \r
                        // 320x240 mode 60Hz\r
-                       cm.horizontal_total=0x5f; /* CRTC[0]             -5 */\r
-                       cm.horizontal_display_end=0x4f; /* CRTC[1]       -1 */\r
-                       cm.horizontal_blank_start=0x50; /* CRTC[2] */\r
-                       cm.horizontal_blank_end=0x82;   /* CRTC[3] bit 0-4 & CRTC[5] bit 7 */\r
+                       cm.horizontal_total=0x5f + 5; /* CRTC[0]             -5 */\r
+                       cm.horizontal_display_end=0x4f + 1; /* CRTC[1]       -1 */\r
+                       cm.horizontal_blank_start=0x50 + 1; /* CRTC[2] */\r
+                       cm.horizontal_blank_end=0x82 + 1;   /* CRTC[3] bit 0-4 & CRTC[5] bit 7 */\r
                        cm.horizontal_start_retrace=0x54;/* CRTC[4] */\r
                        cm.horizontal_end_retrace=0x80; /* CRTC[5] bit 0-4 */\r
                        //cm.horizontal_start_delay_after_total=0x3e; /* CRTC[3] bit 5-6 */\r
                        //cm.horizontal_start_delay_after_retrace=0x41; /* CRTC[5] bit 5-6 */\r
-                       cm.vertical_total = 525;\r
+                       cm.vertical_total = 0x20D + 2;\r
                        cm.vertical_start_retrace = 0x1EA;\r
                        cm.vertical_end_retrace = 0x1EC;\r
                        cm.vertical_display_end = 480;\r
-                       cm.vertical_blank_start = 489;\r
-                       cm.vertical_blank_end = 517;\r
+                       cm.vertical_blank_start = 0x1E7 + 1;\r
+                       cm.vertical_blank_end = 0x206 + 1;\r
+                       cm.clock_select = 0; /* misc register = 0xE3  25MHz */\r
+                       cm.vsync_neg = 1;\r
+                       cm.hsync_neg = 1;\r
 \r
                        vga_write_crtc_mode(&cm,0);\r
                        }\r
@@ -198,10 +201,8 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        {\r
                case 1:\r
                /* clear video memory */\r
-               outpw(SC_INDEX, 0x0f02);\r
-               for(i=0; i<0x8000; i++) {\r
-                       ptr[i] = 0x0000;\r
-               }\r
+               vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);\r
+               for(i=0; i<0x8000; i++) ptr[i] = 0x0000;\r
                break;\r
        }\r
        gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH;\r
@@ -227,27 +228,7 @@ modexsetBaseXMode()
 {\r
        /* TODO save current video mode and palette */\r
        vgaSetMode(VGA_256_COLOR_MODE);\r
-\r
        vga_enable_256color_modex();\r
-\r
-       /* disable chain4 mode */\r
-       //outpw(SC_INDEX, 0x0604);\r
-\r
-       /* synchronous reset while setting Misc Output */\r
-       //outpw(SC_INDEX, 0x0100);\r
-\r
-       /* select 25 MHz dot clock & 60 Hz scanning rate */\r
-       outp(MISC_OUTPUT, 0xe3);\r
-\r
-       /* undo reset (restart sequencer) */\r
-       //outpw(SC_INDEX, 0x0300);\r
-\r
-       /* reprogram the CRT controller */\r
-       outp(CRTC_INDEX, 0x11); /* VSync End reg contains register write prot */\r
-//     temp = inp(CRTC_DATA) & 0x7F;\r
-//     outp(CRTC_INDEX, 0x11);\r
-       outp(CRTC_DATA, 0x7f);  /* get current write protect on varios regs */\r
-//     outp(CRTC_DATA, temp);  /* get current write protect on varios regs */\r
        update_state_from_vga();\r
 }\r
 \r