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

Remove trailing whitespace + indentation consistency fixes

Browse Source
This commit is contained in:
Alexander Babikov
2022-04-12 15:58:57 +05:00
parent 818e0a843d
commit eba088c692
13 changed files with 379 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@@ -2421,12 +2421,12 @@ save_machine(void)
if (fpu_type == 0) if (fpu_type == 0)
config_delete_var(cat, "fpu_type"); config_delete_var(cat, "fpu_type");
else else
config_set_string(cat, "fpu_type", (char *) fpu_get_internal_name(cpu_f, cpu, fpu_type)); config_set_string(cat, "fpu_type", (char *) fpu_get_internal_name(cpu_f, cpu, fpu_type));
//Write the mem_size explicitly to the setttings in order to help managers to display it without having the actual machine table //Write the mem_size explicitly to the setttings in order to help managers to display it without having the actual machine table
config_delete_var(cat, "mem_size"); config_delete_var(cat, "mem_size");
config_set_int(cat, "mem_size", mem_size); config_set_int(cat, "mem_size", mem_size);
config_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec); config_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec);

150
src/video/vid_svga_render.c
View File

@@ -396,94 +396,94 @@ svga_render_2bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0) if ((svga->displine + svga->y_add) < 0)
return; return;
if (svga->force_old_addr) { if (svga->force_old_addr) {
changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12; changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) { if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine; svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine; svga->lastline_draw = svga->displine;
for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) { for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
addr = svga->ma; addr = svga->ma;
if (!(svga->crtc[0x17] & 0x40)) { if (!(svga->crtc[0x17] & 0x40)) {
addr = (addr << 1) & svga->vram_mask; addr = (addr << 1) & svga->vram_mask;
addr &= ~7; addr &= ~7;
if ((svga->crtc[0x17] & 0x20) && (svga->ma & 0x20000)) if ((svga->crtc[0x17] & 0x20) && (svga->ma & 0x20000))
addr |= 4; addr |= 4;
if (!(svga->crtc[0x17] & 0x20) && (svga->ma & 0x8000)) if (!(svga->crtc[0x17] & 0x20) && (svga->ma & 0x8000))
addr |= 4; addr |= 4;
}
if (!(svga->crtc[0x17] & 0x01))
addr = (addr & ~0x8000) | ((svga->sc & 1) ? 0x8000 : 0);
if (!(svga->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((svga->sc & 2) ? 0x10000 : 0);
dat[0] = svga->vram[addr];
dat[1] = svga->vram[addr | 0x1];
if (svga->seqregs[1] & 4)
svga->ma += 2;
else
svga->ma += 4;
svga->ma &= svga->vram_mask;
if (svga->crtc[0x17] & 0x80) {
p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3]];
p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
} }
if (!(svga->crtc[0x17] & 0x01))
addr = (addr & ~0x8000) | ((svga->sc & 1) ? 0x8000 : 0);
if (!(svga->crtc[0x17] & 0x02))
addr = (addr & ~0x10000) | ((svga->sc & 2) ? 0x10000 : 0);
dat[0] = svga->vram[addr];
dat[1] = svga->vram[addr | 0x1];
if (svga->seqregs[1] & 4)
svga->ma += 2;
else
svga->ma += 4;
svga->ma &= svga->vram_mask;
if (svga->crtc[0x17] & 0x80) {
p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3]];
p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
} else
memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16;
} }
} else { }
changed_addr = svga->remap_func(svga, svga->ma); } else {
changed_addr = svga->remap_func(svga, svga->ma);
if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) { if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
p = &buffer32->line[svga->displine + svga->y_add][svga->x_add]; p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
if (svga->firstline_draw == 2000) if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine; svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine; svga->lastline_draw = svga->displine;
for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) { for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
addr = svga->remap_func(svga, svga->ma); addr = svga->remap_func(svga, svga->ma);
dat[0] = svga->vram[addr]; dat[0] = svga->vram[addr];
dat[1] = svga->vram[addr | 0x1]; dat[1] = svga->vram[addr | 0x1];
if (svga->seqregs[1] & 4) if (svga->seqregs[1] & 4)
svga->ma += 2; svga->ma += 2;
else else
svga->ma += 4; svga->ma += 4;
svga->ma &= svga->vram_mask; svga->ma &= svga->vram_mask;
if (svga->crtc[0x17] & 0x80) { if (svga->crtc[0x17] & 0x80) {
p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]]; p[0] = p[1] = svga->pallook[svga->egapal[(dat[0] >> 6) & 3]];
p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]]; p[2] = p[3] = svga->pallook[svga->egapal[(dat[0] >> 4) & 3]];
p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]]; p[4] = p[5] = svga->pallook[svga->egapal[(dat[0] >> 2) & 3]];
p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3]]; p[6] = p[7] = svga->pallook[svga->egapal[dat[0] & 3]];
p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]]; p[8] = p[9] = svga->pallook[svga->egapal[(dat[1] >> 6) & 3]];
p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]]; p[10] = p[11] = svga->pallook[svga->egapal[(dat[1] >> 4) & 3]];
p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]]; p[12] = p[13] = svga->pallook[svga->egapal[(dat[1] >> 2) & 3]];
p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]]; p[14] = p[15] = svga->pallook[svga->egapal[dat[1] & 3]];
} else } else
memset(p, 0x00, 16 * sizeof(uint32_t)); memset(p, 0x00, 16 * sizeof(uint32_t));
p += 16; p += 16;
}
} }
}
} }
} }
@@ -500,7 +500,7 @@ svga_render_2bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0) if ((svga->displine + svga->y_add) < 0)
return; return;
if (svga->force_old_addr) { if (svga->force_old_addr) {
changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12; changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) { if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
@@ -551,7 +551,7 @@ svga_render_2bpp_highres(svga_t *svga)
p += 8; p += 8;
} }
} }
} else { } else {
changed_addr = svga->remap_func(svga, svga->ma); changed_addr = svga->remap_func(svga, svga->ma);
if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) { if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
@@ -588,7 +588,7 @@ svga_render_2bpp_highres(svga_t *svga)
p += 8; p += 8;
} }
} }
} }
} }