Skip to content

scsi: unify A2091/A4091 into a [scsi] controller picker #152

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.

Sign up for GitHub

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

Merged
LinuxJedi merged 2 commits into from
Jul 8, 2026
+196 −156
Merged

scsi: unify A2091/A4091 into a [scsi] controller picker #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6739950
config: unify A2091/A4091 into [scsi] controller
codewiz Jul 7, 2026
d79bbfa
launcher: add SCSI controller picker
codewiz Jul 7, 2026
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
21 changes: 13 additions & 8 deletions copperline.example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,20 @@ slow = "512K"
# metadata = "boards/megaram.toml"


# A2091 SCSI controller: a Zorro II board with up to seven drives, on any
# machine model. Preferred over [ide] for multiple disks: the board's own
# boot ROM carries scsi.device and autoboots on Kickstart 1.3+, so it does
# not depend on the Kickstart IDE driver (which only probes the master on
# stock 3.1). Needs an A590/A2091 boot ROM image (6.6+, 16K/32K; rom_odd
# takes the odd half of split even/odd EPROM dumps). Drive paths accept
# the same images as [ide]: RDB HDFs, bare partition hardfiles, or host
# directories.
# SCSI controller: a Zorro board with up to seven drives, on any machine
# model. Preferred over [ide] for multiple disks: the board's own boot ROM
# carries scsi.device and autoboots on Kickstart 1.3+, so it does not depend
# on the Kickstart IDE driver (which only probes the master on stock 3.1).
# Drive paths accept the same images as [ide]: RDB HDFs, bare partition
# hardfiles, or host directories.
#
# controller picks the board: "a2091" (Zorro II, WD33C93; the default) or
# "a4091" (Zorro III, NCR 53C710). The A2091 needs an A590/A2091 boot ROM
# (6.6+, 16K/32K; rom_odd takes the odd half of a split even/odd EPROM dump);
# the A4091 needs a raw A4091 EPROM image (e.g. the open-source a4091.rom) and
# has a single ROM (no rom_odd).
# [scsi]
# controller = "a2091"
# rom = "a2091-v6.6.rom"
# unit0 = "workbench.hdf"
# unit1 = "data.hdf"
Expand Down
131 changes: 55 additions & 76 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,11 @@ pub struct Config {
/// Gayle IDE drive images (raw flat HDF, RDB inside), opened
/// read/write. Only valid on machines with a Gayle gate array.
pub ide: IdeConfig,
/// A2091 SCSI controller (`[scsi]`): boot ROM image plus up to seven
/// drive images on SCSI IDs 0-6. Works on any machine model (the board
/// autoconfigs on the Zorro chain and carries its own scsi.device).
/// SCSI controller (`[scsi]`): the `controller` selects an A2091 (Zorro II)
/// or A4091 (Zorro III), plus a boot ROM image and up to seven drive images
/// on SCSI IDs 0-6. The board autoconfigs on the Zorro chain and carries its
/// own scsi.device.
pub scsi: ScsiConfig,
/// A4091 SCSI-2 controller (`[a4091]`): boot ROM image plus up to seven
/// drive images on SCSI IDs 0-6. A Zorro III board; the 53C710 core is
/// not implemented yet, so drives are parsed but not driven.
pub a4091: A4091Config,
/// A2065 Ethernet board (`[a2065]`): when set, an A2065 NIC autoconfigs on
/// the Zorro chain using the named host network backend. Networking is
/// non-deterministic, so a fitted A2065 breaks byte-identical replay.
Expand Down Expand Up @@ -294,34 +291,34 @@ pub struct IdeConfig {
pub slave: Option<DriveImage>,
}

/// Which SCSI host adapter the `[scsi]` section fits. Both are Zorro
/// autoconfig boards carrying their own boot ROM and scsi.device.
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
pub enum ScsiController {
/// Commodore A2091/A590: Zorro II, WD33C93. The default.
#[default]
A2091,
/// Commodore A4091: Zorro III, NCR 53C710.
A4091,
}

#[derive(Debug, Clone, Default, PartialEq, Eq)]
pub struct ScsiConfig {
/// A2091/A590 boot ROM image (merged, or the even half when
/// `rom_odd` gives the other EPROM).
/// Which host adapter the section fits (`controller`). Only meaningful
/// when `enabled()`.
pub controller: ScsiController,
/// Boot ROM image. For the A2091's split even/odd EPROM dumps, `rom` is
/// the even half and `rom_odd` the other; the A4091 has a single ROM.
pub rom: Option<PathBuf>,
/// Odd-byte EPROM half for split dumps.
/// Odd-byte EPROM half for split A2091 dumps.
pub rom_odd: Option<PathBuf>,
/// Drive images by SCSI ID (0-6; ID 7 is the controller).
pub units: [Option<DriveImage>; 7],
}

impl ScsiConfig {
/// Whether a `[scsi]` section asked for the board at all.
pub fn enabled(&self) -> bool {
self.rom.is_some() || self.units.iter().any(Option::is_some)
}
}

#[derive(Debug, Clone, Default, PartialEq, Eq)]
pub struct A4091Config {
/// A4091 boot ROM image (a raw 32K or 64K byte-wide EPROM dump).
pub rom: Option<PathBuf>,
/// Drive images by SCSI ID (0-6; ID 7 is the controller).
pub units: [Option<DriveImage>; 7],
}

impl A4091Config {
/// Whether an `[a4091]` section asked for the board at all.
/// Whether a `[scsi]` section asked for a board at all (a bare
/// `controller` with no ROM or drives fits nothing).
pub fn enabled(&self) -> bool {
self.rom.is_some() || self.units.iter().any(Option::is_some)
}
Expand Down Expand Up @@ -899,7 +896,6 @@ impl Default for Config {
audio: AudioConfig::default(),
ide: IdeConfig::default(),
scsi: ScsiConfig::default(),
a4091: A4091Config::default(),
a2065_net: None,
floppy: FloppyConfig::default(),
floppy_connected: [true, false, false, false],
Expand Down Expand Up @@ -1165,8 +1161,6 @@ pub struct RawConfig {
#[serde(default, skip_serializing_if = "is_default")]
pub(crate) scsi: RawScsi,
#[serde(default, skip_serializing_if = "is_default")]
pub(crate) a4091: RawA4091,
#[serde(default, skip_serializing_if = "is_default")]
pub(crate) a2065: RawA2065,
#[serde(default, skip_serializing_if = "is_default")]
pub(crate) floppy: RawFloppy,
Expand Down Expand Up @@ -1347,8 +1341,11 @@ pub(crate) struct RawIde {
#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub(crate) struct RawScsi {
/// A2091/A590 boot ROM image. For split even/odd EPROM dumps, `rom`
/// is the even half and `rom_odd` the odd half.
/// Host adapter to fit: "a2091" (Zorro II, default) or "a4091" (Zorro III).
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) controller: Option<String>,
/// Boot ROM image. For split even/odd A2091 EPROM dumps, `rom` is the
/// even half and `rom_odd` the odd half.
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) rom: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand All @@ -1369,29 +1366,6 @@ pub(crate) struct RawScsi {
pub(crate) unit6: Option<RawDrive>,
}

/// `[a4091]` SCSI-2 controller: boot ROM image plus drive images by SCSI ID.
#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub(crate) struct RawA4091 {
/// A4091 boot ROM image (raw 32K or 64K byte-wide EPROM dump).
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) rom: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit0: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit1: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit2: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit3: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit4: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit5: Option<RawDrive>,
#[serde(skip_serializing_if = "Option::is_none")]
pub(crate) unit6: Option<RawDrive>,
}

/// `[a2065]` Ethernet board. Fitting the board enables host networking, which
/// is non-deterministic.
#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
Expand Down Expand Up @@ -1844,7 +1818,22 @@ impl TryFrom<RawConfig> for Config {
));
}

