Added the IBM 5161 ISA expansion for PC and XT;
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port; Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX); Finished the 586MC1; Added 8087 emulation; Moved Cyrix 6x86'es to the Dev branch; Sanitized/cleaned up memregs.c/h and intel.c/h; Split the chipsets from machines and sanitized Port 92 emulation; Added support for the 15bpp mode to the Compaq ATI 28800; Moved the MR 386DX and 486 machines to the Dev branch; Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00; Ported the new timer code from PCem; Cleaned up the CPU table of unused stuff and better optimized its structure; Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch; Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem; Added the AHA-1540A and the BusTek BT-542B; Moved the Sumo SCSI-AT to the Dev branch; Minor IDE, FDC, and floppy drive code clean-ups; Made NCR 5380/53C400-based cards' BIOS address configurable; Got rid of the legacy romset variable; Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit; Added the Amstead PPC512 per PCem patch by John Elliott; Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages); Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing; Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem; Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit; Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement; Amstrad MegaPC does now works correctly with non-internal graphics card; The SLiRP code no longer casts a packed struct type to a non-packed struct type; The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present; The S3 Virge on BeOS is no longer broken (was broken by build #1591); OS/2 2.0 build 6.167 now sees key presses again; Xi8088 now work on CGA again; 86F images converted from either the old or new variants of the HxC MFM format now work correctly; Hardware interrupts with a vector of 0xFF are now handled correctly; OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct; Fixed VNC keyboard input bugs; Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g / 81 MIDI play no longer hangs with the build's own VTD driver; Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly; Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4; Compaq Portable now works with all graphics cards; Fixed various MDSI Genius bugs; Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly; Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355; OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400. Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391. Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389. Fixed a minor IDE timing bug, fixes #388. Fixed Toshiba T1000 RAM issues, fixes #379. Fixed EGA/(S)VGA overscan border handling, fixes #378; Got rid of the now long useless IDE channel 2 auto-removal, fixes #370; Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366; Ported the Unicode CD image file name fix from VARCem, fixes #365; Fixed high density floppy disks on the Xi8088, fixes #359; Fixed some bugs in the Hercules emulation, fixes #346, fixes #358; Fixed the SCSI hard disk mode sense pages, fixes #356; Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349; Fixed bugs in the serial mouse emulation, fixes #344; Compiled 86Box binaries now include all the required .DLL's, fixes #341; Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
@@ -66,13 +66,12 @@
|
||||
#include "vid_svga.h"
|
||||
|
||||
|
||||
bitmap_t *screen = NULL,
|
||||
*buffer = NULL,
|
||||
*buffer32 = NULL;
|
||||
bitmap_t *buffer32 = NULL;
|
||||
uint8_t fontdat[2048][8]; /* IBM CGA font */
|
||||
uint8_t fontdatm[2048][16]; /* IBM MDA font */
|
||||
uint8_t fontdatw[512][32]; /* Wyse700 font */
|
||||
uint8_t fontdat8x12[256][16]; /* MDSI Genius font */
|
||||
uint8_t fontdat12x18[256][36]; /* IM1024 font */
|
||||
dbcs_font_t *fontdatksc5601 = NULL; /* Korean KSC-5601 font */
|
||||
dbcs_font_t *fontdatksc5601_user = NULL; /* Korean KSC-5601 user defined font */
|
||||
uint32_t pal_lookup[256];
|
||||
@@ -325,7 +324,7 @@ video_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
|
||||
}
|
||||
|
||||
|
||||
uint8_t pixels8(uint8_t *pixels)
|
||||
uint8_t pixels8(uint32_t *pixels)
|
||||
{
|
||||
int i;
|
||||
uint8_t temp = 0;
|
||||
@@ -367,14 +366,14 @@ video_blend(int x, int y)
|
||||
if (!x)
|
||||
carry = 0;
|
||||
|
||||
val1 = pixels8(&(buffer->line[y][x]));
|
||||
val1 = pixels8(&(buffer32->line[y][x]));
|
||||
val2 = (val1 >> 1) + carry;
|
||||
carry = (val1 & 1) << 7;
|
||||
pixels32_1 = cga_2_table[val1 >> 4] + cga_2_table[val2 >> 4];
|
||||
pixels32_2 = cga_2_table[val1 & 0xf] + cga_2_table[val2 & 0xf];
|
||||
for (xx = 0; xx < 4; xx++) {
|
||||
buffer->line[y][x + xx] = pixel_to_color((uint8_t *) &pixels32_1, xx);
|
||||
buffer->line[y][x + (xx | 4)] = pixel_to_color((uint8_t *) &pixels32_2, xx);
|
||||
buffer32->line[y][x + xx] = pixel_to_color((uint8_t *) &pixels32_1, xx);
|
||||
buffer32->line[y][x + (xx | 4)] = pixel_to_color((uint8_t *) &pixels32_2, xx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -388,10 +387,14 @@ video_blit_memtoscreen_8(int x, int y, int y1, int y2, int w, int h)
|
||||
|
||||
for (yy = 0; yy < h; yy++)
|
||||
{
|
||||
if ((y + yy) >= 0 && (y + yy) < buffer->h)
|
||||
if ((y + yy) >= 0 && (y + yy) < buffer32->h)
|
||||
{
|
||||
for (xx = 0; xx < w; xx++)
|
||||
*(uint32_t *) &(buffer32->line[y + yy][(x + xx) << 2]) = pal_lookup[buffer->line[y + yy][x + xx]];
|
||||
for (xx = 0; xx < w; xx++) {
|
||||
if (buffer32->line[y + yy][x + xx] <= 0xff)
|
||||
buffer32->line[y + yy][x + xx] = pal_lookup[buffer32->line[y + yy][x + xx]];
|
||||
else
|
||||
buffer32->line[y + yy][x + xx] = 0x00000000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -557,13 +560,13 @@ calc_16to32(int c)
|
||||
void
|
||||
hline(bitmap_t *b, int x1, int y, int x2, uint32_t col)
|
||||
{
|
||||
if (y < 0 || y >= buffer->h)
|
||||
int x;
|
||||
|
||||
if (y < 0 || y >= buffer32->h)
|
||||
return;
|
||||
|
||||
if (b == buffer)
|
||||
memset(&b->line[y][x1], col, x2 - x1);
|
||||
else
|
||||
memset(&((uint32_t *)b->line[y])[x1], col, (x2 - x1) * 4);
|
||||
for (x = x1; x < x2; x++)
|
||||
b->line[y][x] = col;
|
||||
}
|
||||
|
||||
|
||||
@@ -603,12 +606,12 @@ destroy_bitmap(bitmap_t *b)
|
||||
bitmap_t *
|
||||
create_bitmap(int x, int y)
|
||||
{
|
||||
bitmap_t *b = malloc(sizeof(bitmap_t) + (y * sizeof(uint8_t *)));
|
||||
bitmap_t *b = malloc(sizeof(bitmap_t) + (y * sizeof(uint32_t *)));
|
||||
int c;
|
||||
|
||||
b->dat = malloc(x * y * 4);
|
||||
for (c = 0; c < y; c++)
|
||||
b->line[c] = b->dat + (c * x * 4);
|
||||
b->line[c] = &(b->dat[c * x]);
|
||||
b->w = x;
|
||||
b->h = y;
|
||||
|
||||
@@ -630,7 +633,6 @@ video_init(void)
|
||||
/* Account for overscan. */
|
||||
buffer32 = create_bitmap(2048, 2048);
|
||||
|
||||
buffer = create_bitmap(2048, 2048);
|
||||
for (c = 0; c < 64; c++) {
|
||||
cgapal[c + 64].r = (((c & 4) ? 2 : 0) | ((c & 0x10) ? 1 : 0)) * 21;
|
||||
cgapal[c + 64].g = (((c & 2) ? 2 : 0) | ((c & 0x10) ? 1 : 0)) * 21;
|
||||
@@ -699,7 +701,6 @@ video_close(void)
|
||||
free(video_15to32);
|
||||
free(video_16to32);
|
||||
|
||||
destroy_bitmap(buffer);
|
||||
destroy_bitmap(buffer32);
|
||||
|
||||
if (fontdatksc5601) {
|
||||
@@ -753,17 +754,14 @@ loadfont(wchar_t *s, int format)
|
||||
break;
|
||||
|
||||
case 1: /* PC200 */
|
||||
for (c=0; c<256; c++)
|
||||
for (d=0; d<8; d++)
|
||||
fontdatm[c][d] = fgetc(f);
|
||||
for (c=0; c<256; c++)
|
||||
for (d=0; d<8; d++)
|
||||
fontdatm[c][d+8] = fgetc(f);
|
||||
(void)fseek(f, 4096, SEEK_SET);
|
||||
for (c=0; c<256; c++) {
|
||||
for (d=0; d<8; d++)
|
||||
fontdat[c][d] = fgetc(f);
|
||||
for (d=0; d<8; d++) (void)fgetc(f);
|
||||
for (d = 0; d < 4; d++) {
|
||||
/* There are 4 fonts in the ROM */
|
||||
for (c = 0; c < 256; c++) /* 8x14 MDA in 8x16 cell */
|
||||
fread(&fontdatm[256*d + c][0], 1, 16, f);
|
||||
for (c = 0; c < 256; c++) { /* 8x8 CGA in 8x16 cell */
|
||||
fread(&fontdat[256*d + c][0], 1, 8, f);
|
||||
fseek(f, 8, SEEK_CUR);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -841,6 +839,17 @@ loadfont(wchar_t *s, int format)
|
||||
for (c = 0; c < 256; c++)
|
||||
fread(&fontdatm[c][0], 1, 16, f);
|
||||
break;
|
||||
|
||||
case 8: /* Amstrad PC1512 */
|
||||
for (c = 0; c < 2048; c++) /* Allow up to 2048 chars */
|
||||
for (d=0; d<8; d++)
|
||||
fontdat[c][d] = fgetc(f);
|
||||
break;
|
||||
|
||||
case 9: /* Image Manager 1024 native font */
|
||||
for (c = 0; c < 256; c++)
|
||||
fread(&fontdat12x18[c][0], 1, 36, f);
|
||||
break;
|
||||
}
|
||||
|
||||
(void)fclose(f);
|
||||
|
||||
Reference in New Issue
Block a user