claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

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;
}