From 3dd22962b91bbdd76b6158c9a9c59cc2040517fa Mon Sep 17 00:00:00 2001 From: yz70s Date: Sun, 22 Dec 2019 18:26:02 +0100 Subject: bebox.cpp: remove device not found errors (nw) --- src/devices/bus/lpci/cirrus.h | 3 ++- src/mame/drivers/bebox.cpp | 11 +++++++++-- src/mame/includes/bebox.h | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index cc466f12329..ef0b8ce3369 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -20,8 +20,9 @@ class pci_cirrus_svga_device : public device_t, public pci_device_interface { public: - // construction/destruction + // construction/destruction pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + void set_vga(const char *tag) { m_vga.set_tag(tag); } virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override; diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index f5a8a05ec49..d812bd2b8b2 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -122,6 +122,12 @@ void bebox_state::mpc105_config(device_t *device) mpc105.set_bank_base_default(0); } +void bebox_state::cirrus_config(device_t *device) +{ + pci_cirrus_svga_device &cirruspci = *downcast(device); + cirruspci.set_vga(":vga"); +} + /************************************* * * Keyboard @@ -188,7 +194,7 @@ void bebox_state::bebox_peripherals(machine_config &config) screen.set_raw(XTAL(25'174'800), 900, 0, 640, 526, 0, 480); screen.set_screen_update("vga", FUNC(cirrus_gd5428_device::screen_update)); - cirrus_gd5428_device &vga(CIRRUS_GD5428(config, "vga", 0)); + cirrus_gd5428_device &vga(CIRRUS_GD5428(config, m_vga, 0)); vga.set_screen("screen"); speaker_device &speaker(SPEAKER(config, "mono")); @@ -219,7 +225,8 @@ void bebox_state::bebox_peripherals(machine_config &config) pci_connector_device &pcislot0 = add_pci_slot(config, "pcibus:0", 0, "mpc105"); pcislot0.set_option_machine_config("mpc105", mpc105_config); - add_pci_slot(config, "pcibus:1", 1, "cirrus"); + pci_connector_device &pcislot1 = add_pci_slot(config, "pcibus:1", 1, "cirrus"); + pcislot1.set_option_machine_config("cirrus", cirrus_config); /*PCI_BUS_LEGACY_DEVICE(12, nullptr, scsi53c810_pci_read, scsi53c810_pci_write)*/ diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h index 85a1eb3abdd..a33ab3c1043 100644 --- a/src/mame/includes/bebox.h +++ b/src/mame/includes/bebox.h @@ -23,6 +23,7 @@ #include "machine/ram.h" #include "machine/upd765.h" #include "machine/intelfsh.h" +#include "video/pc_vga.h" #include "bus/lpci/pci.h" @@ -46,6 +47,7 @@ public: , m_smc37c78(*this, "smc37c78") , m_flash(*this, "flash") , m_pcibus(*this, "pcibus") + , m_vga(*this, "vga") { } @@ -58,6 +60,7 @@ public: required_device m_smc37c78; required_device m_flash; required_device m_pcibus; + required_device m_vga; uint32_t m_cpu_imask[2]; uint32_t m_interrupts; uint32_t m_crossproc_interrupts; @@ -119,6 +122,7 @@ public: void bebox_update_interrupts(); static void mpc105_config(device_t *device); + static void cirrus_config(device_t *device); pci_connector_device & add_pci_slot(machine_config &config, const char *tag, size_t index, const char *default_tag); void bebox_peripherals(machine_config &config); -- cgit v1.2.3