From c9af458ddcd883d6ae5b0605271f339d92361140 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 18 Mar 2021 00:34:33 -0300 Subject: [PATCH 1/3] Make EDID frequency limits sane, fixes Voodoo 3 DDC on Windows 98 --- src/video/vid_ddc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/video/vid_ddc.c b/src/video/vid_ddc.c index 725578da2..d7daefb2e 100644 --- a/src/video/vid_ddc.c +++ b/src/video/vid_ddc.c @@ -181,18 +181,18 @@ ddc_init(void *i2c) memset(&edid->descriptors[1].established_timings3.timings, 0xff, sizeof(edid->descriptors[1].established_timings3.timings)); /* all enabled */ edid->descriptors[1].established_timings3.timings[5] &= 0xf0; /* reserved bits */ - edid->descriptors[2].tag = 0xfc; /* display name */ - memcpy(&edid->descriptors[2].ascii, "86Box Monitor", 13); /* exactly 13 characters (would otherwise require LF termination and space padding) */ + edid->descriptors[2].tag = 0xfd; /* range limits */ + edid->descriptors[2].range_limits.min_v_field = 45; + edid->descriptors[2].range_limits.max_v_field = 125; + edid->descriptors[2].range_limits.min_h_line = 30; /* 640x480 = ~31.5 KHz */ + edid->descriptors[2].range_limits.max_h_line = 115; /* 1920x1440 = 112.5 KHz */ + edid->descriptors[2].range_limits.max_pixel_clock = 30; /* 1920x1440 = 297 MHz */ + edid->descriptors[2].range_limits.timing_type = 0x00; /* default GTF */ + edid->descriptors[2].range_limits.padding[0] = 0x0a; + memset(&edid->descriptors[2].range_limits.padding[1], 0x20, sizeof(edid->descriptors[2].range_limits.padding) - 1); - edid->descriptors[3].tag = 0xfd; /* range limits */ - edid->descriptors[3].range_limits.min_v_field = 1; - edid->descriptors[3].range_limits.max_v_field = -1; - edid->descriptors[3].range_limits.min_h_line = 1; - edid->descriptors[3].range_limits.max_h_line = -1; - edid->descriptors[3].range_limits.max_pixel_clock = -1; - edid->descriptors[3].range_limits.timing_type = 0x00; /* default GTF */ - edid->descriptors[3].range_limits.padding[0] = 0x0a; - memset(&edid->descriptors[3].range_limits.padding[1], 0x20, sizeof(edid->descriptors[3].range_limits.padding) - 1); + edid->descriptors[3].tag = 0xfc; /* display name */ + memcpy(&edid->descriptors[3].ascii, "86Box Monitor", 13); /* exactly 13 characters (would otherwise require LF termination and space padding) */ edid->extensions = 1; for (uint8_t c = 0; c < 127; c++) From 4ff9ab5b15f00d8987e7db75ee6735e673988983 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 18 Mar 2021 19:51:00 -0300 Subject: [PATCH 2/3] Fix PCI Voodoo Banshee --- src/video/vid_voodoo_banshee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index 3d01378e7..bb6b9ee71 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -2836,7 +2836,7 @@ static void *banshee_init_common(const device_t *info, wchar_t *fn, int has_sgra static void *banshee_init(const device_t *info) { - return banshee_init_common(info, L"roms/video/voodoo/Pci_sg.rom", 1, TYPE_BANSHEE, VOODOO_BANSHEE, 1); + return banshee_init_common(info, L"roms/video/voodoo/Pci_sg.rom", 1, TYPE_BANSHEE, VOODOO_BANSHEE, 0); } static void *creative_banshee_init(const device_t *info) { From 0c98ad9146b2eed61451a8276817ea533666a342 Mon Sep 17 00:00:00 2001 From: Daniel Gurney Date: Fri, 19 Mar 2021 20:39:20 +0200 Subject: [PATCH 3/3] Remove optimized builds from README --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 12d9c48f9..233b863bd 100644 --- a/README.md +++ b/README.md @@ -34,18 +34,15 @@ Automatic builds For your convenience, we compile a number of 86Box builds per revision on our Jenkins instance. -| Regular | Debug | Optimized | Experimental | -|:-------:|:-----:|:---------:|:------------:| -|[![Build Status](http://ci.86box.net/job/86Box/badge/icon)](http://ci.86box.net/job/86Box)|[![Build Status](http://ci.86box.net/job/86Box-Debug/badge/icon)](http://ci.86box.net/job/86Box-Debug)|[![Build Status](http://ci.86box.net/job/86Box-Optimized/badge/icon)](http://ci.86box.net/job/86Box-Optimized)|[![Build Status](http://ci.86box.net/job/86Box-Dev/badge/icon)](http://ci.86box.net/job/86Box-Dev) +| Regular | Debug | Experimental | +|:-------:|:-----:|:------------:| +|[![Build Status](http://ci.86box.net/job/86Box/badge/icon)](http://ci.86box.net/job/86Box)|[![Build Status](http://ci.86box.net/job/86Box-Debug/badge/icon)](http://ci.86box.net/job/86Box-Debug)|[![Build Status](http://ci.86box.net/job/86Box-Dev/badge/icon)](http://ci.86box.net/job/86Box-Dev) ### Legend * **Regular** builds are compiled using the settings in the building guide above. Use these if you don't know which build to use. * **Debug** builds are same as regular builds but include debug symbols. If you don't need them, you don't need to use this build. -* **Optimized** builds have the same feature set as regular builds, but are - optimized for every modern Intel and AMD processor architecture, which might - improve the emulator's performance in certain scenarios. * **Experimental (Dev)** builds are similar to regular builds but are compiled with certain unfinished features enabled. These builds are not optimized for maximum performance.