Skip to content
Snippets Groups Projects
Commit 9494cc30 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Calculate and plug in pixel aspect ratios. 

We're leaving the "Awesome Modes" as 1:1, but the rest all assume
a 4:3 display that is filled by the described text.
parent f688ecce
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #2225 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 31 deletions
src/conio/vidmodes.c
+ 31
− 31
View file @ 9494cc30
...@@ -21,23 +21,23 @@ struct video_params vparams[] = { ...@@ -21,23 +21,23 @@ struct video_params vparams[] = {
/* MONO */ /* MONO */
{MONO, 0, 80, 25, 14, 15, 16, 8, 1, 7, 0, 833, 1000, 640, 400}, {MONO, 0, 80, 25, 14, 15, 16, 8, 1, 7, 0, 833, 1000, 640, 400},
/* CO 40x14 */ /* CO 40x14 */
{C40X14, COLOUR_PALETTE, 40, 14, 14, 15, 16, 8, 1, 7, 0, 1, 1, 320, 224}, {C40X14, COLOUR_PALETTE, 40, 14, 14, 15, 16, 8, 1, 7, 0, 933, 1000, 320, 224},
/* CO 40x21 */ /* CO 40x21 */
{C40X21, COLOUR_PALETTE, 40, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 320, 336}, {C40X21, COLOUR_PALETTE, 40, 21, 14, 15, 16, 8, 1, 7, 0,1400, 1000, 320, 336},
/* CO 40x28 */ /* CO 40x28 */
{C40X28, COLOUR_PALETTE, 40, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 320, 392}, {C40X28, COLOUR_PALETTE, 40, 28, 12, 13, 14, 8, 1, 7, 0,1633, 1000, 320, 392},
/* CO 40x43 */ /* CO 40x43 */
{C40X43, COLOUR_PALETTE, 40, 43, 7, 7, 8, 8, 1, 7, 0, 1, 1, 320, 774}, {C40X43, COLOUR_PALETTE, 40, 43, 7, 7, 8, 8, 1, 7, 0,3225, 1000, 320, 774},
/* CO 40x50 */ /* CO 40x50 */
{C40X50, COLOUR_PALETTE, 40, 50, 7, 7, 8, 8, 1, 7, 0, 1, 1, 320, 400}, {C40X50, COLOUR_PALETTE, 40, 50, 7, 7, 8, 8, 1, 7, 0,1666, 1000, 320, 400},
/* CO 40x60 */ /* CO 40x60 */
{C40X60, COLOUR_PALETTE, 40, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 320, 480}, {C40X60, COLOUR_PALETTE, 40, 60, 7, 7, 8, 8, 1, 7, 0, 2, 1, 320, 480},
/* CO 80x14 */ /* CO 80x14 */
{C80X14, COLOUR_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 224}, {C80X14, COLOUR_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 466, 1000, 640, 224},
/* CO 80x21 */ /* CO 80x21 */
{C80X21, COLOUR_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 336}, {C80X21, COLOUR_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 698, 1000, 640, 336},
/* CO 80x28 */ /* CO 80x28 */
{C80X28, COLOUR_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 640, 392}, {C80X28, COLOUR_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 817, 1000, 640, 392},
/* CO 80x30 */ /* CO 80x30 */
{C80X30, COLOUR_PALETTE, 80, 30, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 480}, {C80X30, COLOUR_PALETTE, 80, 30, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 480},
/* CO 80x43 */ /* CO 80x43 */
...@@ -49,23 +49,23 @@ struct video_params vparams[] = { ...@@ -49,23 +49,23 @@ struct video_params vparams[] = {
/* CO 80x60 */ /* CO 80x60 */
{C80X60, COLOUR_PALETTE, 80, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 640, 480}, {C80X60, COLOUR_PALETTE, 80, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 640, 480},
/* B 40x14 */ /* B 40x14 */
{BW40X14, GREYSCALE_PALETTE, 40, 14, 14, 15, 16, 8, 1, 7, 0, 1, 1, 320, 224}, {BW40X14, GREYSCALE_PALETTE, 40, 14, 14, 15, 16, 8, 1, 7, 0, 933, 1000, 320, 224},
/* BW 40x21 */ /* BW 40x21 */
{BW40X21, GREYSCALE_PALETTE, 40, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 320, 336}, {BW40X21, GREYSCALE_PALETTE, 40, 21, 14, 15, 16, 8, 1, 7, 0, 14, 10, 320, 336},
/* BW 40x28 */ /* BW 40x28 */
{BW40X28, GREYSCALE_PALETTE, 40, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 320, 392}, {BW40X28, GREYSCALE_PALETTE, 40, 28, 12, 13, 14, 8, 1, 7, 0,1633, 1000, 320, 392},
/* BW 40x43 */ /* BW 40x43 */
{BW40X43, GREYSCALE_PALETTE, 40, 43, 7, 7, 14, 8, 1, 7, 0, 1, 1, 320, 350}, {BW40X43, GREYSCALE_PALETTE, 40, 43, 7, 7, 14, 8, 1, 7, 0,1458, 1000, 320, 350},
/* BW 40x50 */ /* BW 40x50 */
{BW40X50, GREYSCALE_PALETTE, 40, 50, 7, 7, 8, 8, 1, 7, 0, 1, 1, 320, 400}, {BW40X50, GREYSCALE_PALETTE, 40, 50, 7, 7, 8, 8, 1, 7, 0,1667, 1000, 320, 400},
/* BW 40x60 */ /* BW 40x60 */
{BW40X60, GREYSCALE_PALETTE, 40, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 320, 480}, {BW40X60, GREYSCALE_PALETTE, 40, 60, 7, 7, 8, 8, 1, 7, 0, 2, 1, 320, 480},
/* BW 80x14 */ /* BW 80x14 */
{BW80X14, GREYSCALE_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 224}, {BW80X14, GREYSCALE_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 467, 1000, 640, 224},
/* BW 80x21 */ /* BW 80x21 */
{BW80X21, GREYSCALE_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 336}, {BW80X21, GREYSCALE_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 7, 10, 640, 336},
/* BW 80x28 */ /* BW 80x28 */
{BW80X28, GREYSCALE_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 640, 392}, {BW80X28, GREYSCALE_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 817, 1000, 640, 392},
/* BW 80x43 */ /* BW 80x43 */
{BW80X43, GREYSCALE_PALETTE, 80, 43, 7, 7, 14, 8, 1, 7, 0, 729, 1000, 640, 350}, {BW80X43, GREYSCALE_PALETTE, 80, 43, 7, 7, 14, 8, 1, 7, 0, 729, 1000, 640, 350},
/* BW 80x50 */ /* BW 80x50 */
...@@ -73,13 +73,13 @@ struct video_params vparams[] = { ...@@ -73,13 +73,13 @@ struct video_params vparams[] = {
/* BW 80x60 */ /* BW 80x60 */
{BW80X60, GREYSCALE_PALETTE, 80, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 640, 480}, {BW80X60, GREYSCALE_PALETTE, 80, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 640, 480},
/* MONO 80x14 */ /* MONO 80x14 */
{MONO14, MONO_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 224}, {MONO14, MONO_PALETTE, 80, 14, 14, 15, 16, 8, 1, 7, 0, 467, 1000, 640, 224},
/* MONO 80x21 */ /* MONO 80x21 */
{MONO21, MONO_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 640, 336}, {MONO21, MONO_PALETTE, 80, 21, 14, 15, 16, 8, 1, 7, 0, 7, 10, 640, 336},
/* MONO 80x28 */ /* MONO 80x28 */
{MONO28, MONO_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 640, 392}, {MONO28, MONO_PALETTE, 80, 28, 12, 13, 14, 8, 1, 7, 0, 817, 1000, 640, 392},
/* MONO 80x43 */ /* MONO 80x43 */
{MONO43, MONO_PALETTE, 80, 43, 7, 7, 14, 8, 1, 7, 0, 1, 1, 640, 350}, {MONO43, MONO_PALETTE, 80, 43, 7, 7, 14, 8, 1, 7, 0, 729, 1000, 640, 350},
/* MONO 80x50 */ /* MONO 80x50 */
{MONO50, MONO_PALETTE, 80, 50, 7, 7, 8, 8, 1, 7, 0, 833, 1000, 640, 400}, {MONO50, MONO_PALETTE, 80, 50, 7, 7, 8, 8, 1, 7, 0, 833, 1000, 640, 400},
/* MONO 80x60 */ /* MONO 80x60 */
...@@ -93,25 +93,25 @@ struct video_params vparams[] = { ...@@ -93,25 +93,25 @@ struct video_params vparams[] = {
/* Commodore 128 80x25 mode */ /* Commodore 128 80x25 mode */
{C128_80X25, COLOUR_PALETTE, 80, 25, 0, 7, 8, 8, 2, 7, CIOLIB_VIDEO_BGBRIGHT|CIOLIB_VIDEO_NOBLINK, 240, 312, 640, 200}, {C128_80X25, COLOUR_PALETTE, 80, 25, 0, 7, 8, 8, 2, 7, CIOLIB_VIDEO_BGBRIGHT|CIOLIB_VIDEO_NOBLINK, 240, 312, 640, 200},
/* Atari 800 40x24 mode */ /* Atari 800 40x24 mode */
{ATARI_40X24, ATARI_PALETTE, 40, 24, 0, 7, 8, 8, 1, 7, 0, 1, 1, 320, 192}, {ATARI_40X24, ATARI_PALETTE, 40, 24, 0, 7, 8, 8, 1, 7, 0, 4, 10, 320, 192},
/* Atari 800 XEP80 80x25 mode */ /* Atari 800 XEP80 80x25 mode */
{ATARI_80X25, GREYSCALE_PALETTE, 80, 25, 0, 15, 16, 8, 1, 7, 0, 833, 1000, 640, 400}, {ATARI_80X25, GREYSCALE_PALETTE, 80, 25, 0, 15, 16, 8, 1, 7, 0, 833, 1000, 640, 400},
/* VESA 21x132 mode */ /* VESA 21x132 mode */
{VESA_132X21, COLOUR_PALETTE, 132, 21, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 336}, {VESA_132X21, COLOUR_PALETTE, 132, 21, 14, 15, 16, 8, 1, 7, 0, 424, 1000, 1056, 336},
/* VESA 25x132 mode */ /* VESA 25x132 mode */
{VESA_132X25, COLOUR_PALETTE, 132, 25, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 400}, {VESA_132X25, COLOUR_PALETTE, 132, 25, 14, 15, 16, 8, 1, 7, 0, 505, 1000, 1056, 400},
/* VESA 28x132 mode */ /* VESA 28x132 mode */
{VESA_132X28, COLOUR_PALETTE, 132, 28, 12, 13, 14, 8, 1, 7, 0, 1, 1, 1056, 392}, {VESA_132X28, COLOUR_PALETTE, 132, 28, 12, 13, 14, 8, 1, 7, 0, 495, 1000, 1056, 392},
/* VESA 30x132 mode */ /* VESA 30x132 mode */
{VESA_132X30, COLOUR_PALETTE, 132, 30, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 480}, {VESA_132X30, COLOUR_PALETTE, 132, 30, 14, 15, 16, 8, 1, 7, 0, 606, 1000, 1056, 480},
/* VESA 34x132 mode */ /* VESA 34x132 mode */
{VESA_132X34, COLOUR_PALETTE, 132, 34, 12, 13, 14, 8, 1, 7, 0, 1, 1, 1056, 476}, {VESA_132X34, COLOUR_PALETTE, 132, 34, 12, 13, 14, 8, 1, 7, 0, 601, 1000, 1056, 476},
/* VESA 43x132 mode */ /* VESA 43x132 mode */
{VESA_132X43, COLOUR_PALETTE, 132, 43, 7, 7, 14, 8, 1, 7, 0, 1, 1, 1056, 350}, {VESA_132X43, COLOUR_PALETTE, 132, 43, 7, 7, 14, 8, 1, 7, 0, 442, 1000, 1056, 350},
/* VESA 50x132 mode */ /* VESA 50x132 mode */
{VESA_132X50, COLOUR_PALETTE, 132, 50, 7, 7, 8, 8, 1, 7, 0, 1, 1, 1056, 400}, {VESA_132X50, COLOUR_PALETTE, 132, 50, 7, 7, 8, 8, 1, 7, 0, 505, 1000, 1056, 400},
/* VESA 60x132 mode */ /* VESA 60x132 mode */
{VESA_132X60, COLOUR_PALETTE, 132, 60, 7, 7, 8, 8, 1, 7, 0, 1, 1, 1056, 480}, {VESA_132X60, COLOUR_PALETTE, 132, 60, 7, 7, 8, 8, 1, 7, 0, 606, 1000, 1056, 480},
/* Awesome modes */ /* Awesome modes */
{ST132X37_16_9, COLOUR_PALETTE, 132, 37, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 600}, {ST132X37_16_9, COLOUR_PALETTE, 132, 37, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 600},
{ST132X52_5_4, COLOUR_PALETTE, 132, 52, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 823}, {ST132X52_5_4, COLOUR_PALETTE, 132, 52, 14, 15, 16, 8, 1, 7, 0, 1, 1, 1056, 823},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment