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

Merge branch '86Box:master' into machine_23

Browse Source
This commit is contained in:
BurnedPinguin
2024-01-18 11:51:46 +01:00
committed by GitHub
parent 7a4d3aaa5a 19af46a8c2
commit 325c27de70
65 changed files with 3584 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/machine/machine_table.c
View File

@@ -51,6 +51,7 @@ extern const device_t vid_ppc512_device;
extern const device_t vid_device_sl;
extern const device_t t1200_video_device;
extern const device_t compaq_plasma_device;
extern const device_t ps1_2011_device;
const machine_filter_t machine_types[] = {
{ "None", MACHINE_TYPE_NONE },
@@ -2585,7 +2586,7 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.device = &ps1_2011_device,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,