diff --git a/lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_config_hook.cpp b/lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_config_hook.cpp index c73fd67f..e72804f2 100644 --- a/lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_config_hook.cpp +++ b/lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_config_hook.cpp @@ -73,7 +73,7 @@ static bool isValidMacintoshImage(image_config_t *img) return result; } -// Called from BlueSCSI_disk after image is initalized. +// Called from BlueSCSI_disk after image is initialized. void platformConfigHook(image_config_t *img) { if(ini_getbool("SCSI", "DisableConfigHook", false, CONFIGFILE)) @@ -94,7 +94,7 @@ void platformConfigHook(image_config_t *img) debuglog("---- Valid Macintosh Device Image detected."); } } - // Macintosh hosts reserve ID 7, so warn the user this configuration wont work + // Macintosh hosts reserve ID 7, so warn the user this configuration won't work if((img->scsiId & S2S_CFG_TARGET_ID_BITS) == 7) { log("---- WARNING: Quirks set to Apple so can not use SCSI ID 7!"); diff --git a/src/BlueSCSI_disk.cpp b/src/BlueSCSI_disk.cpp index cca17015..52f5c969 100644 --- a/src/BlueSCSI_disk.cpp +++ b/src/BlueSCSI_disk.cpp @@ -591,7 +591,7 @@ static void scsiDiskConfigDefaults(int target_idx) } // Load values for target configuration from given section if they exist. -// Otherwise keep current settings. +// Otherwise, keep current settings. static void scsiDiskLoadConfig(int target_idx, const char *section) { image_config_t &img = g_DiskImages[target_idx]; diff --git a/src/BlueSCSI_presets.cpp b/src/BlueSCSI_presets.cpp index a21ccd36..e5874178 100644 --- a/src/BlueSCSI_presets.cpp +++ b/src/BlueSCSI_presets.cpp @@ -1,7 +1,7 @@ #include "BlueSCSI_presets.h" +#include "BlueSCSI_config.h" #include "BlueSCSI_disk.h" #include "BlueSCSI_log.h" -#include "BlueSCSI_config.h" #include // Helper function for case-insensitive string compare @@ -59,9 +59,16 @@ preset_config_t getSystemPreset(const char *presetName) cfg.presetName = "X68000"; cfg.selectionDelay = 0; cfg.quirks = S2S_CFG_QUIRKS_X68000; - cfg.enableSCSI2 = 0; + cfg.enableSCSI2 = false; cfg.maxSyncSpeed = 5; } + else if (strequals(presetName, "NeXT")) + { + cfg.presetName = "NeXT"; + cfg.quirks = S2S_CFG_QUIRKS_NONE; + cfg.sectorsPerTrack = 139; + cfg.headsPerCylinder = 4; + } else { log("Unknown preset name ", presetName, ", using default settings");