mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 18:08:20 -07:00
Code Issues Packages Projects Releases Activity

More sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-09 23:46:54 -04:00
parent 0d1d069af4
commit ee695e71f9
218 changed files with 6282 additions and 3845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/agpgart.c
View File

@@ -24,6 +24,7 @@
#include <86box/device.h>
#include <86box/mem.h>
#include <86box/agpgart.h>
#include <86box/plat_unused.h>
#ifdef ENABLE_AGPGART_LOG
int agpgart_do_log = ENABLE_AGPGART_LOG;
@@ -129,7 +130,7 @@ agpgart_aperture_writel(uint32_t addr, uint32_t val, void *priv)
}
static void *
agpgart_init(const device_t *info)
agpgart_init(UNUSED(const device_t *info))
{
agpgart_t *dev = malloc(sizeof(agpgart_t));
memset(dev, 0, sizeof(agpgart_t));

205
src/video/vid_8514a.c
View File

@@ -38,10 +38,10 @@
#include <86box/vid_svga_render.h>
#include "cpu.h"
static void ibm8514_accel_outb(uint16_t port, uint8_t val, void *p);
static void ibm8514_accel_outw(uint16_t port, uint16_t val, void *p);
static uint8_t ibm8514_accel_inb(uint16_t port, void *p);
static uint16_t ibm8514_accel_inw(uint16_t port, void *p);
static void ibm8514_accel_outb(uint16_t port, uint8_t val, void *priv);
static void ibm8514_accel_outw(uint16_t port, uint16_t val, void *priv);
static uint8_t ibm8514_accel_inb(uint16_t port, void *priv);
static uint16_t ibm8514_accel_inw(uint16_t port, void *priv);
#ifdef ENABLE_IBM8514_LOG
int ibm8514_do_log = ENABLE_IBM8514_LOG;
@@ -238,7 +238,7 @@ ibm8514_cpu_dest(svga_t *svga)
}
void
ibm8514_accel_out_pixtrans(svga_t *svga, uint16_t port, uint16_t val, int len)
ibm8514_accel_out_pixtrans(svga_t *svga, UNUSED(uint16_t port), uint16_t val, int len)
{
ibm8514_t *dev = &svga->dev8514;
uint8_t nibble = 0;
@@ -536,6 +536,7 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
case 0x92e8:
if (len != 1)
dev->test = val;
[[fallthrough]];
case 0xd2e8:
if (len == 1)
dev->accel.err_term = (dev->accel.err_term & 0x3f00) | val;
@@ -778,21 +779,24 @@ ibm8514_accel_out_fifo(svga_t *svga, uint16_t port, uint32_t val, int len)
dev->accel.cmd_back = 0;
}
break;
default:
break;
}
}
void
ibm8514_ramdac_out(uint16_t port, uint8_t val, void *p)
ibm8514_ramdac_out(uint16_t port, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
svga_out(port, val, svga);
}
uint8_t
ibm8514_ramdac_in(uint16_t port, void *p)
ibm8514_ramdac_in(uint16_t port, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
uint8_t ret;
ret = svga_in(port, svga);
@@ -980,21 +984,24 @@ ibm8514_accel_out(uint16_t port, uint32_t val, svga_t *svga, int len)
ibm8514_log("IBM 8514/A: VGA ON = %i, val = %02x\n", vga_on, val);
svga_recalctimings(svga);
break;
default:
break;
}
}
}
static void
ibm8514_accel_outb(uint16_t port, uint8_t val, void *p)
ibm8514_accel_outb(uint16_t port, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
ibm8514_accel_out(port, val, svga, 1);
}
static void
ibm8514_accel_outw(uint16_t port, uint16_t val, void *p)
ibm8514_accel_outw(uint16_t port, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
ibm8514_accel_out(port, val, svga, 2);
}
@@ -1120,21 +1127,24 @@ ibm8514_accel_in(uint16_t port, svga_t *svga, int len)
}
}
break;
default:
break;
}
return temp;
}
static uint8_t
ibm8514_accel_inb(uint16_t port, void *p)
ibm8514_accel_inb(uint16_t port, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
return ibm8514_accel_in(port, svga, 1);
}
static uint16_t
ibm8514_accel_inw(uint16_t port, void *p)
ibm8514_accel_inw(uint16_t port, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
return ibm8514_accel_in(port, svga, 2);
}
@@ -1157,27 +1167,30 @@ ibm8514_short_stroke_start(int count, int cpu_input, uint32_t mix_dat, uint32_t
}
void
ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, int len)
ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, svga_t *svga, UNUSED(int len))
{
ibm8514_t *dev = &svga->dev8514;
uint16_t *vram_w = (uint16_t *)svga->vram;
uint16_t src_dat = 0, dest_dat, old_dest_dat;
int frgd_mix, bkgd_mix;
uint16_t clip_b = dev->accel.multifunc[3];
uint16_t clip_r = dev->accel.multifunc[4];
int pixcntl = (dev->accel.multifunc[0x0a] >> 6) & 3;
uint16_t mix_mask = ((svga->bpp == 8) || (svga->bpp == 24)) ? 0x80 : 0x8000;
uint16_t compare = dev->accel.color_cmp;
int compare_mode = dev->accel.multifunc[0x0a] & 0x38;
int cmd = dev->accel.cmd >> 13;
uint16_t wrt_mask = dev->accel.wrt_mask;
uint16_t rd_mask = dev->accel.rd_mask;
uint16_t rd_mask_polygon = dev->accel.rd_mask;
uint16_t frgd_color = dev->accel.frgd_color;
uint16_t bkgd_color = dev->accel.bkgd_color;
uint32_t old_mix_dat;
int and3 = dev->accel.cur_x & 3;
uint16_t poly_src = 0;
uint16_t *vram_w = (uint16_t *)svga->vram;
uint16_t src_dat = 0;
uint16_t dest_dat;
uint16_t old_dest_dat;
int frgd_mix;
int bkgd_mix;
uint16_t clip_b = dev->accel.multifunc[3];
uint16_t clip_r = dev->accel.multifunc[4];
int pixcntl = (dev->accel.multifunc[0x0a] >> 6) & 3;
uint16_t mix_mask = ((svga->bpp == 8) || (svga->bpp == 24)) ? 0x80 : 0x8000;
uint16_t compare = dev->accel.color_cmp;
int compare_mode = dev->accel.multifunc[0x0a] & 0x38;
int cmd = dev->accel.cmd >> 13;
uint16_t wrt_mask = dev->accel.wrt_mask;
uint16_t rd_mask = dev->accel.rd_mask;
uint16_t rd_mask_polygon = dev->accel.rd_mask;
uint16_t frgd_color = dev->accel.frgd_color;
uint16_t bkgd_color = dev->accel.bkgd_color;
uint32_t old_mix_dat;
int and3 = dev->accel.cur_x & 3;
uint16_t poly_src = 0;
if ((svga->bpp == 8) || (svga->bpp == 24)) {
compare &= 0xff;
@@ -1210,7 +1223,7 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
count >>= 3;
}
if (((svga->bpp == 15) || (svga->bpp == 16))) {
if ((svga->bpp == 15) || (svga->bpp == 16)) {
if ((dev->accel.cmd & 0x200) && (count == 2))
count >>= 1;
}
@@ -1318,6 +1331,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -1375,13 +1391,16 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
dev->accel.cx++;
dev->accel.cy++;
break;
default:
break;
}
dev->accel.ssv_len--;
}
} else {
while (count-- && (dev->accel.ssv_len >= 0)) {
if ((dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b)) {
if (dev->accel.cx >= dev->accel.clip_left && dev->accel.cx <= clip_r && dev->accel.cy >= dev->accel.clip_top && dev->accel.cy <= clip_b) {
switch ((mix_dat & mix_mask) ? frgd_mix : bkgd_mix) {
case 0:
src_dat = bkgd_color;
@@ -1395,6 +1414,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -1452,6 +1474,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cx++;
break;
default:
break;
}
} else
dev->accel.err_term += dev->accel.desty_axstp;
@@ -1482,6 +1507,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cy++;
break;
default:
break;
}
dev->accel.ssv_len--;
@@ -1579,6 +1607,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -1697,6 +1728,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
dev->accel.cx++;
dev->accel.cy++;
break;
default:
break;
}
dev->accel.sy--;
@@ -1728,6 +1762,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -1783,6 +1820,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cx++;
break;
default:
break;
}
} else
dev->accel.err_term += dev->accel.desty_axstp;
@@ -1813,6 +1853,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cy++;
break;
default:
break;
}
dev->accel.sy--;
@@ -1847,6 +1890,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -1902,6 +1948,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cx++;
break;
default:
break;
}
} else
dev->accel.err_term += dev->accel.desty_axstp;
@@ -1932,6 +1981,9 @@ ibm8514_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
case 0xe0:
dev->accel.cy++;
break;
default:
break;
}
dev->accel.sy--;
@@ -2067,6 +2119,9 @@ rect_fill_pix:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2161,6 +2216,9 @@ rect_fill_pix:
case 0xe0:
dev->accel.cx++;
break;
default:
break;
}
dev->accel.sx--;
@@ -2200,6 +2258,9 @@ rect_fill_pix:
case 0xe0:
dev->accel.cy++;
break;
default:
break;
}
dev->accel.dest = dev->accel.cy * dev->pitch;
@@ -2239,6 +2300,9 @@ rect_fill_pix:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2320,6 +2384,9 @@ rect_fill_pix:
case 3:
src_dat = 0;
break;
default:
break;
}
}
@@ -2556,6 +2623,9 @@ rect_fill_pix:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2632,6 +2702,9 @@ rect_fill:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2699,6 +2772,9 @@ rect_fill:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2762,6 +2838,9 @@ rect_fill:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, poly_src);
@@ -2838,6 +2917,9 @@ rect_fill:
case 3:
src_dat = 0;
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.cx, dest_dat);
@@ -2926,6 +3008,9 @@ rect_fill:
case 3:
src_dat = 0;
break;
default:
break;
}
READ((dev->accel.cy * dev->pitch) + dev->accel.cx, dest_dat);
@@ -2989,6 +3074,9 @@ rect_fill:
case 0xe0:
dev->accel.cx++;
break;
default:
break;
}
} else
dev->accel.err_term += dev->accel.desty_axstp;
@@ -3023,6 +3111,9 @@ rect_fill:
dev->accel.oldcy = dev->accel.cy;
dev->accel.cy++;
break;
default:
break;
}
dev->accel.sy++;
@@ -3111,6 +3202,9 @@ bitblt_pix:
}
}
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3200,6 +3294,9 @@ bitblt_pix:
}
}
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3307,6 +3404,9 @@ bitblt_pix:
}
}
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3385,6 +3485,9 @@ bitblt:
case 3:
READ(dev->accel.src + dev->accel.cx, src_dat);
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3459,6 +3562,9 @@ bitblt:
case 3:
READ(dev->accel.src + dev->accel.cx, src_dat);
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3514,13 +3620,14 @@ bitblt:
}
} else {
if ((svga->bpp == 24) && dev->local && (dev->accel.cmd == 0xc2b5)) {
int64_t cx, dx;
int64_t cx;
int64_t dx;
cx = (int64_t)dev->accel.cx;
dx = (int64_t)dev->accel.dx;
while (1) {
if (((dx) >= (((int64_t)dev->accel.clip_left) * 3) && (dx) <= (((uint64_t)clip_r) * 3) && dev->accel.dy >= (dev->accel.clip_top << 1) && dev->accel.dy <= (clip_b << 1))) {
if (dx >= (((int64_t)dev->accel.clip_left) * 3) && dx <= (((uint64_t)clip_r) * 3) && dev->accel.dy >= (dev->accel.clip_top << 1) && dev->accel.dy <= (clip_b << 1)) {
READ(dev->accel.src + (dev->accel.ge_offset << 2) + cx, src_dat);
READ(dev->accel.dest + (dev->accel.ge_offset << 2) + dx, dest_dat);
@@ -3570,6 +3677,9 @@ bitblt:
}
}
break;
default:
break;
}
READ(dev->accel.dest + dev->accel.dx, dest_dat);
@@ -3632,6 +3742,9 @@ bitblt:
}
}
break;
default:
break;
}
}
@@ -3960,9 +4073,9 @@ static void
}
static void
ibm8514_close(void *p)
ibm8514_close(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
ibm8514_t *dev = &svga->dev8514;
if (dev) {
@@ -3972,17 +4085,17 @@ ibm8514_close(void *p)
}
static void
ibm8514_speed_changed(void *p)
ibm8514_speed_changed(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
svga_recalctimings(svga);
}
static void
ibm8514_force_redraw(void *p)
ibm8514_force_redraw(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
svga->fullchange = changeframecount;
}

32
src/video/vid_ati18800.c
View File

@@ -62,9 +62,9 @@ typedef struct ati18800_t {
static video_timings_t timing_ati18800 = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
static void
ati18800_out(uint16_t addr, uint8_t val, void *p)
ati18800_out(uint16_t addr, uint8_t val, void *priv)
{
ati18800_t *ati18800 = (ati18800_t *) p;
ati18800_t *ati18800 = (ati18800_t *) priv;
svga_t *svga = &ati18800->svga;
uint8_t old;
@@ -93,6 +93,9 @@ ati18800_out(uint16_t addr, uint8_t val, void *p)
case 0xb3:
ati_eeprom_write(&ati18800->eeprom, val & 8, val & 2, val & 1);
break;
default:
break;
}
break;
@@ -118,14 +121,17 @@ ati18800_out(uint16_t addr, uint8_t val, void *p)
}
}
break;
default:
break;
}
svga_out(addr, val, svga);
}
static uint8_t
ati18800_in(uint16_t addr, void *p)
ati18800_in(uint16_t addr, void *priv)
{
ati18800_t *ati18800 = (ati18800_t *) p;
ati18800_t *ati18800 = (ati18800_t *) priv;
svga_t *svga = &ati18800->svga;
uint8_t temp = 0xff;
@@ -165,7 +171,7 @@ ati18800_in(uint16_t addr, void *p)
static void
ati18800_recalctimings(svga_t *svga)
{
ati18800_t *ati18800 = (ati18800_t *) svga->p;
ati18800_t *ati18800 = (ati18800_t *) svga->priv;
if (svga->crtc[0x17] & 4) {
svga->vtotal <<= 1;
@@ -193,11 +199,9 @@ ati18800_init(const device_t *info)
video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ati18800);
switch (info->local) {
#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
case ATI18800_WONDER:
#endif
default:
#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
case ATI18800_WONDER:
rom_init(&ati18800->bios_rom, BIOS_ROM_PATH_WONDER, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
break;
#endif
@@ -254,9 +258,9 @@ ati18800_available(void)
}
static void
ati18800_close(void *p)
ati18800_close(void *priv)
{
ati18800_t *ati18800 = (ati18800_t *) p;
ati18800_t *ati18800 = (ati18800_t *) priv;
svga_close(&ati18800->svga);
@@ -264,17 +268,17 @@ ati18800_close(void *p)
}
static void
ati18800_speed_changed(void *p)
ati18800_speed_changed(void *priv)
{
ati18800_t *ati18800 = (ati18800_t *) p;
ati18800_t *ati18800 = (ati18800_t *) priv;
svga_recalctimings(&ati18800->svga);
}
static void
ati18800_force_redraw(void *p)
ati18800_force_redraw(void *priv)
{
ati18800_t *ati18800 = (ati18800_t *) p;
ati18800_t *ati18800 = (ati18800_t *) priv;
ati18800->svga.fullchange = changeframecount;
}

47
src/video/vid_ati28800.c
View File

@@ -108,9 +108,9 @@ ati28800_log(const char *fmt, ...)
static void ati28800_recalctimings(svga_t *svga);
static void
ati28800_out(uint16_t addr, uint8_t val, void *p)
ati28800_out(uint16_t addr, uint8_t val, void *priv)
{
ati28800_t *ati28800 = (ati28800_t *) p;
ati28800_t *ati28800 = (ati28800_t *) priv;
svga_t *svga = &ati28800->svga;
uint8_t old;
@@ -169,6 +169,9 @@ ati28800_out(uint16_t addr, uint8_t val, void *p)
if ((old ^ val) & 2)
svga_recalctimings(svga);
break;
default:
break;
}
break;
@@ -205,14 +208,17 @@ ati28800_out(uint16_t addr, uint8_t val, void *p)
}
}
break;
default:
break;
}
svga_out(addr, val, svga);
}
static void
ati28800k_out(uint16_t addr, uint8_t val, void *p)
ati28800k_out(uint16_t addr, uint8_t val, void *priv)
{
ati28800_t *ati28800 = (ati28800_t *) p;
ati28800_t *ati28800 = (ati28800_t *) priv;
svga_t *svga = &ati28800->svga;
uint16_t oldaddr = addr;
@@ -225,7 +231,7 @@ ati28800k_out(uint16_t addr, uint8_t val, void *p)
ati28800->ksc5601_mode_enabled = val & 0x20;
svga_recalctimings(svga);
}
ati28800_out(oldaddr, val, p);
ati28800_out(oldaddr, val, priv);
break;
case 0x3DD:
ati28800->port_03dd_val = val;
@@ -259,20 +265,23 @@ ati28800k_out(uint16_t addr, uint8_t val, void *p)
if (val & 2)
ati28800->in_get_korean_font_kind_set = 1;
break;
default:
break;
}
break;
}
break;
default:
ati28800_out(oldaddr, val, p);
ati28800_out(oldaddr, val, priv);
break;
}
}
static uint8_t
ati28800_in(uint16_t addr, void *p)
ati28800_in(uint16_t addr, void *priv)
{
ati28800_t *ati28800 = (ati28800_t *) p;
ati28800_t *ati28800 = (ati28800_t *) priv;
svga_t *svga = &ati28800->svga;
uint8_t temp;
@@ -346,9 +355,9 @@ ati28800_in(uint16_t addr, void *p)
}
static uint8_t
ati28800k_in(uint16_t addr, void *p)
ati28800k_in(uint16_t addr, void *priv)
{
ati28800_t *ati28800 = (ati28800_t *) p;
ati28800_t *ati28800 = (ati28800_t *) priv;
svga_t *svga = &ati28800->svga;
uint16_t oldaddr = addr;
uint8_t temp = 0xFF;
@@ -380,7 +389,7 @@ ati28800k_in(uint16_t addr, void *p)
}
break;
default:
temp = ati28800_in(oldaddr, p);
temp = ati28800_in(oldaddr, priv);
break;
}
if (addr != 0x3da)
@@ -391,7 +400,7 @@ ati28800k_in(uint16_t addr, void *p)
static void
ati28800_recalctimings(svga_t *svga)
{
ati28800_t *ati28800 = (ati28800_t *) svga->p;
ati28800_t *ati28800 = (ati28800_t *) svga->priv;
if (ati28800->regs[0xa3] & 0x10)
svga->ma_latch |= 0x10000;
@@ -507,8 +516,14 @@ ati28800_recalctimings(svga_t *svga)
svga->ma_latch <<= 1;
}
break;
default:
break;
}
break;
default:
break;
}
}
}
@@ -517,7 +532,7 @@ ati28800_recalctimings(svga_t *svga)
static void
ati28800k_recalctimings(svga_t *svga)
{
ati28800_t *ati28800 = (ati28800_t *) svga->p;
ati28800_t *ati28800 = (ati28800_t *) svga->priv;
ati28800_recalctimings(svga);
@@ -550,8 +565,8 @@ ati28800k_init(const device_t *info)
ati28800->ksc5601_mode_enabled = 0;
switch (ati28800->type_korean) {
case 0:
default:
case 0:
rom_init(&ati28800->bios_rom, BIOS_ATIKOR_PATH, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
loadfont(FONT_ATIKOR_PATH, 6);
break;
@@ -705,9 +720,9 @@ ati28800_close(void *priv)
}
static void
ati28800_speed_changed(void *p)
ati28800_speed_changed(void *priv)
{
ati28800_t *ati28800 = (ati28800_t *) p;
ati28800_t *ati28800 = (ati28800_t *) priv;
svga_recalctimings(&ati28800->svga);
}

15
src/video/vid_ati68860_ramdac.c
View File

@@ -48,13 +48,16 @@
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
#include <86box/plat_unused.h>
typedef struct ati68860_ramdac_t {
uint8_t regs[16];
void (*render)(struct svga_t *svga);
int dac_addr, dac_pos;
int dac_r, dac_g;
int dac_addr;
int dac_pos;
int dac_r;
int dac_g;
PALETTE pal;
uint32_t pallook[2];
@@ -113,6 +116,9 @@ ati68860_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga)
ramdac->dac_pos = 0;
ramdac->dac_addr = (ramdac->dac_addr + 1) & 255;
break;
default:
break;
}
break;
case 0xb:
@@ -153,6 +159,9 @@ ati68860_ramdac_out(uint16_t addr, uint8_t val, void *p, svga_t *svga)
case 0xc:
svga_set_ramdac_type(svga, (val & 1) ? RAMDAC_6BIT : RAMDAC_8BIT);
break;
default:
break;
}
break;
}
@@ -217,7 +226,7 @@ ati68860_set_ramdac_type(void *p, int type)
}
static void *
ati68860_ramdac_init(const device_t *info)
ati68860_ramdac_init(UNUSED(const device_t *info))
{
ati68860_ramdac_t *ramdac = (ati68860_ramdac_t *) malloc(sizeof(ati68860_ramdac_t));
memset(ramdac, 0, sizeof(ati68860_ramdac_t));

49
src/video/vid_ati_eeprom.c
View File

@@ -30,49 +30,49 @@
void
ati_eeprom_load(ati_eeprom_t *eeprom, char *fn, int type)
{
FILE *f;
FILE *fp;
int size;
eeprom->type = type;
strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
f = nvr_fopen(eeprom->fn, "rb");
fp = nvr_fopen(eeprom->fn, "rb");
size = eeprom->type ? 512 : 128;
if (!f) {
if (!fp) {
memset(eeprom->data, 0xff, size);
return;
}
if (fread(eeprom->data, 1, size, f) != size)
if (fread(eeprom->data, 1, size, fp) != size)
memset(eeprom->data, 0, size);
fclose(f);
fclose(fp);
}
void
ati_eeprom_load_mach8(ati_eeprom_t *eeprom, char *fn)
{
FILE *f;
FILE *fp;
int size;
eeprom->type = 0;
strncpy(eeprom->fn, fn, sizeof(eeprom->fn) - 1);
f = nvr_fopen(eeprom->fn, "rb");
fp = nvr_fopen(eeprom->fn, "rb");
size = 128;
if (!f) { /*The ATI Graphics Ultra bios expects an immediate write to nvram if none is present at boot time otherwise
if (!fp) { /*The ATI Graphics Ultra bios expects an immediate write to nvram if none is present at boot time otherwise
it would hang the machine.*/
memset(eeprom->data, 0, size);
f = nvr_fopen(eeprom->fn, "wb");
fwrite(eeprom->data, 1, size, f);
fp = nvr_fopen(eeprom->fn, "wb");
fwrite(eeprom->data, 1, size, fp);
}
if (fread(eeprom->data, 1, size, f) != size)
if (fread(eeprom->data, 1, size, fp) != size)
memset(eeprom->data, 0, size);
fclose(f);
fclose(fp);
}
void
ati_eeprom_save(ati_eeprom_t *eeprom)
{
FILE *f = nvr_fopen(eeprom->fn, "wb");
if (!f)
FILE *fp = nvr_fopen(eeprom->fn, "wb");
if (!fp)
return;
fwrite(eeprom->data, 1, eeprom->type ? 512 : 128, f);
fclose(f);
fwrite(eeprom->data, 1, eeprom->type ? 512 : 128, fp);
fclose(fp);
}
void
@@ -93,7 +93,7 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
if (!dat)
break;
eeprom->state = EEPROM_OPCODE;
/* fall through */
[[fallthrough]];
case EEPROM_OPCODE:
eeprom->opcode = (eeprom->opcode << 1) | (dat ? 1 : 0);
eeprom->count--;
@@ -119,6 +119,9 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
eeprom->state = EEPROM_INPUT;
eeprom->dat = 0;
break;
default:
break;
}
}
break;
@@ -160,6 +163,9 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
case EEPROM_OP_EWEN:
eeprom->wp = 0;
break;
default:
break;
}
eeprom->state = EEPROM_IDLE;
eeprom->out = 1;
@@ -183,9 +189,15 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
eeprom->state = EEPROM_IDLE;
eeprom->out = 1;
break;
default:
break;
}
}
break;
default:
break;
}
}
eeprom->oldena = ena;
@@ -200,6 +212,9 @@ ati_eeprom_write(ati_eeprom_t *eeprom, int ena, int clk, int dat)
eeprom->state = EEPROM_IDLE;
}
break;
default:
break;
}
}
}

453
src/video/vid_ati_mach64.c
View File

File diff suppressed because it is too large Load Diff

437
src/video/vid_ati_mach8.c
View File

File diff suppressed because it is too large Load Diff

9
src/video/vid_att20c49x_ramdac.c
View File

@@ -63,6 +63,9 @@ att49x_ramdac_control(uint8_t val, void *p, svga_t *svga)
case 7:
svga->bpp = 24;
break;
default:
break;
}
if (ramdac->type == ATT_490 || ramdac->type == ATT_491)
svga_set_ramdac_type(svga, (val & 2) ? RAMDAC_8BIT : RAMDAC_6BIT);
@@ -100,6 +103,9 @@ att49x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga)
att49x_ramdac_control(val, ramdac, svga);
ramdac->state = 0;
break;
default:
break;
}
}
@@ -143,6 +149,9 @@ att49x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga)
temp = ramdac->ctrl;
ramdac->state = 0;
break;
default:
break;
}
return temp;

6
src/video/vid_att2xc498_ramdac.c
View File

@@ -102,6 +102,9 @@ att498_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga)
case 0x06:
att498_ramdac_control(val, ramdac, svga);
break;
default:
break;
}
}
@@ -147,6 +150,9 @@ att498_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga)
temp = ramdac->ctrl;
ramdac->state = 0;
break;
default:
break;
}
return temp;

8
src/video/vid_av9194.c
View File

@@ -27,9 +27,10 @@
#include <86box/timer.h>
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/plat_unused.h>
float
av9194_getclock(int clock, void *p)
av9194_getclock(int clock, UNUSED(void *priv))
{
float ret = 0.0;
@@ -79,13 +80,16 @@ av9194_getclock(int clock, void *p)
case 0xf:
ret = 94500000.0;
break;
default:
break;
}
return ret;
}
static void *
av9194_init(const device_t *info)
av9194_init(UNUSED(const device_t *info))
{
/* Return something non-NULL. */
return (void *) &av9194_device;

38
src/video/vid_bt48x_ramdac.c
View File

@@ -77,6 +77,9 @@ bt48x_set_bpp(bt48x_ramdac_t *ramdac, svga_t *svga)
case 0x60:
svga->bpp = 4;
break;
default:
break;
}
svga_recalctimings(svga);
}
@@ -104,7 +107,7 @@ bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *
svga->dac_status = addr & 0x03;
svga->dac_addr = val;
if (ramdac->type >= BT485)
svga->dac_addr |= ((int) (ramdac->cmd_r3 & 0x03) << 8);
svga->dac_addr |= ((ramdac->cmd_r3 & 0x03) << 8);
if (svga->dac_status)
svga->dac_addr = (svga->dac_addr + 1) & da_mask;
break;
@@ -143,6 +146,9 @@ bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *
svga->dac_addr = (svga->dac_addr + 1) & 0xff;
svga->dac_pos = 0;
break;
default:
break;
}
break;
case 0x06: /* Command Register 0 (RS value = 0110) */
@@ -183,6 +189,9 @@ bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *
break;
}
break;
default:
break;
}
}
break;
@@ -215,6 +224,9 @@ bt48x_ramdac_out(uint16_t addr, int rs2, int rs3, uint8_t val, void *p, svga_t *
ramdac->hwc_y = (ramdac->hwc_y & 0x00ff) | ((val & 0x0f) << 8);
svga->dac_hwcursor.y = ramdac->hwc_y - svga->dac_hwcursor.cur_ysize;
break;
default:
break;
}
return;
@@ -271,6 +283,9 @@ bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
else
temp = ramdac->extpal[index].b & 0x3f;
break;
default:
break;
}
break;
case 0x06: /* Command Register 0 (RS value = 0110) */
@@ -285,8 +300,8 @@ bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
case 0x0a:
if ((ramdac->type >= BT485) && (ramdac->cmd_r0 & 0x80)) {
switch (svga->dac_addr & ((ramdac->type >= BT485A) ? 0xff : 0x3f)) {
case 0x00:
default:
case 0x00:
temp = ramdac->status | (svga->dac_status ? 0x04 : 0x00);
break;
case 0x01:
@@ -307,7 +322,6 @@ bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
temp = 0xff;
break;
}
break;
}
} else
temp = ramdac->status | (svga->dac_status ? 0x04 : 0x00);
@@ -337,6 +351,9 @@ bt48x_ramdac_in(uint16_t addr, int rs2, int rs3, void *p, svga_t *svga)
case 0x0f: /* Cursor Y High Register (RS value = 1111) */
temp = (ramdac->hwc_y >> 8) & 0xff;
break;
default:
break;
}
return temp;
@@ -419,6 +436,9 @@ bt48x_hwcursor_draw(svga_t *svga, int displine)
case 3:
p[x_pos] = clr3;
break;
default:
break;
}
break;
case 2: /* PM/Windows */
@@ -432,6 +452,9 @@ bt48x_hwcursor_draw(svga_t *svga, int displine)
case 3:
p[x_pos] ^= 0xffffff;
break;
default:
break;
}
break;
case 3: /* X-Windows */
@@ -442,8 +465,14 @@ bt48x_hwcursor_draw(svga_t *svga, int displine)
case 3:
p[x_pos] = clr2;
break;
default:
break;
}
break;
default:
break;
}
}
offset++;
@@ -484,6 +513,9 @@ bt48x_ramdac_init(const device_t *info)
case BT485A:
ramdac->status = 0x20;
break;
default:
break;
}
return ramdac;

47
src/video/vid_cga.c
View File

