From: sparky4 Date: Thu, 22 Oct 2015 21:19:07 +0000 (-0500) Subject: addedexperimental 2nd res header for testings! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=53485e89fa74280d146128398fae955cdd980593;p=16.git addedexperimental 2nd res header for testings! --- diff --git a/16.exe b/16.exe index ddd85e0d..ea7ada36 100755 Binary files a/16.exe and b/16.exe differ diff --git a/16.map b/16.map index a985242e..e9cbe00d 100755 --- a/16.map +++ b/16.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: 16.exe creating a DOS executable @@ -664,4 +664,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00022c20 (142368.) Entry point address: 08ed:0072 -Link time: 00:00.43 +Link time: 00:00.34 diff --git a/16/tweak16/16.24 b/16/tweak16/16.24 index f6ff0100..d71b7125 100755 Binary files a/16/tweak16/16.24 and b/16/tweak16/16.24 differ diff --git a/bakapi.exe b/bakapi.exe index 802bdddd..1479767e 100755 Binary files a/bakapi.exe and b/bakapi.exe differ diff --git a/bakapi.map b/bakapi.map index 400ea6f9..f7cbb0dd 100755 --- a/bakapi.map +++ b/bakapi.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: bakapi.exe creating a DOS executable @@ -676,4 +676,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00023520 (144672.) Entry point address: 07d7:022c -Link time: 00:00.43 +Link time: 00:00.04 diff --git a/exmmtest.exe b/exmmtest.exe index 0d5dd3f6..8e0b6827 100755 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/exmmtest.map b/exmmtest.map index ec483c08..05bb4019 100755 --- a/exmmtest.map +++ b/exmmtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: exmmtest.exe creating a DOS executable @@ -577,4 +577,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) Stack size: dac0 (56000.) Memory size: 0001d620 (120352.) Entry point address: 0000:8094 -Link time: 00:00.19 +Link time: 00:00.11 diff --git a/fmemtest.map b/fmemtest.map index 01a24f0a..c336e7aa 100755 --- a/fmemtest.map +++ b/fmemtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: fmemtest.exe creating a DOS executable @@ -576,4 +576,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) Stack size: dac0 (56000.) Memory size: 0001d3e0 (119776.) Entry point address: 0000:7e06 -Link time: 00:00.27 +Link time: 00:00.02 diff --git a/fontgfx.exe b/fontgfx.exe index c3712ad8..054c0f09 100755 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fontgfx.map b/fontgfx.map index 2e884ce8..85d09ac2 100755 --- a/fontgfx.map +++ b/fontgfx.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: fontgfx.exe creating a DOS executable @@ -638,4 +638,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00021030 (135216.) Entry point address: 0000:7cf8 -Link time: 00:00.16 +Link time: 00:00.67 diff --git a/fonttest.map b/fonttest.map index 2db56c47..a64780ee 100755 --- a/fonttest.map +++ b/fonttest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: fonttest.exe creating a DOS executable @@ -588,4 +588,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001d960 (121184.) Entry point address: 0000:7d82 -Link time: 00:00.59 +Link time: 00:00.69 diff --git a/inputest.map b/inputest.map index 176bf1f0..85d76ef0 100755 --- a/inputest.map +++ b/inputest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: inputest.exe creating a DOS executable @@ -572,4 +572,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) Stack size: dac0 (56000.) Memory size: 0001d1c0 (119232.) Entry point address: 0000:7ae2 -Link time: 00:00.31 +Link time: 00:00.25 diff --git a/maptest.exe b/maptest.exe index dea9c5fe..7c49d435 100755 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/maptest.map b/maptest.map index 202ef73f..0bc3b5de 100755 --- a/maptest.map +++ b/maptest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: maptest.exe creating a DOS executable @@ -658,4 +658,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 000229b0 (141744.) Entry point address: 08e3:0072 -Link time: 00:00.88 +Link time: 00:00.51 diff --git a/palettec.exe b/palettec.exe index 6a194d79..fec3b421 100755 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/palettec.map b/palettec.map index 78f9f2d0..ba57b737 100755 --- a/palettec.map +++ b/palettec.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: palettec.exe creating a DOS executable @@ -636,4 +636,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00020ab0 (133808.) Entry point address: 0000:7cd6 -Link time: 00:00.41 +Link time: 00:00.13 diff --git a/palettel.exe b/palettel.exe index 7c12e5d8..721b488e 100755 Binary files a/palettel.exe and b/palettel.exe differ diff --git a/palettel.map b/palettel.map index 2d22c0f1..c2448211 100755 --- a/palettel.map +++ b/palettel.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: palettel.exe creating a DOS executable @@ -641,4 +641,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00020b60 (133984.) Entry point address: 0000:7d80 -Link time: 00:00.06 +Link time: 00:00.22 diff --git a/pcxtest.exe b/pcxtest.exe index 846dbaba..2e0573cc 100755 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/pcxtest.map b/pcxtest.map index 876c05f7..e3f9e4ab 100755 --- a/pcxtest.map +++ b/pcxtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: pcxtest.exe creating a DOS executable @@ -507,4 +507,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a5a0 (107936.) Entry point address: 0000:03d6 -Link time: 00:00.11 +Link time: 00:00.80 diff --git a/pcxtest2.exe b/pcxtest2.exe index b315de52..08453b08 100755 Binary files a/pcxtest2.exe and b/pcxtest2.exe differ diff --git a/pcxtest2.map b/pcxtest2.map index 3e4cd8a2..29d4f2de 100755 --- a/pcxtest2.map +++ b/pcxtest2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: pcxtest2.exe creating a DOS executable @@ -507,4 +507,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a5e0 (108000.) Entry point address: 0000:0416 -Link time: 00:00.75 +Link time: 00:00.86 diff --git a/scroll.exe b/scroll.exe index a015efc4..8323ccd4 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index f0a26074..e6cf3481 100755 --- a/scroll.map +++ b/scroll.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: scroll.exe creating a DOS executable @@ -740,4 +740,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00029d80 (171392.) Entry point address: 09cc:037c -Link time: 00:00.01 +Link time: 00:00.98 diff --git a/src/lib/modex16.h b/src/lib/modex16.h index 22abf730..fbcc3982 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -33,8 +33,8 @@ #include "src/lib/16text.h" #include "src/lib/modex16/320x240.h" #include "src/lib/modex16/320x200.h" -#include "src/lib/modex16/192x144.h" #include "src/lib/modex16/256x192.h" +#include "src/lib/modex16/192x144_.h" //320x240 = 20x15 //192x144 = 12x9 diff --git a/src/lib/modex16/192x144.h b/src/lib/modex16/192x144.h index 0c06722c..a6f645e6 100755 --- a/src/lib/modex16/192x144.h +++ b/src/lib/modex16/192x144.h @@ -72,7 +72,7 @@ static const word ModeX_192x144regs[] = { 0xe715, /* v blank start */ 0x0616, /* v blank end */ 0xe317 /* turn on byte mode */ -}; +};//50 => 30 #endif /*_SMALLMODEXRES_H_*/ /* diff --git a/src/lib/modex16/192x144_.h b/src/lib/modex16/192x144_.h new file mode 100755 index 00000000..f5dbc18a --- /dev/null +++ b/src/lib/modex16/192x144_.h @@ -0,0 +1,108 @@ + +/* Project 16 Source Code~ + * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef _SMALLMODEXRESS_H_ +#define _SMALLMODEXRESS_H_ + +#include "src/lib/types.h" + +/*static const word ModeX_320x240regs[75] = +{ + 0x3c2, 0x00, 0xe3, + 0x3d4, 0x00, 0x5f, + 0x3d4, 0x01, 0x4f, + 0x3d4, 0x02, 0x50, + 0x3d4, 0x03, 0x82, + 0x3d4, 0x04, 0x54, + 0x3d4, 0x05, 0x80, + 0x3d4, 0x06, 0x0d, + 0x3d4, 0x07, 0x3e, + 0x3d4, 0x08, 0x00, + 0x3d4, 0x09, 0x41, + 0x3d4, 0x10, 0xea, + 0x3d4, 0x11, 0xac, + 0x3d4, 0x12, 0xdf, + 0x3d4, 0x13, 0x28, + 0x3d4, 0x14, 0x00, + 0x3d4, 0x15, 0xe7, + 0x3d4, 0x16, 0x06, + 0x3d4, 0x17, 0xe3, + 0x3c4, 0x01, 0x01, + 0x3c4, 0x04, 0x06, + 0x3ce, 0x05, 0x40, + 0x3ce, 0x06, 0x05, + 0x3c0, 0x10, 0x41, + 0x3c0, 0x13, 0x00 +};*/ + +static const word ModeX_192x144regs[] = { + 0x3f00, /* Horizontal total */ + 0x2f01, /* horizontal display enable end */ + 0x3002, /* Start horizontal blanking */ + 0x5003, /* End horizontal blanking */ + 0x3404, /* Start horizontal retrace */ + 0x4805, /* End horizontal retrace */ + 0x0d06, /* vertical total */ + 0x3e07, /* overflow (bit 8 of vertical counts) */ + 0x4109, /* cell height (2 to double-scan */ + 0xea10, /* v sync start */ + 0xac11, /* v sync end and protect cr0-cr7 */ + 0x1f12, /* vertical displayed */ + 0x1813, /* offset/logical width */ + 0x0014, /* turn off dword mode */ + 0xe715, /* v blank start */ + 0x0616, /* v blank end */ + 0xe317 /* turn on byte mode */ +};//50 => 30 + +#endif /*_SMALLMODEXRESS_H_*/ +/*#include "TwkUser.h" // get Register definition +Register 192x144_[] = + { + { 0x3c2, 0x0, 0xe3}, + { 0x3d4, 0x0, 0x3f}, + { 0x3d4, 0x1, 0x2f}, + { 0x3d4, 0x2, 0x30}, + { 0x3d4, 0x3, 0x4a}, + { 0x3d4, 0x4, 0x34}, + { 0x3d4, 0x5, 0x48}, + { 0x3d4, 0x6, 0xd}, + { 0x3d4, 0x7, 0x3e}, + { 0x3d4, 0x8, 0x0}, + { 0x3d4, 0x9, 0x41}, + { 0x3d4, 0x10, 0xea}, + { 0x3d4, 0x11, 0xac}, + { 0x3d4, 0x12, 0x1f}, + { 0x3d4, 0x13, 0x18}, + { 0x3d4, 0x14, 0x0}, + { 0x3d4, 0x15, 0xe7}, + { 0x3d4, 0x16, 0x6}, + { 0x3d4, 0x17, 0xe3}, + { 0x3c4, 0x1, 0x1}, + { 0x3c4, 0x4, 0x6}, + { 0x3ce, 0x5, 0x40}, + { 0x3ce, 0x6, 0x5}, + { 0x3c0, 0x10, 0x41}, + { 0x3c0, 0x11, 0xe}, + { 0x3c0, 0x13, 0x0} + };*/ diff --git a/test.exe b/test.exe index a597b10d..7f60edae 100755 Binary files a/test.exe and b/test.exe differ diff --git a/test.map b/test.map index be8f8c29..2fdf8656 100755 --- a/test.map +++ b/test.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: test.exe creating a DOS executable @@ -475,4 +475,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00019fe0 (106464.) Entry point address: 0000:2892 -Link time: 00:00.78 +Link time: 00:00.19 diff --git a/test2.exe b/test2.exe index 94312bf8..12a323fc 100755 Binary files a/test2.exe and b/test2.exe differ diff --git a/test2.map b/test2.map index e1e78aad..2b997a89 100755 --- a/test2.map +++ b/test2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:24 +Created on: 15/10/22 16:17:36 Executable Image: test2.exe creating a DOS executable @@ -422,4 +422,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 000177e0 (96224.) Entry point address: 0000:0260 -Link time: 00:00.09 +Link time: 00:00.78 diff --git a/vgmtest.map b/vgmtest.map index c1ad9f27..6868f1ec 100755 --- a/vgmtest.map +++ b/vgmtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/22 15:05:25 +Created on: 15/10/22 16:17:36 Executable Image: vgmtest.exe creating a DOS executable @@ -606,4 +606,4 @@ vgmsnd.lib Stack size: dac0 (56000.) Memory size: 0001f460 (128096.) Entry point address: 0000:7d06 -Link time: 00:00.38 +Link time: 00:00.59