From c1678d7be70c4f1f4662c47e3ec41dfa3b151d75 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 21 Jun 2021 22:56:25 -0400 Subject: [PATCH] Corrects exposition and transmission of drive selection. What a klutz I've been. --- Machines/Enterprise/EXDos.cpp | 8 +------- Storage/Disk/Controller/DiskController.hpp | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Machines/Enterprise/EXDos.cpp b/Machines/Enterprise/EXDos.cpp index 189a18468..4dda5cf17 100644 --- a/Machines/Enterprise/EXDos.cpp +++ b/Machines/Enterprise/EXDos.cpp @@ -49,13 +49,7 @@ void EXDos::set_control_register(uint8_t control) { } // Select drive. - // TODO: should potentially be drives, plural. - set_drive(0); - for(int c = 1; c < 4; c++) { - if(control & (1 << c)) { - set_drive(c); - } - } + set_drive(control & 0xf); } uint8_t EXDos::get_control_register() { diff --git a/Storage/Disk/Controller/DiskController.hpp b/Storage/Disk/Controller/DiskController.hpp index 3d8c723c3..55f7dcc5c 100644 --- a/Storage/Disk/Controller/DiskController.hpp +++ b/Storage/Disk/Controller/DiskController.hpp @@ -49,8 +49,10 @@ class Controller: void run_for(const Cycles cycles); /*! - Sets the current drive(s). Normally this will be exactly one, but some machines allow - zero or multiple drives to be attached, with useless results. + Sets the current drive(s), by bit mask. Normally this will be exactly one, but some + machines allow zero or multiple drives to be attached, with useless results. + + E.g. supply 1 to select drive 0, 2 to select drive 1, 4 to select drive 2, etc. */ void set_drive(int index_mask);