claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Even more sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-01 18:32:25 -04:00
parent ef2b84ed63
commit d1127e68fa
89 changed files with 2509 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/video/vid_nga.c
View File

@@ -50,9 +50,11 @@ static video_timings_t timing_nga = { .type = VIDEO_ISA, .write_b = 8, .write_w
void
nga_recalctimings(nga_t *nga)
{
double _dispontime, _dispofftime, disptime;
double _dispontime;
double _dispofftime;
double disptime;
if ((nga->cga.cgamode & 1)) {
if (nga->cga.cgamode & 1) {
disptime = nga->cga.crtc[0] + 1;
_dispontime = nga->cga.crtc[1];
} else {
@@ -136,7 +138,7 @@ nga_read(uint32_t addr, void *priv)
nga->cga.charbuffer[offset | 1] = nga->cga.vram[addr & 0x7fff];
}
return (ret);
return ret;
}
void
@@ -146,10 +148,15 @@ nga_poll(void *priv)
/* set cursor position in memory */
uint16_t ca = (nga->cga.crtc[15] | (nga->cga.crtc[14] << 8)) & 0x3fff;
int drawcursor;
int x, c, xs_temp, ys_temp;
int x;
int c;
int xs_temp;
int ys_temp;
int oldvc;
uint8_t chr, attr;
uint16_t dat, dat2;
uint8_t chr;
uint8_t attr;
uint16_t dat;
uint16_t dat2;
int cols[4];
int col;
int oldsc;
@@ -338,7 +345,7 @@ nga_poll(void *priv)
/* nga specific */
cols[0] = ((nga->cga.cgamode & 0x12) == 0x12) ? 0 : (nga->cga.cgacol & 15) + 16;
/* 80-col */
if ((nga->cga.cgamode & 1)) {
if (nga->cga.cgamode & 1) {
hline(buffer32, 0, (nga->cga.displine << 1), ((nga->cga.crtc[1] << 3) + 16) << 2, cols[0]);
hline(buffer32, 0, (nga->cga.displine << 1) + 1, ((nga->cga.crtc[1] << 3) + 16) << 2, cols[0]);
} else {
@@ -347,7 +354,7 @@ nga_poll(void *priv)
}
}
if ((nga->cga.cgamode & 1))
if (nga->cga.cgamode & 1)
/* set screen width */
x = (nga->cga.crtc[1] << 3) + 16;
else
@@ -444,7 +451,7 @@ nga_poll(void *priv)
nga->cga.vsynctime = 16;
/* vsync pos */
if (nga->cga.crtc[7]) {
if ((nga->cga.cgamode & 1))
if (nga->cga.cgamode & 1)
/* set screen width */
x = (nga->cga.crtc[1] << 3) + 16;
else
@@ -515,7 +522,7 @@ nga_poll(void *priv)
nga->cga.cgastat &= ~1;
/* enable cursor if its scanline was reached */
if ((nga->cga.sc == (nga->cga.crtc[10] & 31) || ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == ((nga->cga.crtc[10] & 31) >> 1))))
if (nga->cga.sc == (nga->cga.crtc[10] & 31) || ((nga->cga.crtc[8] & 3) == 3 && nga->cga.sc == ((nga->cga.crtc[10] & 31) >> 1)))
nga->cga.con = 1;
}
/* 80-columns */