@@ -33,6 +33,7 @@
#include <86box/video.h>
#include <86box/vid_cga.h>
#include <86box/vid_cga_comp.h>
#include <86box/plat_unused.h>
#define CGA_RGB 0
#define CGA_COMPOSITE 1
@@ -50,9 +51,9 @@ static video_timings_t timing_cga = { .type = VIDEO_ISA, .write_b = 8, .write_w
void cga_recalctimings(cga_t *cga);
void
cga_out(uint16_t addr, uint8_t val, void *p)
cga_out(uint16_t addr, uint8_t val, void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
uint8_t old;
if ((addr >= 0x3d0) && (addr <= 0x3d7))
@@ -89,13 +90,16 @@ cga_out(uint16_t addr, uint8_t val, void *p)
if (old ^ val)
cga_recalctimings(cga);
return;
default:
break;
}
}
uint8_t
cga_in(uint16_t addr, void *p)
cga_in(uint16_t addr, void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
uint8_t ret = 0xff;
@@ -112,29 +116,32 @@ cga_in(uint16_t addr, void *p)
case 0x3DA:
ret = cga->cgastat;
break;
default:
break;
}
return ret;
}
void
cga_pravetz_out(uint16_t addr, uint8_t val, void *p)
cga_pravetz_out(UNUSED(uint16_t addr), uint8_t val, void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
cga->fontbase = (((unsigned int) val) << 8);
}
uint8_t
cga_pravetz_in(uint16_t addr, void *p)
cga_pravetz_in(UNUSED(uint16_t addr), void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
return (cga->fontbase >> 8);
}
void
cga_waitstates(void *p)
cga_waitstates(UNUSED(void *priv))
{
int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
int ws;
@@ -144,9 +151,9 @@ cga_waitstates(void *p)
}
void
cga_write(uint32_t addr, uint8_t val, void *p)
cga_write(uint32_t addr, uint8_t val, void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
cga->vram[addr & 0x3fff] = val;
if (cga->snow_enabled) {
@@ -158,9 +165,9 @@ cga_write(uint32_t addr, uint8_t val, void *p)
}
uint8_t
cga_read(uint32_t addr, void *p)
cga_read(uint32_t addr, void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
cga_waitstates(cga);
if (cga->snow_enabled) {
@@ -193,9 +200,9 @@ cga_recalctimings(cga_t *cga)
}
void
cga_poll(void *p)
cga_poll(void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
uint16_t ca = (cga->crtc[15] | (cga->crtc[14] << 8)) & 0x3fff;
int drawcursor;
int x;
@@ -508,7 +515,7 @@ cga_init(cga_t *cga)
}
void *
cga_standalone_init(const device_t *info)
cga_standalone_init(UNUSED(const device_t *info))
{
int display_type;
cga_t *cga = malloc(sizeof(cga_t));
@@ -554,18 +561,18 @@ cga_pravetz_init(const device_t *info)
}
void
cga_close(void *p)
cga_close(void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
free(cga->vram);
free(cga);
}
void
cga_speed_changed(void *p)
cga_speed_changed(void *priv)
{
cga_t *cga = (cga_t *) p;
cga_t *cga = (cga_t *) priv;
cga_recalctimings(cga);
}

4
src/video/vid_cga_comp.c
View File

@@ -244,7 +244,7 @@ Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewi
if ((cgamode & 4) != 0) {
/* Decode */
i = temp + 5;
srgb = (Bit32u *) TempLine;
srgb = TempLine;
for (x2 = 0; x2 < blocks * 4; ++x2) {
int c = (i[0] + i[0]) << 3;
int d = (i[-1] + i[1]) << 3;
@@ -268,7 +268,7 @@ Composite_Process(uint8_t cgamode, Bit8u border, Bit32u blocks /*, bool doublewi
i = temp + 5;
i[-1] = (i[-1] << 3) - ap[-1];
i[0] = (i[0] << 3) - ap[0];
srgb = (Bit32u *) TempLine;
srgb = TempLine;
for (x2 = 0; x2 < blocks; ++x2) {
int y;
int a;

256
src/video/vid_cl54xx.c
View File

@@ -236,19 +236,19 @@ static video_timings_t timing_gd54xx_vlb = { .type = VIDEO_BUS, .write_b = 4, .w
static video_timings_t timing_gd54xx_pci = { .type = VIDEO_PCI, .write_b = 4, .write_w = 4, .write_l = 8, .read_b = 10, .read_w = 10, .read_l = 20 };
static void
gd543x_mmio_write(uint32_t addr, uint8_t val, void *p);
gd543x_mmio_write(uint32_t addr, uint8_t val, void *priv);
static void
gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *p);
gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *priv);
static void
gd543x_mmio_writew(uint32_t addr, uint16_t val, void *p);
gd543x_mmio_writew(uint32_t addr, uint16_t val, void *priv);
static void
gd543x_mmio_writel(uint32_t addr, uint32_t val, void *p);
gd543x_mmio_writel(uint32_t addr, uint32_t val, void *priv);
static uint8_t
gd543x_mmio_read(uint32_t addr, void *p);
gd543x_mmio_read(uint32_t addr, void *priv);
static uint16_t
gd543x_mmio_readw(uint32_t addr, void *p);
gd543x_mmio_readw(uint32_t addr, void *priv);
static uint32_t
gd543x_mmio_readl(uint32_t addr, void *p);
gd543x_mmio_readl(uint32_t addr, void *priv);
static void
gd54xx_recalc_banking(gd54xx_t *gd54xx);
@@ -492,7 +492,7 @@ gd54xx_update_irqs(gd54xx_t *gd54xx)
static void
gd54xx_vblank_start(svga_t *svga)
{
gd54xx_t *gd54xx = (gd54xx_t *) svga->p;
gd54xx_t *gd54xx = (gd54xx_t *) svga->priv;
if (gd54xx->vblank_irq >= 0) {
gd54xx->vblank_irq = 1;
gd54xx_update_irqs(gd54xx);
@@ -512,7 +512,7 @@ gd54xx_is_5422(svga_t *svga)
static void
gd54xx_overlay_draw(svga_t *svga, int displine)
{
gd54xx_t *gd54xx = (gd54xx_t *) svga->p;
gd54xx_t *gd54xx = (gd54xx_t *) svga->priv;
int shift = (svga->crtc[0x27] >= CIRRUS_ID_CLGD5446) ? 2 : 0;
int h_acc = svga->overlay_latch.h_acc;
int r[8];
@@ -612,9 +612,9 @@ gd54xx_is_5434(svga_t *svga)
}
static void
gd54xx_out(uint16_t addr, uint8_t val, void *p)
gd54xx_out(uint16_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t old;
uint8_t o;
@@ -1157,9 +1157,9 @@ gd54xx_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
gd54xx_in(uint16_t addr, void *p)
gd54xx_in(uint16_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t index;
@@ -1646,7 +1646,7 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
static void
gd54xx_recalctimings(svga_t *svga)
{
gd54xx_t *gd54xx = (gd54xx_t *) svga->p;
gd54xx_t *gd54xx = (gd54xx_t *) svga->priv;
uint8_t clocksel;
uint8_t rdmask;
uint8_t linedbl = svga->dispend * 9 / 10 >= svga->hdisp;
@@ -1833,7 +1833,7 @@ gd54xx_recalctimings(svga_t *svga)
static void
gd54xx_hwcursor_draw(svga_t *svga, int displine)
{
gd54xx_t *gd54xx = (gd54xx_t *) svga->p;
gd54xx_t *gd54xx = (gd54xx_t *) svga->priv;
int comb;
int b0;
int b1;
@@ -1988,9 +1988,9 @@ gd54xx_mem_sys_src_write(gd54xx_t *gd54xx, uint8_t val)
}
static void
gd54xx_write(uint32_t addr, uint8_t val, void *p)
gd54xx_write(uint32_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2009,9 +2009,9 @@ gd54xx_write(uint32_t addr, uint8_t val, void *p)
}
static void
gd54xx_writew(uint32_t addr, uint16_t val, void *p)
gd54xx_writew(uint32_t addr, uint16_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2036,9 +2036,9 @@ gd54xx_writew(uint32_t addr, uint16_t val, void *p)
}
static void
gd54xx_writel(uint32_t addr, uint32_t val, void *p)
gd54xx_writel(uint32_t addr, uint32_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2147,9 +2147,9 @@ gd54xx_aperture2_enabled(gd54xx_t *gd54xx)
}
static uint8_t
gd54xx_readb_linear(uint32_t addr, void *p)
gd54xx_readb_linear(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2187,9 +2187,9 @@ gd54xx_readb_linear(uint32_t addr, void *p)
}
static uint16_t
gd54xx_readw_linear(uint32_t addr, void *p)
gd54xx_readw_linear(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2209,8 +2209,8 @@ gd54xx_readw_linear(uint32_t addr, void *p)
/* Do mem sys dest reads here if the blitter is neither paused, nor is there a second aperture. */
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
temp = gd54xx_readb_linear(addr, p);
temp |= gd54xx_readb_linear(addr + 1, p) << 8;
temp = gd54xx_readb_linear(addr, priv);
temp |= gd54xx_readb_linear(addr + 1, priv) << 8;
return temp;
}
@@ -2235,9 +2235,9 @@ gd54xx_readw_linear(uint32_t addr, void *p)
}
static uint32_t
gd54xx_readl_linear(uint32_t addr, void *p)
gd54xx_readl_linear(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2257,10 +2257,10 @@ gd54xx_readl_linear(uint32_t addr, void *p)
/* Do mem sys dest reads here if the blitter is neither paused, nor is there a second aperture. */
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
temp = gd54xx_readb_linear(addr, p);
temp |= gd54xx_readb_linear(addr + 1, p) << 8;
temp |= gd54xx_readb_linear(addr + 2, p) << 16;
temp |= gd54xx_readb_linear(addr + 3, p) << 24;
temp = gd54xx_readb_linear(addr, priv);
temp |= gd54xx_readb_linear(addr + 1, priv) << 8;
temp |= gd54xx_readb_linear(addr + 2, priv) << 16;
temp |= gd54xx_readb_linear(addr + 3, priv) << 24;
return temp;
}
@@ -2294,9 +2294,9 @@ gd54xx_readl_linear(uint32_t addr, void *p)
}
static uint8_t
gd5436_aperture2_readb(uint32_t addr, void *p)
gd5436_aperture2_readb(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
return gd54xx_mem_sys_dest_read(gd54xx);
@@ -2305,14 +2305,14 @@ gd5436_aperture2_readb(uint32_t addr, void *p)
}
static uint16_t
gd5436_aperture2_readw(uint32_t addr, void *p)
gd5436_aperture2_readw(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
uint16_t ret = 0xffff;
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd5436_aperture2_readb(addr, p);
ret |= gd5436_aperture2_readb(addr + 1, p) << 8;
ret = gd5436_aperture2_readb(addr, priv);
ret |= gd5436_aperture2_readb(addr + 1, priv) << 8;
return ret;
}
@@ -2320,16 +2320,16 @@ gd5436_aperture2_readw(uint32_t addr, void *p)
}
static uint32_t
gd5436_aperture2_readl(uint32_t addr, void *p)
gd5436_aperture2_readl(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
uint32_t ret = 0xffffffff;
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd5436_aperture2_readb(addr, p);
ret |= gd5436_aperture2_readb(addr + 1, p) << 8;
ret |= gd5436_aperture2_readb(addr + 2, p) << 16;
ret |= gd5436_aperture2_readb(addr + 3, p) << 24;
ret = gd5436_aperture2_readb(addr, priv);
ret |= gd5436_aperture2_readb(addr + 1, priv) << 8;
ret |= gd5436_aperture2_readb(addr + 2, priv) << 16;
ret |= gd5436_aperture2_readb(addr + 3, priv) << 24;
return ret;
}
@@ -2337,9 +2337,9 @@ gd5436_aperture2_readl(uint32_t addr, void *p)
}
static void
gd5436_aperture2_writeb(uint32_t addr, uint8_t val, void *p)
gd5436_aperture2_writeb(uint32_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest
&& gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED))
@@ -2347,9 +2347,9 @@ gd5436_aperture2_writeb(uint32_t addr, uint8_t val, void *p)
}
static void
gd5436_aperture2_writew(uint32_t addr, uint16_t val, void *p)
gd5436_aperture2_writew(uint32_t addr, uint16_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest
&& gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2359,9 +2359,9 @@ gd5436_aperture2_writew(uint32_t addr, uint16_t val, void *p)
}
static void
gd5436_aperture2_writel(uint32_t addr, uint32_t val, void *p)
gd5436_aperture2_writel(uint32_t addr, uint32_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
if (gd54xx->countminusone && !gd54xx->blt.ms_is_dest
&& gd54xx_aperture2_enabled(gd54xx) && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2373,9 +2373,9 @@ gd5436_aperture2_writel(uint32_t addr, uint32_t val, void *p)
}
static void
gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *p)
gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2401,8 +2401,8 @@ gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *p)
}
switch (ap) {
case 0:
default:
case 0:
break;
case 1:
/* 0 -> 1, 1 -> 0, 2 -> 3, 3 -> 2 */
@@ -2420,9 +2420,9 @@ gd54xx_writeb_linear(uint32_t addr, uint8_t val, void *p)
}
static void
gd54xx_writew_linear(uint32_t addr, uint16_t val, void *p)
gd54xx_writew_linear(uint32_t addr, uint16_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2484,9 +2484,9 @@ gd54xx_writew_linear(uint32_t addr, uint16_t val, void *p)
}
static void
gd54xx_writel_linear(uint32_t addr, uint32_t val, void *p)
gd54xx_writel_linear(uint32_t addr, uint32_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ap = gd54xx_get_aperture(addr);
@@ -2561,9 +2561,9 @@ gd54xx_writel_linear(uint32_t addr, uint32_t val, void *p)
}
static uint8_t
gd54xx_read(uint32_t addr, void *p)
gd54xx_read(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if ((svga->seqregs[0x07] & 0x01) == 0)
@@ -2577,9 +2577,9 @@ gd54xx_read(uint32_t addr, void *p)
}
static uint16_t
gd54xx_readw(uint32_t addr, void *p)
gd54xx_readw(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint16_t ret;
@@ -2587,8 +2587,8 @@ gd54xx_readw(uint32_t addr, void *p)
return svga_readw(addr, svga);
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd54xx_read(addr, p);
ret |= gd54xx_read(addr + 1, p) << 8;
ret = gd54xx_read(addr, priv);
ret |= gd54xx_read(addr + 1, priv) << 8;
return ret;
}
@@ -2597,9 +2597,9 @@ gd54xx_readw(uint32_t addr, void *p)
}
static uint32_t
gd54xx_readl(uint32_t addr, void *p)
gd54xx_readl(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint32_t ret;
@@ -2607,10 +2607,10 @@ gd54xx_readl(uint32_t addr, void *p)
return svga_readl(addr, svga);
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd54xx_read(addr, p);
ret |= gd54xx_read(addr + 1, p) << 8;
ret |= gd54xx_read(addr + 2, p) << 16;
ret |= gd54xx_read(addr + 3, p) << 24;
ret = gd54xx_read(addr, priv);
ret |= gd54xx_read(addr + 1, priv) << 8;
ret |= gd54xx_read(addr + 2, priv) << 16;
ret |= gd54xx_read(addr + 3, priv) << 24;
return ret;
}
@@ -2628,9 +2628,9 @@ gd543x_do_mmio(svga_t *svga, uint32_t addr)
}
static void
gd543x_mmio_write(uint32_t addr, uint8_t val, void *p)
gd543x_mmio_write(uint32_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t old;
@@ -2794,9 +2794,9 @@ gd543x_mmio_write(uint32_t addr, uint8_t val, void *p)
}
static void
gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *p)
gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (!gd543x_do_mmio(svga, addr) && !gd54xx->blt.ms_is_dest && gd54xx->countminusone && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
@@ -2804,13 +2804,13 @@ gd543x_mmio_writeb(uint32_t addr, uint8_t val, void *p)
return;
}
gd543x_mmio_write(addr, val, p);
gd543x_mmio_write(addr, val, priv);
}
static void
gd543x_mmio_writew(uint32_t addr, uint16_t val, void *p)
gd543x_mmio_writew(uint32_t addr, uint16_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (gd543x_do_mmio(svga, addr)) {
@@ -2828,9 +2828,9 @@ gd543x_mmio_writew(uint32_t addr, uint16_t val, void *p)
}
static void
gd543x_mmio_writel(uint32_t addr, uint32_t val, void *p)
gd543x_mmio_writel(uint32_t addr, uint32_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
if (gd543x_do_mmio(svga, addr)) {
@@ -2854,9 +2854,9 @@ gd543x_mmio_writel(uint32_t addr, uint32_t val, void *p)
}
static uint8_t
gd543x_mmio_read(uint32_t addr, void *p)
gd543x_mmio_read(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ret = 0xff;
@@ -2993,9 +2993,9 @@ gd543x_mmio_read(uint32_t addr, void *p)
}
static uint16_t
gd543x_mmio_readw(uint32_t addr, void *p)
gd543x_mmio_readw(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint16_t ret = 0xffff;
@@ -3004,8 +3004,8 @@ gd543x_mmio_readw(uint32_t addr, void *p)
else if (gd54xx->mmio_vram_overlap)
ret = gd54xx_read(addr, gd54xx) | (gd54xx_read(addr + 1, gd54xx) << 8);
else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd543x_mmio_read(addr, p);
ret |= gd543x_mmio_read(addr + 1, p) << 8;
ret = gd543x_mmio_read(addr, priv);
ret |= gd543x_mmio_read(addr + 1, priv) << 8;
return ret;
}
@@ -3013,9 +3013,9 @@ gd543x_mmio_readw(uint32_t addr, void *p)
}
static uint32_t
gd543x_mmio_readl(uint32_t addr, void *p)
gd543x_mmio_readl(uint32_t addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint32_t ret = 0xffffffff;
@@ -3024,10 +3024,10 @@ gd543x_mmio_readl(uint32_t addr, void *p)
else if (gd54xx->mmio_vram_overlap)
ret = gd54xx_read(addr, gd54xx) | (gd54xx_read(addr + 1, gd54xx) << 8) | (gd54xx_read(addr + 2, gd54xx) << 16) | (gd54xx_read(addr + 3, gd54xx) << 24);
else if (gd54xx->countminusone && gd54xx->blt.ms_is_dest && !(gd54xx->blt.status & CIRRUS_BLT_PAUSED)) {
ret = gd543x_mmio_read(addr, p);
ret |= gd543x_mmio_read(addr + 1, p) << 8;
ret |= gd543x_mmio_read(addr + 2, p) << 16;
ret |= gd543x_mmio_read(addr + 3, p) << 24;
ret = gd543x_mmio_read(addr, priv);
ret |= gd543x_mmio_read(addr + 1, priv) << 8;
ret |= gd543x_mmio_read(addr + 2, priv) << 16;
ret |= gd543x_mmio_read(addr + 3, priv) << 24;
return ret;
}
@@ -3035,86 +3035,86 @@ gd543x_mmio_readl(uint32_t addr, void *p)
}
static void
gd5480_vgablt_write(uint32_t addr, uint8_t val, void *p)
gd5480_vgablt_write(uint32_t addr, uint8_t val, void *priv)
{
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
gd543x_mmio_writeb((addr & 0x000000ff) | 0x000b8000, val, p);
gd543x_mmio_writeb((addr & 0x000000ff) | 0x000b8000, val, priv);
else if (addr < 0x00000100)
gd54xx_out(0x03c0 + addr, val, p);
gd54xx_out(0x03c0 + addr, val, priv);
}
static void
gd5480_vgablt_writew(uint32_t addr, uint16_t val, void *p)
gd5480_vgablt_writew(uint32_t addr, uint16_t val, void *priv)
{
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
gd543x_mmio_writew((addr & 0x000000ff) | 0x000b8000, val, p);
gd543x_mmio_writew((addr & 0x000000ff) | 0x000b8000, val, priv);
else if (addr < 0x00000100) {
gd5480_vgablt_write(addr, val & 0xff, p);
gd5480_vgablt_write(addr + 1, val >> 8, p);
gd5480_vgablt_write(addr, val & 0xff, priv);
gd5480_vgablt_write(addr + 1, val >> 8, priv);
}
}
static void
gd5480_vgablt_writel(uint32_t addr, uint32_t val, void *p)
gd5480_vgablt_writel(uint32_t addr, uint32_t val, void *priv)
{
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
gd543x_mmio_writel((addr & 0x000000ff) | 0x000b8000, val, p);
gd543x_mmio_writel((addr & 0x000000ff) | 0x000b8000, val, priv);
else if (addr < 0x00000100) {
gd5480_vgablt_writew(addr, val & 0xffff, p);
gd5480_vgablt_writew(addr + 2, val >> 16, p);
gd5480_vgablt_writew(addr, val & 0xffff, priv);
gd5480_vgablt_writew(addr + 2, val >> 16, priv);
}
}
static uint8_t
gd5480_vgablt_read(uint32_t addr, void *p)
gd5480_vgablt_read(uint32_t addr, void *priv)
{
uint8_t ret = 0xff;
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
ret = gd543x_mmio_read((addr & 0x000000ff) | 0x000b8000, p);
ret = gd543x_mmio_read((addr & 0x000000ff) | 0x000b8000, priv);
else if (addr < 0x00000100)
ret = gd54xx_in(0x03c0 + addr, p);
ret = gd54xx_in(0x03c0 + addr, priv);
return ret;
}
static uint16_t
gd5480_vgablt_readw(uint32_t addr, void *p)
gd5480_vgablt_readw(uint32_t addr, void *priv)
{
uint16_t ret = 0xffff;
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
ret = gd543x_mmio_readw((addr & 0x000000ff) | 0x000b8000, p);
ret = gd543x_mmio_readw((addr & 0x000000ff) | 0x000b8000, priv);
else if (addr < 0x00000100) {
ret = gd5480_vgablt_read(addr, p);
ret |= (gd5480_vgablt_read(addr + 1, p) << 8);
ret = gd5480_vgablt_read(addr, priv);
ret |= (gd5480_vgablt_read(addr + 1, priv) << 8);
}
return ret;
}
static uint32_t
gd5480_vgablt_readl(uint32_t addr, void *p)
gd5480_vgablt_readl(uint32_t addr, void *priv)
{
uint32_t ret = 0xffffffff;
addr &= 0x00000fff;
if ((addr >= 0x00000100) && (addr < 0x00000200))
ret = gd543x_mmio_readl((addr & 0x000000ff) | 0x000b8000, p);
ret = gd543x_mmio_readl((addr & 0x000000ff) | 0x000b8000, priv);
else if (addr < 0x00000100) {
ret = gd5480_vgablt_readw(addr, p);
ret |= (gd5480_vgablt_readw(addr + 2, p) << 16);
ret = gd5480_vgablt_readw(addr, priv);
ret |= (gd5480_vgablt_readw(addr + 2, priv) << 16);
}
return ret;
@@ -3557,9 +3557,9 @@ gd54xx_start_blit(uint32_t cpu_dat, uint32_t count, gd54xx_t *gd54xx, svga_t *sv
}
static uint8_t
cl_pci_read(int func, int addr, void *p)
cl_pci_read(int func, int addr, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint8_t ret = 0x00;
@@ -3656,9 +3656,9 @@ cl_pci_read(int func, int addr, void *p)
}
static void
cl_pci_write(int func, int addr, uint8_t val, void *p)
cl_pci_write(int func, int addr, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_t *svga = &gd54xx->svga;
uint32_t byte;
@@ -3724,17 +3724,17 @@ cl_pci_write(int func, int addr, uint8_t val, void *p)
}
static uint8_t
gd5428_mca_read(int port, void *p)
gd5428_mca_read(int port, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
return gd54xx->pos_regs[port & 7];
}
static void
gd5428_mca_write(int port, uint8_t val, void *p)
gd5428_mca_write(int port, uint8_t val, void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
if (port < 0x102)
return;
@@ -3744,7 +3744,7 @@ gd5428_mca_write(int port, uint8_t val, void *p)
}
static uint8_t
gd5428_mca_feedb(void *p)
gd5428_mca_feedb(void *priv)
{
return 1;
}
@@ -4264,9 +4264,9 @@ gd5480_available(void)
}
void
gd54xx_close(void *p)
gd54xx_close(void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_close(&gd54xx->svga);
@@ -4279,17 +4279,17 @@ gd54xx_close(void *p)
}
void
gd54xx_speed_changed(void *p)
gd54xx_speed_changed(void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
svga_recalctimings(&gd54xx->svga);
}
void
gd54xx_force_redraw(void *p)
gd54xx_force_redraw(void *priv)
{
gd54xx_t *gd54xx = (gd54xx_t *) p;
gd54xx_t *gd54xx = (gd54xx_t *) priv;
gd54xx->svga.fullchange = gd54xx->svga.monitor->mon_changeframecount;
}

31
src/video/vid_colorplus.c
View File

@@ -34,6 +34,7 @@
#include <86box/vid_cga.h>
#include <86box/vid_colorplus.h>
#include <86box/vid_cga_comp.h>
#include <86box/plat_unused.h>
/* Bits in the colorplus control register: */
#define COLORPLUS_PLANE_SWAP 0x40 /* Swap planes at 0000h and 4000h */
@@ -55,9 +56,9 @@ video_timings_t timing_colorplus = { .type = VIDEO_ISA, .write_b = 8, .write_w =
void cga_recalctimings(cga_t *cga);
void
colorplus_out(uint16_t addr, uint8_t val, void *p)
colorplus_out(uint16_t addr, uint8_t val, void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
if (addr == 0x3DD) {
colorplus->control = val & 0x70;
@@ -67,17 +68,17 @@ colorplus_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
colorplus_in(uint16_t addr, void *p)
colorplus_in(uint16_t addr, void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
return cga_in(addr, &colorplus->cga);
}
void
colorplus_write(uint32_t addr, uint8_t val, void *p)
colorplus_write(uint32_t addr, uint8_t val, void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_GRAPHICS_MODE)) {
addr ^= 0x4000;
@@ -94,9 +95,9 @@ colorplus_write(uint32_t addr, uint8_t val, void *p)
}
uint8_t
colorplus_read(uint32_t addr, void *p)
colorplus_read(uint32_t addr, void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
if ((colorplus->control & COLORPLUS_PLANE_SWAP) && (colorplus->control & COLORPLUS_EITHER_MODE) && (colorplus->cga.cgamode & CGA_GRAPHICS_MODE)) {
addr ^= 0x4000;
@@ -119,9 +120,9 @@ colorplus_recalctimings(colorplus_t *colorplus)
}
void
colorplus_poll(void *p)
colorplus_poll(void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
int x;
int c;
int oldvc;
@@ -333,7 +334,7 @@ colorplus_init(colorplus_t *colorplus)
}
void *
colorplus_standalone_init(const device_t *info)
colorplus_standalone_init(UNUSED(const device_t *info))
{
int display_type;
@@ -362,18 +363,18 @@ colorplus_standalone_init(const device_t *info)
}
void
colorplus_close(void *p)
colorplus_close(void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
free(colorplus->cga.vram);
free(colorplus);
}
void
colorplus_speed_changed(void *p)
colorplus_speed_changed(void *priv)
{
colorplus_t *colorplus = (colorplus_t *) p;
colorplus_t *colorplus = (colorplus_t *) priv;
cga_recalctimings(&colorplus->cga);
}

12
src/video/vid_compaq_cga.c
View File

@@ -83,9 +83,9 @@ compaq_cga_recalctimings(compaq_cga_t *self)
}
void
compaq_cga_poll(void *p)
compaq_cga_poll(void *priv)
{
compaq_cga_t *self = (compaq_cga_t *) p;
compaq_cga_t *self = (compaq_cga_t *) priv;
uint16_t ca = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x3fff;
int drawcursor;
int x;
@@ -452,18 +452,18 @@ compaq_cga_init(const device_t *info)
}
void
compaq_cga_close(void *p)
compaq_cga_close(void *priv)
{
compaq_cga_t *self = (compaq_cga_t *) p;
compaq_cga_t *self = (compaq_cga_t *) priv;
free(self->cga.vram);
free(self);
}
void
compaq_cga_speed_changed(void *p)
compaq_cga_speed_changed(void *priv)
{
compaq_cga_t *self = (compaq_cga_t *) p;
compaq_cga_t *self = (compaq_cga_t *) priv;
if (self->cga.crtc[9] == 13) /* Character height */
compaq_cga_recalctimings(self);

30
src/video/vid_ega.c
View File

@@ -67,12 +67,12 @@ int egaswitchread;
int egaswitches = 9;
int update_overscan = 0;
uint8_t ega_in(uint16_t addr, void *p);
uint8_t ega_in(uint16_t addr, void *priv);
void
ega_out(uint16_t addr, uint8_t val, void *p)
ega_out(uint16_t addr, uint8_t val, void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
uint8_t o;
uint8_t old;
@@ -248,9 +248,9 @@ ega_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
ega_in(uint16_t addr, void *p)
ega_in(uint16_t addr, void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
uint8_t ret = 0xff;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
@@ -481,9 +481,9 @@ ega_recalctimings(ega_t *ega)
}
void
ega_poll(void *p)
ega_poll(void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
int x;
int old_ma;
int wx = 640;
@@ -831,9 +831,9 @@ ega_remap_cpu_addr(uint32_t inaddr, ega_t *ega)
}
void
ega_write(uint32_t addr, uint8_t val, void *p)
ega_write(uint32_t addr, uint8_t val, void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
uint8_t vala;
uint8_t valb;
uint8_t valc;
@@ -1006,9 +1006,9 @@ ega_write(uint32_t addr, uint8_t val, void *p)
}
uint8_t
ega_read(uint32_t addr, void *p)
ega_read(uint32_t addr, void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
uint8_t temp;
uint8_t temp2;
uint8_t temp3;
@@ -1292,9 +1292,9 @@ et2000_standalone_available(void)
}
static void
ega_close(void *p)
ega_close(void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
if (ega->eeprom)
free(ega->eeprom);
@@ -1303,9 +1303,9 @@ ega_close(void *p)
}
static void
ega_speed_changed(void *p)
ega_speed_changed(void *priv)
{
ega_t *ega = (ega_t *) p;
ega_t *ega = (ega_t *) priv;
ega_recalctimings(ega);
}

13
src/video/vid_ega_render.c
View File

@@ -47,29 +47,30 @@ ega_display_line(ega_t *ega)
void
ega_render_blank(ega_t *ega)
{
int xx;
if ((ega->displine + ega->y_add) < 0)
return;
for (int x = 0; x < (ega->hdisp + ega->scrollcache); x++) {
switch (ega->seqregs[1] & 9) {
case 0:
for (xx = 0; xx < 9; xx++)
for (uint8_t xx = 0; xx < 9; xx++)
buffer32->line[ega->displine + ega->y_add][ega->x_add + (x * 9) + xx] = 0;
break;
case 1:
for (xx = 0; xx < 8; xx++)
for (uint8_t xx = 0; xx < 8; xx++)
buffer32->line[ega->displine + ega->y_add][ega->x_add + (x * 8) + xx] = 0;
break;
case 8:
for (xx = 0; xx < 18; xx++)
for (uint8_t xx = 0; xx < 18; xx++)
buffer32->line[ega->displine + ega->y_add][ega->x_add + (x * 18) + xx] = 0;
break;
case 9:
for (xx = 0; xx < 16; xx++)
for (uint8_t xx = 0; xx < 16; xx++)
buffer32->line[ega->displine + ega->y_add][ega->x_add + (x * 16) + xx] = 0;
break;
default:
break;
}
}
}

21
src/video/vid_et3000.c
View File

@@ -66,6 +66,9 @@ et3000_in(uint16_t addr, void *priv)
case 0x3d5:
return svga->crtc[svga->crtcreg];
default:
break;
}
return svga_in(addr, svga);
@@ -124,6 +127,9 @@ et3000_out(uint16_t addr, uint8_t val, void *priv)
svga->write_bank = (val & 7) << 16;
svga->read_bank = ((val >> 3) & 7) << 16;
break;
default:
break;
}
}
return;
@@ -147,6 +153,9 @@ et3000_out(uint16_t addr, uint8_t val, void *priv)
}
}
break;
default:
break;
}
svga_out(addr, val, svga);
@@ -184,11 +193,16 @@ et3000_recalctimings(svga_t *svga)
case 0x60:
svga->render = svga_render_8bpp_highres;
break;
default:
break;
}
}
/* pclog("HDISP = %i, HTOTAL = %i, ROWOFFSET = %i, INTERLACE = %i\n",
svga->hdisp, svga->htotal, svga->rowoffset, svga->interlace); */
#if 0
pclog("HDISP = %i, HTOTAL = %i, ROWOFFSET = %i, INTERLACE = %i\n",
svga->hdisp, svga->htotal, svga->rowoffset, svga->interlace);
#endif
switch (((svga->miscout >> 2) & 3) | ((svga->crtc[0x24] << 1) & 4)) {
case 0:
@@ -227,6 +241,9 @@ et3000_init(const device_t *info)
io_sethandler(0x03c0, 32,
et3000_in, NULL, NULL, et3000_out, NULL, NULL, dev);
break;
default:
break;
}
rom_init(&dev->bios_rom, (char *) fn,

25
src/video/vid_et4000.c
View File

@@ -52,6 +52,7 @@
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
#include <86box/plat_unused.h>
#define ET4000_TYPE_ISA 1 /* ISA ET4000AX */
#define ET4000_TYPE_MCA 2 /* MCA ET4000AX */
@@ -105,8 +106,8 @@ static const uint8_t crtc_mask[0x40] = {
static video_timings_t timing_et4000_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
static video_timings_t timing_et4000_mca = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b = 5, .read_w = 5, .read_l = 10 };
static void et4000_kasan_out(uint16_t addr, uint8_t val, void *p);
static uint8_t et4000_kasan_in(uint16_t addr, void *p);
static void et4000_kasan_out(uint16_t addr, uint8_t val, void *priv);
static uint8_t et4000_kasan_in(uint16_t addr, void *priv);
static uint8_t
et4000_in(uint16_t addr, void *priv)
@@ -146,6 +147,9 @@ et4000_in(uint16_t addr, void *priv)
case 0x3d5:
return svga->crtc[svga->crtcreg];
default:
break;
}
return svga_in(addr, svga);
@@ -288,6 +292,9 @@ et4000_out(uint16_t addr, uint8_t val, void *priv)
}
}
break;
default:
break;
}
svga_out(addr, val, svga);
@@ -425,6 +432,7 @@ et4000_kasan_out(uint16_t addr, uint8_t val, void *priv)
case 5:
et4000->kasan_cfg_regs[5] = val;
et4000->svga.ksc5601_english_font_type = 0x100 | val;
[[fallthrough]];
case 6:
case 7:
et4000->svga.ksc5601_udc_area_msb[et4000->kasan_cfg_index - 0xF6] = val;
@@ -474,9 +482,9 @@ et4000_kasan_out(uint16_t addr, uint8_t val, void *priv)
}
uint32_t
get_et4000_addr(uint32_t addr, void *p)
get_et4000_addr(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
uint32_t nbank;
switch (svga->crtc[0x37] & 0x0B) {
@@ -536,7 +544,7 @@ get_et4000_addr(uint32_t addr, void *p)
static void
et4000_recalctimings(svga_t *svga)
{
et4000_t *dev = (et4000_t *) svga->p;
et4000_t *dev = (et4000_t *) svga->priv;
svga->ma_latch |= (svga->crtc[0x33] & 3) << 16;
if (svga->crtc[0x35] & 1)
@@ -580,6 +588,9 @@ et4000_recalctimings(svga_t *svga)
case 24:
svga->hdisp /= 3;
break;
default:
break;
}
if (dev->type == ET4000_TYPE_KOREAN || dev->type == ET4000_TYPE_TRIGEM || dev->type == ET4000_TYPE_KASAN) {
@@ -598,7 +609,7 @@ et4000_recalctimings(svga_t *svga)
static void
et4000_kasan_recalctimings(svga_t *svga)
{
et4000_t *et4000 = (et4000_t *) svga->p;
et4000_t *et4000 = (et4000_t *) svga->priv;
et4000_recalctimings(svga);
@@ -633,7 +644,7 @@ et4000_mca_write(int port, uint8_t val, void *priv)
}
static uint8_t
et4000_mca_feedb(void *priv)
et4000_mca_feedb(UNUSED(void *priv))
{
return 1;
}

48
src/video/vid_et4000w32.c
View File

@@ -130,14 +130,14 @@ static video_timings_t timing_et4000w32_isa = { .type = VIDEO_ISA, .write_b = 4,
void et4000w32p_recalcmapping(et4000w32p_t *et4000);
static uint8_t et4000w32p_mmu_read(uint32_t addr, void *p);
static void et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *p);
static uint8_t et4000w32p_mmu_read(uint32_t addr, void *priv);
static void et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *priv);
static void et4000w32_blit_start(et4000w32p_t *et4000);
static void et4000w32p_blit_start(et4000w32p_t *et4000);
static void et4000w32_blit(int count, int cpu_input, uint32_t src_dat, uint32_t mix_dat, et4000w32p_t *et4000);
static void et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32p_t *et4000);
uint8_t et4000w32p_in(uint16_t addr, void *p);
uint8_t et4000w32p_in(uint16_t addr, void *priv);
#ifdef ENABLE_ET4000W32_LOG
int et4000w32_do_log = ENABLE_ET4000W32_LOG;
@@ -158,9 +158,9 @@ et4000w32_log(const char *fmt, ...)
#endif
void
et4000w32p_out(uint16_t addr, uint8_t val, void *p)
et4000w32p_out(uint16_t addr, uint8_t val, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_t *svga = &et4000->svga;
uint8_t old;
uint32_t add2addr = 0;
@@ -321,9 +321,9 @@ et4000w32p_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
et4000w32p_in(uint16_t addr, void *p)
et4000w32p_in(uint16_t addr, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_t *svga = &et4000->svga;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -343,7 +343,6 @@ et4000w32p_in(uint16_t addr, void *p)
return sdac_ramdac_in(addr, 0, svga->ramdac, svga);
else
return stg_ramdac_in(addr, svga->ramdac, svga);
break;
case 0x3cb:
return et4000->banking2;
@@ -417,7 +416,7 @@ et4000w32p_in(uint16_t addr, void *p)
void
et4000w32p_recalctimings(svga_t *svga)
{
et4000w32p_t *et4000 = (et4000w32p_t *) svga->p;
et4000w32p_t *et4000 = (et4000w32p_t *) svga->priv;
svga->ma_latch |= (svga->crtc[0x33] & 0x7) << 16;
if (svga->crtc[0x35] & 0x01)
@@ -899,9 +898,9 @@ et4000w32p_accel_write_mmu(et4000w32p_t *et4000, uint32_t addr, uint8_t val, uin
}
static void
et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *p)
et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_t *svga = &et4000->svga;
switch (addr & 0x6000) {
@@ -975,9 +974,9 @@ et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *p)
}
static uint8_t
et4000w32p_mmu_read(uint32_t addr, void *p)
et4000w32p_mmu_read(uint32_t addr, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_t *svga = &et4000->svga;
uint8_t temp;
@@ -1075,7 +1074,6 @@ et4000w32p_mmu_read(uint32_t addr, void *p)
return et4000->acl.internal.pixel_depth;
else
return et4000->acl.internal.vbus;
break;
case 0x8f:
return et4000->acl.internal.xy_dir;
case 0x90:
@@ -2453,7 +2451,7 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
void
et4000w32p_hwcursor_draw(svga_t *svga, int displine)
{
et4000w32p_t *et4000 = (et4000w32p_t *) svga->p;
et4000w32p_t *et4000 = (et4000w32p_t *) svga->priv;
int offset;
int xx;
int xx2;
@@ -2559,9 +2557,9 @@ et4000w32p_io_set(et4000w32p_t *et4000)
}
uint8_t
et4000w32p_pci_read(int func, int addr, void *p)
et4000w32p_pci_read(UNUSED(int func), int addr, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
addr &= 0xff;
@@ -2615,9 +2613,9 @@ et4000w32p_pci_read(int func, int addr, void *p)
}
void
et4000w32p_pci_write(int func, int addr, uint8_t val, void *p)
et4000w32p_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_t *svga = &et4000->svga;
addr &= 0xff;
@@ -2873,9 +2871,9 @@ et4000w32p_cardex_available(void)
}
void
et4000w32p_close(void *p)
et4000w32p_close(void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_close(&et4000->svga);
@@ -2883,17 +2881,17 @@ et4000w32p_close(void *p)
}
void
et4000w32p_speed_changed(void *p)
et4000w32p_speed_changed(void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
svga_recalctimings(&et4000->svga);
}
void
et4000w32p_force_redraw(void *p)
et4000w32p_force_redraw(void *priv)
{
et4000w32p_t *et4000 = (et4000w32p_t *) p;
et4000w32p_t *et4000 = (et4000w32p_t *) priv;
et4000->svga.fullchange = changeframecount;
}

32
src/video/vid_f82c425.c
View File

@@ -63,6 +63,7 @@
#include "cpu.h"
#include <86box/video.h>
#include <86box/vid_cga.h>
#include <86box/plat_unused.h>
#define F82C425_XSIZE 640
#define F82C425_YSIZE 200
@@ -226,9 +227,9 @@ f82c425_colormap(f82c425_t *f82c425)
}
static void
f82c425_out(uint16_t addr, uint8_t val, void *p)
f82c425_out(uint16_t addr, uint8_t val, void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
if (addr == 0x3d4)
f82c425->crtcreg = val;
@@ -271,9 +272,9 @@ f82c425_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
f82c425_in(uint16_t addr, void *p)
f82c425_in(uint16_t addr, void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
if ((f82c425->function & 0x01) == 0)
return 0xff;
@@ -305,18 +306,18 @@ f82c425_in(uint16_t addr, void *p)
}
static void
f82c425_write(uint32_t addr, uint8_t val, void *p)
f82c425_write(uint32_t addr, uint8_t val, void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
f82c425->vram[addr & 0x3fff] = val;
cycles -= 4;
}
static uint8_t
f82c425_read(uint32_t addr, void *p)
f82c425_read(uint32_t addr, void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
cycles -= 4;
return f82c425->vram[addr & 0x3fff];
@@ -454,9 +455,9 @@ f82c425_cgaline4(f82c425_t *f82c425)
}
static void
f82c425_poll(void *p)
f82c425_poll(void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
if (f82c425->video_options != st_video_options || !!(f82c425->function & 1) != st_enabled) {
f82c425->video_options = st_video_options;
@@ -560,9 +561,10 @@ f82c425_poll(void *p)
}
static void *
f82c425_init(const device_t *info)
f82c425_init(UNUSED(const device_t *info))
{
f82c425_t *f82c425 = malloc(sizeof(f82c425_t));
memset(f82c425, 0, sizeof(f82c425_t));
cga_init(&f82c425->cga);
video_inform(VIDEO_FLAG_TYPE_CGA, &timing_f82c425);
@@ -595,18 +597,18 @@ f82c425_init(const device_t *info)
}
static void
f82c425_close(void *p)
f82c425_close(void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
free(f82c425->vram);
free(f82c425);
}
static void
f82c425_speed_changed(void *p)
f82c425_speed_changed(void *priv)
{
f82c425_t *f82c425 = (f82c425_t *) p;
f82c425_t *f82c425 = (f82c425_t *) priv;
f82c425_recalctimings(f82c425);
}

32
src/video/vid_genius.c
View File

@@ -138,13 +138,13 @@ static uint8_t genius_pal[4];
static uint8_t mdaattr[256][2][2];
void genius_recalctimings(genius_t *genius);
void genius_write(uint32_t addr, uint8_t val, void *p);
uint8_t genius_read(uint32_t addr, void *p);
void genius_write(uint32_t addr, uint8_t val, void *priv);
uint8_t genius_read(uint32_t addr, void *priv);
void
genius_out(uint16_t addr, uint8_t val, void *p)
genius_out(uint16_t addr, uint8_t val, void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
switch (addr) {
case 0x3b0: /* Command / control register */
@@ -208,9 +208,9 @@ genius_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
genius_in(uint16_t addr, void *p)
genius_in(uint16_t addr, void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
uint8_t ret = 0xff;
switch (addr) {
@@ -269,9 +269,9 @@ genius_waitstates(void)
}
void
genius_write(uint32_t addr, uint8_t val, void *p)
genius_write(uint32_t addr, uint8_t val, void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
genius_waitstates();
if (genius->genius_control & 1) {
@@ -293,9 +293,9 @@ genius_write(uint32_t addr, uint8_t val, void *p)
}
uint8_t
genius_read(uint32_t addr, void *p)
genius_read(uint32_t addr, void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
uint8_t ret;
genius_waitstates();
@@ -623,9 +623,9 @@ genius_hiresline(genius_t *genius)
}
void
genius_poll(void *p)
genius_poll(void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
uint8_t background;
if (!genius->linepos) {
@@ -784,9 +784,9 @@ void
}
void
genius_close(void *p)
genius_close(void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
free(genius->vram);
free(genius);
@@ -799,9 +799,9 @@ genius_available(void)
}
void
genius_speed_changed(void *p)
genius_speed_changed(void *priv)
{
genius_t *genius = (genius_t *) p;
genius_t *genius = (genius_t *) priv;
genius_recalctimings(genius);
}

9
src/video/vid_hercules.c
View File

@@ -32,6 +32,7 @@
#include <86box/device.h>
#include <86box/video.h>
#include <86box/vid_hercules.h>
#include <86box/plat_unused.h>
static video_timings_t timing_hercules = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
@@ -192,7 +193,7 @@ hercules_in(uint16_t addr, void *priv)
}
static void
hercules_waitstates(void *p)
hercules_waitstates(UNUSED(void *priv))
{
int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
int ws;
@@ -493,7 +494,9 @@ hercules_poll(void *priv)
else
video_blit_memtoscreen(8, dev->firstline + 14, xsize, ysize);
frames++;
// if ((dev->ctrl & 2) && (dev->ctrl2 & 1)) {
#if 0
if ((dev->ctrl & 2) && (dev->ctrl2 & 1)) {
#endif
if (dev->ctrl & 0x02) {
video_res_x = dev->crtc[1] * 16;
video_res_y = dev->crtc[6] * 4;
@@ -527,7 +530,7 @@ hercules_poll(void *priv)
}
static void *
hercules_init(const device_t *info)
hercules_init(UNUSED(const device_t *info))
{
hercules_t *dev;

12
src/video/vid_herculesplus.c
View File

@@ -30,6 +30,7 @@
#include <86box/rom.h>
#include <86box/device.h>
#include <86box/video.h>
#include <86box/plat_unused.h>
/* extended CRTC registers */
#define HERCULESPLUS_CRTC_XMODE 20 /* xMode register */
@@ -162,6 +163,9 @@ herculesplus_out(uint16_t port, uint8_t val, void *priv)
else
mem_mapping_set_addr(&dev->mapping, 0xb0000, 0x08000);
return;
default:
break;
}
}
@@ -191,6 +195,9 @@ herculesplus_in(uint16_t port, void *priv)
/* 0x10: Hercules Plus card identity */
ret = (dev->stat & 0xf) | ((dev->stat & 8) << 4) | 0x10;
break;
default:
break;
}
return ret;
@@ -458,6 +465,9 @@ text_line(herculesplus_t *dev, uint16_t ca)
case 5: /* 48k RAMfont */
draw_char_ram48(dev, x, chr, attr);
break;
default:
break;
}
++dev->ma;
@@ -641,7 +651,7 @@ herculesplus_poll(void *priv)
}
static void *
herculesplus_init(const device_t *info)
herculesplus_init(UNUSED(const device_t *info))
{
herculesplus_t *dev;

65
src/video/vid_ht216.c
View File

@@ -35,6 +35,7 @@
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
#include <86box/plat_unused.h>
typedef struct ht216_t {
svga_t svga;
@@ -92,8 +93,8 @@ typedef struct ht216_t {
void ht216_remap(ht216_t *ht216);
void ht216_out(uint16_t addr, uint8_t val, void *p);
uint8_t ht216_in(uint16_t addr, void *p);
void ht216_out(uint16_t addr, uint8_t val, void *priv);
uint8_t ht216_in(uint16_t addr, void *priv);
#define BIOS_G2_GC205_PATH "roms/video/video7/BIOS.BIN"
#define BIOS_VIDEO7_VGA_1024I_PATH "roms/video/video7/Video Seven VGA 1024i - BIOS - v2.19 - 435-0062-05 - U17 - 27C256.BIN"
@@ -164,9 +165,9 @@ ht216_recalc_bank_regs(ht216_t *ht216, int mode)
}
void
ht216_out(uint16_t addr, uint8_t val, void *p)
ht216_out(uint16_t addr, uint8_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint8_t old;
@@ -319,7 +320,7 @@ ht216_out(uint16_t addr, uint8_t val, void *p)
svga->adv_flags &= ~FLAG_RAMDAC_SHIFT;
if (val & 0x04)
svga->adv_flags |= FLAG_RAMDAC_SHIFT;
/* FALLTHROUGH */
[[fallthrough]];
/*Bank registers*/
case 0xe8:
case 0xe9:
@@ -463,9 +464,9 @@ ht216_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
ht216_in(uint16_t addr, void *p)
ht216_in(uint16_t addr, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint8_t ret = 0xff;
@@ -606,7 +607,7 @@ ht216_remap(ht216_t *ht216)
void
ht216_recalctimings(svga_t *svga)
{
ht216_t *ht216 = (ht216_t *) svga->p;
ht216_t *ht216 = (ht216_t *) svga->priv;
int high_res_256 = 0;
switch ((((((svga->miscout >> 2) & 3) || ((ht216->ht_regs[0xa4] >> 2) & 3)) | ((ht216->ht_regs[0xa4] >> 2) & 4)) || ((ht216->ht_regs[0xf8] >> 5) & 0x0f)) | ((ht216->ht_regs[0xf8] << 1) & 8)) {
@@ -702,7 +703,7 @@ ht216_recalctimings(svga_t *svga)
static void
ht216_hwcursor_draw(svga_t *svga, int displine)
{
ht216_t *ht216 = (ht216_t *) svga->p;
ht216_t *ht216 = (ht216_t *) svga->priv;
int shift = (ht216->adjust_cursor ? 2 : 1);
uint32_t dat[2];
int offset = svga->hwcursor_latch.x + svga->hwcursor_latch.xoff;
@@ -1164,9 +1165,9 @@ ht216_write_common(ht216_t *ht216, uint32_t addr, uint8_t val)
}
static void
ht216_write(uint32_t addr, uint8_t val, void *p)
ht216_write(uint32_t addr, uint8_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint32_t prev_addr = addr;
@@ -1185,9 +1186,9 @@ ht216_write(uint32_t addr, uint8_t val, void *p)
}
static void
ht216_writew(uint32_t addr, uint16_t val, void *p)
ht216_writew(uint32_t addr, uint16_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint32_t prev_addr = addr;
@@ -1208,9 +1209,9 @@ ht216_writew(uint32_t addr, uint16_t val, void *p)
}
static void
ht216_writel(uint32_t addr, uint32_t val, void *p)
ht216_writel(uint32_t addr, uint32_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint32_t prev_addr = addr;
@@ -1233,9 +1234,9 @@ ht216_writel(uint32_t addr, uint32_t val, void *p)
}
static void
ht216_write_linear(uint32_t addr, uint8_t val, void *p)
ht216_write_linear(uint32_t addr, uint8_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
addr -= ht216->linear_base;
@@ -1250,9 +1251,9 @@ ht216_write_linear(uint32_t addr, uint8_t val, void *p)
}
static void
ht216_writew_linear(uint32_t addr, uint16_t val, void *p)
ht216_writew_linear(uint32_t addr, uint16_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
addr -= ht216->linear_base;
@@ -1269,9 +1270,9 @@ ht216_writew_linear(uint32_t addr, uint16_t val, void *p)
}
static void
ht216_writel_linear(uint32_t addr, uint32_t val, void *p)
ht216_writel_linear(uint32_t addr, uint32_t val, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
addr -= ht216->linear_base;
@@ -1372,9 +1373,9 @@ ht216_read_common(ht216_t *ht216, uint32_t addr)
}
static uint8_t
ht216_read(uint32_t addr, void *p)
ht216_read(uint32_t addr, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
uint32_t prev_addr = addr;
@@ -1390,9 +1391,9 @@ ht216_read(uint32_t addr, void *p)
}
static uint8_t
ht216_read_linear(uint32_t addr, void *p)
ht216_read_linear(uint32_t addr, void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_t *svga = &ht216->svga;
addr -= ht216->linear_base;
@@ -1427,7 +1428,7 @@ radius_mca_write(int port, uint8_t val, void *priv)
}
static uint8_t
radius_mca_feedb(void *priv)
radius_mca_feedb(UNUSED(void *priv))
{
return 1;
}
@@ -1611,9 +1612,9 @@ radius_svga_multiview_available(void)
}
void
ht216_close(void *p)
ht216_close(void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_close(&ht216->svga);
@@ -1621,17 +1622,17 @@ ht216_close(void *p)
}
void
ht216_speed_changed(void *p)
ht216_speed_changed(void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
svga_recalctimings(&ht216->svga);
}
void
ht216_force_redraw(void *p)
ht216_force_redraw(void *priv)
{
ht216_t *ht216 = (ht216_t *) p;
ht216_t *ht216 = (ht216_t *) priv;
ht216->svga.fullchange = changeframecount;
}

3
src/video/vid_ibm_rgb528_ramdac.c
View File

@@ -25,6 +25,7 @@
#include <86box/timer.h>
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/plat_unused.h>
typedef union {
uint8_t pixel;
@@ -913,7 +914,7 @@ ibm_rgb528_hwcursor_draw(svga_t *svga, int displine)
}
void *
ibm_rgb528_ramdac_init(const device_t *info)
ibm_rgb528_ramdac_init(UNUSED(const device_t *info))
{
ibm_rgb528_ramdac_t *ramdac = (ibm_rgb528_ramdac_t *) malloc(sizeof(ibm_rgb528_ramdac_t));
memset(ramdac, 0, sizeof(ibm_rgb528_ramdac_t));

7
src/video/vid_icd2061.c
View File

@@ -29,6 +29,7 @@
#define HAVE_STDARG_H
#include <86box/86box.h>
#include <86box/device.h>
#include <86box/plat_unused.h>
typedef struct icd2061_t {
float freq[3];
@@ -135,9 +136,9 @@ icd2061_write(void *p, int val)
}
float
icd2061_getclock(int clock, void *p)
icd2061_getclock(int clock, void *priv)
{
icd2061_t *icd2061 = (icd2061_t *) p;
icd2061_t *icd2061 = (icd2061_t *) priv;
if (clock > 2)
clock = 2;
@@ -146,7 +147,7 @@ icd2061_getclock(int clock, void *p)
}
static void *
icd2061_init(const device_t *info)
icd2061_init(UNUSED(const device_t *info))
{
icd2061_t *icd2061 = (icd2061_t *) malloc(sizeof(icd2061_t));
memset(icd2061, 0, sizeof(icd2061_t));

4
src/video/vid_ics2494.c
View File

@@ -49,9 +49,9 @@ ics2494_log(const char *fmt, ...)
#endif
float
ics2494_getclock(int clock, void *p)
ics2494_getclock(int clock, void *priv)
{
ics2494_t *ics2494 = (ics2494_t *) p;
ics2494_t *ics2494 = (ics2494_t *) priv;
if (clock > 15)
clock = 15;

10
src/video/vid_ics2595.c
View File

@@ -23,6 +23,7 @@
#include <wchar.h>
#include <86box/86box.h>
#include <86box/device.h>
#include <86box/plat_unused.h>
typedef struct ics2595_t {
int oldfs3, oldfs2;
@@ -70,6 +71,9 @@ ics2595_write(void *p, int strobe, int dat)
ics2595->state = ICS2595_IDLE;
}
break;
default:
break;
}
}
@@ -81,7 +85,7 @@ ics2595_write(void *p, int strobe, int dat)
}
static void *
ics2595_init(const device_t *info)
ics2595_init(UNUSED(const device_t *info))
{
ics2595_t *ics2595 = (ics2595_t *) malloc(sizeof(ics2595_t));
memset(ics2595, 0, sizeof(ics2595_t));
@@ -99,9 +103,9 @@ ics2595_close(void *priv)
}
double
ics2595_getclock(void *p)
ics2595_getclock(void *priv)
{
ics2595_t *ics2595 = (ics2595_t *) p;
ics2595_t *ics2595 = (ics2595_t *) priv;
return ics2595->output_clock;
}

4
src/video/vid_im1024.c
View File

@@ -635,7 +635,7 @@ hndl_poly(pgc_t *pgc)
}
static int
parse_poly(pgc_t *pgc, pgc_cl_t *cl, int c)
parse_poly(pgc_t *pgc, pgc_cl_t *cl, UNUSED(int c))
{
uint8_t count;
@@ -1031,7 +1031,7 @@ static const pgc_cmd_t im1024_commands[] = {
};
static void *
im1024_init(const device_t *info)
im1024_init(UNUSED(const device_t *info))
{
im1024_t *dev;

3
src/video/vid_incolor.c
View File

@@ -30,6 +30,7 @@
#include <86box/rom.h>
#include <86box/device.h>
#include <86box/video.h>
#include <86box/plat_unused.h>
/* extended CRTC registers */
#define INCOLOR_CRTC_XMODE 20 /* xMode register */
@@ -972,7 +973,7 @@ incolor_poll(void *priv)
}
static void *
incolor_init(const device_t *info)
incolor_init(UNUSED(const device_t *info))
{
incolor_t *dev;
int c;

40
src/video/vid_mda.c
View File

@@ -31,6 +31,7 @@
#include <86box/device.h>
#include <86box/video.h>
#include <86box/vid_mda.h>
#include <86box/plat_unused.h>
static int mdacols[256][2][2];
@@ -39,9 +40,10 @@ static video_timings_t timing_mda = { .type = VIDEO_ISA, .write_b = 8, .write_w
void mda_recalctimings(mda_t *mda);
void
mda_out(uint16_t addr, uint8_t val, void *p)
mda_out(uint16_t addr, uint8_t val, void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
switch (addr) {
case 0x3b0:
case 0x3b2:
@@ -64,13 +66,17 @@ mda_out(uint16_t addr, uint8_t val, void *p)
case 0x3b8:
mda->ctrl = val;
return;
default:
break;
}
}
uint8_t
mda_in(uint16_t addr, void *p)
mda_in(uint16_t addr, void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
switch (addr) {
case 0x3b0:
case 0x3b2:
@@ -84,21 +90,25 @@ mda_in(uint16_t addr, void *p)
return mda->crtc[mda->crtcreg];
case 0x3ba:
return mda->stat | 0xF0;
default:
break;
}
return 0xff;
}
void
mda_write(uint32_t addr, uint8_t val, void *p)
mda_write(uint32_t addr, uint8_t val, void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
mda->vram[addr & 0xfff] = val;
}
uint8_t
mda_read(uint32_t addr, void *p)
mda_read(uint32_t addr, void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
return mda->vram[addr & 0xfff];
}
@@ -118,9 +128,9 @@ mda_recalctimings(mda_t *mda)
}
void
mda_poll(void *p)
mda_poll(void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
uint16_t ca = (mda->crtc[15] | (mda->crtc[14] << 8)) & 0x3fff;
int drawcursor;
int x;
@@ -299,7 +309,7 @@ mda_init(mda_t *mda)
}
void *
mda_standalone_init(const device_t *info)
mda_standalone_init(UNUSED(const device_t *info))
{
mda_t *mda = malloc(sizeof(mda_t));
memset(mda, 0, sizeof(mda_t));
@@ -324,18 +334,18 @@ mda_setcol(int chr, int blink, int fg, uint8_t cga_ink)
}
void
mda_close(void *p)
mda_close(void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
free(mda->vram);
free(mda);
}
void
mda_speed_changed(void *p)
mda_speed_changed(void *priv)
{
mda_t *mda = (mda_t *) p;
mda_t *mda = (mda_t *) priv;
mda_recalctimings(mda);
}

186
src/video/vid_mga.c
View File

@@ -633,28 +633,28 @@ static void wake_fifo_thread(mystique_t *mystique);
static void wait_fifo_idle(mystique_t *mystique);
static void mystique_queue(mystique_t *mystique, uint32_t addr, uint32_t val, uint32_t type);
static uint8_t mystique_readb_linear(uint32_t addr, void *p);
static uint16_t mystique_readw_linear(uint32_t addr, void *p);
static uint32_t mystique_readl_linear(uint32_t addr, void *p);
static void mystique_writeb_linear(uint32_t addr, uint8_t val, void *p);
static void mystique_writew_linear(uint32_t addr, uint16_t val, void *p);
static void mystique_writel_linear(uint32_t addr, uint32_t val, void *p);
static uint8_t mystique_readb_linear(uint32_t addr, void *priv);
static uint16_t mystique_readw_linear(uint32_t addr, void *priv);
static uint32_t mystique_readl_linear(uint32_t addr, void *priv);
static void mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv);
static void mystique_writew_linear(uint32_t addr, uint16_t val, void *priv);
static void mystique_writel_linear(uint32_t addr, uint32_t val, void *priv);
static void mystique_recalc_mapping(mystique_t *mystique);
static int mystique_line_compare(svga_t *svga);
static uint8_t mystique_iload_read_b(uint32_t addr, void *p);
static uint32_t mystique_iload_read_l(uint32_t addr, void *p);
static void mystique_iload_write_b(uint32_t addr, uint8_t val, void *p);
static void mystique_iload_write_l(uint32_t addr, uint32_t val, void *p);
static uint8_t mystique_iload_read_b(uint32_t addr, void *priv);
static uint32_t mystique_iload_read_l(uint32_t addr, void *priv);
static void mystique_iload_write_b(uint32_t addr, uint8_t val, void *priv);
static void mystique_iload_write_l(uint32_t addr, uint32_t val, void *priv);
static uint32_t blit_idump_read(mystique_t *mystique);
static void blit_iload_write(mystique_t *mystique, uint32_t data, int size);
void
mystique_out(uint16_t addr, uint8_t val, void *p)
mystique_out(uint16_t addr, uint8_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
svga_t *svga = &mystique->svga;
uint8_t old;
@@ -664,6 +664,7 @@ mystique_out(uint16_t addr, uint8_t val, void *p)
switch (addr) {
case 0x3c8:
mystique->xreg_idx = val;
[[fallthrough]];
case 0x3c6:
case 0x3c7:
case 0x3c9:
@@ -746,9 +747,9 @@ mystique_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
mystique_in(uint16_t addr, void *p)
mystique_in(uint16_t addr, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
svga_t *svga = &mystique->svga;
uint8_t temp = 0xff;
@@ -803,7 +804,7 @@ mystique_in(uint16_t addr, void *p)
static int
mystique_line_compare(svga_t *svga)
{
mystique_t *mystique = (mystique_t *) svga->p;
mystique_t *mystique = (mystique_t *) svga->priv;
mystique->status |= STATUS_VLINEPEN;
mystique_update_irqs(mystique);
@@ -814,7 +815,7 @@ mystique_line_compare(svga_t *svga)
static void
mystique_vsync_callback(svga_t *svga)
{
mystique_t *mystique = (mystique_t *) svga->p;
mystique_t *mystique = (mystique_t *) svga->priv;
if (svga->crtc[0x11] & 0x10) {
mystique->status |= STATUS_VSYNCPEN;
@@ -823,9 +824,9 @@ mystique_vsync_callback(svga_t *svga)
}
static float
mystique_getclock(int clock, void *p)
mystique_getclock(int clock, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
if (clock == 0)
return 25175000.0;
@@ -845,7 +846,7 @@ mystique_getclock(int clock, void *p)
void
mystique_recalctimings(svga_t *svga)
{
mystique_t *mystique = (mystique_t *) svga->p;
mystique_t *mystique = (mystique_t *) svga->priv;
int clk_sel = (svga->miscout >> 2) & 3;
svga->clock = (cpuclock * (float) (1ULL << 32)) / svga->getclock(clk_sel & 3, svga->clock_gen);
@@ -1361,9 +1362,9 @@ mystique_write_xreg(mystique_t *mystique, int reg, uint8_t val)
}
static uint8_t
mystique_ctrl_read_b(uint32_t addr, void *p)
mystique_ctrl_read_b(uint32_t addr, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
svga_t *svga = &mystique->svga;
uint8_t ret = 0xff;
int fifocount;
@@ -1586,9 +1587,9 @@ mystique_ctrl_read_b(uint32_t addr, void *p)
}
static void
mystique_accel_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
mystique_accel_ctrl_write_b(uint32_t addr, uint8_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
int start_blit = 0;
if ((addr & 0x300) == 0x100) {
@@ -1705,7 +1706,9 @@ mystique_accel_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
case REG_YDSTLEN:
case REG_YDSTLEN + 1:
WRITE8(addr, mystique->dwgreg.length, val);
/* pclog("Write YDSTLEN+%i %i\n", addr&1, mystique->dwgreg.length); */
#if 0
pclog("Write YDSTLEN+%i %i\n", addr&1, mystique->dwgreg.length);
#endif
break;
case REG_YDSTLEN + 2:
mystique->dwgreg.ydst = (mystique->dwgreg.ydst & ~0xff) | val;
@@ -1924,9 +1927,9 @@ mystique_accel_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
}
static void
mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
svga_t *svga = &mystique->svga;
uint16_t addr_0x0f = 0;
uint16_t addr_0x03 = 0;
@@ -1962,7 +1965,7 @@ mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
}
if ((addr & 0x3fff) < 0x1c00) {
mystique_iload_write_b(addr, val, p);
mystique_iload_write_b(addr, val, priv);
return;
}
if ((addr & 0x3e00) == 0x1c00 || (addr & 0x3e00) == 0x2c00) {
@@ -2144,25 +2147,25 @@ mystique_ctrl_write_b(uint32_t addr, uint8_t val, void *p)
}
static uint32_t
mystique_ctrl_read_l(uint32_t addr, void *p)
mystique_ctrl_read_l(uint32_t addr, void *priv)
{
uint32_t ret;
if ((addr & 0x3fff) < 0x1c00)
return mystique_iload_read_l(addr, p);
return mystique_iload_read_l(addr, priv);
ret = mystique_ctrl_read_b(addr, p);
ret |= mystique_ctrl_read_b(addr + 1, p) << 8;
ret |= mystique_ctrl_read_b(addr + 2, p) << 16;
ret |= mystique_ctrl_read_b(addr + 3, p) << 24;
ret = mystique_ctrl_read_b(addr, priv);
ret |= mystique_ctrl_read_b(addr + 1, priv) << 8;
ret |= mystique_ctrl_read_b(addr + 2, priv) << 16;
ret |= mystique_ctrl_read_b(addr + 3, priv) << 24;
return ret;
}
static void
mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
int start_blit = 0;
if ((addr & 0x300) == 0x100) {
@@ -2256,7 +2259,9 @@ mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
mystique->dwgreg.pattern[y][x] = val & (1 << (x + (y * 16)));
}
}
// pclog("SRC0 = 0x%08X\n", val);
#if 0
pclog("SRC0 = 0x%08X\n", val);
#endif
if (mystique->busy && (mystique->dwgreg.dwgctrl_running & DWGCTRL_OPCODE_MASK) == DWGCTRL_OPCODE_ILOAD)
blit_iload_write(mystique, mystique->dwgreg.src[0], 32);
}
@@ -2379,10 +2384,10 @@ mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
break;
default:
mystique_accel_ctrl_write_b(addr, val & 0xff, p);
mystique_accel_ctrl_write_b(addr + 1, (val >> 8) & 0xff, p);
mystique_accel_ctrl_write_b(addr + 2, (val >> 16) & 0xff, p);
mystique_accel_ctrl_write_b(addr + 3, (val >> 24) & 0xff, p);
mystique_accel_ctrl_write_b(addr, val & 0xff, priv);
mystique_accel_ctrl_write_b(addr + 1, (val >> 8) & 0xff, priv);
mystique_accel_ctrl_write_b(addr + 2, (val >> 16) & 0xff, priv);
mystique_accel_ctrl_write_b(addr + 3, (val >> 24) & 0xff, priv);
break;
}
@@ -2391,13 +2396,13 @@ mystique_accel_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
}
static void
mystique_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
mystique_ctrl_write_l(uint32_t addr, uint32_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
uint32_t reg_addr;
if ((addr & 0x3fff) < 0x1c00) {
mystique_iload_write_l(addr, val, p);
mystique_iload_write_l(addr, val, priv);
return;
}
@@ -2452,18 +2457,18 @@ mystique_ctrl_write_l(uint32_t addr, uint32_t val, void *p)
break;
default:
mystique_ctrl_write_b(addr, val & 0xff, p);
mystique_ctrl_write_b(addr + 1, (val >> 8) & 0xff, p);
mystique_ctrl_write_b(addr + 2, (val >> 16) & 0xff, p);
mystique_ctrl_write_b(addr + 3, (val >> 24) & 0xff, p);
mystique_ctrl_write_b(addr, val & 0xff, priv);
mystique_ctrl_write_b(addr + 1, (val >> 8) & 0xff, priv);
mystique_ctrl_write_b(addr + 2, (val >> 16) & 0xff, priv);
mystique_ctrl_write_b(addr + 3, (val >> 24) & 0xff, priv);
break;
}
}
static uint8_t
mystique_iload_read_b(uint32_t addr, void *p)
mystique_iload_read_b(UNUSED(uint32_t addr), void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
wait_fifo_idle(mystique);
@@ -2474,9 +2479,9 @@ mystique_iload_read_b(uint32_t addr, void *p)
}
static uint32_t
mystique_iload_read_l(uint32_t addr, void *p)
mystique_iload_read_l(UNUSED(uint32_t addr), void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
wait_fifo_idle(mystique);
@@ -2488,22 +2493,23 @@ mystique_iload_read_l(uint32_t addr, void *p)
}
static void
mystique_iload_write_b(uint32_t addr, uint8_t val, void *p)
mystique_iload_write_b(UNUSED(uint32_t addr), UNUSED(uint8_t val), UNUSED(void *priv))
{
//
}
static void
mystique_iload_write_l(uint32_t addr, uint32_t val, void *p)
mystique_iload_write_l(UNUSED(uint32_t addr), uint32_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
mystique_queue(mystique, 0, val, FIFO_WRITE_ILOAD_LONG);
}
static void
mystique_accel_iload_write_l(uint32_t addr, uint32_t val, void *p)
mystique_accel_iload_write_l(UNUSED(uint32_t addr), uint32_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
switch (mystique->dwgreg.dmamod) {
case DMA_MODE_REG:
@@ -2531,15 +2537,18 @@ mystique_accel_iload_write_l(uint32_t addr, uint32_t val, void *p)
blit_iload_write(mystique, val, 32);
break;
/* default:
pclog("ILOAD write DMAMOD %i\n", mystique->dwgreg.dmamod); */
default:
#if 0
pclog("ILOAD write DMAMOD %i\n", mystique->dwgreg.dmamod); */
#endif
break;
}
}
static uint8_t
mystique_readb_linear(uint32_t addr, void *p)
mystique_readb_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_read_b;
@@ -2551,9 +2560,9 @@ mystique_readb_linear(uint32_t addr, void *p)
}
static uint16_t
mystique_readw_linear(uint32_t addr, void *p)
mystique_readw_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_read_w;
@@ -2565,9 +2574,9 @@ mystique_readw_linear(uint32_t addr, void *p)
}
static uint32_t
mystique_readl_linear(uint32_t addr, void *p)
mystique_readl_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_read_l;
@@ -2579,9 +2588,9 @@ mystique_readl_linear(uint32_t addr, void *p)
}
static void
mystique_writeb_linear(uint32_t addr, uint8_t val, void *p)
mystique_writeb_linear(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_write_b;
@@ -2594,9 +2603,9 @@ mystique_writeb_linear(uint32_t addr, uint8_t val, void *p)
}
static void
mystique_writew_linear(uint32_t addr, uint16_t val, void *p)
mystique_writew_linear(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_write_w;
@@ -2609,9 +2618,9 @@ mystique_writew_linear(uint32_t addr, uint16_t val, void *p)
}
static void
mystique_writel_linear(uint32_t addr, uint32_t val, void *p)
mystique_writel_linear(uint32_t addr, uint32_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
cycles -= video_timing_write_l;
@@ -2751,9 +2760,9 @@ run_dma(mystique_t *mystique)
}
static void
fifo_thread(void *p)
fifo_thread(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
while (mystique->thread_run) {
thread_set_event(mystique->fifo_not_full_event);
@@ -2815,9 +2824,9 @@ wake_fifo_thread_now(mystique_t *mystique)
}
static void
mystique_wake_timer(void *p)
mystique_wake_timer(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
thread_set_event(mystique->wake_fifo_thread); /*Wake up FIFO thread if moving from idle*/
}
@@ -2837,9 +2846,9 @@ wait_fifo_idle(mystique_t *mystique)
SOFTRAP IRQs and code reading the status register. Croc will get into an IRQ
loop and triple fault if the ENDPRDMASTS flag is seen before the IRQ is taken*/
static void
mystique_softrap_pending_timer(void *p)
mystique_softrap_pending_timer(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
timer_advance_u64(&mystique->softrap_pending_timer, TIMER_USEC * 100);
@@ -3268,6 +3277,9 @@ blit_iload_iload(mystique_t *mystique, uint32_t data, int size)
case MACCESS_PWIDTH_32:
min_size = 32;
break;
default:
break;
}
while (size >= min_size) {
@@ -5148,7 +5160,7 @@ mystique_start_blit(mystique_t *mystique)
static void
mystique_hwcursor_draw(svga_t *svga, int displine)
{
mystique_t *mystique = (mystique_t *) svga->p;
mystique_t *mystique = (mystique_t *) svga->priv;
uint64_t dat[2];
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
@@ -5178,9 +5190,9 @@ mystique_hwcursor_draw(svga_t *svga, int displine)
}
static uint8_t
mystique_pci_read(int func, int addr, void *p)
mystique_pci_read(UNUSED(int func), int addr, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
uint8_t ret = 0x00;
if ((addr >= 0x30) && (addr <= 0x33) && !(mystique->pci_regs[0x43] & 0x40))
@@ -5328,9 +5340,9 @@ mystique_pci_read(int func, int addr, void *p)
}
static void
mystique_pci_write(int func, int addr, uint8_t val, void *p)
mystique_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
switch (addr) {
case PCI_REG_COMMAND:
@@ -5569,9 +5581,9 @@ mystique_init(const device_t *info)
}
static void
mystique_close(void *p)
mystique_close(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
mystique->thread_run = 0;
thread_set_event(mystique->wake_fifo_thread);
@@ -5608,17 +5620,17 @@ mystique_220_available(void)
}
static void
mystique_speed_changed(void *p)
mystique_speed_changed(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
svga_recalctimings(&mystique->svga);
}
static void
mystique_force_redraw(void *p)
mystique_force_redraw(void *priv)
{
mystique_t *mystique = (mystique_t *) p;
mystique_t *mystique = (mystique_t *) priv;
mystique->svga.fullchange = changeframecount;
}

5
src/video/vid_nga.c
View File

@@ -38,6 +38,7 @@
#include <86box/vid_cga.h>
#include <86box/vid_nga.h>
#include <86box/vid_cga_comp.h>
#include <86box/plat_unused.h>
#define CGA_RGB 0
#define CGA_COMPOSITE 1
@@ -86,7 +87,7 @@ nga_in(uint16_t addr, void *priv)
}
void
nga_waitstates(void *p)
nga_waitstates(UNUSED(void *priv))
{
int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
int ws;
@@ -553,7 +554,7 @@ nga_speed_changed(void *priv)
}
void *
nga_init(const device_t *info)
nga_init(UNUSED(const device_t *info))
{
int mem;
uint8_t charset;

32
src/video/vid_oak_oti.c
View File

@@ -29,6 +29,7 @@
#include <86box/video.h>
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
#include <86box/plat_unused.h>
#define BIOS_037C_PATH "roms/video/oti/bios.bin"
#define BIOS_067_AMA932J_PATH "roms/machines/ama932j/OTI067.BIN"
@@ -64,9 +65,9 @@ typedef struct {
static video_timings_t timing_oti = { .type = VIDEO_ISA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
static void
oti_out(uint16_t addr, uint8_t val, void *p)
oti_out(uint16_t addr, uint8_t val, void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
svga_t *svga = &oti->svga;
uint8_t old;
uint8_t idx;
@@ -85,7 +86,6 @@ oti_out(uint16_t addr, uint8_t val, void *p)
return;
} else
break;
break;
case 0x3c6:
case 0x3c7:
@@ -199,9 +199,9 @@ oti_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
oti_in(uint16_t addr, void *p)
oti_in(uint16_t addr, void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
svga_t *svga = &oti->svga;
uint8_t idx;
uint8_t temp;
@@ -319,9 +319,9 @@ oti_in(uint16_t addr, void *p)
}
static void
oti_pos_out(uint16_t addr, uint8_t val, void *p)
oti_pos_out(UNUSED(uint16_t addr), uint8_t val, void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
if ((val ^ oti->pos) & 8) {
if (val & 8)
@@ -336,9 +336,9 @@ oti_pos_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
oti_pos_in(uint16_t addr, void *p)
oti_pos_in(UNUSED(uint16_t addr), void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
return (oti->pos);
}
@@ -373,7 +373,7 @@ oti_getclock(int clock)
static void
oti_recalctimings(svga_t *svga)
{
oti_t *oti = (oti_t *) svga->p;
oti_t *oti = (oti_t *) svga->priv;
int clk_sel = ((svga->miscout >> 2) & 3) | ((oti->regs[0x0d] & 0x20) >> 3);
svga->clock = (cpuclock * (double) (1ULL << 32)) / oti_getclock(clk_sel);
@@ -479,9 +479,9 @@ oti_init(const device_t *info)
}
static void
oti_close(void *p)
oti_close(void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
svga_close(&oti->svga);
@@ -489,17 +489,17 @@ oti_close(void *p)
}
static void
oti_speed_changed(void *p)
oti_speed_changed(void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
svga_recalctimings(&oti->svga);
}
static void
oti_force_redraw(void *p)
oti_force_redraw(void *priv)
{
oti_t *oti = (oti_t *) p;
oti_t *oti = (oti_t *) priv;
oti->svga.fullchange = changeframecount;
}

5
src/video/vid_ogc.c
View File

@@ -39,6 +39,7 @@
#include <86box/vid_cga.h>
#include <86box/vid_ogc.h>
#include <86box/vid_cga_comp.h>
#include <86box/plat_unused.h>
/*
* Current bugs:
@@ -140,7 +141,7 @@ ogc_in(uint16_t addr, void *priv)
}
void
ogc_waitstates(void *p)
ogc_waitstates(UNUSED(void *priv))
{
int ws_array[16] = { 3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8 };
int ws;
@@ -572,7 +573,7 @@ ogc_mdaattr_rebuild(void)
* - Optional EGC expansion board (which handles 640x400x16) not implemented
*/
void *
ogc_init(const device_t *info)
ogc_init(UNUSED(const device_t *info))
{
// int display_type;
ogc_t *ogc = (ogc_t *) malloc(sizeof(ogc_t));

38
src/video/vid_paradise.c
View File

@@ -75,9 +75,9 @@ static video_timings_t timing_paradise_wd90c = { .type = VIDEO_ISA, .write_b =
void paradise_remap(paradise_t *paradise);
uint8_t
paradise_in(uint16_t addr, void *p)
paradise_in(uint16_t addr, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -135,9 +135,9 @@ paradise_in(uint16_t addr, void *p)
}
void
paradise_out(uint16_t addr, uint8_t val, void *p)
paradise_out(uint16_t addr, uint8_t val, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
uint8_t old;
@@ -301,7 +301,7 @@ paradise_remap(paradise_t *paradise)
void
paradise_recalctimings(svga_t *svga)
{
paradise_t *paradise = (paradise_t *) svga->p;
paradise_t *paradise = (paradise_t *) svga->priv;
svga->lowres = !(svga->gdcreg[0x0e] & 0x01);
@@ -345,9 +345,9 @@ paradise_recalctimings(svga_t *svga)
}
static void
paradise_write(uint32_t addr, uint8_t val, void *p)
paradise_write(uint32_t addr, uint8_t val, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
uint32_t prev_addr;
uint32_t prev_addr2;
@@ -394,9 +394,9 @@ paradise_write(uint32_t addr, uint8_t val, void *p)
svga_write_linear(addr, val, svga);
}
static void
paradise_writew(uint32_t addr, uint16_t val, void *p)
paradise_writew(uint32_t addr, uint16_t val, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
uint32_t prev_addr;
uint32_t prev_addr2;
@@ -444,9 +444,9 @@ paradise_writew(uint32_t addr, uint16_t val, void *p)
}
static uint8_t
paradise_read(uint32_t addr, void *p)
paradise_read(uint32_t addr, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
uint32_t prev_addr;
uint32_t prev_addr2;
@@ -493,9 +493,9 @@ paradise_read(uint32_t addr, void *p)
return svga_read_linear(addr, svga);
}
static uint16_t
paradise_readw(uint32_t addr, void *p)
paradise_readw(uint32_t addr, void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_t *svga = &paradise->svga;
uint32_t prev_addr;
uint32_t prev_addr2;
@@ -728,9 +728,9 @@ paradise_wd90c30_standalone_available(void)
}
void
paradise_close(void *p)
paradise_close(void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_close(&paradise->svga);
@@ -738,17 +738,17 @@ paradise_close(void *p)
}
void
paradise_speed_changed(void *p)
paradise_speed_changed(void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
svga_recalctimings(&paradise->svga);
}
void
paradise_force_redraw(void *p)
paradise_force_redraw(void *priv)
{
paradise_t *paradise = (paradise_t *) p;
paradise_t *paradise = (paradise_t *) priv;
paradise->svga.fullchange = changeframecount;
}

5
src/video/vid_pgc.c
View File

@@ -414,7 +414,7 @@ hndl_clbeg(pgc_t *dev)
}
static void
hndl_clend(pgc_t *dev)
hndl_clend(UNUSED(pgc_t *dev))
{
/* Should not happen outside a CLBEG. */
}
@@ -1035,7 +1035,7 @@ hndl_poly(pgc_t *dev)
/* Parse but don't execute a POLY command (for adding to a command list) */
static int
parse_poly(pgc_t *dev, pgc_cl_t *cl, int c)
parse_poly(pgc_t *dev, pgc_cl_t *cl, UNUSED(int c))
{
uint8_t count;
@@ -1898,7 +1898,6 @@ pgc_param_coord(pgc_t *dev, int32_t *value)
pgc_error(dev, PGC_ERROR_MISSING);
return err_digit(dev);
}
break;
/* Scientific notation. */
case 'd':

151
src/video/vid_s3.c
View File

@@ -376,24 +376,24 @@ typedef struct s3_t {
static void s3_updatemapping(s3_t *s3);
static void s3_accel_write(uint32_t addr, uint8_t val, void *p);
static void s3_accel_write_w(uint32_t addr, uint16_t val, void *p);
static void s3_accel_write_l(uint32_t addr, uint32_t val, void *p);
static uint8_t s3_accel_read(uint32_t addr, void *p);
static uint16_t s3_accel_read_w(uint32_t addr, void *p);
static uint32_t s3_accel_read_l(uint32_t addr, void *p);
static void s3_accel_write(uint32_t addr, uint8_t val, void *priv);
static void s3_accel_write_w(uint32_t addr, uint16_t val, void *priv);
static void s3_accel_write_l(uint32_t addr, uint32_t val, void *priv);
static uint8_t s3_accel_read(uint32_t addr, void *priv);
static uint16_t s3_accel_read_w(uint32_t addr, void *priv);
static uint32_t s3_accel_read_l(uint32_t addr, void *priv);
static void s3_out(uint16_t addr, uint8_t val, void *p);
static uint8_t s3_in(uint16_t addr, void *p);
static void s3_out(uint16_t addr, uint8_t val, void *priv);
static uint8_t s3_in(uint16_t addr, void *priv);
static void s3_accel_out(uint16_t port, uint8_t val, void *p);
static void s3_accel_out_w(uint16_t port, uint16_t val, void *p);
static void s3_accel_out_l(uint16_t port, uint32_t val, void *p);
static uint8_t s3_accel_in(uint16_t port, void *p);
static uint16_t s3_accel_in_w(uint16_t port, void *p);
static uint32_t s3_accel_in_l(uint16_t port, void *p);
static uint8_t s3_pci_read(int func, int addr, void *p);
static void s3_pci_write(int func, int addr, uint8_t val, void *p);
static void s3_accel_out(uint16_t port, uint8_t val, void *priv);
static void s3_accel_out_w(uint16_t port, uint16_t val, void *priv);
static void s3_accel_out_l(uint16_t port, uint32_t val, void *priv);
static uint8_t s3_accel_in(uint16_t port, void *priv);
static uint16_t s3_accel_in_w(uint16_t port, void *priv);
static uint32_t s3_accel_in_l(uint16_t port, void *priv);
static uint8_t s3_pci_read(int func, int addr, void *priv);
static void s3_pci_write(int func, int addr, uint8_t val, void *priv);
/*Remap address for chain-4/doubleword style layout.
These will stay for convenience.*/
@@ -1980,7 +1980,7 @@ s3_accel_write_fifo_l(s3_t *s3, uint32_t addr, uint32_t val)
static void
s3_vblank_start(svga_t *svga)
{
s3_t *s3 = (s3_t *) svga->p;
s3_t *s3 = (s3_t *) svga->priv;
s3->subsys_stat |= INT_VSY;
s3_update_irqs(s3);
@@ -2003,7 +2003,7 @@ s3_hwcursor_convert_addr(svga_t *svga)
static void
s3_hwcursor_draw(svga_t *svga, int displine)
{
s3_t *s3 = (s3_t *) svga->p;
s3_t *s3 = (s3_t *) svga->priv;
int shift = 1;
int width = 16;
uint16_t dat[2];
@@ -2332,7 +2332,7 @@ s3_hwcursor_draw(svga_t *svga, int displine)
static void
s3_trio64v_overlay_draw(svga_t *svga, int displine)
{
s3_t *s3 = (s3_t *) svga->p;
s3_t *s3 = (s3_t *) svga->priv;
int offset = (s3->streams.sec_x - s3->streams.pri_x) + 1;
int h_acc = s3->streams.dda_horiz_accumulator;
int r[8];
@@ -2562,9 +2562,9 @@ s3_io_set(s3_t *s3)
}
static void
s3_out(uint16_t addr, uint8_t val, void *p)
s3_out(uint16_t addr, uint8_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint8_t old;
uint8_t mask;
@@ -2909,9 +2909,9 @@ s3_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
s3_in(uint16_t addr, void *p)
s3_in(uint16_t addr, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
int rs2;
int rs3;
@@ -3018,7 +3018,6 @@ s3_in(uint16_t addr, void *p)
}
} else
return svga->crtc[0x6b];
break;
case 0x6c:
if (s3->chip != S3_TRIO64V2) {
if (svga->crtc[0x53] & 0x08) {
@@ -3027,7 +3026,6 @@ s3_in(uint16_t addr, void *p)
return (svga->crtc[0x5a] & 0x80);
} else
return svga->crtc[0x6c];
break;
}
return svga->crtc[svga->crtcreg];
}
@@ -3037,7 +3035,7 @@ s3_in(uint16_t addr, void *p)
static void
s3_recalctimings(svga_t *svga)
{
s3_t *s3 = (s3_t *) svga->p;
s3_t *s3 = (s3_t *) svga->priv;
int clk_sel = (svga->miscout >> 2) & 3;
if (!svga->scrblank && svga->attr_palette_enable) {
@@ -3348,7 +3346,7 @@ s3_recalctimings(svga_t *svga)
static void
s3_trio64v_recalctimings(svga_t *svga)
{
s3_t *s3 = (s3_t *) svga->p;
s3_t *s3 = (s3_t *) svga->priv;
int clk_sel = (svga->miscout >> 2) & 3;
if (!svga->scrblank && svga->attr_palette_enable) {
@@ -3582,9 +3580,9 @@ s3_updatemapping(s3_t *s3)
}
static float
s3_trio64_getclock(int clock, void *p)
s3_trio64_getclock(int clock, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
float t;
int m;
@@ -3602,9 +3600,9 @@ s3_trio64_getclock(int clock, void *p)
}
static void
s3_accel_out(uint16_t port, uint8_t val, void *p)
s3_accel_out(uint16_t port, uint8_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
if (port >= 0x8000) {
@@ -3650,9 +3648,9 @@ s3_accel_out(uint16_t port, uint8_t val, void *p)
}
static void
s3_accel_out_w(uint16_t port, uint16_t val, void *p)
s3_accel_out_w(uint16_t port, uint16_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
if (!s3->enable_8514)
return;
@@ -3664,9 +3662,9 @@ s3_accel_out_w(uint16_t port, uint16_t val, void *p)
}
static void
s3_accel_out_l(uint16_t port, uint32_t val, void *p)
s3_accel_out_l(uint16_t port, uint32_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
if (!s3->enable_8514)
return;
@@ -3678,9 +3676,9 @@ s3_accel_out_l(uint16_t port, uint32_t val, void *p)
}
static uint8_t
s3_accel_in(uint16_t port, void *p)
s3_accel_in(uint16_t port, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
int temp;
@@ -4262,9 +4260,9 @@ s3_accel_in(uint16_t port, void *p)
}
static uint16_t
s3_accel_in_w(uint16_t port, void *p)
s3_accel_in_w(uint16_t port, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint16_t temp = 0x0000;
uint16_t *vram_w = (uint16_t *) svga->vram;
@@ -4318,9 +4316,9 @@ s3_accel_in_w(uint16_t port, void *p)
}
static uint32_t
s3_accel_in_l(uint16_t port, void *p)
s3_accel_in_l(UNUSED(uint16_t port), void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint32_t temp = 0x00000000;
uint16_t *vram_w = (uint16_t *) svga->vram;
@@ -4371,9 +4369,9 @@ s3_accel_in_l(uint16_t port, void *p)
}
static void
s3_accel_write(uint32_t addr, uint8_t val, void *p)
s3_accel_write(uint32_t addr, uint8_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
if (!s3->enable_8514)
@@ -4389,9 +4387,9 @@ s3_accel_write(uint32_t addr, uint8_t val, void *p)
}
static void
s3_accel_write_w(uint32_t addr, uint16_t val, void *p)
s3_accel_write_w(uint32_t addr, uint16_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
if (!s3->enable_8514)
@@ -4407,9 +4405,9 @@ s3_accel_write_w(uint32_t addr, uint16_t val, void *p)
}
static void
s3_accel_write_l(uint32_t addr, uint32_t val, void *p)
s3_accel_write_l(uint32_t addr, uint32_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
if (!s3->enable_8514)
@@ -4425,9 +4423,9 @@ s3_accel_write_l(uint32_t addr, uint32_t val, void *p)
}
static uint8_t
s3_accel_read(uint32_t addr, void *p)
s3_accel_read(uint32_t addr, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint8_t temp = 0x00;
@@ -4492,12 +4490,12 @@ s3_accel_read(uint32_t addr, void *p)
case 0x8505:
return s3->subsys_cntl;
default:
return s3_accel_in(addr & 0xffff, p);
return s3_accel_in(addr & 0xffff, priv);
}
return 0xff;
} else {
if (addr & 0x8000) {
temp = s3_accel_in(addr & 0xffff, p);
temp = s3_accel_in(addr & 0xffff, priv);
} else if (s3_cpu_dest(s3)) {
READ_PIXTRANS_BYTE_MM
@@ -4528,9 +4526,9 @@ s3_accel_read(uint32_t addr, void *p)
}
static uint16_t
s3_accel_read_w(uint32_t addr, void *p)
s3_accel_read_w(uint32_t addr, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint16_t temp = 0x0000;
uint16_t *vram_w = (uint16_t *) svga->vram;
@@ -4546,7 +4544,7 @@ s3_accel_read_w(uint32_t addr, void *p)
return s3->accel.short_stroke;
default:
return s3_accel_read(addr, p) | s3_accel_read(addr + 1, p) << 8;
return s3_accel_read(addr, priv) | s3_accel_read(addr + 1, priv) << 8;
}
return 0xffff;
} else {
@@ -4556,8 +4554,8 @@ s3_accel_read_w(uint32_t addr, void *p)
s3_wait_fifo_idle(s3);
temp = s3->accel.short_stroke;
} else {
temp = s3_accel_read((addr & 0xfffe), p);
temp |= s3_accel_read((addr & 0xfffe) + 1, p) << 8;
temp = s3_accel_read((addr & 0xfffe), priv);
temp |= s3_accel_read((addr & 0xfffe) + 1, priv) << 8;
}
} else if (s3_cpu_dest(s3)) {
READ_PIXTRANS_WORD
@@ -4589,9 +4587,9 @@ s3_accel_read_w(uint32_t addr, void *p)
}
static uint32_t
s3_accel_read_l(uint32_t addr, void *p)
s3_accel_read_l(uint32_t addr, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
uint32_t temp = 0x00000000;
uint16_t *vram_w = (uint16_t *) svga->vram;
@@ -4721,15 +4719,15 @@ s3_accel_read_l(uint32_t addr, void *p)
break;
default:
temp = s3_accel_read_w(addr, p) | (s3_accel_read_w(addr + 2, p) << 16);
temp = s3_accel_read_w(addr, priv) | (s3_accel_read_w(addr + 2, priv) << 16);
break;
}
} else {
if (addr & 0x8000) {
temp = s3_accel_read((addr & 0xfffc), p);
temp |= s3_accel_read((addr & 0xfffc) + 1, p) << 8;
temp |= s3_accel_read((addr & 0xfffc) + 2, p) << 16;
temp |= s3_accel_read((addr & 0xfffc) + 3, p) << 24;
temp = s3_accel_read((addr & 0xfffc), priv);
temp |= s3_accel_read((addr & 0xfffc) + 1, priv) << 8;
temp |= s3_accel_read((addr & 0xfffc) + 2, priv) << 16;
temp |= s3_accel_read((addr & 0xfffc) + 3, priv) << 24;
} else if (s3_cpu_dest(s3)) {
READ_PIXTRANS_LONG
@@ -7319,9 +7317,9 @@ s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat, s3_
}
static uint8_t
s3_pci_read(int func, int addr, void *p)
s3_pci_read(UNUSED(int func), int addr, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
switch (addr) {
@@ -7340,7 +7338,6 @@ s3_pci_read(int func, int addr, void *p)
return s3->pci_regs[PCI_REG_COMMAND] | 0x80; /*Respond to IO and memory accesses*/
else
return s3->pci_regs[PCI_REG_COMMAND]; /*Respond to IO and memory accesses*/
break;
case 0x07:
return (s3->chip == S3_TRIO64V2) ? (s3->pci_regs[0x07] & 0x36) : (1 << 1); /*Medium DEVSEL timing*/
@@ -7355,17 +7352,14 @@ s3_pci_read(int func, int addr, void *p)
return 0x00; /*Supports VGA interface*/
else
return 0x01;
break;
case 0x0b:
if (s3->chip >= S3_TRIO32 || s3->chip == S3_VISION968 || s3->chip == S3_VISION868)
return 0x03;
else
return 0x00;
break;
case 0x0d:
return (s3->chip == S3_TRIO64V2) ? (s3->pci_regs[0x0d] & 0xf8) : 0x00;
break;
case 0x10:
return 0x00; /*Linear frame buffer address*/
@@ -7376,7 +7370,6 @@ s3_pci_read(int func, int addr, void *p)
return 0x00;
else
return (svga->crtc[0x5a] & 0x80);
break;
case 0x13:
if (svga->crtc[0x53] & 0x08) {
@@ -7384,7 +7377,6 @@ s3_pci_read(int func, int addr, void *p)
} else {
return svga->crtc[0x59];
}
break;
case 0x30:
return s3->has_bios ? (s3->pci_regs[0x30] & 0x01) : 0x00; /*BIOS ROM address*/
@@ -7405,15 +7397,14 @@ s3_pci_read(int func, int addr, void *p)
break;
case 0x3f:
return (s3->chip == S3_TRIO64V2) ? 0xff : 0x00;
break;
}
return 0;
}
static void
s3_pci_write(int func, int addr, uint8_t val, void *p)
s3_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_t *svga = &s3->svga;
switch (addr) {
@@ -8565,9 +8556,9 @@ s3_trio64v2_dx_available(void)
}
static void
s3_close(void *p)
s3_close(void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
s3->fifo_thread_run = 0;
thread_set_event(s3->wake_fifo_thread);
@@ -8584,17 +8575,17 @@ s3_close(void *p)
}
static void
s3_speed_changed(void *p)
s3_speed_changed(void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
svga_recalctimings(&s3->svga);
}
static void
s3_force_redraw(void *p)
s3_force_redraw(void *priv)
{
s3_t *s3 = (s3_t *) p;
s3_t *s3 = (s3_t *) priv;
s3->svga.fullchange = s3->svga.monitor->mon_changeframecount;
}

80
src/video/vid_s3_virge.c
View File

@@ -39,6 +39,7 @@
#include <86box/vid_ddc.h>
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
#include <86box/plat_unused.h>
static int dither[4][4] = {
{0, 4, 1, 5},
@@ -307,12 +308,12 @@ static void s3_virge_updatemapping(virge_t *virge);
static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat);
static uint8_t s3_virge_mmio_read(uint32_t addr, void *p);
static uint16_t s3_virge_mmio_read_w(uint32_t addr, void *p);
static uint32_t s3_virge_mmio_read_l(uint32_t addr, void *p);
static void s3_virge_mmio_write(uint32_t addr, uint8_t val, void *p);
static void s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p);
static void s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p);
static uint8_t s3_virge_mmio_read(uint32_t addr, void *priv);
static uint16_t s3_virge_mmio_read_w(uint32_t addr, void *rivp);
static uint32_t s3_virge_mmio_read_l(uint32_t addr, void *priv);
static void s3_virge_mmio_write(uint32_t addr, uint8_t val, void *priv);
static void s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *priv);
static void s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv);
enum {
CMD_SET_AE = 1,
@@ -387,9 +388,9 @@ s3_virge_log(const char *fmt, ...)
#endif
static void
s3_virge_tri_timer(void *p)
s3_virge_tri_timer(void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
thread_set_event(virge->wake_render_thread); /*Wake up FIFO thread if moving from idle*/
}
@@ -447,9 +448,9 @@ render_thread(void *param)
}
static void
s3_virge_out(uint16_t addr, uint8_t val, void *p)
s3_virge_out(uint16_t addr, uint8_t val, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_t *svga = &virge->svga;
uint8_t old;
uint32_t cursoraddr;
@@ -653,9 +654,9 @@ s3_virge_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
s3_virge_in(uint16_t addr, void *p)
s3_virge_in(uint16_t addr, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_t *svga = &virge->svga;
uint8_t ret;
@@ -760,7 +761,7 @@ s3_virge_in(uint16_t addr, void *p)
static void
s3_virge_recalctimings(svga_t *svga)
{
virge_t *virge = (virge_t *) svga->p;
virge_t *virge = (virge_t *) svga->priv;
svga->hdisp = svga->hdisp_old;
@@ -988,7 +989,7 @@ s3_virge_updatemapping(virge_t *virge)
static void
s3_virge_vblank_start(svga_t *svga)
{
virge_t *virge = (virge_t *) svga->p;
virge_t *virge = (virge_t *) svga->priv;
virge->subsys_stat |= INT_VSY;
s3_virge_update_irqs(virge);
@@ -1471,9 +1472,9 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
}
static uint8_t
s3_virge_mmio_read(uint32_t addr, void *p)
s3_virge_mmio_read(uint32_t addr, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
uint8_t ret = 0xff;
s3_virge_log("[%04X:%08X]: MMIO ReadB addr = %04x\n", CS, cpu_state.pc, addr & 0xffff);
@@ -1555,9 +1556,9 @@ s3_virge_mmio_read(uint32_t addr, void *p)
return 0xff;
}
static uint16_t
s3_virge_mmio_read_w(uint32_t addr, void *p)
s3_virge_mmio_read_w(uint32_t addr, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
uint16_t ret = 0xffff;
s3_virge_log("[%04X:%08X]: MMIO ReadW addr = %04x\n", CS, cpu_state.pc, addr & 0xfffe);
@@ -1584,9 +1585,9 @@ s3_virge_mmio_read_w(uint32_t addr, void *p)
}
static uint32_t
s3_virge_mmio_read_l(uint32_t addr, void *p)
s3_virge_mmio_read_l(uint32_t addr, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
uint32_t ret = 0xffffffff;
s3_virge_log("[%04X:%08X]: MMIO ReadL addr = %04x\n", CS, cpu_state.pc, addr & 0xfffc);
@@ -1745,9 +1746,9 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
}
static void
s3_virge_mmio_write(uint32_t addr, uint8_t val, void *p)
s3_virge_mmio_write(uint32_t addr, uint8_t val, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
s3_virge_log("MMIO WriteB addr = %04x, val = %02x\n", addr & 0xffff, val);
if (((addr & 0xffff) >= 0x8590) || ((addr & 0xffff) < 0x8000)) {
if ((addr & 0xffff) == 0xff20) {
@@ -1812,9 +1813,9 @@ s3_virge_mmio_write(uint32_t addr, uint8_t val, void *p)
}
static void
s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p)
s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
s3_virge_log("[%04X:%08X]: MMIO WriteW addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffe, val);
if (((addr & 0xfffe) >= 0x8590) || ((addr & 0xfffe) < 0x8000))
if ((addr & 0xfffe) == 0xff20)
@@ -1830,9 +1831,9 @@ s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p)
}
static void
s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p)
s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_t *svga = &virge->svga;
s3_virge_log("[%04X:%08X]: MMIO WriteL addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffc, val);
@@ -3486,7 +3487,7 @@ s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
static void
s3_virge_hwcursor_draw(svga_t *svga, int displine)
{
virge_t *virge = (virge_t *) svga->p;
virge_t *virge = (virge_t *) svga->priv;
uint16_t dat[2];
int xx;
int offset = svga->hwcursor_latch.x - svga->hwcursor_latch.xoff;
@@ -3771,7 +3772,7 @@ s3_virge_hwcursor_draw(svga_t *svga, int displine)
static void
s3_virge_overlay_draw(svga_t *svga, int displine)
{
virge_t *virge = (virge_t *) svga->p;
virge_t *virge = (virge_t *) svga->priv;
int offset = (virge->streams.sec_x - virge->streams.pri_x) + 1;
int h_acc = virge->streams.dda_horiz_accumulator;
int r[8];
@@ -3813,9 +3814,9 @@ s3_virge_overlay_draw(svga_t *svga, int displine)
}
static uint8_t
s3_virge_pci_read(int func, int addr, void *p)
s3_virge_pci_read(UNUSED(int func), int addr, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_t *svga = &virge->svga;
uint8_t ret = 0;
@@ -3975,9 +3976,9 @@ s3_virge_pci_read(int func, int addr, void *p)
}
static void
s3_virge_pci_write(int func, int addr, uint8_t val, void *p)
s3_virge_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_t *svga = &virge->svga;
switch (addr) {
case 0x00:
@@ -4304,7 +4305,8 @@ s3_virge_init(const device_t *info)
case S3_VIRGE_GX:
virge->virge_rev = 0x01;
/*FALLTHROUGH*/
[[fallthrough]];
default:
virge->svga.decode_mask = (4 << 20) - 1;
virge->virge_id_high = 0x8a;
@@ -4382,9 +4384,9 @@ s3_virge_init(const device_t *info)
}
static void
s3_virge_close(void *p)
s3_virge_close(void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
virge->render_thread_run = 0;
thread_set_event(virge->wake_render_thread);
@@ -4462,17 +4464,17 @@ s3_trio3d2x_available(void)
}
static void
s3_virge_speed_changed(void *p)
s3_virge_speed_changed(void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
svga_recalctimings(&virge->svga);
}
static void
s3_virge_force_redraw(void *p)
s3_virge_force_redraw(void *priv)
{
virge_t *virge = (virge_t *) p;
virge_t *virge = (virge_t *) priv;
virge->svga.fullchange = changeframecount;
}

4
src/video/vid_sdac_ramdac.c
View File

@@ -243,9 +243,9 @@ sdac_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga)
}
float
sdac_getclock(int clock, void *p)
sdac_getclock(int clock, void *priv)
{
sdac_ramdac_t *ramdac = (sdac_ramdac_t *) p;
sdac_ramdac_t *ramdac = (sdac_ramdac_t *) priv;
float t;
int m;
int n1;

36
src/video/vid_sigma.c
View File

@@ -192,9 +192,9 @@ static video_timings_t timing_sigma = { .type = VIDEO_ISA, .write_b = 8, .write_
static void sigma_recalctimings(sigma_t *cga);
static void
sigma_out(uint16_t addr, uint8_t val, void *p)
sigma_out(uint16_t addr, uint8_t val, void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
uint8_t old;
if (addr >= 0x3D0 && addr < 0x3E0) {
@@ -260,10 +260,10 @@ sigma_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
sigma_in(uint16_t addr, void *p)
sigma_in(uint16_t addr, void *priv)
{
uint8_t result = 0xFF;
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
switch (addr) {
case 0x2D0:
@@ -332,27 +332,27 @@ sigma_in(uint16_t addr, void *p)
}
static void
sigma_write(uint32_t addr, uint8_t val, void *p)
sigma_write(uint32_t addr, uint8_t val, void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
sigma->vram[sigma->plane * 0x8000 + (addr & 0x7fff)] = val;
cycles -= 4;
}
static uint8_t
sigma_read(uint32_t addr, void *p)
sigma_read(uint32_t addr, void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
cycles -= 4;
return sigma->vram[sigma->plane * 0x8000 + (addr & 0x7fff)];
}
static void
sigma_bwrite(uint32_t addr, uint8_t val, void *p)
sigma_bwrite(uint32_t addr, uint8_t val, void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
addr &= 0x3FFF;
if ((addr < 0x1800) || sigma->rom_paged || (addr >= 0x2000))
@@ -362,9 +362,9 @@ sigma_bwrite(uint32_t addr, uint8_t val, void *p)
}
static uint8_t
sigma_bread(uint32_t addr, void *p)
sigma_bread(uint32_t addr, void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
uint8_t result;
addr &= 0x3FFF;
@@ -589,9 +589,9 @@ sigma_gfx4col(sigma_t *sigma)
}
static void
sigma_poll(void *p)
sigma_poll(void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
int x;
int c;
int oldvc;
@@ -833,18 +833,18 @@ sigma_available(void)
}
static void
sigma_close(void *p)
sigma_close(void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
free(sigma->vram);
free(sigma);
}
void
sigma_speed_changed(void *p)
sigma_speed_changed(void *priv)
{
sigma_t *sigma = (sigma_t *) p;
sigma_t *sigma = (sigma_t *) priv;
sigma_recalctimings(sigma);
}

4
src/video/vid_stg_ramdac.c
View File

@@ -199,9 +199,9 @@ stg_ramdac_in(uint16_t addr, void *p, svga_t *svga)
}
float
stg_getclock(int clock, void *p)
stg_getclock(int clock, void *priv)
{
stg_ramdac_t *ramdac = (stg_ramdac_t *) p;
stg_ramdac_t *ramdac = (stg_ramdac_t *) priv;
float t;
int m;
int n;

156
src/video/vid_svga.c
View File

@@ -108,9 +108,9 @@ svga_set_override(svga_t *svga, int val)
}
void
svga_out(uint16_t addr, uint8_t val, void *p)
svga_out(uint16_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
uint8_t o;
uint8_t index;
@@ -161,9 +161,9 @@ svga_out(uint16_t addr, uint8_t val, void *p)
case 0x3c2:
svga->miscout = val;
svga->vidclock = val & 4;
io_removehandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->p);
io_removehandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
if (!(val & 1))
io_sethandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->p);
io_sethandler(0x03a0, 0x0020, svga->video_in, NULL, NULL, svga->video_out, NULL, NULL, svga->priv);
svga_recalctimings(svga);
break;
case 0x3c3:
@@ -299,9 +299,9 @@ svga_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
svga_in(uint16_t addr, void *p)
svga_in(uint16_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
uint8_t index;
uint8_t ret = 0xff;
@@ -693,9 +693,9 @@ svga_do_render(svga_t *svga)
}
void
svga_poll(void *p)
svga_poll(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
ibm8514_t *dev = &svga->dev8514;
uint32_t x;
uint32_t blink_delay;
@@ -982,16 +982,16 @@ svga_poll(void *p)
}
int
svga_init(const device_t *info, svga_t *svga, void *p, int memsize,
svga_init(const device_t *info, svga_t *svga, void *priv, int memsize,
void (*recalctimings_ex)(struct svga_t *svga),
uint8_t (*video_in)(uint16_t addr, void *p),
void (*video_out)(uint16_t addr, uint8_t val, void *p),
uint8_t (*video_in)(uint16_t addr, void *priv),
void (*video_out)(uint16_t addr, uint8_t val, void *priv),
void (*hwcursor_draw)(struct svga_t *svga, int displine),
void (*overlay_draw)(struct svga_t *svga, int displine))
{
int e;
svga->p = p;
svga->priv = priv;
svga->monitor_index = monitor_index_global;
svga->monitor = &monitors[svga->monitor_index];
@@ -1119,9 +1119,9 @@ svga_decode_addr(svga_t *svga, uint32_t addr, int write)
}
static __inline void
svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *p)
svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
int writemask2 = svga->writemask;
int reset_wm = 0;
@@ -1197,7 +1197,7 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *p)
addr &= svga->decode_mask;
if (svga->translate_address)
addr = svga->translate_address(addr, p);
addr = svga->translate_address(addr, priv);
if (addr >= svga->vram_max)
return;
@@ -1332,9 +1332,9 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *p)
}
static __inline uint8_t
svga_read_common(uint32_t addr, uint8_t linear, void *p)
svga_read_common(uint32_t addr, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
uint32_t latch_addr = 0;
int readplane = svga->readplane;
uint8_t count;
@@ -1386,7 +1386,7 @@ svga_read_common(uint32_t addr, uint8_t linear, void *p)
else if ((svga->chain4 && (svga->packed_chain4 || svga->force_old_addr)) || svga->fb_only) {
addr &= svga->decode_mask;
if (svga->translate_address)
addr = svga->translate_address(addr, p);
addr = svga->translate_address(addr, priv);
if (addr >= svga->vram_max)
return 0xff;
latch_addr = (addr & svga->vram_mask) & ~3;
@@ -1418,8 +1418,8 @@ svga_read_common(uint32_t addr, uint8_t linear, void *p)
addr &= svga->decode_mask;
if (svga->translate_address) {
latch_addr = svga->translate_address(latch_addr, p);
addr = svga->translate_address(addr, p);
latch_addr = svga->translate_address(latch_addr, priv);
addr = svga->translate_address(addr, priv);
}
/* standard VGA latched access */
@@ -1459,27 +1459,27 @@ svga_read_common(uint32_t addr, uint8_t linear, void *p)
}
void
svga_write(uint32_t addr, uint8_t val, void *p)
svga_write(uint32_t addr, uint8_t val, void *priv)
{
svga_write_common(addr, val, 0, p);
svga_write_common(addr, val, 0, priv);
}
void
svga_write_linear(uint32_t addr, uint8_t val, void *p)
svga_write_linear(uint32_t addr, uint8_t val, void *priv)
{
svga_write_common(addr, val, 1, p);
svga_write_common(addr, val, 1, priv);
}
uint8_t
svga_read(uint32_t addr, void *p)
svga_read(uint32_t addr, void *priv)
{
return svga_read_common(addr, 0, p);
return svga_read_common(addr, 0, priv);
}
uint8_t
svga_read_linear(uint32_t addr, void *p)
svga_read_linear(uint32_t addr, void *priv)
{
return svga_read_common(addr, 1, p);
return svga_read_common(addr, 1, priv);
}
void
@@ -1570,12 +1570,12 @@ svga_doblit(int wx, int wy, svga_t *svga)
}
void
svga_writeb_linear(uint32_t addr, uint8_t val, void *p)
svga_writeb_linear(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast) {
svga_write_linear(addr, val, p);
svga_write_linear(addr, val, priv);
return;
}
@@ -1588,13 +1588,13 @@ svga_writeb_linear(uint32_t addr, uint8_t val, void *p)
}
void
svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *p)
svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast) {
svga_write_common(addr, val, linear, p);
svga_write_common(addr + 1, val >> 8, linear, p);
svga_write_common(addr, val, linear, priv);
svga_write_common(addr + 1, val >> 8, linear, priv);
return;
}
@@ -1609,12 +1609,12 @@ svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *p)
addr &= svga->decode_mask;
if (svga->translate_address) {
uint32_t addr2 = svga->translate_address(addr, p);
uint32_t addr2 = svga->translate_address(addr, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = val & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
}
addr2 = svga->translate_address(addr + 1, p);
addr2 = svga->translate_address(addr + 1, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = (val >> 8) & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
@@ -1630,27 +1630,27 @@ svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *p)
}
void
svga_writew(uint32_t addr, uint16_t val, void *p)
svga_writew(uint32_t addr, uint16_t val, void *priv)
{
svga_writew_common(addr, val, 0, p);
svga_writew_common(addr, val, 0, priv);
}
void
svga_writew_linear(uint32_t addr, uint16_t val, void *p)
svga_writew_linear(uint32_t addr, uint16_t val, void *priv)
{
svga_writew_common(addr, val, 1, p);
svga_writew_common(addr, val, 1, priv);
}
void
svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *p)
svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast) {
svga_write_common(addr, val, linear, p);
svga_write_common(addr + 1, val >> 8, linear, p);
svga_write_common(addr + 2, val >> 16, linear, p);
svga_write_common(addr + 3, val >> 24, linear, p);
svga_write_common(addr, val, linear, priv);
svga_write_common(addr + 1, val >> 8, linear, priv);
svga_write_common(addr + 2, val >> 16, linear, priv);
svga_write_common(addr + 3, val >> 24, linear, priv);
return;
}
@@ -1665,22 +1665,22 @@ svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *p)
addr &= svga->decode_mask;
if (svga->translate_address) {
uint32_t addr2 = svga->translate_address(addr, p);
uint32_t addr2 = svga->translate_address(addr, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = val & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
}
addr2 = svga->translate_address(addr + 1, p);
addr2 = svga->translate_address(addr + 1, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = (val >> 8) & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
}
addr2 = svga->translate_address(addr + 2, p);
addr2 = svga->translate_address(addr + 2, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = (val >> 16) & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
}
addr2 = svga->translate_address(addr + 3, p);
addr2 = svga->translate_address(addr + 3, priv);
if (addr2 < svga->vram_max) {
svga->vram[addr2 & svga->vram_mask] = (val >> 24) & 0xff;
svga->changedvram[addr2 >> 12] = svga->monitor->mon_changeframecount;
@@ -1696,24 +1696,24 @@ svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *p)
}
void
svga_writel(uint32_t addr, uint32_t val, void *p)
svga_writel(uint32_t addr, uint32_t val, void *priv)
{
svga_writel_common(addr, val, 0, p);
svga_writel_common(addr, val, 0, priv);
}
void
svga_writel_linear(uint32_t addr, uint32_t val, void *p)
svga_writel_linear(uint32_t addr, uint32_t val, void *priv)
{
svga_writel_common(addr, val, 1, p);
svga_writel_common(addr, val, 1, priv);
}
uint8_t
svga_readb_linear(uint32_t addr, void *p)
svga_readb_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast)
return svga_read_linear(addr, p);
return svga_read_linear(addr, priv);
addr &= svga->decode_mask;
if (addr >= svga->vram_max)
@@ -1723,12 +1723,12 @@ svga_readb_linear(uint32_t addr, void *p)
}
uint16_t
svga_readw_common(uint32_t addr, uint8_t linear, void *p)
svga_readw_common(uint32_t addr, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast)
return svga_read_common(addr, linear, p) | (svga_read_common(addr + 1, linear, p) << 8);
return svga_read_common(addr, linear, priv) | (svga_read_common(addr + 1, linear, priv) << 8);
cycles -= svga->monitor->mon_video_timing_read_w;
@@ -1743,10 +1743,10 @@ svga_readw_common(uint32_t addr, uint8_t linear, void *p)
if (svga->translate_address) {
uint8_t val1 = 0xff;
uint8_t val2 = 0xff;
uint32_t addr2 = svga->translate_address(addr, p);
uint32_t addr2 = svga->translate_address(addr, priv);
if (addr2 < svga->vram_max)
val1 = svga->vram[addr2 & svga->vram_mask];
addr2 = svga->translate_address(addr + 1, p);
addr2 = svga->translate_address(addr + 1, priv);
if (addr2 < svga->vram_max)
val2 = svga->vram[addr2 & svga->vram_mask];
return (val2 << 8) | val1;
@@ -1758,24 +1758,24 @@ svga_readw_common(uint32_t addr, uint8_t linear, void *p)
}
uint16_t
svga_readw(uint32_t addr, void *p)
svga_readw(uint32_t addr, void *priv)
{
return svga_readw_common(addr, 0, p);
return svga_readw_common(addr, 0, priv);
}
uint16_t
svga_readw_linear(uint32_t addr, void *p)
svga_readw_linear(uint32_t addr, void *priv)
{
return svga_readw_common(addr, 1, p);
return svga_readw_common(addr, 1, priv);
}
uint32_t
svga_readl_common(uint32_t addr, uint8_t linear, void *p)
svga_readl_common(uint32_t addr, uint8_t linear, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
if (!svga->fast) {
return svga_read_common(addr, linear, p) | (svga_read_common(addr + 1, linear, p) << 8) | (svga_read_common(addr + 2, linear, p) << 16) | (svga_read_common(addr + 3, linear, p) << 24);
return svga_read_common(addr, linear, priv) | (svga_read_common(addr + 1, linear, priv) << 8) | (svga_read_common(addr + 2, linear, priv) << 16) | (svga_read_common(addr + 3, linear, priv) << 24);
}
cycles -= svga->monitor->mon_video_timing_read_l;
@@ -1793,16 +1793,16 @@ svga_readl_common(uint32_t addr, uint8_t linear, void *p)
uint8_t val2 = 0xff;
uint8_t val3 = 0xff;
uint8_t val4 = 0xff;
uint32_t addr2 = svga->translate_address(addr, p);
uint32_t addr2 = svga->translate_address(addr, priv);
if (addr2 < svga->vram_max)
val1 = svga->vram[addr2 & svga->vram_mask];
addr2 = svga->translate_address(addr + 1, p);
addr2 = svga->translate_address(addr + 1, priv);
if (addr2 < svga->vram_max)
val2 = svga->vram[addr2 & svga->vram_mask];
addr2 = svga->translate_address(addr + 2, p);
addr2 = svga->translate_address(addr + 2, priv);
if (addr2 < svga->vram_max)
val3 = svga->vram[addr2 & svga->vram_mask];
addr2 = svga->translate_address(addr + 3, p);
addr2 = svga->translate_address(addr + 3, priv);
if (addr2 < svga->vram_max)
val4 = svga->vram[addr2 & svga->vram_mask];
return (val4 << 24) | (val3 << 16) | (val2 << 8) | val1;
@@ -1814,13 +1814,13 @@ svga_readl_common(uint32_t addr, uint8_t linear, void *p)
}
uint32_t
svga_readl(uint32_t addr, void *p)
svga_readl(uint32_t addr, void *priv)
{
return svga_readl_common(addr, 0, p);
return svga_readl_common(addr, 0, priv);
}
uint32_t
svga_readl_linear(uint32_t addr, void *p)
svga_readl_linear(uint32_t addr, void *priv)
{
return svga_readl_common(addr, 1, p);
return svga_readl_common(addr, 1, priv);
}

236
src/video/vid_tgui9440.c
View File

@@ -169,17 +169,17 @@ typedef struct tgui_t {
video_timings_t timing_tgui_vlb = { .type = VIDEO_BUS, .write_b = 4, .write_w = 8, .write_l = 16, .read_b = 4, .read_w = 8, .read_l = 16 };
video_timings_t timing_tgui_pci = { .type = VIDEO_PCI, .write_b = 4, .write_w = 8, .write_l = 16, .read_b = 4, .read_w = 8, .read_l = 16 };
static void tgui_out(uint16_t addr, uint8_t val, void *p);
static uint8_t tgui_in(uint16_t addr, void *p);
static void tgui_out(uint16_t addr, uint8_t val, void *priv);
static uint8_t tgui_in(uint16_t addr, void *priv);
static void tgui_recalcmapping(tgui_t *tgui);
static void tgui_accel_out(uint16_t addr, uint8_t val, void *p);
static void tgui_accel_out_w(uint16_t addr, uint16_t val, void *p);
static void tgui_accel_out_l(uint16_t addr, uint32_t val, void *p);
static uint8_t tgui_accel_in(uint16_t addr, void *p);
static uint16_t tgui_accel_in_w(uint16_t addr, void *p);
static uint32_t tgui_accel_in_l(uint16_t addr, void *p);
static void tgui_accel_out(uint16_t addr, uint8_t val, void *priv);
static void tgui_accel_out_w(uint16_t addr, uint16_t val, void *priv);
static void tgui_accel_out_l(uint16_t addr, uint32_t val, void *priv);
static uint8_t tgui_accel_in(uint16_t addr, void *priv);
static uint16_t tgui_accel_in_w(uint16_t addr, void *priv);
static uint32_t tgui_accel_in_l(uint16_t addr, void *priv);
static uint8_t tgui_accel_read(uint32_t addr, void *priv);
static uint16_t tgui_accel_read_w(uint32_t addr, void *priv);
@@ -193,15 +193,15 @@ static void tgui_accel_write_fb_b(uint32_t addr, uint8_t val, void *priv);
static void tgui_accel_write_fb_w(uint32_t addr, uint16_t val, void *priv);
static void tgui_accel_write_fb_l(uint32_t addr, uint32_t val, void *priv);
static uint8_t tgui_ext_linear_read(uint32_t addr, void *p);
static void tgui_ext_linear_write(uint32_t addr, uint8_t val, void *p);
static void tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *p);
static void tgui_ext_linear_writel(uint32_t addr, uint32_t val, void *p);
static uint8_t tgui_ext_linear_read(uint32_t addr, void *priv);
static void tgui_ext_linear_write(uint32_t addr, uint8_t val, void *priv);
static void tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *priv);
static void tgui_ext_linear_writel(uint32_t addr, uint32_t val, void *priv);
static uint8_t tgui_ext_read(uint32_t addr, void *p);
static void tgui_ext_write(uint32_t addr, uint8_t val, void *p);
static void tgui_ext_writew(uint32_t addr, uint16_t val, void *p);
static void tgui_ext_writel(uint32_t addr, uint32_t val, void *p);
static uint8_t tgui_ext_read(uint32_t addr, void *priv);
static void tgui_ext_write(uint32_t addr, uint8_t val, void *priv);
static void tgui_ext_writew(uint32_t addr, uint16_t val, void *priv);
static void tgui_ext_writel(uint32_t addr, uint32_t val, void *priv);
/*Remap address for chain-4/doubleword style layout*/
static __inline uint32_t
@@ -289,9 +289,9 @@ tgui_set_io(tgui_t *tgui)
}
static void
tgui_out(uint16_t addr, uint8_t val, void *p)
tgui_out(uint16_t addr, uint8_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
uint8_t old;
@@ -531,9 +531,9 @@ tgui_out(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
tgui_in(uint16_t addr, void *p)
tgui_in(uint16_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
uint8_t temp;
@@ -624,7 +624,7 @@ tgui_in(uint16_t addr, void *p)
void
tgui_recalctimings(svga_t *svga)
{
tgui_t *tgui = (tgui_t *) svga->p;
tgui_t *tgui = (tgui_t *) svga->priv;
uint8_t ger22lower = tgui->accel.ger22 & 0xff;
uint8_t ger22upper = (tgui->accel.ger22 >> 8);
@@ -927,9 +927,9 @@ tgui_hwcursor_draw(svga_t *svga, int displine)
}
uint8_t
tgui_pci_read(int func, int addr, void *p)
tgui_pci_read(int func, int addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
switch (addr) {
case 0x00:
@@ -994,9 +994,9 @@ tgui_pci_read(int func, int addr, void *p)
}
void
tgui_pci_write(int func, int addr, uint8_t val, void *p)
tgui_pci_write(int func, int addr, uint8_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
switch (addr) {
@@ -1064,10 +1064,10 @@ tgui_pci_write(int func, int addr, uint8_t val, void *p)
}
static uint8_t
tgui_ext_linear_read(uint32_t addr, void *p)
tgui_ext_linear_read(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
cycles -= video_timing_read_b;
@@ -1087,9 +1087,9 @@ tgui_ext_linear_read(uint32_t addr, void *p)
}
static uint8_t
tgui_ext_read(uint32_t addr, void *p)
tgui_ext_read(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
addr = (addr & svga->banked_mask) + svga->read_bank;
@@ -1097,10 +1097,10 @@ tgui_ext_read(uint32_t addr, void *p)
}
static void
tgui_ext_linear_write(uint32_t addr, uint8_t val, void *p)
tgui_ext_linear_write(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
int c;
uint8_t fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
uint8_t bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
@@ -1171,10 +1171,10 @@ tgui_ext_linear_write(uint32_t addr, uint8_t val, void *p)
}
static void
tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *p)
tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
int c;
uint8_t fg[2] = { tgui->ext_gdc_regs[4], tgui->ext_gdc_regs[5] };
uint8_t bg[2] = { tgui->ext_gdc_regs[1], tgui->ext_gdc_regs[2] };
@@ -1247,33 +1247,33 @@ tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *p)
}
static void
tgui_ext_linear_writel(uint32_t addr, uint32_t val, void *p)
tgui_ext_linear_writel(uint32_t addr, uint32_t val, void *priv)
{
tgui_ext_linear_writew(addr, val, p);
tgui_ext_linear_writew(addr, val, priv);
}
static void
tgui_ext_write(uint32_t addr, uint8_t val, void *p)
tgui_ext_write(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
addr = (addr & svga->banked_mask) + svga->read_bank;
tgui_ext_linear_write(addr, val, svga);
}
static void
tgui_ext_writew(uint32_t addr, uint16_t val, void *p)
tgui_ext_writew(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
addr = (addr & svga->banked_mask) + svga->read_bank;
tgui_ext_linear_writew(addr, val, svga);
}
static void
tgui_ext_writel(uint32_t addr, uint32_t val, void *p)
tgui_ext_writel(uint32_t addr, uint32_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
addr = (addr & svga->banked_mask) + svga->read_bank;
@@ -1995,9 +1995,9 @@ tgui_accel_command(int count, uint32_t cpu_dat, tgui_t *tgui)
}
static void
tgui_accel_out(uint16_t addr, uint8_t val, void *p)
tgui_accel_out(uint16_t addr, uint8_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
switch (addr) {
case 0x2122:
@@ -2339,17 +2339,17 @@ tgui_accel_out(uint16_t addr, uint8_t val, void *p)
}
static void
tgui_accel_out_w(uint16_t addr, uint16_t val, void *p)
tgui_accel_out_w(uint16_t addr, uint16_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
tgui_accel_out(addr, val, tgui);
tgui_accel_out(addr + 1, val >> 8, tgui);
}
static void
tgui_accel_out_l(uint16_t addr, uint32_t val, void *p)
tgui_accel_out_l(uint16_t addr, uint32_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
switch (addr) {
case 0x2124: /*Long version of Command and ROP together*/
@@ -2369,9 +2369,9 @@ tgui_accel_out_l(uint16_t addr, uint32_t val, void *p)
}
static uint8_t
tgui_accel_in(uint16_t addr, void *p)
tgui_accel_in(uint16_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
switch (addr) {
case 0x2120: /*Status*/
@@ -2622,23 +2622,23 @@ tgui_accel_in(uint16_t addr, void *p)
}
static uint16_t
tgui_accel_in_w(uint16_t addr, void *p)
tgui_accel_in_w(uint16_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
return tgui_accel_in(addr, tgui) | (tgui_accel_in(addr + 1, tgui) << 8);
}
static uint32_t
tgui_accel_in_l(uint16_t addr, void *p)
tgui_accel_in_l(uint16_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
return tgui_accel_in_w(addr, tgui) | (tgui_accel_in_w(addr + 2, tgui) << 16);
}
static void
tgui_accel_write(uint32_t addr, uint8_t val, void *p)
tgui_accel_write(uint32_t addr, uint8_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
if ((svga->crtc[0x36] & 0x03) == 0x02) {
@@ -2989,18 +2989,18 @@ tgui_accel_write(uint32_t addr, uint8_t val, void *p)
}
static void
tgui_accel_write_w(uint32_t addr, uint16_t val, void *p)
tgui_accel_write_w(uint32_t addr, uint16_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
tgui_accel_write(addr, val, tgui);
tgui_accel_write(addr + 1, val >> 8, tgui);
}
static void
tgui_accel_write_l(uint32_t addr, uint32_t val, void *p)
tgui_accel_write_l(uint32_t addr, uint32_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
switch (addr & 0xff) {
@@ -3026,9 +3026,9 @@ tgui_accel_write_l(uint32_t addr, uint32_t val, void *p)
}
static uint8_t
tgui_accel_read(uint32_t addr, void *p)
tgui_accel_read(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
if ((svga->crtc[0x36] & 0x03) == 0x02) {
@@ -3288,24 +3288,26 @@ tgui_accel_read(uint32_t addr, void *p)
}
static uint16_t
tgui_accel_read_w(uint32_t addr, void *p)
tgui_accel_read_w(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
return tgui_accel_read(addr, tgui) | (tgui_accel_read(addr + 1, tgui) << 8);
}
static uint32_t
tgui_accel_read_l(uint32_t addr, void *p)
tgui_accel_read_l(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
return tgui_accel_read_w(addr, tgui) | (tgui_accel_read_w(addr + 2, tgui) << 16);
}
static void
tgui_accel_write_fb_b(uint32_t addr, uint8_t val, void *p)
tgui_accel_write_fb_b(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
if (tgui->write_blitter) {
tgui_accel_command(8, val << 24, tgui);
@@ -3314,10 +3316,10 @@ tgui_accel_write_fb_b(uint32_t addr, uint8_t val, void *p)
}
static void
tgui_accel_write_fb_w(uint32_t addr, uint16_t val, void *p)
tgui_accel_write_fb_w(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
if (tgui->write_blitter)
tgui_accel_command(16, (((val & 0xff00) >> 8) | ((val & 0x00ff) << 8)) << 16, tgui);
@@ -3326,10 +3328,10 @@ tgui_accel_write_fb_w(uint32_t addr, uint16_t val, void *p)
}
static void
tgui_accel_write_fb_l(uint32_t addr, uint32_t val, void *p)
tgui_accel_write_fb_l(uint32_t addr, uint32_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
tgui_t *tgui = (tgui_t *) svga->p;
svga_t *svga = (svga_t *) priv;
tgui_t *tgui = (tgui_t *) svga->priv;
if (tgui->write_blitter)
tgui_accel_command(32, ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24), tgui);
@@ -3338,63 +3340,63 @@ tgui_accel_write_fb_l(uint32_t addr, uint32_t val, void *p)
}
static void
tgui_mmio_write(uint32_t addr, uint8_t val, void *p)
tgui_mmio_write(uint32_t addr, uint8_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
tgui_accel_out(addr, val, p);
tgui_accel_out(addr, val, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
tgui_accel_write(addr, val, p);
tgui_accel_write(addr, val, priv);
else
tgui_out(addr, val, p);
tgui_out(addr, val, priv);
}
static void
tgui_mmio_write_w(uint32_t addr, uint16_t val, void *p)
tgui_mmio_write_w(uint32_t addr, uint16_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
tgui_accel_out_w(addr, val, p);
tgui_accel_out_w(addr, val, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
tgui_accel_write_w(addr, val, p);
tgui_accel_write_w(addr, val, priv);
else {
tgui_out(addr, val & 0xff, p);
tgui_out(addr + 1, val >> 8, p);
tgui_out(addr, val & 0xff, priv);
tgui_out(addr + 1, val >> 8, priv);
}
}
static void
tgui_mmio_write_l(uint32_t addr, uint32_t val, void *p)
tgui_mmio_write_l(uint32_t addr, uint32_t val, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
tgui_accel_out_l(addr, val, p);
tgui_accel_out_l(addr, val, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
tgui_accel_write_l(addr, val, p);
tgui_accel_write_l(addr, val, priv);
else {
tgui_out(addr, val & 0xff, p);
tgui_out(addr + 1, val >> 8, p);
tgui_out(addr + 2, val >> 16, p);
tgui_out(addr + 3, val >> 24, p);
tgui_out(addr, val & 0xff, priv);
tgui_out(addr + 1, val >> 8, priv);
tgui_out(addr + 2, val >> 16, priv);
tgui_out(addr + 3, val >> 24, priv);
}
}
static uint8_t
tgui_mmio_read(uint32_t addr, void *p)
tgui_mmio_read(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
uint8_t ret = 0xff;
@@ -3402,49 +3404,49 @@ tgui_mmio_read(uint32_t addr, void *p)
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
ret = tgui_accel_in(addr, p);
ret = tgui_accel_in(addr, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
ret = tgui_accel_read(addr, p);
ret = tgui_accel_read(addr, priv);
else
ret = tgui_in(addr, p);
ret = tgui_in(addr, priv);
return ret;
}
static uint16_t
tgui_mmio_read_w(uint32_t addr, void *p)
tgui_mmio_read_w(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
uint16_t ret = 0xffff;
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
ret = tgui_accel_in_w(addr, p);
ret = tgui_accel_in_w(addr, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
ret = tgui_accel_read_w(addr, p);
ret = tgui_accel_read_w(addr, priv);
else
ret = tgui_in(addr, p) | (tgui_in(addr + 1, p) << 8);
ret = tgui_in(addr, priv) | (tgui_in(addr + 1, priv) << 8);
return ret;
}
static uint32_t
tgui_mmio_read_l(uint32_t addr, void *p)
tgui_mmio_read_l(uint32_t addr, void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_t *svga = &tgui->svga;
uint32_t ret = 0xffffffff;
addr &= 0x0000ffff;
if (((svga->crtc[0x36] & 0x03) == 0x00) && (addr >= 0x2100 && addr <= 0x21ff))
ret = tgui_accel_in_l(addr, p);
ret = tgui_accel_in_l(addr, priv);
else if (((svga->crtc[0x36] & 0x03) > 0x00) && (addr <= 0xff))
ret = tgui_accel_read_l(addr, p);
ret = tgui_accel_read_l(addr, priv);
else
ret = tgui_in(addr, p) | (tgui_in(addr + 1, p) << 8) | (tgui_in(addr + 2, p) << 16) | (tgui_in(addr + 3, p) << 24);
ret = tgui_in(addr, priv) | (tgui_in(addr + 1, priv) << 8) | (tgui_in(addr + 2, priv) << 16) | (tgui_in(addr + 3, priv) << 24);
return ret;
}
@@ -3556,9 +3558,9 @@ tgui96xx_available(void)
}
void
tgui_close(void *p)
tgui_close(void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_close(&tgui->svga);
@@ -3571,17 +3573,17 @@ tgui_close(void *p)
}
void
tgui_speed_changed(void *p)
tgui_speed_changed(void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
svga_recalctimings(&tgui->svga);
}
void
tgui_force_redraw(void *p)
tgui_force_redraw(void *priv)
{
tgui_t *tgui = (tgui_t *) p;
tgui_t *tgui = (tgui_t *) priv;
tgui->svga.fullchange = changeframecount;
}

22
src/video/vid_tvga.c
View File

@@ -74,9 +74,9 @@ static uint8_t crtc_mask[0x40] = {
static void tvga_recalcbanking(tvga_t *tvga);
void
tvga_out(uint16_t addr, uint8_t val, void *p)
tvga_out(uint16_t addr, uint8_t val, void *priv)
{
tvga_t *tvga = (tvga_t *) p;
tvga_t *tvga = (tvga_t *) priv;
svga_t *svga = &tvga->svga;
uint8_t old;
@@ -199,9 +199,9 @@ tvga_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
tvga_in(uint16_t addr, void *p)
tvga_in(uint16_t addr, void *priv)
{
tvga_t *tvga = (tvga_t *) p;
tvga_t *tvga = (tvga_t *) priv;
svga_t *svga = &tvga->svga;
if (((addr & 0xFFF0) == 0x3D0 || (addr & 0xFFF0) == 0x3B0) && !(svga->miscout & 1))
@@ -261,7 +261,7 @@ tvga_recalcbanking(tvga_t *tvga)
void
tvga_recalctimings(svga_t *svga)
{
tvga_t *tvga = (tvga_t *) svga->p;
tvga_t *tvga = (tvga_t *) svga->priv;
int clksel;
int high_res_256 = 0;
@@ -458,9 +458,9 @@ tvga9000b_nec_sv9000_available(void)
}
void
tvga_close(void *p)
tvga_close(void *priv)
{
tvga_t *tvga = (tvga_t *) p;
tvga_t *tvga = (tvga_t *) priv;
svga_close(&tvga->svga);
@@ -468,17 +468,17 @@ tvga_close(void *p)
}
void
tvga_speed_changed(void *p)
tvga_speed_changed(void *priv)
{
tvga_t *tvga = (tvga_t *) p;
tvga_t *tvga = (tvga_t *) priv;
svga_recalctimings(&tvga->svga);
}
void
tvga_force_redraw(void *p)
tvga_force_redraw(void *priv)
{
tvga_t *tvga = (tvga_t *) p;
tvga_t *tvga = (tvga_t *) priv;
tvga->svga.fullchange = changeframecount;
}

4
src/video/vid_tvp3026_ramdac.c
View File

@@ -550,9 +550,9 @@ tvp3026_hwcursor_draw(svga_t *svga, int displine)
}
float
tvp3026_getclock(int clock, void *p)
tvp3026_getclock(int clock, void *priv)
{
tvp3026_ramdac_t *ramdac = (tvp3026_ramdac_t *) p;
tvp3026_ramdac_t *ramdac = (tvp3026_ramdac_t *) priv;
int n;
int m;
int pl;

20
src/video/vid_vga.c
View File

@@ -35,9 +35,9 @@ static video_timings_t timing_ps1_svga_isa = { .type = VIDEO_ISA, .write_b = 6,
static video_timings_t timing_ps1_svga_mca = { .type = VIDEO_MCA, .write_b = 6, .write_w = 8, .write_l = 16, .read_b = 6, .read_w = 8, .read_l = 16 };
void
vga_out(uint16_t addr, uint8_t val, void *p)
vga_out(uint16_t addr, uint8_t val, void *priv)
{
vga_t *vga = (vga_t *) p;
vga_t *vga = (vga_t *) priv;
svga_t *svga = &vga->svga;
uint8_t old;
@@ -74,9 +74,9 @@ vga_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
vga_in(uint16_t addr, void *p)
vga_in(uint16_t addr, void *priv)
{
vga_t *vga = (vga_t *) p;
vga_t *vga = (vga_t *) priv;
svga_t *svga = &vga->svga;
uint8_t temp;
@@ -157,9 +157,9 @@ vga_available(void)
}
void
vga_close(void *p)
vga_close(void *priv)
{
vga_t *vga = (vga_t *) p;
vga_t *vga = (vga_t *) priv;
svga_close(&vga->svga);
@@ -167,17 +167,17 @@ vga_close(void *p)
}
void
vga_speed_changed(void *p)
vga_speed_changed(void *priv)
{
vga_t *vga = (vga_t *) p;
vga_t *vga = (vga_t *) priv;
svga_recalctimings(&vga->svga);
}
void
vga_force_redraw(void *p)
vga_force_redraw(void *priv)
{
vga_t *vga = (vga_t *) p;
vga_t *vga = (vga_t *) priv;
vga->svga.fullchange = changeframecount;
}

64
src/video/vid_voodoo.c
View File

@@ -149,9 +149,9 @@ voodoo_recalc(voodoo_t *voodoo)
}
static uint16_t
voodoo_readw(uint32_t addr, void *p)
voodoo_readw(uint32_t addr, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
addr &= 0xffffff;
@@ -184,9 +184,9 @@ voodoo_readw(uint32_t addr, void *p)
}
static uint32_t
voodoo_readl(uint32_t addr, void *p)
voodoo_readl(uint32_t addr, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
uint32_t temp = 0xffffffff;
int fifo_size;
voodoo->rd_count++;
@@ -394,9 +394,9 @@ voodoo_readl(uint32_t addr, void *p)
}
static void
voodoo_writew(uint32_t addr, uint16_t val, void *p)
voodoo_writew(uint32_t addr, uint16_t val, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
voodoo->wr_count++;
addr &= 0xffffff;
@@ -407,9 +407,9 @@ voodoo_writew(uint32_t addr, uint16_t val, void *p)
}
static void
voodoo_writel(uint32_t addr, uint32_t val, void *p)
voodoo_writel(uint32_t addr, uint32_t val, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
voodoo->wr_count++;
@@ -670,32 +670,32 @@ voodoo_writel(uint32_t addr, uint32_t val, void *p)
}
static uint16_t
voodoo_snoop_readw(uint32_t addr, void *p)
voodoo_snoop_readw(uint32_t addr, void *priv)
{
voodoo_set_t *set = (voodoo_set_t *) p;
voodoo_set_t *set = (voodoo_set_t *) priv;
return voodoo_readw(addr, set->voodoos[0]);
}
static uint32_t
voodoo_snoop_readl(uint32_t addr, void *p)
voodoo_snoop_readl(uint32_t addr, void *priv)
{
voodoo_set_t *set = (voodoo_set_t *) p;
voodoo_set_t *set = (voodoo_set_t *) priv;
return voodoo_readl(addr, set->voodoos[0]);
}
static void
voodoo_snoop_writew(uint32_t addr, uint16_t val, void *p)
voodoo_snoop_writew(uint32_t addr, uint16_t val, void *priv)
{
voodoo_set_t *set = (voodoo_set_t *) p;
voodoo_set_t *set = (voodoo_set_t *) priv;
voodoo_writew(addr, val, set->voodoos[0]);
voodoo_writew(addr, val, set->voodoos[1]);
}
static void
voodoo_snoop_writel(uint32_t addr, uint32_t val, void *p)
voodoo_snoop_writel(uint32_t addr, uint32_t val, void *priv)
{
voodoo_set_t *set = (voodoo_set_t *) p;
voodoo_set_t *set = (voodoo_set_t *) priv;
voodoo_writel(addr, val, set->voodoos[0]);
voodoo_writel(addr, val, set->voodoos[1]);
@@ -747,14 +747,16 @@ voodoo_recalcmapping(voodoo_set_t *set)
}
uint8_t
voodoo_pci_read(int func, int addr, void *p)
voodoo_pci_read(int func, int addr, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
if (func)
return 0;
// voodoo_log("Voodoo PCI read %08X PC=%08x\n", addr, cpu_state.pc);
#if 0
voodoo_log("Voodoo PCI read %08X PC=%08x\n", addr, cpu_state.pc);
#endif
switch (addr) {
case 0x00:
@@ -806,14 +808,16 @@ voodoo_pci_read(int func, int addr, void *p)
}
void
voodoo_pci_write(int func, int addr, uint8_t val, void *p)
voodoo_pci_write(int func, int addr, uint8_t val, void *priv)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
if (func)
return;
// voodoo_log("Voodoo PCI write %04X %02X PC=%08x\n", addr, val, cpu_state.pc);
#if 0
voodoo_log("Voodoo PCI write %04X %02X PC=%08x\n", addr, val, cpu_state.pc);
#endif
switch (addr) {
case 0x04:
@@ -844,9 +848,9 @@ voodoo_pci_write(int func, int addr, uint8_t val, void *p)
}
static void
voodoo_speed_changed(void *p)
voodoo_speed_changed(void *priv)
{
voodoo_set_t *voodoo_set = (voodoo_set_t *) p;
voodoo_set_t *voodoo_set = (voodoo_set_t *) priv;
voodoo_pixelclock_update(voodoo_set->voodoos[0]);
voodoo_set->voodoos[0]->read_time = pci_nonburst_time + pci_burst_time * ((voodoo_set->voodoos[0]->fbiInit4 & 1) ? 2 : 1);
@@ -858,13 +862,15 @@ voodoo_speed_changed(void *p)
voodoo_set->voodoos[1]->write_time = pci_nonburst_time + pci_burst_time * ((voodoo_set->voodoos[1]->fbiInit1 & 2) ? 1 : 0);
voodoo_set->voodoos[1]->burst_time = pci_burst_time * ((voodoo_set->voodoos[1]->fbiInit1 & 2) ? 2 : 1);
}
// voodoo_log("Voodoo read_time=%i write_time=%i burst_time=%i %08x %08x\n", voodoo->read_time, voodoo->write_time, voodoo->burst_time, voodoo->fbiInit1, voodoo->fbiInit4);
#if 0
voodoo_log("Voodoo read_time=%i write_time=%i burst_time=%i %08x %08x\n", voodoo->read_time, voodoo->write_time, voodoo->burst_time, voodoo->fbiInit1, voodoo->fbiInit4);
#endif
}
static void
voodoo_force_blit(void *p)
voodoo_force_blit(void *priv)
{
voodoo_set_t *voodoo_set = (voodoo_set_t *) p;
voodoo_set_t *voodoo_set = (voodoo_set_t *) priv;
thread_wait_mutex(voodoo_set->voodoos[0]->force_blit_mutex);
if (voodoo_set->voodoos[0]->can_blit) {
@@ -1261,9 +1267,9 @@ voodoo_card_close(voodoo_t *voodoo)
}
void
voodoo_close(void *p)
voodoo_close(void *priv)
{
voodoo_set_t *voodoo_set = (voodoo_set_t *) p;
voodoo_set_t *voodoo_set = (voodoo_set_t *) priv;
if (voodoo_set->nr_cards == 2)
voodoo_card_close(voodoo_set->voodoos[1]);

12
src/video/vid_voodoo_banshee.c
View File

@@ -315,7 +315,7 @@ banshee_update_irqs(banshee_t *banshee)
static void
banshee_vblank_start(svga_t *svga)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
if (banshee->vblank_irq >= 0) {
banshee->vblank_irq = 1;
banshee_update_irqs(banshee);
@@ -460,7 +460,7 @@ banshee_updatemapping(banshee_t *banshee)
static void
banshee_render_16bpp_tiled(svga_t *svga)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
uint32_t *p = &((uint32_t *) svga->monitor->target_buffer->line[svga->displine + svga->y_add])[svga->x_add];
uint32_t addr;
int drawn = 0;
@@ -500,7 +500,7 @@ banshee_render_16bpp_tiled(svga_t *svga)
static void
banshee_recalctimings(svga_t *svga)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
voodoo_t *voodoo = banshee->voodoo;
/*7 R/W Horizontal Retrace End bit 5. -
@@ -1981,7 +1981,7 @@ banshee_write_linear_l(uint32_t addr, uint32_t val, void *priv)
void
banshee_hwcursor_draw(svga_t *svga, int displine)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
int x;
int x_off;
int xx;
@@ -2329,7 +2329,7 @@ voodoo_generate_vb_filters(voodoo_t *voodoo, int fcr, int fcg)
static void
banshee_overlay_draw(svga_t *svga, int displine)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
voodoo_t *voodoo = banshee->voodoo;
uint32_t *p;
int x;
@@ -2581,7 +2581,7 @@ banshee_set_overlay_addr(void *priv, UNUSED(uint32_t addr))
static void
banshee_vsync_callback(svga_t *svga)
{
banshee_t *banshee = (banshee_t *) svga->p;
banshee_t *banshee = (banshee_t *) svga->priv;
voodoo_t *voodoo = banshee->voodoo;
voodoo->retrace_count++;

4
src/video/vid_voodoo_texture.c
View File

@@ -585,12 +585,12 @@ flush_texture_cache(voodoo_t *voodoo, uint32_t dirty_addr, int tmu)
}
void
voodoo_tex_writel(uint32_t addr, uint32_t val, void *p)
voodoo_tex_writel(uint32_t addr, uint32_t val, void *priv)
{
int lod;
int s;
int t;
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_t *voodoo = (voodoo_t *) priv;
int tmu;
if (addr & 0x400000)

32
src/video/vid_wy700.c
View File

@@ -216,16 +216,16 @@ static int cgacols[256][2][2];
static int mdacols[256][2][2];
void wy700_recalctimings(wy700_t *wy700);
void wy700_write(uint32_t addr, uint8_t val, void *p);
uint8_t wy700_read(uint32_t addr, void *p);
void wy700_write(uint32_t addr, uint8_t val, void *priv);
uint8_t wy700_read(uint32_t addr, void *priv);
void wy700_checkchanges(wy700_t *wy700);
static video_timings_t timing_wy700 = { .type = VIDEO_ISA, .write_b = 8, .write_w = 16, .write_l = 32, .read_b = 8, .read_w = 16, .read_l = 32 };
void
wy700_out(uint16_t addr, uint8_t val, void *p)
wy700_out(uint16_t addr, uint8_t val, void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
switch (addr) {
/* These three registers are only mapped in the 3Dx range,
* not the 3Bx range. */
@@ -287,9 +287,9 @@ wy700_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
wy700_in(uint16_t addr, void *p)
wy700_in(uint16_t addr, void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
switch (addr) {
case 0x3b0:
case 0x3b2:
@@ -456,9 +456,9 @@ wy700_checkchanges(wy700_t *wy700)
}
void
wy700_write(uint32_t addr, uint8_t val, void *p)
wy700_write(uint32_t addr, uint8_t val, void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
if (wy700->wy700_mode & 0x80) /* High-res mode. */
{
@@ -475,9 +475,9 @@ wy700_write(uint32_t addr, uint8_t val, void *p)
}
uint8_t
wy700_read(uint32_t addr, void *p)
wy700_read(uint32_t addr, void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
if (wy700->wy700_mode & 0x80) /* High-res mode. */
{
addr &= 0xFFFF;
@@ -745,9 +745,9 @@ wy700_hiresline(wy700_t *wy700)
}
void
wy700_poll(void *p)
wy700_poll(void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
int mode;
if (!wy700->linepos) {
@@ -959,18 +959,18 @@ wy700_init(const device_t *info)
}
void
wy700_close(void *p)
wy700_close(void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
free(wy700->vram);
free(wy700);
}
void
wy700_speed_changed(void *p)
wy700_speed_changed(void *priv)
{
wy700_t *wy700 = (wy700_t *) p;
wy700_t *wy700 = (wy700_t *) priv;
wy700_recalctimings(wy700);
}

182
src/video/vid_xga.c
View File

@@ -42,15 +42,15 @@
static video_timings_t timing_xga_isa = { .type = VIDEO_ISA, .write_b = 3, .write_w = 3, .write_l = 6, .read_b = 5, .read_w = 5, .read_l = 10 };
static video_timings_t timing_xga_mca = { .type = VIDEO_MCA, .write_b = 4, .write_w = 5, .write_l = 10, .read_b = 5, .read_w = 5, .read_l = 10 };
static void xga_ext_outb(uint16_t addr, uint8_t val, void *p);
static uint8_t xga_ext_inb(uint16_t addr, void *p);
static void xga_ext_outb(uint16_t addr, uint8_t val, void *priv);
static uint8_t xga_ext_inb(uint16_t addr, void *priv);
int xga_has_vga = 0;
void
svga_xga_out(uint16_t addr, uint8_t val, void *p)
svga_xga_out(uint16_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *)p;
svga_t *svga = (svga_t *) priv;
uint8_t old;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -86,9 +86,9 @@ svga_xga_out(uint16_t addr, uint8_t val, void *p)
}
uint8_t
svga_xga_in(uint16_t addr, void *p)
svga_xga_in(uint16_t addr, void *priv)
{
svga_t *svga = (svga_t *)p;
svga_t *svga = (svga_t *) priv;
uint8_t temp;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
@@ -451,9 +451,9 @@ xga_ext_out_reg(xga_t *xga, svga_t *svga, uint8_t idx, uint8_t val)
}
static void
xga_ext_outb(uint16_t addr, uint8_t val, void *p)
xga_ext_outb(uint16_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
//pclog("[%04X:%08X]: EXT OUTB = %02x, val = %02x\n", CS, cpu_state.pc, addr, val);
@@ -500,9 +500,9 @@ xga_ext_outb(uint16_t addr, uint8_t val, void *p)
}
static uint8_t
xga_ext_inb(uint16_t addr, void *p)
xga_ext_inb(uint16_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
uint8_t ret = 0xff;
uint8_t index;
@@ -2014,9 +2014,9 @@ exec_command:
}
static void
xga_memio_writeb(uint32_t addr, uint8_t val, void *p)
xga_memio_writeb(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
xga_mem_write(addr, val, xga, svga, 1);
@@ -2024,9 +2024,9 @@ xga_memio_writeb(uint32_t addr, uint8_t val, void *p)
}
static void
xga_memio_writew(uint32_t addr, uint16_t val, void *p)
xga_memio_writew(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
xga_mem_write(addr, val, xga, svga, 2);
@@ -2034,9 +2034,9 @@ xga_memio_writew(uint32_t addr, uint16_t val, void *p)
}
static void
xga_memio_writel(uint32_t addr, uint32_t val, void *p)
xga_memio_writel(uint32_t addr, uint32_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
xga_mem_write(addr, val, xga, svga, 4);
@@ -2125,9 +2125,9 @@ xga_mem_read(uint32_t addr, xga_t *xga, svga_t *svga)
}
static uint8_t
xga_memio_readb(uint32_t addr, void *p)
xga_memio_readb(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
uint8_t temp;
@@ -2138,9 +2138,9 @@ xga_memio_readb(uint32_t addr, void *p)
}
static uint16_t
xga_memio_readw(uint32_t addr, void *p)
xga_memio_readw(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
uint16_t temp;
@@ -2152,9 +2152,9 @@ xga_memio_readw(uint32_t addr, void *p)
}
static uint32_t
xga_memio_readl(uint32_t addr, void *p)
xga_memio_readl(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
uint32_t temp;
@@ -2326,9 +2326,9 @@ xga_render_16bpp(xga_t *xga, svga_t *svga)
}
static void
xga_write(uint32_t addr, uint8_t val, void *p)
xga_write(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on) {
@@ -2349,34 +2349,34 @@ xga_write(uint32_t addr, uint8_t val, void *p)
}
static void
xga_writeb(uint32_t addr, uint8_t val, void *p)
xga_writeb(uint32_t addr, uint8_t val, void *priv)
{
// pclog("[%04X:%08X]: WriteB\n", CS, cpu_state.pc);
xga_write(addr, val, p);
xga_write(addr, val, priv);
}
static void
xga_writew(uint32_t addr, uint16_t val, void *p)
xga_writew(uint32_t addr, uint16_t val, void *priv)
{
// pclog("[%04X:%08X]: WriteW\n", CS, cpu_state.pc);
xga_write(addr, val, p);
xga_write(addr + 1, val >> 8, p);
xga_write(addr, val, priv);
xga_write(addr + 1, val >> 8, priv);
}
static void
xga_writel(uint32_t addr, uint32_t val, void *p)
xga_writel(uint32_t addr, uint32_t val, void *priv)
{
// pclog("[%04X:%08X]: WriteL\n", CS, cpu_state.pc);
xga_write(addr, val, p);
xga_write(addr + 1, val >> 8, p);
xga_write(addr + 2, val >> 16, p);
xga_write(addr + 3, val >> 24, p);
xga_write(addr, val, priv);
xga_write(addr + 1, val >> 8, priv);
xga_write(addr + 2, val >> 16, priv);
xga_write(addr + 3, val >> 24, priv);
}
static void
xga_write_linear(uint32_t addr, uint8_t val, void *p)
xga_write_linear(uint32_t addr, uint8_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on) {
@@ -2396,9 +2396,9 @@ xga_write_linear(uint32_t addr, uint8_t val, void *p)
}
static void
xga_writew_linear(uint32_t addr, uint16_t val, void *p)
xga_writew_linear(uint32_t addr, uint16_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on) {
@@ -2408,33 +2408,33 @@ xga_writew_linear(uint32_t addr, uint16_t val, void *p)
if (xga->linear_endian_reverse) {
if (xga->accel.px_map_format[xga->accel.dst_map] == 0x0c) {
xga_write_linear(addr, val, p);
xga_write_linear(addr + 1, val >> 8, p);
xga_write_linear(addr, val, priv);
xga_write_linear(addr + 1, val >> 8, priv);
} else if (xga->accel.px_map_format[xga->accel.dst_map] == 4) {
xga_write_linear(addr + 1, val, p);
xga_write_linear(addr, val >> 8, p);
xga_write_linear(addr + 1, val, priv);
xga_write_linear(addr, val >> 8, priv);
} else {
xga_write_linear(addr, val, p);
xga_write_linear(addr + 1, val >> 8, p);
xga_write_linear(addr, val, priv);
xga_write_linear(addr + 1, val >> 8, priv);
}
} else {
if (xga->accel.px_map_format[xga->accel.dst_map] == 0x0c) {
xga_write_linear(addr + 1, val, p);
xga_write_linear(addr, val >> 8, p);
xga_write_linear(addr + 1, val, priv);
xga_write_linear(addr, val >> 8, priv);
} else if (xga->accel.px_map_format[xga->accel.dst_map] == 4) {
xga_write_linear(addr, val, p);
xga_write_linear(addr + 1, val >> 8, p);
xga_write_linear(addr, val, priv);
xga_write_linear(addr + 1, val >> 8, priv);
} else {
xga_write_linear(addr, val, p);
xga_write_linear(addr + 1, val >> 8, p);
xga_write_linear(addr, val, priv);
xga_write_linear(addr + 1, val >> 8, priv);
}
}
}
static void
xga_writel_linear(uint32_t addr, uint32_t val, void *p)
xga_writel_linear(uint32_t addr, uint32_t val, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on) {
@@ -2442,16 +2442,16 @@ xga_writel_linear(uint32_t addr, uint32_t val, void *p)
return;
}
xga_write_linear(addr, val, p);
xga_write_linear(addr + 1, val >> 8, p);
xga_write_linear(addr + 2, val >> 16, p);
xga_write_linear(addr + 3, val >> 24, p);
xga_write_linear(addr, val, priv);
xga_write_linear(addr + 1, val >> 8, priv);
xga_write_linear(addr + 2, val >> 16, priv);
xga_write_linear(addr + 3, val >> 24, priv);
}
static uint8_t
xga_read(uint32_t addr, void *p)
xga_read(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on)
@@ -2469,43 +2469,43 @@ xga_read(uint32_t addr, void *p)
}
static uint8_t
xga_readb(uint32_t addr, void *p)
xga_readb(uint32_t addr, void *priv)
{
uint8_t ret;
ret = xga_read(addr, p);
ret = xga_read(addr, priv);
return ret;
}
static uint16_t
xga_readw(uint32_t addr, void *p)
xga_readw(uint32_t addr, void *priv)
{
uint16_t ret;
ret = xga_read(addr, p);
ret |= (xga_read(addr + 1, p) << 8);
ret = xga_read(addr, priv);
ret |= (xga_read(addr + 1, priv) << 8);
return ret;
}
static uint32_t
xga_readl(uint32_t addr, void *p)
xga_readl(uint32_t addr, void *priv)
{
uint32_t ret;
ret = xga_read(addr, p);
ret |= (xga_read(addr + 1, p) << 8);
ret |= (xga_read(addr + 2, p) << 16);
ret |= (xga_read(addr + 3, p) << 24);
ret = xga_read(addr, priv);
ret |= (xga_read(addr + 1, priv) << 8);
ret |= (xga_read(addr + 2, priv) << 16);
ret |= (xga_read(addr + 3, priv) << 24);
return ret;
}
static uint8_t
xga_read_linear(uint32_t addr, void *p)
xga_read_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on)
@@ -2522,9 +2522,9 @@ xga_read_linear(uint32_t addr, void *p)
}
static uint16_t
xga_readw_linear(uint32_t addr, void *p)
xga_readw_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
uint16_t ret;
@@ -2533,32 +2533,32 @@ xga_readw_linear(uint32_t addr, void *p)
if (xga->linear_endian_reverse) {
if (xga->accel.px_map_format[xga->accel.src_map] == 0x0c) {
ret = xga_read_linear(addr, p) | (xga_read_linear(addr + 1, p) << 8);
ret = xga_read_linear(addr, priv) | (xga_read_linear(addr + 1, priv) << 8);
} else if (xga->accel.px_map_format[xga->accel.src_map] == 4) {
ret = xga_read_linear(addr + 1, p) | (xga_read_linear(addr, p) << 8);
ret = xga_read_linear(addr + 1, priv) | (xga_read_linear(addr, priv) << 8);
} else
ret = xga_read_linear(addr, p) | (xga_read_linear(addr + 1, p) << 8);
ret = xga_read_linear(addr, priv) | (xga_read_linear(addr + 1, priv) << 8);
} else {
if (xga->accel.px_map_format[xga->accel.src_map] == 0x0c) {
ret = xga_read_linear(addr + 1, p) | (xga_read_linear(addr, p) << 8);
ret = xga_read_linear(addr + 1, priv) | (xga_read_linear(addr, priv) << 8);
} else if (xga->accel.px_map_format[xga->accel.src_map] == 4) {
ret = xga_read_linear(addr, p) | (xga_read_linear(addr + 1, p) << 8);
ret = xga_read_linear(addr, priv) | (xga_read_linear(addr + 1, priv) << 8);
} else
ret = xga_read_linear(addr, p) | (xga_read_linear(addr + 1, p) << 8);
ret = xga_read_linear(addr, priv) | (xga_read_linear(addr + 1, priv) << 8);
}
return ret;
}
static uint32_t
xga_readl_linear(uint32_t addr, void *p)
xga_readl_linear(uint32_t addr, void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (!xga->on)
return svga_readl_linear(addr, svga);
return xga_read_linear(addr, p) | (xga_read_linear(addr + 1, p) << 8) | (xga_read_linear(addr + 2, p) << 16) | (xga_read_linear(addr + 3, p) << 24);
return xga_read_linear(addr, priv) | (xga_read_linear(addr + 1, priv) << 8) | (xga_read_linear(addr + 2, priv) << 16) | (xga_read_linear(addr + 3, priv) << 24);
}
static void
@@ -2793,9 +2793,9 @@ xga_mca_feedb(void *priv)
}
static void
xga_mca_reset(void *p)
xga_mca_reset(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
xga->on = 0;
@@ -2804,9 +2804,9 @@ xga_mca_reset(void *p)
}
static void
xga_reset(void *p)
xga_reset(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
mem_mapping_disable(&xga->bios_rom.mapping);
@@ -3090,9 +3090,9 @@ static void
}
static void
xga_close(void *p)
xga_close(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
xga_t *xga = &svga->xga;
if (svga) {
@@ -3114,17 +3114,17 @@ inmos_xga_available(void)
}
static void
xga_speed_changed(void *p)
xga_speed_changed(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
svga_recalctimings(svga);
}
static void
xga_force_redraw(void *p)
xga_force_redraw(void *priv)
{
svga_t *svga = (svga_t *) p;
svga_t *svga = (svga_t *) priv;
svga->fullchange = svga->monitor->mon_changeframecount;
}