mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 01:25:33 -07:00
Code Issues Packages Projects Releases Activity

Removed win_status.c and the related stuff as it was not updated for a while and no longer displayed useful information.

Browse Source
This commit is contained in:
OBattler
2018-04-26 13:33:29 +02:00
parent 040b97bfc1
commit 16a7b1cef2
97 changed files with 186 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bugger.c
View File

@@ -44,7 +44,7 @@
* configuration register (CTRL_SPCFG bit set) but have to
* remember that stuff first...
*
* Version: @(#)bugger.c 1.0.10 2018/03/18
* Version: @(#)bugger.c 1.0.11 2018/04/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
* Copyright 1989-2018 Fred N. van Kempen.
@@ -338,6 +338,6 @@ const device_t bugger_device = {
DEVICE_ISA | DEVICE_AT,
0,
bug_init, bug_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

1
src/cpu/386.c
View File

@@ -384,7 +384,6 @@ dontprint=0;
}
ins++;
insc++;
if (timetolive)
{

6
src/cpu/386_dynarec.c
View File

@@ -592,7 +592,6 @@ void exec386_dynarec(int cycs)
CPU_BLOCK_END();
ins++;
insc++;
/* if ((cs + pc) == 4)
fatal("4\n");*/
@@ -686,9 +685,6 @@ inrecomp=1;
inrecomp=0;
if (!use32) cpu_state.pc &= 0xffff;
cpu_recomp_blocks++;
/* ins += codeblock_ins[index];
insc += codeblock_ins[index];*/
/* pclog("Exit block now %04X:%04X\n", CS, pc);*/
}
else if (valid_block && !cpu_state.abrt)
{
@@ -752,7 +748,6 @@ inrecomp=0;
}
ins++;
insc++;
}
if (!cpu_state.abrt && !x86_was_reset)
@@ -823,7 +818,6 @@ inrecomp=0;
}
ins++;
insc++;
}
if (!cpu_state.abrt && !x86_was_reset)

3
src/cpu/808x.c
View File

