From 8fcbc74c3346eb760cbfb7c6b3df7349808f0d97 Mon Sep 17 00:00:00 2001
From: Uwe Seimet <Uwe.Seimet@seimet.de>
Date: Sun, 22 Aug 2021 16:16:02 +0200
Subject: [PATCH] Cleanup

---
 src/raspberrypi/devices/block_device.h | 10 +++-------
 src/raspberrypi/devices/disk.h         | 12 ++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/raspberrypi/devices/block_device.h b/src/raspberrypi/devices/block_device.h
index b4f7ec9b..9c3ea143 100644
--- a/src/raspberrypi/devices/block_device.h
+++ b/src/raspberrypi/devices/block_device.h
@@ -34,14 +34,10 @@ public:
 	virtual void Write10(SASIDEV *) = 0;
 	virtual void Write16(SASIDEV *) = 0;
 
-	// Implemented optional commands
-	// TODO uncomment
-	//virtual void Verify10(SASIDEV *) = 0;
-	//virtual void Verify16(SASIDEV *) = 0;
 	virtual void RequestSense(SASIDEV *) override = 0;
-	//virtual void ModeSense(SASIDEV *) override = 0;
-	//virtual void ModeSense10(SASIDEV *) override = 0;
-	//virtual void ModeSelect(SASIDEV *) override = 0;
+	virtual void ModeSense(SASIDEV *) override = 0;
+	virtual void ModeSense10(SASIDEV *) override = 0;
+	virtual void ModeSelect(SASIDEV *) override = 0;
 
 	// TODO Add the other optional commands currently implemented
 };
diff --git a/src/raspberrypi/devices/disk.h b/src/raspberrypi/devices/disk.h
index d7e24c11..5e232f7e 100644
--- a/src/raspberrypi/devices/disk.h
+++ b/src/raspberrypi/devices/disk.h
@@ -170,14 +170,14 @@ public:
 	void ReadDefectData10(SASIDEV *);
 	virtual int Read(const DWORD *cdb, BYTE *buf, DWORD block);			// READ command
 	void Read6(SASIDEV *);
-	void Read10(SASIDEV *);
-	void Read16(SASIDEV *);
+	void Read10(SASIDEV *) override;
+	void Read16(SASIDEV *) override;
 	virtual int Inquiry(const DWORD *cdb, BYTE *buf);	// INQUIRY command
 	virtual int WriteCheck(DWORD block);					// WRITE check
 	virtual bool Write(const DWORD *cdb, const BYTE *buf, DWORD block);			// WRITE command
 	void Write6(SASIDEV *);
-	void Write10(SASIDEV *);
-	void Write16(SASIDEV *);
+	void Write10(SASIDEV *) override;
+	void Write16(SASIDEV *) override;
 	void Seek(SASIDEV *);
 	void Seek6(SASIDEV *);
 	void Seek10(SASIDEV *);
@@ -186,8 +186,8 @@ public:
 	bool StartStop(const DWORD *cdb);				// START STOP UNIT command
 	bool SendDiag(const DWORD *cdb);				// SEND DIAGNOSTIC command
 	bool Removal(const DWORD *cdb);				// PREVENT/ALLOW MEDIUM REMOVAL command
-	void ReadCapacity10(SASIDEV *) override;			// READ CAPACITY(10) command
-	void ReadCapacity16(SASIDEV *) override;			// READ CAPACITY(16) command
+	void ReadCapacity10(SASIDEV *) override;
+	void ReadCapacity16(SASIDEV *) override;
 	void ReportLuns(SASIDEV *) override;
 	void Reserve6(SASIDEV *);
 	void Reserve10(SASIDEV *);