Переглянути джерело

Revert "Don't let user use ID7 on Apple quirks as it wont work" (#162)

This reverts commit 953ed91c180c892a219d532854cd64f1b1630f78.

The patch has no chance of working. The if near line 321 skips the
loop if cfg != NULL, then the next if proceeds to dereference cfg
anyway. As a result it crashes always if ID 7 is used.
Petteri Aimonen 2 роки тому
батько
коміт
c5eb5b6e6b
1 змінених файлів з 1 додано та 9 видалено
  1. 1 9
      src/ZuluSCSI.cpp

+ 1 - 9
src/ZuluSCSI.cpp

@@ -318,20 +318,12 @@ bool findHDDImages()
         strcat(fullname, name);
 
         // Check whether this SCSI ID has been configured yet
-        const S2S_TargetCfg* cfg = s2s_getConfigById(id);
-        if (cfg)
+        if (s2s_getConfigById(id))
         {
           logmsg("-- Ignoring ", fullname, ", SCSI ID ", id, " is already in use!");
           continue;
         }
 
-        // Apple computers reserve ID 7, so warn the user this configuration wont work
-        if(id == 7 && cfg->quirks == S2S_CFG_QUIRKS_APPLE )
-        {
-          logmsg("-- Ignoring ", fullname, ", SCSI ID ", id, " Quirks set to Apple so can not use SCSI ID 7!");
-          continue;
-        }
-
         // Type mapping based on filename.
         // If type is FIXED, the type can still be overridden in .ini file.
         S2S_CFG_TYPE type = S2S_CFG_FIXED;