claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added the IBM 5161 ISA expansion for PC and XT;

Browse Source 
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port;
Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX);
Finished the 586MC1;
Added 8087 emulation;
Moved Cyrix 6x86'es to the Dev branch;
Sanitized/cleaned up memregs.c/h and intel.c/h;
Split the chipsets from machines and sanitized Port 92 emulation;
Added support for the 15bpp mode to the Compaq ATI 28800;
Moved the MR 386DX and 486 machines to the Dev branch;
Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00;
Ported the new timer code from PCem;
Cleaned up the CPU table of unused stuff and better optimized its structure;
Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch;
Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem;
Added the AHA-1540A and the BusTek BT-542B;
Moved the Sumo SCSI-AT to the Dev branch;
Minor IDE, FDC, and floppy drive code clean-ups;
Made NCR 5380/53C400-based cards' BIOS address configurable;
Got rid of the legacy romset variable;
Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit;
Added the Amstead PPC512 per PCem patch by John Elliott;
Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages);
Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing;
Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem;
Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit;
Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement;
Amstrad MegaPC does now works correctly with non-internal graphics card;
The SLiRP code no longer casts a packed struct type to a non-packed struct type;
The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present;
The S3 Virge on BeOS is no longer broken (was broken by build #1591);
OS/2 2.0 build 6.167 now sees key presses again;
Xi8088 now work on CGA again;
86F images converted from either the old or new variants of the HxC MFM format now work correctly;
Hardware interrupts with a vector of 0xFF are now handled correctly;
OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct;
Fixed VNC keyboard input bugs;
Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g  / 81 MIDI play no longer hangs with the build's own VTD driver;
Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly;
Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4;
Compaq Portable now works with all graphics cards;
Fixed various MDSI Genius bugs;
Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly;
Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355;
OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400.
Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391.
Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389.
Fixed a minor IDE timing bug, fixes #388.
Fixed Toshiba T1000 RAM issues, fixes #379.
Fixed EGA/(S)VGA overscan border handling, fixes #378;
Got rid of the now long useless IDE channel 2 auto-removal, fixes #370;
Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366;
Ported the Unicode CD image file name fix from VARCem, fixes #365;
Fixed high density floppy disks on the Xi8088, fixes #359;
Fixed some bugs in the Hercules emulation, fixes #346, fixes #358;
Fixed the SCSI hard disk mode sense pages, fixes #356;
Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349;
Fixed bugs in the serial mouse emulation, fixes #344;
Compiled 86Box binaries now include all the required .DLL's, fixes #341;
Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
2019-09-20 14:02:30 +02:00
parent b06296bbf6
commit 552a87ea3d
524 changed files with 129555 additions and 21862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/video/vid_compaq_cga.c
View File

@@ -7,10 +7,10 @@
#include "../86box.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../timer.h"
#include "../pit.h"
#include "../mem.h"
#include "../rom.h"
#include "../timer.h"
#include "../device.h"
#include "video.h"
#include "vid_cga.h"
@@ -19,10 +19,11 @@
#define CGA_RGB 0
#define CGA_COMPOSITE 1
static uint32_t vflags;
typedef struct compaq_cga_t
{
cga_t cga;
uint32_t flags;
} compaq_cga_t;
static uint8_t mdaattr[256][2][2];
@@ -35,8 +36,8 @@ void compaq_cga_recalctimings(compaq_cga_t *self)
_dispofftime = disptime - _dispontime;
_dispontime *= MDACONST;
_dispofftime *= MDACONST;
self->cga.dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
self->cga.dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
self->cga.dispontime = (uint64_t)(_dispontime);
self->cga.dispofftime = (uint64_t)(_dispofftime);
}
void compaq_cga_poll(void *p)
@@ -47,7 +48,8 @@ void compaq_cga_poll(void *p)
int x, c;
int oldvc;
uint8_t chr, attr;
uint32_t cols[4];
uint8_t border;
uint8_t cols[4];
int oldsc;
int underline = 0;
int blink = 0;
@@ -64,7 +66,7 @@ void compaq_cga_poll(void *p)
/* We are in Compaq 350-line CGA territory */
if (!self->cga.linepos)
{
self->cga.vidtime += self->cga.dispofftime;
timer_advance_u64(&self->cga.timer, self->cga.dispofftime);
self->cga.cgastat |= 1;
self->cga.linepos = 1;
oldsc = self->cga.sc;
@@ -80,15 +82,15 @@ void compaq_cga_poll(void *p)
}
self->cga.lastline = self->cga.displine;
cols[0] = (self->cga.cgacol & 15);
cols[0] = (self->cga.cgacol & 15) + 16;
for (c = 0; c < 8; c++)
{
((uint32_t *)buffer32->line[self->cga.displine])[c] = cols[0];
buffer32->line[self->cga.displine][c] = cols[0];
if (self->cga.cgamode & 1)
((uint32_t *)buffer32->line[self->cga.displine])[c + (self->cga.crtc[1] << 3) + 8] = cols[0];
buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 3) + 8] = cols[0];
else
((uint32_t *)buffer32->line[self->cga.displine])[c + (self->cga.crtc[1] << 4) + 8] = cols[0];
buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 4) + 8] = cols[0];
}
if (self->cga.cgamode & 1)
{
@@ -97,11 +99,11 @@ void compaq_cga_poll(void *p)
chr = self->cga.charbuffer[x << 1];
attr = self->cga.charbuffer[(x << 1) + 1];
drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
if (self->flags) {
if (vflags) {
underline = 0;
blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
}
if (self->flags && (self->cga.cgamode & 0x80))
if (vflags && (self->cga.cgamode & 0x80))
{
cols[0] = mdaattr[attr][blink][0];
cols[1] = mdaattr[attr][blink][1];
@@ -111,7 +113,7 @@ void compaq_cga_poll(void *p)
{
cols[1] = (attr & 15) + 16;
cols[0] = ((attr >> 4) & 7) + 16;
if (self->flags) {
if (vflags) {
if (blink)
cols[1] = cols[0];
} else {
@@ -124,20 +126,20 @@ void compaq_cga_poll(void *p)
cols[1] = (attr & 15) + 16;
cols[0] = (attr >> 4) + 16;
}
if (self->flags && underline)
if (vflags && underline)
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = mdaattr[attr][blink][1];
buffer32->line[self->cga.displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
}
else if (drawcursor)
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xffffff;
buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
}
else
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
}
self->cga.ma++;
}
@@ -149,11 +151,11 @@ void compaq_cga_poll(void *p)
chr = self->cga.vram[((self->cga.ma << 1) & 0x3fff)];
attr = self->cga.vram[(((self->cga.ma << 1) + 1) & 0x3fff)];
drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
if (self->flags) {
if (vflags) {
underline = 0;
blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
}
if (self->flags && (self->cga.cgamode & 0x80))
if (vflags && (self->cga.cgamode & 0x80))
{
cols[0] = mdaattr[attr][blink][0];
cols[1] = mdaattr[attr][blink][1];
@@ -163,7 +165,7 @@ void compaq_cga_poll(void *p)
{
cols[1] = (attr & 15) + 16;
cols[0] = ((attr >> 4) & 7) + 16;
if (self->flags) {
if (vflags) {
if (blink)
cols[1] = cols[0];
} else {
@@ -177,23 +179,26 @@ void compaq_cga_poll(void *p)
cols[0] = (attr >> 4) + 16;
}
self->cga.ma++;
if (self->flags && underline)
if (vflags && underline)
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 8] =
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 9] = mdaattr[attr][blink][1];
buffer32->line[self->cga.displine][(x << 4)+(c << 1) + 8] =
buffer32->line[self->cga.displine][(x << 4)+(c << 1) + 9] =
mdaattr[attr][blink][1];
}
else if (drawcursor)
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 8] =
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
buffer32->line[self->cga.displine][(x << 4)+(c << 1) + 8] =
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] =
cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
}
else
{
for (c = 0; c < 8; c++)
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 8] =
((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] =
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] =
cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
}
}
}
@@ -201,8 +206,8 @@ void compaq_cga_poll(void *p)
else
{
cols[0] = (self->cga.cgacol & 15) + 16;
if (self->cga.cgamode & 1) hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 3) + 16, cols[0]);
else hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 4) + 16, cols[0]);
if (self->cga.cgamode & 1) hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 3) + 16, cols[0]);
else hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 4) + 16, cols[0]);
}
if (self->cga.cgamode & 1) x = (self->cga.crtc[1] << 3) + 16;
@@ -210,19 +215,16 @@ void compaq_cga_poll(void *p)
if (self->cga.composite)
{
for (c = 0; c < x; c++)
buffer32->line[self->cga.displine][c] = ((uint32_t *)buffer32->line[self->cga.displine])[c] & 0xf;
if (self->flags)
Composite_Process(self->cga.cgamode & 0x7F, 0, x >> 2, buffer32->line[self->cga.displine]);
if (self->cga.cgamode & 0x10)
border = 0x00;
else
Composite_Process(self->cga.cgamode, 0, x >> 2, buffer32->line[self->cga.displine]);
border = self->cga.cgacol & 0x0f;
if (vflags)
Composite_Process(self->cga.cgamode & 0x7F, border, x >> 2, buffer32->line[self->cga.displine]);
else
Composite_Process(self->cga.cgamode, border, x >> 2, buffer32->line[self->cga.displine]);
}
else
{
for (c = 0; c < x; c++)
buffer->line[self->cga.displine][c] = ((uint32_t *)buffer32->line[self->cga.displine])[c];
}
self->cga.sc = oldsc;
if (self->cga.vc == self->cga.crtc[7] && !self->cga.sc)
@@ -233,7 +235,7 @@ void compaq_cga_poll(void *p)
}
else
{
self->cga.vidtime += self->cga.dispontime;
timer_advance_u64(&self->cga.timer, self->cga.dispontime);
self->cga.linepos = 0;
if (self->cga.vsynctime)
{
@@ -375,8 +377,8 @@ void *compaq_cga_init(const device_t *info)
self->cga.vram = malloc(0x4000);
cga_comp_init(self->cga.revision);
timer_add(compaq_cga_poll, &self->cga.vidtime, TIMER_ALWAYS_ENABLED, self);
mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, self->cga.vram, MEM_MAPPING_EXTERNAL, self);
timer_add(&self->cga.timer, compaq_cga_poll, self, 1);
mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self);
io_sethandler(0x03d0, 0x0010, cga_in, NULL, NULL, cga_out, NULL, NULL, self);
if (info->local) {
@@ -399,7 +401,7 @@ void *compaq_cga_init(const device_t *info)
mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
}
self->flags = info->local;
vflags = info->local;
overscan_x = overscan_y = 16;
@@ -407,6 +409,8 @@ void *compaq_cga_init(const device_t *info)
cga_palette = (self->cga.rgb_type << 1);
cgapal_rebuild();
self->cga.crtc[9] = 13;
return self;
}