diff --git a/src/codegen/CMakeLists.txt b/src/codegen/CMakeLists.txt
index c5f3eef3d..416b4792a 100644
--- a/src/codegen/CMakeLists.txt
+++ b/src/codegen/CMakeLists.txt
@@ -23,7 +23,7 @@ if(DYNAREC)
target_sources(dynarec PRIVATE codegen_x86-64.c
codegen_accumulate_x86-64.c)
else()
- message(SEND_ERROR
+ message(SEND_ERROR
"Dynarec is incompatible with target platform ${ARCH}")
endif()
diff --git a/src/codegen_new/CMakeLists.txt b/src/codegen_new/CMakeLists.txt
index e9f53f4a6..a96d0b57e 100644
--- a/src/codegen_new/CMakeLists.txt
+++ b/src/codegen_new/CMakeLists.txt
@@ -43,7 +43,7 @@ if(DYNAREC)
target_sources(dynarec PRIVATE codegen_backend_arm.c
codegen_backend_arm_ops.c codegen_backend_arm_uops.c)
else()
- message(SEND_ERROR
+ message(SEND_ERROR
"Dynarec is incompatible with target platform ${ARCH}")
endif()
diff --git a/src/config.c b/src/config.c
index 4dbbb4a21..27f0fb9ee 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2421,12 +2421,12 @@ save_machine(void)
if (fpu_type == 0)
config_delete_var(cat, "fpu_type");
- else
+ else
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
- config_delete_var(cat, "mem_size");
- config_set_int(cat, "mem_size", mem_size);
+ config_delete_var(cat, "mem_size");
+ config_set_int(cat, "mem_size", mem_size);
config_set_int(cat, "cpu_use_dynarec", cpu_use_dynarec);
diff --git a/src/include/86box/vid_svga.h b/src/include/86box/vid_svga.h
index 1502fba2d..5109207d0 100644
--- a/src/include/86box/vid_svga.h
+++ b/src/include/86box/vid_svga.h
@@ -158,7 +158,7 @@ typedef struct svga_t
/*Force CRTC to dword mode, regardless of CR14/CR17. Required for S3 enhanced mode*/
int force_dword_mode;
-
+
int force_old_addr;
int remap_required;
diff --git a/src/mem/rom.c b/src/mem/rom.c
index 2e9697801..5300e47a0 100644
--- a/src/mem/rom.c
+++ b/src/mem/rom.c
@@ -138,7 +138,7 @@ rom_getfile(char *fn, char *s, int size)
strncpy(s, fn, size);
return 1;
}
-
+
return 0;
}
}
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 91891087b..053cf691d 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -244,7 +244,7 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
install_qt5_plugin("Qt${QT_MAJOR}::QMacStylePlugin" QT_PLUGINS ${prefix})
install_qt5_plugin("Qt${QT_MAJOR}::QICOPlugin" QT_PLUGINS ${prefix})
install_qt5_plugin("Qt${QT_MAJOR}::QICNSPlugin" QT_PLUGINS ${prefix})
-
+
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
"[Paths]\nPlugins = PlugIns\n")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
diff --git a/src/qt/qt_softwarerenderer.cpp b/src/qt/qt_softwarerenderer.cpp
index a6cca1152..850e8369a 100644
--- a/src/qt/qt_softwarerenderer.cpp
+++ b/src/qt/qt_softwarerenderer.cpp
@@ -60,7 +60,7 @@ void SoftwareRenderer::onBlit(int buf_idx, int x, int y, int w, int h) {
cur_image = buf_idx;
buf_usage[(buf_idx + 1) % 2].clear();
-
+
source.setRect(x, y, w, h);
update();
}
diff --git a/src/unix/macOSXGlue.m b/src/unix/macOSXGlue.m
index d23c9abb8..b170dea5f 100644
--- a/src/unix/macOSXGlue.m
+++ b/src/unix/macOSXGlue.m
@@ -15,12 +15,12 @@ void getDefaultROMPath(char* Path)
inDomains:NSUserDomainMask];
NSURL* appSupportDir = nil;
NSURL* appDirectory = nil;
-
+
if ([possibleURLs count] >= 1) {
// Use the first directory (if multiple are returned)
appSupportDir = [possibleURLs objectAtIndex:0];
}
-
+
// If a valid app support directory exists, add the
// app's bundle ID to it to specify the final directory.
if (appSupportDir) {
@@ -29,7 +29,7 @@ void getDefaultROMPath(char* Path)
appDirectory=[appDirectory URLByAppendingPathComponent:@"roms"];
}
// create ~/Library/Application Support/... stuff
-
+
NSError* theError = nil;
if (![sharedFM createDirectoryAtURL:appDirectory withIntermediateDirectories:YES
attributes:nil error:&theError])
@@ -37,7 +37,7 @@ void getDefaultROMPath(char* Path)
// Handle the error.
NSLog(@"Error creating user library rom path");
} else NSLog(@"Create user rom path sucessfull");
-
+
strcpy(Path,[appDirectory fileSystemRepresentation]);
// return appDirectory;
}
diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c
index a69736d40..80c48b15f 100644
--- a/src/video/vid_et4000w32.c
+++ b/src/video/vid_et4000w32.c
@@ -120,7 +120,7 @@ typedef struct et4000w32p_t
uint32_t base[3];
uint8_t ctrl;
} mmu;
-
+
volatile int busy;
} et4000w32p_t;
@@ -176,7 +176,7 @@ et4000w32p_out(uint16_t addr, uint8_t val, void *p)
uint8_t old;
uint32_t add2addr = 0;
- if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+ if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
addr ^= 0x60;
switch (addr) {
@@ -318,12 +318,12 @@ et4000w32p_in(uint16_t addr, void *p)
et4000w32p_t *et4000 = (et4000w32p_t *)p;
svga_t *svga = &et4000->svga;
- if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+ if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
addr ^= 0x60;
switch (addr) {
case 0x3c5:
- if ((svga->seqaddr & 0xf) == 7)
+ if ((svga->seqaddr & 0xf) == 7)
return svga->seqregs[svga->seqaddr & 0xf] | 4;
break;
@@ -466,7 +466,7 @@ et4000w32p_recalctimings(svga_t *svga)
}
et4000->adjust_cursor = 0;
-
+
switch (svga->bpp) {
case 15: case 16:
svga->hdisp >>= 1;
@@ -501,10 +501,10 @@ et4000w32p_recalctimings(svga_t *svga)
}
switch (svga->gdcreg[5] & 0x60) {
- case 0x00:
+ case 0x00:
if (et4000->rev == 5)
svga->ma_latch++;
-
+
if (svga->seqregs[1] & 8) /* Low res (320) */
svga->render = svga_render_4bpp_lowres;
else
@@ -674,7 +674,7 @@ et4000w32p_accel_write_fifo(et4000w32p_t *et4000, uint32_t addr, uint8_t val)
et4000->acl.queued.dest_off = (et4000->acl.queued.dest_off & 0x00ff) | ((val & 0x0f) << 8);
break;
case 0x8e:
- if (et4000->type >= ET4000W32P_REVC)
+ if (et4000->type >= ET4000W32P_REVC)
et4000->acl.queued.pixel_depth = val & 0x30;
else
et4000->acl.queued.vbus = val & 0x03;
@@ -747,7 +747,7 @@ et4000w32p_accel_write_fifo(et4000w32p_t *et4000, uint32_t addr, uint8_t val)
}
}
break;
- case 0xa4:
+ case 0xa4:
et4000->acl.queued.mix_addr = (et4000->acl.queued.mix_addr & 0xFFFFFF00) | val;
break;
case 0xa5:
@@ -829,7 +829,7 @@ et4000w32p_accel_write_mmu(et4000w32p_t *et4000, uint32_t addr, uint8_t val, uin
et4000->acl.cpu_input_num = 0;
}
-
+
if ((et4000->acl.internal.ctrl_routing & 7) == 4) /*CPU data is X Count*/
et4000w32_blit(val | (et4000->acl.queued.count_x << 8), 0, 0, 0xffffffff, et4000);
if ((et4000->acl.internal.ctrl_routing & 7) == 5) /*CPU data is Y Count*/
@@ -863,7 +863,7 @@ et4000w32p_mmu_write(uint32_t addr, uint8_t val, void *p)
et4000w32p_accel_write_fifo(et4000, addr & 0x7fff, val);
} else {
switch (addr & 0xff) {
- case 0x00:
+ case 0x00:
et4000->mmu.base[0] = (et4000->mmu.base[0] & 0x3fff00) | val;
break;
case 0x01:
@@ -911,7 +911,7 @@ et4000w32p_mmu_read(uint32_t addr, void *p)
et4000w32p_t *et4000 = (et4000w32p_t *)p;
svga_t *svga = &et4000->svga;
uint8_t temp;
-
+
switch (addr & 0x6000) {
case 0x0000: /* MMU 0 */
case 0x2000: /* MMU 1 */
@@ -933,7 +933,7 @@ et4000w32p_mmu_read(uint32_t addr, void *p)
if ((addr & 0x1fff) + et4000->mmu.base[et4000->bank] >= svga->vram_max)
return 0xff;
-
+
return svga->vram[(addr & 0x1fff) + et4000->mmu.base[et4000->bank]];
case 0x6000:
@@ -1001,8 +1001,8 @@ et4000w32p_mmu_read(uint32_t addr, void *p)
return et4000->acl.internal.dest_off & 0xff;
case 0x8d:
return et4000->acl.internal.dest_off >> 8;
- case 0x8e:
- if (et4000->type >= ET4000W32P_REVC)
+ case 0x8e:
+ if (et4000->type >= ET4000W32P_REVC)
return et4000->acl.internal.pixel_depth;
else
return et4000->acl.internal.vbus;
@@ -1036,7 +1036,7 @@ et4000w32_blit_start(et4000w32p_t *et4000)
{
et4000->acl.x_count = et4000->acl.internal.count_x;
et4000->acl.y_count = et4000->acl.internal.count_y;
-
+
et4000->acl.pattern_addr = et4000->acl.internal.pattern_addr;
et4000->acl.source_addr = et4000->acl.internal.source_addr;
et4000->acl.dest_addr = et4000->acl.internal.dest_addr;
@@ -1098,9 +1098,9 @@ et4000w32p_blit_start(et4000w32p_t *et4000)
et4000->acl.internal.pos_x = et4000->acl.internal.pos_y = 0;
et4000->acl.pattern_x = et4000->acl.source_x = et4000->acl.pattern_y = et4000->acl.source_y = 0;
et4000->acl.status |= ACL_XYST;
-
+
et4000w32_log("ACL status XYST set\n");
- if ((!(et4000->acl.internal.ctrl_routing & 7) || (et4000->acl.internal.ctrl_routing & 4)) && !(et4000->acl.internal.ctrl_routing & 0x40))
+ if ((!(et4000->acl.internal.ctrl_routing & 7) || (et4000->acl.internal.ctrl_routing & 4)) && !(et4000->acl.internal.ctrl_routing & 0x40))
et4000->acl.status |= ACL_SSO;
if (et4000w32_wrap_x[et4000->acl.internal.pattern_wrap & 7]) {
@@ -1497,7 +1497,7 @@ et4000w32_blit(int count, int cpu_input, uint32_t src_dat, uint32_t mix_dat, et4
/*Write the data*/
svga->vram[et4000->acl.dest_addr & et4000->vram_mask] = out;
svga->changedvram[(et4000->acl.dest_addr & et4000->vram_mask) >> 12] = changeframecount;
-
+
if (et4000->acl.internal.xy_dir & 1) {
et4000->acl.dest_addr--;
et4000->acl.pattern_x--;
@@ -1515,7 +1515,7 @@ et4000w32_blit(int count, int cpu_input, uint32_t src_dat, uint32_t mix_dat, et4
if (et4000->acl.source_x >= (et4000w32_wrap_x[et4000->acl.internal.source_wrap & 7] + 1))
et4000->acl.source_x -= (et4000w32_wrap_x[et4000->acl.internal.source_wrap & 7] + 1);
}
-
+
et4000->acl.x_count--;
if (et4000->acl.x_count == 0xffff) {
et4000->acl.x_count = et4000->acl.internal.count_x;
@@ -1604,14 +1604,14 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
et4000w32_log("%06X %02X ", et4000->acl.mix_addr, svga->vram[(et4000->acl.mix_addr >> 3) & et4000->vram_mask]);
} else {
mixdat = mix & 1;
- mix >>= 1;
+ mix >>= 1;
mix |= 0x80000000;
}
et4000->acl.mix_addr++;
rop = mixdat ? et4000->acl.internal.rop_fg : et4000->acl.internal.rop_bg;
-
+
ROPMIX(rop, dest, pattern, source, out);
-
+
et4000w32_log("%06X = %02X\n", et4000->acl.dest_addr & et4000->vram_mask, out);
if (!(et4000->acl.internal.ctrl_routing & 0x40)) {
svga->vram[et4000->acl.dest_addr & et4000->vram_mask] = out;
@@ -1627,9 +1627,9 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
if (et4000->acl.internal.xy_dir & 1) et4000w32_decx(1, et4000);
else et4000w32_incx(1, et4000);
} else {
- if (et4000->acl.internal.xy_dir & 1)
+ if (et4000->acl.internal.xy_dir & 1)
et4000w32_incx((et4000->acl.internal.pixel_depth >> 4) & 3, et4000);
- else
+ else
et4000w32_decx((et4000->acl.internal.pixel_depth >> 4) & 3, et4000);
et4000->acl.pix_pos = 0;
@@ -1692,15 +1692,15 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
sdat >>= 8;
} else
source = svga->vram[(et4000->acl.source_addr + et4000->acl.source_x) & et4000->vram_mask];
-
+
dest = svga->vram[et4000->acl.dest_addr & et4000->vram_mask];
out = 0;
-
+
if ((et4000->acl.internal.ctrl_routing & 0xa) == 8) {
mixdat = svga->vram[(et4000->acl.mix_addr >> 3) & et4000->vram_mask] & (1 << (et4000->acl.mix_addr & 7));
} else {
mixdat = mix & 1;
- mix >>= 1;
+ mix >>= 1;
mix |= 0x80000000;
}
@@ -1708,7 +1708,7 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
ROPMIX(rop, dest, pattern, source, out);
- if (!(et4000->acl.internal.ctrl_routing & 0x40)) {
+ if (!(et4000->acl.internal.ctrl_routing & 0x40)) {
svga->vram[et4000->acl.dest_addr & et4000->vram_mask] = out;
svga->changedvram[(et4000->acl.dest_addr & et4000->vram_mask) >> 12] = changeframecount;
} else {
@@ -1720,7 +1720,7 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
et4000w32_decx(1, et4000);
else
et4000w32_incx(1, et4000);
-
+
et4000->acl.x_count--;
if (et4000->acl.x_count == 0xffff) {
if (et4000->acl.internal.xy_dir & 2) {
@@ -1748,7 +1748,7 @@ et4000w32p_blit(int count, uint32_t mix, uint32_t sdat, int cpu_input, et4000w32
return;
if (et4000->acl.internal.ctrl_routing & 0x40) {
- if (et4000->acl.cpu_dat_pos & 3)
+ if (et4000->acl.cpu_dat_pos & 3)
et4000->acl.cpu_dat_pos += 4 - (et4000->acl.cpu_dat_pos & 3);
return;
}
@@ -1770,7 +1770,7 @@ et4000w32p_hwcursor_draw(svga_t *svga, int displine)
int minus_width = 0;
uint8_t dat;
offset = svga->hwcursor_latch.xoff;
-
+
if (et4000->type == ET4000W32) {
switch (svga->bpp) {
case 8:
@@ -1916,12 +1916,12 @@ et4000w32p_pci_write(int func, int addr, uint8_t val, void *p)
et4000w32p_recalcmapping(et4000);
break;
- case 0x13:
- et4000->linearbase &= 0x00c00000;
+ case 0x13:
+ et4000->linearbase &= 0x00c00000;
et4000->linearbase |= (et4000->pci_regs[0x13] << 24);
svga->crtc[0x30] &= 3;
svga->crtc[0x30] |= ((et4000->linearbase & 0x3f000000) >> 22);
- et4000w32p_recalcmapping(et4000);
+ et4000w32p_recalcmapping(et4000);
break;
case 0x30: case 0x31: case 0x32: case 0x33:
@@ -1954,7 +1954,7 @@ et4000w32p_init(const device_t *info)
et4000->pci = (info->flags & DEVICE_PCI) ? 0x80 : 0x00;
et4000->vlb = (info->flags & DEVICE_VLB) ? 0x40 : 0x00;
-
+
/*The ET4000/W32i ISA BIOS seems to not support 2MB of VRAM*/
if ((info->local == ET4000W32) || ((info->local == ET4000W32I) && !(et4000->vlb)))
vram_size = 1;
@@ -1986,14 +1986,14 @@ et4000w32p_init(const device_t *info)
case ET4000W32:
/* ET4000/W32 */
et4000->rev = 0;
-
+
rom_init(&et4000->bios_rom, BIOS_ROM_PATH_W32, 0xc0000, 0x8000, 0x7fff, 0,
MEM_MAPPING_EXTERNAL);
et4000->svga.ramdac = device_add(&tseng_ics5301_ramdac_device);
et4000->svga.clock_gen = et4000->svga.ramdac;
et4000->svga.getclock = sdac_getclock;
- break;
+ break;
case ET4000W32I:
/* ET4000/W32i rev B */
@@ -2001,7 +2001,7 @@ et4000w32p_init(const device_t *info)
if (et4000->vlb) {
rom_init(&et4000->bios_rom, BIOS_ROM_PATH_W32I_VLB, 0xc0000, 0x8000, 0x7fff, 0,
- MEM_MAPPING_EXTERNAL);
+ MEM_MAPPING_EXTERNAL);
} else {
rom_init(&et4000->bios_rom, BIOS_ROM_PATH_W32I_ISA, 0xc0000, 0x8000, 0x7fff, 0,
MEM_MAPPING_EXTERNAL);
diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c
index 23184560d..ba86de08a 100644
--- a/src/video/vid_s3.c
+++ b/src/video/vid_s3.c
@@ -406,7 +406,7 @@ dword_remap(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4 || svga->force_old_addr)
return in_addr;
-
+
return ((in_addr << 2) & 0x3fff0) |
((in_addr >> 14) & 0xc) |
(in_addr & ~0x3fffc);
@@ -415,8 +415,8 @@ static __inline uint32_t
dword_remap_w(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4 || svga->force_old_addr)
- return in_addr;
-
+ return in_addr;
+
return ((in_addr << 2) & 0x1fff8) |
((in_addr >> 14) & 0x6) |
(in_addr & ~0x1fffe);
@@ -425,8 +425,8 @@ static __inline uint32_t
dword_remap_l(svga_t *svga, uint32_t in_addr)
{
if (svga->packed_chain4 || svga->force_old_addr)
- return in_addr;
-
+ return in_addr;
+
return ((in_addr << 2) & 0xfffc) |
((in_addr >> 14) & 0x3) |
(in_addr & ~0xffff);
@@ -3379,7 +3379,7 @@ s3_updatemapping(s3_t *s3)
} else {
if (s3->chip >= S3_TRIO64V)
svga->fb_only = 0;
-
+
mem_mapping_disable(&s3->linear_mapping);
}
diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c
index 0e9f5d66c..9aa5b0973 100644
--- a/src/video/vid_s3_virge.c
+++ b/src/video/vid_s3_virge.c
@@ -117,10 +117,10 @@ typedef struct s3d_t
{
uint32_t cmd_set;
int clip_l, clip_r, clip_t, clip_b;
-
+
uint32_t dest_base;
uint32_t dest_str;
-
+
uint32_t z_base;
uint32_t z_str;
@@ -136,14 +136,14 @@ typedef struct s3d_t
int32_t TdWdX, TdWdY;
uint32_t tws;
-
+
int32_t TdDdX, TdDdY;
uint32_t tds;
-
+
int16_t TdGdX, TdBdX, TdRdX, TdAdX;
int16_t TdGdY, TdBdY, TdRdY, TdAdY;
uint32_t tgs, tbs, trs, tas;
-
+
uint32_t TdXdY12;
uint32_t txend12;
uint32_t TdXdY01;
@@ -161,9 +161,9 @@ typedef struct virge_t
mem_mapping_t linear_mapping;
mem_mapping_t mmio_mapping;
mem_mapping_t new_mmio_mapping;
-
+
rom_t bios_rom;
-
+
svga_t svga;
uint8_t bank;
@@ -195,7 +195,7 @@ typedef struct virge_t
uint32_t hwc_fg_col, hwc_bg_col;
int hwc_col_stack_pos;
-
+
struct
{
uint32_t src_base;
@@ -212,21 +212,21 @@ typedef struct virge_t
int r_width, r_height;
int rsrc_x, rsrc_y;
int rdest_x, rdest_y;
-
+
int lxend0, lxend1;
int32_t ldx;
uint32_t lxstart, lystart;
int lycnt;
int line_dir;
-
+
int src_x, src_y;
int dest_x, dest_y;
int w, h;
uint8_t rop;
-
+
int data_left_count;
uint32_t data_left;
-
+
uint32_t pattern_8[8*8];
uint32_t pattern_16[8*8];
uint32_t pattern_24[8*8];
@@ -240,14 +240,14 @@ typedef struct virge_t
uint32_t pycnt;
uint32_t dest_l, dest_r;
} s3d;
-
+
s3d_t s3d_tri;
s3d_t s3d_buffer[RB_SIZE];
int s3d_read_idx, s3d_write_idx;
int s3d_busy;
int render_idx;
-
+
struct
{
uint32_t pri_ctrl;
@@ -273,9 +273,9 @@ typedef struct virge_t
uint32_t pri_size;
uint32_t sec_start;
uint32_t sec_size;
-
+
int sdif;
-
+
int pri_x, pri_y, pri_w, pri_h;
int sec_x, sec_y, sec_w, sec_h;
} streams;
@@ -285,7 +285,7 @@ typedef struct virge_t
uint32_t dma_ptr;
uint64_t blitter_time;
volatile int fifo_slot;
-
+
pc_timer_t tri_timer;
int virge_busy, local;
@@ -297,7 +297,7 @@ typedef struct virge_t
uint8_t serialport;
void *i2c, *ddc;
-
+
int waiting;
} virge_t;
@@ -324,29 +324,29 @@ enum
{
CMD_SET_AE = 1,
CMD_SET_HC = (1 << 1),
-
+
CMD_SET_FORMAT_MASK = (7 << 2),
CMD_SET_FORMAT_8 = (0 << 2),
CMD_SET_FORMAT_16 = (1 << 2),
CMD_SET_FORMAT_24 = (2 << 2),
-
+
CMD_SET_MS = (1 << 6),
CMD_SET_IDS = (1 << 7),
CMD_SET_MP = (1 << 8),
CMD_SET_TP = (1 << 9),
-
+
CMD_SET_ITA_MASK = (3 << 10),
CMD_SET_ITA_BYTE = (0 << 10),
CMD_SET_ITA_WORD = (1 << 10),
CMD_SET_ITA_DWORD = (2 << 10),
-
+
CMD_SET_ZUP = (1 << 23),
-
+
CMD_SET_ZB_MODE = (3 << 24),
CMD_SET_XP = (1 << 25),
CMD_SET_YP = (1 << 26),
-
+
CMD_SET_COMMAND_MASK = (15 << 27)
};
@@ -440,7 +440,7 @@ static void
render_thread(void *param)
{
virge_t *virge = (virge_t *)param;
-
+
while (virge->render_thread_run) {
thread_wait_event(virge->wake_render_thread, -1);
thread_reset_event(virge->wake_render_thread);
@@ -467,9 +467,9 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
uint8_t old;
uint32_t cursoraddr;
- if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+ if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
addr ^= 0x60;
-
+
switch (addr)
{
case 0x3c5:
@@ -495,7 +495,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
return;
}
break;
-
+
case 0x3d4:
svga->crtcreg = val;
return;
@@ -503,7 +503,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
if ((svga->crtcreg < 7) && (svga->crtc[0x11] & 0x80))
return;
if ((svga->crtcreg == 7) && (svga->crtc[0x11] & 0x80))
- val = (svga->crtc[7] & ~0x10) | (val & 0x10);
+ val = (svga->crtc[7] & ~0x10) | (val & 0x10);
if ((svga->crtcreg >= 0x20) && (svga->crtcreg < 0x40) &&
(svga->crtcreg != 0x36) && (svga->crtcreg != 0x38) &&
(svga->crtcreg != 0x39) && ((svga->crtc[0x38] & 0xcc) != 0x48))
@@ -516,10 +516,10 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
return;
old = svga->crtc[svga->crtcreg];
svga->crtc[svga->crtcreg] = val;
-
+
if (svga->crtcreg > 0x18)
s3_virge_log("OUTB VGA reg = %02x, val = %02x\n", svga->crtcreg, val);
-
+
switch (svga->crtcreg)
{
case 0x31:
@@ -528,11 +528,11 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
case 0x32:
s3_virge_update_irqs(virge);
break;
-
+
case 0x69:
virge->ma_ext = val & 0x1f;
break;
-
+
case 0x35:
virge->bank = (virge->bank & 0x70) | (val & 0xf);
if (svga->chain4)
@@ -555,12 +555,12 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
else
svga->write_bank = svga->read_bank = virge->bank << 14;
break;
-
+
case 0x3a:
if (val & 0x10)
svga->gdcreg[5] |= 0x40; /*Horrible cheat*/
break;
-
+
case 0x45:
svga->hwcursor.ena = val & 1;
break;
@@ -573,7 +573,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
cursoraddr = (virge->memory_size == 8) ? 0x1fff : 0x0fff;
svga->hwcursor.addr = ((((svga->crtc[0x4c] << 8) | svga->crtc[0x4d]) & cursoraddr) * 1024) + (svga->hwcursor.yoff * 16);
break;
-
+
case 0x4a:
switch (virge->hwc_col_stack_pos)
{
@@ -614,12 +614,12 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
svga->dpms = (svga->seqregs[0x0d] & 0x50) || (svga->crtc[0x56] & 0x06);
old = ~val; /* force recalc */
break;
-
+
case 0x5c:
if ((val & 0xa0) == 0x80)
i2c_gpio_set(virge->i2c, !!(val & 0x40), !!(val & 0x10));
break;
-
+
case 0x67:
switch (val >> 4)
{
@@ -630,7 +630,7 @@ static void s3_virge_out(uint16_t addr, uint8_t val, void *p)
default: svga->bpp = 8; break;
}
break;
-
+
case 0xaa:
i2c_gpio_set(virge->i2c, !!(val & SERIAL_PORT_SCW), !!(val & SERIAL_PORT_SDW));
break;
@@ -660,8 +660,8 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
virge_t *virge = (virge_t *)p;
svga_t *svga = &virge->svga;
uint8_t ret;
-
- if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
+
+ if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(svga->miscout & 1))
addr ^= 0x60;
switch (addr)
@@ -671,7 +671,7 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
ret = 0xff;
else
ret = svga_in(addr, svga);
- break;
+ break;
case 0x3c5:
if (svga->seqaddr >= 8)
@@ -690,7 +690,7 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
{
case 0x2d: ret = virge->virge_id_high; break; /*Extended chip ID*/
case 0x2e: ret = virge->virge_id_low; break; /*New chip ID*/
- case 0x2f: ret = virge->virge_rev; break;
+ case 0x2f: ret = virge->virge_rev; break;
case 0x30: ret = virge->virge_id; break; /*Chip ID*/
case 0x31: ret = (svga->crtc[0x31] & 0xcf) | ((virge->ma_ext & 3) << 4); break;
case 0x33: ret = (svga->crtc[0x33] | 0x04); break;
@@ -724,16 +724,16 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
} else
ret = svga->crtc[0xaa];
break;
-
+
default:
ret = svga->crtc[svga->crtcreg];
break;
}
break;
-
+
default:
ret = svga_in(addr, svga);
- break;
+ break;
}
return ret;
}
@@ -741,7 +741,7 @@ static uint8_t s3_virge_in(uint16_t addr, void *p)
static void s3_virge_recalctimings(svga_t *svga)
{
virge_t *virge = (virge_t *)svga->p;
-
+
svga->hdisp = svga->hdisp_old;
if (svga->crtc[0x5d] & 0x01) svga->htotal += 0x100;
@@ -759,36 +759,36 @@ static void s3_virge_recalctimings(svga_t *svga)
if (((svga->miscout >> 2) & 3) == 3) {
int n = svga->seqregs[0x12] & 0x1f;
int r = (svga->seqregs[0x12] >> 5);
-
- if (virge->chip == S3_VIRGEVX || virge->chip == S3_VIRGEDX)
+
+ if (virge->chip == S3_VIRGEVX || virge->chip == S3_VIRGEDX)
r &= 7;
else if (virge->chip >= S3_VIRGEGX2)
r &= 10;
else
r &= 3;
-
+
int m = svga->seqregs[0x13] & 0x7f;
double freq = (((double)m + 2) / (((double)n + 2) * (double)(1 << r))) * 14318184.0;
svga->clock = (cpuclock * (float)(1ull << 32)) / freq;
}
-
+
if ((svga->crtc[0x67] & 0xc) != 0xc) /*VGA mode*/
- {
+ {
svga->fb_only = 0;
svga->ma_latch |= (virge->ma_ext << 16);
if (svga->crtc[0x51] & 0x30) svga->rowoffset += (svga->crtc[0x51] & 0x30) << 4;
else if (svga->crtc[0x43] & 0x04) svga->rowoffset += 0x100;
if (!svga->rowoffset) svga->rowoffset = 256;
-
+
svga->lowres = !((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10));
if ((svga->gdcreg[5] & 0x40) && (svga->crtc[0x3a] & 0x10)) {
switch (svga->bpp) {
- case 8:
- svga->render = svga_render_8bpp_highres;
+ case 8:
+ svga->render = svga_render_8bpp_highres;
break;
- case 15:
+ case 15:
svga->render = svga_render_15bpp_highres;
if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2)
{
@@ -796,12 +796,12 @@ static void s3_virge_recalctimings(svga_t *svga)
svga->hdisp >>= 1;
}
break;
- case 16:
+ case 16:
svga->render = svga_render_16bpp_highres;
if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2)
{
svga->htotal >>= 1;
- svga->hdisp >>= 1;
+ svga->hdisp >>= 1;
}
break;
case 24:
@@ -809,7 +809,7 @@ static void s3_virge_recalctimings(svga_t *svga)
if (virge->chip != S3_VIRGEVX && virge->chip < S3_VIRGEGX2)
svga->rowoffset = (svga->rowoffset * 3) / 4; /*Hack*/
break;
- case 32:
+ case 32:
svga->render = svga_render_32bpp_highres;
break;
}
@@ -820,16 +820,16 @@ static void s3_virge_recalctimings(svga_t *svga)
else /*Streams mode*/
{
svga->fb_only = 1;
-
+
if (virge->streams.buffer_ctrl & 1)
svga->ma_latch = virge->streams.pri_fb1 >> 2;
else
svga->ma_latch = virge->streams.pri_fb0 >> 2;
-
+
svga->hdisp = virge->streams.pri_w + 1;
if (virge->streams.pri_h < svga->dispend)
svga->dispend = virge->streams.pri_h;
-
+
svga->overlay.x = virge->streams.sec_x - virge->streams.pri_x;
svga->overlay.y = virge->streams.sec_y - virge->streams.pri_y;
svga->overlay.ysize = virge->streams.sec_h;
@@ -846,21 +846,21 @@ static void s3_virge_recalctimings(svga_t *svga)
switch ((virge->streams.pri_ctrl >> 24) & 0x7)
{
case 0: /*RGB-8 (CLUT)*/
- svga->render = svga_render_8bpp_highres;
+ svga->render = svga_render_8bpp_highres;
break;
- case 3: /*KRGB-16 (1.5.5.5)*/
+ case 3: /*KRGB-16 (1.5.5.5)*/
svga->htotal >>= 1;
- svga->render = svga_render_15bpp_highres;
+ svga->render = svga_render_15bpp_highres;
break;
- case 5: /*RGB-16 (5.6.5)*/
+ case 5: /*RGB-16 (5.6.5)*/
svga->htotal >>= 1;
- svga->render = svga_render_16bpp_highres;
+ svga->render = svga_render_16bpp_highres;
break;
- case 6: /*RGB-24 (8.8.8)*/
- svga->render = svga_render_24bpp_highres;
+ case 6: /*RGB-24 (8.8.8)*/
+ svga->render = svga_render_24bpp_highres;
break;
case 7: /*XRGB-32 (X.8.8.8)*/
- svga->render = svga_render_32bpp_highres;
+ svga->render = svga_render_32bpp_highres;
break;
}
svga->vram_display_mask = virge->vram_mask;
@@ -880,7 +880,7 @@ static void s3_virge_updatemapping(virge_t *virge)
return;
}
- s3_virge_log("Update mapping - bank %02X ", svga->gdcreg[6] & 0xc);
+ s3_virge_log("Update mapping - bank %02X ", svga->gdcreg[6] & 0xc);
/*Banked framebuffer*/
switch (svga->gdcreg[6] & 0xc) { /*VGA mapping*/
case 0x0: /*128k at A0000*/
@@ -900,7 +900,7 @@ static void s3_virge_updatemapping(virge_t *virge)
svga->banked_mask = 0x7fff;
break;
}
-
+
virge->linear_base = (svga->crtc[0x5a] << 16) | (svga->crtc[0x59] << 24);
s3_virge_log("Linear framebuffer %02X, linear base = %08x, display mask = %08x\n", svga->crtc[0x58] & 0x17, virge->linear_base, svga->vram_display_mask);
@@ -936,7 +936,7 @@ static void s3_virge_updatemapping(virge_t *virge)
} else {
virge->linear_base &= 0xfc000000;
}
-
+
mem_mapping_set_addr(&virge->linear_mapping, virge->linear_base, virge->linear_size);
}
svga->fb_only = 1;
@@ -944,7 +944,7 @@ static void s3_virge_updatemapping(virge_t *virge)
mem_mapping_disable(&virge->linear_mapping);
svga->fb_only = 0;
}
-
+
s3_virge_log("Memory mapped IO %02X\n", svga->crtc[0x53] & 0x38);
/* Memory mapped I/O. */
@@ -984,8 +984,8 @@ s3_virge_mmio_fifo_write(uint32_t addr, uint8_t val, virge_t *virge)
case 0x859c:
virge->cmd_dma = val;
break;
- }
- }
+ }
+ }
}
static void
@@ -1004,7 +1004,7 @@ s3_virge_mmio_fifo_write_w(uint32_t addr, uint16_t val, virge_t *virge)
static void
s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
-{
+{
if ((addr & 0xfffc) < 0x8000) {
if (virge->s3d.cmd_set & CMD_SET_MS)
s3_virge_bitblt(virge, 32, ((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24));
@@ -1016,7 +1016,7 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
case 0x8590:
virge->cmd_dma_base = val;
break;
-
+
case 0x8594:
virge->dma_ptr = val;
break;
@@ -1027,7 +1027,7 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
case 0x859c:
virge->cmd_dma = val;
break;
-
+
case 0xa000: case 0xa004: case 0xa008: case 0xa00c:
case 0xa010: case 0xa014: case 0xa018: case 0xa01c:
case 0xa020: case 0xa024: case 0xa028: case 0xa02c:
@@ -1069,7 +1069,7 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
virge->s3d.pattern_8[y*8 + x + 1] = val >> 8;
virge->s3d.pattern_8[y*8 + x + 2] = val >> 16;
virge->s3d.pattern_8[y*8 + x + 3] = val >> 24;
-
+
x = (addr >> 1) & 6;
y = (addr >> 4) & 7;
virge->s3d.pattern_16[y*8 + x] = val & 0xffff;
@@ -1195,7 +1195,7 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
if (virge->s3d.cmd_set & CMD_SET_AE)
s3_virge_bitblt(virge, -1, 0);
break;
-
+
case 0xb0f4: case 0xb4f4:
virge->s3d_tri.fog_b = val & 0xff;
virge->s3d_tri.fog_g = (val >> 8) & 0xff;
@@ -1299,7 +1299,7 @@ s3_virge_mmio_fifo_write_l(uint32_t addr, uint32_t val, virge_t *virge)
virge->s3d_tri.tas = (val >> 16) & 0xffff;
virge->s3d_tri.trs = val & 0xffff;
break;
-
+
case 0xb554:
virge->s3d_tri.TdZdX = val;
break;
@@ -1362,7 +1362,7 @@ s3_virge_mmio_read(uint32_t addr, void *p)
if (virge->fifo_slot)
virge->fifo_slot--;
return ret;
-
+
case 0x83b0: case 0x83b1: case 0x83b2: case 0x83b3:
case 0x83b4: case 0x83b5: case 0x83b6: case 0x83b7:
case 0x83b8: case 0x83b9: case 0x83ba: case 0x83bb:
@@ -1376,10 +1376,10 @@ s3_virge_mmio_read(uint32_t addr, void *p)
case 0x83d8: case 0x83d9: case 0x83da: case 0x83db:
case 0x83dc: case 0x83dd: case 0x83de: case 0x83df:
return s3_virge_in(addr & 0x3ff, virge);
-
+
case 0x859c:
return virge->cmd_dma;
-
+
case 0xff20: case 0xff21:
ret = virge->serialport & ~(SERIAL_PORT_SCR | SERIAL_PORT_SDR);
if ((virge->serialport & SERIAL_PORT_SCW) && i2c_gpio_get_scl(virge->i2c))
@@ -1395,9 +1395,9 @@ s3_virge_mmio_read_w(uint32_t addr, void *p)
{
virge_t *virge = (virge_t *)p;
uint16_t ret = 0xffff;
-
+
s3_virge_log("[%04X:%08X]: MMIO ReadW addr = %04x\n", CS, cpu_state.pc, addr & 0xfffe);
-
+
switch (addr & 0xfffe) {
case 0x8504:
if (!virge->fifo_slot)
@@ -1408,10 +1408,10 @@ s3_virge_mmio_read_w(uint32_t addr, void *p)
ret |= 0x30; /*A bit of a workaround at the moment.*/
s3_virge_update_irqs(virge);
return ret;
-
+
case 0x859c:
return virge->cmd_dma;
-
+
default:
return s3_virge_mmio_read(addr, virge) |
(s3_virge_mmio_read(addr + 1, virge) << 8);
@@ -1494,7 +1494,7 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
break;
case 0x81fc:
ret = virge->streams.sec_size;
- break;
+ break;
case 0x8504:
if (virge->s3d_busy || virge->fifo_slot) {
@@ -1511,7 +1511,7 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
virge->fifo_slot--;
s3_virge_update_irqs(virge);
break;
-
+
case 0x8590:
ret = virge->cmd_dma_base;
break;
@@ -1523,7 +1523,7 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
case 0x859c:
ret = virge->cmd_dma;
break;
-
+
case 0xa4d4:
ret = virge->s3d.src_base;
break;
@@ -1569,11 +1569,11 @@ s3_virge_mmio_read_l(uint32_t addr, void *p)
case 0xa50c:
ret = (virge->s3d.rdest_x << 16) | virge->s3d.rdest_y;
break;
-
+
default:
ret = s3_virge_mmio_read(addr, virge) |
(s3_virge_mmio_read(addr + 1, virge) << 8) |
- (s3_virge_mmio_read(addr + 2, virge) << 16) |
+ (s3_virge_mmio_read(addr + 2, virge) << 16) |
(s3_virge_mmio_read(addr + 3, virge) << 24);
break;
}
@@ -1627,7 +1627,7 @@ s3_virge_mmio_write_w(uint32_t addr, uint16_t val, void *p)
if ((addr & 0xfffe) == 0x83d4) {
s3_virge_mmio_write(addr, val, virge);
s3_virge_mmio_write(addr + 1, val >> 8, virge);
- }
+ }
}
}
@@ -1635,12 +1635,12 @@ static void
s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p)
{
virge_t *virge = (virge_t *)p;
- svga_t *svga = &virge->svga;
-
+ svga_t *svga = &virge->svga;
+
s3_virge_log("[%04X:%08X]: MMIO WriteL addr = %04x, val = %04x\n", CS, cpu_state.pc, addr & 0xfffc, val);
if (((addr & 0xfffc) >= 0x8590) || ((addr & 0xfffc) < 0x8000))
if ((addr & 0xfffc) == 0xff20)
- s3_virge_mmio_write(addr, val, virge);
+ s3_virge_mmio_write(addr, val, virge);
else {
s3_virge_mmio_fifo_write_l(addr, val, virge);
}
@@ -1735,38 +1735,38 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p)
case 0x81f0:
virge->streams.pri_start = val;
virge->streams.pri_x = (val >> 16) & 0x7ff;
- virge->streams.pri_y = val & 0x7ff;
+ virge->streams.pri_y = val & 0x7ff;
svga_recalctimings(svga);
svga->fullchange = changeframecount;
break;
case 0x81f4:
virge->streams.pri_size = val;
virge->streams.pri_w = (val >> 16) & 0x7ff;
- virge->streams.pri_h = val & 0x7ff;
+ virge->streams.pri_h = val & 0x7ff;
svga_recalctimings(svga);
svga->fullchange = changeframecount;
break;
case 0x81f8:
virge->streams.sec_start = val;
virge->streams.sec_x = (val >> 16) & 0x7ff;
- virge->streams.sec_y = val & 0x7ff;
+ virge->streams.sec_y = val & 0x7ff;
svga_recalctimings(svga);
svga->fullchange = changeframecount;
break;
case 0x81fc:
virge->streams.sec_size = val;
virge->streams.sec_w = (val >> 16) & 0x7ff;
- virge->streams.sec_h = val & 0x7ff;
+ virge->streams.sec_h = val & 0x7ff;
svga_recalctimings(svga);
svga->fullchange = changeframecount;
break;
-
+
case 0x8504:
virge->subsys_stat &= ~(val & 0xff);
virge->subsys_cntl = (val >> 8);
s3_virge_update_irqs(virge);
break;
-
+
case 0x850c:
virge->advfunc_cntl = val & 0xff;
s3_virge_updatemapping(virge);
@@ -1810,7 +1810,7 @@ s3_virge_mmio_write_l(uint32_t addr, uint32_t val, void *p)
y > s3d_tri->clip_b)) \
update = 0; \
}
-
+
#define MIX() \
{ \
@@ -1862,7 +1862,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
uint32_t source = 0, dest = 0, pattern;
uint32_t out = 0;
int update;
-
+
switch (virge->s3d.cmd_set & CMD_SET_FORMAT_MASK)
{
case CMD_SET_FORMAT_8:
@@ -1893,7 +1893,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
}
if (virge->s3d.cmd_set & CMD_SET_MP)
pattern_data = mono_pattern;
-
+
switch (virge->s3d.cmd_set & CMD_SET_ITA_MASK)
{
case CMD_SET_ITA_BYTE:
@@ -1938,7 +1938,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
virge->s3d.h = virge->s3d.r_height;
virge->s3d.rop = (virge->s3d.cmd_set >> 17) & 0xff;
virge->s3d.data_left_count = 0;
-
+
s3_virge_log("BitBlt start src_x=%i,src_y=%i,dest_x=%i,dest_y=%i,w=%i,h=%i,rop=%02X,src_base=%x,dest_base=%x\n",
virge->s3d.src_x,
virge->s3d.src_y,
@@ -1949,7 +1949,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
virge->s3d.rop,
virge->s3d.src_base,
virge->s3d.dest_base);
-
+
if (virge->s3d.cmd_set & CMD_SET_IDS)
return;
}
@@ -2020,7 +2020,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
WRITE(dest_addr, out);
}
-
+
virge->s3d.src_x += x_inc;
virge->s3d.src_x &= 0x7ff;
virge->s3d.dest_x += x_inc;
@@ -2034,7 +2034,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
virge->s3d.src_y += y_inc;
virge->s3d.dest_y += y_inc;
virge->s3d.h--;
-
+
switch (virge->s3d.cmd_set & (CMD_SET_MS | CMD_SET_IDS))
{
case CMD_SET_IDS:
@@ -2054,10 +2054,10 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
}
}
else
- virge->s3d.w--;
+ virge->s3d.w--;
}
break;
-
+
case CMD_SET_COMMAND_RECTFILL:
/*No source, pattern = pat_fg_clr*/
if (count == -1)
@@ -2069,7 +2069,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
virge->s3d.w = virge->s3d.r_width;
virge->s3d.h = virge->s3d.r_height;
virge->s3d.rop = (virge->s3d.cmd_set >> 17) & 0xff;
-
+
s3_virge_log("RctFll start %i,%i %i,%i %02X %08x\n", virge->s3d.dest_x,
virge->s3d.dest_y,
virge->s3d.w,
@@ -2115,11 +2115,11 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
}
}
else
- virge->s3d.w--;
+ virge->s3d.w--;
count--;
}
break;
-
+
case CMD_SET_COMMAND_LINE:
if (count == -1)
{
@@ -2133,7 +2133,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
int x;
int new_x;
int first_pixel = 1;
-
+
x = virge->s3d.dest_x >> 20;
if (virge->s3d.h == virge->s3d.lycnt &&
@@ -2146,11 +2146,11 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
else
new_x = (virge->s3d.dest_x + virge->s3d.ldx) >> 20;
-
+
if ((virge->s3d.line_dir && x > new_x) ||
(!virge->s3d.line_dir && x < new_x))
goto skip_line;
-
+
do
{
uint32_t dest_addr = virge->s3d.dest_base + (x * x_mul) + (virge->s3d.dest_y * virge->s3d.dest_str);
@@ -2179,7 +2179,7 @@ static void s3_virge_bitblt(virge_t *virge, int count, uint32_t cpu_dat)
WRITE(dest_addr, out);
}
-
+
if (x < new_x)
x++;
else if (x > new_x)
@@ -2225,7 +2225,7 @@ skip_line:
WRITE(dest_addr, out);
}
-
+
x = (x + xdir) & 0x7ff;
}
while (x != (xend + xdir));
@@ -2274,21 +2274,21 @@ typedef struct s3d_state_t
int32_t r, g, b, a, u, v, d, w;
int32_t base_r, base_g, base_b, base_a, base_u, base_v, base_d, base_w;
-
+
uint32_t base_z;
uint32_t tbu, tbv;
uint32_t cmd_set;
int max_d;
-
+
uint16_t *texture[10];
-
+
uint32_t tex_bdr_clr;
-
+
int32_t x1, x2;
int y;
-
+
rgba_t dest_rgba;
} s3d_state_t;
@@ -2296,7 +2296,7 @@ typedef struct s3d_texture_state_t
{
int level;
int texture_shift;
-
+
int32_t u, v;
} s3d_texture_state_t;
@@ -2392,7 +2392,7 @@ static void tex_ARGB8888_nowrap(s3d_state_t *state, s3d_texture_state_t *texture
static void tex_sample_normal(s3d_state_t *state)
{
s3d_texture_state_t texture_state;
-
+
texture_state.level = state->max_d;
texture_state.texture_shift = 18 + (9 - texture_state.level);
texture_state.u = state->u + state->tbu;
@@ -2430,12 +2430,12 @@ static void tex_sample_normal_filter(s3d_state_t *state)
texture_state.u = state->u + state->tbu + tex_offset;
texture_state.v = state->v + state->tbv + tex_offset;
tex_read(state, &texture_state, &tex_samples[3]);
-
+
d[0] = (256 - du) * (256 - dv);
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2469,7 +2469,7 @@ static void tex_sample_mipmap_filter(s3d_state_t *state)
texture_state.level = 0;
texture_state.texture_shift = 18 + (9 - texture_state.level);
tex_offset = 1 << texture_state.texture_shift;
-
+
texture_state.u = state->u + state->tbu;
texture_state.v = state->v + state->tbv;
tex_read(state, &texture_state, &tex_samples[0]);
@@ -2492,7 +2492,7 @@ static void tex_sample_mipmap_filter(s3d_state_t *state)
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2506,9 +2506,9 @@ static void tex_sample_persp_normal(s3d_state_t *state)
if (state->w)
w = (int32_t)(((1ULL << 27) << 19) / (int64_t)state->w);
-
+
texture_state.level = state->max_d;
- texture_state.texture_shift = 18 + (9 - texture_state.level);
+ texture_state.texture_shift = 18 + (9 - texture_state.level);
texture_state.u = (int32_t)(((int64_t)state->u * (int64_t)w) >> (12 + state->max_d)) + state->tbu;
texture_state.v = (int32_t)(((int64_t)state->v * (int64_t)w) >> (12 + state->max_d)) + state->tbv;
@@ -2533,7 +2533,7 @@ static void tex_sample_persp_normal_filter(s3d_state_t *state)
texture_state.level = state->max_d;
texture_state.texture_shift = 18 + (9 - texture_state.level);
tex_offset = 1 << texture_state.texture_shift;
-
+
texture_state.u = u;
texture_state.v = v;
tex_read(state, &texture_state, &tex_samples[0]);
@@ -2556,7 +2556,7 @@ static void tex_sample_persp_normal_filter(s3d_state_t *state)
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2570,9 +2570,9 @@ static void tex_sample_persp_normal_375(s3d_state_t *state)
if (state->w)
w = (int32_t)(((1ULL << 27) << 19) / (int64_t)state->w);
-
+
texture_state.level = state->max_d;
- texture_state.texture_shift = 18 + (9 - texture_state.level);
+ texture_state.texture_shift = 18 + (9 - texture_state.level);
texture_state.u = (int32_t)(((int64_t)state->u * (int64_t)w) >> (8 + state->max_d)) + state->tbu;
texture_state.v = (int32_t)(((int64_t)state->v * (int64_t)w) >> (8 + state->max_d)) + state->tbv;
@@ -2593,7 +2593,7 @@ static void tex_sample_persp_normal_filter_375(s3d_state_t *state)
u = (int32_t)(((int64_t)state->u * (int64_t)w) >> (8 + state->max_d)) + state->tbu;
v = (int32_t)(((int64_t)state->v * (int64_t)w) >> (8 + state->max_d)) + state->tbv;
-
+
texture_state.level = state->max_d;
texture_state.texture_shift = 18 + (9 - texture_state.level);
tex_offset = 1 << texture_state.texture_shift;
@@ -2620,7 +2620,7 @@ static void tex_sample_persp_normal_filter_375(s3d_state_t *state)
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2635,7 +2635,7 @@ static void tex_sample_persp_mipmap(s3d_state_t *state)
if (state->w)
w = (int32_t)(((1ULL << 27) << 19) / (int64_t)state->w);
-
+
texture_state.level = (state->d < 0) ? state->max_d : state->max_d - ((state->d >> 27) & 0xf);
if (texture_state.level < 0)
texture_state.level = 0;
@@ -2660,7 +2660,7 @@ static void tex_sample_persp_mipmap_filter(s3d_state_t *state)
u = (int32_t)(((int64_t)state->u * (int64_t)w) >> (12 + state->max_d)) + state->tbu;
v = (int32_t)(((int64_t)state->v * (int64_t)w) >> (12 + state->max_d)) + state->tbv;
-
+
texture_state.level = (state->d < 0) ? state->max_d : state->max_d - ((state->d >> 27) & 0xf);
if (texture_state.level < 0)
texture_state.level = 0;
@@ -2689,7 +2689,7 @@ static void tex_sample_persp_mipmap_filter(s3d_state_t *state)
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2703,7 +2703,7 @@ static void tex_sample_persp_mipmap_375(s3d_state_t *state)
if (state->w)
w = (int32_t)(((1ULL << 27) << 19) / (int64_t)state->w);
-
+
texture_state.level = (state->d < 0) ? state->max_d : state->max_d - ((state->d >> 27) & 0xf);
if (texture_state.level < 0)
texture_state.level = 0;
@@ -2728,13 +2728,13 @@ static void tex_sample_persp_mipmap_filter_375(s3d_state_t *state)
u = (int32_t)(((int64_t)state->u * (int64_t)w) >> (8 + state->max_d)) + state->tbu;
v = (int32_t)(((int64_t)state->v * (int64_t)w) >> (8 + state->max_d)) + state->tbv;
-
+
texture_state.level = (state->d < 0) ? state->max_d : state->max_d - ((state->d >> 27) & 0xf);
if (texture_state.level < 0)
texture_state.level = 0;
texture_state.texture_shift = 18 + (9 - texture_state.level);
tex_offset = 1 << texture_state.texture_shift;
-
+
texture_state.u = u;
texture_state.v = v;
tex_read(state, &texture_state, &tex_samples[0]);
@@ -2757,7 +2757,7 @@ static void tex_sample_persp_mipmap_filter_375(s3d_state_t *state)
d[1] = du * (256 - dv);
d[2] = (256 - du) * dv;
d[3] = du * dv;
-
+
state->dest_rgba.r = (tex_samples[0].r * d[0] + tex_samples[1].r * d[1] + tex_samples[2].r * d[2] + tex_samples[3].r * d[3]) >> 16;
state->dest_rgba.g = (tex_samples[0].g * d[0] + tex_samples[1].g * d[1] + tex_samples[2].g * d[2] + tex_samples[3].g * d[3]) >> 16;
state->dest_rgba.b = (tex_samples[0].b * d[0] + tex_samples[1].b * d[1] + tex_samples[2].b * d[2] + tex_samples[3].b * d[3]) >> 16;
@@ -2781,7 +2781,7 @@ static void tex_sample_persp_mipmap_filter_375(s3d_state_t *state)
b = ((b) < 0) ? 0 : 0xff; \
if ((a) & ~0xff) \
a = ((a) < 0) ? 0 : 0xff;
-
+
#define CLAMP_RGB(r, g, b) do \
{ \
if ((r) < 0) \
@@ -2846,11 +2846,11 @@ static void dest_pixel_lit_texture_reflection(s3d_state_t *state)
static void dest_pixel_lit_texture_modulate(s3d_state_t *state)
{
int r = state->r >> 7, g = state->g >> 7, b = state->b >> 7, a = state->a >> 7;
-
+
tex_sample(state);
-
+
CLAMP_RGBA(r, g, b, a);
-
+
state->dest_rgba.r = ((state->dest_rgba.r) * r) >> 8;
state->dest_rgba.g = ((state->dest_rgba.g) * g) >> 8;
state->dest_rgba.b = ((state->dest_rgba.b) * b) >> 8;
@@ -2865,13 +2865,13 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
uint8_t *vram = (uint8_t *)svga->vram;
int x_dir = s3d_tri->tlr ? 1 : -1;
-
+
int use_z = !(s3d_tri->cmd_set & CMD_SET_ZB_MODE);
int y_count = yc;
-
+
int bpp = (s3d_tri->cmd_set >> 2) & 7;
-
+
uint32_t dest_offset = 0, z_offset = 0;
uint32_t src_col;
@@ -2889,7 +2889,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
int update;
uint16_t src_z = 0;
-
+
if (s3d_tri->cmd_set & CMD_SET_HC)
{
if (state->y < s3d_tri->clip_t)
@@ -2897,10 +2897,10 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
if (state->y > s3d_tri->clip_b)
{
int diff_y = state->y - s3d_tri->clip_b;
-
+
if (diff_y > y_count)
diff_y = y_count;
-
+
state->base_u += (s3d_tri->TdUdY * diff_y);
state->base_v += (s3d_tri->TdVdY * diff_y);
state->base_z += (s3d_tri->TdZdY * diff_y);
@@ -2923,7 +2923,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
dest_offset = s3d_tri->dest_base + (state->y * s3d_tri->dest_str);
z_offset = s3d_tri->z_base + (state->y * s3d_tri->z_str);
-
+
while (y_count > 0)
{
x = (state->x1 + ((1 << 20) - 1)) >> 20;
@@ -2965,7 +2965,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
if (x < s3d_tri->clip_l)
{
int diff_x = s3d_tri->clip_l - x;
-
+
z += (s3d_tri->TdZdX * diff_x);
state->u += (s3d_tri->TdUdX * diff_x);
state->v += (s3d_tri->TdVdX * diff_x);
@@ -2975,7 +2975,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
state->a += (s3d_tri->TdAdX * diff_x);
state->d += (s3d_tri->TdDdX * diff_x);
state->w += (s3d_tri->TdWdX * diff_x);
-
+
x = s3d_tri->clip_l;
}
}
@@ -2990,7 +2990,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
if (x > s3d_tri->clip_r)
{
int diff_x = x - s3d_tri->clip_r;
-
+
z += (s3d_tri->TdZdX * diff_x);
state->u += (s3d_tri->TdUdX * diff_x);
state->v += (s3d_tri->TdVdX * diff_x);
@@ -3000,7 +3000,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
state->a += (s3d_tri->TdAdX * diff_x);
state->d += (s3d_tri->TdDdX * diff_x);
state->w += (s3d_tri->TdWdX * diff_x);
-
+
x = s3d_tri->clip_r;
}
}
@@ -3013,7 +3013,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
x &= 0xfff;
xe &= 0xfff;
-
+
while (x != xe) {
update = 1;
_x = x; _y = state->y;
@@ -3105,7 +3105,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
switch (bpp)
{
- case 0: /*8 bpp*/
+ case 0: /*8 bpp*/
/*Not implemented yet*/
break;
case 1: /*16 bpp*/
@@ -3139,13 +3139,13 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
state->w += s3d_tri->TdWdX;
dest_addr += x_offset;
z_addr += xz_offset;
-
+
x = (x + x_dir) & 0xfff;
}
}
y_count--;
-
+
tri_skip_line:
state->x1 += dx1;
state->x2 += dx2;
@@ -3188,11 +3188,11 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
state.tbu = s3d_tri->tbu << 11;
state.tbv = s3d_tri->tbv << 11;
-
+
state.max_d = (s3d_tri->cmd_set >> 8) & 15;
-
+
state.tex_bdr_clr = s3d_tri->tex_bdr_clr;
-
+
state.cmd_set = s3d_tri->cmd_set;
state.base_u = s3d_tri->tus;
@@ -3204,7 +3204,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
state.base_a = (int32_t)s3d_tri->tas;
state.base_d = s3d_tri->tds;
state.base_w = s3d_tri->tws;
-
+
tex_base = s3d_tri->tex_base;
for (c = 9; c >= 0; c--)
{
@@ -3243,8 +3243,8 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
default:
s3_virge_log("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf);
return;
- }
-
+ }
+
switch (((s3d_tri->cmd_set >> 12) & 7) | ((s3d_tri->cmd_set & (1 << 29)) ? 8 : 0))
{
case 0: case 1:
@@ -3284,7 +3284,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
tex_sample = virge->bilinear_enabled ? tex_sample_persp_normal_filter : tex_sample_persp_normal;
break;
}
-
+
switch ((s3d_tri->cmd_set >> 5) & 7)
{
case 0:
@@ -3308,9 +3308,9 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
tri(virge, s3d_tri, &state, s3d_tri->ty01, s3d_tri->TdXdY02, s3d_tri->TdXdY01);
state.x2 = s3d_tri->txend12;
tri(virge, s3d_tri, &state, s3d_tri->ty12, s3d_tri->TdXdY02, s3d_tri->TdXdY12);
-
+
end_time = plat_timer_read();
-
+
virge->blitter_time += end_time - start_time;
}
@@ -3328,17 +3328,17 @@ static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
svga->hwcursor_latch.addr += 16;
switch (svga->bpp)
- {
+ {
case 15:
fg = video_15to32[virge->hwc_fg_col & 0xffff];
bg = video_15to32[virge->hwc_bg_col & 0xffff];
break;
-
+
case 16:
fg = video_16to32[virge->hwc_fg_col & 0xffff];
bg = video_16to32[virge->hwc_bg_col & 0xffff];
break;
-
+
case 24: case 32:
fg = virge->hwc_fg_col;
bg = virge->hwc_bg_col;
@@ -3364,7 +3364,7 @@ static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
if (dat[0] & 0x8000)
buffer32->line[displine][offset + svga->x_add] = (dat[1] & 0x8000) ? fg : bg;
}
-
+
offset++;
dat[0] <<= 1;
dat[1] <<= 1;
@@ -3382,7 +3382,7 @@ static void s3_virge_hwcursor_draw(svga_t *svga, int displine)
else if (dat[1] & 0x8000)
buffer32->line[displine][offset + svga->x_add] ^= 0xffffff;
}
-
+
offset++;
dat[0] <<= 1;
dat[1] <<= 1;
@@ -3631,7 +3631,7 @@ static void s3_virge_overlay_draw(svga_t *svga, int displine)
int x;
uint32_t *p;
uint8_t *src = &svga->vram[svga->overlay_latch.addr];
-
+
p = &(buffer32->line[displine][offset + svga->x_add]);
if ((offset + virge->streams.sec_w) > virge->streams.pri_w)
@@ -3640,7 +3640,7 @@ static void s3_virge_overlay_draw(svga_t *svga, int displine)
x_size = virge->streams.sec_w + 1;
OVERLAY_SAMPLE();
-
+
for (x = 0; x < x_size; x++)
{
*p++ = r[x_read] | (g[x_read] << 8) | (b[x_read] << 16);
@@ -3673,22 +3673,22 @@ static uint8_t s3_virge_pci_read(int func, int addr, void *p)
switch (addr) {
case 0x00: ret = 0x33; break; /*'S3'*/
case 0x01: ret = 0x53; break;
-
+
case 0x02: ret = virge->virge_id_low; break;
case 0x03: ret = virge->virge_id_high; break;
case PCI_REG_COMMAND: ret = virge->pci_regs[PCI_REG_COMMAND] & 0x27; break;
-
+
case 0x07: ret = virge->pci_regs[0x07] & 0x36; break;
-
+
case 0x08: ret = virge->virge_rev; break; /*Revision ID*/
case 0x09: ret = 0; break; /*Programming interface*/
-
+
case 0x0a: ret = 0x00; break; /*Supports VGA interface*/
case 0x0b: ret = 0x03; break;
case 0x0d: ret = virge->pci_regs[0x0d] & 0xf8; break;
-
+
case 0x10: ret = 0x00; break;/*Linear frame buffer address*/
case 0x11: ret = 0x00; break;
case 0x12: ret = 0x00; break;
@@ -3707,12 +3707,12 @@ static uint8_t s3_virge_pci_read(int func, int addr, void *p)
case 0x34: ret = (virge->chip >= S3_VIRGEGX2) ? 0xdc : 0x00; break;
case 0x3c: ret = virge->pci_regs[0x3c]; break;
-
+
case 0x3d: ret = PCI_INTA; break; /*INTA*/
-
+
case 0x3e: ret = 0x04; break;
case 0x3f: ret = 0xff; break;
-
+
case 0x80: ret = 0x02; break; /* AGP capability */
case 0x81: ret = 0x00; break;
case 0x82: ret = 0x10; break; /* assumed AGP 1.0 */
@@ -3746,8 +3746,8 @@ static void s3_virge_pci_write(int func, int addr, uint8_t val, void *p)
case 0x00: case 0x01: case 0x02: case 0x03:
case 0x08: case 0x09: case 0x0a: case 0x0b:
case 0x3d: case 0x3e: case 0x3f:
- return;
-
+ return;
+
case PCI_REG_COMMAND:
if (val & PCI_COMMAND_IO)
{
@@ -3757,12 +3757,12 @@ static void s3_virge_pci_write(int func, int addr, uint8_t val, void *p)
else
io_removehandler(0x03c0, 0x0020, s3_virge_in, NULL, NULL, s3_virge_out, NULL, NULL, virge);
virge->pci_regs[PCI_REG_COMMAND] = val & 0x27;
- s3_virge_updatemapping(virge);
+ s3_virge_updatemapping(virge);
return;
case 0x07:
virge->pci_regs[0x07] = val & 0x3e;
return;
- case 0x0d:
+ case 0x0d:
virge->pci_regs[0x0d] = val & 0xf8;
return;
@@ -3786,7 +3786,7 @@ static void s3_virge_pci_write(int func, int addr, uint8_t val, void *p)
mem_mapping_disable(&virge->bios_rom.mapping);
}
return;
- case 0x3c:
+ case 0x3c:
virge->pci_regs[0x3c] = val;
return;
@@ -3834,7 +3834,7 @@ static void s3_virge_reset(void *priv)
virge->pci_regs[0x06] = 0;
virge->pci_regs[0x07] = 2;
virge->pci_regs[0x32] = 0x0c;
- virge->pci_regs[0x3d] = 1;
+ virge->pci_regs[0x3d] = 1;
virge->pci_regs[0x3e] = 4;
virge->pci_regs[0x3f] = 0xff;
@@ -3888,7 +3888,7 @@ static void s3_virge_reset(void *priv)
else
virge->svga.crtc[0x36] = 2 | (0 << 2) | (1 << 4) | (0 << 5);
break;
- }
+ }
if (virge->local == S3_VIRGE_GX)
virge->svga.crtc[0x36] |= (1 << 2);
}
@@ -3917,8 +3917,8 @@ static void *s3_virge_init(const device_t *info)
virge->memory_size = 4;
else
virge->memory_size = device_get_config_int("memory");
-
-
+
+
switch(info->local) {
case S3_VIRGE_325:
bios_fn = ROM_VIRGE_325;
@@ -3966,7 +3966,7 @@ static void *s3_virge_init(const device_t *info)
rom_init(&virge->bios_rom, (char *) bios_fn, 0xc0000, 0x10000, 0xffff, 0, MEM_MAPPING_EXTERNAL);
else
rom_init(&virge->bios_rom, (char *) bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
-
+
mem_mapping_disable(&virge->bios_rom.mapping);
mem_mapping_add(&virge->linear_mapping, 0, 0, svga_read_linear,
@@ -4004,10 +4004,10 @@ static void *s3_virge_init(const device_t *info)
virge->pci_regs[0x06] = 0;
virge->pci_regs[0x07] = 2;
virge->pci_regs[0x32] = 0x0c;
- virge->pci_regs[0x3d] = 1;
+ virge->pci_regs[0x3d] = 1;
virge->pci_regs[0x3e] = 4;
virge->pci_regs[0x3f] = 0xff;
-
+
virge->virge_rev = 0;
virge->virge_id = 0xe1;
virge->is_agp = !!(info->flags & DEVICE_AGP);
@@ -4106,11 +4106,11 @@ static void *s3_virge_init(const device_t *info)
else
virge->svga.crtc[0x36] = 2 | (0 << 2) | (1 << 4) | (0 << 5);
break;
- }
+ }
if (info->local == S3_VIRGE_GX)
virge->svga.crtc[0x36] |= (1 << 2);
}
-
+
virge->svga.crtc[0x37] = 1 | (7 << 5);
virge->svga.crtc[0x53] = 8;
@@ -4118,7 +4118,7 @@ static void *s3_virge_init(const device_t *info)
virge->i2c = i2c_gpio_init("ddc_s3_virge");
virge->ddc = ddc_init(i2c_gpio_get_bus(virge->i2c));
-
+
virge->svga.force_old_addr = 1;
virge->wake_render_thread = thread_create_event();
@@ -4128,9 +4128,9 @@ static void *s3_virge_init(const device_t *info)
virge->render_thread = thread_create(render_thread, virge);
timer_add(&virge->tri_timer, s3_virge_tri_timer, virge, 0);
-
+
virge->local = info->local;
-
+
return virge;
}
@@ -4149,7 +4149,7 @@ static void s3_virge_close(void *p)
ddc_close(virge->ddc);
i2c_gpio_close(virge->i2c);
-
+
free(virge);
}
@@ -4206,7 +4206,7 @@ static int s3_trio3d2x_available(void)
static void s3_virge_speed_changed(void *p)
{
virge_t *virge = (virge_t *)p;
-
+
svga_recalctimings(&virge->svga);
}
diff --git a/src/video/vid_svga_render.c b/src/video/vid_svga_render.c
index 2d23231be..ca9c3b3f1 100644
--- a/src/video/vid_svga_render.c
+++ b/src/video/vid_svga_render.c
@@ -396,94 +396,94 @@ svga_render_2bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
- if (svga->force_old_addr) {
- 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) {
- p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
+ if (svga->force_old_addr) {
+ changed_offset = ((svga->ma << 1) + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
- if (svga->firstline_draw == 2000)
- svga->firstline_draw = svga->displine;
- svga->lastline_draw = svga->displine;
+ if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
+ p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
- for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
- addr = svga->ma;
+ if (svga->firstline_draw == 2000)
+ svga->firstline_draw = svga->displine;
+ svga->lastline_draw = svga->displine;
- if (!(svga->crtc[0x17] & 0x40)) {
- addr = (addr << 1) & svga->vram_mask;
- addr &= ~7;
+ for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
+ addr = svga->ma;
- if ((svga->crtc[0x17] & 0x20) && (svga->ma & 0x20000))
- addr |= 4;
+ if (!(svga->crtc[0x17] & 0x40)) {
+ addr = (addr << 1) & svga->vram_mask;
+ addr &= ~7;
- if (!(svga->crtc[0x17] & 0x20) && (svga->ma & 0x8000))
- addr |= 4;
- }
+ if ((svga->crtc[0x17] & 0x20) && (svga->ma & 0x20000))
+ 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] & 0x20) && (svga->ma & 0x8000))
+ 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;
}
- } 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) {
- p = &buffer32->line[svga->displine + svga->y_add][svga->x_add];
+ 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];
- if (svga->firstline_draw == 2000)
- svga->firstline_draw = svga->displine;
- svga->lastline_draw = svga->displine;
+ if (svga->firstline_draw == 2000)
+ svga->firstline_draw = svga->displine;
+ svga->lastline_draw = svga->displine;
- for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
- addr = svga->remap_func(svga, svga->ma);
+ for (x = 0; x <= (svga->hdisp + svga->scrollcache); x += 16) {
+ addr = svga->remap_func(svga, svga->ma);
- dat[0] = svga->vram[addr];
- dat[1] = svga->vram[addr | 0x1];
- if (svga->seqregs[1] & 4)
- svga->ma += 2;
- else
- svga->ma += 4;
+ 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;
+ 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));
+ 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;
- }
+ p += 16;
}
+ }
}
}
@@ -500,7 +500,7 @@ svga_render_2bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
- if (svga->force_old_addr) {
+ if (svga->force_old_addr) {
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) {
@@ -551,7 +551,7 @@ svga_render_2bpp_highres(svga_t *svga)
p += 8;
}
}
- } else {
+ } else {
changed_addr = svga->remap_func(svga, svga->ma);
if (svga->changedvram[changed_addr >> 12] || svga->changedvram[(changed_addr >> 12) + 1] || svga->fullchange) {
@@ -587,8 +587,8 @@ svga_render_2bpp_highres(svga_t *svga)
p += 8;
}
- }
- }
+ }
+ }
}
@@ -666,7 +666,7 @@ svga_render_4bpp_lowres(svga_t *svga)
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -722,7 +722,7 @@ svga_render_4bpp_lowres(svga_t *svga)
p += 16;
}
- }
+ }
} else {
changed_addr = svga->remap_func(svga, svga->ma);
@@ -767,7 +767,7 @@ svga_render_4bpp_lowres(svga_t *svga)
p += 16;
}
- }
+ }
}
}
@@ -784,14 +784,14 @@ svga_render_4bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
changed_offset = (svga->ma + (svga->sc & ~svga->crtc[0x17] & 3) * 0x8000) >> 12;
if (svga->changedvram[changed_offset] || svga->changedvram[changed_offset + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -847,7 +847,7 @@ svga_render_4bpp_highres(svga_t *svga)
p += 8;
}
- }
+ }
} else {
changed_addr = svga->remap_func(svga, svga->ma);
@@ -908,12 +908,12 @@ svga_render_8bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -981,12 +981,12 @@ svga_render_8bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1172,12 +1172,12 @@ svga_render_15bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1253,12 +1253,12 @@ svga_render_15bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1282,7 +1282,7 @@ svga_render_15bpp_highres(svga_t *svga)
} else
memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
}
- svga->ma += x << 1;
+ svga->ma += x << 1;
svga->ma &= svga->vram_display_mask;
}
} else {
@@ -1453,7 +1453,7 @@ svga_render_16bpp_lowres(svga_t *svga)
} else
memset(&(p[(x << 1)]), 0x00, 8 * sizeof(uint32_t));
}
- svga->ma += x << 1;
+ svga->ma += x << 1;
svga->ma &= svga->vram_display_mask;
}
} else {
@@ -1496,7 +1496,7 @@ svga_render_16bpp_lowres(svga_t *svga)
svga->ma += 4;
}
svga->ma &= svga->vram_display_mask;
- }
+ }
}
}
@@ -1511,12 +1511,12 @@ svga_render_16bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1540,9 +1540,9 @@ svga_render_16bpp_highres(svga_t *svga)
} else
memset(&(p[x]), 0x00, 8 * sizeof(uint32_t));
}
- svga->ma += x << 1;
+ svga->ma += x << 1;
svga->ma &= svga->vram_display_mask;
- }
+ }
} else {
changed_addr = svga->remap_func(svga, svga->ma);
@@ -1590,7 +1590,7 @@ svga_render_16bpp_highres(svga_t *svga)
}
}
svga->ma &= svga->vram_display_mask;
- }
+ }
}
}
@@ -1606,13 +1606,13 @@ svga_render_24bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if ((svga->displine + svga->y_add) < 0)
return;
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
- if (svga->firstline_draw == 2000)
+ if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
@@ -1621,7 +1621,7 @@ svga_render_24bpp_lowres(svga_t *svga)
fg = svga->vram[svga->ma] | (svga->vram[svga->ma + 1] << 8) | (svga->vram[svga->ma + 2] << 16);
else
fg = 0x00000000;
- svga->ma += 3;
+ svga->ma += 3;
svga->ma &= svga->vram_display_mask;
buffer32->line[svga->displine + svga->y_add][(x << 1) + svga->x_add] =
buffer32->line[svga->displine + svga->y_add][(x << 1) + 1 + svga->x_add] = fg;
@@ -1690,12 +1690,12 @@ svga_render_24bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1718,7 +1718,7 @@ svga_render_24bpp_highres(svga_t *svga)
svga->ma += 12;
}
svga->ma &= svga->vram_display_mask;
- }
+ }
} else {
changed_addr = svga->remap_func(svga, svga->ma);
@@ -1766,7 +1766,7 @@ svga_render_24bpp_highres(svga_t *svga)
}
}
svga->ma &= svga->vram_display_mask;
- }
+ }
}
}
@@ -1781,10 +1781,10 @@ svga_render_32bpp_lowres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->fullchange) {
- if (svga->firstline_draw == 2000)
+ if (svga->firstline_draw == 2000)
svga->firstline_draw = svga->displine;
svga->lastline_draw = svga->displine;
@@ -1847,12 +1847,12 @@ svga_render_32bpp_highres(svga_t *svga)
if ((svga->displine + svga->y_add) < 0)
return;
-
+
if (svga->force_old_addr) {
if (svga->changedvram[svga->ma >> 12] || svga->changedvram[(svga->ma >> 12) + 1] || svga->changedvram[(svga->ma >> 12) + 2] || svga->fullchange) {
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->lastline_draw = svga->displine;
@@ -1863,7 +1863,7 @@ svga_render_32bpp_highres(svga_t *svga)
dat = 0x00000000;
p[x] = dat & 0xffffff;
}
- svga->ma += 4;
+ svga->ma += 4;
svga->ma &= svga->vram_display_mask;
}
} else {
diff --git a/src/win/86Box.manifest b/src/win/86Box.manifest
index 045e12dbf..58f2d4194 100644
--- a/src/win/86Box.manifest
+++ b/src/win/86Box.manifest
@@ -43,7 +43,7 @@
-
+