Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements for ZuluSCSI v1.2 #356

Merged
merged 2 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/ZuluSCSI_platform_GD32F205/ZuluSCSI_platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,27 +343,29 @@ static void set_termination(uint32_t port, uint32_t pin, const char *switch_name
}
else
{
logmsg(switch_name, "is OFF: SCSI termination disabled");
logmsg(switch_name, " is OFF: Disabling SCSI termination");
}
}

static bool get_debug(uint32_t port, uint32_t pin, const char *switch_name)
{
if (gpio_input_bit_get(port, pin))
{
logmsg(switch_name, " is ON: enabling debug messages");
logmsg(switch_name, " is ON: Enabling debug messages");
return true;
}
logmsg(switch_name, " is OFF: Disabling debug messages");
return false;
}

static bool get_quirks(uint32_t port, uint32_t pin, const char *switch_name)
{
if (gpio_input_bit_get(port, pin))
{
logmsg(switch_name, " is ON: enabling Apple quirks by default");
logmsg(switch_name, " is ON: Enabling Apple quirks by default");
return true;
}
logmsg(switch_name, " is OFF: Disabling Apple quirks mode by default");
return false;
}

Expand Down
82 changes: 41 additions & 41 deletions lib/ZuluSCSI_platform_GD32F205/platform_hw_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,50 +58,50 @@ void HardwareConfig::init_gpios()
void HardwareConfig::init_state(bool is_active)
{
m_is_active = is_active;
m_scsi_id = (gpio_input_port_get(DIPSW_SCSI_ID_BIT_PORT) & DIPSW_SCSI_ID_BIT_PINS) >> DIPSW_SCSI_ID_BIT_SHIFT;
m_device_preset = DEV_PRESET_NONE;
logmsg("SCSI ID set via DIP switch to ", m_scsi_id);
scsi_device_settings_t &cfg_dev = *g_scsi_settings.getDevice(m_scsi_id);

uint8_t rotary_select = (gpio_input_port_get(DIPROT_DEVICE_SEL_BIT_PORT) & DIPROT_DEVICE_SEL_BIT_PINS) >> DIPROT_DEVICE_SEL_BIT_SHIFT;
switch (rotary_select)
{
case 0:
cfg_dev.deviceType = S2S_CFG_FIXED;
break;
case 1:
cfg_dev.deviceType = S2S_CFG_OPTICAL;
break;
case 2:
cfg_dev.deviceType = S2S_CFG_FLOPPY_14MB;
break;
case 3:
cfg_dev.deviceType = S2S_CFG_REMOVABLE;
break;
case 4:
cfg_dev.deviceType = S2S_CFG_MO;
break;
case 5:
m_device_preset = DEV_PRESET_ST32430N;
cfg_dev.deviceType = S2S_CFG_FIXED;
break;
case 6:
cfg_dev.deviceType = S2S_CFG_SEQUENTIAL;
break;
default:
cfg_dev.deviceType = S2S_CFG_FIXED;
}

if (cfg_dev.deviceType == S2S_CFG_OPTICAL)
if (m_is_active)
{
m_blocksize = DEFAULT_BLOCKSIZE_OPTICAL;
}
else
{
m_blocksize = RAW_FALLBACK_BLOCKSIZE;
}
m_scsi_id = (gpio_input_port_get(DIPSW_SCSI_ID_BIT_PORT) & DIPSW_SCSI_ID_BIT_PINS) >> DIPSW_SCSI_ID_BIT_SHIFT;
m_device_preset = DEV_PRESET_NONE;
scsi_device_settings_t &cfg_dev = *g_scsi_settings.getDevice(m_scsi_id);

uint8_t rotary_select = (gpio_input_port_get(DIPROT_DEVICE_SEL_BIT_PORT) & DIPROT_DEVICE_SEL_BIT_PINS) >> DIPROT_DEVICE_SEL_BIT_SHIFT;
switch (rotary_select)
{
case 0:
cfg_dev.deviceType = S2S_CFG_FIXED;
break;
case 1:
cfg_dev.deviceType = S2S_CFG_OPTICAL;
break;
case 2:
cfg_dev.deviceType = S2S_CFG_FLOPPY_14MB;
break;
case 3:
cfg_dev.deviceType = S2S_CFG_REMOVABLE;
break;
case 4:
cfg_dev.deviceType = S2S_CFG_MO;
break;
case 5:
m_device_preset = DEV_PRESET_ST32430N;
cfg_dev.deviceType = S2S_CFG_FIXED;
break;
case 6:
cfg_dev.deviceType = S2S_CFG_SEQUENTIAL;
break;
default:
cfg_dev.deviceType = S2S_CFG_FIXED;
}

if (cfg_dev.deviceType == S2S_CFG_OPTICAL)
{
m_blocksize = DEFAULT_BLOCKSIZE_OPTICAL;
}
else
{
m_blocksize = RAW_FALLBACK_BLOCKSIZE;
}
}
}

#endif // ZULUSCSI_HARDWARE_CONFIG
1 change: 1 addition & 0 deletions src/ZuluSCSI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ static void reinitSCSI()
g_scsi_settings.initDevice(scsiId, g_hw_config.device_type());

logmsg("Direct/Raw mode enabled, using hardware switches for configuration");
logmsg("-- SCSI ID set via DIP switch to ", (int) g_hw_config.scsi_id());
char raw_filename[32];
uint32_t start = g_scsi_settings.getDevice(scsiId)->sectorSDBegin;
uint32_t end = g_scsi_settings.getDevice(scsiId)->sectorSDEnd;
Expand Down