From 02a475e113bd15f957bae684c3d4e67a762d678d Mon Sep 17 00:00:00 2001 From: joevt Date: Sun, 10 Mar 2024 16:08:49 -0700 Subject: [PATCH] sc53c94: Remove duplicate bus_obj. sc53c94 is a ScsiDevice which has its own bus_obj which is set by register_device. --- devices/common/scsi/sc53c94.cpp | 8 ++++---- devices/common/scsi/sc53c94.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devices/common/scsi/sc53c94.cpp b/devices/common/scsi/sc53c94.cpp index 02e8e2c..500b0f5 100644 --- a/devices/common/scsi/sc53c94.cpp +++ b/devices/common/scsi/sc53c94.cpp @@ -43,10 +43,10 @@ Sc53C94::Sc53C94(uint8_t chip_id, uint8_t my_id) : ScsiDevice("SC53C94", my_id) int Sc53C94::device_postinit() { - this->bus_obj = dynamic_cast(gMachineObj->get_comp_by_name("ScsiCurio")); - if (this->bus_obj) { - this->bus_obj->register_device(7, static_cast(this)); - this->bus_obj->attach_scsi_devices(""); + ScsiBus* bus = dynamic_cast(gMachineObj->get_comp_by_name("ScsiCurio")); + if (bus) { + bus->register_device(7, static_cast(this)); + bus->attach_scsi_devices(""); } this->int_ctrl = dynamic_cast( diff --git a/devices/common/scsi/sc53c94.h b/devices/common/scsi/sc53c94.h index da4ab80..7d51152 100644 --- a/devices/common/scsi/sc53c94.h +++ b/devices/common/scsi/sc53c94.h @@ -244,7 +244,6 @@ protected: private: uint8_t chip_id = 0; uint8_t my_bus_id = 0; - ScsiBus* bus_obj; uint32_t my_timer_id = 0; uint8_t cmd_fifo[2];