claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied the relevent upstream commits.

Browse Source
This commit is contained in:
waltje
2018-03-27 02:14:27 -04:00
parent d3f8bc5325
commit bae962317f
10 changed files with 375 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/net_pcap.c
View File

@@ -8,7 +8,7 @@
* *
* Handle WinPcap library processing. * Handle WinPcap library processing.
* *
* Version: @(#)net_pcap.c 1.0.3 2018/03/15 * Version: @(#)net_pcap.c 1.0.4 2018/03/26
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* *
@@ -49,7 +49,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#ifdef _WIN32 #if defined(_WIN32) && !defined(WIN32)
# define WIN32 # define WIN32
#endif #endif
#include <pcap/pcap.h> #include <pcap/pcap.h>

4
src/network/pcap_if.c
View File

@@ -10,7 +10,7 @@
* *
* Based on the "libpcap" examples. * Based on the "libpcap" examples.
* *
* Version: @(#)pcap_if.c 1.0.11 2018/03/25 * Version: @(#)pcap_if.c 1.0.12 2018/03/26
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* *
@@ -52,7 +52,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32 #if defined(_WIN32) && !defined(WIN32)
# define WIN32 # define WIN32
#endif #endif
#include <pcap/pcap.h> #include <pcap/pcap.h>

35
src/video/vid_ati18800.c
View File

@@ -8,7 +8,7 @@
* *
* ATI 18800 emulation (VGA Edge-16) * ATI 18800 emulation (VGA Edge-16)
* *
* Version: @(#)vid_ati18800.c 1.0.4 2018/03/17 * Version: @(#)vid_ati18800.c 1.0.5 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -170,39 +170,6 @@ static uint8_t ati18800_in(uint16_t addr, void *p)
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; temp = svga->crtc[svga->crtcreg];
break; break;
case 0x3DA:
svga->attrff = 0;
svga->attrff = 0;
svga->cgastat &= ~0x30;
/* copy color diagnostic info from the overscan color register */
switch (svga->attrregs[0x12] & 0x30)
{
case 0x00: /* P0 and P2 */
if (svga->attrregs[0x11] & 0x01)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x04)
svga->cgastat |= 0x20;
break;
case 0x10: /* P4 and P5 */
if (svga->attrregs[0x11] & 0x10)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x20)
svga->cgastat |= 0x20;
break;
case 0x20: /* P1 and P3 */
if (svga->attrregs[0x11] & 0x02)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x08)
svga->cgastat |= 0x20;
break;
case 0x30: /* P6 and P7 */
if (svga->attrregs[0x11] & 0x40)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x80)
svga->cgastat |= 0x20;
break;
}
return svga->cgastat;
default: default:
temp = svga_in(addr, svga); temp = svga_in(addr, svga);
break; break;

35
src/video/vid_ati28800.c
View File

@@ -8,7 +8,7 @@
* *
* ATI 28800 emulation (VGA Charger and Korean VGA) * ATI 28800 emulation (VGA Charger and Korean VGA)
* *
* Version: @(#)vid_ati28800.c 1.0.9 2018/03/20 * Version: @(#)vid_ati28800.c 1.0.10 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -275,39 +275,6 @@ static uint8_t ati28800_in(uint16_t addr, void *p)
case 0x3D5: case 0x3D5:
temp = svga->crtc[svga->crtcreg]; temp = svga->crtc[svga->crtcreg];
break; break;
case 0x3DA:
svga->attrff = 0;
svga->attrff = 0;
svga->cgastat &= ~0x30;
/* copy color diagnostic info from the overscan color register */
switch (svga->attrregs[0x12] & 0x30)
{
case 0x00: /* P0 and P2 */
if (svga->attrregs[0x11] & 0x01)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x04)
svga->cgastat |= 0x20;
break;
case 0x10: /* P4 and P5 */
if (svga->attrregs[0x11] & 0x10)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x20)
svga->cgastat |= 0x20;
break;
case 0x20: /* P1 and P3 */
if (svga->attrregs[0x11] & 0x02)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x08)
svga->cgastat |= 0x20;
break;
case 0x30: /* P6 and P7 */
if (svga->attrregs[0x11] & 0x40)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x80)
svga->cgastat |= 0x20;
break;
}
return svga->cgastat;
default: default:
temp = svga_in(addr, svga); temp = svga_in(addr, svga);
break; break;

