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

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