Updated LUN check

PiSCSI · Aug 28, 2022 · 4730781 · 4730781
1 parent 6a80049
commit 4730781
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/raspberrypi/controllers/scsi_controller.cpp b/src/raspberrypi/controllers/scsi_controller.cpp
@@ -256,11 +256,18 @@ void ScsiController::Selection()
 			return;
 		}
 
-		// Abort if there is no LUN for this controller
-		if (ctrl.luns.empty()) {
-			assert(false);
-			return;
-		}
+        // Abort if there is no valid LUN
+        bool has_valid_unit = false;
+        for (int i = 0; i < LUN_MAX; i++) {
+                if (HasLunDevice(i)) {
+                        has_valid_unit = true;
+                        break;
+                }
+        }
+        if (!has_valid_unit) {
+                assert(false);
+                return;
+        }
 
 		LOGTRACE("%s Selection Phase ID=%d (with device)", __PRETTY_FUNCTION__, (int)ctrl.scsi_id);