552a87ea3d
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.
147 lines
3.1 KiB
C
147 lines
3.1 KiB
C
#include <stdarg.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#define HAVE_STDARG_H
|
|
#include "../86box.h"
|
|
#include "../io.h"
|
|
#include "../timer.h"
|
|
#include "../mca.h"
|
|
#include "../device.h"
|
|
#include "sound.h"
|
|
#include "snd_adlib.h"
|
|
#include "snd_opl.h"
|
|
|
|
|
|
#ifdef ENABLE_ADLIB_LOG
|
|
int adlib_do_log = ENABLE_ADLIB_LOG;
|
|
|
|
|
|
static void
|
|
adlib_log(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
if (adlib_do_log) {
|
|
va_start(ap, fmt);
|
|
pclog_ex(fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
}
|
|
#else
|
|
#define adlib_log(fmt, ...)
|
|
#endif
|
|
|
|
|
|
typedef struct adlib_t
|
|
{
|
|
opl_t opl;
|
|
|
|
uint8_t pos_regs[8];
|
|
} adlib_t;
|
|
|
|
|
|
static void adlib_get_buffer(int32_t *buffer, int len, void *p)
|
|
{
|
|
adlib_t *adlib = (adlib_t *)p;
|
|
int c;
|
|
|
|
opl2_update2(&adlib->opl);
|
|
|
|
for (c = 0; c < len * 2; c++)
|
|
buffer[c] += (int32_t)adlib->opl.buffer[c];
|
|
|
|
adlib->opl.pos = 0;
|
|
}
|
|
|
|
uint8_t adlib_mca_read(int port, void *p)
|
|
{
|
|
adlib_t *adlib = (adlib_t *)p;
|
|
|
|
adlib_log("adlib_mca_read: port=%04x\n", port);
|
|
|
|
return adlib->pos_regs[port & 7];
|
|
}
|
|
|
|
void adlib_mca_write(int port, uint8_t val, void *p)
|
|
{
|
|
adlib_t *adlib = (adlib_t *)p;
|
|
|
|
if (port < 0x102)
|
|
return;
|
|
|
|
adlib_log("adlib_mca_write: port=%04x val=%02x\n", port, val);
|
|
|
|
switch (port)
|
|
{
|
|
case 0x102:
|
|
if ((adlib->pos_regs[2] & 1) && !(val & 1))
|
|
io_removehandler(0x0388, 0x0002, opl2_read, NULL, NULL, opl2_write, NULL, NULL, &adlib->opl);
|
|
if (!(adlib->pos_regs[2] & 1) && (val & 1))
|
|
io_sethandler(0x0388, 0x0002, opl2_read, NULL, NULL, opl2_write, NULL, NULL, &adlib->opl);
|
|
break;
|
|
}
|
|
adlib->pos_regs[port & 7] = val;
|
|
}
|
|
|
|
uint8_t adlib_mca_feedb(void *p)
|
|
{
|
|
adlib_t *adlib = (adlib_t *)p;
|
|
|
|
return (adlib->pos_regs[2] & 1);
|
|
}
|
|
|
|
|
|
void *adlib_init(const device_t *info)
|
|
{
|
|
adlib_t *adlib = malloc(sizeof(adlib_t));
|
|
memset(adlib, 0, sizeof(adlib_t));
|
|
|
|
adlib_log("adlib_init\n");
|
|
opl2_init(&adlib->opl);
|
|
io_sethandler(0x0388, 0x0002, opl2_read, NULL, NULL, opl2_write, NULL, NULL, &adlib->opl);
|
|
sound_add_handler(adlib_get_buffer, adlib);
|
|
return adlib;
|
|
}
|
|
|
|
void *adlib_mca_init(const device_t *info)
|
|
{
|
|
adlib_t *adlib = adlib_init(info);
|
|
|
|
io_removehandler(0x0388, 0x0002, opl2_read, NULL, NULL, opl2_write, NULL, NULL, &adlib->opl);
|
|
mca_add(adlib_mca_read, adlib_mca_write, adlib_mca_feedb, adlib);
|
|
adlib->pos_regs[0] = 0xd7;
|
|
adlib->pos_regs[1] = 0x70;
|
|
|
|
return adlib;
|
|
}
|
|
|
|
void adlib_close(void *p)
|
|
{
|
|
adlib_t *adlib = (adlib_t *)p;
|
|
|
|
free(adlib);
|
|
}
|
|
|
|
const device_t adlib_device =
|
|
{
|
|
"AdLib",
|
|
DEVICE_ISA,
|
|
0,
|
|
adlib_init, adlib_close, NULL,
|
|
NULL, NULL, NULL,
|
|
NULL
|
|
};
|
|
|
|
const device_t adlib_mca_device =
|
|
{
|
|
"AdLib (MCA)",
|
|
DEVICE_MCA,
|
|
0,
|
|
adlib_init, adlib_close, NULL,
|
|
NULL, NULL, NULL,
|
|
NULL
|
|
};
|