Added the IBM 5161 ISA expansion for PC and XT;
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port; Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX); Finished the 586MC1; Added 8087 emulation; Moved Cyrix 6x86'es to the Dev branch; Sanitized/cleaned up memregs.c/h and intel.c/h; Split the chipsets from machines and sanitized Port 92 emulation; Added support for the 15bpp mode to the Compaq ATI 28800; Moved the MR 386DX and 486 machines to the Dev branch; Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00; Ported the new timer code from PCem; Cleaned up the CPU table of unused stuff and better optimized its structure; Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch; Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem; Added the AHA-1540A and the BusTek BT-542B; Moved the Sumo SCSI-AT to the Dev branch; Minor IDE, FDC, and floppy drive code clean-ups; Made NCR 5380/53C400-based cards' BIOS address configurable; Got rid of the legacy romset variable; Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit; Added the Amstead PPC512 per PCem patch by John Elliott; Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages); Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing; Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem; Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit; Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement; Amstrad MegaPC does now works correctly with non-internal graphics card; The SLiRP code no longer casts a packed struct type to a non-packed struct type; The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present; The S3 Virge on BeOS is no longer broken (was broken by build #1591); OS/2 2.0 build 6.167 now sees key presses again; Xi8088 now work on CGA again; 86F images converted from either the old or new variants of the HxC MFM format now work correctly; Hardware interrupts with a vector of 0xFF are now handled correctly; OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct; Fixed VNC keyboard input bugs; Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g / 81 MIDI play no longer hangs with the build's own VTD driver; Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly; Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4; Compaq Portable now works with all graphics cards; Fixed various MDSI Genius bugs; Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly; Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355; OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400. Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391. Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389. Fixed a minor IDE timing bug, fixes #388. Fixed Toshiba T1000 RAM issues, fixes #379. Fixed EGA/(S)VGA overscan border handling, fixes #378; Got rid of the now long useless IDE channel 2 auto-removal, fixes #370; Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366; Ported the Unicode CD image file name fix from VARCem, fixes #365; Fixed high density floppy disks on the Xi8088, fixes #359; Fixed some bugs in the Hercules emulation, fixes #346, fixes #358; Fixed the SCSI hard disk mode sense pages, fixes #356; Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349; Fixed bugs in the serial mouse emulation, fixes #344; Compiled 86Box binaries now include all the required .DLL's, fixes #341; Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
@@ -199,7 +199,9 @@ typedef struct {
|
||||
typedef struct {
|
||||
const char *name;
|
||||
|
||||
int64_t timeout;
|
||||
void *lpt;
|
||||
|
||||
pc_timer_t timeout_timer;
|
||||
|
||||
wchar_t page_fn[260];
|
||||
uint8_t color;
|
||||
@@ -431,7 +433,7 @@ timeout_timer(void *priv)
|
||||
if (dev->page->dirty)
|
||||
new_page(dev, 1, 1);
|
||||
|
||||
dev->timeout = 0LL;
|
||||
timer_disable(&dev->timeout_timer);
|
||||
}
|
||||
|
||||
|
||||
@@ -517,7 +519,7 @@ static void
|
||||
reset_printer_hard(escp_t *dev)
|
||||
{
|
||||
dev->char_read = 0;
|
||||
dev->timeout = 0LL;
|
||||
timer_disable(&dev->timeout_timer);
|
||||
reset_printer(dev);
|
||||
}
|
||||
|
||||
@@ -1588,6 +1590,7 @@ handle_char(escp_t *dev, uint8_t ch)
|
||||
double x_advance;
|
||||
|
||||
dev->char_read = 1;
|
||||
lpt_irq(dev->lpt, 1);
|
||||
|
||||
if (dev->page == NULL)
|
||||
return;
|
||||
@@ -1977,7 +1980,7 @@ write_ctrl(uint8_t val, void *priv)
|
||||
/* ACK it, will be read on next READ STATUS. */
|
||||
dev->ack = 1;
|
||||
|
||||
dev->timeout = 500000LL * TIMER_USEC;
|
||||
timer_set_delay_u64(&dev->timeout_timer, 500000 * TIMER_USEC);
|
||||
}
|
||||
|
||||
dev->ctrl = val;
|
||||
@@ -2020,14 +2023,12 @@ read_status(void *priv)
|
||||
|
||||
|
||||
static void *
|
||||
escp_init(const lpt_device_t *INFO)
|
||||
escp_init(void *lpt)
|
||||
{
|
||||
const char *fn = PATH_FREETYPE_DLL;
|
||||
escp_t *dev;
|
||||
int i;
|
||||
|
||||
escp_log("ESC/P: LPT printer '%s' initializing\n", INFO->name);
|
||||
|
||||
/* Dynamically load FreeType. */
|
||||
if (ft_handle == NULL) {
|
||||
ft_handle = dynld_module(fn, ft_imports);
|
||||
@@ -2050,8 +2051,8 @@ escp_init(const lpt_device_t *INFO)
|
||||
/* Initialize a device instance. */
|
||||
dev = (escp_t *)malloc(sizeof(escp_t));
|
||||
memset(dev, 0x00, sizeof(escp_t));
|
||||
dev->name = INFO->name;
|
||||
dev->ctrl = 0x04;
|
||||
dev->lpt = lpt;
|
||||
|
||||
/* Create a full pathname for the font files. */
|
||||
wcscpy(dev->fontpath, exe_path);
|
||||
@@ -2109,7 +2110,7 @@ escp_init(const lpt_device_t *INFO)
|
||||
escp_log("ESC/P: created a virtual page of dimensions %d x %d pixels.\n",
|
||||
dev->page->w, dev->page->h);
|
||||
|
||||
timer_add(timeout_timer, &dev->timeout, &dev->timeout, dev);
|
||||
timer_add(&dev->timeout_timer, timeout_timer, dev, 0);
|
||||
|
||||
return(dev);
|
||||
}
|
||||
|
||||
@@ -96,13 +96,15 @@ typedef struct {
|
||||
|
||||
|
||||
typedef struct {
|
||||
const char *name;
|
||||
const char *name;
|
||||
|
||||
void * lpt;
|
||||
|
||||
/* Output file name. */
|
||||
wchar_t filename[1024];
|
||||
|
||||
/* Printer timeout. */
|
||||
int64_t timeout;
|
||||
pc_timer_t timeout_timer;
|
||||
|
||||
/* page data (TODO: make configurable) */
|
||||
double page_width, /* all in inches */
|
||||
@@ -204,7 +206,7 @@ timeout_timer(void *priv)
|
||||
if (dev->page->dirty)
|
||||
new_page(dev);
|
||||
|
||||
dev->timeout = 0LL;
|
||||
timer_disable(&dev->timeout_timer);
|
||||
}
|
||||
|
||||
|
||||
@@ -237,7 +239,7 @@ reset_printer(prnt_t *dev)
|
||||
/* Create a file for this page. */
|
||||
plat_tempfile(dev->filename, NULL, L".txt");
|
||||
|
||||
dev->timeout = 0LL;
|
||||
timer_disable(&dev->timeout_timer);
|
||||
}
|
||||
|
||||
|
||||
@@ -392,8 +394,9 @@ write_ctrl(uint8_t val, void *priv)
|
||||
|
||||
/* ACK it, will be read on next READ STATUS. */
|
||||
dev->ack = 1;
|
||||
lpt_irq(dev->lpt, 1);
|
||||
|
||||
dev->timeout = 500000LL * TIMER_USEC;
|
||||
timer_set_delay_u64(&dev->timeout_timer, 500000 * TIMER_USEC);
|
||||
}
|
||||
|
||||
dev->ctrl = val;
|
||||
@@ -422,17 +425,15 @@ read_status(void *priv)
|
||||
|
||||
|
||||
static void *
|
||||
prnt_init(const lpt_device_t *INFO)
|
||||
prnt_init(void *lpt)
|
||||
{
|
||||
prnt_t *dev;
|
||||
|
||||
/* Initialize a device instance. */
|
||||
dev = (prnt_t *)malloc(sizeof(prnt_t));
|
||||
memset(dev, 0x00, sizeof(prnt_t));
|
||||
dev->name = INFO->name;
|
||||
dev->ctrl = 0x04;
|
||||
|
||||
//INFO("PRNT: LPT printer '%s' initializing\n", dev->name);
|
||||
dev->lpt = lpt;
|
||||
|
||||
/* Initialize parameters. */
|
||||
reset_printer(dev);
|
||||
@@ -444,9 +445,7 @@ prnt_init(const lpt_device_t *INFO)
|
||||
dev->page->chars = (char *)malloc(dev->page->w * dev->page->h);
|
||||
memset(dev->page->chars, 0x00, dev->page->w * dev->page->h);
|
||||
|
||||
//DEBUG("PRNT: created a virtual %ix%i page.\n", dev->page->w, dev->page->h);
|
||||
|
||||
timer_add(timeout_timer, &dev->timeout, &dev->timeout, dev);
|
||||
timer_add(&dev->timeout_timer, timeout_timer, dev, 0);
|
||||
|
||||
return(dev);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user