Reworked serial and LPT set up - they can now bet set to any I/O base address (though that capability is not used by anything yet);
The CD-ROM IOCTL direct pass through code now does sanity check on the requested data size before passing the command - fixes crashes with some DMA-only host DVD drives; The network poller is now in its own thread; The hack is back in the emulation of the National Semiconductors PC87306 Super I/O Chip - it's the only way right now to have serial working on that board; Fixed a part of the code that was still using NukedOPL even when OPL 3 was set to DOSBox OPL; Applied all mainline PCem commits.
This commit is contained in:
4
src/pc.c
4
src/pc.c
@@ -315,11 +315,14 @@ void initpc(int argc, char *argv[])
|
||||
td0_init();
|
||||
imd_init();
|
||||
|
||||
#if 0
|
||||
if (network_card_current != 0)
|
||||
{
|
||||
vlan_reset(); //NETWORK
|
||||
}
|
||||
network_card_init(network_card_current);
|
||||
network_thread_init();
|
||||
#endif
|
||||
|
||||
disc_load(0, discfns[0]);
|
||||
disc_load(1, discfns[1]);
|
||||
@@ -442,6 +445,7 @@ void resetpchard()
|
||||
vlan_reset(); //NETWORK
|
||||
}
|
||||
network_card_init(network_card_current);
|
||||
network_thread_reset();
|
||||
|
||||
for (i = 0; i < CDROM_NUM; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user