Fix build errors and warnings

Author: rechrtb

src/Storage/MassStorage.cpp

@@ -3,12 +3,6 @@
 #include <Platform/RepRap.h>
 #include <ObjectModel/ObjectModel.h>
 
-#if HAS_MASS_STORAGE
-
-// Check that the LFN configuration in FatFS is sufficient
-static_assert(FF_MAX_LFN >= MaxFilenameLength, "FF_MAX_LFN too small");
-
-#endif
 
 #if HAS_SBC_INTERFACE
 # include <SBC/SbcInterface.h>
@@ -18,9 +12,14 @@ static_assert(FF_MAX_LFN >= MaxFilenameLength, "FF_MAX_LFN too small");
 # include <GCodes/GCodeBuffer/GCodeBuffer.h>
 #endif
 
+#if HAS_MASS_STORAGE
 #include <Libraries/Fatfs/ff.h> // for type definitions
 #include <Libraries/Fatfs/diskio.h>
 
+// Check that the LFN configuration in FatFS is sufficient
+static_assert(FF_MAX_LFN >= MaxFilenameLength, "FF_MAX_LFN too small");
+#endif
+
 #include "SdCardVolume.h"
 
 #if SUPPORT_USB_DRIVE
@@ -39,7 +38,6 @@ static_assert(FF_VOLUMES >= NumSdCards);
 // No function in here should be called when the caller already owns the shared SPI mutex.
 
 #if HAS_MASS_STORAGE
-
 // Private data and methods
 
 # if SAME70
@@ -877,57 +875,51 @@ bool MassStorage::IsVolumeDetected(size_t slot) noexcept
 // This may only be called to mount one volume at a time.
 GCodeResult MassStorage::Mount(size_t slot, const StringRef& reply, bool reportSuccess) noexcept
 {
-	if (slot >= GetNumVolumes())
+	if (slot >= GetNumVolumes()
+#if HAS_MASS_STORAGE
+		|| !storageVolumes[slot]->IsUseable(reply)
+#endif
+	)
 	{
 		reply.copy("Volume slot out of range");
 		return GCodeResult::error;
 	}
 
-	if (!storageVolumes[slot]->IsUseable(reply))
-	{
-		return GCodeResult::error;
-	}
-
-	GCodeResult res = GCodeResult::ok;
-
 # if HAS_MASS_STORAGE
 	MutexLocker lock(fsMutex);
-	res = storageVolumes[slot]->Mount(reply, reportSuccess);
+	return storageVolumes[slot]->Mount(reply, reportSuccess);
+#else
+	return GCodeResult::ok;
 #endif
-
-	return res;
 }
 
 // Unmount the volume on specified slot, returning true if done, false if needs to be called again.
 // If an error occurs, return true with the error message in 'reply'.
 GCodeResult MassStorage::Unmount(size_t slot, const StringRef& reply) noexcept
 {
-	if (slot >= GetNumVolumes())
+	if (slot >= GetNumVolumes()
+#if HAS_MASS_STORAGE
+		|| !storageVolumes[slot]->IsUseable(reply)
+#endif
+	)
 	{
 		reply.copy("Volume slot out of range");
 		return GCodeResult::error;
 	}
 
-	if (!storageVolumes[slot]->IsUseable(reply))
-	{
-		return GCodeResult::error;
-	}
-
-	GCodeResult res = GCodeResult::ok;
-
 # if HAS_MASS_STORAGE
 	MutexLocker lock(fsMutex);
-	res = storageVolumes[slot]->Unmount(reply);
+	return storageVolumes[slot]->Unmount(reply);
+#else
+	return GCodeResult::ok;
 #endif
-
-	return res;
 }
 
 bool MassStorage::IsDriveMounted(size_t slot) noexcept
 {
-	return slot < GetNumVolumes() && storageVolumes[slot]->IsUseable()
+	return slot < GetNumVolumes()
 #if HAS_MASS_STORAGE
-		&& storageVolumes[slot]->IsMounted()
+		&& storageVolumes[slot]->IsUseable() && storageVolumes[slot]->IsMounted()
 #endif
 		;
 }
