From bc0f4195309fe3e9d2a09054e9ee515de5c52e06 Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Mon, 23 Aug 2021 12:11:49 +0200 Subject: [PATCH] Moved CmdGetEventStatusNotification to correct class --- src/raspberrypi/devices/scsi_daynaport.cpp | 7 ------- src/raspberrypi/devices/scsi_daynaport.h | 1 - src/raspberrypi/devices/scsicd.cpp | 7 +++++++ src/raspberrypi/devices/scsicd.h | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/raspberrypi/devices/scsi_daynaport.cpp b/src/raspberrypi/devices/scsi_daynaport.cpp index b5fb5048..c9396648 100644 --- a/src/raspberrypi/devices/scsi_daynaport.cpp +++ b/src/raspberrypi/devices/scsi_daynaport.cpp @@ -91,7 +91,6 @@ SCSIDaynaPort::SCSIDaynaPort() : Disk("SCDP") AddCommand(SCSIDEV::eCmdSetIfaceMode, "CmdSetIfaceMode", &SCSIDaynaPort::CmdSetInterfaceMode); AddCommand(SCSIDEV::eCmdSetMcastAddr, "CmdSetMcastAddr", &SCSIDaynaPort::CmdSetMcastAddr); AddCommand(SCSIDEV::eCmdEnableInterface, "CmdEnableInterface", &SCSIDaynaPort::CmdEnableInterface); - AddCommand(SCSIDEV::eCmdGetEventStatusNotification, "CmdGetEventStatusNotification", &SCSIDaynaPort::CmdGetEventStatusNotification); } //--------------------------------------------------------------------------- @@ -714,12 +713,6 @@ void SCSIDaynaPort::CmdEnableInterface(SASIDEV *controller) controller->Status(); } -void SCSIDaynaPort::CmdGetEventStatusNotification(SASIDEV *controller) -{ - // This naive (but legal) implementation avoids constant warnings in the logs - controller->Error(ERROR_CODES::sense_key::ILLEGAL_REQUEST, ERROR_CODES::asc::INVALID_FIELD_IN_CDB); -} - //--------------------------------------------------------------------------- // // Set Mode - enable broadcast messages diff --git a/src/raspberrypi/devices/scsi_daynaport.h b/src/raspberrypi/devices/scsi_daynaport.h index d1feac5c..0530d969 100644 --- a/src/raspberrypi/devices/scsi_daynaport.h +++ b/src/raspberrypi/devices/scsi_daynaport.h @@ -92,7 +92,6 @@ public: void CmdSetInterfaceMode(SASIDEV *); void CmdSetMcastAddr(SASIDEV *); void CmdEnableInterface(SASIDEV *); - void CmdGetEventStatusNotification(SASIDEV *); bool Dispatch(SCSIDEV *); diff --git a/src/raspberrypi/devices/scsicd.cpp b/src/raspberrypi/devices/scsicd.cpp index bf829f06..ee20db66 100644 --- a/src/raspberrypi/devices/scsicd.cpp +++ b/src/raspberrypi/devices/scsicd.cpp @@ -249,6 +249,7 @@ SCSICD::SCSICD() : Disk("SCCD") AddCommand(SCSIDEV::eCmdPlayAudio10, "CmdPlayAudio10", &SCSICD::CmdPlayAudio10); AddCommand(SCSIDEV::eCmdPlayAudioMSF, "CmdPlayAudioMSF", &SCSICD::CmdPlayAudioMSF); AddCommand(SCSIDEV::eCmdPlayAudioTrack, "CmdPlayAudioTrack", &SCSICD::CmdPlayAudioTrack); + AddCommand(SCSIDEV::eCmdGetEventStatusNotification, "CmdGetEventStatusNotification", &SCSICD::CmdGetEventStatusNotification); } //--------------------------------------------------------------------------- @@ -792,6 +793,12 @@ int SCSICD::ReadToc(const DWORD *cdb, BYTE *buf) return length; } +void SCSICD::CmdGetEventStatusNotification(SASIDEV *controller) +{ + // This naive (but legal) implementation avoids constant warnings in the logs + controller->Error(ERROR_CODES::sense_key::ILLEGAL_REQUEST, ERROR_CODES::asc::INVALID_FIELD_IN_CDB); +} + //--------------------------------------------------------------------------- // // LBA→MSF Conversion diff --git a/src/raspberrypi/devices/scsicd.h b/src/raspberrypi/devices/scsicd.h index 5145e831..f00220b7 100644 --- a/src/raspberrypi/devices/scsicd.h +++ b/src/raspberrypi/devices/scsicd.h @@ -121,6 +121,7 @@ private: void CmdPlayAudio10(SASIDEV *); void CmdPlayAudioMSF(SASIDEV *); void CmdPlayAudioTrack(SASIDEV *); + void CmdGetEventStatusNotification(SASIDEV *); BOOL rawfile; // RAW flag