mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' of https://github.com/OBattler/86Box

Browse Source
This commit is contained in:
OBattler
2017-10-17 08:53:45 +02:00
parent da8029ba5e db6a386566
commit 6bde353f0b
219 changed files with 643 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/vid_ati18800.c
View File

@@ -8,7 +8,7 @@
*
* ATI 18800 emulation (VGA Edge-16)
*
* Version: @(#)vid_ati18800.c 1.0.1 2017/10/10
* Version: @(#)vid_ati18800.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_ati28800.c
View File

@@ -8,7 +8,7 @@
*
* ATI 28800 emulation (VGA Charger)
*
* Version: @(#)vid_ati28800.c 1.0.1 2017/10/10
* Version: @(#)vid_ati28800.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_ati68860_ramdac.c
View File

@@ -28,7 +28,7 @@
* 7 If set can remove "snow" in some cases
* (A860_Delay_L ?) ??
*
* Version: @(#)vid_ati68860.c 1.0.1 2017/10/10
* Version: @(#)vid_ati68860.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -40,6 +40,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_ati_eeprom.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the EEPROM on select ATI cards.
*
* Version: @(#)vid_ati_eeprom.c 1.0.1 2017/10/10
* Version: @(#)vid_ati_eeprom.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "../nvr.h"

9
src/video/vid_ati_mach64.c
View File

@@ -8,7 +8,7 @@
*
* ATi Mach64 graphics card emulation.
*
* Version: @(#)vid_ati_mach64.c 1.0.4 2017/10/10
* Version: @(#)vid_ati_mach64.c 1.0.5 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../device.h"
#include "../io.h"
@@ -879,7 +880,7 @@ static void fifo_thread(void *param)
mach64->blitter_busy = 1;
while (!FIFO_EMPTY)
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
fifo_entry_t *fifo = &mach64->fifo[mach64->fifo_read_idx & FIFO_MASK];
@@ -902,7 +903,7 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(mach64->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
mach64->blitter_time += end_time - start_time;
}
mach64->blitter_busy = 0;
@@ -3422,7 +3423,7 @@ void mach64_add_status_info(char *s, int max_len, void *p)
{
mach64_t *mach64 = (mach64_t *)p;
char temps[256];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - mach64->status_time;
mach64->status_time = new_time;

3
src/video/vid_bt485_ramdac.c
View File

@@ -11,7 +11,7 @@
* Currently only a dummy stub for logging and passing output
* to the generic SVGA handler.
*
* Version: @(#)vid_bt485_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_bt485_ramdac.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_cga.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the old and new IBM CGA graphics cards.
*
* Version: @(#)vid_cga.c 1.0.5 2017/10/13
* Version: @(#)vid_cga.c 1.0.5 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_cga_comp.c
View File

@@ -9,7 +9,7 @@
* IBM CGA composite filter, borrowed from reenigne's DOSBox
* patch and ported to C.
*
* Version: @(#)vid_cga_comp.c 1.0.2 2017/10/10
* Version: @(#)vid_cga_comp.c 1.0.2 2017/10/16
*
* Authors: reenigne,
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../device.h"
#include "../mem.h"

3
src/video/vid_cl_gd.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of select Cirrus Logic cards.
*
* Version: @(#)vid_cl_gd.c 1.0.1 2017/10/10
* Version: @(#)vid_cl_gd.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_cl_gd_blit.c
View File

@@ -8,7 +8,7 @@
*
* This is the CL-GD 5446 blitter, directly from QEMU.
*
* Version: @(#)vid_cl_gd_blit.c 1.0.1 2017/10/10
* Version: @(#)vid_cl_gd_blit.c 1.0.1 2017/10/16
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -19,6 +19,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_cl_ramdac.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Cirrus Logic RAMDAC.
*
* Version: @(#)vid_cl_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_cl_ramdac.c 1.0.1 2017/10/16
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -18,6 +18,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "../rom.h"

3
src/video/vid_colorplus.c
View File

@@ -8,7 +8,7 @@
*
* Plantronics ColorPlus emulation.
*
* Version: @(#)vid_colorplus.c 1.0.1 2017/10/10
* Version: @(#)vid_colorplus.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_ega.c
View File

@@ -9,7 +9,7 @@
* Emulation of the EGA, Chips & Technologies SuperEGA, and
* AX JEGA graphics cards.
*
* Version: @(#)vid_ega.c 1.0.6 2017/10/10
* Version: @(#)vid_ega.c 1.0.6 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_ega_render.c
View File

@@ -8,7 +8,7 @@
*
* EGA renderers.
*
* Version: @(#)vid_ega_render.c 1.0.3 2017/10/10
* Version: @(#)vid_ega_render.c 1.0.3 2017/10/16
*
* Author: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../device.h"
#include "../mem.h"

3
src/video/vid_et4000.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Tseng Labs ET4000.
*
* Version: @(#)vid_et4000.c 1.0.1 2017/10/10
* Version: @(#)vid_et4000.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

9
src/video/vid_et4000w32.c
View File

@@ -10,7 +10,7 @@
*
* Known bugs: Accelerator doesn't work in planar modes
*
* Version: @(#)vid_et4000w32.c 1.0.1 2017/10/10
* Version: @(#)vid_et4000w32.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"
@@ -470,7 +471,7 @@ static void fifo_thread(void *param)
et4000->blitter_busy = 1;
while (!FIFO_EMPTY)
{
start_time = timer_read();
start_time = plat_timer_read();
fifo = &et4000->fifo[et4000->fifo_read_idx & FIFO_MASK];
switch (fifo->addr_type & FIFO_TYPE)
@@ -489,7 +490,7 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(et4000->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
et4000->blitter_time += end_time - start_time;
}
et4000->blitter_busy = 0;
@@ -1243,7 +1244,7 @@ void et4000w32p_add_status_info(char *s, int max_len, void *p)
{
et4000w32p_t *et4000 = (et4000w32p_t *)p;
char temps[256];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - et4000->status_time;
et4000->status_time = new_time;

1
src/video/vid_et4000w32i.c
View File

@@ -26,6 +26,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "ibm.h"
int et4k_b8000;

3
src/video/vid_genius.c
View File

@@ -8,7 +8,7 @@
*
* MDSI Genius VHR emulation.
*
* Version: @(#)vid_genius.c 1.0.1 2017/10/10
* Version: @(#)vid_genius.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_hercules.c
View File

@@ -8,7 +8,7 @@
*
* Hercules emulation.
*
* Version: @(#)vid_hercules.c 1.0.2 2017/10/13
* Version: @(#)vid_hercules.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "../rom.h"

3
src/video/vid_herculesplus.c
View File

@@ -8,7 +8,7 @@
*
* Hercules InColor emulation.
*
* Version: @(#)vid_herculesplus.c 1.0.1 2017/10/10
* Version: @(#)vid_herculesplus.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_icd2061.c
View File

@@ -10,7 +10,7 @@
*
* Used by ET4000w32/p (Diamond Stealth 32)
*
* Version: @(#)vid_icd2061.c 1.0.1 2017/10/10
* Version: @(#)vid_icd2061.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "vid_icd2061.h"

3
src/video/vid_ics2595.c
View File

@@ -8,7 +8,7 @@
*
* ICS2595 clock chip emulation. Used by ATI Mach64.
*
* Version: @(#)vid_ics2595.c 1.0.1 2017/10/10
* Version: @(#)vid_ics2595.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "vid_ics2595.h"

3
src/video/vid_incolor.c
View File

@@ -8,7 +8,7 @@
*
* Hercules InColor emulation.
*
* Version: @(#)vid_incolor.c 1.0.1 2017/10/10
* Version: @(#)vid_incolor.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_mda.c
View File

@@ -8,7 +8,7 @@
*
* MDA emulation.
*
* Version: @(#)vid_mda.c 1.0.2 2017/10/13
* Version: @(#)vid_mda.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_nv_riva128.c
View File

@@ -8,7 +8,7 @@
*
* nVidia RIVA 128 emulation.
*
* Version: @(#)vid_nv_riva128.c 1.0.1 2017/10/10
* Version: @(#)vid_nv_riva128.c 1.0.1 2017/10/16
*
* Author: Melissa Goad
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_olivetti_m24.c
View File

@@ -8,7 +8,7 @@
*
* Olivetti M24 video emulation- essentially double-res CGA.
*
* Version: @(#)vid_olivetti_m24.c 1.0.1 2017/10/10
* Version: @(#)vid_olivetti_m24.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_oti067.c
View File

@@ -8,7 +8,7 @@
*
* Oak OTI067/077 emulation.
*
* Version: @(#)vid_oti067.c 1.0.1 2017/10/10
* Version: @(#)vid_oti067.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_paradise.c
View File

@@ -10,7 +10,7 @@
* PC2086, PC3086 use PVGA1A
* MegaPC uses W90C11A
*
* Version: @(#)vid_paradise.c 1.0.1 2017/10/10
* Version: @(#)vid_paradise.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_pc1512.c
View File

@@ -15,7 +15,7 @@
* time as between 12 and 46 cycles. We currently always use
* the lower number.
*
* Version: @(#)vid_pc1512.c 1.0.1 2017/10/10
* Version: @(#)vid_pc1512.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -28,6 +28,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_pc1640.c
View File

@@ -9,7 +9,7 @@
* PC1640 video emulation.
* Mostly standard EGA, but with CGA & Hercules emulation.
*
* Version: @(#)vid_pc1640.c 1.0.1 2017/10/10
* Version: @(#)vid_pc1640.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_pc200.c
View File

@@ -10,7 +10,7 @@
* CGA with some NMI stuff. But we don't need that as it's only
* used for TV and LCD displays, and we're emulating a CRT.
*
* Version: @(#)vid_pc200.c 1.0.1 2017/10/10
* Version: @(#)vid_pc200.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_pcjr.c
View File

@@ -8,7 +8,7 @@
*
* Video emulation for IBM PCjr.
*
* Version: @(#)vid_pcjr.c 1.0.1 2017/10/10
* Version: @(#)vid_pcjr.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_ps1_svga.c
View File

@@ -16,7 +16,7 @@
* drivers for any operating system and there is no VBE
* implementation, so it's just a VGA for now.
*
* Version: @(#)vid_ps1_svga.c 1.0.1 2017/10/10
* Version: @(#)vid_ps1_svga.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

9
src/video/vid_s3.c
View File

@@ -8,7 +8,7 @@
*
* S3 emulation.
*
* Version: @(#)vid_s3.c 1.0.1 2017/10/10
* Version: @(#)vid_s3.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../device.h"
#include "../io.h"
@@ -711,7 +712,7 @@ static void fifo_thread(void *param)
s3->blitter_busy = 1;
while (!FIFO_EMPTY)
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
fifo_entry_t *fifo = &s3->fifo[s3->fifo_read_idx & FIFO_MASK];
@@ -743,7 +744,7 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(s3->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
s3->blitter_time += end_time - start_time;
}
s3->blitter_busy = 0;
@@ -2357,7 +2358,7 @@ static void s3_add_status_info(char *s, int max_len, void *p)
{
s3_t *s3 = (s3_t *)p;
char temps[256];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - s3->status_time;
s3->status_time = new_time;

13
src/video/vid_s3_virge.c
View File

@@ -8,7 +8,7 @@
*
* S3 ViRGE emulation.
*
* Version: @(#)vid_s3_virge.c 1.0.1 2017/10/10
* Version: @(#)vid_s3_virge.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"
@@ -956,7 +957,7 @@ static void fifo_thread(void *param)
virge->virge_busy = 1;
while (!FIFO_EMPTY)
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
fifo_entry_t *fifo = &virge->fifo[virge->fifo_read_idx & FIFO_MASK];
uint32_t val = fifo->val;
@@ -1287,7 +1288,7 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(virge->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
virge_time += end_time - start_time;
}
virge->virge_busy = 0;
@@ -3168,7 +3169,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
uint32_t tex_base;
int c;
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
state.tbu = s3d_tri->tbu << 11;
@@ -3296,7 +3297,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri)
virge->tri_count++;
end_time = timer_read();
end_time = plat_timer_read();
virge_time += end_time - start_time;
}
@@ -4136,7 +4137,7 @@ static void s3_virge_add_status_info(char *s, int max_len, void *p)
{
virge_t *virge = (virge_t *)p;
char temps[256];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - status_time;
status_time = new_time;

3
src/video/vid_sc1502x_ramdac.c
View File

@@ -10,7 +10,7 @@
*
* Used by the TLIVESA1 driver for ET4000.
*
* Version: @(#)vid_sc1502x_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_sc1502x_ramdac.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_sdac_ramdac.c
View File

@@ -10,7 +10,7 @@
*
* Misidentifies as AT&T 21C504.
*
* Version: @(#)vid_sdac_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_sdac_ramdac.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_stg_ramdac.c
View File

@@ -8,7 +8,7 @@
*
* STG1702 true colour RAMDAC emulation.
*
* Version: @(#)vid_stg_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_stg_ramdac.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_svga.c
View File

@@ -11,7 +11,7 @@
* This is intended to be used by another SVGA driver,
* and not as a card in it's own right.
*
* Version: @(#)vid_svga.c 1.0.5 2017/10/10
* Version: @(#)vid_svga.c 1.0.5 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -24,6 +24,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_svga_render.c
View File

@@ -8,7 +8,7 @@
*
* SVGA renderers.
*
* Version: @(#)vid_svga_render.c 1.0.2 2017/10/10
* Version: @(#)vid_svga_render.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_table.c
View File

@@ -8,7 +8,7 @@
*
* Define all known video cards.
*
* Version: @(#)vid_table.c 1.0.2 2017/10/14
* Version: @(#)vid_table.c 1.0.2 2017/10/16
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "../rom.h"

3
src/video/vid_tandy.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Tandy Model 1000 video.
*
* Version: @(#)vid_tandy.c 1.0.1 2017/10/10
* Version: @(#)vid_tandy.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_tandysl.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Tandy Model 1000/SL video.
*
* Version: @(#)vid_tandysl.c 1.0.1 2017/10/10
* Version: @(#)vid_tandysl.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

9
src/video/vid_tgui9440.c
View File

@@ -8,7 +8,7 @@
*
* Trident TGUI9440 emulation.
*
* Version: @(#)vid_tgui9440.c 1.0.1 2017/10/10
* Version: @(#)vid_tgui9440.c 1.0.2 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"
@@ -1029,7 +1030,7 @@ static void fifo_thread(void *param)
tgui->blitter_busy = 1;
while (!FIFO_EMPTY)
{
start_time = timer_read();
start_time = plat_timer_read();
fifo = &tgui->fifo[tgui->fifo_read_idx & FIFO_MASK];
switch (fifo->addr_type & FIFO_TYPE)
@@ -1054,7 +1055,7 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(tgui->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
tgui->blitter_time += end_time - start_time;
}
tgui->blitter_busy = 0;
@@ -1258,7 +1259,7 @@ void tgui_add_status_info(char *s, int max_len, void *p)
{
tgui_t *tgui = (tgui_t *)p;
char temps[256];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - tgui->status_time;
tgui->status_time = new_time;

3
src/video/vid_tkd8001_ramdac.c
View File

@@ -8,7 +8,7 @@
*
* Trident TKD8001 RAMDAC emulation.
*
* Version: @(#)vid_tkd8001_ramdac.c 1.0.1 2017/10/10
* Version: @(#)vid_tkd8001_ramdac.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../mem.h"
#include "video.h"

3
src/video/vid_tvga.c
View File

@@ -8,7 +8,7 @@
*
* Trident TVGA (8900D) emulation.
*
* Version: @(#)vid_tvga.c 1.0.1 2017/10/10
* Version: @(#)vid_tvga.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

3
src/video/vid_vga.c
View File

@@ -8,7 +8,7 @@
*
* IBM VGA emulation.
*
* Version: @(#)vid_vga.c 1.0.1 2017/10/10
* Version: @(#)vid_vga.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"

17
src/video/vid_voodoo.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the 3DFX Voodoo Graphics controller.
*
* Version: @(#)vid_voodoo.c 1.0.2 2017/10/11
* Version: @(#)vid_voodoo.c 1.0.3 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei
@@ -22,6 +22,7 @@
#include <stddef.h>
#include <wchar.h>
#include <math.h>
#include "../86box.h"
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
@@ -3489,7 +3490,7 @@ static void render_thread(void *param, int odd_even)
while (!(odd_even ? PARAM_EMPTY_2 : PARAM_EMPTY_1))
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
voodoo_params_t *params = &voodoo->params_buffer[voodoo->params_read_idx[odd_even] & PARAM_MASK];
@@ -3500,7 +3501,7 @@ static void render_thread(void *param, int odd_even)
if ((odd_even ? PARAM_ENTRIES_2 : PARAM_ENTRIES_1) > (PARAM_SIZE - 10))
thread_set_event(voodoo->render_not_full_event[odd_even]);
end_time = timer_read();
end_time = plat_timer_read();
voodoo->render_time[odd_even] += end_time - start_time;
}
@@ -6494,7 +6495,7 @@ static void fifo_thread(void *param)
voodoo->voodoo_busy = 1;
while (!FIFO_EMPTY)
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
fifo_entry_t *fifo = &voodoo->fifo[voodoo->fifo_read_idx & FIFO_MASK];
@@ -6522,13 +6523,13 @@ static void fifo_thread(void *param)
if (FIFO_ENTRIES > 0xe000)
thread_set_event(voodoo->fifo_not_full_event);
end_time = timer_read();
end_time = plat_timer_read();
voodoo->time += end_time - start_time;
}
while (voodoo->cmdfifo_depth_rd != voodoo->cmdfifo_depth_wr)
{
uint64_t start_time = timer_read();
uint64_t start_time = plat_timer_read();
uint64_t end_time;
uint32_t header = cmdfifo_get(voodoo);
uint32_t addr;
@@ -6698,7 +6699,7 @@ static void fifo_thread(void *param)
pclog("Bad CMDFIFO packet %08x %08x\n", header, voodoo->cmdfifo_rp);
}
end_time = timer_read();
end_time = plat_timer_read();
voodoo->time += end_time - start_time;
}
voodoo->voodoo_busy = 0;
@@ -7388,7 +7389,7 @@ static void voodoo_add_status_info(char *s, int max_len, void *p)
int texel_count_current[2];
int texel_count_total;
int render_time[2];
uint64_t new_time = timer_read();
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - status_time;
status_time = new_time;

3
src/video/vid_wy700.c
View File

@@ -8,7 +8,7 @@
*
* Wyse-700 emulation.
*
* Version: @(#)vid_wy700.c 1.0.1 2017/10/10
* Version: @(#)vid_wy700.c 1.0.1 2017/10/16
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"