Commit Graph

2855 Commits

Author SHA1 Message Date
waltje
87725e8cfb Merge branch 'master' of https://github.com/OBattler/86Box 2017-06-19 22:38:04 -04:00
waltje
7bc1d6fdca Applied PCem patch for ide.c to make the Samsung 4200P work. 2017-06-19 22:37:30 -04:00
OBattler
9a153f752a Merge branch 'master' of https://github.com/OBattler/86Box
# Conflicts:
#	src/VIDEO/vid_s3.c
2017-06-19 22:38:01 +02:00
OBattler
310881dd63 S3 Trio32 and Trio64 no longer use the SDAC RAMDAC. 2017-06-19 22:32:55 +02:00
TC1995
ca53dd0280 S3 Trio/Vision changes (again x2):
Trio32/64 with on-chip ramdac instead of SDAC.
FIFO Empty/Full status from 9ae8/9ae9 no longer slowing down OS/2 when native drivers are installed.
2017-06-19 22:32:16 +02:00
OBattler
51ef58ad00 Fixed RTL8029AS PCI register write handlers;
Disabled the Nation Semiconductors PC87306's IDE handler, the board replaces it with the PCI IDE device anyway;
The Commodore PC 300 now remaps the top 384k of RAM;
The network card is now initialized after the SCSI controller;
The graphics cards remain on the INTA pin, but the network card is now on INTC, and the SCSI controller on INTB;
S3 Vision/Trio emulation brought completely in line with mainline PCem, fixes Windows 2000 freezes.
2017-06-19 22:18:35 +02:00
OBattler
6ff9019206 Added experimental 286 task switching support, patch from Greatpsycho. 2017-06-19 18:45:29 +02:00
OBattler
21f5a3fbf9 Merge branch 'master' of https://github.com/OBattler/86Box 2017-06-19 18:34:03 +02:00
OBattler
43aaf7dc74 When selecting an AT-class machine with less than 1 MB memory size granularity, memory size is no longer incorrectly multiplied by 1024, fixes the crashes with those machines;
The NEAT, SCAT, and Headland chipsets no longer remap the top 384 kB.
2017-06-19 18:33:36 +02:00
waltje
367c0fa7fe Merge branch 'master' of https://github.com/OBattler/86Box
# Conflicts:
#	src/Makefile.mingw
#	src/SOUND/openal.c
2017-06-19 01:08:47 -04:00
waltje
d4c1c93bf9 Merge branch 'master' of https://github.com/OBattler/86Box
# Conflicts:
#	src/Makefile.mingw
#	src/SOUND/openal.c
2017-06-19 01:01:21 -04:00
OBattler
42d2130b1c Fixed the previous commit mess. 2017-06-19 07:00:41 +02:00
waltje
92755dd76a Revert "Small fixes for openal and some dynamic linking stuff. Bug in libopenal.a makes this not work, so we're still on openall.dll ..."
This reverts commit bb03e64539.
2017-06-19 00:54:44 -04:00
OBattler
94d7a9c1ac Merge branch 'master' of https://github.com/OBattler/86Box
# Conflicts:
#	src/Makefile.mingw
#	src/SOUND/openal.c
2017-06-19 06:51:29 +02:00
OBattler
1e7668f1db Applied the recent mainline PCem commits (and fixed the Pentium machines);
Ported the Roland MT-32 emulation (using MUNT) from bit's MT32 emulation branch of PCem;
Sanitized the OpenAL give buffer code in openal.c a bit;
NVR path is now specifiable in the Settings dialog;
Added Logitech 3-button serial mouse per protocol description by waltje;
The RTL8029AS and the BT-958D now actually use the PCI IRQ routing;
Fixed BT-958D PCI device initialization on the bus;
PCI IRQ routing now respects the edge/level setting set on ports 4D0/4D1.
2017-06-19 06:46:08 +02:00
waltje
bb03e64539 Small fixes for openal and some dynamic linking stuff. Bug in libopenal.a makes this not work, so we're still on openall.dll ... 2017-06-18 22:32:27 -04:00
waltje
9c9f7b1b9a And now the missing new/updated serial.c.. 2017-06-17 03:36:54 -04:00
waltje
8b03a29638 Fix up the serial mess. New mouse_serial.ch, new serial.h, updated (but old) serial.c. 2017-06-17 03:31:35 -04:00
OBattler
9b6aaaa5fd Reverted the serial code to the working one again. 2017-06-17 07:23:49 +02:00
waltje
2cf68ffaba Merge branch 'master' of https://github.com/OBattler/86Box
# Conflicts:
#	src/serial.c
2017-06-17 01:07:57 -04:00
TC1995
c68b460b53 Fixed (again) massive OS/2 S3 Trio64 driver spam and MIX + src_dat variable initialized properly + warning gone. 2017-06-17 01:01:40 +02:00
OBattler
66ff71ca55 Applied the latest mainline PCem commits. 2017-06-17 00:50:51 +02:00
waltje
1351cdefb6 Reverted to old (but slightly modified) serial driver. 2017-06-16 17:52:09 -04:00
OBattler
20178cb1bb Reversed serial port and serial mouse code to the old ones. 2017-06-16 23:47:08 +02:00
OBattler
c9aac82b94 Changed all instances of pclog to serial_log in the serial code. 2017-06-16 23:30:42 +02:00
OBattler
5fca563dd0 Changed type of string literals in all (I hope) structs to const char *, reduces .EXE file size by about 200 kB. 2017-06-16 22:54:08 +02:00
waltje
ce09beb9c8 Rest of serial driver - WORK IN PROGRESS - MIGHT BREAK - DONT CHANGE ! 2017-06-16 16:34:39 -04:00
waltje
2019183c29 Removed all model-based one-line header files and moved their info to model.h. Added static to handler functions where needed. 2017-06-16 16:03:07 -04:00
waltje
743c8f3680 Merge branch 'master' of https://github.com/OBattler/86Box 2017-06-16 14:10:31 -04:00
waltje
d2465dd5b3 More changes (stdarg.h in ide.c and name cleanups and %ws to %S in pc.c) 2017-06-16 14:09:57 -04:00
OBattler
89b83f26ea Brought the S3 accelerator code in line with the mainline, this means that initial value of 0 for src_dat is gone, but the warnings remain gone as well. 2017-06-16 19:58:59 +02:00
Melissa Goad
dbbea37d00 Fix EDID reading typo 2017-06-16 00:54:43 -05:00
Melissa Goad
a2e1466754 Merge branch 'master' into experimental 2017-06-16 00:52:52 -05:00
OBattler
843236a28e Merge branch 'master' of https://github.com/OBattler/86Box 2017-06-16 06:44:34 +02:00
OBattler
8061db66fe A lot of cleanaps, got rid of all warnings with -Wall;
The makefile now uses -Wall.
2017-06-16 06:44:11 +02:00
waltje
477491ca00 Resources postfix. 2017-06-15 22:40:59 -04:00
OBattler
464b1a624f Fixed the hard disk controls in the Settings dialog. 2017-06-16 04:14:50 +02:00
OBattler
657f633edb Fixed the bus location controls in the Settings and Add Hard Disk dialogs. 2017-06-16 03:40:18 +02:00
OBattler
8dcc7176a9 Hard disk image handling is now unified in hdd_image.c/h;
Fixed some bugs regarding the Winbond W83877F Super I/O Chip and serial ports;
Added the President Award 430FX PCI machine, thank you ashenone for the BIOS.
2017-06-16 03:18:59 +02:00
OBattler
15b25157ee Reverted the Acer V35N to the service BIOS and made it initialize PCI with the correct slot ID's, the board works correctly now. 2017-06-15 19:35:48 +02:00
waltje
fd923ef050 Added module dependencies to Makefile, small fixes. 2017-06-15 03:10:31 -04:00
OBattler
e4c08cf594 Network code and pc.c are more platform-independent now. 2017-06-15 06:34:08 +02:00
TC1995
12e1e8dfa7 Properly fixed Adaptec AHA-1640 MCA adapter, setup is handled directly by the ADF file in the reference disks.
Re-introduced the Acer V35n machine, but with a proper bios (r01-c0.bin instead of the service one).
MCA serial and parallel initialization fixes alongside the ISA PS/1 and PS/2 Model 30 ones.
2017-06-15 05:17:34 +02:00
OBattler
805237fb33 Merge pull request #137 from MoochMcGee/voodoo-work
Add XRGB8888 LFB format to Voodoo 1.
2017-06-15 04:44:01 +02:00
Melissa Goad
9ed5b93f81 Add XRGB8888 LFB format to Voodoo 1. 2017-06-14 21:33:58 -05:00
Melissa Goad
69b72d3459 Fix EDID 2017-06-14 21:32:54 -05:00
Melissa Goad
5fb073a6c1 Add EDID reading 2017-06-14 15:13:05 -05:00
Melissa Goad
d543cee986 Merge branch 'master' into experimental 2017-06-14 13:49:30 -05:00
OBattler
c0a8830d5e Brought the Voodoo files in line with the mainline PCem code - fixes all warnings;
Applied all the mainline PCem commits;
Fixed some sound-related warnings.
2017-06-14 20:35:58 +02:00
OBattler
62bfb60a7b Committed network/slirp/udp.h that I forgot to commit before. 2017-06-14 07:35:39 +02:00