OBattler
f1ca1a2b68
Merge branch 'master' of https://github.com/86Box/86Box
2023-12-20 20:50:00 +01:00
OBattler
04103ee9b1
Made the RTL8139 use the same 93x6 EEPROM implementation as the DEC Tulip's, also cleaned up the I/O and memory access handlers a bit.
2023-12-20 20:49:51 +01:00
Miran Grča
2ccc46d28a
Merge pull request #3915 from lemondrops/qt_icons
...
Qt: Application icon fixes
2023-12-20 18:56:20 +01:00
Alexander Babikov
fdae410884
qt: Set the .desktop file name on *nix
...
May fix generic icon instead of 86Box's icon showing up on Wayland
2023-12-20 20:18:51 +05:00
Alexander Babikov
aabbad31d8
qt: Set the window icon per-application, instead of per-window
2023-12-20 20:18:50 +05:00
Miran Grča
69d38811a6
Merge pull request #3914 from Cacodemon345/mga-busmastering-fixes
...
MGA: More Mystique busmastering fixes
2023-12-20 11:25:18 +01:00
Cacodemon345
7a8fe414c5
MGA: 3D busmastering now works (albeit slowly)
2023-12-20 16:24:04 +06:00
Cacodemon345
bf30678d5f
MGA: More Mystique busmastering fixes
...
* Use mutex locking when reporting SOFTRAPEN
* IEN register now correctly returns values it currently holds
* Restore VLINEPEN interrupt
2023-12-20 13:48:45 +06:00
Miran Grča
0fed169ecf
Merge pull request #3912 from Cacodemon345/mga-busmastering-fixes
...
Mystique: SOFTRAP register writes correctly reset the primary DMA channel
2023-12-19 20:49:25 +01:00
Cacodemon345
1773ebfbf3
Mystique: SOFTRAP register writes correctly reset the primary DMA channel
2023-12-20 01:38:14 +06:00
OBattler
1201b52890
Fixed the RTL8139 MAC address.
2023-12-19 20:09:00 +01:00
OBattler
c64748ca6c
Slight RTL8139 mapping fixes, now Windows 2000 pings correctly, but still all 00's MAC address.
2023-12-19 20:02:07 +01:00
OBattler
7495c2537b
Fixed a warning in video/vid_ati18800.c.
2023-12-19 19:32:23 +01:00
Miran Grča
6e2d7f531e
Merge pull request #3911 from 86Box/tc1995
...
ATI EGA Wonder 800+ fixes.
2023-12-19 19:29:29 +01:00
TC1995
d38ad2eb23
ATI EGA Wonder 800+ fixes.
...
1. Reverted the migration from ATI 18800 as the EGA code had the proper palette.
2. Add support for the 800x600 resolution required by said card.
2023-12-19 19:03:54 +01:00
Miran Grča
3f498ea8e0
Merge pull request #3910 from 86Box/tc1995
...
More MGA fixes.
2023-12-19 18:51:46 +01:00
Miran Grča
06df42cacd
Merge pull request #3909 from Cacodemon345/mga-busmastering-fixes
...
Matrox Mystique: Attempt fixing 3D busmastered drawing
2023-12-19 18:51:33 +01:00
Miran Grča
71d6a7ff23
Merge pull request #3906 from iamgreaser/gm/t64v2-revision-id
...
Report correct S3 Trio64V2/DX revision ID
2023-12-19 18:51:17 +01:00
TC1995
1e71efc5bb
More MGA fixes.
...
Re-introduced the mystique read/write linear functions but with a check (!svga->fast) in the byte ones to make sure the generic svga linear functions are enabled when needed, this should keep compatibility stable while also fixing the amount of memory of NT 4.0's MGA Millennium drivers.
2023-12-19 18:48:49 +01:00
Cacodemon345
8226a5e39c
Matrox Mystique: Attempt fixing 3D busmastered drawing
...
NT 4.0's OpenGL screensavers only display one frame before freezing the system
2023-12-19 16:27:05 +06:00
Miran Grča
3a0e75d6d7
Merge pull request #3908 from Cacodemon345/mga-busmastering-fixes
...
Matrox Mystique: Make it work under Windows NT 4.0 for real
2023-12-19 09:17:29 +01:00
Cacodemon345
3a5bbe9ad3
vid_mga: Busmastering works properly now
2023-12-19 13:46:27 +06:00
Cacodemon345
1f91c0e2ec
More work on busmastering
...
NT 4.0 freezes as of now. No idea, although the data aren't filled with total nonsense anymore
2023-12-19 12:59:18 +06:00
Cacodemon345
3ba6e337c5
Revert "MGA: Count for cases where DMA header data is not immediately available"
...
This reverts commit efe9784aad
.
2023-12-19 12:02:58 +06:00
Cacodemon345
efe9784aad
MGA: Count for cases where DMA header data is not immediately available
...
Fixes crashes on NT 4.0
2023-12-19 11:42:01 +06:00
GreaseMonkey
0bd67a1bc4
Report correct S3 Trio64V2/DX revision ID
...
Doesn't seem to affect much, but we might as well fix it.
2023-12-19 13:11:01 +13:00
Miran Grča
7f77fd4666
Merge pull request #3905 from 86Box/tc1995
...
ATI EGA Wonder 800+ and 18800 refactoring:
2023-12-19 00:04:23 +01:00
TC1995
6eb05e14d5
ATI EGA Wonder 800+ and 18800 refactoring:
...
1. Proper cleanup of the code.
2. Migrate the card in question to the VGA class list as it's actually a rebadged VGA Edge (thus 18800).
3. Some VGA only features are not supported on this card and are documented in the recalctimings.
2023-12-18 23:43:37 +01:00
Miran Grča
c63734678c
Merge pull request #3904 from lemondrops/fonts
...
ESC/P: make the dot matrix font optional
2023-12-18 23:34:45 +01:00
Alexander Babikov
bf1f425267
prt_escp.c: Try to use courier.ttf if dotmatrix.ttf is missing
2023-12-19 03:14:45 +05:00
Alexander Babikov
ff446fab9b
prt_escp.c: Fall back to roman.ttf instead of dotmatrix.ttf for unhandled typefaces
2023-12-19 03:14:45 +05:00
OBattler
46c5f9c0cc
Added a missing sanity check to device/isapnp.c, fixes crash with ISA PnP sound cards on the PB520R.
2023-12-18 22:33:15 +01:00
Miran Grča
a83486ea32
Merge pull request #3903 from Cacodemon345/mga-busmastering-fixes
...
Matrox Mystique: Bus-mastering fixes
2023-12-18 22:30:05 +01:00
Cacodemon345
111b623811
Fix logical error
2023-12-19 03:00:54 +06:00
Cacodemon345
12d5d6c260
Matrox Mystique: Bus-mastering fixes
...
* Make all bus-mastering-related variables atomic
* Do not, under any circumstances, attempt to read beyond PRIMEND and SECEND
This allows NT 4.0's Mystique drivers to work with busmastering enabled.
2023-12-19 02:18:08 +06:00
Miran Grča
d10a36f75e
Merge pull request #3902 from 86Box/tc1995
...
S3 wraparound fix.
2023-12-18 14:08:53 +01:00
TC1995
552740b2bd
S3 wraparound fix.
...
Just a quick fix for Commander Keen 4 EGA's flickering.
2023-12-18 14:01:38 +01:00
Miran Grča
394a62d880
Merge pull request #3901 from 86Box/tc1995
...
MGA fixes 2:
2023-12-18 13:57:54 +01:00
OBattler
c7f4e59e49
Restoring the old changes.
2023-12-18 13:57:33 +01:00
TC1995
718fb759af
There, log excess disabled.
2023-12-18 13:47:23 +01:00
TC1995
f5642ab1c3
MGA fixes 2:
...
1. Reverted the packed chain4 and fb_only sides to 1 when extended mode is set, but with the call to svga_recalctimings removed from port 0x3df due to mode issues, this should fix all the MGA mode issues I know.
2. Cleaned up the rendering order in svga_recalctimings, especially 4bpp and 8bpp.
2023-12-18 13:42:32 +01:00
OBattler
80e5c4f5ac
Temporarily reverted all the Matrox mode changes since they broke even standard SVGA modes.
2023-12-18 10:02:18 +01:00
Jasmine Iwanek
bd2b4e8a53
Merge pull request #3897 from 86Box/tc1995
...
More MGA fixes.
2023-12-17 23:30:44 -05:00
Miran Grča
c023ba42d1
Merge pull request #3896 from jriwanek-forks/warnfix
...
Warning fixes
2023-12-18 03:00:01 +01:00
TC1995
9573d37364
And warning fixes.
2023-12-18 00:41:51 +01:00
TC1995
c1ba150e3c
Oops, they actually can mix together, but not with plain (non-packed) chain4 stuff enabled, should fix more mode issues in the MGA Millennium card.
2023-12-18 00:40:31 +01:00
Jasmine Iwanek
8e74ee2726
Fix most of the warnings in the macos builds
2023-12-17 18:30:16 -05:00
Miran Grča
24a43c6648
Merge pull request #3895 from 86Box/tc1995
...
MGA Fixes:
2023-12-18 00:12:33 +01:00
TC1995
c62182cd2e
MGA Fixes:
...
1. LFB access is now done properly through the right svga_read/write linear calls.
2. Lowres 8bpp mode and Packed/Extended 8bpp+ mode don't mix together, fixes Debian Woody matroxfb module when testing the modes while keeping other compatibility intact (basically enable packed stuff only when gdcreg5 bits 5-6 are 0 when extended mode is set).
3. Small cleanup in the line accel stuff.
2023-12-18 00:08:51 +01:00
Jasmine Iwanek
4c87164692
Fix remaining warnings in windows and linux builds
2023-12-17 15:08:22 -05:00