diff --git a/binaries/disk-with-partition-table.img b/binaries/computie/disk-with-partition-table.img similarity index 100% rename from binaries/disk-with-partition-table.img rename to binaries/computie/disk-with-partition-table.img diff --git a/binaries/computie/kernel-68030.bin b/binaries/computie/kernel-68030.bin new file mode 100755 index 0000000..e726eb4 Binary files /dev/null and b/binaries/computie/kernel-68030.bin differ diff --git a/binaries/kernel.bin b/binaries/computie/kernel.bin similarity index 100% rename from binaries/kernel.bin rename to binaries/computie/kernel.bin diff --git a/binaries/computie/monitor-68030.bin b/binaries/computie/monitor-68030.bin new file mode 100755 index 0000000..a9aa5ea Binary files /dev/null and b/binaries/computie/monitor-68030.bin differ diff --git a/binaries/monitor.bin b/binaries/computie/monitor.bin similarity index 100% rename from binaries/monitor.bin rename to binaries/computie/monitor.bin diff --git a/src/machines/computie.rs b/src/machines/computie.rs index eb56b7d..a3c0fdd 100644 --- a/src/machines/computie.rs +++ b/src/machines/computie.rs @@ -15,15 +15,15 @@ use crate::host::tty::SimplePty; pub fn build_computie(host: &H) -> Result { let mut system = System::new(); - let monitor = MemoryBlock::load("binaries/monitor.bin")?; + let monitor = MemoryBlock::load("binaries/computie/monitor.bin")?; system.add_addressable_device(0x00000000, wrap_transmutable(monitor))?; let mut ram = MemoryBlock::new(vec![0; 0x00100000]); - ram.load_at(0, "binaries/kernel.bin")?; + ram.load_at(0, "binaries/computie/kernel.bin")?; system.add_addressable_device(0x00100000, wrap_transmutable(ram))?; let mut ata = AtaDevice::new(); - ata.load("binaries/disk-with-partition-table.img")?; + ata.load("binaries/computie/disk-with-partition-table.img")?; system.add_addressable_device(0x00600000, wrap_transmutable(ata))?; let mut serial = MC68681::new(); @@ -51,15 +51,15 @@ pub fn build_computie(host: &H) -> Result { pub fn build_computie_k30(host: &H) -> Result { let mut system = System::new(); - let monitor = MemoryBlock::load("binaries/monitor-68030.bin")?; + let monitor = MemoryBlock::load("binaries/computie/monitor-68030.bin")?; system.add_addressable_device(0x00000000, wrap_transmutable(monitor))?; let mut ram = MemoryBlock::new(vec![0; 0x00100000]); - ram.load_at(0, "binaries/kernel-68030.bin")?; + ram.load_at(0, "binaries/computie/kernel-68030.bin")?; system.add_addressable_device(0x00100000, wrap_transmutable(ram))?; let mut ata = AtaDevice::new(); - ata.load("binaries/disk-with-partition-table.img")?; + ata.load("binaries/computie/disk-with-partition-table.img")?; system.add_addressable_device(0x00600000, wrap_transmutable(ata))?; let mut serial = MC68681::new();