From 2281a7e53b5767b4dba6d41357ec1b29cb08939f Mon Sep 17 00:00:00 2001 From: Uwe Seimet <48174652+uweseimet@users.noreply.github.com> Date: Fri, 18 Feb 2022 21:03:22 +0100 Subject: [PATCH] Bridge is not yet ready to not subclass Disk (#679) --- src/raspberrypi/devices/scsi_host_bridge.cpp | 2 +- src/raspberrypi/devices/scsi_host_bridge.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/raspberrypi/devices/scsi_host_bridge.cpp b/src/raspberrypi/devices/scsi_host_bridge.cpp index a4a956c8..e490f6a2 100644 --- a/src/raspberrypi/devices/scsi_host_bridge.cpp +++ b/src/raspberrypi/devices/scsi_host_bridge.cpp @@ -24,7 +24,7 @@ using namespace std; using namespace scsi_defs; -SCSIBR::SCSIBR() : PrimaryDevice("SCBR") +SCSIBR::SCSIBR() : Disk("SCBR") { tap = NULL; m_bTapEnable = false; diff --git a/src/raspberrypi/devices/scsi_host_bridge.h b/src/raspberrypi/devices/scsi_host_bridge.h index 7964e9eb..e7e304e7 100644 --- a/src/raspberrypi/devices/scsi_host_bridge.h +++ b/src/raspberrypi/devices/scsi_host_bridge.h @@ -18,7 +18,7 @@ #pragma once #include "os.h" -#include "primary_device.h" +#include "disk.h" #include //=========================================================================== @@ -29,7 +29,7 @@ class CTapDriver; class CFileSys; -class SCSIBR : public PrimaryDevice +class SCSIBR : public Disk { public: @@ -48,7 +48,7 @@ public: void SendMessage10(SASIDEV *); private: - typedef PrimaryDevice super; + typedef Disk super; Dispatcher dispatcher;