2017-11-11 16:03:13 -05:00
|
|
|
/*
|
2022-11-13 16:37:58 -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.
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
2022-11-13 16:37:58 -05:00
|
|
|
* This file is part of the 86Box distribution.
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
2022-11-13 16:37:58 -05:00
|
|
|
* Emulation of various Compaq PC's.
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
2020-03-25 00:46:02 +02:00
|
|
|
*
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
2023-01-06 15:36:29 -05:00
|
|
|
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
|
2022-11-13 16:37:58 -05:00
|
|
|
* Miran Grca, <mgrca8@gmail.com>
|
|
|
|
|
* TheCollector1995, <mariogplayer@gmail.com>
|
2017-11-11 16:03:13 -05:00
|
|
|
*
|
2022-11-13 16:37:58 -05: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>
|
2023-07-14 22:14:56 +02:00
|
|
|
#include <86box/keyboard.h>
|
2020-03-29 14:24:42 +02:00
|
|
|
#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
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
|
|
|
|
|
static video_timings_t timing_compaq_plasma = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
|
|
|
|
|
|
2022-07-27 15:17:53 -04: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,
|
2023-07-14 22:14:56 +02:00
|
|
|
COMPAQ_DESKPRO386,
|
|
|
|
|
COMPAQ_DESKPRO386_01_1988
|
2020-03-25 02:18:28 +01:00
|
|
|
};
|
|
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
#define CGA_RGB 0
|
2020-03-25 02:18:28 +01:00
|
|
|
#define CGA_COMPOSITE 1
|
|
|
|
|
|
|
|
|
|
/*Very rough estimate*/
|
2022-07-27 15:17:53 -04:00
|
|
|
#define VID_CLOCK (double) (651 * 416 * 60)
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
static uint8_t cga_crtcmask[32] = {
|
|
|
|
|
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
|
|
|
|
|
};
|
|
|
|
|
|
2020-03-25 02:18:28 +01:00
|
|
|
/* Mapping of attributes to colours */
|
2023-05-11 03:02:36 -04:00
|
|
|
static uint32_t amber;
|
|
|
|
|
static uint32_t black;
|
2022-07-27 15:17:53 -04:00
|
|
|
static uint32_t blinkcols[256][2];
|
|
|
|
|
static uint32_t normcols[256][2];
|
2020-03-25 02:18:28 +01:00
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
static uint8_t mdaattr[256][2][2];
|
|
|
|
|
|
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)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
cpq_st_display_internal = internal;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
2022-02-20 02:26:27 -05:00
|
|
|
static uint8_t
|
2020-03-25 02:18:28 +01:00
|
|
|
compaq_plasma_display_get(void)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
return cpq_st_display_internal;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
typedef struct compaq_plasma_t {
|
|
|
|
|
cga_t cga;
|
|
|
|
|
uint8_t port_23c6;
|
|
|
|
|
uint8_t internal_monitor;
|
2023-07-14 22:14:56 +02:00
|
|
|
uint8_t attrmap;
|
2020-03-25 02:18:28 +01:00
|
|
|
} compaq_plasma_t;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
static int compaq_machine_type = 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
|
|
|
|
2016-06-26 00:34:39 +02:00
|
|
|
/* Compaq Deskpro 386 remaps RAM from 0xA0000-0xFFFFF to 0xFA0000-0xFFFFFF */
|
2022-07-27 15:17:53 -04: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)
|
|
|
|
|
{
|
2023-05-11 03:02:36 -04:00
|
|
|
double _dispontime;
|
|
|
|
|
double _dispofftime;
|
|
|
|
|
double disptime;
|
2022-07-27 15:17:53 -04:00
|
|
|
|
|
|
|
|
if (!self->internal_monitor && !(self->port_23c6 & 1)) {
|
|
|
|
|
cga_recalctimings(&self->cga);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
disptime = 651;
|
|
|
|
|
_dispontime = 640;
|
|
|
|
|
_dispofftime = disptime - _dispontime;
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.dispontime = (uint64_t) (_dispontime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
|
|
|
|
|
self->cga.dispofftime = (uint64_t) (_dispofftime * (cpuclock / VID_CLOCK) * (double) (1ULL << 32));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_waitstates(void *p)
|
|
|
|
|
{
|
|
|
|
|
int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
|
|
|
|
|
int ws;
|
|
|
|
|
|
|
|
|
|
ws = ws_array[cycles & 0xf];
|
|
|
|
|
sub_cycles(ws);
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_write(uint32_t addr, uint8_t val, void *priv)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) priv;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.vram[addr & 0x7fff] = val;
|
|
|
|
|
compaq_plasma_waitstates(&self->cga);
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint8_t
|
|
|
|
|
compaq_plasma_read(uint32_t addr, void *priv)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) priv;
|
|
|
|
|
uint8_t ret;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
compaq_plasma_waitstates(&self->cga);
|
|
|
|
|
ret = (self->cga.vram[addr & 0x7fff]);
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
return ret;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_out(uint16_t addr, uint8_t val, void *priv)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) priv;
|
|
|
|
|
uint8_t old;
|
|
|
|
|
|
|
|
|
|
switch (addr) {
|
|
|
|
|
/* Emulated CRTC, register select */
|
|
|
|
|
case 0x3d4:
|
2023-07-14 22:14:56 +02:00
|
|
|
cga_out(addr, val, &self->cga);
|
2022-07-27 15:17:53 -04:00
|
|
|
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
|
|
|
|
|
* plasma screen. */
|
|
|
|
|
if (self->cga.crtcreg == 0x12) {
|
|
|
|
|
self->attrmap = val;
|
|
|
|
|
compaq_plasma_recalcattrs(self);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (old != val) {
|
|
|
|
|
if (self->cga.crtcreg < 0xe || self->cga.crtcreg > 0x10) {
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.fullchange = changeframecount;
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_recalctimings(self);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 0x3d8:
|
|
|
|
|
case 0x3d9:
|
2023-07-14 22:14:56 +02:00
|
|
|
cga_out(addr, val, &self->cga);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x13c6:
|
2023-07-14 22:14:56 +02:00
|
|
|
compaq_plasma_display_set((val & 8) ? 1 : 0);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x23c6:
|
|
|
|
|
self->port_23c6 = val;
|
|
|
|
|
if (val & 8) /* Disable internal CGA */
|
2023-07-14 22:14:56 +02:00
|
|
|
mem_mapping_disable(&self->cga.mapping);
|
2022-07-27 15:17:53 -04:00
|
|
|
else
|
2023-07-14 22:14:56 +02:00
|
|
|
mem_mapping_enable(&self->cga.mapping);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
}
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint8_t
|
|
|
|
|
compaq_plasma_in(uint16_t addr, void *priv)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) priv;
|
|
|
|
|
uint8_t ret = 0xff;
|
|
|
|
|
|
|
|
|
|
switch (addr) {
|
|
|
|
|
case 0x3d4:
|
2023-07-14 22:14:56 +02:00
|
|
|
case 0x3da:
|
|
|
|
|
ret = cga_in(addr, &self->cga);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x3d5:
|
|
|
|
|
if (self->cga.crtcreg == 0x12) {
|
2023-07-14 22:14:56 +02:00
|
|
|
ret = self->attrmap & 0x0f;
|
2022-07-27 15:17:53 -04:00
|
|
|
if (self->internal_monitor)
|
|
|
|
|
ret |= 0x30; /* Plasma / CRT */
|
|
|
|
|
} else
|
2023-07-14 22:14:56 +02:00
|
|
|
ret = cga_in(addr, &self->cga);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
case 0x13c6:
|
|
|
|
|
ret = compaq_plasma_display_get() ? 8 : 0;
|
|
|
|
|
ret |= 4;
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
case 0x1bc6:
|
|
|
|
|
ret = 0;
|
|
|
|
|
if (compaq_plasma_display_get()) {
|
|
|
|
|
if ((self->cga.cgamode & 0x12) == 0x12) {
|
|
|
|
|
if (self->port_23c6 & 8)
|
|
|
|
|
ret |= 0x40;
|
|
|
|
|
else
|
|
|
|
|
ret |= 0x20;
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0x23c6:
|
2023-07-14 22:14:56 +02:00
|
|
|
ret = 0;
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_poll(void *p)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) p;
|
2023-07-14 22:14:56 +02:00
|
|
|
uint8_t chr, attr;
|
|
|
|
|
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;
|
|
|
|
|
uint16_t addr;
|
|
|
|
|
int drawcursor;
|
|
|
|
|
int x, c;
|
|
|
|
|
int cursorline;
|
|
|
|
|
int blink = 0;
|
|
|
|
|
int underline = 0;
|
|
|
|
|
uint32_t ink = 0;
|
|
|
|
|
uint32_t fg = (self->cga.cgacol & 0x0f) ? amber : black;
|
|
|
|
|
uint32_t bg = black;
|
|
|
|
|
uint32_t cols[2];
|
|
|
|
|
uint8_t dat2, pattern;
|
|
|
|
|
uint32_t ink0 = 0, ink1 = 0;
|
2022-07-27 15:17:53 -04:00
|
|
|
|
|
|
|
|
/* Switch between internal plasma and external CRT display. */
|
2023-07-14 22:14:56 +02:00
|
|
|
if ((cpq_st_display_internal != -1) && (cpq_st_display_internal != self->internal_monitor)) {
|
2022-07-27 15:17:53 -04:00
|
|
|
self->internal_monitor = cpq_st_display_internal;
|
|
|
|
|
compaq_plasma_recalctimings(self);
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
/* graphic mode and not mode 40h */
|
2022-07-27 15:17:53 -04:00
|
|
|
if (!self->internal_monitor && !(self->port_23c6 & 1)) {
|
|
|
|
|
cga_poll(&self->cga);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
/* mode 40h or text mode */
|
|
|
|
|
if (!self->cga.linepos) {
|
|
|
|
|
timer_advance_u64(&self->cga.timer, self->cga.dispofftime);
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.cgastat |= 1;
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.linepos = 1;
|
|
|
|
|
if (self->cga.cgadispon) {
|
|
|
|
|
if (self->cga.displine == 0) {
|
2022-07-27 15:17:53 -04:00
|
|
|
video_wait_for_buffer();
|
2023-07-14 22:14:56 +02:00
|
|
|
}
|
|
|
|
|
if (self->cga.cgamode & 2) {
|
|
|
|
|
if (self->cga.cgamode & 0x10) {
|
|
|
|
|
/* 640x400 mode */
|
|
|
|
|
if (self->port_23c6 & 1) /* 640*400 */ {
|
|
|
|
|
addr = ((self->cga.displine) & 1) * 0x2000 + ((self->cga.displine >> 1) & 1) * 0x4000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
|
|
|
|
|
} else {
|
|
|
|
|
addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
|
|
|
|
|
}
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
dat2 = self->cga.vram[(addr & 0x7FFF)];
|
|
|
|
|
addr++;
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
|
|
|
|
ink = (dat2 & 0x80) ? fg : bg;
|
|
|
|
|
if (!(self->cga.cgamode & 8))
|
|
|
|
|
ink = black;
|
|
|
|
|
((uint32_t *) buffer32->line[self->cga.displine])[x * 8 + c] = ink;
|
|
|
|
|
dat2 <<= 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
addr = ((self->cga.displine >> 1) & 1) * 0x2000 + (self->cga.displine >> 2) * 80 + ((ma & ~1) << 1);
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
dat2 = self->cga.vram[(addr & 0x7fff)];
|
|
|
|
|
addr++;
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < 4; c++) {
|
|
|
|
|
pattern = (dat2 & 0xC0) >> 6;
|
|
|
|
|
if (!(self->cga.cgamode & 8))
|
|
|
|
|
pattern = 0;
|
|
|
|
|
|
|
|
|
|
switch (pattern & 3) {
|
|
|
|
|
case 0:
|
|
|
|
|
ink0 = ink1 = black;
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
if (self->cga.displine & 1) {
|
|
|
|
|
ink0 = black;
|
|
|
|
|
ink1 = black;
|
|
|
|
|
} else {
|
|
|
|
|
ink0 = amber;
|
|
|
|
|
ink1 = black;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
if (self->cga.displine & 1) {
|
|
|
|
|
ink0 = black;
|
|
|
|
|
ink1 = amber;
|
|
|
|
|
} else {
|
|
|
|
|
ink0 = amber;
|
|
|
|
|
ink1 = black;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
ink0 = ink1 = amber;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
buffer32->line[self->cga.displine][x * 8 + 2 * c] = ink0;
|
|
|
|
|
buffer32->line[self->cga.displine][x * 8 + 2 * c + 1] = ink1;
|
|
|
|
|
dat2 <<= 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (self->cga.cgamode & 1) {
|
|
|
|
|
/* 80-col */
|
|
|
|
|
sc = self->cga.displine & 0x0f;
|
|
|
|
|
addr = ((ma & ~1) + (self->cga.displine >> 4) * 80) * 2;
|
|
|
|
|
ma += (self->cga.displine >> 4) * 80;
|
|
|
|
|
|
|
|
|
|
if ((self->cga.crtc[0x0a] & 0x60) == 0x20)
|
|
|
|
|
cursorline = 0;
|
|
|
|
|
else
|
|
|
|
|
cursorline = ((self->cga.crtc[0x0a] & 0x0f) * 2 <= sc) && ((self->cga.crtc[0x0b] & 0x0F) * 2 >= sc);
|
|
|
|
|
|
|
|
|
|
/* for each text column */
|
|
|
|
|
for (x = 0; x < 80; x++) {
|
|
|
|
|
/* video output enabled */
|
|
|
|
|
if (self->cga.cgamode & 8) {
|
|
|
|
|
chr = self->cga.vram[(addr + 2 * x) & 0x7fff];
|
|
|
|
|
attr = self->cga.vram[(addr + 2 * x + 1) & 0x7fff];
|
|
|
|
|
} else
|
|
|
|
|
chr = attr = 0;
|
|
|
|
|
/* check if cursor has to be drawn */
|
|
|
|
|
drawcursor = ((ma == ca) && cursorline && self->cga.cursoron);
|
|
|
|
|
underline = ((self->port_23c6 & 0x40) && (attr & 0x1) && !(attr & 0x6));
|
|
|
|
|
if (underline) {
|
|
|
|
|
/* set forecolor to white */
|
|
|
|
|
attr |= 7;
|
|
|
|
|
}
|
|
|
|
|
blink = 0;
|
|
|
|
|
/* blink active */
|
|
|
|
|
if (self->cga.cgamode & 0x20) {
|
|
|
|
|
cols[1] = blinkcols[attr][1];
|
|
|
|
|
cols[0] = blinkcols[attr][0];
|
|
|
|
|
/* attribute 7 active and not cursor */
|
|
|
|
|
if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor) {
|
|
|
|
|
/* set blinking */
|
|
|
|
|
cols[1] = cols[0];
|
|
|
|
|
blink = 1;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/* Set intensity bit */
|
|
|
|
|
cols[1] = normcols[attr][1];
|
|
|
|
|
cols[0] = normcols[attr][0];
|
|
|
|
|
blink = (attr & 0x80) * 8 + 7 + 16;
|
|
|
|
|
}
|
|
|
|
|
/* character underline active and 7th row of pixels in character height being drawn */
|
|
|
|
|
if (underline && (sc == 7)) {
|
|
|
|
|
/* for each pixel in character width */
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 3) + c] = mdaattr[attr][blink][1];
|
|
|
|
|
} else if (drawcursor) {
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 3) + c] = cols[(fontdatm[chr + self->cga.fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
|
|
|
|
|
} else {
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 3) + c] = cols[(fontdatm[chr + self->cga.fontbase][sc] & (1 << (c ^ 7))) ? 1 : 0];
|
|
|
|
|
}
|
2022-07-27 15:17:53 -04:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
++ma;
|
|
|
|
|
}
|
|
|
|
|
} else { /* 40-col */
|
|
|
|
|
sc = self->cga.displine & 0x0f;
|
|
|
|
|
addr = ((ma & ~1) + (self->cga.displine >> 4) * 40) * 2;
|
|
|
|
|
ma += (self->cga.displine >> 4) * 40;
|
|
|
|
|
|
|
|
|
|
if ((self->cga.crtc[0x0a] & 0x60) == 0x20)
|
|
|
|
|
cursorline = 0;
|
2022-07-27 15:17:53 -04:00
|
|
|
else
|
2023-07-14 22:14:56 +02:00
|
|
|
cursorline = ((self->cga.crtc[0x0a] & 0x0f) * 2 <= sc) && ((self->cga.crtc[0x0b] & 0x0F) * 2 >= sc);
|
|
|
|
|
|
|
|
|
|
for (x = 0; x < 40; x++) {
|
|
|
|
|
if (self->cga.cgamode & 8) {
|
|
|
|
|
chr = self->cga.vram[(addr + 2 * x) & 0x7fff];
|
|
|
|
|
attr = self->cga.vram[(addr + 2 * x + 1) & 0x7fff];
|
|
|
|
|
} else {
|
|
|
|
|
chr = attr = 0;
|
|
|
|
|
}
|
|
|
|
|
drawcursor = ((ma == ca) && cursorline && self->cga.cursoron);
|
|
|
|
|
underline = ((self->port_23c6 & 0x40) && (attr & 0x1) && !(attr & 0x6));
|
|
|
|
|
if (underline) {
|
|
|
|
|
/* set forecolor to white */
|
|
|
|
|
attr |= 7;
|
|
|
|
|
}
|
|
|
|
|
blink = 0;
|
|
|
|
|
/* blink active */
|
|
|
|
|
if (self->cga.cgamode & 0x20) {
|
|
|
|
|
cols[1] = blinkcols[attr][1];
|
|
|
|
|
cols[0] = blinkcols[attr][0];
|
|
|
|
|
/* attribute 7 active and not cursor */
|
|
|
|
|
if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor) {
|
|
|
|
|
/* set blinking */
|
|
|
|
|
cols[1] = cols[0];
|
|
|
|
|
blink = 1;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/* Set intensity bit */
|
|
|
|
|
cols[1] = normcols[attr][1];
|
|
|
|
|
cols[0] = normcols[attr][0];
|
|
|
|
|
blink = (attr & 0x80) * 8 + 7 + 16;
|
|
|
|
|
}
|
|
|
|
|
/* character underline active and 7th row of pixels in character height being drawn */
|
|
|
|
|
if (underline && (sc == 7)) {
|
|
|
|
|
/* for each pixel in character width */
|
|
|
|
|
for (c = 0; c < 8; c++)
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 4) + (c * 2)] = buffer32->line[self->cga.displine][(x << 4) + (c * 2) + 1] = mdaattr[attr][blink][1];
|
|
|
|
|
} else if (drawcursor) {
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 4) + c * 2] = buffer32->line[self->cga.displine][(x << 4) + c * 2 + 1] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0] ^ (amber ^ black);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (c = 0; c < 8; c++) {
|
|
|
|
|
buffer32->line[self->cga.displine][(x << 4) + c * 2] = buffer32->line[self->cga.displine][(x << 4) + c * 2 + 1] = cols[(fontdatm[chr][sc] & (1 << (c ^ 7))) ? 1 : 0];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
++ma;
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-07-27 15:17:53 -04:00
|
|
|
}
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.displine++;
|
2022-07-27 15:17:53 -04:00
|
|
|
/* Hardcode a fixed refresh rate and VSYNC timing */
|
2023-07-14 22:14:56 +02:00
|
|
|
if (self->cga.displine == 400) { /* Start of VSYNC */
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.cgastat |= 8;
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.cgadispon = 0;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
2023-07-14 22:14:56 +02:00
|
|
|
if (self->cga.displine == 416) { /* End of VSYNC */
|
|
|
|
|
self->cga.displine = 0;
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.cgastat &= ~8;
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.cgadispon = 1;
|
2022-07-27 15:17:53 -04:00
|
|
|
}
|
|
|
|
|
} else {
|
2023-07-14 22:14:56 +02:00
|
|
|
if (self->cga.cgadispon)
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.cgastat &= ~1;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
timer_advance_u64(&self->cga.timer, self->cga.dispontime);
|
|
|
|
|
self->cga.linepos = 0;
|
2022-07-27 15:17:53 -04:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
if (self->cga.displine == 400) {
|
2022-07-27 15:17:53 -04:00
|
|
|
/* Hardcode 640x400 window size */
|
|
|
|
|
if ((640 != xsize) || (400 != ysize) || video_force_resize_get()) {
|
|
|
|
|
xsize = 640;
|
|
|
|
|
ysize = 400;
|
|
|
|
|
if (xsize < 64)
|
|
|
|
|
xsize = 656;
|
|
|
|
|
if (ysize < 32)
|
|
|
|
|
ysize = 200;
|
|
|
|
|
set_screen_size(xsize, ysize);
|
|
|
|
|
|
|
|
|
|
if (video_force_resize_get())
|
|
|
|
|
video_force_resize_set(0);
|
|
|
|
|
}
|
|
|
|
|
video_blit_memtoscreen(0, 0, xsize, ysize);
|
|
|
|
|
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;
|
|
|
|
|
else
|
|
|
|
|
video_bpp = 2;
|
|
|
|
|
} else
|
|
|
|
|
video_bpp = 0;
|
2023-07-14 22:14:56 +02:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.cgablink++;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
static void
|
|
|
|
|
compaq_plasma_mdaattr_rebuild(void)
|
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < 256; c++) {
|
|
|
|
|
mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
|
|
|
|
|
if (c & 8)
|
|
|
|
|
mdaattr[c][0][1] = 15 + 16;
|
|
|
|
|
else
|
|
|
|
|
mdaattr[c][0][1] = 7 + 16;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mdaattr[0x70][0][1] = 16;
|
|
|
|
|
mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
|
|
|
|
|
mdaattr[0xF0][0][1] = 16;
|
|
|
|
|
mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
|
|
|
|
|
mdaattr[0x78][0][1] = 16 + 7;
|
|
|
|
|
mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
|
|
|
|
|
mdaattr[0xF8][0][1] = 16 + 7;
|
|
|
|
|
mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
|
|
|
|
|
mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
|
|
|
|
|
mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
|
|
|
|
|
mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
|
|
|
|
|
mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
|
|
|
|
|
}
|
|
|
|
|
|
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)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
/* val behaves as follows:
|
|
|
|
|
* Bit 0: Attributes 01-06, 08-0E are inverse video
|
|
|
|
|
* Bit 1: Attributes 01-06, 08-0E are bold
|
|
|
|
|
* Bit 2: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
|
2023-01-06 15:36:05 -05:00
|
|
|
* are inverse video
|
2022-07-27 15:17:53 -04:00
|
|
|
* Bit 3: Attributes 11-16, 18-1F, 21-26, 28-2F ... F1-F6, F8-FF
|
2023-01-06 15:36:05 -05:00
|
|
|
* are bold */
|
2022-07-27 15:17:53 -04:00
|
|
|
|
|
|
|
|
/* Set up colours */
|
2023-07-14 22:14:56 +02:00
|
|
|
amber = makecol(0xff, 0x7d, 0x00);
|
|
|
|
|
black = makecol(0x64, 0x0c, 0x00);
|
2022-07-27 15:17:53 -04:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
/* Initialize the attribute mapping. Start by defaulting everything
|
2022-07-27 15:17:53 -04:00
|
|
|
* to black on amber, and with bold set by bit 3 */
|
|
|
|
|
for (n = 0; n < 256; n++) {
|
|
|
|
|
blinkcols[n][0] = normcols[n][0] = amber;
|
|
|
|
|
blinkcols[n][1] = normcols[n][1] = black;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Colours 0x11-0xFF are controlled by bits 2 and 3 of the
|
|
|
|
|
* passed value. Exclude x0 and x8, which are always black on
|
|
|
|
|
* amber. */
|
|
|
|
|
for (n = 0x11; n <= 0xFF; n++) {
|
|
|
|
|
if ((n & 7) == 0)
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Set up the 01-0E range, controlled by bits 0 and 1 of the
|
|
|
|
|
* passed value. When blinking is enabled this also affects 81-8E. */
|
|
|
|
|
for (n = 0x01; n <= 0x0E; n++) {
|
|
|
|
|
if (n == 7)
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Colours 07 and 0F are always amber on black. If blinking is
|
|
|
|
|
* 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;
|
|
|
|
|
}
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = malloc(sizeof(compaq_plasma_t));
|
|
|
|
|
memset(self, 0, sizeof(compaq_plasma_t));
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
video_inform(VIDEO_FLAG_TYPE_CGA, &timing_compaq_plasma);
|
|
|
|
|
loadfont_ex("roms/machines/portableiii/K Combined.bin", 1, 0x4bb2);
|
|
|
|
|
|
|
|
|
|
self->cga.composite = 0;
|
|
|
|
|
self->cga.revision = 0;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.vram = malloc(0x8000);
|
2022-07-27 15:17:53 -04:00
|
|
|
self->internal_monitor = 1;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
cga_comp_init(self->cga.revision);
|
|
|
|
|
timer_add(&self->cga.timer, compaq_plasma_poll, self, 1);
|
2023-07-14 22:14:56 +02:00
|
|
|
mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, compaq_plasma_read, NULL, NULL, compaq_plasma_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self);
|
2022-07-27 15:17:53 -04:00
|
|
|
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);
|
2023-07-14 22:14:56 +02:00
|
|
|
io_sethandler(0x1bc6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
|
2022-07-27 15:17:53 -04:00
|
|
|
io_sethandler(0x23c6, 0x0001, compaq_plasma_in, NULL, NULL, compaq_plasma_out, NULL, NULL, self);
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
/* Default attribute mapping is 4 */
|
|
|
|
|
self->attrmap = 4;
|
|
|
|
|
compaq_plasma_recalcattrs(self);
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
self->cga.cgastat = 0xf4;
|
2022-07-27 15:17:53 -04:00
|
|
|
overscan_x = overscan_y = 16;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
self->cga.rgb_type = device_get_config_int("rgb_type");
|
|
|
|
|
cga_palette = (self->cga.rgb_type << 1);
|
|
|
|
|
cgapal_rebuild();
|
2023-07-14 22:14:56 +02:00
|
|
|
compaq_plasma_mdaattr_rebuild();
|
2022-02-20 02:26:27 -05:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
return self;
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_close(void *p)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) p;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
free(self->cga.vram);
|
2022-07-27 15:17:53 -04:00
|
|
|
free(self);
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
compaq_plasma_speed_changed(void *p)
|
|
|
|
|
{
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_t *self = (compaq_plasma_t *) p;
|
2020-03-25 02:18:28 +01:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
compaq_plasma_recalctimings(self);
|
2020-03-25 02:18:28 +01:00
|
|
|
}
|
|
|
|
|
|
2022-03-13 09:46:07 -04:00
|
|
|
const device_config_t compaq_plasma_config[] = {
|
2022-07-27 15:17:53 -04:00
|
|
|
// clang-format off
|
2022-03-13 09:46:07 -04:00
|
|
|
{
|
|
|
|
|
.name = "rgb_type",
|
2023-07-14 22:14:56 +02:00
|
|
|
.description = "RGB type",
|
|
|
|
|
.type = CONFIG_SELECTION,
|
2022-03-13 09:46:07 -04:00
|
|
|
.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 = "" }
|
|
|
|
|
}
|
|
|
|
|
},
|
2022-04-02 18:14:24 -04:00
|
|
|
{ .name = "", .description = "", .type = CONFIG_END }
|
2022-11-19 08:49:04 -05:00
|
|
|
// clang-format on
|
2020-03-25 02:18:28 +01:00
|
|
|
};
|
|
|
|
|
|
2022-07-19 18:51:18 -04:00
|
|
|
const device_t compaq_plasma_device = {
|
2022-07-27 15:17:53 -04:00
|
|
|
.name = "Compaq Plasma",
|
2022-03-13 09:46:07 -04:00
|
|
|
.internal_name = "compaq_plasma",
|
2022-07-27 15:17:53 -04:00
|
|
|
.flags = 0,
|
|
|
|
|
.local = 0,
|
|
|
|
|
.init = compaq_plasma_init,
|
|
|
|
|
.close = compaq_plasma_close,
|
|
|
|
|
.reset = NULL,
|
2022-03-13 09:46:07 -04:00
|
|
|
{ .available = NULL },
|
|
|
|
|
.speed_changed = compaq_plasma_speed_changed,
|
2022-07-27 15:17:53 -04:00
|
|
|
.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);
|
|
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
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);
|
|
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
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);
|
|
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
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
|
|
|
}
|
|
|
|
|
|
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
|
|
|
{
|
2023-07-14 22:14:56 +02:00
|
|
|
compaq_machine_type = type;
|
|
|
|
|
|
|
|
|
|
if ((type != COMPAQ_DESKPRO386) && (type != COMPAQ_DESKPRO386_01_1988))
|
2022-07-27 15:17:53 -04:00
|
|
|
mem_remap_top(384);
|
2022-02-20 02:26:27 -05:00
|
|
|
|
|
|
|
|
if (fdc_type == FDC_INTERNAL)
|
2022-07-27 15:17:53 -04:00
|
|
|
device_add(&fdc_at_device);
|
2017-11-11 16:03:13 -05:00
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
if ((type == COMPAQ_DESKPRO386) || (type == COMPAQ_DESKPRO386_01_1988) || (type == COMPAQ_PORTABLEIII386))
|
|
|
|
|
mem_mapping_add(&ram_mapping, 0xfa0000, 0x60000,
|
|
|
|
|
read_ram, read_ramw, read_raml,
|
|
|
|
|
write_ram, write_ramw, write_raml,
|
|
|
|
|
0xa0000 + ram, MEM_MAPPING_EXTERNAL, NULL);
|
|
|
|
|
else
|
|
|
|
|
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
|
|
|
|
2023-02-06 04:12:46 -05:00
|
|
|
video_reset(gfxcard[0]);
|
2021-07-15 03:00:16 +02:00
|
|
|
|
2022-07-27 15:17:53 -04:00
|
|
|
switch (type) {
|
|
|
|
|
case COMPAQ_PORTABLEII:
|
2023-07-14 22:14:56 +02:00
|
|
|
machine_at_init(model);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COMPAQ_PORTABLEIII:
|
2023-02-06 04:12:46 -05:00
|
|
|
if (gfxcard[0] == VID_INTERNAL)
|
2022-07-27 15:17:53 -04:00
|
|
|
device_add(&compaq_plasma_device);
|
2023-07-14 22:14:56 +02:00
|
|
|
machine_at_init(model);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COMPAQ_PORTABLEIII386:
|
|
|
|
|
if (hdc_current == 1)
|
|
|
|
|
device_add(&ide_isa_device);
|
2023-02-06 04:12:46 -05:00
|
|
|
if (gfxcard[0] == VID_INTERNAL)
|
2022-07-27 15:17:53 -04:00
|
|
|
device_add(&compaq_plasma_device);
|
2023-07-14 22:14:56 +02:00
|
|
|
machine_at_init(model);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COMPAQ_DESKPRO386:
|
2023-07-14 22:14:56 +02:00
|
|
|
case COMPAQ_DESKPRO386_01_1988:
|
2022-07-27 15:17:53 -04:00
|
|
|
if (hdc_current == 1)
|
|
|
|
|
device_add(&ide_isa_device);
|
2023-07-14 22:14:56 +02:00
|
|
|
machine_at_common_init(model);
|
|
|
|
|
device_add(&keyboard_at_compaq_device);
|
2022-07-27 15:17:53 -04:00
|
|
|
break;
|
2017-11-12 03:06:38 -05: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
|
|
|
|
|
|
|
|
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",
|
2022-07-27 15:17:53 -04:00
|
|
|
"roms/machines/portableii/109739-001.rom",
|
|
|
|
|
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)
|
2022-07-27 15:17:53 -04:00
|
|
|
return ret;
|
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
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEII);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_portableiii_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
ret = bios_load_linearr("roms/machines/portableiii/K Combined.bin",
|
|
|
|
|
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)
|
2022-07-27 15:17:53 -04:00
|
|
|
return ret;
|
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
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEIII);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_portableiii386_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
2023-07-14 22:14:56 +02:00
|
|
|
ret = bios_load_linearr("roms/machines/portableiii/K Combined.bin",
|
|
|
|
|
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)
|
2022-07-27 15:17:53 -04:00
|
|
|
return ret;
|
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
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_PORTABLEIII386);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2022-03-18 21:22:18 +01:00
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_deskpro386_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = bios_load_linearr("roms/machines/deskpro386/1986-09-04-HI.json.bin",
|
2023-07-14 22:14:56 +02:00
|
|
|
0x000f8000, 65536, 0);
|
2022-03-18 21:22:18 +01:00
|
|
|
|
|
|
|
|
if (bios_only || !ret)
|
2022-07-27 15:17:53 -04:00
|
|
|
return ret;
|
2022-03-18 21:22:18 +01:00
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_DESKPRO386);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2023-07-14 22:14:56 +02:00
|
|
|
|
|
|
|
|
int
|
|
|
|
|
machine_at_deskpro386_01_1988_init(const machine_t *model)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = bios_load_linearr("roms/machines/deskpro386/1988-01-28.json.bin",
|
|
|
|
|
0x000f8000, 65536, 0);
|
|
|
|
|
|
|
|
|
|
if (bios_only || !ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
machine_at_compaq_init(model, COMPAQ_DESKPRO386_01_1988);
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|