cleanup

dirkwhoffmann · Feb 20, 2025 · 78ecd0e · 78ecd0e
1 parent 6623613
commit 78ecd0e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Emulator/VAmiga/Components/Memory/Memory.cpp b/Emulator/VAmiga/Components/Memory/Memory.cpp
@@ -610,7 +610,7 @@ Memory::fillRamWithInitPattern()
     }
 }
 
-RomTraits &
+const RomTraits &
 Memory::getRomTraits(u32 crc)
 {
     static RomTraits fallback;
@@ -631,19 +631,19 @@ Memory::getRomTraits(u32 crc)
     return fallback;
 }
 
-RomTraits &
+const RomTraits &
 Memory::getRomTraits() const
 {
     return getRomTraits(util::crc32(rom, config.romSize));
 }
 
-RomTraits &
+const RomTraits &
 Memory::getWomTraits() const
 {
     return getRomTraits(util::crc32(wom, config.womSize));
 }
 
-RomTraits &
+const RomTraits &
 Memory::getExtTraits() const
 {
     return getRomTraits(util::crc32(ext, config.extSize));

diff --git a/Emulator/VAmiga/Components/Memory/Memory.h b/Emulator/VAmiga/Components/Memory/Memory.h
@@ -216,7 +216,7 @@ class Memory final : public SubComponent, public Inspectable<MemInfo, MemStats>
 
     // Static buffer for returning textual representations
     // TODO: Replace by "static string str" and make it local
-    char str[256];
+    // char str[256];
 
 
     //
@@ -402,10 +402,10 @@ class Memory final : public SubComponent, public Inspectable<MemInfo, MemStats>
 public:
 
     // Queries ROM information
-    static RomTraits &getRomTraits(u32 crc);
-    RomTraits &getRomTraits() const;
-    RomTraits &getWomTraits() const;
-    RomTraits &getExtTraits() const;
+    static const RomTraits &getRomTraits(u32 crc);
+    const RomTraits &getRomTraits() const;
+    const RomTraits &getWomTraits() const;
+    const RomTraits &getExtTraits() const;
 
     // Computes a CRC-32 checksum
     u32 romFingerprint() const;

diff --git a/Emulator/VAmiga/FileSystems/FileSystem.h b/Emulator/VAmiga/FileSystems/FileSystem.h
@@ -76,9 +76,9 @@ class FileSystem : public CoreObject {
     FileSystem() { };
     FileSystem(const MediaFile &file, isize part = 0) throws { init(file, part); }
     FileSystem(const ADFFile &adf) throws { init(adf); }
-    FileSystem(const HDFFile &hdn, isize part) throws { init(hdn, part); }
+    FileSystem(const HDFFile &hdn, isize part = 0) throws { init(hdn, part); }
     FileSystem(FloppyDrive &dfn) throws { init(dfn); }
-    FileSystem(const HardDrive &hdn, isize part) throws { init(hdn, part); }
+    FileSystem(const HardDrive &hdn, isize part = 0) throws { init(hdn, part); }
 
     virtual ~FileSystem();
 

diff --git a/Emulator/VAmiga/Peripherals/Drive/HardDrive.cpp b/Emulator/VAmiga/Peripherals/Drive/HardDrive.cpp
@@ -369,7 +369,7 @@ HardDrive::isBootable()
 {
     try {
 
-        if (FileSystem(*this, 0).seekPath("s/startup-sequence")) {
+        if (FileSystem(*this).seekPath("s/startup-sequence")) {
 
             debug(HDR_DEBUG, "Bootable drive\n");
             return true;