80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2021-03-20 04:45:52 +01:00
parent 0c9cc06238 0c98ad9146
commit 74007c684c
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -34,18 +34,15 @@ Automatic builds
For your convenience, we compile a number of 86Box builds per revision on our For your convenience, we compile a number of 86Box builds per revision on our
Jenkins instance. Jenkins instance.
| Regular | Debug | Optimized | Experimental | | 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-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) |[![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 ### Legend
* **Regular** builds are compiled using the settings in the building guide * **Regular** builds are compiled using the settings in the building guide
above. Use these if you don't know which build to use. above. Use these if you don't know which build to use.
* **Debug** builds are same as regular builds but include debug symbols. * **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. 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 * **Experimental (Dev)** builds are similar to regular builds but are compiled
with certain unfinished features enabled. These builds are not optimized for maximum performance. with certain unfinished features enabled. These builds are not optimized for maximum performance.

22
src/video/vid_ddc.c
View File

@@ -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 */ 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[1].established_timings3.timings[5] &= 0xf0; /* reserved bits */
edid->descriptors[2].tag = 0xfc; /* display name */ edid->descriptors[2].tag = 0xfd; /* range limits */
memcpy(&edid->descriptors[2].ascii, "86Box Monitor", 13); /* exactly 13 characters (would otherwise require LF termination and space padding) */ 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].tag = 0xfc; /* display name */
edid->descriptors[3].range_limits.min_v_field = 1; memcpy(&edid->descriptors[3].ascii, "86Box Monitor", 13); /* exactly 13 characters (would otherwise require LF termination and space padding) */
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->extensions = 1; edid->extensions = 1;
for (uint8_t c = 0; c < 127; c++) for (uint8_t c = 0; c < 127; c++)

2
src/video/vid_voodoo_banshee.c
View File

@@ -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) 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) static void *creative_banshee_init(const device_t *info)
{ {