@@ -18,7 +18,7 @@
* 2 clocks - fetch opcode 1 2 clocks - execute
* 2 clocks - fetch opcode 2 etc
*
* Version: @(#)808x.c 1.0.3 2018/04/19
* Version: @(#)808x.c 1.0.4 2018/04/26
*
* Authors: Sarah Walker, <tommowalker@tommowalker.co.uk>
* Miran Grca, <mgrca8@gmail.com>
@@ -3245,7 +3245,6 @@ void execx86(int cycs)
}
memcycs=0;
insc++;
clockhardware();
if (trap && (flags&T_FLAG) && !noint)

16
src/device.c
View File

@@ -9,7 +9,7 @@
* Implementation of the generic device interface to handle
* all devices attached to the emulator.
*
* Version: @(#)device.c 1.0.6 2018/03/26
* Version: @(#)device.c 1.0.7 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -230,20 +230,6 @@ device_force_redraw(void)
}
void
device_add_status_info(char *s, int max_len)
{
int c;
for (c=0; c<DEVICE_MAX; c++) {
if (devices[c] != NULL) {
if (devices[c]->add_status_info != NULL)
devices[c]->add_status_info(s, max_len, device_priv[c]);
}
}
}
char *
device_get_config_string(char *s)
{

4
src/device.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the device handler.
*
* Version: @(#)device.h 1.0.4 2018/03/26
* Version: @(#)device.h 1.0.5 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -104,7 +104,6 @@ typedef struct _device_ {
int (*available)(/*void*/);
void (*speed_changed)(void *p);
void (*force_redraw)(void *p);
void (*add_status_info)(char *s, int max_len, void *p);
const device_config_t *config;
} device_t;
@@ -124,7 +123,6 @@ extern void *device_get_priv(const device_t *d);
extern int device_available(const device_t *d);
extern void device_speed_changed(void);
extern void device_force_redraw(void);
extern void device_add_status_info(char *s, int max_len);
extern int device_get_config_int(char *name);
extern int device_get_config_int_ex(char *s, int default_int);

6
src/disk/hdc.c
View File

@@ -8,7 +8,7 @@
*
* Common code to handle all sorts of disk controllers.
*
* Version: @(#)hdc.c 1.0.13 2018/04/04
* Version: @(#)hdc.c 1.0.14 2018/04/26
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -48,7 +48,7 @@ null_close(void *priv)
static const device_t null_device = {
"Null HDC", 0, 0,
null_init, null_close, NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};
@@ -68,7 +68,7 @@ inthdc_close(void *priv)
static const device_t inthdc_device = {
"Internal Controller", 0, 0,
inthdc_init, inthdc_close, NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};

4
src/disk/hdc_esdi_at.c
View File

@@ -8,7 +8,7 @@
*
* Driver for the ESDI controller (WD1007-vse1) for PC/AT.
*
* Version: @(#)hdc_esdi_at.c 1.0.10 2018/04/17
* Version: @(#)hdc_esdi_at.c 1.0.11 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -835,6 +835,6 @@ const device_t esdi_at_wd1007vse1_device = {
0,
wd1007vse1_init, wd1007vse1_close, NULL,
wd1007vse1_available,
NULL, NULL, NULL,
NULL, NULL,
NULL
};

4
src/disk/hdc_esdi_mca.c
View File

@@ -52,7 +52,7 @@
* however, are auto-configured by the system software as
* shown above.
*
* Version: @(#)hdc_esdi_mca.c 1.0.11 2018/04/17
* Version: @(#)hdc_esdi_mca.c 1.0.12 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -1086,5 +1086,5 @@ const device_t esdi_ps2_device = {
"IBM ESDI Fixed Disk Adapter (MCA)",
DEVICE_MCA, 0,
esdi_init, esdi_close, NULL,
esdi_available, NULL, NULL, NULL, NULL
esdi_available, NULL, NULL, NULL
};

27
src/disk/hdc_ide.c
View File

@@ -9,7 +9,7 @@
* Implementation of the IDE emulation for hard disks and ATAPI
* CD-ROM devices.
*
* Version: @(#)hdc_ide.c 1.0.44 2018/03/26
* Version: @(#)hdc_ide.c 1.0.45 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -2812,8 +2812,7 @@ const device_t ide_isa_device = {
DEVICE_ISA | DEVICE_AT,
0,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_isa_2ch_device = {
@@ -2821,8 +2820,7 @@ const device_t ide_isa_2ch_device = {
DEVICE_ISA | DEVICE_AT,
2,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_isa_2ch_opt_device = {
@@ -2830,8 +2828,7 @@ const device_t ide_isa_2ch_opt_device = {
DEVICE_ISA | DEVICE_AT,
3,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_vlb_device = {
@@ -2839,8 +2836,7 @@ const device_t ide_vlb_device = {
DEVICE_VLB | DEVICE_AT,
4,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_vlb_2ch_device = {
@@ -2848,8 +2844,7 @@ const device_t ide_vlb_2ch_device = {
DEVICE_VLB | DEVICE_AT,
6,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_pci_device = {
@@ -2857,8 +2852,7 @@ const device_t ide_pci_device = {
DEVICE_PCI | DEVICE_AT,
8,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
const device_t ide_pci_2ch_device = {
@@ -2866,8 +2860,7 @@ const device_t ide_pci_2ch_device = {
DEVICE_PCI | DEVICE_AT,
10,
ide_sainit, ide_saclose, ide_sareset,
NULL, NULL, NULL, NULL,
NULL
NULL, NULL, NULL, NULL
};
static const device_config_t ide_ter_config[] =
@@ -2959,7 +2952,7 @@ const device_t ide_ter_device = {
DEVICE_AT,
0,
ide_ter_init, ide_ter_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
ide_ter_config
};
@@ -2968,6 +2961,6 @@ const device_t ide_qua_device = {
DEVICE_AT,
0,
ide_qua_init, ide_qua_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
ide_qua_config
};

4
src/disk/hdc_mfm_at.c
View File

@@ -12,7 +12,7 @@
* based design. Most cards were WD1003-WA2 or -WAH, where the
* -WA2 cards had a floppy controller as well (to save space.)
*
* Version: @(#)hdc_mfm_at.c 1.0.14 2018/04/16
* Version: @(#)hdc_mfm_at.c 1.0.15 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -762,5 +762,5 @@ const device_t mfm_at_wd1003_device = {
DEVICE_ISA | DEVICE_AT,
0,
mfm_init, mfm_close, NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};

8
src/disk/hdc_mfm_xt.c
View File

@@ -41,7 +41,7 @@
* Since all controllers (including the ones made by DTC) use
* (mostly) the same API, we keep them all in this module.
*
* Version: @(#)hdc_mfm_xt.c 1.0.15 2018/04/18
* Version: @(#)hdc_mfm_xt.c 1.0.16 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -869,8 +869,7 @@ const device_t mfm_xt_xebec_device = {
DEVICE_ISA,
0,
xebec_init, mfm_close, NULL,
xebec_available, NULL, NULL, NULL,
NULL
xebec_available, NULL, NULL, NULL
};
@@ -924,6 +923,5 @@ const device_t mfm_xt_dtc5150x_device = {
DEVICE_ISA,
0,
dtc5150x_init, mfm_close, NULL,
dtc5150x_available, NULL, NULL, NULL,
NULL
dtc5150x_available, NULL, NULL, NULL
};

6
src/disk/hdc_xta.c
View File

@@ -46,7 +46,7 @@
*
* NOTE: The XTA interface is 0-based for sector numbers !!
*
* Version: @(#)hdc_ide_xta.c 1.0.5 2018/04/26
* Version: @(#)hdc_ide_xta.c 1.0.6 2018/04/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -1207,7 +1207,7 @@ const device_t xta_wdxt150_device = {
DEVICE_ISA,
0,
xta_init, xta_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
wdxt150_config
};
@@ -1217,6 +1217,6 @@ const device_t xta_hd20_device = {
DEVICE_ISA,
1,
xta_init, xta_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

10
src/disk/hdc_xtide.c
View File

@@ -21,7 +21,7 @@
* already on their way out, the newer IDE standard based on the
* PC/AT controller and 16b design became the IDE we now know.
*
* Version: @(#)hdc_xtide.c 1.0.12 2018/04/05
* Version: @(#)hdc_xtide.c 1.0.13 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -252,7 +252,7 @@ const device_t xtide_device = {
DEVICE_ISA,
0,
xtide_init, xtide_close, NULL,
xtide_available, NULL, NULL, NULL,
xtide_available, NULL, NULL,
NULL
};
@@ -261,7 +261,7 @@ const device_t xtide_at_device = {
DEVICE_ISA | DEVICE_AT,
0,
xtide_at_init, xtide_at_close, NULL,
xtide_at_available, NULL, NULL, NULL,
xtide_at_available, NULL, NULL,
NULL
};
@@ -270,7 +270,7 @@ const device_t xtide_acculogic_device = {
DEVICE_ISA,
0,
xtide_acculogic_init, xtide_close, NULL,
xtide_acculogic_available, NULL, NULL, NULL,
xtide_acculogic_available, NULL, NULL,
NULL
};
@@ -279,6 +279,6 @@ const device_t xtide_at_ps2_device = {
DEVICE_ISA | DEVICE_PS2,
0,
xtide_at_ps2_init, xtide_at_close, NULL,
xtide_at_ps2_available, NULL, NULL, NULL,
xtide_at_ps2_available, NULL, NULL,
NULL
};

18
src/floppy/fdc.c
View File

@@ -9,7 +9,7 @@
* Implementation of the NEC uPD-765 and compatible floppy disk
* controller.
*
* Version: @(#)fdc.c 1.0.6 2018/04/12
* Version: @(#)fdc.c 1.0.7 2018/04/26
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -2158,7 +2158,7 @@ const device_t fdc_xt_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_pcjr_device = {
@@ -2168,7 +2168,7 @@ const device_t fdc_pcjr_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_device = {
@@ -2178,7 +2178,7 @@ const device_t fdc_at_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_actlow_device = {
@@ -2188,7 +2188,7 @@ const device_t fdc_at_actlow_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_ps1_device = {
@@ -2198,7 +2198,7 @@ const device_t fdc_at_ps1_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_smc_device = {
@@ -2208,7 +2208,7 @@ const device_t fdc_at_smc_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_winbond_device = {
@@ -2218,7 +2218,7 @@ const device_t fdc_at_winbond_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t fdc_at_nsc_device = {
@@ -2228,5 +2228,5 @@ const device_t fdc_at_nsc_device = {
fdc_init,
fdc_close,
fdc_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};

6
src/game/gameport.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of a generic Game Port.
*
* Version: @(#)gameport.c 1.0.4 2018/03/19
* Version: @(#)gameport.c 1.0.5 2018/04/26
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -321,7 +321,7 @@ const device_t gameport_device = {
0, 0,
gameport_init,
gameport_close,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};
@@ -330,6 +330,6 @@ const device_t gameport_201_device = {
0, 0,
gameport_201_init,
gameport_close,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

10
src/intel_flash.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 1 Mbit 8-bit flash devices.
*
* Version: @(#)intel_flash.c 1.0.14 2018/03/18
* Version: @(#)intel_flash.c 1.0.15 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -295,7 +295,7 @@ const device_t intel_flash_bxt_ami_device =
intel_flash_bxt_ami_init,
intel_flash_close,
NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};
const device_t intel_flash_bxb_ami_device =
@@ -305,7 +305,7 @@ const device_t intel_flash_bxb_ami_device =
intel_flash_bxb_ami_init,
intel_flash_close,
NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};
const device_t intel_flash_bxt_device =
@@ -315,7 +315,7 @@ const device_t intel_flash_bxt_device =
intel_flash_bxt_init,
intel_flash_close,
NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};
const device_t intel_flash_bxb_device =
@@ -325,5 +325,5 @@ const device_t intel_flash_bxb_device =
intel_flash_bxb_init,
intel_flash_close,
NULL,
NULL, NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL
};

4
src/intel_piix.c
View File

@@ -10,7 +10,7 @@
* word 0 - base address
* word 1 - bits 1-15 = byte count, bit 31 = end of transfer
*
* Version: @(#)intel_piix.c 1.0.14 2018/03/26
* Version: @(#)intel_piix.c 1.0.15 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -868,7 +868,6 @@ const device_t piix_device =
NULL,
NULL,
NULL,
NULL,
NULL
};
@@ -883,6 +882,5 @@ const device_t piix3_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

3
src/intel_sio.c
View File

@@ -6,7 +6,7 @@
*
* Emulation of Intel System I/O PCI chip.
*
* Version: @(#)intel_sio.c 1.0.7 2018/03/26
* Version: @(#)intel_sio.c 1.0.8 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -203,6 +203,5 @@ const device_t sio_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

22
src/keyboard_at.c
View File

@@ -8,7 +8,7 @@
*
* Intel 8042 (AT keyboard controller) emulation.
*
* Version: @(#)keyboard_at.c 1.0.34 2018/03/26
* Version: @(#)keyboard_at.c 1.0.35 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1971,7 +1971,7 @@ const device_t keyboard_at_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_at_ami_device = {
@@ -1981,7 +1981,7 @@ const device_t keyboard_at_ami_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_at_toshiba_device = {
@@ -1991,7 +1991,7 @@ const device_t keyboard_at_toshiba_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_device = {
@@ -2001,7 +2001,7 @@ const device_t keyboard_ps2_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_ami_device = {
@@ -2011,7 +2011,7 @@ const device_t keyboard_ps2_ami_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_mca_device = {
@@ -2021,7 +2021,7 @@ const device_t keyboard_ps2_mca_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_mca_2_device = {
@@ -2031,7 +2031,7 @@ const device_t keyboard_ps2_mca_2_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_quadtel_device = {
@@ -2041,7 +2041,7 @@ const device_t keyboard_ps2_quadtel_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_pci_device = {
@@ -2051,7 +2051,7 @@ const device_t keyboard_ps2_pci_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_ps2_ami_pci_device = {
@@ -2061,7 +2061,7 @@ const device_t keyboard_ps2_ami_pci_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};

6
src/keyboard_xt.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the XT-style keyboard.
*
* Version: @(#)keyboard_xt.c 1.0.11 2018/03/19
* Version: @(#)keyboard_xt.c 1.0.12 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -581,7 +581,7 @@ const device_t keyboard_xt_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};
const device_t keyboard_tandy_device = {
@@ -591,5 +591,5 @@ const device_t keyboard_tandy_device = {
kbd_init,
kbd_close,
kbd_reset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL
};

5
src/machine/m_amstrad.c
View File

@@ -32,7 +32,7 @@
* in alpha mode, but in highres ("ECD350") mode, it displays
* some semi-random junk. Video-memory pointer maybe?
*
* Version: @(#)m_amstrad.c 1.0.12 2018/04/11
* Version: @(#)m_amstrad.c 1.0.13 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -563,7 +563,6 @@ static const device_t vid_1512_device = {
NULL, vid_close_1512, NULL,
NULL,
vid_speed_change_1512,
NULL,
NULL
};
@@ -727,7 +726,6 @@ static const device_t vid_1640_device = {
NULL, vid_close_1640, NULL,
NULL,
vid_speed_changed_1640,
NULL,
NULL
};
@@ -862,7 +860,6 @@ static const device_t vid_200_device = {
NULL, vid_close_200, NULL,
NULL,
vid_speed_changed_200,
NULL,
NULL
};

3
src/machine/m_at_430fx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430FX PCISet chip.
*
* Version: @(#)m_at_430fx.c 1.0.16 2018/04/04
* Version: @(#)m_at_430fx.c 1.0.17 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -212,7 +212,6 @@ const device_t i430fx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

4
src/machine/m_at_430hx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430HX PCISet chip.
*
* Version: @(#)m_at_430hx.c 1.0.12 2018/04/04
* Version: @(#)m_at_430hx.c 1.0.13 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -221,7 +221,6 @@ const device_t i430hx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};
@@ -283,7 +282,6 @@ const device_t acerm3a_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

4
src/machine/m_at_430lx_nx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430LX and 430NX PCISet chips.
*
* Version: @(#)m_at_430lx_nx.c 1.0.11 2018/04/04
* Version: @(#)m_at_430lx_nx.c 1.0.12 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -213,7 +213,6 @@ const device_t i430lx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};
@@ -229,7 +228,6 @@ const device_t i430nx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

3
src/machine/m_at_430vx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430VX PCISet chip.
*
* Version: @(#)m_at_430vx.c 1.0.12 2018/04/04
* Version: @(#)m_at_430vx.c 1.0.13 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -216,7 +216,6 @@ const device_t i430vx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

3
src/machine/m_at_440fx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 440FX PCISet chip.
*
* Version: @(#)m_at_440fx.c 1.0.12 2018/04/04
* Version: @(#)m_at_440fx.c 1.0.13 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -221,7 +221,6 @@ const device_t i440fx_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

3
src/machine/m_at_sis_85c496.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the SiS 85c496/85c497 chip.
*
* Version: @(#)m_at_sis_85c496.c 1.0.0 2018/04/17
* Version: @(#)m_at_sis_85c496.c 1.0.1 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -192,7 +192,6 @@ const device_t sis_85c496_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

3
src/machine/m_at_t3100e_vid.c
View File

@@ -22,7 +22,7 @@
* 61 50 52 0F 19 06 19 19 02 0D 0B 0C MONO
* 2D 28 22 0A 67 00 64 67 02 03 06 07 640x400
*
* Version: @(#)m_at_t3100e_vid.c 1.0.4 2018/03/18
* Version: @(#)m_at_t3100e_vid.c 1.0.5 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -758,6 +758,5 @@ const device_t t3100e_device =
NULL,
NULL,
t3100e_speed_changed,
NULL,
NULL
};

4
src/machine/m_europc.c
View File

@@ -68,7 +68,7 @@
*
* WARNING THIS IS A WORK-IN-PROGRESS MODULE. USE AT OWN RISK.
*
* Version: @(#)europc.c 1.0.4 2018/04/11
* Version: @(#)europc.c 1.0.5 2018/04/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -702,7 +702,7 @@ const device_t europc_device = {
"EuroPC System Board",
0, 0,
europc_boot, europc_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
europc_config
};

4
src/machine/m_olivetti_m24.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Olivetti M24.
*
* Version: @(#)m_olivetti_m24.c 1.0.13 2018/04/10
* Version: @(#)m_olivetti_m24.c 1.0.14 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -795,7 +795,7 @@ const device_t m24_device = {
NULL, vid_close, NULL,
NULL,
speed_changed,
NULL, NULL,
NULL,
NULL
};

3
src/machine/m_pcjr.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the IBM PCjr.
*
* Version: @(#)m_pcjr.c 1.0.6 2018/03/18
* Version: @(#)m_pcjr.c 1.0.7 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -721,7 +721,6 @@ static const device_t pcjr_device = {
NULL,
speed_changed,
NULL,
NULL,
pcjr_config
};

3
src/machine/m_ps1.c
View File

@@ -28,7 +28,7 @@
* boot. Sometimes, they do, and then it shows an "Incorrect
* DOS" error message?? --FvK
*
* Version: @(#)m_ps1.c 1.0.8 2018/04/10
* Version: @(#)m_ps1.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -267,7 +267,6 @@ static const device_t snd_device = {
snd_init, snd_close, NULL,
NULL,
NULL,
NULL,
NULL
};

4
src/machine/m_ps1_hdc.c
View File

@@ -43,7 +43,7 @@
* Type table with the main code, so the user can only select
* items from that list...
*
* Version: @(#)m_ps1_hdc.c 1.0.3 2018/04/23
* Version: @(#)m_ps1_hdc.c 1.0.4 2018/04/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -1497,7 +1497,7 @@ const device_t ps1_hdc_device = {
DEVICE_ISA | DEVICE_PS2,
0,
ps1_hdc_init, ps1_hdc_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

7
src/machine/m_tandy.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of Tandy models 1000, 1000HX and 1000SL2.
*
* Version: @(#)m_tandy.c 1.0.5 2018/03/19
* Version: @(#)m_tandy.c 1.0.6 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1381,7 +1381,6 @@ static const device_t vid_device = {
NULL,
vid_speed_changed,
NULL,
NULL,
vid_config
};
@@ -1392,7 +1391,6 @@ static const device_t vid_device_hx = {
NULL,
vid_speed_changed,
NULL,
NULL,
vid_config
};
@@ -1403,7 +1401,6 @@ static const device_t vid_device_sl = {
NULL,
vid_speed_changed,
NULL,
NULL,
NULL
};
@@ -1552,7 +1549,7 @@ static const device_t eep_device = {
"Tandy 1000 EEPROM",
0, 0,
eep_init, eep_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

4
src/machine/m_xt_t1000_vid.c
View File

@@ -9,7 +9,7 @@
* Implementation of the Toshiba T1000 plasma display, which
* has a fixed resolution of 640x200 pixels.
*
* Version: @(#)m_xt_t1000_vid.c 1.0.5 2018/03/18
* Version: @(#)m_xt_t1000_vid.c 1.0.6 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -736,7 +736,6 @@ const device_t t1000_video_device = {
NULL,
t1000_speed_changed,
NULL,
NULL,
t1000_config
};
@@ -748,6 +747,5 @@ const device_t t1200_video_device = {
NULL,
t1000_speed_changed,
NULL,
NULL,
t1000_config
};

1
src/machine/m_xt_xi8088.c
View File

@@ -112,7 +112,6 @@ const device_t xi8088_device =
NULL,
NULL,
NULL,
NULL,
xi8088_config
};

6
src/mouse.c
View File

@@ -11,7 +11,7 @@
* TODO: Add the Genius bus- and serial mouse.
* Remove the '3-button' flag from mouse types.
*
* Version: @(#)mouse.c 1.0.25 2018/03/19
* Version: @(#)mouse.c 1.0.26 2018/04/26
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -45,14 +45,14 @@ static const device_t mouse_none_device = {
"None",
0, MOUSE_TYPE_NONE,
NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};
static const device_t mouse_internal_device = {
"Internal Mouse",
0, MOUSE_TYPE_INTERNAL,
NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

6
src/mouse_bus.c
View File

@@ -49,7 +49,7 @@
*
* Based on an early driver for MINIX 1.5.
*
* Version: @(#)mouse_bus.c 1.0.32 2018/03/18
* Version: @(#)mouse_bus.c 1.0.33 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -767,7 +767,7 @@ const device_t mouse_logibus_device = {
DEVICE_ISA,
MOUSE_TYPE_LOGIBUS,
bm_init, bm_close, NULL,
bm_poll, NULL, NULL, NULL,
bm_poll, NULL, NULL,
bm_config
};
@@ -776,6 +776,6 @@ const device_t mouse_msinport_device = {
DEVICE_ISA,
MOUSE_TYPE_INPORT,
bm_init, bm_close, NULL,
bm_poll, NULL, NULL, NULL,
bm_poll, NULL, NULL,
bm_config
};

4
src/mouse_ps2.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of PS/2 series Mouse devices.
*
* Version: @(#)mouse_ps2.c 1.0.6 2018/03/18
* Version: @(#)mouse_ps2.c 1.0.7 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -292,6 +292,6 @@ const device_t mouse_ps2_device = {
0,
MOUSE_TYPE_PS2,
mouse_ps2_init, ps2_close, NULL,
ps2_poll, NULL, NULL, NULL,
ps2_poll, NULL, NULL,
ps2_config
};

6
src/mouse_serial.c
View File

@@ -10,7 +10,7 @@
*
* TODO: Add the Genius Serial Mouse.
*
* Version: @(#)mouse_serial.c 1.0.21 2018/03/18
* Version: @(#)mouse_serial.c 1.0.22 2018/04/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -288,7 +288,7 @@ const device_t mouse_mssystems_device = {
0,
MOUSE_TYPE_MSYSTEMS,
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_poll, NULL, NULL,
sermouse_config
};
@@ -297,6 +297,6 @@ const device_t mouse_msserial_device = {
0,
0,
sermouse_init, sermouse_close, NULL,
sermouse_poll, NULL, NULL, NULL,
sermouse_poll, NULL, NULL,
sermouse_config
};

10
src/network/net_ne2000.c
View File

@@ -12,7 +12,7 @@
* - Realtek RTL8019AS (ISA 16-bit, PnP);
* - Realtek RTL8029AS (PCI).
*
* Version: @(#)net_ne2000.c 1.0.3 2018/03/15
* Version: @(#)net_ne2000.c 1.0.4 2018/04/26
*
* Based on @(#)ne2k.cc v1.56.2.1 2004/02/02 22:37:22 cbothamy
*
@@ -2814,7 +2814,7 @@ const device_t ne1000_device = {
DEVICE_ISA,
NE2K_NE1000,
nic_init, nic_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
ne1000_config
};
@@ -2823,7 +2823,7 @@ const device_t ne2000_device = {
DEVICE_ISA | DEVICE_AT,
NE2K_NE2000,
nic_init, nic_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
ne2000_config
};
@@ -2832,7 +2832,7 @@ const device_t rtl8019as_device = {
DEVICE_ISA | DEVICE_AT,
NE2K_RTL8019AS,
nic_init, nic_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
rtl8019as_config
};
@@ -2841,6 +2841,6 @@ const device_t rtl8029as_device = {
DEVICE_PCI,
NE2K_RTL8029AS,
nic_init, nic_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
rtl8029as_config
};

8
src/nvr_at.c
View File

@@ -189,7 +189,7 @@
* including the later update (DS12887A) which implemented a
* "century" register to be compatible with Y2K.
*
* Version: @(#)nvr_at.c 1.0.5 2018/04/09
* Version: @(#)nvr_at.c 1.0.6 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -721,7 +721,7 @@ const device_t at_nvr_device = {
DEVICE_ISA | DEVICE_AT,
0,
nvr_at_init, nvr_at_close, NULL,
NULL, NULL, NULL,
NULL, NULL,
NULL
};
@@ -730,7 +730,7 @@ const device_t ps_nvr_device = {
DEVICE_PS2,
1,
nvr_at_init, nvr_at_close, NULL,
NULL, NULL, NULL,
NULL, NULL,
NULL
};
@@ -739,6 +739,6 @@ const device_t amstrad_nvr_device = {
MACHINE_ISA | MACHINE_AT,
2,
nvr_at_init, nvr_at_close, NULL,
NULL, NULL, NULL,
NULL, NULL,
NULL
};

4
src/nvr_ps2.c
View File

@@ -8,7 +8,7 @@
*
* Handling of the PS/2 series CMOS devices.
*
* Version: @(#)nvr_ps2.c 1.0.6 2018/03/20
* Version: @(#)nvr_ps2.c 1.0.7 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -169,6 +169,6 @@ const device_t ps2_nvr_device = {
"PS/2 Secondary NVRAM",
0, 0,
ps2_nvr_init, ps2_nvr_close, NULL,
NULL, NULL, NULL,
NULL, NULL,
NULL
};

63
src/pc.c
View File

@@ -8,7 +8,7 @@
*
* Main emulator module where most things are controlled.
*
* Version: @(#)pc.c 1.0.69 2018/03/26
* Version: @(#)pc.c 1.0.70 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -127,17 +127,7 @@ extern int
readlnum,
writelnum;
int sndcount = 0;
int sreadlnum,
swritelnum,
segareads,
segawrites,
scycles_lost;
float mips, flops;
int cycles_lost = 0; /* video */
int insc = 0; /* cpu */
int emu_fps = 0, fps; /* video */
int framecount;
int fps, framecount; /* emulator % */
int CPUID;
int output;
@@ -909,7 +899,6 @@ pc_thread(void *param)
wchar_t wmachine[2048];
uint64_t start_time, end_time;
uint32_t old_time, new_time;
int status_update_needed;
int done, drawits, frames;
int *quitp = (int *)param;
int framecountx;
@@ -918,16 +907,10 @@ pc_thread(void *param)
main_time = 0;
framecountx = 0;
status_update_needed = title_update = 1;
title_update = 1;
old_time = plat_get_ticks();
done = drawits = frames = 0;
while (! *quitp) {
/* Update the Stat(u)s window with the current info. */
if (status_update_needed) {
ui_status_update();
status_update_needed = 0;
}
/* See if it is time to run a frame of code. */
new_time = plat_get_ticks();
drawits += (new_time - old_time);
@@ -967,50 +950,10 @@ pc_thread(void *param)
if (++framecountx >= 100) {
framecountx = 0;
/* FIXME: all this should go into a "stats" struct! */
mips = (float)insc/1000000.0f;
insc = 0;
flops = (float)fpucount/1000000.0f;
fpucount = 0;
sreadlnum = readlnum;
swritelnum = writelnum;
segareads = egareads;
segawrites = egawrites;
scycles_lost = cycles_lost;
#ifdef USE_DYNAREC
cpu_recomp_blocks_latched = cpu_recomp_blocks;
cpu_recomp_ins_latched = cpu_state.cpu_recomp_ins;
cpu_recomp_full_ins_latched = cpu_recomp_full_ins;
cpu_new_blocks_latched = cpu_new_blocks;
cpu_recomp_flushes_latched = cpu_recomp_flushes;
cpu_recomp_evicted_latched = cpu_recomp_evicted;
cpu_recomp_reuse_latched = cpu_recomp_reuse;
cpu_recomp_removed_latched = cpu_recomp_removed;
cpu_reps_latched = cpu_reps;
cpu_notreps_latched = cpu_notreps;
cpu_recomp_blocks = 0;
cpu_state.cpu_recomp_ins = 0;
cpu_recomp_full_ins = 0;
cpu_new_blocks = 0;
cpu_recomp_flushes = 0;
cpu_recomp_evicted = 0;
cpu_recomp_reuse = 0;
cpu_recomp_removed = 0;
cpu_reps = 0;
cpu_notreps = 0;
#endif
readlnum = writelnum = 0;
egareads = egawrites = 0;
cycles_lost = 0;
mmuflush = 0;
emu_fps = frames;
frames = 0;
/* We need a Status window update now. */
status_update_needed = 1;
}
if (title_update) {

10
src/scsi/scsi_aha154x.c
View File

@@ -10,7 +10,7 @@
* made by Adaptec, Inc. These controllers were designed for
* the ISA bus.
*
* Version: @(#)scsi_aha154x.c 1.0.40 2018/04/11
* Version: @(#)scsi_aha154x.c 1.0.41 2018/04/26
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -1113,7 +1113,7 @@ const device_t aha1540b_device = {
DEVICE_ISA | DEVICE_AT,
AHA_154xB,
aha_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
aha_154xb_config
};
@@ -1122,7 +1122,7 @@ const device_t aha1542c_device = {
DEVICE_ISA | DEVICE_AT,
AHA_154xC,
aha_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
aha_154x_config
};
@@ -1131,7 +1131,7 @@ const device_t aha1542cf_device = {
DEVICE_ISA | DEVICE_AT,
AHA_154xCF,
aha_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
aha_154x_config
};
@@ -1140,6 +1140,6 @@ const device_t aha1640_device = {
DEVICE_MCA,
AHA_1640,
aha_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

14
src/scsi/scsi_buslogic.c
View File

@@ -11,7 +11,7 @@
* 1 - BT-545S ISA;
* 2 - BT-958D PCI
*
* Version: @(#)scsi_buslogic.c 1.0.37 2018/03/28
* Version: @(#)scsi_buslogic.c 1.0.38 2018/04/26
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -1776,7 +1776,7 @@ const device_t buslogic_device = {
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_542,
buslogic_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
BT_ISA_Config
};
@@ -1785,7 +1785,7 @@ const device_t buslogic_545s_device = {
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA,
buslogic_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
BT_ISA_Config
};
@@ -1794,16 +1794,16 @@ const device_t buslogic_640a_device = {
DEVICE_MCA,
CHIP_BUSLOGIC_MCA,
buslogic_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};
const device_t buslogic_445s_device = {
"Buslogic BT-445S ISA",
"Buslogic BT-445S VLB",
DEVICE_VLB,
CHIP_BUSLOGIC_VLB,
buslogic_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
BT_ISA_Config
};
@@ -1812,6 +1812,6 @@ const device_t buslogic_pci_device = {
DEVICE_PCI,
CHIP_BUSLOGIC_PCI,
buslogic_init, x54x_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
BT958D_Config
};

10
src/scsi/scsi_ncr5380.c
View File

@@ -9,7 +9,7 @@
* Implementation of the NCR 5380 series of SCSI Host Adapters
* made by NCR. These controllers were designed for the ISA bus.
*
* Version: @(#)scsi_ncr5380.c 1.0.13 2018/04/11
* Version: @(#)scsi_ncr5380.c 1.0.14 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* TheCollector1995, <mariogplayer@gmail.com>
@@ -1052,7 +1052,7 @@ const device_t scsi_lcs6821n_device =
0,
ncr_init, ncr_close, NULL,
lcs6821n_available,
NULL, NULL, NULL,
NULL, NULL,
NULL
};
@@ -1063,7 +1063,7 @@ const device_t scsi_rt1000b_device =
1,
ncr_init, ncr_close, NULL,
rt1000b_available,
NULL, NULL, NULL,
NULL, NULL,
NULL
};
@@ -1074,7 +1074,7 @@ const device_t scsi_t130b_device =
2,
ncr_init, ncr_close, NULL,
t130b_available,
NULL, NULL, NULL,
NULL, NULL,
NULL
};
@@ -1085,6 +1085,6 @@ const device_t scsi_scsiat_device =
3,
ncr_init, ncr_close, NULL,
scsiat_available,
NULL, NULL, NULL,
NULL, NULL,
scsiat_config
};

4
src/scsi/scsi_ncr53c810.c
View File

@@ -10,7 +10,7 @@
* NCR and later Symbios and LSI. This controller was designed
* for the PCI bus.
*
* Version: @(#)scsi_ncr53c810.c 1.0.11 2018/03/28
* Version: @(#)scsi_ncr53c810.c 1.0.12 2018/04/26
*
* Authors: Paul Brook (QEMU)
* Artyom Tarasenko (QEMU)
@@ -2186,6 +2186,6 @@ const device_t ncr53c810_pci_device =
0,
ncr53c810_init, ncr53c810_close, NULL,
NULL,
NULL, NULL, NULL,
NULL, NULL,
NULL
};

1
src/sound/midi_fluidsynth.c
View File

@@ -577,7 +577,6 @@ const device_t fluidsynth_device =
fluidsynth_available,
NULL,
NULL,
NULL,
fluidsynth_config
};

2
src/sound/midi_mt32.c
View File

@@ -323,7 +323,6 @@ const device_t mt32_device =
mt32_available,
NULL,
NULL,
NULL,
mt32_config
};
@@ -338,6 +337,5 @@ const device_t cm32l_device =
cm32l_available,
NULL,
NULL,
NULL,
mt32_config
};

1
src/sound/midi_system.c
View File

@@ -62,6 +62,5 @@ const device_t system_midi_device =
system_midi_available,
NULL,
NULL,
NULL,
system_midi_config
};

4
src/sound/snd_adlib.c
View File

@@ -100,7 +100,7 @@ const device_t adlib_device =
DEVICE_ISA,
0,
adlib_init, adlib_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};
@@ -110,6 +110,6 @@ const device_t adlib_mca_device =
DEVICE_MCA,
0,
adlib_init, adlib_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

1
src/sound/snd_adlibgold.c
View File

@@ -847,6 +847,5 @@ const device_t adgold_device =
NULL,
NULL,
NULL,
NULL,
adgold_config
};

9
src/sound/snd_audiopci.c
View File

@@ -1294,14 +1294,6 @@ void es1371_add_status_info_dac(es1371_t *es1371, char *s, int max_len, int dac_
}
}
void es1371_add_status_info(char *s, int max_len, void *p)
{
es1371_t *es1371 = (es1371_t *)p;
es1371_add_status_info_dac(es1371, s, max_len, 0);
es1371_add_status_info_dac(es1371, s, max_len, 1);
}
const device_t es1371_device =
{
"Ensoniq AudioPCI (ES1371)",
@@ -1313,6 +1305,5 @@ const device_t es1371_device =
NULL,
es1371_speed_changed,
NULL,
es1371_add_status_info,
NULL
};

2
src/sound/snd_cms.c
View File

@@ -198,6 +198,6 @@ const device_t cms_device =
"Creative Music System / Game Blaster",
0, 0,
cms_init, cms_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

2
src/sound/snd_gus.c
View File

@@ -1063,6 +1063,6 @@ const device_t gus_device =
"Gravis UltraSound",
0, 0,
gus_init, gus_close, NULL, NULL,
gus_speed_changed, NULL, NULL,
gus_speed_changed, NULL,
NULL
};

3
src/sound/snd_mpu401.c
View File

@@ -8,7 +8,7 @@
*
* Roland MPU-401 emulation.
*
* Version: @(#)snd_mpu401.c 1.0.8 2018/03/18
* Version: @(#)snd_mpu401.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* DOSBox Team,
@@ -987,6 +987,5 @@ const device_t mpu401_device = {
NULL,
NULL,
NULL,
NULL,
mpu401_standalone_config
};

2
src/sound/snd_pas16.c
View File

@@ -752,6 +752,6 @@ const device_t pas16_device =
DEVICE_ISA | DEVICE_NOT_WORKING,
0,
pas16_init, pas16_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

1
src/sound/snd_pssj.c
View File

@@ -214,6 +214,5 @@ const device_t pssj_device =
NULL,
NULL,
NULL,
NULL,
NULL
};

18
src/sound/snd_sb.c
View File

@@ -8,7 +8,7 @@
*
* Sound Blaster emulation.
*
* Version: @(#)sound_sb.c 1.0.7 2018/04/18
* Version: @(#)sound_sb.c 1.0.8 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1362,13 +1362,6 @@ void sb_speed_changed(void *p)
sb_dsp_speed_changed(&sb->dsp);
}
void sb_add_status_info(char *s, int max_len, void *p)
{
sb_t *sb = (sb_t *)p;
sb_dsp_add_status_info(s, max_len, &sb->dsp);
}
static const device_config_t sb_config[] =
{
{
@@ -1853,7 +1846,6 @@ const device_t sb_1_device =
sb_1_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_config
};
const device_t sb_15_device =
@@ -1864,7 +1856,6 @@ const device_t sb_15_device =
sb_15_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_config
};
const device_t sb_mcv_device =
@@ -1875,7 +1866,6 @@ const device_t sb_mcv_device =
sb_mcv_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_mcv_config
};
const device_t sb_2_device =
@@ -1886,7 +1876,6 @@ const device_t sb_2_device =
sb_2_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_config
};
const device_t sb_pro_v1_device =
@@ -1897,7 +1886,6 @@ const device_t sb_pro_v1_device =
sb_pro_v1_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_pro_config
};
const device_t sb_pro_v2_device =
@@ -1908,7 +1896,6 @@ const device_t sb_pro_v2_device =
sb_pro_v2_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_pro_config
};
const device_t sb_pro_mcv_device =
@@ -1919,7 +1906,6 @@ const device_t sb_pro_mcv_device =
sb_pro_mcv_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
NULL
};
const device_t sb_16_device =
@@ -1930,7 +1916,6 @@ const device_t sb_16_device =
sb_16_init, sb_close, NULL, NULL,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_16_config
};
const device_t sb_awe32_device =
@@ -1942,6 +1927,5 @@ const device_t sb_awe32_device =
sb_awe32_available,
sb_speed_changed,
NULL,
sb_add_status_info,
sb_awe32_config
};

64
src/sound/snd_sb_dsp.c
View File

@@ -1243,67 +1243,3 @@ void sb_dsp_close(sb_dsp_t *dsp)
}
#endif
}
void sb_dsp_add_status_info(char *s, int max_len, sb_dsp_t *dsp)
{
char temps[128];
int freq;
if (dsp->sb_timeo < 256LL)
freq = 1000000 / (256LL - dsp->sb_timeo);
else
freq = dsp->sb_timeo - 256LL;
if (dsp->sb_8_enable && dsp->sb_8_output)
{
switch (dsp->sb_8_format)
{
case 0x00: /*Mono unsigned*/
case 0x10: /*Mono signed*/
if (dsp->sb_type >= SBPRO && dsp->sb_type < SB16 && dsp->stereo)
{
strcpy(temps, "SB playback format : 8-bit stereo\n");
freq /= 2;
}
else
strcpy(temps, "SB playback format : 8-bit mono\n");
break;
case 0x20: /*Stereo unsigned*/
case 0x30: /*Stereo signed*/
strcpy(temps, "SB playback format : 8-bit stereo\n");
break;
case ADPCM_4:
strcpy(temps, "SB playback format : 4-bit ADPCM\n");
break;
case ADPCM_26:
strcpy(temps, "SB playback format : 2.6-bit ADPCM\n");
break;
case ADPCM_2:
strcpy(temps, "SB playback format : 2-bit ADPCM\n");
break;
}
}
else if (dsp->sb_16_enable && dsp->sb_16_output)
{
switch (dsp->sb_16_format)
{
case 0x00: /*Mono unsigned*/
case 0x10: /*Mono signed*/
strcpy(temps, "SB playback format : 16-bit mono\n");
break;
case 0x20: /*Stereo unsigned*/
case 0x30: /*Stereo signed*/
strcpy(temps, "SB playback format : 16-bit stereo\n");
break;
}
}
else
strcpy(temps, "SB playback stopped\n");
strncat(s, temps, max_len);
if ((dsp->sb_8_enable && dsp->sb_8_output) || (dsp->sb_16_enable && dsp->sb_16_output))
{
sprintf(temps, "SB playback frequency : %iHz\n", freq);
strncat(s, temps, max_len);
}
}

2
src/sound/snd_sb_dsp.h
View File

@@ -87,6 +87,4 @@ void sb_dsp_poll(sb_dsp_t *dsp, int16_t *l, int16_t *r);
void sb_dsp_set_stereo(sb_dsp_t *dsp, int stereo);
void sb_dsp_add_status_info(char *s, int max_len, sb_dsp_t *dsp);
void sb_dsp_update(sb_dsp_t *dsp);

4
src/sound/snd_sn76489.c
View File

@@ -238,7 +238,7 @@ const device_t sn76489_device =
0,
sn76489_device_init,
sn76489_device_close,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};
const device_t ncr8496_device =
@@ -248,6 +248,6 @@ const device_t ncr8496_device =
0,
ncr8496_device_init,
sn76489_device_close,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

2
src/sound/snd_ssi2001.c
View File

@@ -84,6 +84,6 @@ const device_t ssi2001_device =
"Innovation SSI-2001",
0, 0,
ssi2001_init, ssi2001_close, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
NULL
};

2
src/sound/snd_wss.c
View File

@@ -119,6 +119,6 @@ const device_t wss_device =
wss_init, wss_close, NULL,
NULL,
wss_speed_changed,
NULL, NULL,
NULL,
NULL
};

12
src/video/vid_ati18800.c
View File

@@ -8,7 +8,7 @@
*
* ATI 18800 emulation (VGA Edge-16)
*
* Version: @(#)vid_ati18800.c 1.0.10 2018/04/09
* Version: @(#)vid_ati18800.c 1.0.11 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -265,13 +265,6 @@ static void ati18800_force_redraw(void *p)
ati18800->svga.fullchange = changeframecount;
}
static void ati18800_add_status_info(char *s, int max_len, void *p)
{
ati18800_t *ati18800 = (ati18800_t *)p;
svga_add_status_info(s, max_len, &ati18800->svga);
}
#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
const device_t ati18800_wonder_device =
{
@@ -283,7 +276,6 @@ const device_t ati18800_wonder_device =
ati18800_wonder_available,
ati18800_speed_changed,
ati18800_force_redraw,
ati18800_add_status_info,
NULL
};
#endif
@@ -298,7 +290,6 @@ const device_t ati18800_vga88_device =
ati18800_vga88_available,
ati18800_speed_changed,
ati18800_force_redraw,
ati18800_add_status_info,
NULL
};
@@ -312,6 +303,5 @@ const device_t ati18800_device =
ati18800_available,
ati18800_speed_changed,
ati18800_force_redraw,
ati18800_add_status_info,
NULL
};

24
src/video/vid_ati28800.c
View File

@@ -8,7 +8,7 @@
*
* ATI 28800 emulation (VGA Charger and Korean VGA)
*
* Version: @(#)vid_ati28800.c 1.0.16 2018/03/24
* Version: @(#)vid_ati28800.c 1.0.17 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -520,24 +520,6 @@ ati28800_force_redraw(void *priv)
ati->svga.fullchange = changeframecount;
}
static void ati28800_add_status_info(char *s, int max_len, void *priv)
{
ati28800_t *ati = (ati28800_t *)priv;
svga_add_status_info(s, max_len, &ati->svga);
}
void ati28800k_add_status_info(char *s, int max_len, void *p)
{
ati28800_t *ati28800 = (ati28800_t *)p;
char temps[128];
ati28800_add_status_info(s, max_len, p);
sprintf(temps, "Korean SVGA mode enabled : %s\n\n", ati28800->ksc5601_mode_enabled ? "Yes" : "No");
strncat(s, temps, max_len);
}
static const device_config_t ati28800_config[] =
{
@@ -598,7 +580,6 @@ const device_t ati28800_device =
ati28800_available,
ati28800_speed_changed,
ati28800_force_redraw,
ati28800_add_status_info,
ati28800_config
};
@@ -611,7 +592,6 @@ const device_t ati28800k_device =
ati28800k_available,
ati28800_speed_changed,
ati28800_force_redraw,
ati28800k_add_status_info,
ati28800_config
};
@@ -624,7 +604,6 @@ const device_t compaq_ati28800_device =
compaq_ati28800_available,
ati28800_speed_changed,
ati28800_force_redraw,
ati28800_add_status_info,
ati28800_config
};
@@ -638,7 +617,6 @@ const device_t ati28800_wonderxl24_device =
ati28800_wonderxl24_available,
ati28800_speed_changed,
ati28800_force_redraw,
ati28800_add_status_info,
ati28800_wonderxl_config
};
#endif

54
src/video/vid_ati_mach64.c
View File

@@ -8,7 +8,7 @@
*
* ATi Mach64 graphics card emulation.
*
* Version: @(#)vid_ati_mach64.c 1.0.19 2018/04/02
* Version: @(#)vid_ati_mach64.c 1.0.20 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -3525,54 +3525,6 @@ void mach64_force_redraw(void *p)
mach64->svga.fullchange = changeframecount;
}
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 = plat_timer_read();
uint64_t status_diff = new_time - mach64->status_time;
mach64->status_time = new_time;
if (((mach64->crtc_gen_cntl >> 24) & 3) == 3)
{
svga_t *svga = &mach64->svga;
char temps[128];
int bpp = 4;
strncat(s, "Mach64 in native mode\n", max_len);
switch ((mach64->crtc_gen_cntl >> 8) & 7)
{
case 1: bpp = 4; break;
case 2: bpp = 8; break;
case 3: bpp = 15; break;
case 4: bpp = 16; break;
case 5: bpp = 24; break;
case 6: bpp = 32; break;
}
sprintf(temps, "Mach64 colour depth : %i bpp\n", bpp);
strncat(s, temps, max_len);
sprintf(temps, "Mach64 resolution : %i x %i\n", svga->hdisp, svga->dispend);
strncat(s, temps, max_len);
sprintf(temps, "Mach64 refresh rate : %i Hz\n\n", svga->frames);
svga->frames = 0;
strncat(s, temps, max_len);
}
else
{
strncat(s, "Mach64 in SVGA mode\n", max_len);
svga_add_status_info(s, max_len, &mach64->svga);
}
sprintf(temps, "%f%% CPU\n%f%% CPU (real)\n\n", ((double)mach64->blitter_time * 100.0) / timer_freq, ((double)mach64->blitter_time * 100.0) / status_diff);
strncat(s, temps, max_len);
mach64->blitter_time = 0;
}
static const device_config_t mach64gx_config[] =
{
{
@@ -3627,7 +3579,6 @@ const device_t mach64gx_isa_device =
mach64gx_isa_available,
mach64_speed_changed,
mach64_force_redraw,
mach64_add_status_info,
mach64gx_config
};
@@ -3640,7 +3591,6 @@ const device_t mach64gx_vlb_device =
mach64gx_vlb_available,
mach64_speed_changed,
mach64_force_redraw,
mach64_add_status_info,
mach64gx_config
};
@@ -3653,7 +3603,6 @@ const device_t mach64gx_pci_device =
mach64gx_available,
mach64_speed_changed,
mach64_force_redraw,
mach64_add_status_info,
mach64gx_config
};
@@ -3666,6 +3615,5 @@ const device_t mach64vt2_device =
mach64vt2_available,
mach64_speed_changed,
mach64_force_redraw,
mach64_add_status_info,
mach64vt2_config
};

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.14 2018/03/18
* Version: @(#)vid_cga.c 1.0.15 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -595,6 +595,5 @@ const device_t cga_device =
NULL,
cga_speed_changed,
NULL,
NULL,
cga_config
};

45
src/video/vid_cl54xx.c
View File

@@ -9,7 +9,7 @@
* Emulation of select Cirrus Logic cards (CL-GD 5428,
* CL-GD 5429, CL-GD 5430, CL-GD 5434 and CL-GD 5436 are supported).
*
* Version: @(#)vid_cl_54xx.c 1.0.17 2018/04/02
* Version: @(#)vid_cl_54xx.c 1.0.18 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Barry Rodewald,
@@ -1202,10 +1202,8 @@ gd54xx_readw_linear(uint32_t addr, void *p)
temp = svga_readb_linear(addr + 1, p);
temp |= (svga_readb_linear(addr, p) << 8);
if (svga->fast) {
if (svga->fast)
cycles -= video_timing_read_w;
cycles_lost += video_timing_read_w;
}
return temp;
case 3:
@@ -1263,10 +1261,8 @@ gd54xx_readl_linear(uint32_t addr, void *p)
temp |= (svga_readb_linear(addr + 3, p) << 16);
temp |= (svga_readb_linear(addr + 2, p) << 24);
if (svga->fast) {
if (svga->fast)
cycles -= video_timing_read_l;
cycles_lost += video_timing_read_l;
}
return temp;
case 2:
@@ -1275,10 +1271,8 @@ gd54xx_readl_linear(uint32_t addr, void *p)
temp |= (svga_readb_linear(addr + 1, p) << 16);
temp |= (svga_readb_linear(addr, p) << 24);
if (svga->fast) {
if (svga->fast)
cycles -= video_timing_read_l;
cycles_lost += video_timing_read_l;
}
return temp;
case 3:
@@ -1382,10 +1376,8 @@ gd54xx_writew_linear(uint32_t addr, uint16_t val, void *p)
svga_writeb_linear(addr + 1, val & 0xff, svga);
svga_writeb_linear(addr, val >> 8, svga);
if (svga->fast) {
if (svga->fast)
cycles -= video_timing_write_w;
cycles_lost += video_timing_write_w;
}
case 3:
return;
}
@@ -1475,10 +1467,8 @@ gd54xx_writel_linear(uint32_t addr, uint32_t val, void *p)
return;
}
if (svga->fast) {
if (svga->fast)
cycles -= video_timing_write_l;
cycles_lost += video_timing_write_l;
}
} else {
switch(ap) {
case 0:
@@ -2349,15 +2339,6 @@ gd54xx_force_redraw(void *p)
}
void
gd54xx_add_status_info(char *s, int max_len, void *p)
{
gd54xx_t *gd54xx = (gd54xx_t *)p;
svga_add_status_info(s, max_len, &gd54xx->svga);
}
static const device_config_t gd5428_config[] =
{
{
@@ -2423,7 +2404,6 @@ const device_t gd5426_vlb_device =
gd5426_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2438,7 +2418,6 @@ const device_t gd5428_isa_device =
gd5428_isa_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2453,7 +2432,6 @@ const device_t gd5428_vlb_device =
gd5428_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2468,7 +2446,6 @@ const device_t gd5429_isa_device =
gd5429_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2483,7 +2460,6 @@ const device_t gd5429_vlb_device =
gd5429_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2498,7 +2474,6 @@ const device_t gd5430_vlb_device =
gd5430_vlb_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2513,7 +2488,6 @@ const device_t gd5430_pci_device =
gd5430_pci_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5428_config
};
@@ -2528,7 +2502,6 @@ const device_t gd5434_isa_device =
gd5434_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2543,7 +2516,6 @@ const device_t gd5434_vlb_device =
gd5434_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2558,7 +2530,6 @@ const device_t gd5434_pci_device =
gd5434_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2573,7 +2544,6 @@ const device_t gd5436_pci_device =
gd5436_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2588,7 +2558,6 @@ const device_t gd5446_pci_device =
gd5446_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2603,7 +2572,6 @@ const device_t gd5446_stb_pci_device =
gd5446_stb_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};
@@ -2618,6 +2586,5 @@ const device_t gd5480_pci_device =
gd5480_available,
gd54xx_speed_changed,
gd54xx_force_redraw,
gd54xx_add_status_info,
gd5434_config
};

3
src/video/vid_colorplus.c
View File

@@ -8,7 +8,7 @@
*
* Plantronics ColorPlus emulation.
*
* Version: @(#)vid_colorplus.c 1.0.8 2018/03/18
* Version: @(#)vid_colorplus.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -473,6 +473,5 @@ const device_t colorplus_device =
NULL, NULL,
colorplus_speed_changed,
NULL,
NULL,
colorplus_config
};

2
src/video/vid_compaq_cga.c
View File

@@ -444,7 +444,6 @@ const device_t compaq_cga_device =
NULL,
compaq_cga_speed_changed,
NULL,
NULL,
cga_config
};
@@ -458,6 +457,5 @@ const device_t compaq_cga_2_device =
NULL,
compaq_cga_speed_changed,
NULL,
NULL,
cga_config
};

8
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.16 2018/03/18
* Version: @(#)vid_ega.c 1.0.17 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -683,7 +683,6 @@ void ega_write(uint32_t addr, uint8_t val, void *p)
egawrites++;
cycles -= video_timing_write_b;
cycles_lost += video_timing_write_b;
if (addr >= 0xB0000) addr &= 0x7fff;
else addr &= 0xffff;
@@ -820,7 +819,6 @@ uint8_t ega_read(uint32_t addr, void *p)
egareads++;
cycles -= video_timing_read_b;
cycles_lost += video_timing_read_b;
if (addr >= 0xb0000) addr &= 0x7fff;
else addr &= 0xffff;
@@ -1253,7 +1251,6 @@ const device_t ega_device =
ega_standalone_available,
ega_speed_changed,
NULL,
NULL,
ega_config
};
@@ -1266,7 +1263,6 @@ const device_t cpqega_device =
cpqega_standalone_available,
ega_speed_changed,
NULL,
NULL,
ega_config
};
@@ -1279,7 +1275,6 @@ const device_t sega_device =
sega_standalone_available,
ega_speed_changed,
NULL,
NULL,
ega_config
};
@@ -1293,7 +1288,6 @@ const device_t jega_device =
sega_standalone_available,
ega_speed_changed,
NULL,
NULL,
ega_config
};
#endif

10
src/video/vid_et4000.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Tseng Labs ET4000.
*
* Version: @(#)vid_et4000.c 1.0.5 2018/03/18
* Version: @(#)vid_et4000.c 1.0.6 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -206,13 +206,6 @@ void et4000_force_redraw(void *p)
et4000->svga.fullchange = changeframecount;
}
void et4000_add_status_info(char *s, int max_len, void *p)
{
et4000_t *et4000 = (et4000_t *)p;
svga_add_status_info(s, max_len, &et4000->svga);
}
const device_t et4000_device =
{
"Tseng Labs ET4000AX",
@@ -221,6 +214,5 @@ const device_t et4000_device =
et4000_available,
et4000_speed_changed,
et4000_force_redraw,
et4000_add_status_info,
NULL
};

22
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.8 2018/04/02
* Version: @(#)vid_et4000w32.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1301,22 +1301,6 @@ void et4000w32p_force_redraw(void *p)
et4000w32p->svga.fullchange = changeframecount;
}
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 = plat_timer_read();
uint64_t status_diff = new_time - et4000->status_time;
et4000->status_time = new_time;
svga_add_status_info(s, max_len, &et4000->svga);
sprintf(temps, "%f%% CPU\n%f%% CPU (real)\n\n", ((double)et4000->blitter_time * 100.0) / timer_freq, ((double)et4000->blitter_time * 100.0) / status_diff);
strncat(s, temps, max_len);
et4000->blitter_time = 0;
}
static const device_config_t et4000w32p_config[] =
{
{
@@ -1346,7 +1330,6 @@ const device_t et4000w32p_cardex_vlb_device =
et4000w32p_cardex_available,
et4000w32p_speed_changed,
et4000w32p_force_redraw,
et4000w32p_add_status_info,
et4000w32p_config
};
@@ -1358,7 +1341,6 @@ const device_t et4000w32p_cardex_pci_device =
et4000w32p_cardex_available,
et4000w32p_speed_changed,
et4000w32p_force_redraw,
et4000w32p_add_status_info,
et4000w32p_config
};
@@ -1371,7 +1353,6 @@ const device_t et4000w32p_vlb_device =
et4000w32p_available,
et4000w32p_speed_changed,
et4000w32p_force_redraw,
et4000w32p_add_status_info,
et4000w32p_config
};
@@ -1383,7 +1364,6 @@ const device_t et4000w32p_pci_device =
et4000w32p_available,
et4000w32p_speed_changed,
et4000w32p_force_redraw,
et4000w32p_add_status_info,
et4000w32p_config
};
#endif

3
src/video/vid_genius.c
View File

@@ -8,7 +8,7 @@
*
* MDSI Genius VHR emulation.
*
* Version: @(#)vid_genius.c 1.0.8 2018/03/18
* Version: @(#)vid_genius.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -646,6 +646,5 @@ const device_t genius_device =
genius_available,
genius_speed_changed,
NULL,
NULL,
NULL
};

3
src/video/vid_hercules.c
View File

@@ -8,7 +8,7 @@
*
* Hercules emulation.
*
* Version: @(#)vid_hercules.c 1.0.9 2018/03/18
* Version: @(#)vid_hercules.c 1.0.10 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -427,6 +427,5 @@ const device_t hercules_device =
NULL,
hercules_speed_changed,
NULL,
NULL,
hercules_config
};

3
src/video/vid_herculesplus.c
View File

@@ -8,7 +8,7 @@
*
* Hercules InColor emulation.
*
* Version: @(#)vid_herculesplus.c 1.0.7 2018/03/18
* Version: @(#)vid_herculesplus.c 1.0.8 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -737,6 +737,5 @@ const device_t herculesplus_device =
NULL,
herculesplus_speed_changed,
NULL,
NULL,
NULL
};

3
src/video/vid_incolor.c
View File

@@ -8,7 +8,7 @@
*
* Hercules InColor emulation.
*
* Version: @(#)vid_incolor.c 1.0.8 2018/03/18
* Version: @(#)vid_incolor.c 1.0.9 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1081,6 +1081,5 @@ const device_t incolor_device =
NULL,
incolor_speed_changed,
NULL,
NULL,
NULL
};

3
src/video/vid_mda.c
View File

@@ -8,7 +8,7 @@
*
* MDA emulation.
*
* Version: @(#)vid_mda.c 1.0.10 2018/03/18
* Version: @(#)vid_mda.c 1.0.11 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -376,6 +376,5 @@ const device_t mda_device =
NULL,
mda_speed_changed,
NULL,
NULL,
mda_config
};

26
src/video/vid_nv_riva128.c
View File

@@ -8,7 +8,7 @@
*
* nVidia RIVA 128 emulation.
*
* Version: @(#)vid_nv_riva128.c 1.0.5 2018/03/18
* Version: @(#)vid_nv_riva128.c 1.0.6 2018/04/26
*
* Author: Melissa Goad
* Miran Grca, <mgrca8@gmail.com>
@@ -3210,13 +3210,6 @@ void riva128_force_redraw(void *p)
riva128->svga.fullchange = changeframecount;
}
void riva128_add_status_info(char *s, int max_len, void *p)
{
riva128_t *riva128 = (riva128_t *)p;
svga_add_status_info(s, max_len, &riva128->svga);
}
const device_config_t riva128_config[] =
{
{
@@ -3289,7 +3282,6 @@ const device_t riva128_device =
riva128_available,
riva128_speed_changed,
riva128_force_redraw,
riva128_add_status_info,
riva128_config
};
@@ -3443,13 +3435,6 @@ void rivatnt_force_redraw(void *p)
riva128->svga.fullchange = changeframecount;
}
void rivatnt_add_status_info(char *s, int max_len, void *p)
{
riva128_t *riva128 = (riva128_t *)p;
svga_add_status_info(s, max_len, &riva128->svga);
}
const device_config_t rivatnt_config[] =
{
{
@@ -3485,7 +3470,6 @@ const device_t rivatnt_device =
rivatnt_available,
rivatnt_speed_changed,
rivatnt_force_redraw,
rivatnt_add_status_info,
rivatnt_config
};
@@ -3651,13 +3635,6 @@ void rivatnt2_force_redraw(void *p)
riva128->svga.fullchange = changeframecount;
}
void rivatnt2_add_status_info(char *s, int max_len, void *p)
{
riva128_t *riva128 = (riva128_t *)p;
svga_add_status_info(s, max_len, &riva128->svga);
}
const device_config_t rivatnt2_config[] =
{
{
@@ -3710,6 +3687,5 @@ const device_t rivatnt2_device =
rivatnt2_available,
rivatnt2_speed_changed,
rivatnt2_force_redraw,
rivatnt2_add_status_info,
rivatnt2_config
};

13
src/video/vid_oak_oti.c
View File

@@ -8,7 +8,7 @@
*
* Oak OTI037C/67/077 emulation.
*
* Version: @(#)vid_oak_oti.c 1.0.11 2018/04/12
* Version: @(#)vid_oak_oti.c 1.0.12 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -326,14 +326,6 @@ oti_force_redraw(void *p)
}
static void
oti_add_status_info(char *s, int max_len, void *p)
{
oti_t *oti = (oti_t *)p;
svga_add_status_info(s, max_len, &oti->svga);
}
static int
oti037c_available(void)
{
@@ -403,7 +395,6 @@ const device_t oti037c_device =
oti037c_available,
oti_speed_changed,
oti_force_redraw,
oti_add_status_info,
oti067_config
};
@@ -416,7 +407,6 @@ const device_t oti067_device =
oti067_077_available,
oti_speed_changed,
oti_force_redraw,
oti_add_status_info,
oti067_config
};
@@ -429,6 +419,5 @@ const device_t oti077_device =
oti067_077_available,
oti_speed_changed,
oti_force_redraw,
oti_add_status_info,
oti077_config
};

19
src/video/vid_paradise.c
View File

@@ -10,7 +10,7 @@
* PC2086, PC3086 use PVGA1A
* MegaPC uses W90C11A
*
* Version: @(#)vid_paradise.c 1.0.6 2018/04/02
* Version: @(#)vid_paradise.c 1.0.7 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -489,13 +489,6 @@ void paradise_force_redraw(void *p)
paradise->svga.fullchange = changeframecount;
}
void paradise_add_status_info(char *s, int max_len, void *p)
{
paradise_t *paradise = (paradise_t *)p;
svga_add_status_info(s, max_len, &paradise->svga);
}
const device_t paradise_pvga1a_pc2086_device =
{
@@ -508,7 +501,7 @@ const device_t paradise_pvga1a_pc2086_device =
NULL,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info
NULL
};
const device_t paradise_pvga1a_pc3086_device =
{
@@ -521,7 +514,7 @@ const device_t paradise_pvga1a_pc3086_device =
NULL,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info
NULL
};
static const device_config_t paradise_pvga1a_config[] =
@@ -559,7 +552,6 @@ const device_t paradise_pvga1a_device =
paradise_pvga1a_standalone_available,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info,
paradise_pvga1a_config
};
const device_t paradise_wd90c11_megapc_device =
@@ -573,7 +565,7 @@ const device_t paradise_wd90c11_megapc_device =
NULL,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info
NULL
};
const device_t paradise_wd90c11_device =
{
@@ -586,7 +578,7 @@ const device_t paradise_wd90c11_device =
paradise_wd90c11_standalone_available,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info
NULL
};
static const device_config_t paradise_wd90c30_config[] =
@@ -621,6 +613,5 @@ const device_t paradise_wd90c30_device =
paradise_wd90c30_standalone_available,
paradise_speed_changed,
paradise_force_redraw,
paradise_add_status_info,
paradise_wd90c30_config
};

33
src/video/vid_s3.c
View File

@@ -8,7 +8,7 @@
*
* S3 emulation.
*
* Version: @(#)vid_s3.c 1.0.9 2018/04/02
* Version: @(#)vid_s3.c 1.0.10 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -2929,24 +2929,6 @@ static void s3_force_redraw(void *p)
s3->svga.fullchange = changeframecount;
}
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 = plat_timer_read();
uint64_t status_diff = new_time - s3->status_time;
s3->status_time = new_time;
if (!status_diff)
status_diff = 1;
svga_add_status_info(s, max_len, &s3->svga);
sprintf(temps, "%f%% CPU\n%f%% CPU (real)\n\n", ((double)s3->blitter_time * 100.0) / timer_freq, ((double)s3->blitter_time * 100.0) / status_diff);
strncat(s, temps, max_len);
s3->blitter_time = 0;
}
static const device_config_t s3_bahamas64_config[] =
{
{
@@ -3091,7 +3073,6 @@ const device_t s3_bahamas64_vlb_device =
s3_bahamas64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_bahamas64_config
};
@@ -3106,7 +3087,6 @@ const device_t s3_bahamas64_pci_device =
s3_bahamas64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_bahamas64_config
};
@@ -3121,7 +3101,6 @@ const device_t s3_9fx_vlb_device =
s3_9fx_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_9fx_config
};
@@ -3136,7 +3115,6 @@ const device_t s3_9fx_pci_device =
s3_9fx_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_9fx_config
};
@@ -3151,7 +3129,6 @@ const device_t s3_phoenix_trio32_vlb_device =
s3_phoenix_trio32_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio32_config
};
@@ -3166,7 +3143,6 @@ const device_t s3_phoenix_trio32_pci_device =
s3_phoenix_trio32_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio32_config
};
@@ -3181,7 +3157,6 @@ const device_t s3_phoenix_trio64_vlb_device =
s3_phoenix_trio64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio64_config
};
@@ -3196,7 +3171,6 @@ const device_t s3_phoenix_trio64_onboard_pci_device =
NULL,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio64_onboard_config
};
@@ -3211,7 +3185,6 @@ const device_t s3_phoenix_trio64_pci_device =
s3_phoenix_trio64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio64_config
};
@@ -3226,7 +3199,6 @@ const device_t s3_phoenix_vision864_vlb_device =
s3_phoenix_vision864_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_bahamas64_config
};
@@ -3241,7 +3213,6 @@ const device_t s3_phoenix_vision864_pci_device =
s3_phoenix_vision864_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_bahamas64_config
};
@@ -3256,7 +3227,6 @@ const device_t s3_diamond_stealth64_vlb_device =
s3_diamond_stealth64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio64_config
};
@@ -3271,6 +3241,5 @@ const device_t s3_diamond_stealth64_pci_device =
s3_diamond_stealth64_available,
s3_speed_changed,
s3_force_redraw,
s3_add_status_info,
s3_phoenix_trio64_config
};

32
src/video/vid_s3_virge.c
View File

@@ -8,7 +8,7 @@
*
* S3 ViRGE emulation.
*
* Version: @(#)vid_s3_virge.c 1.0.9 2018/04/02
* Version: @(#)vid_s3_virge.c 1.0.10 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -35,7 +35,6 @@
static uint64_t virge_time = 0;
static uint64_t status_time = 0;
static int reg_writes = 0, reg_reads = 0;
static int dither[4][4] =
@@ -4166,27 +4165,6 @@ static void s3_virge_force_redraw(void *p)
virge->svga.fullchange = changeframecount;
}
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 = plat_timer_read();
uint64_t status_diff = new_time - status_time;
status_time = new_time;
if (!status_diff)
status_diff = 1;
svga_add_status_info(s, max_len, &virge->svga);
sprintf(temps, "%f Mpixels/sec\n%f ktris/sec\n%f%% CPU\n%f%% CPU (real)\n%d writes %i reads\n\n", (double)virge->pixel_count/1000000.0, (double)virge->tri_count/1000.0, ((double)virge_time * 100.0) / timer_freq, ((double)virge_time * 100.0) / status_diff, reg_writes, reg_reads);
strncat(s, temps, max_len);
virge->pixel_count = virge->tri_count = 0;
virge_time = 0;
reg_reads = 0;
reg_writes = 0;
}
static const device_config_t s3_virge_config[] =
{
{
@@ -4225,7 +4203,6 @@ const device_t s3_virge_vlb_device =
s3_virge_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4240,7 +4217,6 @@ const device_t s3_virge_pci_device =
s3_virge_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4255,7 +4231,6 @@ const device_t s3_virge_988_vlb_device =
s3_virge_988_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4270,7 +4245,6 @@ const device_t s3_virge_988_pci_device =
s3_virge_988_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4285,7 +4259,6 @@ const device_t s3_virge_375_vlb_device =
s3_virge_375_1_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4300,7 +4273,6 @@ const device_t s3_virge_375_pci_device =
s3_virge_375_1_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4315,7 +4287,6 @@ const device_t s3_virge_375_4_vlb_device =
s3_virge_375_4_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};
@@ -4330,6 +4301,5 @@ const device_t s3_virge_375_4_pci_device =
s3_virge_375_4_available,
s3_virge_speed_changed,
s3_virge_force_redraw,
s3_virge_add_status_info,
s3_virge_config
};

8
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.28 2018/04/01
* Version: @(#)vid_svga.c 1.0.29 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -839,7 +839,6 @@ svga_write_common(uint32_t addr, uint8_t val, uint8_t linear, void *p)
egawrites++;
cycles -= video_timing_write_b;
cycles_lost += video_timing_write_b;
if (!linear) {
addr &= svga->banked_mask;
@@ -972,7 +971,6 @@ svga_read_common(uint32_t addr, uint8_t linear, void *p)
uint8_t ret8;
cycles -= video_timing_read_b;
cycles_lost += video_timing_read_b;
egareads++;
@@ -1167,7 +1165,6 @@ svga_writew_common(uint32_t addr, uint16_t val, uint8_t linear, void *p)
egawrites += 2;
cycles -= video_timing_write_w;
cycles_lost += video_timing_write_w;
if (!linear)
addr = (addr & svga->banked_mask) + svga->write_bank;
@@ -1210,7 +1207,6 @@ svga_writel_common(uint32_t addr, uint32_t val, uint8_t linear, void *p)
egawrites += 4;
cycles -= video_timing_write_l;
cycles_lost += video_timing_write_l;
if (!linear)
addr = (addr & svga->banked_mask) + svga->write_bank;
@@ -1267,7 +1263,6 @@ svga_readw_common(uint32_t addr, uint8_t linear, void *p)
egareads += 2;
cycles -= video_timing_read_w;
cycles_lost += video_timing_read_w;
if (!linear)
addr = (addr & svga->banked_mask) + svga->read_bank;
@@ -1306,7 +1301,6 @@ svga_readl_common(uint32_t addr, uint8_t linear, void *p)
egareads += 4;
cycles -= video_timing_read_l;
cycles_lost += video_timing_read_l;
if (!linear)
addr = (addr & svga->banked_mask) + svga->read_bank;

24
src/video/vid_tgui9440.c
View File

@@ -47,7 +47,7 @@
* access size or host data has any affect, but the Windows 3.1
* driver always reads bytes and write words of 0xffff.
*
* Version: @(#)vid_tgui9440.c 1.0.5 2018/03/18
* Version: @(#)vid_tgui9440.c 1.0.6 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -864,7 +864,6 @@ static uint8_t tgui_ext_linear_read(uint32_t addr, void *p)
int c;
cycles -= video_timing_read_b;
cycles_lost += video_timing_read_b;
addr &= svga->decode_mask;
if (addr >= svga->vram_max)
@@ -896,7 +895,6 @@ static void tgui_ext_linear_write(uint32_t addr, uint8_t val, void *p)
uint8_t mask = tgui->ext_gdc_regs[7];
cycles -= video_timing_write_b;
cycles_lost += video_timing_write_b;
addr &= svga->decode_mask;
if (addr >= svga->vram_max)
@@ -966,7 +964,6 @@ static void tgui_ext_linear_writew(uint32_t addr, uint16_t val, void *p)
uint16_t mask = (tgui->ext_gdc_regs[7] << 8) | tgui->ext_gdc_regs[8];
cycles -= video_timing_write_w;
cycles_lost += video_timing_write_w;
addr &= svga->decode_mask;
if (addr >= svga->vram_max)
@@ -1729,22 +1726,6 @@ void tgui_accel_write_fb_l(uint32_t addr, uint32_t val, void *p)
svga_writel_linear(addr, val, svga);
}
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 = plat_timer_read();
uint64_t status_diff = new_time - tgui->status_time;
tgui->status_time = new_time;
svga_add_status_info(s, max_len, &tgui->svga);
sprintf(temps, "%f%% CPU\n%f%% CPU (real)\n\n", ((double)tgui->blitter_time * 100.0) / timer_freq, ((double)tgui->blitter_time * 100.0) / status_diff);
strncat(s, temps, max_len);
tgui->blitter_time = 0;
}
static const device_config_t tgui9440_config[] =
{
{
@@ -1783,7 +1764,6 @@ const device_t tgui9400cxi_device =
tgui9400cxi_available,
tgui_speed_changed,
tgui_force_redraw,
tgui_add_status_info,
tgui9440_config
};
@@ -1798,7 +1778,6 @@ const device_t tgui9440_vlb_device =
tgui9440_available,
tgui_speed_changed,
tgui_force_redraw,
tgui_add_status_info,
tgui9440_config
};
@@ -1813,6 +1792,5 @@ const device_t tgui9440_pci_device =
tgui9440_available,
tgui_speed_changed,
tgui_force_redraw,
tgui_add_status_info,
tgui9440_config
};

13
src/video/vid_ti_cf62011.c
View File

@@ -42,7 +42,7 @@
* which are the same as the XGA. It supports up to 1MB of VRAM,
* but we lock it down to 512K. The PS/1 2122 had 256K.
*
* Version: @(#)vid_ti_cf62011.c 1.0.5 2018/04/12
* Version: @(#)vid_ti_cf62011.c 1.0.6 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -223,15 +223,6 @@ vid_force_redraw(void *priv)
}
static void
vid_add_status_info(char *s, int max_len, void *priv)
{
tivga_t *ti = (tivga_t *)priv;
svga_add_status_info(s, max_len, &ti->svga);
}
static void
vid_close(void *priv)
{
@@ -309,7 +300,6 @@ const device_t ti_cf62011_device = {
NULL,
vid_speed_changed,
vid_force_redraw,
vid_add_status_info,
vid_config
};
#endif
@@ -323,6 +313,5 @@ const device_t ibm_ps1_2121_device = {
NULL,
vid_speed_changed,
vid_force_redraw,
vid_add_status_info,
NULL
};

10
src/video/vid_tvga.c
View File

@@ -8,7 +8,7 @@
*
* Trident TVGA (8900D) emulation.
*
* Version: @(#)vid_tvga.c 1.0.5 2018/03/18
* Version: @(#)vid_tvga.c 1.0.6 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -341,13 +341,6 @@ void tvga_force_redraw(void *p)
tvga->svga.fullchange = changeframecount;
}
void tvga_add_status_info(char *s, int max_len, void *p)
{
tvga_t *tvga = (tvga_t *)p;
svga_add_status_info(s, max_len, &tvga->svga);
}
static const device_config_t tvga_config[] =
{
{
@@ -384,6 +377,5 @@ const device_t tvga8900d_device =
tvga8900d_available,
tvga_speed_changed,
tvga_force_redraw,
tvga_add_status_info,
tvga_config
};

15
src/video/vid_vga.c
View File

@@ -8,7 +8,7 @@
*
* IBM VGA emulation.
*
* Version: @(#)vid_vga.c 1.0.4 2018/03/18
* Version: @(#)vid_vga.c 1.0.5 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -199,13 +199,6 @@ void vga_force_redraw(void *p)
vga->svga.fullchange = changeframecount;
}
void vga_add_status_info(char *s, int max_len, void *p)
{
vga_t *vga = (vga_t *)p;
svga_add_status_info(s, max_len, &vga->svga);
}
const device_t vga_device =
{
"VGA",
@@ -217,7 +210,7 @@ const device_t vga_device =
vga_available,
vga_speed_changed,
vga_force_redraw,
vga_add_status_info
NULL
};
#ifdef DEV_BRANCH
const device_t trigem_unk_device =
@@ -231,7 +224,7 @@ const device_t trigem_unk_device =
vga_available,
vga_speed_changed,
vga_force_redraw,
vga_add_status_info
NULL
};
#endif
const device_t ps1vga_device =
@@ -245,5 +238,5 @@ const device_t ps1vga_device =
vga_available,
vga_speed_changed,
vga_force_redraw,
vga_add_status_info
NULL
};

92
src/video/vid_voodoo.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the 3DFX Voodoo Graphics controller.
*
* Version: @(#)vid_voodoo.c 1.0.13 2018/04/13
* Version: @(#)vid_voodoo.c 1.0.14 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei
@@ -74,8 +74,6 @@ static uint32_t texture_offset[LOD_MAX+3] =
static int tris = 0;
static uint64_t status_time = 0;
typedef union {
uint32_t i;
float f;
@@ -7487,93 +7485,6 @@ skip_draw:
voodoo->timer_count += TIMER_USEC * 32;
}
static void voodoo_add_status_info(char *s, int max_len, void *p)
{
voodoo_set_t *voodoo_set = (voodoo_set_t *)p;
voodoo_t *voodoo = voodoo_set->voodoos[0];
voodoo_t *voodoo_slave = voodoo_set->voodoos[1];
char temps[512], temps2[256];
int pixel_count_current[2];
int pixel_count_total;
int texel_count_current[2];
int texel_count_total;
int render_time[2];
uint64_t new_time = plat_timer_read();
uint64_t status_diff = new_time - status_time;
status_time = new_time;
if (!status_diff)
status_diff = 1;
svga_add_status_info(s, max_len, &voodoo->svga);
pixel_count_current[0] = voodoo->pixel_count[0];
pixel_count_current[1] = voodoo->pixel_count[1];
texel_count_current[0] = voodoo->texel_count[0];
texel_count_current[1] = voodoo->texel_count[1];
render_time[0] = voodoo->render_time[0];
render_time[1] = voodoo->render_time[1];
if (voodoo_set->nr_cards == 2)
{
pixel_count_current[0] += voodoo_slave->pixel_count[0];
pixel_count_current[1] += voodoo_slave->pixel_count[1];
texel_count_current[0] += voodoo_slave->texel_count[0];
texel_count_current[1] += voodoo_slave->texel_count[1];
render_time[0] = (render_time[0] + voodoo_slave->render_time[0]) / 2;
render_time[1] = (render_time[1] + voodoo_slave->render_time[1]) / 2;
}
pixel_count_total = (pixel_count_current[0] + pixel_count_current[1]) - (voodoo->pixel_count_old[0] + voodoo->pixel_count_old[1]);
texel_count_total = (texel_count_current[0] + texel_count_current[1]) - (voodoo->texel_count_old[0] + voodoo->texel_count_old[1]);
sprintf(temps, "%f Mpixels/sec (%f)\n%f Mtexels/sec (%f)\n%f ktris/sec\n%f%% CPU (%f%% real)\n%d frames/sec (%i)\n%f%% CPU (%f%% real)\n"/*%d reads/sec\n%d write/sec\n%d tex/sec\n*/,
(double)pixel_count_total/1000000.0,
((double)pixel_count_total/1000000.0) / ((double)render_time[0] / status_diff),
(double)texel_count_total/1000000.0,
((double)texel_count_total/1000000.0) / ((double)render_time[0] / status_diff),
(double)voodoo->tri_count/1000.0, ((double)voodoo->time * 100.0) / timer_freq, ((double)voodoo->time * 100.0) / status_diff, voodoo->frame_count, voodoo_recomp,
((double)voodoo->render_time[0] * 100.0) / timer_freq, ((double)voodoo->render_time[0] * 100.0) / status_diff);
if (voodoo->render_threads == 2)
{
sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo->render_time[1] * 100.0) / timer_freq, ((double)voodoo->render_time[1] * 100.0) / status_diff);
strncat(temps, temps2, sizeof(temps)-1);
}
if (voodoo_set->nr_cards == 2)
{
sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo_slave->render_time[0] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[0] * 100.0) / status_diff);
strncat(temps, temps2, sizeof(temps)-1);
if (voodoo_slave->render_threads == 2)
{
sprintf(temps2, "%f%% CPU (%f%% real)\n",
((double)voodoo_slave->render_time[1] * 100.0) / timer_freq, ((double)voodoo_slave->render_time[1] * 100.0) / status_diff);
strncat(temps, temps2, sizeof(temps)-1);
}
}
strncat(s, temps, max_len);
voodoo->pixel_count_old[0] = pixel_count_current[0];
voodoo->pixel_count_old[1] = pixel_count_current[1];
voodoo->texel_count_old[0] = texel_count_current[0];
voodoo->texel_count_old[1] = texel_count_current[1];
voodoo->tri_count = voodoo->frame_count = 0;
voodoo->rd_count = voodoo->wr_count = voodoo->tex_count = 0;
voodoo->time = 0;
voodoo->render_time[0] = voodoo->render_time[1] = 0;
if (voodoo_set->nr_cards == 2)
{
voodoo_slave->pixel_count_old[0] = pixel_count_current[0];
voodoo_slave->pixel_count_old[1] = pixel_count_current[1];
voodoo_slave->texel_count_old[0] = texel_count_current[0];
voodoo_slave->texel_count_old[1] = texel_count_current[1];
voodoo_slave->tri_count = voodoo_slave->frame_count = 0;
voodoo_slave->rd_count = voodoo_slave->wr_count = voodoo_slave->tex_count = 0;
voodoo_slave->time = 0;
voodoo_slave->render_time[0] = voodoo_slave->render_time[1] = 0;
}
voodoo_recomp = 0;
}
static void voodoo_speed_changed(void *p)
{
voodoo_set_t *voodoo_set = (voodoo_set_t *)p;
@@ -7973,6 +7884,5 @@ const device_t voodoo_device =
NULL,
voodoo_speed_changed,
NULL,
voodoo_add_status_info,
voodoo_config
};

3
src/video/vid_wy700.c
View File

@@ -8,7 +8,7 @@
*
* Wyse-700 emulation.
*
* Version: @(#)vid_wy700.c 1.0.7 2018/03/18
* Version: @(#)vid_wy700.c 1.0.8 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -1014,7 +1014,6 @@ const device_t wy700_device =
NULL,
NULL,
wy700_speed_changed,
NULL,
NULL,
NULL
};

6
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.114 2018/03/31
# Version: @(#)Makefile.mingw 1.0.115 2018/04/26
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -295,9 +295,9 @@ ifneq ($(WX), n)
LIBS += $(WX_LIBS)
UIOBJ := wx_main.o wx_ui.o wx_stbar.o wx_render.o
else
UIOBJ := win_ui.o \
UIOBJ := win_ui.o win_stbar.o \
win_ddraw.o win_d3d.o \
win_dialog.o win_about.o win_status.o win_stbar.o \
win_dialog.o win_about.o \
win_settings.o win_devconf.o win_snd_gain.o \
win_new_floppy.o win_jsconf.o
endif

9
src/win/win.h
View File

@@ -8,7 +8,7 @@
*
* Platform support defintions for Win32.
*
* Version: @(#)win.h 1.0.16 2018/03/28
* Version: @(#)win.h 1.0.17 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -58,7 +58,7 @@ extern HANDLE ghMutex;
extern LCID lang_id;
extern HICON hIcon[512];
extern int status_is_open;
// extern int status_is_open;
extern char openfilestring[260];
extern WCHAR wopenfilestring[260];
@@ -125,11 +125,6 @@ extern void SoundGainDialogCreate(HWND hwnd);
extern void NewFloppyDialogCreate(HWND hwnd, int id, int part);
/* Functions in win_status.c: */
extern HWND hwndStatus;
extern void StatusWindowCreate(HWND hwnd);
/* Functions in win_stbar.c: */
extern HWND hwndSBAR;
extern void StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst);

124
src/win/win_status.c
View File

@@ -1,124 +0,0 @@
/* Copyright holders: Sarah Walker
see COPYING for more details
*/
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#include <windowsx.h>
#undef BITMAP
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../pit.h"
#include "../mem.h"
#include "../cpu/cpu.h"
#include "../cpu/x86_ops.h"
#ifdef USE_DYNAREC
# include "../cpu/codegen.h"
#endif
#include "../device.h"
#include "../plat.h"
#include "win.h"
HWND hwndStatus = NULL;
extern int sreadlnum, swritelnum, segareads, segawrites, scycles_lost;
extern uint64_t main_time;
static uint64_t status_time;
#ifdef __amd64__
static LRESULT CALLBACK
#else
static BOOL CALLBACK
#endif
StatusWindowProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{
char temp[4096];
uint64_t new_time;
uint64_t status_diff;
switch (message) {
case WM_INITDIALOG:
hwndStatus = hdlg;
/*FALLTHROUGH*/
case WM_USER:
new_time = plat_timer_read();
status_diff = new_time - status_time;
status_time = new_time;
sprintf(temp,
"CPU speed : %f MIPS\n"
"FPU speed : %f MFLOPS\n\n"
"Video throughput (read) : %i bytes/sec\n"
"Video throughput (write) : %i bytes/sec\n\n"
"Effective clockspeed : %iHz\n\n"
"Timer 0 frequency : %fHz\n\n"
"CPU time : %f%% (%f%%)\n"
#ifdef USE_DYNAREC
"New blocks : %i\nOld blocks : %i\nRecompiled speed : %f MIPS\nAverage size : %f\n"
"Flushes : %i\nEvicted : %i\nReused : %i\nRemoved : %i"
#endif
,mips,
flops,
segareads,
segawrites,
clockrate - scycles_lost,
pit_timer0_freq(),
((double)main_time * 100.0) / status_diff,
((double)main_time * 100.0) / timer_freq
#ifdef USE_DYNAREC
, cpu_new_blocks_latched, cpu_recomp_blocks_latched, (double)cpu_recomp_ins_latched / 1000000.0, (double)cpu_recomp_ins_latched/cpu_recomp_blocks_latched,
cpu_recomp_flushes_latched, cpu_recomp_evicted_latched,
cpu_recomp_reuse_latched, cpu_recomp_removed_latched
#endif
);
main_time = 0;
SendDlgItemMessage(hdlg, IDT_SDEVICE, WM_SETTEXT,
(WPARAM)NULL, (LPARAM)temp);
temp[0] = 0;
device_add_status_info(temp, 4096);
SendDlgItemMessage(hdlg, IDT_STEXT, WM_SETTEXT,
(WPARAM)NULL, (LPARAM)temp);
return(TRUE);
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
case IDCANCEL:
hwndStatus = NULL;
EndDialog(hdlg, 0);
return(TRUE);
}
break;
}
return(FALSE);
}
void
StatusWindowCreate(HWND hwndParent)
{
HWND hwnd;
hwnd = CreateDialog(hinstance, (LPCSTR)DLG_STATUS,
hwndParent, StatusWindowProcedure);
ShowWindow(hwnd, SW_SHOW);
}
/* Tell the Status window to update. */
void
ui_status_update(void)
{
SendMessage(hwndStatus, WM_USER, 0, 0);
}

6
src/win/win_ui.c
View File

@@ -8,7 +8,7 @@
*
* user Interface module for WinAPI on Windows.
*
* Version: @(#)win_ui.c 1.0.24 2018/04/21
* Version: @(#)win_ui.c 1.0.25 2018/04/26
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -315,10 +315,6 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
AboutDialogCreate(hwnd);
break;
case IDM_STATUS:
StatusWindowCreate(hwnd);
break;
case IDM_UPDATE_ICONS:
update_icons ^= 1;
CheckMenuItem(hmenu, IDM_UPDATE_ICONS, update_icons ? MF_CHECKED : MF_UNCHECKED);