From f7f4013cf03f093838d9eb6aae4d1d227f56a8ef Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 13 Nov 2019 19:39:45 -0700
Subject: [PATCH] Do not use COM3 or COM4
---
src/arch/x86_64/device/serial.rs | 2 --
src/arch/x86_64/interrupt/irq.rs | 8 +-------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/arch/x86_64/device/serial.rs b/src/arch/x86_64/device/serial.rs
index a9548d5f..1f3e18cf 100644
--- a/src/arch/x86_64/device/serial.rs
+++ b/src/arch/x86_64/device/serial.rs
@@ -13,8 +13,6 @@ pub static LPSS: Mutex<Option<&'static mut SerialPort<Mmio<u32>>>> = Mutex::new(
pub unsafe fn init() {
COM1.lock().init();
COM2.lock().init();
- COM3.lock().init();
- COM4.lock().init();
#[cfg(feature = "lpss_debug")]
{
diff --git a/src/arch/x86_64/interrupt/irq.rs b/src/arch/x86_64/interrupt/irq.rs
index ccd505c7..8c755baa 100644
--- a/src/arch/x86_64/interrupt/irq.rs
+++ b/src/arch/x86_64/interrupt/irq.rs
@@ -2,7 +2,7 @@ use core::sync::atomic::{AtomicUsize, Ordering};
use crate::context::timeout;
use crate::device::pic;
-use crate::device::serial::{COM1, COM2, COM3, COM4};
+use crate::device::serial::{COM1, COM2};
use crate::ipi::{ipi, IpiKind, IpiTarget};
use crate::scheme::debug::debug_input;
use crate::{context, ptrace, time};
@@ -78,9 +78,6 @@ interrupt!(com2, {
while let Some(c) = COM2.lock().receive() {
debug_input(c);
}
- while let Some(c) = COM4.lock().receive() {
- debug_input(c);
- }
pic::MASTER.ack();
});
@@ -88,9 +85,6 @@ interrupt!(com1, {
while let Some(c) = COM1.lock().receive() {
debug_input(c);
}
- while let Some(c) = COM3.lock().receive() {
- debug_input(c);
- }
pic::MASTER.ack();
});
--
GitLab