@@ -1038,7 +1030,7 @@ void MassStorage::RecordSimulationTime(const char *printingFilePath, uint32_t si
 // Get information about the volume and interface speed on the specified slot
 MassStorage::InfoResult MassStorage::GetVolumeInfo(size_t slot, SdCardReturnedInfo& returnedInfo) noexcept
 {
-	if (slot >= GetNumVolumes() && storageVolumes[slot]->IsUseable())
+	if (slot >= GetNumVolumes() || !storageVolumes[slot]->IsUseable())
 	{
 		return InfoResult::badSlot;
 	}
@@ -1066,7 +1058,6 @@ const ObjectModel * MassStorage::GetVolume(size_t slot) noexcept
 }
 # endif
 
-#endif
 
 // Functions called by FatFS to acquire/release mutual exclusion
 extern "C"
@@ -1124,4 +1115,7 @@ extern "C"
 	}
 }
 
+#endif
+
+
 // End

src/Storage/MassStorage.h

@@ -56,7 +56,9 @@ namespace MassStorage
 	bool FileExists(const char *filePath) noexcept;
 	void CloseAllFiles() noexcept;
 	void Spin() noexcept;
-
+#if HAS_EMBEDDED_FILES && defined(DUET3_MB6HC)
+	size_t GetNumVolumes() noexcept;
+#else
 	inline size_t GetNumVolumes() noexcept
 	{
 		return NumSdCards
@@ -65,6 +67,7 @@ namespace MassStorage
 #endif
 		;
 	}
+#endif // HAS_EMBEDDED_FILES && defined(DUET3_MB6HC)
 #endif
 
 #if HAS_MASS_STORAGE || HAS_SBC_INTERFACE

src/Storage/SdCardVolume.cpp

@@ -250,7 +250,7 @@ GCodeResult SdCardVolume::Mount(const StringRef& reply, bool reportSuccess) noex
 
 bool SdCardVolume::IsUseable(const StringRef& reply) const noexcept
 {
-#if DUET3_MB6HC
+#ifdef DUET3_MB6HC
 	// We have another sd slot if the second one has a valid CS pin
 	if (slot == 1 && (reprap.GetPlatform().GetBoardType() >= BoardType::Duet3_6HC_v102 || sd1Ports[0].IsValid()))
 	{

src/Storage/SdCardVolume.h

@@ -3,6 +3,8 @@
 #include <ObjectModel/ObjectModel.h>
 #include "StorageVolume.h"
 
+#if HAS_MASS_STORAGE
+
 class SdCardVolume : public StorageVolume
 {
 public:
@@ -75,3 +77,5 @@ class SdCardVolume : public StorageVolume
 
 	void DeviceUnmount() noexcept override;
 };
+
+#endif

src/Storage/StorageVolume.cpp

@@ -1,8 +1,9 @@
 #include <Platform/RepRap.h>
 
-#include "StorageVolume.h"
 #include "MassStorage.h"
+#include "StorageVolume.h"
 
+#if HAS_MASS_STORAGE
 #if SUPPORT_OBJECT_MODEL
 
 // Object model table and functions
@@ -114,3 +115,5 @@ void StorageVolume::Clear()
 }
 
 /*static*/ const StringRef StorageVolume::noReply = StringRef(nullptr, 0);
+
+#endif // HAS_MASS_STORAGE

src/Storage/StorageVolume.h

@@ -4,6 +4,8 @@
 
 #include <General/StringRef.h>
 #include <ObjectModel/ObjectModel.h>
+
+#if HAS_MASS_STORAGE
 #include <Libraries/Fatfs/diskio.h>
 
 class StorageVolume INHERIT_OBJECT_MODEL
@@ -57,3 +59,4 @@ class StorageVolume INHERIT_OBJECT_MODEL
 	unsigned int InternalUnmount() noexcept;
 	virtual void DeviceUnmount() noexcept = 0;
 };
+#endif