cleanup and consolidate some mode-X code modesetting.

reminders to self.

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 0aa6904b1daa289ca79646d456cb9a4f5122ef17..5c0cab2c0031bc35accfac37ab355a60a6c1b114 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -90,9 +90,13 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 {\r
        word i;\r
        dword far*ptr=(dword far*)VGA;      /* used for faster screen clearing */\r
+       struct vga_mode_params cm;\r
        int CRTParmCount;\r
-       /* common mode X initiation stuff~ */\r
-       modexsetBaseXMode();\r
+\r
+       vgaSetMode(VGA_256_COLOR_MODE);\r
+       vga_enable_256color_modex();\r
+       update_state_from_vga();\r
+       vga_read_crtc_mode(&cm);\r
 \r
        switch(vq)\r
        {\r
@@ -102,32 +106,6 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                        gv->video.page[0].sw=vga_state.vga_width = 320; // VGA lib currently does not update this\r
                        gv->video.page[0].sh=vga_state.vga_height = 240; // VGA lib currently does not update this\r
 \r
-                       /* send the CRTParms */\r
-                       /*for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_320x240regs[i]);\r
-                       }*/\r
-                       {\r
-                       struct vga_mode_params cm;\r
-                       vga_read_crtc_mode(&cm);\r
-\r
-//     0x5f00,         /* Horizontal total */\r
-//     0x4f01,         /* horizontal display enable end */\r
-//     0x5002,         /* Start horizontal blanking */\r
-//     0x8203,         /* End horizontal blanking */\r
-//     0x5404,         /* Start horizontal retrace */\r
-//     0x8005,         /* End horizontal retrace */\r
-//     0x0d06,          /* vertical total */\r
-//     0x3e07,          /* overflow (bit 8 of vertical counts) */\r
-//     0x4109,          /* cell height (2 to double-scan */\r
-//     0xea10,          /* v sync start */\r
-//     0xac11,          /* v sync end and protect cr0-cr7 */\r
-//     0xdf12,          /* vertical displayed */\r
-//     0x2813,         /* offset/logical width */\r
-//     0x0014,          /* turn off dword mode */\r
-//     0xe715,          /* v blank start */\r
-//     0x0616,          /* v blank end */\r
-//     0xe317            /* turn on byte mode */\r
-\r
                        // 320x240 mode 60Hz\r
                        cm.horizontal_total=0x5f + 5; /* CRTC[0]             -5 */\r
                        cm.horizontal_display_end=0x4f + 1; /* CRTC[1]       -1 */\r
@@ -146,56 +124,21 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                        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
-               break;\r
-               case 2:\r
-                       CRTParmCount = sizeof(ModeX_160x120regs) / sizeof(ModeX_160x120regs[0]);\r
-                       /* width and height */\r
-                       gv->video.page[0].sw=120;\r
-                       gv->video.page[0].sh=160;\r
-\r
-                       /* send the CRTParms */\r
-                       for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_160x120regs[i]);\r
-                       }\r
-               break;\r
-               case 3:\r
-                       CRTParmCount = sizeof(ModeX_320x200regs) / sizeof(ModeX_320x200regs[0]);\r
-                       /* width and height */\r
-                       gv->video.page[0].sw=320;\r
-                       gv->video.page[0].sh=200;\r
-\r
-                       /* send the CRTParms */\r
-                       for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_320x200regs[i]);\r
-                       }\r
-               break;\r
-               case 4:\r
-                       CRTParmCount = sizeof(ModeX_192x144regs) / sizeof(ModeX_192x144regs[0]);\r
-                       /* width and height */\r
-                       gv->video.page[0].sw=192;\r
-                       gv->video.page[0].sh=144;\r
-\r
-                       /* send the CRTParms */\r
-                       for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_192x144regs[i]);\r
-                       }\r
-               break;\r
-               case 5:\r
-                       CRTParmCount = sizeof(ModeX_256x192regs) / sizeof(ModeX_256x192regs[0]);\r
-                       /* width and height */\r
-                       gv->video.page[0].sw=256;\r
-                       gv->video.page[0].sh=192;\r
-\r
-                       /* send the CRTParms */\r
-                       for(i=0; i<CRTParmCount; i++) {\r
-                               outpw(CRTC_INDEX, ModeX_256x192regs[i]);\r
-                       }\r
-               break;\r
+                       break;\r
+               case 2: // TODO: 160x120 according to ModeX_160x120regs\r
+                       return;\r
+               case 3: // TODO: 160x120 according to ModeX_320x200regs\r
+                       return;\r
+               case 4: // TODO: 160x120 according to ModeX_192x144regs\r
+                       return;\r
+               case 5: // TODO: 160x120 according to ModeX_256x192regs\r
+                       return;\r
+               default:\r
+                       return;\r
        }\r
 \r
+       vga_write_crtc_mode(&cm,0);\r
+\r
        /* clear video memory */\r
        switch (cmem)\r
        {\r
@@ -219,19 +162,6 @@ modexLeave() {
        vgaSetMode(TEXT_MODE);\r
 }\r
 \r
-//    setBaseXMode() does the initialization to make the VGA ready to\r
-//    accept any combination of configuration register settings.  This\r
-//    involves enabling writes to index 0 to 7 of the CRT controller (port\r
-//    0x3D4), by clearing the most significant bit (bit 7) of index 0x11.\r
-void\r
-modexsetBaseXMode()\r
-{\r
-       /* TODO save current video mode and palette */\r
-       vgaSetMode(VGA_256_COLOR_MODE);\r
-       vga_enable_256color_modex();\r
-       update_state_from_vga();\r
-}\r
-\r
 page_t\r
 modexDefaultPage(page_t *p)\r
 {\r