diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index a715f7373..b90772b48 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -363,6 +363,7 @@ extern const device_t *at_acera1g_get_device(void); #if defined(DEV_BRANCH) && defined(USE_VECT486VL) extern const device_t *at_vect486vl_get_device(void); #endif +extern const device_t *at_valuepoint433_get_device(void); #endif /* m_at_commodore.c */ diff --git a/src/include/86box/video.h b/src/include/86box/video.h index e51021098..881f3e3bd 100644 --- a/src/include/86box/video.h +++ b/src/include/86box/video.h @@ -259,6 +259,7 @@ extern const device_t et4000_mca_device; /* Tseng ET4000-W32x */ extern const device_t et4000w32_device; +extern const device_t et4000w32_onboard_device; extern const device_t et4000w32i_isa_device; extern const device_t et4000w32i_vlb_device; extern const device_t et4000w32p_revc_vlb_device; diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index bd41ed5c0..0c800ad92 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -150,9 +150,17 @@ machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2 if (fdc_type == FDC_INTERNAL) device_add(&fdc_at_device); + if (gfxcard == VID_INTERNAL) + device_add(&et4000w32_onboard_device); + return ret; } +const device_t * +at_valuepoint433_get_device(void) +{ + return &et4000w32_onboard_device; +} int machine_at_ecs386_init(const machine_t *model) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4f604c03a..d7e1bffff 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -209,7 +209,7 @@ const machine_t machines[] = { { "[OPTi 895] Mylex MVI486", "mvi486", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE_DUAL, 1024, 65536, 1024, 127, machine_at_mvi486_init, NULL }, { "[SiS 401] AMI 486 Clone", "sis401", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_sis401_init, NULL }, { "[SiS 460] ABIT AV4", "av4", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_av4_init, NULL }, - { "[SiS 461] IBM PS/ValuePoint 433DX/Si", "valuepoint433", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_valuepoint433_init, NULL }, + { "[SiS 461] IBM PS/ValuePoint 433DX/Si", "valuepoint433", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_valuepoint433_init, at_valuepoint433_get_device }, { "[SiS 471] AMI 486 Clone", "ami471", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_ami471_init, NULL }, { "[SiS 471] AMI WinBIOS 486 clone", "win471", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_win471_init, NULL }, { "[SiS 471] AOpen Vi15G", "vi15g", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024, 65536, 1024, 127, machine_at_vi15g_init, NULL }, diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index bbddc6ac8..5d1771494 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -1704,6 +1704,17 @@ const device_t et4000w32_device = et4000w32p_config }; +const device_t et4000w32_onboard_device = +{ + "Tseng Labs ET4000/w32 (On-board)", + DEVICE_ISA | DEVICE_AT, ET4000W32, + et4000w32p_init, et4000w32p_close, NULL, + { et4000w32_available }, + et4000w32p_speed_changed, + et4000w32p_force_redraw, + et4000w32p_config +}; + const device_t et4000w32i_isa_device = { "Tseng Labs ET4000/w32i ISA",