35
src/video/vid_ati_mach64.c
View File

@@ -8,7 +8,7 @@
* *
* ATi Mach64 graphics card emulation. * ATi Mach64 graphics card emulation.
* *
* Version: @(#)vid_ati_mach64.c 1.0.7 2018/03/17 * Version: @(#)vid_ati_mach64.c 1.0.8 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -451,39 +451,6 @@ uint8_t mach64_in(uint16_t addr, void *p)
if (svga->crtcreg > 0x18) if (svga->crtcreg > 0x18)
return 0xff; return 0xff;
return svga->crtc[svga->crtcreg]; return svga->crtc[svga->crtcreg];
case 0x3DA:
svga->attrff = 0;
svga->attrff = 0;
svga->cgastat &= ~0x30;
/* copy color diagnostic info from the overscan color register */
switch (svga->attrregs[0x12] & 0x30)
{
case 0x00: /* P0 and P2 */
if (svga->attrregs[0x11] & 0x01)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x04)
svga->cgastat |= 0x20;
break;
case 0x10: /* P4 and P5 */
if (svga->attrregs[0x11] & 0x10)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x20)
svga->cgastat |= 0x20;
break;
case 0x20: /* P1 and P3 */
if (svga->attrregs[0x11] & 0x02)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x08)
svga->cgastat |= 0x20;
break;
case 0x30: /* P6 and P7 */
if (svga->attrregs[0x11] & 0x40)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x80)
svga->cgastat |= 0x20;
break;
}
return svga->cgastat;
} }
return svga_in(addr, svga); return svga_in(addr, svga);
} }

187
src/video/vid_cl54xx.c
View File

