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

WARNING: CONFIGS MIGHT PARTIALLY BREAK WHERE DEVICE NAMES HAVE CHANGED.

Browse Source 
Changes to device_t struct to accomodate the upcoming PCI IRQ arbitration rewrite;
Added device.c/h API to obtain name from the device_t struct;
Significant changes to win/win_settings.c to clean up the code a bit and fix bugs;
Ported all the CPU and AudioPCI commits from PCem;
Added an API call to allow ACPI soft power off to gracefully stop the emulator;
Removed the Siemens PCD-2L from the Dev branch because it now works;
Removed the Socket 5 HP Vectra from the Dev branch because it now works;
Fixed the Compaq Presario and the Micronics Spitfire;
Give the IBM PC330 its own list of 486 CPU so it can have DX2's with CPUID 0x470;
SMM fixes;
Rewrote the SYSENTER, SYSEXIT, SYSCALL, and SYSRET instructions;
Changed IDE reset period to match the specification, fixes #929;
The keyboard input and output ports are now forced in front of the queue when read, fixes a number of bugs, including the AMI Apollo hanging on soft reset;
Added the Intel AN430TX but Dev branched because it does not work;
The network code no longer drops packets if the emulated network card has failed to receive them (eg. when the buffer is full);
Changes to PCI card adding and renamed some PCI slot types, also added proper AGP bridge slot types;
USB UHCI emulation is no longer a stub (still doesn't fully work, but at least Windows XP chk with Debug no longer ASSERT's on it);
Fixed NVR on the the SMC FDC37C932QF and APM variants;
A number of fixes to Intel 4x0 chipsets, including fixing every register of the 440LX and 440EX;
Some ACPI changes.
This commit is contained in:
OBattler
2020-11-16 00:01:21 +01:00
parent 745460f64b
commit 0faf6692c9
260 changed files with 5122 additions and 4471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/machine/m_amstrad.c
View File

@@ -668,7 +668,7 @@ vid_speed_change_1512(void *priv)
device_config_t vid_1512_config[] =
{
{
"display_type", "Display type", CONFIG_SELECTION, "", 0,
"display_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 },
{
{
"PC-CM (Colour)", 0
@@ -682,7 +682,7 @@ device_config_t vid_1512_config[] =
}
},
{
"codepage", "Hardware font", CONFIG_SELECTION, "", 3,
"codepage", "Hardware font", CONFIG_SELECTION, "", 3, "", { 0 },
{
{
"US English", 3
@@ -699,7 +699,7 @@ device_config_t vid_1512_config[] =
}
},
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -740,7 +740,7 @@ static const device_t vid_1512_device = {
"Amstrad PC1512 (video)",
0, 0,
NULL, vid_close_1512, NULL,
NULL,
{ NULL },
vid_speed_change_1512,
NULL,
vid_1512_config
@@ -896,7 +896,7 @@ vid_speed_changed_1640(void *priv)
device_config_t vid_1640_config[] =
{
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -936,7 +936,7 @@ static const device_t vid_1640_device = {
"Amstrad PC1640 (video)",
0, 0,
NULL, vid_close_1640, NULL,
NULL,
{ NULL },
vid_speed_changed_1640,
NULL,
vid_1640_config
@@ -1729,7 +1729,7 @@ device_config_t vid_200_config[] =
* > Display port (TTL or RF)
*/
{
"video_emulation", "Display type", CONFIG_SELECTION, "", PC200_CGA,
"video_emulation", "Display type", CONFIG_SELECTION, "", PC200_CGA, "", { 0 },
{
{
"CGA monitor", PC200_CGA
@@ -1746,7 +1746,7 @@ device_config_t vid_200_config[] =
}
},
{
"display_type", "Monitor type", CONFIG_SELECTION, "", 0,
"display_type", "Monitor type", CONFIG_SELECTION, "", 0, "", { 0 },
{
{
"RGB", 0
@@ -1769,7 +1769,7 @@ device_config_t vid_200_config[] =
}
},
{
"codepage", "Hardware font", CONFIG_SELECTION, "", 3,
"codepage", "Hardware font", CONFIG_SELECTION, "", 3, "", { 0 },
{
{
"US English", 3
@@ -1789,7 +1789,7 @@ device_config_t vid_200_config[] =
}
},
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -1830,7 +1830,7 @@ static const device_t vid_200_device = {
"Amstrad PC200 (video)",
0, 0,
NULL, vid_close_200, NULL,
NULL,
{ NULL },
vid_speed_changed_200,
NULL,
vid_200_config
@@ -1851,7 +1851,7 @@ device_config_t vid_ppc512_config[] =
* > Display port (TTL or RF)
*/
{
"video_emulation", "Display type", CONFIG_SELECTION, "", PC200_LCDC,
"video_emulation", "Display type", CONFIG_SELECTION, "", PC200_LCDC, "", { 0 },
{
{
"CGA monitor", PC200_CGA
@@ -1871,7 +1871,7 @@ device_config_t vid_ppc512_config[] =
},
},
{
"display_type", "Monitor type", CONFIG_SELECTION, "", 0,
"display_type", "Monitor type", CONFIG_SELECTION, "", 0, "", { 0 },
{
{
"RGB", 0
@@ -1894,7 +1894,7 @@ device_config_t vid_ppc512_config[] =
},
},
{
"codepage", "Hardware font", CONFIG_SELECTION, "", 3,
"codepage", "Hardware font", CONFIG_SELECTION, "", 3, "", { 0 },
{
{
"US English", 3
@@ -1914,7 +1914,7 @@ device_config_t vid_ppc512_config[] =
},
},
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -1954,7 +1954,7 @@ static const device_t vid_ppc512_device = {
"Amstrad PPC512 (video)",
0, 0,
NULL, vid_close_200, NULL,
NULL,
{ NULL },
vid_speed_changed_200,
NULL,
vid_ppc512_config
@@ -1971,7 +1971,7 @@ ppc512_get_device(void)
device_config_t vid_pc2086_config[] =
{
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -1993,7 +1993,7 @@ static const device_t vid_pc2086_device = {
"Amstrad PC2086",
0, 0,
NULL, NULL, NULL,
NULL,
{ NULL },
NULL,
NULL,
vid_pc2086_config
@@ -2010,7 +2010,7 @@ pc2086_get_device(void)
device_config_t vid_pc3086_config[] =
{
{
"language", "BIOS language", CONFIG_SELECTION, "", 7,
"language", "BIOS language", CONFIG_SELECTION, "", 7, "", { 0 },
{
{
"English", 7
@@ -2032,7 +2032,7 @@ static const device_t vid_pc3086_device = {
"Amstrad PC3086",
0, 0,
NULL, NULL, NULL,
NULL,
{ NULL },
NULL,
NULL,
vid_pc3086_config