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

Applied all mainline PCem commits;

Browse Source 
Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee);
ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back;
National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle;
Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests);
Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers;
Added floppy drives 3 and 4, bringing the maximum to 4;
You can now connect hard disks to the tertiary IDE controller;
Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's;
Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle);
Overhauled DMA channel read and write routines and fixed cascading;
Improved IMG detection of a bad BPB (or complete lack of a BPB);
Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin);
Removed the incorrect Amstrad mouse patch from TheCollector1995;
Fixed ATAPI CD-ROM disk change detection;
Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity;
The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes;
The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63;
Moved a few options from the Configuration dialog box to the menu;
SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should;
Several bugfixes.
This commit is contained in:
OBattler
2016-12-23 03:16:24 +01:00
parent 724c5699ca
commit dc46480aa4
142 changed files with 8778 additions and 3331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/video.c
View File

@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <time.h>
#include <time.h>1
#include "ibm.h"
#include "config.h"
#include "device.h"
@@ -47,6 +47,7 @@
#include "vid_tgui9440.h"
#include "vid_tvga.h"
#include "vid_vga.h"
#include "vid_wy700.h"
typedef struct
{
@@ -79,6 +80,8 @@ static VIDEO_CARD video_cards[] =
{"Number Nine 9FX (S3 Trio64)", &s3_9fx_device, GFX_N9_9FX},
{"nVidia RIVA 128 (Experimental)", &riva128_device, GFX_RIVA128},
{"nVidia RIVA TNT (Experimental)", &rivatnt_device, GFX_RIVATNT},
{"nVidia TNT2 (Experimental)", &rivatnt2_device, GFX_RIVATNT2},
{"OAK OTI-067", &oti067_device, GFX_OTI067},
{"OAK OTI-077", &oti077_device, GFX_OTI077},
{"Paradise Bahamas 64 (S3 Vision864)", &s3_bahamas64_device, GFX_BAHAMAS64},
@@ -92,6 +95,7 @@ static VIDEO_CARD video_cards[] =
{"Tseng ET4000AX", &et4000_device, GFX_ET4000},
{"Trident TGUI9440", &tgui9440_device, GFX_TGUI9440},
{"VGA", &vga_device, GFX_VGA},
{"Wyse 700", &wy700_device, GFX_WY700},
{"", NULL, 0}
};
@@ -152,7 +156,7 @@ int video_new_to_old(int card)
}
int video_fullscreen = 0, video_fullscreen_scale, video_fullscreen_first;
uint32_t *video_15to32, *video_16to32;
uint32_t *video_6to8, *video_15to32, *video_16to32;
int egareads=0,egawrites=0;
int changeframecount=2;
@@ -312,6 +316,7 @@ BITMAP *buffer, *buffer32;
uint8_t fontdat[256][8];
uint8_t fontdatm[256][16];
uint8_t fontdatw[512][32]; /* Wyse700 font */
int xsize=1,ysize=1;
@@ -322,10 +327,12 @@ void loadfont(char *s, int format)
FILE *f=romfopen(s,"rb");
int c,d;
if (!f)
return;
if (!format)
{
return;
}
switch (format)
{
case 0: /* MDA */
for (c=0;c<256;c++)
{
for (d=0;d<8;d++)
@@ -348,9 +355,8 @@ void loadfont(char *s, int format)
fontdat[c][d]=getc(f);
}
}
}
else if (format == 1)
{
break;
case 1: /* PC200 */
for (c=0;c<256;c++)
{
for (d=0;d<8;d++)
@@ -360,7 +366,7 @@ void loadfont(char *s, int format)
}
for (c=0;c<256;c++)
{
for (d=0;d<8;d++)
for (d=0;d<8;d++)
{
fontdatm[c][d+8]=getc(f);
}
@@ -374,16 +380,26 @@ void loadfont(char *s, int format)
}
for (d=0;d<8;d++) getc(f);
}
}
else
{
break;
default:
case 2: /* CGA */
for (c=0;c<256;c++)
{
for (d=0;d<8;d++)
for (d=0;d<8;d++)
{
fontdat[c][d]=getc(f);
}
}
break;
case 3: /* Wyse 700 */
for (c=0;c<512;c++)
{
for (d=0;d<32;d++)
{
fontdatw[c][d]=getc(f);
}
}
break;
}
fclose(f);
}
@@ -402,6 +418,25 @@ static struct
static void blit_thread(void *param);
int calc_6to8(int c)
{
int ic, i8;
double dc, d8;
ic = c;
if (ic == 64)
{
ic = 63;
}
else
{
ic &= 0x3f;
}
dc = (double) ic;
d8 = (ic / 63.0) * 255.0;
i8 = (int) d8;
return i8 & 0xff;
}
int calc_15to32(int c)
{
int b, g, r;
@@ -480,6 +515,10 @@ void initvideo()
}
}
video_6to8 = malloc(4 * 256);
for (c = 0; c < 256; c++)
video_6to8[c] = calc_6to8(c);
video_15to32 = malloc(4 * 65536);
#if 0
for (c = 0; c < 65536; c++)
@@ -509,7 +548,8 @@ void closevideo()
thread_destroy_event(blit_data.blit_complete);
thread_destroy_event(blit_data.wake_blit_thread);
free(video_15to32);
free(video_6to8);
free(video_15to32);
free(video_16to32);
destroy_bitmap(buffer);
destroy_bitmap(buffer32);