From 194ed138d7691020b66e95e20f270312b83c839e Mon Sep 17 00:00:00 2001 From: luennix Date: Fri, 3 Feb 2023 10:24:11 +0300 Subject: [PATCH] Add Packard Bell PB810 (without on-board video, for now) --- src/machine/m_at_socket7.c | 5 ++--- src/machine/machine_table.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c index 34e54a9ee..f7faae167 100644 --- a/src/machine/m_at_socket7.c +++ b/src/machine/m_at_socket7.c @@ -35,6 +35,7 @@ #include <86box/keyboard.h> #include <86box/flash.h> #include <86box/sio.h> +#include <86box/sound.h> #include <86box/hwm.h> #include <86box/video.h> #include <86box/spd.h> @@ -551,9 +552,7 @@ machine_at_pb810_init(const machine_t *model) pci_register_slot(0x0b, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); - if (gfxcard == VID_INTERNAL) - device_add(&s3_phoenix_trio64vplus_onboard_pci_device); - if (soundcard == SOUND_INTERNAL) + if (sound_card_current[0] == SOUND_INTERNAL) device_add(&cs4237b_device); device_add(&i430vx_device); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 1d00f8287..bc993c913 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -9471,7 +9471,7 @@ const machine_t machines[] = { .max_multi = 3.0 }, .bus_flags = MACHINE_PS2_PCI, - .flags = MACHINE_IDE_DUAL | MACHINE_AV, + .flags = MACHINE_IDE_DUAL | MACHINE_SOUND, .ram = { .min = 8192, .max = 131072, @@ -9481,7 +9481,7 @@ const machine_t machines[] = { .kbc = KBC_UNKNOWN, .kbc_p1 = 0, .gpio = 0, - .device = &s3_phoenix_trio64vplus_onboard_pci_device, + .device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL