All attached HDs are marked as bootable

Author: dirkwhoffmann

Emulator/VAmiga/Components/Zorro/HdController.cpp

@@ -263,12 +263,13 @@ HdController::spypeek16(u32 addr) const
         case EXPROM_SIZE + 4:
 
             // Should auto boot be disabled?
-            if (df0.hasDisk() || !drive.hasBootBlock()) {
+            /*
+            if (df0.hasDisk() && ...) {
 
                 debug(HDR_DEBUG, "Disabling auto boot\n");
                 return u16(true);
             }
-
+            */
             return u16(false);
 
         case EXPROM_SIZE + 6:

Emulator/VAmiga/Foundation/Defaults.cpp

@@ -113,8 +113,8 @@ Defaults::Defaults()
     setFallback(Opt::DRIVE_POLL_VOLUME,          0,                      { 0, 1, 2, 3 });
     setFallback(Opt::DRIVE_INSERT_VOLUME,        50,                     { 0, 1, 2, 3 });
     setFallback(Opt::DRIVE_EJECT_VOLUME,         50,                     { 0, 1, 2, 3 });
-    setFallback(Opt::HDC_CONNECT,                true,                   { 0 });
-    setFallback(Opt::HDC_CONNECT,                false,                  { 1, 2, 3 });
+    // setFallback(Opt::HDC_CONNECT,                true,                   { 0 });
+    setFallback(Opt::HDC_CONNECT,                false,                  { 0, 1, 2, 3 });
     setFallback(Opt::HDR_TYPE,                   (i64)HardDriveType::GENERIC, { 0, 1, 2, 3 });
     setFallback(Opt::HDR_PAN,                    300,                    { 0, 2 });
     setFallback(Opt::HDR_PAN,                    100,                    { 1, 3 });

Emulator/VAmiga/Media/DiskFiles/HDFFile.cpp

@@ -156,12 +156,11 @@ HDFFile::getPartitionDescriptor(isize part) const
 
         assert(part == 0);
 
-        // Add a default partition spanning the whole disk
+        // Add a default partition spanning the entire disk
         auto geo = getGeometryDescriptor();
         result = PartitionDescriptor(geo);
 
-        // Make the first partition bootable if a boot block exists
-//        if (hasBootBlock()) result.flags |= 1;
+        // Make the first partition bootable
         result.flags |= 1;
     }
 
@@ -300,17 +299,6 @@ 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

@@ -117,9 +117,6 @@ 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

@@ -101,7 +101,15 @@ HardDrive::init(const GeometryDescriptor &geometry)
 
     // Create the drive description
     this->geometry = geometry;
-    ptable.push_back(PartitionDescriptor(geometry));
+    
+    // Add a default partition spanning the entire disk
+    auto partition = PartitionDescriptor(geometry);
+    
+    // Make the partition bootable
+    partition.flags |= 1;
+    
+    // Add the descriptor to the partition table
+    ptable.push_back(partition);
 
     // Create the new drive
     data.resize(geometry.numBytes());
@@ -161,12 +169,10 @@ HardDrive::init(const HDFFile &hdf)
     if (auto value = hdf.getControllerRevision(); value) controllerRevision = *value;
 
     // Copy geometry
-    assert(hdf.geometry == hdf.getGeometryDescriptor());
-    geometry = hdf.getGeometryDescriptor(); // TODO: Replace by " = hdf.geometry" (?!)
+    geometry = hdf.geometry;
 
     // Copy partition table
-    ptable = hdf.getPartitionDescriptors();  // TODO: Replace by " = hdf.ptable" (?!)
-    assert(ptable.size() == hdf.getPartitionDescriptors().size());
+    ptable = hdf.ptable;
 
     // Copy over all needed file system drivers
     for (const auto &driver : hdf.drivers) {
@@ -399,8 +405,6 @@ 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("Boot block");
-        os << bol(hasBootBlock()) << std::endl;
         os << tab("Capacity");
         os << dec(cap1) << "." << dec(cap2) << " MB" << std::endl;
         geometry.dump(os);
@@ -499,17 +503,6 @@ 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

@@ -263,8 +263,6 @@ class HardDrive final : public Drive, public Inspectable<HardDriveInfo> {
     bool hasProtectedDisk() const override;
     void setModificationFlag(bool value) override;
     void setProtectionFlag(bool value) override;
-
-    bool hasBootBlock() const;
 
 
     //

Emulator/VAmiga/Utilities/Compression.cpp

@@ -222,11 +222,10 @@ gunzip(u8 *compressed, isize len, std::vector<u8> &result, isize sizeEstimate)
 
 #else
 
-void
-gzip(u8 *uncompressed, isize len, std::vector<u8> &result) {
+void gzip(u8 *uncompressed, isize len, std::vector<u8> &result) {
     throw std::runtime_error("No zlib support.");
 }
-void gunzip(u8 *compressed, isize len, std::vector<u8> &result) {
+void gunzip(u8 *compressed, isize len, std::vector<u8> &result, isize sizeEstimate) {
     throw std::runtime_error("No zlib support.");
 }
 

Emulator/VAmigaCheck.cpp

@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
         std::cout << "       <script>            Execute this script instead of the default" << std::endl;
         std::cout << std::endl;
 
-        if (auto what = string(e.what()); !what.empty()) {
+        if (auto what = std::string(e.what()); !what.empty()) {
             std::cout << what << std::endl;
         }
 

vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -261,21 +261,5 @@
             landmarkType = "21">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CDE299FF-8C61-4C06-8687-58C4FB2E8AF2"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Emulator/VAmiga/Components/Zorro/HdController.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "268"
-            endingLineNumber = "268"
-            landmarkName = "HdController::spypeek16(addr)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>