@@ -9,7 +9,7 @@
* Emulation of select Cirrus Logic cards (CL-GD 5428, * Emulation of select Cirrus Logic cards (CL-GD 5428,
* CL-GD 5429, 5430, 5434 and 5436 are supported). * CL-GD 5429, 5430, 5434 and 5436 are supported).
* *
* Version: @(#)vid_cl54xx.c 1.0.12 2018/03/22 * Version: @(#)vid_cl54xx.c 1.0.13 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -60,7 +60,8 @@
#define BIOS_GD5426_PATH L"roms/video/cirruslogic/diamond speedstar pro vlb v3.04.bin" #define BIOS_GD5426_PATH L"roms/video/cirruslogic/diamond speedstar pro vlb v3.04.bin"
#define BIOS_GD5428_PATH L"roms/video/cirruslogic/vlbusjapan.bin" #define BIOS_GD5428_ISA_PATH L"roms/video/cirruslogic/gd5428.bin"
#define BIOS_GD5428_VLB_PATH L"roms/video/cirruslogic/vlbusjapan.bin"
#define BIOS_GD5429_PATH L"roms/video/cirruslogic/gd5429.vbi" #define BIOS_GD5429_PATH L"roms/video/cirruslogic/gd5429.vbi"
#define BIOS_GD5430_VLB_PATH L"roms/video/cirruslogic/diamondvlbus.bin" #define BIOS_GD5430_VLB_PATH L"roms/video/cirruslogic/diamondvlbus.bin"
#define BIOS_GD5430_PCI_PATH L"roms/video/cirruslogic/gd5430pci.bin" #define BIOS_GD5430_PCI_PATH L"roms/video/cirruslogic/gd5430pci.bin"
@@ -187,11 +188,15 @@ typedef struct gd54xx_t
uint8_t pci_regs[256]; uint8_t pci_regs[256];
uint8_t int_line; uint8_t int_line;
int card; int card;
uint32_t lfb_base; uint32_t lfb_base;
int mmio_vram_overlap; int mmio_vram_overlap;
uint32_t extpallook[256];
PALETTE extpal;
} gd54xx_t; } gd54xx_t;
static void static void
@@ -222,16 +227,57 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
gd54xx_t *gd54xx = (gd54xx_t *)p; gd54xx_t *gd54xx = (gd54xx_t *)p;
svga_t *svga = &gd54xx->svga; svga_t *svga = &gd54xx->svga;
uint8_t old; uint8_t old;
int c;
uint8_t o;
uint32_t o32;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1)) if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
addr ^= 0x60; addr ^= 0x60;
switch (addr) { switch (addr) {
case 0x3c0:
case 0x3c1:
if (!svga->attrff) {
svga->attraddr = val & 31;
if ((val & 0x20) != svga->attr_palette_enable) {
svga->fullchange = 3;
svga->attr_palette_enable = val & 0x20;
svga_recalctimings(svga);
}
} else {
o = svga->attrregs[svga->attraddr & 31];
svga->attrregs[svga->attraddr & 31] = val;
if (svga->attraddr < 16)
svga->fullchange = changeframecount;
if (svga->attraddr == 0x10 || svga->attraddr == 0x14 || svga->attraddr < 0x10) {
for (c = 0; c < 16; c++) {
if (svga->attrregs[0x10] & 0x80) svga->egapal[c] = (svga->attrregs[c] & 0xf) | ((svga->attrregs[0x14] & 0xf) << 4);
else svga->egapal[c] = (svga->attrregs[c] & 0x3f) | ((svga->attrregs[0x14] & 0xc) << 4);
}
}
/* Recalculate timings on change of attribute register 0x11 (overscan border color) too. */
if (svga->attraddr == 0x10) {
if (o != val)
svga_recalctimings(svga);
} else if (svga->attraddr == 0x11) {
if (!(svga->seqregs[0x12] & 0x80)) {
svga->overscan_color = svga->pallook[svga->attrregs[0x11]];
if (o != val) svga_recalctimings(svga);
}
} else if (svga->attraddr == 0x12) {
if ((val & 0xf) != svga->plane_mask)
svga->fullchange = changeframecount;
svga->plane_mask = val & 0xf;
}
}
svga->attrff ^= 1;
return;
case 0x3c4: case 0x3c4:
svga->seqaddr = val; svga->seqaddr = val;
break; break;
case 0x3c5: case 0x3c5:
if (svga->seqaddr > 5) { if (svga->seqaddr > 5) {
o = svga->seqregs[svga->seqaddr & 0x1f];
svga->seqregs[svga->seqaddr & 0x1f] = val; svga->seqregs[svga->seqaddr & 0x1f] = val;
switch (svga->seqaddr & 0x1f) { switch (svga->seqaddr & 0x1f) {
case 6: case 6:
@@ -256,6 +302,11 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
svga->hwcursor.y = (val << 3) | (svga->seqaddr >> 5); svga->hwcursor.y = (val << 3) | (svga->seqaddr >> 5);
break; break;
case 0x12: case 0x12:
if (val & 0x80)
svga->overscan_color = gd54xx->extpallook[2];
else
svga->overscan_color = svga->pallook[svga->attrregs[0x11]];
svga_recalctimings(svga);
svga->hwcursor.ena = val & CIRRUS_CURSOR_SHOW; svga->hwcursor.ena = val & CIRRUS_CURSOR_SHOW;
svga->hwcursor.xsize = svga->hwcursor.ysize = (val & CIRRUS_CURSOR_LARGE) ? 64 : 32; svga->hwcursor.xsize = svga->hwcursor.ysize = (val & CIRRUS_CURSOR_LARGE) ? 64 : 32;
if (val & CIRRUS_CURSOR_LARGE) if (val & CIRRUS_CURSOR_LARGE)
@@ -288,6 +339,42 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
} }
gd54xx->ramdac.state = 0; gd54xx->ramdac.state = 0;
break; break;
case 0x3C9:
svga->dac_status = 0;
svga->fullchange = changeframecount;
switch (svga->dac_pos) {
case 0:
svga->dac_r = val;
svga->dac_pos++;
break;
case 1:
svga->dac_g = val;
svga->dac_pos++;
break;
case 2:
if (svga->seqregs[0x12] & 2) {
gd54xx->extpal[svga->dac_write].r = svga->dac_r;
gd54xx->extpal[svga->dac_write].g = svga->dac_g;
gd54xx->extpal[svga->dac_write].b = val;
gd54xx->extpallook[svga->dac_write & 15] = makecol32(video_6to8[gd54xx->extpal[svga->dac_write].r & 0x3f], video_6to8[gd54xx->extpal[svga->dac_write].g & 0x3f], video_6to8[gd54xx->extpal[svga->dac_write].b & 0x3f]);
if ((svga->seqregs[0x12] & 0x80) && ((svga->dac_write & 15) == 2)) {
o32 = svga->overscan_color;
svga->overscan_color = gd54xx->extpallook[2];
if (o32 != svga->overscan_color)
svga_recalctimings(svga);
}
svga->dac_write = (svga->dac_write + 1) & 15;
} else {
svga->vgapal[svga->dac_write].r = svga->dac_r;
svga->vgapal[svga->dac_write].g = svga->dac_g;
svga->vgapal[svga->dac_write].b = val;
svga->pallook[svga->dac_write] = makecol32(video_6to8[svga->vgapal[svga->dac_write].r & 0x3f], video_6to8[svga->vgapal[svga->dac_write].g & 0x3f], video_6to8[svga->vgapal[svga->dac_write].b & 0x3f]);
svga->dac_write = (svga->dac_write + 1) & 255;
}
svga->dac_pos = 0;
break;
}
return;
case 0x3cf: case 0x3cf:
if (svga->gdcaddr == 0) if (svga->gdcaddr == 0)
gd543x_mmio_write(0xb8000, val, gd54xx); gd543x_mmio_write(0xb8000, val, gd54xx);
@@ -514,6 +601,32 @@ gd54xx_in(uint16_t addr, void *p)
} }
gd54xx->ramdac.state++; gd54xx->ramdac.state++;
break; break;
case 0x3c9:
svga->dac_status = 3;
switch (svga->dac_pos) {
case 0:
svga->dac_pos++;
if (svga->seqregs[0x12] & 2)
return gd54xx->extpal[svga->dac_read].r & 0x3f;
else
return svga->vgapal[svga->dac_read].r & 0x3f;
case 1:
svga->dac_pos++;
if (svga->seqregs[0x12] & 2)
return gd54xx->extpal[svga->dac_read].g & 0x3f;
else
return svga->vgapal[svga->dac_read].g & 0x3f;
case 2:
svga->dac_pos=0;
if (svga->seqregs[0x12] & 2) {
svga->dac_read = (svga->dac_read + 1) & 15;
return gd54xx->extpal[(svga->dac_read - 1) & 15].b & 0x3f;
} else {
svga->dac_read = (svga->dac_read + 1) & 255;
return svga->vgapal[(svga->dac_read - 1) & 255].b & 0x3f;
}
}
return 0xFF;
case 0x3cf: case 0x3cf:
if (svga->gdcaddr > 8) { if (svga->gdcaddr > 8) {
return svga->gdcreg[svga->gdcaddr & 0x3f]; return svga->gdcreg[svga->gdcaddr & 0x3f];
@@ -761,13 +874,15 @@ gd54xx_recalctimings(svga_t *svga)
static static
void gd54xx_hwcursor_draw(svga_t *svga, int displine) void gd54xx_hwcursor_draw(svga_t *svga, int displine)
{ {
int x; gd54xx_t *gd54xx = (gd54xx_t *)svga->p;
int x, xx, comb, b0, b1;
uint8_t dat[2]; uint8_t dat[2];
int xx;
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff; int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0; int y_add = (enable_overscan && !suppress_overscan) ? 16 : 0;
int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0; int x_add = (enable_overscan && !suppress_overscan) ? 8 : 0;
int pitch = (svga->hwcursor.xsize == 64) ? 16 : 4; int pitch = (svga->hwcursor.xsize == 64) ? 16 : 4;
uint32_t bgcol = gd54xx->extpallook[0x00];
uint32_t fgcol = gd54xx->extpallook[0x0f];
if (svga->interlace && svga->hwcursor_oddeven) if (svga->interlace && svga->hwcursor_oddeven)
svga->hwcursor_latch.addr += pitch; svga->hwcursor_latch.addr += pitch;
@@ -779,16 +894,31 @@ void gd54xx_hwcursor_draw(svga_t *svga, int displine)
else else
dat[1] = svga->vram[svga->hwcursor_latch.addr + 0x80]; dat[1] = svga->vram[svga->hwcursor_latch.addr + 0x80];
for (xx = 0; xx < 8; xx++) { for (xx = 0; xx < 8; xx++) {
b0 = (dat[0] >> (7 - xx)) & 1;
b1 = (dat[1] >> (7 - xx)) & 1;
comb = (b1 | (b0 << 1));
if (offset >= svga->hwcursor_latch.x) { if (offset >= svga->hwcursor_latch.x) {
if (dat[1] & 0x80) switch(comb) {
((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] = 0; case 0:
if (dat[0] & 0x80) /* The original screen pixel is shown (invisible cursor) */
break;
case 1:
/* The pixel is shown in the cursor background color */
((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] = bgcol;
break;
case 2:
/* The pixel is shown as the inverse of the original screen pixel
(XOR cursor) */
((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] ^= 0xffffff; ((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] ^= 0xffffff;
break;
case 3:
/* The pixel is shown in the cursor foreground color */
((uint32_t *)buffer32->line[displine + y_add])[offset + 32 + x_add] = fgcol;
break;
}
} }
offset++; offset++;
dat[0] <<= 1;
dat[1] <<= 1;
} }
svga->hwcursor_latch.addr++; svga->hwcursor_latch.addr++;
} }
@@ -2249,7 +2379,10 @@ gd54xx_init(const device_t *info)
break; break;
case CIRRUS_ID_CLGD5428: case CIRRUS_ID_CLGD5428:
romfn = BIOS_GD5428_PATH; if (gd54xx->vlb)
romfn = BIOS_GD5428_VLB_PATH;
else
romfn = BIOS_GD5428_ISA_PATH;
break; break;
case CIRRUS_ID_CLGD5429: case CIRRUS_ID_CLGD5429:
@@ -2286,19 +2419,29 @@ gd54xx_init(const device_t *info)
gd54xx->vram_size = device_get_config_int("memory"); gd54xx->vram_size = device_get_config_int("memory");
gd54xx->vram_mask = (gd54xx->vram_size << 20) - 1; gd54xx->vram_mask = (gd54xx->vram_size << 20) - 1;
rom_init(&gd54xx->bios_rom, romfn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); rom_init(&gd54xx->bios_rom, romfn,
0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
svga_init(&gd54xx->svga, gd54xx, gd54xx->vram_size << 20, svga_init(&gd54xx->svga, gd54xx, gd54xx->vram_size << 20,
gd54xx_recalctimings, gd54xx_in, gd54xx_out, gd54xx_recalctimings, gd54xx_in, gd54xx_out,
gd54xx_hwcursor_draw, NULL); gd54xx_hwcursor_draw, NULL);
mem_mapping_set_handler(&svga->mapping, gd54xx_read, gd54xx_readw, gd54xx_readl, gd54xx_write, gd54xx_writew, gd54xx_writel); mem_mapping_set_handler(&svga->mapping,
gd54xx_read,gd54xx_readw,gd54xx_readl,
gd54xx_write,gd54xx_writew,gd54xx_writel);
mem_mapping_set_p(&svga->mapping, gd54xx); mem_mapping_set_p(&svga->mapping, gd54xx);
mem_mapping_add(&gd54xx->mmio_mapping, 0, 0, gd543x_mmio_read, gd543x_mmio_readw, gd543x_mmio_readl, gd543x_mmio_write, gd543x_mmio_writew, gd543x_mmio_writel, NULL, 0, gd54xx); mem_mapping_add(&gd54xx->mmio_mapping, 0, 0,
mem_mapping_add(&gd54xx->linear_mapping, 0, 0, gd54xx_readb_linear, gd54xx_readw_linear, gd54xx_readl_linear, gd54xx_writeb_linear, gd54xx_writew_linear, gd54xx_writel_linear, NULL, 0, svga); gd543x_mmio_read,gd543x_mmio_readw,gd543x_mmio_readl,
gd543x_mmio_write,gd543x_mmio_writew,gd543x_mmio_writel,
NULL, 0, gd54xx);
mem_mapping_add(&gd54xx->linear_mapping, 0, 0,
gd54xx_readb_linear,gd54xx_readw_linear,gd54xx_readl_linear,
gd54xx_writeb_linear,gd54xx_writew_linear,gd54xx_writel_linear,
NULL, 0, svga);
io_sethandler(0x03c0, 0x0020, gd54xx_in, NULL, NULL, gd54xx_out, NULL, NULL, gd54xx); io_sethandler(0x03c0, 32,
gd54xx_in,NULL,NULL, gd54xx_out,NULL,NULL, gd54xx);
svga->hwcursor.yoff = 32; svga->hwcursor.yoff = 32;
svga->hwcursor.xoff = 0; svga->hwcursor.xoff = 0;
@@ -2331,9 +2474,15 @@ gd5426_available(void)
} }
static int static int
gd5428_available(void) gd5428_isa_available(void)
{ {
return rom_present(BIOS_GD5428_PATH); return rom_present(BIOS_GD5428_ISA_PATH);
}
static int
gd5428_vlb_available(void)
{
return rom_present(BIOS_GD5428_VLB_PATH);
} }
static int static int
@@ -2500,7 +2649,7 @@ const device_t gd5428_isa_device =
gd54xx_init, gd54xx_init,
gd54xx_close, gd54xx_close,
NULL, NULL,
gd5428_available, gd5428_isa_available,
gd54xx_speed_changed, gd54xx_speed_changed,
gd54xx_force_redraw, gd54xx_force_redraw,
gd54xx_add_status_info, gd54xx_add_status_info,
@@ -2515,7 +2664,7 @@ const device_t gd5428_vlb_device =
gd54xx_init, gd54xx_init,
gd54xx_close, gd54xx_close,
NULL, NULL,
gd5428_available, gd5428_vlb_available,
gd54xx_speed_changed, gd54xx_speed_changed,
gd54xx_force_redraw, gd54xx_force_redraw,
gd54xx_add_status_info, gd54xx_add_status_info,

11
src/video/vid_et4000w32.c
View File

@@ -10,7 +10,7 @@
* *
* Known bugs: Accelerator doesn't work in planar modes * Known bugs: Accelerator doesn't work in planar modes
* *
* Version: @(#)vid_et4000w32.c 1.0.4 2018/03/15 * Version: @(#)vid_et4000w32.c 1.0.5 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -305,6 +305,15 @@ uint8_t et4000w32p_in(uint16_t addr, void *p)
case 0x214B: case 0x215B: case 0x216B: case 0x217B: case 0x214B: case 0x215B: case 0x216B: case 0x217B:
if (et4000->index==0xec) if (et4000->index==0xec)
return (et4000->regs[0xec] & 0xf) | 0x60; /*ET4000/W32p rev D*/ return (et4000->regs[0xec] & 0xf) | 0x60; /*ET4000/W32p rev D*/
if (et4000->index == 0xee) /*Preliminary implementation*/
{
if (svga->bpp == 8)
return 3;
else if (svga->bpp == 16)
return 4;
else
break;
}
if (et4000->index == 0xef) if (et4000->index == 0xef)
{ {
if (et4000->pci) return et4000->regs[0xef] | 0xe0; /*PCI*/ if (et4000->pci) return et4000->regs[0xef] | 0xe0; /*PCI*/

36
src/video/vid_oak_oti.c
View File

@@ -8,7 +8,7 @@
* *
* Oak OTI037C/67/077 emulation. * Oak OTI037C/67/077 emulation.
* *
* Version: @(#)vid_oak_oti.c 1.0.6 2018/03/15 * Version: @(#)vid_oak_oti.c 1.0.7 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -181,6 +181,40 @@ oti_in(uint16_t addr, void *p)
temp = svga->crtc[svga->crtcreg & 31]; temp = svga->crtc[svga->crtcreg & 31];
break; break;
case 0x3DA:
svga->attrff = 0;
svga->attrff = 0;
svga->cgastat &= ~0x30;
/* copy color diagnostic info from the overscan color register */
switch (svga->attrregs[0x12] & 0x30)
{
case 0x00: /* P0 and P2 */
if (svga->attrregs[0x11] & 0x01)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x04)
svga->cgastat |= 0x20;
break;
case 0x10: /* P4 and P5 */
if (svga->attrregs[0x11] & 0x10)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x20)
svga->cgastat |= 0x20;
break;
case 0x20: /* P1 and P3 */
if (svga->attrregs[0x11] & 0x02)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x08)
svga->cgastat |= 0x20;
break;
case 0x30: /* P6 and P7 */
if (svga->attrregs[0x11] & 0x40)
svga->cgastat |= 0x10;
if (svga->attrregs[0x11] & 0x80)
svga->cgastat |= 0x20;
break;
}
return svga->cgastat;
case 0x3DE: case 0x3DE:
temp = oti->index | (oti->chip_id << 5); temp = oti->index | (oti->chip_id << 5);
break; break;

26
src/video/vid_svga.c
View File

@@ -11,7 +11,7 @@
* This is intended to be used by another SVGA driver, * This is intended to be used by another SVGA driver,
* and not as a card in it's own right. * and not as a card in it's own right.
* *
* Version: @(#)vid_svga.c 1.0.7 2018/03/17 * Version: @(#)vid_svga.c 1.0.8 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -115,9 +115,18 @@ void svga_out(uint16_t addr, uint8_t val, void *p)
} }
} }
/* Recalculate timings on change of attribute register 0x11 (overscan border color) too. */ /* Recalculate timings on change of attribute register 0x11 (overscan border color) too. */
if ((svga->attraddr == 0x10) || (svga->attraddr == 0x11)) if (svga->attraddr == 0x10)
if (o != val) svga_recalctimings(svga); {
if (svga->attraddr == 0x12) if (o != val)
svga_recalctimings(svga);
}
else if (svga->attraddr == 0x11)
{
svga->overscan_color = svga->pallook[svga->overscan_color];
if (o != val)
svga_recalctimings(svga);
}
else if (svga->attraddr == 0x12)
{ {
if ((val & 0xf) != svga->plane_mask) if ((val & 0xf) != svga->plane_mask)
svga->fullchange = changeframecount; svga->fullchange = changeframecount;
@@ -710,6 +719,7 @@ int svga_init(svga_t *svga, void *p, int memsize,
svga->readmode = 0; svga->readmode = 0;
svga->attrregs[0x11] = 0; svga->attrregs[0x11] = 0;
svga->overscan_color = 0x000000;
overscan_x = 16; overscan_x = 16;
overscan_y = 32; overscan_y = 32;
@@ -1294,7 +1304,7 @@ void svga_doblit(int y1, int y2, int wx, int wy, svga_t *svga)
p = &((uint32_t *)buffer32->line[i & 0x7ff])[32]; p = &((uint32_t *)buffer32->line[i & 0x7ff])[32];
for (j = 0; j < (xsize + x_add); j++) for (j = 0; j < (xsize + x_add); j++)
p[j] = svga_color_transform(svga->pallook[svga->attrregs[0x11]]); p[j] = svga_color_transform(svga->overscan_color);
} }
/* Draw (overscan_size + scroll size) lines of overscan on the bottom. */ /* Draw (overscan_size + scroll size) lines of overscan on the bottom. */
@@ -1302,15 +1312,15 @@ void svga_doblit(int y1, int y2, int wx, int wy, svga_t *svga)
p = &((uint32_t *)buffer32->line[(ysize + (y_add >> 1) + i) & 0x7ff])[32]; p = &((uint32_t *)buffer32->line[(ysize + (y_add >> 1) + i) & 0x7ff])[32];
for (j = 0; j < (xsize + x_add); j++) for (j = 0; j < (xsize + x_add); j++)
p[j] = svga_color_transform(svga->pallook[svga->attrregs[0x11]]); p[j] = svga_color_transform(svga->overscan_color);
} }
for (i = (y_add >> 1); i < (ysize + (y_add >> 1)); i ++) { for (i = (y_add >> 1); i < (ysize + (y_add >> 1)); i ++) {
p = &((uint32_t *)buffer32->line[i & 0x7ff])[32]; p = &((uint32_t *)buffer32->line[i & 0x7ff])[32];
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
p[j] = svga_color_transform(svga->pallook[svga->attrregs[0x11]]); p[j] = svga->pallook[svga->overscan_color];
p[xsize + (x_add >> 1) + j] = svga_color_transform(svga->pallook[svga->attrregs[0x11]]); p[xsize + (x_add >> 1) + j] = svga_color_transform(svga->overscan_color);
} }
} }
} }