let scsi_controller = match raw.scsi.controller.as_deref() {
None => ScsiController::A2091,
Some(raw_ctrl) => match raw_ctrl.trim().to_ascii_lowercase().as_str() {
"a2091" => ScsiController::A2091,
"a4091" => ScsiController::A4091,
_ => {
errors.push(anyhow!(
"[scsi] controller = {raw_ctrl:?} is not known \
(expected \"a2091\" or \"a4091\")"
));
ScsiController::A2091
}
},
};
let scsi = ScsiConfig {
controller: scsi_controller,
rom: raw.scsi.rom.map(PathBuf::from),
rom_odd: raw.scsi.rom_odd.map(PathBuf::from),
units: [
Expand All @@ -1858,33 +1847,24 @@ impl TryFrom<RawConfig> for Config {
],
};
if scsi.enabled() && scsi.rom.is_none() {
let hint = match scsi.controller {
ScsiController::A2091 => {
"an A590/A2091 6.x ROM image; its scsi.device drives the disks"
}
ScsiController::A4091 => "a raw A4091 EPROM image, e.g. the open-source a4091.rom",
};
errors.push(anyhow!(
"[scsi] drives need the A2091 boot ROM: set [scsi] rom = \"...\" \
(an A590/A2091 6.x ROM image; its scsi.device drives the disks)"
"[scsi] drives need the boot ROM: set [scsi] rom = \"...\" ({hint})"
));
}
if scsi.rom_odd.is_some() && scsi.rom.is_none() {
errors.push(anyhow!("[scsi] rom_odd needs rom (the even EPROM half)"));
}

let a4091 = A4091Config {
rom: raw.a4091.rom.map(PathBuf::from),
units: [
raw.a4091.unit0.map(drive_image).transpose()?,
raw.a4091.unit1.map(drive_image).transpose()?,
raw.a4091.unit2.map(drive_image).transpose()?,
raw.a4091.unit3.map(drive_image).transpose()?,
raw.a4091.unit4.map(drive_image).transpose()?,
raw.a4091.unit5.map(drive_image).transpose()?,
raw.a4091.unit6.map(drive_image).transpose()?,
],
};
if a4091.enabled() && a4091.rom.is_none() {
if scsi.rom_odd.is_some() && scsi.controller != ScsiController::A2091 {
errors.push(anyhow!(
"[a4091] drives need the boot ROM: set [a4091] rom = \"...\" \
(a raw A4091 EPROM image, e.g. the open-source a4091.rom)"
"[scsi] rom_odd is an A2091 split-EPROM option; the A4091 has a single rom"
));
}
if scsi.rom_odd.is_some() && scsi.rom.is_none() {
errors.push(anyhow!("[scsi] rom_odd needs rom (the even EPROM half)"));
}

let a2065_net = match &raw.a2065.net {
None => None,
Expand Down Expand Up @@ -2009,7 +1989,6 @@ impl TryFrom<RawConfig> for Config {
audio,
ide,
scsi,
a4091,
a2065_net,
floppy,
floppy_connected,
Expand Down
89 changes: 49 additions & 40 deletions src/emulator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,48 +1780,57 @@ pub fn build_machine(
// is attached to the bus after it is built; the slot index ties them.
let mut devices: Vec<crate::zorro_device::BoardDevice> = Vec::new();
if cfg.scsi.enabled() {
use crate::config::ScsiController;
let rom_path = cfg.scsi.rom.as_ref().expect("config validated [scsi] rom");
let rom = crate::a2091::A2091::load_rom(rom_path, cfg.scsi.rom_odd.as_deref())?;
let mut board = crate::a2091::A2091::new(rom)?;
for (unit, drive) in cfg.scsi.units.iter().enumerate() {
let Some(drive) = drive else { continue };
board.attach_drive(
unit,
crate::scsi::ScsiDisk::open(&drive.path, unit, drive.volume_name.as_deref())?,
);
info!("scsi: unit {unit} {}", drive.path.display());
}
let slot = devices.len();
zorro.add_board(crate::zorro::BoardSpec::a2091(slot))?;
info!(
"scsi: A2091 controller on the Zorro chain (slot {slot}), ROM {}",
rom_path.display()
);
devices.push(crate::zorro_device::BoardDevice::A2091(board));
}
if cfg.a4091.enabled() {
let rom_path = cfg
.a4091
.rom
.as_ref()
.expect("config validated [a4091] rom");
let rom = crate::a4091::A4091::load_rom(rom_path)?;
let mut board = crate::a4091::A4091::new(rom)?;
for (unit, drive) in cfg.a4091.units.iter().enumerate() {
let Some(drive) = drive else { continue };
board.attach_drive(
unit,
crate::scsi::ScsiDisk::open(&drive.path, unit, drive.volume_name.as_deref())?,
);
info!("a4091: unit {unit} {}", drive.path.display());
}
let slot = devices.len();
zorro.add_board(crate::zorro::BoardSpec::a4091(slot))?;
info!(
"a4091: SCSI controller on the Zorro chain (slot {slot}), ROM {}",
rom_path.display()
);
devices.push(crate::zorro_device::BoardDevice::A4091(board));
// The controller picks the board; the drive plumbing is identical.
let device = match cfg.scsi.controller {
ScsiController::A2091 => {
let rom = crate::a2091::A2091::load_rom(rom_path, cfg.scsi.rom_odd.as_deref())?;
let mut board = crate::a2091::A2091::new(rom)?;
for (unit, drive) in cfg.scsi.units.iter().enumerate() {
let Some(drive) = drive else { continue };
board.attach_drive(
unit,
crate::scsi::ScsiDisk::open(
&drive.path,
unit,
drive.volume_name.as_deref(),
)?,
);
info!("scsi: unit {unit} {}", drive.path.display());
}
zorro.add_board(crate::zorro::BoardSpec::a2091(slot))?;
info!(
"scsi: A2091 controller on the Zorro chain (slot {slot}), ROM {}",
rom_path.display()
);
crate::zorro_device::BoardDevice::A2091(board)
}
ScsiController::A4091 => {
let rom = crate::a4091::A4091::load_rom(rom_path)?;
let mut board = crate::a4091::A4091::new(rom)?;
for (unit, drive) in cfg.scsi.units.iter().enumerate() {
let Some(drive) = drive else { continue };
board.attach_drive(
unit,
crate::scsi::ScsiDisk::open(
&drive.path,
unit,
drive.volume_name.as_deref(),
)?,
);
info!("scsi: unit {unit} {}", drive.path.display());
}
zorro.add_board(crate::zorro::BoardSpec::a4091(slot))?;
info!(
"scsi: A4091 controller on the Zorro chain (slot {slot}), ROM {}",
rom_path.display()
);
crate::zorro_device::BoardDevice::A4091(board)
}
};
devices.push(device);
}
// WASM plugin boards: assign each a device slot, put its autoconfig
// identity on the chain, and instantiate the module.
Expand Down
Loading
Loading