Rewritten 808x CPU emulation core based on reenigne's XTCE, VisiOn, SnatchIt, and 8088 MPH now work correctly;
Fixed PC speaker sound volume in PIT mode 0; A few CPU emulation clean-ups; Hard disk controller changing redone in a less messy way; Re-added the long-missing key send delay handling to the XT keyboard handler; Fixed a bug that was causing SLiRP not to work when compiled with MingW/GCC 7.3.0-2 or newer; Some serial mouse and port fixes; A lot of changes to printer emulation, mostly based on DOSBox-X; Printer PNG writer now uses statically linked libpng; Added support for the HxC MFM floppy image format and upped 86F format version to 2.12; Ported various things from PCem and some from VARCem; Added the S3 86c801/805 emulation (patch from TheCollector1995); Fixed and renamed the EGA monitor options; Better synchronized the 808x to the PIT and the CGA; Fixed the CGA wait state calculation; Cleaned up some things in mem.c; Fixed some things in the floppy emulation to make VisiOn get the correct errors from the copy protection disk; Fixed several renderer-related bugs, including the SDL2 renderer's failure to take screenshots; The Jenkins builds are now compiled with MingW/GCC 7.4.0-1 and include all the required DLL's.
This commit is contained in:
41
src/lpt.c
41
src/lpt.c
@@ -12,6 +12,7 @@
|
||||
#include "sound/snd_lpt_dss.h"
|
||||
#include "printer/prt_devs.h"
|
||||
|
||||
|
||||
char lpt_device_names[3][16];
|
||||
|
||||
|
||||
@@ -64,7 +65,7 @@ void lpt_devices_init()
|
||||
{
|
||||
lpt_device_ts[i] = (lpt_device_t *) lpt_devices[c].device;
|
||||
if (lpt_device_ts[i])
|
||||
lpt_device_ps[i] = lpt_device_ts[i]->init();
|
||||
lpt_device_ps[i] = lpt_device_ts[i]->init(lpt_device_ts[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,12 +88,16 @@ void lpt_write(int i, uint16_t port, uint8_t val, void *priv)
|
||||
switch (port & 3)
|
||||
{
|
||||
case 0:
|
||||
if (lpt_device_ts[i])
|
||||
if (lpt_device_ts[i] && lpt_device_ts[i]->write_data)
|
||||
lpt_device_ts[i]->write_data(val, lpt_device_ps[i]);
|
||||
lpt_dats[i] = val;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
break;
|
||||
|
||||
case 2:
|
||||
if (lpt_device_ts[i])
|
||||
if (lpt_device_ts[i] && lpt_device_ts[i]->write_ctrl)
|
||||
lpt_device_ts[i]->write_ctrl(val, lpt_device_ps[i]);
|
||||
lpt_ctrls[i] = val;
|
||||
break;
|
||||
@@ -100,18 +105,35 @@ void lpt_write(int i, uint16_t port, uint8_t val, void *priv)
|
||||
}
|
||||
uint8_t lpt_read(int i, uint16_t port, void *priv)
|
||||
{
|
||||
uint8_t retval = 0xff;
|
||||
|
||||
switch (port & 3)
|
||||
{
|
||||
case 0:
|
||||
return lpt_dats[i];
|
||||
if (lpt_device_ts[i] && lpt_device_ts[i]->read_data) {
|
||||
retval = lpt_device_ts[i]->read_data(lpt_device_ps[i]);
|
||||
break;
|
||||
}
|
||||
retval = lpt_dats[i];
|
||||
break;
|
||||
|
||||
case 1:
|
||||
if (lpt_device_ts[i])
|
||||
return lpt_device_ts[i]->read_status(lpt_device_ps[i]);
|
||||
return 0;
|
||||
if (lpt_device_ts[i] && lpt_device_ts[i]->read_status) {
|
||||
retval = lpt_device_ts[i]->read_status(lpt_device_ps[i]);
|
||||
break;
|
||||
}
|
||||
retval = 0xdf;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
return lpt_ctrls[i];
|
||||
if (lpt_device_ts[i] && lpt_device_ts[i]->read_ctrl) {
|
||||
retval = lpt_device_ts[i]->read_ctrl(lpt_device_ps[i]);
|
||||
break;
|
||||
}
|
||||
retval = 0xe0 | lpt_ctrls[i];
|
||||
break;
|
||||
}
|
||||
return 0xff;
|
||||
return retval;
|
||||
}
|
||||
|
||||
void lpt1_write(uint16_t port, uint8_t val, void *priv)
|
||||
@@ -124,6 +146,7 @@ uint8_t lpt1_read(uint16_t port, void *priv)
|
||||
return lpt_read(0, port, priv);
|
||||
}
|
||||
|
||||
|
||||
void lpt2_write(uint16_t port, uint8_t val, void *priv)
|
||||
{
|
||||
lpt_write(1, port, val, priv);
|
||||
|
||||
Reference in New Issue
Block a user