18
src/video/vid_svga.h
View File

@@ -8,7 +8,7 @@
* *
* Definitions for the generic SVGA driver. * Definitions for the generic SVGA driver.
* *
* Version: @(#)vid_svga.h 1.0.3 2018/03/04 * Version: @(#)vid_svga.h 1.0.4 2018/03/26
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -46,7 +46,6 @@ typedef struct svga_t
int enabled; int enabled;
uint8_t crtcreg; uint8_t crtcreg;
uint8_t crtc[128]; uint8_t crtc[128];
uint8_t gdcreg[64]; uint8_t gdcreg[64];
@@ -158,6 +157,14 @@ typedef struct svga_t
int hwcursor_oddeven; int hwcursor_oddeven;
int overlay_oddeven; int overlay_oddeven;
/*If set then another device is driving the monitor output and the SVGA
card should not attempt to display anything */
int override;
void *p;
uint32_t linear_base;
uint32_t overscan_color;
void (*render)(struct svga_t *svga); void (*render)(struct svga_t *svga);
void (*recalctimings_ex)(struct svga_t *svga); void (*recalctimings_ex)(struct svga_t *svga);
@@ -169,13 +176,6 @@ typedef struct svga_t
void (*overlay_draw)(struct svga_t *svga, int displine); void (*overlay_draw)(struct svga_t *svga, int displine);
void (*vblank_start)(struct svga_t *svga); void (*vblank_start)(struct svga_t *svga);
/*If set then another device is driving the monitor output and the SVGA
card should not attempt to display anything */
int override;
void *p;
uint32_t linear_base;
} svga_t; } svga_t;
extern int svga_init(svga_t *svga, void *p, int memsize, extern int svga_init(svga_t *svga, void *p, int memsize,