add parallel port config overlay

Author: dbalsom

CHANGELOG.md

@@ -33,7 +33,7 @@ This provides a few nice things:
  - The VHD creator has been updated to support the wide selection of common hard drive geometries that the XTIDE can 
    support. You'll need to be running a machine with the XTIDE configured to see them.
  - It is now possible to take a VHD file from 86Box (assuming you created it as a 'fixed' VHD) and use it in MartyPC
-   (and vice-versa!).
+   (and vice versa!).
 
 ## New Debugger Features
 - You can now edit memory, at last! Double-clicking on byte in the hex view will enter edit mode. Hit enter to accept
@@ -57,6 +57,7 @@ This provides a few nice things:
    - The Keyboard menu allows for resetting the keyboard (clearing any stuck keys). 
 
 ### Core Bug Fixes / Improvements
+ - Added a parallel port card overlay.
  - Added a keyboard reset function to clear stuck keys. 
  - Improved accuracy of the Programmable Interrupt Timer (PIT)
  - Fixed a bug the CPU's DRAM refresh DMA scheduler. Many tests in Acid88 now pass.

crates/lib/frontend/marty_frontend_common/src/machine_manager/mod.rs

@@ -29,8 +29,12 @@
     Machine configuration services for frontends.
 */
 
+use std::{
+    collections::{BTreeMap, HashSet},
+    ffi::OsString,
+};
+
 use crate::resource_manager::ResourceManager;
-use anyhow::Error;
 use marty_core::{
     device_traits::videocard::VideoType,
     machine_config::{
@@ -43,6 +47,7 @@ use marty_core::{
         MachineConfiguration,
         MediaConfig,
         MemoryConfig,
+        ParallelControllerConfig,
         SerialControllerConfig,
         SerialMouseConfig,
         SoundDeviceConfig,
@@ -51,11 +56,8 @@ use marty_core::{
     machine_types::{HardDiskControllerType, MachineType},
 };
 
+use anyhow::Error;
 use serde_derive::Deserialize;
-use std::{
-    collections::{BTreeMap, HashSet},
-    ffi::OsString,
-};
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct MachineConfigFile {
@@ -84,6 +86,7 @@ pub struct MachineConfigFileEntry {
     fdc: Option<FloppyControllerConfig>,
     hdc: Option<HardDriveControllerConfig>,
     serial: Option<Vec<SerialControllerConfig>>,
+    parallel: Option<Vec<ParallelControllerConfig>>,
     video: Option<Vec<VideoCardConfig>>,
     sound: Option<Vec<SoundDeviceConfig>>,
     keyboard: Option<KeyboardConfig>,
@@ -101,6 +104,7 @@ pub struct MachineConfigFileOverlayEntry {
     fdc: Option<FloppyControllerConfig>,
     hdc: Option<HardDriveControllerConfig>,
     serial: Option<Vec<SerialControllerConfig>>,
+    parallel: Option<Vec<ParallelControllerConfig>>,
     video: Option<Vec<VideoCardConfig>>,
     sound: Option<Vec<SoundDeviceConfig>>,
     keyboard: Option<KeyboardConfig>,
@@ -404,6 +408,10 @@ impl MachineConfigFileEntry {
             log::debug!("Applying serial overlay: {:?}", serial);
             self.serial = Some(serial);
         }
+        if let Some(parallel) = overlay.parallel {
+            log::debug!("Applying parallel overlay: {:?}", parallel);
+            self.parallel = Some(parallel);
+        }
         if let Some(video) = overlay.video {
             log::debug!("Applying video overlay: {:?}", video);
             self.video = Some(video);
@@ -439,6 +447,7 @@ impl MachineConfigFileEntry {
             serial: self.serial.clone().unwrap_or_default(),
             video: self.video.clone().unwrap_or_default(),
             sound: self.sound.clone().unwrap_or_default(),
+            parallel: self.parallel.clone().unwrap_or_default(),
             keyboard: self.keyboard.clone(),
             serial_mouse: self.serial_mouse.clone(),
             game_port: self.game_port.clone(),

crates/marty_core/src/bus.rs

@@ -1977,6 +1977,28 @@ impl BusInterface {
             add_io_device!(self, parallel, IoDeviceType::Parallel);
             self.parallel = Some(parallel);
         }
+        else if machine_config.parallel.len() > 0 {
+            if machine_config.parallel.len() > 1 {
+                log::warn!(
+                    "Support for multiple parallel controllers is not implemented. Only the first parallel controller will be created."
+                );
+            }
+
+            if let Some(controller) = machine_config.parallel.get(0) {
+                log::debug!("Creating parallel port...");
+
+                if let Some(port) = controller.port.get(0) {
+                    let parallel = ParallelController::new(Some(port.io_base as u16));
+
+                    // Add Parallel Port ports to io_map
+                    add_io_device!(self, parallel, IoDeviceType::Parallel);
+                    self.parallel = Some(parallel);
+                }
+            }
+            else {
+                log::error!("Parallel controller was specified with no ports!");
+            }
+        }
 
         // Create a Serial card if specified
         if let Some(serial_config) = machine_config.serial.get(0) {

crates/marty_core/src/machine_config.rs

@@ -37,6 +37,7 @@ use crate::machine_types::{
     HardDiskControllerType,
     HardDriveFormat,
     MachineType,
+    ParallelControllerType,
     SerialControllerType,
     SerialMouseType,
     SoundType,
@@ -196,6 +197,18 @@ pub struct SerialControllerConfig {
     pub port:    Vec<SerialPortConfig>,
 }
 
+#[derive(Clone, Debug, Deserialize)]
+pub struct ParallelControllerConfig {
+    #[serde(rename = "type")]
+    pub lpt_type: ParallelControllerType,
+    pub port: Vec<ParallelPortConfig>,
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct ParallelPortConfig {
+    pub io_base: u32,
+}
+
 #[derive(Clone, Debug, Deserialize)]
 pub struct FloppyControllerConfig {
     #[serde(rename = "type")]
@@ -254,6 +267,7 @@ pub struct MachineConfiguration {
     pub video: Vec<VideoCardConfig>,
     pub sound: Vec<SoundDeviceConfig>,
     pub serial: Vec<SerialControllerConfig>,
+    pub parallel: Vec<ParallelControllerConfig>,
     pub game_port: Option<GamePortConfig>,
     pub fdc: Option<FloppyControllerConfig>,
     pub hdc: Option<HardDriveControllerConfig>,

crates/marty_core/src/machine_types.rs

@@ -249,6 +249,11 @@ pub enum SerialMouseType {
     Microsoft,
 }
 
+#[derive(Copy, Clone, Debug, Deserialize, Eq, PartialEq)]
+pub enum ParallelControllerType {
+    Standard,
+}
+
 #[derive(Copy, Clone, Debug, Deserialize, Eq, PartialEq)]
 pub enum EmsType {
     LoTech2MB,

install/configs/machines/config_overlays.toml

@@ -64,6 +64,16 @@ name = "us_modelf_keyboard"
     # Delay in milliseconds between each scancode during typematic repeat.
     typematic_rate= 50.0
 
+[[overlay]]
+name = "parallel_port"
+    # Parallel port card
+    [[overlay.parallel]]
+    bus_type = "ISA"
+    type = "Standard"
+        [[overlay.parallel.port]]
+        # 3BC will typically be LPT1. May conflict with MDA.
+        io_base = 0x3BC
+    
 [[overlay]]
 name = "pcxt_2_serial_ports"
     # Serial card