2017-11-11 16:03:13 -05:00
|
|
|
/*
|
|
|
|
|
* 86Box A hypervisor and IBM PC system emulator that specializes in
|
|
|
|
|
* running old operating systems and software designed for IBM
|
|
|
|
|
* PC systems and compatibles from 1981 through fairly recent
|
|
|
|
|
* system designs based on the PCI bus.
|
|
|
|
|
*
|
|
|
|
|
* This file is part of the 86Box distribution.
|
|
|
|
|
*
|
|
|
|
|
* Emulation of various Compaq PC's.
|
|
|
|
|
*
|
2020-03-25 00:46:02 +02:00
|
|
|
*
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
|
|
|
|
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
|
|
|
|
* Miran Grca, <mgrca8@gmail.com>
|
|
|
|
|
* TheCollector1995, <mariogplayer@gmail.com>
|
|
|
|
|
*
|
2018-01-17 18:43:36 +01:00
|
|
|
* Copyright 2008-2018 Sarah Walker.
|
|
|
|
|
* Copyright 2016-2018 Miran Grca.
|
2017-11-11 16:03:13 -05:00
|
|
|
*/
|
2017-09-25 04:31:20 -04:00
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <string.h>
|
2020-03-25 02:24:47 +01:00
|
|
|
#include <stdlib.h>
|
2017-09-25 04:31:20 -04:00
|
|
|
#include <wchar.h>
|
2020-03-25 02:24:47 +01:00
|
|
|
#include <math.h>
|
2020-03-29 14:24:42 +02:00
|
|
|
#include <86box/86box.h>
|
2020-02-29 19:12:23 +01:00
|
|
|
#include "cpu.h"
|
2020-03-29 14:24:42 +02:00
|
|
|
#include <86box/io.h>
|
|
|
|
|
#include <86box/timer.h>
|
|
|
|
|
#include <86box/pit.h>
|
|
|
|
|
#include <86box/mem.h>
|
|
|
|
|
#include <86box/rom.h>
|
|
|
|
|
#include <86box/device.h>
|
|
|
|
|
#include <86box/fdd.h>
|
|
|
|
|
#include <86box/fdc.h>
|
2020-06-17 00:32:48 +02:00
|
|
|
#include <86box/fdc_ext.h>
|
2020-03-29 14:24:42 +02:00
|
|
|
#include <86box/hdc.h>
|
|
|
|
|
#include <86box/hdc_ide.h>
|
|
|
|
|
#include <86box/machine.h>
|
|
|
|
|
#include <86box/video.h>
|
|
|
|
|
#include <86box/vid_cga.h>
|
|
|
|
|
#include <86box/vid_cga_comp.h>
|
2017-06-16 16:00:44 -04:00
|
|
|
|
2016-06-26 00:34:39 +02:00
|
|
|
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
enum
|
|
|
|
|
{
|
2020-03-25 02:18:28 +01:00
|
|
|
COMPAQ_PORTABLEII = 0,
|
|
|
|
|
COMPAQ_PORTABLEIII,
|
2020-06-17 00:32:48 +02:00
|
|
|
COMPAQ_PORTABLEIII386,
|
|
|
|
|
COMPAQ_DESKPRO386
|
2020-03-25 02:18:28 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define CGA_RGB 0
|
|
|
|
|
#define CGA_COMPOSITE 1
|
|
|
|
|
|
|
|
|
|
#define COMPOSITE_OLD 0
|
|
|
|
|
#define COMPOSITE_NEW 1
|
|
|
|
|
|
|
|
|
|
/*Very rough estimate*/
|
|
|
|
|
#define VID_CLOCK (double)(651 * 416 * 60)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Mapping of attributes to colours */
|
|
|
|
|
static uint32_t amber, black;
|
|
|
|
|
static uint32_t blinkcols[256][2];
|
|
|
|
|
static uint32_t normcols[256][2];
|
|
|
|
|
|
|
|
|
|
/* Video options set by the motherboard; they will be picked up by the card
|
|
|
|
|
* on the next poll.
|
|
|
|
|
*
|
|
|
|
|
* Bit 3: Disable built-in video (for add-on card)
|
|
|
|
|
* Bit 2: Thin font
|
2022-02-20 02:26:27 -05:00
|
|
|
* Bits 0,1: Font set (not currently implemented)
|
|
|
|
|
*/
|
2020-03-25 02:18:28 +01:00
|
|
|
static int8_t cpq_st_display_internal = -1;
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_display_set(uint8_t internal)
|
|
|
|
|
{
|
|
|
|
|
cpq_st_display_internal = internal;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static uint8_t
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_display_get(void)
|
|
|
|
|
{
|
|
|
|
|
return cpq_st_display_internal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
typedef struct compaq_plasma_t
|
2020-03-25 02:18:28 +01:00
|
|
|
{
|
|
|
|
|
mem_mapping_t plasma_mapping;
|
|
|
|
|
cga_t cga;
|
|
|
|
|
uint8_t port_23c6;
|
|
|
|
|
uint8_t internal_monitor;
|
|
|
|
|
uint8_t attrmap; /* Attribute mapping register */
|
|
|
|
|
int linepos, displine;
|
|
|
|
|
uint8_t *vram;
|
|
|
|
|
uint64_t dispontime, dispofftime;
|
|
|
|
|
int dispon;
|
|
|
|
|
} compaq_plasma_t;
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static uint8_t cga_crtcmask[32] =
|
2020-03-25 02:18:28 +01:00
|
|
|
{
|
|
|
|
|
0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f, 0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
|
|
|
|
|
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2016-06-26 00:34:39 +02:00
|
|
|
/* Compaq Deskpro 386 remaps RAM from 0xA0000-0xFFFFF to 0xFA0000-0xFFFFFF */
|
2017-11-11 16:03:13 -05:00
|
|
|
static mem_mapping_t ram_mapping;
|
2016-06-26 00:34:39 +02:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
static void compaq_plasma_recalcattrs(compaq_plasma_t *self);
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_recalctimings(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
double _dispontime, _dispofftime, disptime;
|
|
|
|
|
|
|
|
|
|
if (!self->internal_monitor && !(self->port_23c6 & 1)) {
|
|
|
|
|
cga_recalctimings(&self->cga);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
disptime = 651;
|
|
|
|
|
_dispontime = 640;
|
|
|
|
|
_dispofftime = disptime - _dispontime;
|
|
|
|
|
self->dispontime = (uint64_t)(_dispontime * (cpuclock / VID_CLOCK) * (double)(1ull << 32));
|
|
|
|
|
self->dispofftime = (uint64_t)(_dispofftime * (cpuclock / VID_CLOCK) * (double)(1ull << 32));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_write(uint32_t addr, uint8_t val, void *priv)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)priv;
|
|
|
|
|
|
|
|
|
|
self->vram[addr & 0x7fff] = val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static uint8_t
|
|
|
|
|
compaq_plasma_read(uint32_t addr, void *priv)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)priv;
|
|
|
|
|
uint8_t ret;
|
|
|
|
|
|
|
|
|
|
ret = (self->vram[addr & 0x7fff]);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Draw a row of text in 80-column mode */
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_text80(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
uint32_t cols[2];
|
|
|
|
|
int x, c;
|
|
|
|
|
uint8_t chr, attr;
|
|
|
|
|
int drawcursor;
|
|
|
|
|
int cursorline;
|
|
|
|
|
int blink;
|
|
|
|
|
uint16_t addr;
|
|
|
|
|
uint8_t sc;
|
|
|
|
|
uint16_t ma = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x7fff;
|
|
|
|
|
uint16_t ca = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x7fff;
|
|
|
|
|
|
|
|
|
|
sc = (self->displine) & 15;
|
|
|
|
|
addr = ((ma & ~1) + (self->displine >> 4) * 80) * 2;
|
|
|
|
|
ma += (self->displine >> 4) * 80;
|
|
|
|
|
|
|
|
|
|
if ((self->cga.crtc[10] & 0x60) == 0x20)
|
|
|
|
|
cursorline = 0;
|
|
|
|
|
else
|
|
|
|
|
cursorline = ((self->cga.crtc[10] & 0x0F)*2 <= sc) &&
|
|
|
|
|
((self->cga.crtc[11] & 0x0F)*2 >= sc);
|
|
|
|
|
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
chr = self->vram[(addr + 2 * x) & 0x7FFF];
|
|
|
|
|
attr = self->vram[(addr + 2 * x + 1) & 0x7FFF];
|
|
|
|
|
drawcursor = ((ma == ca) && cursorline &&
|
|
|
|
|
(self->cga.cgamode & 8) && (self->cga.cgablink & 16));
|
|
|
|
|
|
|
|
|
|
blink = ((self->cga.cgablink & 16) && (self->cga.cgamode & 0x20) &&
|
|
|
|
|
(attr & 0x80) && !drawcursor);
|
|
|
|
|
|
|
|
|
|
if (self->cga.cgamode & 0x20) { /* Blink */
|
2022-02-20 02:26:27 -05:00
|
|
|
cols[1] = blinkcols[attr][1];
|
|
|
|
|
cols[0] = blinkcols[attr][0];
|
|
|
|
|
if (blink)
|
2020-03-25 02:18:28 +01:00
|
|
|
cols[1] = cols[0];
|
|
|
|
|
} else {
|
|
|
|
|
cols[1] = normcols[attr][1];
|
|
|
|
|
cols[0] = normcols[attr][0];
|
|
|
|
|
}
|
|
|
|
|
if (drawcursor) {
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 3) + c] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
|
|
|
|
|
} else {
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 3) + c] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
|
|
|
|
|
}
|
|
|
|
|
++ma;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Draw a row of text in 40-column mode */
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_text40(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
uint32_t cols[2];
|
|
|
|
|
int x, c;
|
|
|
|
|
uint8_t chr, attr;
|
|
|
|
|
int drawcursor;
|
|
|
|
|
int cursorline;
|
|
|
|
|
int blink;
|
|
|
|
|
uint16_t addr;
|
|
|
|
|
uint8_t sc;
|
|
|
|
|
uint16_t ma = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x7fff;
|
|
|
|
|
uint16_t ca = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x7fff;
|
|
|
|
|
|
|
|
|
|
sc = (self->displine) & 15;
|
|
|
|
|
addr = ((ma & ~1) + (self->displine >> 4) * 40) * 2;
|
|
|
|
|
ma += (self->displine >> 4) * 40;
|
|
|
|
|
|
|
|
|
|
if ((self->cga.crtc[10] & 0x60) == 0x20)
|
|
|
|
|
cursorline = 0;
|
|
|
|
|
else
|
|
|
|
|
cursorline = ((self->cga.crtc[10] & 0x0F)*2 <= sc) &&
|
|
|
|
|
((self->cga.crtc[11] & 0x0F)*2 >= sc);
|
|
|
|
|
|
|
|
|
|
for (x = 0; x < 40; x++) {
|
|
|
|
|
chr = self->vram[(addr + 2 * x) & 0x7FFF];
|
|
|
|
|
attr = self->vram[(addr + 2 * x + 1) & 0x7FFF];
|
|
|
|
|
drawcursor = ((ma == ca) && cursorline &&
|
|
|
|
|
(self->cga.cgamode & 8) && (self->cga.cgablink & 16));
|
|
|
|
|
|
|
|
|
|
blink = ((self->cga.cgablink & 16) && (self->cga.cgamode & 0x20) &&
|
|
|
|
|
(attr & 0x80) && !drawcursor);
|
|
|
|
|
|
|
|
|
|
if (self->cga.cgamode & 0x20) { /* Blink */
|
2022-02-20 02:26:27 -05:00
|
|
|
cols[1] = blinkcols[attr][1];
|
|
|
|
|
cols[0] = blinkcols[attr][0];
|
|
|
|
|
if (blink)
|
2020-03-25 02:18:28 +01:00
|
|
|
cols[1] = cols[0];
|
|
|
|
|
} else {
|
|
|
|
|
cols[1] = normcols[attr][1];
|
|
|
|
|
cols[0] = normcols[attr][0];
|
|
|
|
|
}
|
|
|
|
|
if (drawcursor) {
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
2022-02-20 02:26:27 -05:00
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 4) + c*2] =
|
2020-03-25 02:18:28 +01:00
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 4) + c*2 + 1] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
2022-02-20 02:26:27 -05:00
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 4) + c*2] =
|
2020-03-25 02:18:28 +01:00
|
|
|
((uint32_t *)buffer32->line[self->displine])[(x << 4) + c*2+1] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
++ma;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Draw a line in CGA 640x200 or Compaq Plasma 640x400 mode */
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_cgaline6(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
int x, c;
|
|
|
|
|
uint8_t dat;
|
|
|
|
|
uint32_t ink = 0;
|
|
|
|
|
uint16_t addr;
|
|
|
|
|
uint32_t fg = (self->cga.cgacol & 0x0F) ? amber : black;
|
|
|
|
|
uint32_t bg = black;
|
|
|
|
|
|
|
|
|
|
uint16_t ma = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x7fff;
|
|
|
|
|
|
|
|
|
|
if ((self->cga.crtc[9] == 3) || (self->port_23c6 & 1)) /* 640*400 */ {
|
|
|
|
|
addr = ((self->displine) & 1) * 0x2000 +
|
|
|
|
|
((self->displine >> 1) & 1) * 0x4000 +
|
|
|
|
|
(self->displine >> 2) * 80 +
|
|
|
|
|
((ma & ~1) << 1);
|
|
|
|
|
} else {
|
|
|
|
|
addr = ((self->displine >> 1) & 1) * 0x2000 +
|
|
|
|
|
(self->displine >> 2) * 80 +
|
|
|
|
|
((ma & ~1) << 1);
|
|
|
|
|
}
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
dat = self->vram[(addr & 0x7FFF)];
|
|
|
|
|
addr++;
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
|
|
|
|
ink = (dat & 0x80) ? fg : bg;
|
|
|
|
|
if (!(self->cga.cgamode & 8)) ink = black;
|
|
|
|
|
((uint32_t *)buffer32->line[self->displine])[x*8+c] = ink;
|
|
|
|
|
dat <<= 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Draw a line in CGA 320x200 mode. Here the CGA colours are converted to
|
|
|
|
|
* dither patterns: colour 1 to 25% grey, colour 2 to 50% grey */
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_cgaline4(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
int x, c;
|
|
|
|
|
uint8_t dat, pattern;
|
|
|
|
|
uint32_t ink0 = 0, ink1 = 0;
|
|
|
|
|
uint16_t addr;
|
|
|
|
|
|
|
|
|
|
uint16_t ma = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x7fff;
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
/* 320*200 */
|
|
|
|
|
addr = ((self->displine >> 1) & 1) * 0x2000 +
|
|
|
|
|
(self->displine >> 2) * 80 +
|
|
|
|
|
((ma & ~1) << 1);
|
|
|
|
|
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
dat = self->vram[(addr & 0x7FFF)];
|
|
|
|
|
addr++;
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < 4; c++) {
|
|
|
|
|
pattern = (dat & 0xC0) >> 6;
|
2022-02-20 02:26:27 -05:00
|
|
|
if (!(self->cga.cgamode & 8))
|
2020-03-25 02:18:28 +01:00
|
|
|
pattern = 0;
|
|
|
|
|
|
|
|
|
|
switch (pattern & 3) {
|
|
|
|
|
case 0: ink0 = ink1 = black; break;
|
|
|
|
|
case 1: if (self->displine & 1) {
|
|
|
|
|
ink0 = black; ink1 = black;
|
|
|
|
|
} else {
|
|
|
|
|
ink0 = amber; ink1 = black;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 2: if (self->displine & 1) {
|
|
|
|
|
ink0 = black; ink1 = amber;
|
|
|
|
|
} else {
|
|
|
|
|
ink0 = amber; ink1 = black;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 3: ink0 = ink1 = amber; break;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
((uint32_t *)buffer32->line[self->displine])[x*8+2*c] = ink0;
|
|
|
|
|
((uint32_t *)buffer32->line[self->displine])[x*8+2*c+1] = ink1;
|
|
|
|
|
dat <<= 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_out(uint16_t addr, uint8_t val, void *priv)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)priv;
|
|
|
|
|
uint8_t old;
|
|
|
|
|
|
|
|
|
|
switch (addr) {
|
|
|
|
|
/* Emulated CRTC, register select */
|
|
|
|
|
case 0x3d4:
|
|
|
|
|
self->cga.crtcreg = val & 31;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Emulated CRTC, value */
|
|
|
|
|
case 0x3d5:
|
|
|
|
|
old = self->cga.crtc[self->cga.crtcreg];
|
|
|
|
|
self->cga.crtc[self->cga.crtcreg] = val & cga_crtcmask[self->cga.crtcreg];
|
|
|
|
|
|
|
|
|
|
/* Register 0x12 controls the attribute mappings for the
|
2022-02-20 02:26:27 -05:00
|
|
|
* plasma screen. */
|
2020-03-25 02:18:28 +01:00
|
|
|
if (self->cga.crtcreg == 0x12) {
|
2022-02-20 02:26:27 -05:00
|
|
|
self->attrmap = val;
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_recalcattrs(self);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
if (old != val) {
|
|
|
|
|
if (self->cga.crtcreg < 0xe || self->cga.crtcreg > 0x10) {
|
|
|
|
|
fullchange = changeframecount;
|
|
|
|
|
compaq_plasma_recalctimings(self);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
case 0x3d8:
|
|
|
|
|
self->cga.cgamode = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x3d9:
|
|
|
|
|
self->cga.cgacol = val;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x13c6:
|
|
|
|
|
if (val & 8)
|
|
|
|
|
compaq_plasma_display_set(1);
|
|
|
|
|
else
|
|
|
|
|
compaq_plasma_display_set(0);
|
|
|
|
|
break;
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
case 0x23c6:
|
|
|
|
|
self->port_23c6 = val;
|
|
|
|
|
if (val & 8) /* Disable internal CGA */
|
|
|
|
|
mem_mapping_disable(&self->plasma_mapping);
|
|
|
|
|
else
|
|
|
|
|
mem_mapping_enable(&self->plasma_mapping);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static uint8_t
|
|
|
|
|
compaq_plasma_in(uint16_t addr, void *priv)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)priv;
|
|
|
|
|
uint8_t ret = 0xff;
|
|
|
|
|
|
|
|
|
|
switch (addr) {
|
|
|
|
|
case 0x3d4:
|
|
|
|
|
ret = self->cga.crtcreg;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x3d5:
|
|
|
|
|
if (self->cga.crtcreg == 0x12) {
|
|
|
|
|
ret = self->attrmap & 0x0F;
|
|
|
|
|
if (self->internal_monitor)
|
|
|
|
|
ret |= 0x30; /* Plasma / CRT */
|
|
|
|
|
} else
|
|
|
|
|
ret = self->cga.crtc[self->cga.crtcreg];
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x3da:
|
|
|
|
|
ret = self->cga.cgastat;
|
|
|
|
|
break;
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
case 0x13c6:
|
|
|
|
|
if (compaq_plasma_display_get())
|
|
|
|
|
ret = 8;
|
|
|
|
|
else
|
|
|
|
|
ret = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x23c6:
|
|
|
|
|
ret = self->port_23c6;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_poll(void *p)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)p;
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
/* Switch between internal plasma and external CRT display. */
|
|
|
|
|
if (cpq_st_display_internal != -1 && cpq_st_display_internal != self->internal_monitor) {
|
|
|
|
|
self->internal_monitor = cpq_st_display_internal;
|
|
|
|
|
compaq_plasma_recalctimings(self);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!self->internal_monitor && !(self->port_23c6 & 1)) {
|
|
|
|
|
cga_poll(&self->cga);
|
|
|
|
|
return;
|
2022-02-20 02:26:27 -05:00
|
|
|
}
|
|
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
if (!self->linepos) {
|
|
|
|
|
timer_advance_u64(&self->cga.timer, self->dispofftime);
|
|
|
|
|
self->cga.cgastat |= 1;
|
|
|
|
|
self->linepos = 1;
|
|
|
|
|
if (self->dispon) {
|
|
|
|
|
if (self->displine == 0)
|
|
|
|
|
video_wait_for_buffer();
|
|
|
|
|
|
|
|
|
|
/* Graphics */
|
|
|
|
|
if (self->cga.cgamode & 0x02) {
|
|
|
|
|
if (self->cga.cgamode & 0x10)
|
|
|
|
|
compaq_plasma_cgaline6(self);
|
2022-02-20 02:26:27 -05:00
|
|
|
else
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_cgaline4(self);
|
|
|
|
|
}
|
|
|
|
|
else if (self->cga.cgamode & 0x01) /* High-res text */
|
|
|
|
|
compaq_plasma_text80(self);
|
|
|
|
|
else
|
|
|
|
|
compaq_plasma_text40(self);
|
|
|
|
|
}
|
|
|
|
|
self->displine++;
|
|
|
|
|
/* Hardcode a fixed refresh rate and VSYNC timing */
|
|
|
|
|
if (self->displine == 400) { /* Start of VSYNC */
|
|
|
|
|
self->cga.cgastat |= 8;
|
|
|
|
|
self->dispon = 0;
|
|
|
|
|
}
|
|
|
|
|
if (self->displine == 416) { /* End of VSYNC */
|
|
|
|
|
self->displine = 0;
|
|
|
|
|
self->cga.cgastat &= ~8;
|
|
|
|
|
self->dispon = 1;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (self->dispon)
|
|
|
|
|
self->cga.cgastat &= ~1;
|
|
|
|
|
|
|
|
|
|
timer_advance_u64(&self->cga.timer, self->dispontime);
|
|
|
|
|
self->linepos = 0;
|
|
|
|
|
|
|
|
|
|
if (self->displine == 400) {
|
|
|
|
|
/* Hardcode 640x400 window size */
|
|
|
|
|
if ((640 != xsize) || (400 != ysize) || video_force_resize_get()) {
|
|
|
|
|
xsize = 640;
|
|
|
|
|
ysize = 400;
|
2022-02-20 02:26:27 -05:00
|
|
|
if (xsize < 64)
|
2020-03-25 02:18:28 +01:00
|
|
|
xsize = 656;
|
2022-02-20 02:26:27 -05:00
|
|
|
if (ysize < 32)
|
2020-03-25 02:18:28 +01:00
|
|
|
ysize = 200;
|
|
|
|
|
set_screen_size(xsize, ysize);
|
|
|
|
|
|
|
|
|
|
if (video_force_resize_get())
|
|
|
|
|
video_force_resize_set(0);
|
|
|
|
|
}
|
2021-09-13 23:19:10 +02:00
|
|
|
video_blit_memtoscreen(0, 0, xsize, ysize);
|
2020-03-25 02:18:28 +01:00
|
|
|
frames++;
|
|
|
|
|
|
|
|
|
|
/* Fixed 640x400 resolution */
|
|
|
|
|
video_res_x = 640;
|
|
|
|
|
video_res_y = 400;
|
|
|
|
|
|
|
|
|
|
if (self->cga.cgamode & 0x02) {
|
|
|
|
|
if (self->cga.cgamode & 0x10)
|
|
|
|
|
video_bpp = 1;
|
2022-02-20 02:26:27 -05:00
|
|
|
else
|
2020-03-25 02:18:28 +01:00
|
|
|
video_bpp = 2;
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
} else
|
2020-03-25 02:18:28 +01:00
|
|
|
video_bpp = 0;
|
|
|
|
|
self->cga.cgablink++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static void
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_recalcattrs(compaq_plasma_t *self)
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
/* val behaves as follows:
|
2022-02-20 02:26:27 -05:00
|
|
|
* Bit 0: Attributes 01-06, 08-0E are inverse video
|
|
|
|
|
* Bit 1: Attributes 01-06, 08-0E are bold
|
2020-03-25 02:18:28 +01:00
|
|
|
* Bit 2: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
|
2022-02-20 02:26:27 -05:00
|
|
|
* are inverse video
|
2020-03-25 02:18:28 +01:00
|
|
|
* Bit 3: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
|
|
|
|
|
* are bold */
|
|
|
|
|
|
|
|
|
|
/* Set up colours */
|
|
|
|
|
amber = makecol(0xff, 0x7D, 0x00);
|
|
|
|
|
black = makecol(0x64, 0x19, 0x00);
|
|
|
|
|
|
|
|
|
|
/* Initialise the attribute mapping. Start by defaulting everything
|
|
|
|
|
* to black on amber, and with bold set by bit 3 */
|
|
|
|
|
for (n = 0; n < 256; n++) {
|
2022-02-20 02:26:27 -05:00
|
|
|
blinkcols[n][0] = normcols[n][0] = amber;
|
2020-03-25 02:18:28 +01:00
|
|
|
blinkcols[n][1] = normcols[n][1] = black;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
/* Colours 0x11-0xFF are controlled by bits 2 and 3 of the
|
|
|
|
|
* passed value. Exclude x0 and x8, which are always black on
|
2020-03-25 02:18:28 +01:00
|
|
|
* amber. */
|
|
|
|
|
for (n = 0x11; n <= 0xFF; n++) {
|
2022-02-20 02:26:27 -05:00
|
|
|
if ((n & 7) == 0)
|
2020-03-25 02:18:28 +01:00
|
|
|
continue;
|
|
|
|
|
if (self->attrmap & 4) { /* Inverse */
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = amber;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = black;
|
|
|
|
|
} else { /* Normal */
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = black;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = amber;
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-02-20 02:26:27 -05:00
|
|
|
/* Set up the 01-0E range, controlled by bits 0 and 1 of the
|
2020-03-25 02:18:28 +01:00
|
|
|
* passed value. When blinking is enabled this also affects 81-8E. */
|
|
|
|
|
for (n = 0x01; n <= 0x0E; n++) {
|
2022-02-20 02:26:27 -05:00
|
|
|
if (n == 7)
|
2020-03-25 02:18:28 +01:00
|
|
|
continue;
|
|
|
|
|
if (self->attrmap & 1) {
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = amber;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = black;
|
|
|
|
|
blinkcols[n+128][0] = amber;
|
|
|
|
|
blinkcols[n+128][1] = black;
|
|
|
|
|
} else {
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = black;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = amber;
|
|
|
|
|
blinkcols[n+128][0] = black;
|
|
|
|
|
blinkcols[n+128][1] = amber;
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-02-20 02:26:27 -05:00
|
|
|
/* Colours 07 and 0F are always amber on black. If blinking is
|
2020-03-25 02:18:28 +01:00
|
|
|
* enabled so are 87 and 8F. */
|
|
|
|
|
for (n = 0x07; n <= 0x0F; n += 8) {
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = black;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = amber;
|
|
|
|
|
blinkcols[n+128][0] = black;
|
|
|
|
|
blinkcols[n+128][1] = amber;
|
|
|
|
|
}
|
|
|
|
|
/* When not blinking, colours 81-8F are always amber on black. */
|
|
|
|
|
for (n = 0x81; n <= 0x8F; n ++) {
|
|
|
|
|
normcols[n][0] = black;
|
|
|
|
|
normcols[n][1] = amber;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finally do the ones which are solid black. These differ between
|
|
|
|
|
* the normal and blinking mappings */
|
|
|
|
|
for (n = 0; n <= 0xFF; n += 0x11)
|
|
|
|
|
normcols[n][0] = normcols[n][1] = black;
|
|
|
|
|
|
|
|
|
|
/* In the blinking range, 00 11 22 .. 77 and 80 91 A2 .. F7 are black */
|
|
|
|
|
for (n = 0; n <= 0x77; n += 0x11) {
|
|
|
|
|
blinkcols[n][0] = blinkcols[n][1] = black;
|
|
|
|
|
blinkcols[n+128][0] = blinkcols[n+128][1] = black;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *
|
2022-02-20 02:26:27 -05:00
|
|
|
compaq_plasma_init(const device_t *info)
|
2020-03-25 02:18:28 +01:00
|
|
|
{
|
|
|
|
|
int display_type;
|
|
|
|
|
compaq_plasma_t *self = malloc(sizeof(compaq_plasma_t));
|
|
|
|
|
memset(self, 0, sizeof(compaq_plasma_t));
|
|
|
|
|
|
|
|
|
|
display_type = device_get_config_int("display_type");
|
|
|
|
|
self->cga.composite = (display_type != CGA_RGB);
|
|
|
|
|
self->cga.revision = device_get_config_int("composite_type");
|
|
|
|
|
|
|
|
|
|
self->vram = malloc(0x8000);
|
|
|
|
|
self->internal_monitor = 1;
|
|
|
|
|
|
|
|
|
|
cga_comp_init(self->cga.revision);
|
|
|
|
|
timer_add(&self->cga.timer, compaq_plasma_poll, self, 1);
|
|
|
|
|
mem_mapping_add(&self->plasma_mapping, 0xb8000, 0x08000, compaq_plasma_read, NULL, NULL, compaq_plasma_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self);
|
|
|
|
|
io_sethandler(0x03d0, 0x0010, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
|
|
|
|
|
io_sethandler(0x13c6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
|
|
|
|
|
io_sethandler(0x23c6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
|
|
|
|
|
|
|
|
|
|
/* Default attribute mapping is 4 */
|
|
|
|
|
self->attrmap = 4;
|
|
|
|
|
compaq_plasma_recalcattrs(self);
|
|
|
|
|
|
|
|
|
|
self->cga.cgastat = 0xF4;
|
|
|
|
|
self->cga.vram = self->vram;
|
|
|
|
|
|
|
|
|
|
overscan_x = overscan_y = 16;
|
|
|
|
|
|
|
|
|
|
self->cga.rgb_type = device_get_config_int("rgb_type");
|
|
|
|
|
cga_palette = (self->cga.rgb_type << 1);
|
|
|
|
|
cgapal_rebuild();
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
return self;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_close(void *p)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)p;
|
|
|
|
|
|
|
|
|
|
free(self->vram);
|
PIC rewrite, proper SMRAM API, complete SiS 471 rewrite and addition of 40x, 460, and 461, changes to mem.c/h, disabled Voodoo memory dumping on exit, bumped SDL Hardware scale quality to 2, bumped IDE/ATAPI drives to ATA-6, finally bumped emulator version to 3.0, redid the bus type ID's to allow for planned ATAPI hard disks, made SST flash set its high mappings to the correct address if the CPU is 16-bit, and added the SiS 401 AMI 486 Clone, AOpen Vi15G, and the Soyo 4SA2 (486 with SiS 496/497 that can boot from CD-ROM), assorted 286+ protected mode fixes (for slightly more accuracy), and fixes to 808x emulation (MS Word 1.0 and 1.10 for DOS now work correctly from floppy).
2020-10-14 23:15:01 +02:00
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
free(self);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_speed_changed(void *p)
|
|
|
|
|
{
|
|
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *)p;
|
|
|
|
|
|
|
|
|
|
compaq_plasma_recalctimings(self);
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-13 09:46:07 -04:00
|
|
|
const device_config_t compaq_plasma_config[] = {
|
|
|
|
|
{
|
|
|
|
|
.name = "display_type",
|
|
|
|
|
.description = "Display type",
|
|
|
|
|
.type = CONFIG_SELECTION,
|
|
|
|
|
.default_string = "",
|
|
|
|
|
.default_int = CGA_RGB,
|
|
|
|
|
.file_filter = "",
|
|
|
|
|
.spinner = { 0 },
|
|
|
|
|
.selection = {
|
|
|
|
|
{ .description = "RGB", .value = CGA_RGB },
|
|
|
|
|
{ .description = "Composite", .value = CGA_COMPOSITE },
|
|
|
|
|
{ .description = "" }
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.name = "composite_type",
|
|
|
|
|
.description = "Composite type",
|
|
|
|
|
.type = CONFIG_SELECTION,
|
|
|
|
|
.default_string = "",
|
|
|
|
|
.default_int = COMPOSITE_OLD,
|
|
|
|
|
.file_filter = "",
|
|
|
|
|
.spinner = { 0 },
|
2020-03-25 02:18:28 +01:00
|
|
|
{
|
2022-03-13 09:46:07 -04:00
|
|
|
{ .description = "Old", .value = COMPOSITE_OLD },
|
|
|
|
|
{ .description = "New", .value = COMPOSITE_NEW },
|
|
|
|
|
{ .description = "" }
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
2022-03-13 09:46:07 -04:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
.name = "rgb_type",
|
|
|
|
|
.description = "RGB type",
|
|
|
|
|
.type = CONFIG_SELECTION,
|
|
|
|
|
.default_string = "",
|
|
|
|
|
.default_int = 0,
|
|
|
|
|
.file_filter = "",
|
|
|
|
|
.spinner = { 0 },
|
|
|
|
|
.selection = {
|
|
|
|
|
{ .description = "Color", .value = 0 },
|
|
|
|
|
{ .description = "Green Monochrome", .value = 1 },
|
|
|
|
|
{ .description = "Amber Monochrome", .value = 2 },
|
|
|
|
|
{ .description = "Gray Monochrome", .value = 3 },
|
|
|
|
|
{ .description = "Color (no brown)", .value = 4 },
|
|
|
|
|
{ .description = "" }
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ .name = "", .description = "", .type = -1 }
|
2020-03-25 02:18:28 +01:00
|
|
|
};
|
|
|
|
|
|
2022-03-13 09:46:07 -04:00
|
|
|
static const device_t compaq_plasma_device = {
|
|
|
|
|
.name = "Compaq Plasma",
|
|
|
|
|
.internal_name = "compaq_plasma",
|
|
|
|
|
.flags = 0,
|
|
|
|
|
.local = 0,
|
|
|
|
|
.init = compaq_plasma_init,
|
|
|
|
|
.close = compaq_plasma_close,
|
|
|
|
|
.reset = NULL,
|
|
|
|
|
{ .available = NULL },
|
|
|
|
|
.speed_changed = compaq_plasma_speed_changed,
|
|
|
|
|
.force_redraw = NULL,
|
|
|
|
|
.config = compaq_plasma_config
|
2020-03-25 02:18:28 +01:00
|
|
|
};
|
2016-06-26 00:34:39 +02:00
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static uint8_t
|
|
|
|
|
read_ram(uint32_t addr, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addreadlookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
return(ram[addr]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
|
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static uint16_t
|
|
|
|
|
read_ramw(uint32_t addr, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addreadlookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
return(*(uint16_t *)&ram[addr]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
|
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static uint32_t
|
|
|
|
|
read_raml(uint32_t addr, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addreadlookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
return(*(uint32_t *)&ram[addr]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
|
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static void
|
|
|
|
|
write_ram(uint32_t addr, uint8_t val, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addwritelookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
mem_write_ramb_page(addr, val, &pages[addr >> 12]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
|
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static void
|
|
|
|
|
write_ramw(uint32_t addr, uint16_t val, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addwritelookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
mem_write_ramw_page(addr, val, &pages[addr >> 12]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
|
|
|
|
|
2017-11-11 16:03:13 -05:00
|
|
|
static void
|
|
|
|
|
write_raml(uint32_t addr, uint32_t val, void *priv)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2017-11-11 16:03:13 -05:00
|
|
|
addr = (addr & 0x7ffff) + 0x80000;
|
|
|
|
|
addwritelookup(mem_logical_addr, addr);
|
|
|
|
|
|
|
|
|
|
mem_write_raml_page(addr, val, &pages[addr >> 12]);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
const device_t *
|
|
|
|
|
at_cpqiii_get_device(void)
|
|
|
|
|
{
|
|
|
|
|
return &compaq_plasma_device;
|
|
|
|
|
}
|
2017-06-16 16:00:44 -04:00
|
|
|
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
static void
|
|
|
|
|
machine_at_compaq_init(const machine_t *model, int type)
|
2016-06-26 00:34:39 +02:00
|
|
|
{
|
2020-06-17 00:32:48 +02:00
|
|
|
if (type != COMPAQ_DESKPRO386)
|
|
|
|
|
mem_remap_top(384);
|
2022-02-20 02:26:27 -05:00
|
|
|
|
|
|
|
|
if (fdc_type == FDC_INTERNAL)
|
2020-06-17 00:32:48 +02:00
|
|
|
device_add(&fdc_at_device);
|
2017-11-11 16:03:13 -05:00
|
|
|
|
|
|
|
|
mem_mapping_add(&ram_mapping, 0xfa0000, 0x60000,
|
|
|
|
|
read_ram, read_ramw, read_raml,
|
|
|
|
|
write_ram, write_ramw, write_raml,
|
|
|
|
|
0xa0000+ram, MEM_MAPPING_INTERNAL, NULL);
|
2017-11-12 03:06:38 -05:00
|
|
|
|
2021-07-15 03:00:16 +02:00
|
|
|
video_reset(gfxcard);
|
|
|
|
|
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
switch(type) {
|
|
|
|
|
case COMPAQ_PORTABLEII:
|
2017-11-12 03:06:38 -05:00
|
|
|
break;
|
|
|
|
|
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
case COMPAQ_PORTABLEIII:
|
2020-03-25 02:18:28 +01:00
|
|
|
if (gfxcard == VID_INTERNAL)
|
|
|
|
|
device_add(&compaq_plasma_device);
|
2017-11-12 03:06:38 -05:00
|
|
|
break;
|
|
|
|
|
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
case COMPAQ_PORTABLEIII386:
|
2017-11-12 03:06:38 -05:00
|
|
|
if (hdc_current == 1)
|
2018-02-14 13:52:19 +01:00
|
|
|
device_add(&ide_isa_device);
|
2020-03-25 02:18:28 +01:00
|
|
|
if (gfxcard == VID_INTERNAL)
|
|
|
|
|
device_add(&compaq_plasma_device);
|
2017-11-12 03:06:38 -05:00
|
|
|
break;
|
2020-06-17 00:32:48 +02:00
|
|
|
|
|
|
|
|
case COMPAQ_DESKPRO386:
|
|
|
|
|
if (hdc_current == 1)
|
|
|
|
|
device_add(&ide_isa_device);
|
|
|
|
|
break;
|
2017-11-12 03:06:38 -05:00
|
|
|
}
|
2021-08-21 18:19:10 +02:00
|
|
|
|
|
|
|
|
machine_at_init(model);
|
2016-06-26 00:34:39 +02:00
|
|
|
}
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_portableii_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2021-03-14 20:35:01 +01:00
|
|
|
ret = bios_load_interleavedr("roms/machines/portableii/109740-001.rom",
|
|
|
|
|
"roms/machines/portableii/109739-001.rom",
|
2020-03-25 19:06:15 +01:00
|
|
|
0x000f8000, 65536, 0);
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
|
|
|
|
|
if (bios_only || !ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEII);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_portableiii_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2021-03-14 20:35:01 +01:00
|
|
|
ret = bios_load_interleavedr("roms/machines/portableiii/Compaq Portable III - BIOS - 106779-002 - Even.bin",
|
|
|
|
|
"roms/machines/portableiii/Compaq Portable III - BIOS - 106778-002 - Odd.bin",
|
2020-03-25 19:06:15 +01:00
|
|
|
0x000f8000, 65536, 0);
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
|
|
|
|
|
if (bios_only || !ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEIII);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_portableiii386_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2021-03-14 20:35:01 +01:00
|
|
|
ret = bios_load_interleavedr("roms/machines/portableiii/Compaq Portable III - BIOS - 106779-002 - Even.bin",
|
|
|
|
|
"roms/machines/portableiii/Compaq Portable III - BIOS - 106778-002 - Odd.bin",
|
2020-03-25 19:06:15 +01:00
|
|
|
0x000f8000, 65536, 0);
|
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.
2019-09-20 14:02:30 +02:00
|
|
|
|
|
|
|
|
if (bios_only || !ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEIII386);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|