Disks imported from HDFs are only marked as bootable when a boot block exists (#876)

Author: dirkwhoffmann

Emulator/VAmiga/Components/Zorro/HdController.cpp

@@ -261,9 +261,9 @@ HdController::spypeek16(u32 addr) const
             return u16(drive.numDrivers());
 
         case EXPROM_SIZE + 4:
-
+            
             // Should auto boot be disabled?
-            if (df0.hasDisk() || drive.bootable == false) {
+            if (df0.hasDisk() || !drive.hasBootBlock()) {
 
                 debug(HDR_DEBUG, "Disabling auto boot\n");
                 return u16(true);

Emulator/VAmiga/FileSystems/BootBlockImage.cpp

@@ -1183,11 +1183,11 @@ BootBlockImage::BootBlockImage(BootBlockId bootBlockID)
 
     switch (bootBlockID) {
 
-        case BootBlockId::AMIGADOS_13: name = "AmigaDOS Standard Bootblock 1.3"; break;
-        case BootBlockId::AMIGADOS_20: name = "AmigaDOS Standard Bootblock 2.0"; break;
-        case BootBlockId::SCA:         name = "SCA Virus";                       break;
-        case BootBlockId::BYTE_BANDIT: name = "Byte Bandit 1 Virus";             break;
-        default:             name = "";                                break;
+        case BootBlockId::AMIGADOS_13:  name = "AmigaDOS Standard Bootblock 1.3"; break;
+        case BootBlockId::AMIGADOS_20:  name = "AmigaDOS Standard Bootblock 2.0"; break;
+        case BootBlockId::SCA:          name = "SCA Virus";                       break;
+        case BootBlockId::BYTE_BANDIT:  name = "Byte Bandit 1 Virus";             break;
+        default:                        name = "";                                break;
     }
 
     BootBlockImage bb = BootBlockImage(string(name));

Emulator/VAmiga/Media/DiskFiles/HDFFile.cpp

@@ -160,8 +160,8 @@ HDFFile::getPartitionDescriptor(isize part) const
         auto geo = getGeometryDescriptor();
         result = PartitionDescriptor(geo);
 
-        // Make the first partition bootable
-        result.flags |= 1;
+        // Make the first partition bootable if a boot block exists
+        if (hasBootBlock()) result.flags |= 1;
     }
 
     return result;
@@ -299,6 +299,17 @@ HDFFile::getInfo() const
     return info;
 }
 
+bool
+HDFFile::hasBootBlock() const
+{
+    if (data.size > 512) {
+        for (isize i = 12; i < 512; i++) {
+            if (data[i]) return true;
+        }
+    }
+    return false;
+}
+
 bool
 HDFFile::hasRDB() const
 {

Emulator/VAmiga/Media/DiskFiles/HDFFile.h

@@ -115,7 +115,10 @@ class HDFFile : public DiskFile {
 
     // Returns the (predicted) geometry for this disk
     const GeometryDescriptor getGeometry() const { return geometry; }
-    
+
+    // Returns true if this image contains a boot block
+    bool hasBootBlock() const;
+
     // Returns true if this image contains a rigid disk block
     bool hasRDB() const;
 

Emulator/VAmiga/Peripherals/Drive/HardDrive.cpp

@@ -46,7 +46,6 @@ HardDrive::operator= (const HardDrive& other) {
     CLONE(head)
     CLONE(state)
     CLONE(flags)
-    CLONE(bootable)
 
     if (RUA_ON_STEROIDS) {
 
@@ -297,7 +296,6 @@ HardDrive::connect()
         debug(WT_DEBUG, "Creating default disk...\n");
         init(MB(10));
         format(FSVolumeType::OFS, defaultName());
-        bootable = false;
     }
 }
 
@@ -385,12 +383,8 @@ HardDrive::_dump(Category category, std::ostream& os) const
         os << HardDriveStateEnum::key(state) << std::endl;
         os << tab("Flags");
         os << DiskFlagsEnum::mask(flags) << std::endl;
-        os << tab("Bootable");
-        if (bootable) {
-            os << bol(*bootable) << std::endl;
-        } else {
-            os << "Unknown" << std::endl;
-        }
+        os << tab("Boot block");
+        os << bol(hasBootBlock()) << std::endl;
         os << tab("Capacity");
         os << dec(cap1) << "." << dec(cap2) << " MB" << std::endl;
         geometry.dump(os);
@@ -489,6 +483,17 @@ HardDrive::setProtectionFlag(bool value)
     if (hasDisk()) setFlag(DiskFlags::PROTECTED, value);
 }
 
+bool
+HardDrive::hasBootBlock() const
+{
+    if (data.size > 512) {
+        for (isize i = 12; i < 512; i++) {
+            if (data[i]) return true;
+        }
+    }
+    return false;
+}
+
 string
 HardDrive::defaultName(isize partition) const
 {

Emulator/VAmiga/Peripherals/Drive/HardDrive.h

@@ -98,7 +98,7 @@ class HardDrive final : public Drive, public Inspectable<HardDriveInfo> {
 
     // Disk state flags
     long flags = 0;
-    optional <bool> bootable;
+    // optional <bool> bootable;
 
 
     //
@@ -223,8 +223,7 @@ class HardDrive final : public Drive, public Inspectable<HardDriveInfo> {
         << ptable
         << drivers
         << data
-        << flags
-        << bootable;
+        << flags;
 
     } SERIALIZERS(serialize, override);
 
@@ -264,6 +263,8 @@ class HardDrive final : public Drive, public Inspectable<HardDriveInfo> {
     void setModificationFlag(bool value) override;
     void setProtectionFlag(bool value) override;
 
+    bool hasBootBlock() const;
+    
 
     //
     // Methods from Configurable

vAmiga.xcodeproj/project.pbxproj

@@ -3213,7 +3213,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 250204;
+				CURRENT_PROJECT_VERSION = 250208;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3229,7 +3229,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.1;
-				MARKETING_VERSION = 3.3;
+				MARKETING_VERSION = 4.0b1;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -3247,7 +3247,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 250204;
+				CURRENT_PROJECT_VERSION = 250208;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3263,7 +3263,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.1;
-				MARKETING_VERSION = 3.3;
+				MARKETING_VERSION = 4.0b1;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;