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

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