==160x120 is back==

diff --git a/src/lib/modex16/256x192.h b/src/lib/modex16/256x192.h
index 94827b02768fdcfef0a7371466b8f4534f30dc78..d59ae7011775d6a9b7495046b8cbcb7873419276 100755 (executable)
--- a/src/lib/modex16/256x192.h
+++ b/src/lib/modex16/256x192.h
@@ -75,118 +75,72 @@ static const word ModeX_256x192regs[] = {
 };\r
 \r
 #endif /*_DIX_H_*/\r
-/*void\r
-tg::mode160x120()\r
-{\r
-    int crtc11;\r
-\r
-    outp(0x3d4, 0x11); // unlock crtc\r
-    crtc11 = inp(0x3d5) & 0x7f;\r
-    outp(0x3d4, 0x11);\r
-    outp(0x3d5, crtc11);\r
-\r
-    width   = 160;\r
-    height  = 120;\r
-    maxx    = 159;\r
-    maxy    = 119;\r
-    pages   = 13;\r
-    lineSize = 40;\r
-    pageSize = 19200;\r
-    modeName = "160x120";\r
-\r
-    outp(0x3c2, 0xe3);   // mor\r
-\r
-    outp(0x3d4, 0x00); // crtc\r
-    outp(0x3d5, 0x32);\r
-\r
-    outp(0x3d4, 0x01); // crtc\r
-    outp(0x3d5, 0x27);\r
-\r
-    outp(0x3d4, 0x02); // crtc\r
-    outp(0x3d5, 0x28);\r
-\r
-    outp(0x3d4, 0x03); // crtc\r
-    outp(0x3d5, 0x20);\r
-\r
-    outp(0x3d4, 0x04); // crtc\r
-    outp(0x3d5, 0x2b);\r
-\r
-    outp(0x3d4, 0x05); // crtc\r
-    outp(0x3d5, 0x70);\r
-\r
-    outp(0x3d4, 0x06); // crtc\r
-    outp(0x3d5, 0x0d);\r
-\r
-    outp(0x3d4, 0x07); // crtc\r
-    outp(0x3d5, 0x3e);\r
-\r
-    outp(0x3d4, 0x08); // crtc\r
-    outp(0x3d5, 0x00);\r
-\r
-    outp(0x3d4, 0x09); // crtc\r
-    outp(0x3d5, 0x43);\r
-\r
-    outp(0x3d4, 0x10); // crtc\r
-    outp(0x3d5, 0xea);\r
-\r
-    outp(0x3d4, 0x11); // crtc\r
-    outp(0x3d5, 0xac);\r
-\r
-    outp(0x3d4, 0x12); // crtc\r
-    outp(0x3d5, 0xdf);\r
-\r
-    outp(0x3d4, 0x13); // crtc\r
-    outp(0x3d5, 0x14);\r
-\r
-    outp(0x3d4, 0x14); // crtc\r
-    outp(0x3d5, 0x00);\r
-\r
-    outp(0x3d4, 0x15); // crtc\r
-    outp(0x3d5, 0xe7);\r
-\r
-    outp(0x3d4, 0x16); // crtc\r
-    outp(0x3d5, 0x06);\r
-\r
-    outp(0x3d4, 0x17); // crtc\r
-    outp(0x3d5, 0xe3);\r
-\r
-    outp(0x3c4, 0x01); // seq\r
-    outp(0x3c5, 0x01);\r
-\r
-    outp(0x3c4, 0x03); // seq\r
-    outp(0x3c5, 0x00);\r
-\r
-    outp(0x3c4, 0x04); // seq\r
-    outp(0x3c5, 0x06);\r
-\r
-    outp(0x3ce, 0x05); // gcr\r
-    outp(0x3cf, 0x40);\r
-\r
-    outp(0x3ce, 0x06); // gcr\r
-    outp(0x3cf, 0x05);\r
-\r
-    inp(0x3da);          // acr\r
-    outp(0x3c0, 0x10 | 0x20);\r
-    outp(0x3c0, 0x41);\r
-\r
-    inp(0x3da);          // acr\r
-    outp(0x3c0, 0x11 | 0x20);\r
-    outp(0x3c0, 0x00);\r
-\r
-    inp(0x3da);          // acr\r
-    outp(0x3c0, 0x12 | 0x20);\r
-    outp(0x3c0, 0x0f);\r
-\r
-    inp(0x3da);          // acr\r
-    outp(0x3c0, 0x13 | 0x20);\r
-    outp(0x3c0, 0x00);\r
-\r
-    inp(0x3da);          // acr\r
-    outp(0x3c0, 0x14 | 0x20);\r
-    outp(0x3c0, 0x00);\r
-\r
-    outp(0x3d4, 0x11); // lock crtc\r
-    crtc11 = inp(0x3d5) | 0x80;\r
-    outp(0x3d4, 0x11);\r
-    outp(0x3d5, crtc11);\r
-}*/\r
+/*\r
+voidtg::mode160x120(){\r
+       int crtc11;     outp(CRTC_INDEX, 0x11); // unlock crtc\r
+       crtc11 = inp(CRTC_DATA) & 0x7f;\r
+       outp(CRTC_INDEX, 0x11);\r
+       outp(CRTC_DATA, crtc11);\r
+       width   = 160;\r
+       height  = 120;\r
+       maxx    = 159;\r
+       maxy    = 119;\r
+       pages   = 13;\r
+       lineSize = 40;\r
+       pageSize = 19200;\r
+       modeName = "160x120";\r
+       outp(MISC_OUTPUT, 0xe3);   // mor\r
+\r
+       outp(CRTC_INDEX, 0x00); outp(CRTC_DATA, 0x32);\r
+       outp(CRTC_INDEX, 0x01); outp(CRTC_DATA, 0x27);\r
+       outp(CRTC_INDEX, 0x02); outp(CRTC_DATA, 0x28);\r
+       outp(CRTC_INDEX, 0x03); outp(CRTC_DATA, 0x20);\r
+       outp(CRTC_INDEX, 0x04); outp(CRTC_DATA, 0x2b);\r
+       outp(CRTC_INDEX, 0x05); outp(CRTC_DATA, 0x70);\r
+       outp(CRTC_INDEX, 0x06); outp(CRTC_DATA, 0x0d);\r
+       outp(CRTC_INDEX, 0x07); outp(CRTC_DATA, 0x3e);\r
+       outp(CRTC_INDEX, 0x08); outp(CRTC_DATA, 0x00);\r
+       outp(CRTC_INDEX, 0x09); outp(CRTC_DATA, 0x43);\r
+       outp(CRTC_INDEX, 0x10); outp(CRTC_DATA, 0xea);\r
+       outp(CRTC_INDEX, 0x11); outp(CRTC_DATA, 0xac);\r
+       outp(CRTC_INDEX, 0x12); outp(CRTC_DATA, 0xdf);\r
+       outp(CRTC_INDEX, 0x13); outp(CRTC_DATA, 0x14);\r
+       outp(CRTC_INDEX, 0x14); outp(CRTC_DATA, 0x00);\r
+       outp(CRTC_INDEX, 0x15); outp(CRTC_DATA, 0xe7);\r
+       outp(CRTC_INDEX, 0x16); outp(CRTC_DATA, 0x06);\r
+       outp(CRTC_INDEX, 0x17); outp(CRTC_DATA, 0xe3);\r
+\r
+       outp(0xSC_INDEX, 0x01); // seq\r
+       outp(0xSC_DATA, 0x01);\r
+       outp(0xSC_INDEX, 0x03); // seq\r
+       outp(0xSC_DATA, 0x00);\r
+       outp(0xSC_INDEX, 0x04); // seq\r
+       outp(0xSC_DATA, 0x06);\r
+\r
+       outp(GC_INDEX, 0x05); // gcr\r
+       outp(0x3cf, 0x40);\r
+       outp(GC_INDEX, 0x06); // gcr\r
+       outp(0x3cf, 0x05);\r
+\r
+       inp(0x3da);               // acr\r
+       outp(0x3c0, 0x10 | 0x20);\r
+       outp(0x3c0, 0x41);\r
+       inp(0x3da);               // acr\r
+       outp(0x3c0, 0x11 | 0x20);\r
+       outp(0x3c0, 0x00);\r
+       inp(0x3da);               // acr\r
+       outp(0x3c0, 0x12 | 0x20);\r
+       outp(0x3c0, 0x0f);\r
+       inp(0x3da);               // acr\r
+       outp(0x3c0, 0x13 | 0x20);\r
+       outp(0x3c0, 0x00);\r
+       inp(0x3da);               // acr\r
+       outp(0x3c0, 0x14 | 0x20);\r
+       outp(0x3c0, 0x00);\r
+\r
+       outp(CRTC_INDEX, 0x11); // lock crtc\r
+       crtc11 = inp(CRTC_DATA) | 0x80;\r
+       outp(CRTC_INDEX, 0x11);\r
+       outp(CRTC_DATA, crtc11);\r
+}\r
+*/\r