From 6ca9a9a806fa3a5a74702ce4dfcda4114ba3e707 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 12 Sep 2025 18:02:30 +0200
Subject: [PATCH] Move uart_pl011.rs to src/devices

---
 src/acpi/spcr.rs                                   | 6 ++----
 src/arch/aarch64/device/mod.rs                     | 1 -
 src/arch/aarch64/device/serial.rs                  | 3 +--
 src/devices/mod.rs                                 | 1 +
 src/{arch/aarch64/device => devices}/uart_pl011.rs | 2 ++
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename src/{arch/aarch64/device => devices}/uart_pl011.rs (99%)

diff --git a/src/acpi/spcr.rs b/src/acpi/spcr.rs
index f65dcd6da5..a611480002 100644
--- a/src/acpi/spcr.rs
+++ b/src/acpi/spcr.rs
@@ -2,10 +2,8 @@ use core::mem;
 
 use super::{find_sdt, sdt::Sdt, GenericAddressStructure};
 use crate::{
-    device::{
-        serial::{SerialKind, COM1},
-        uart_pl011,
-    },
+    device::serial::{SerialKind, COM1},
+    devices::uart_pl011,
     log::LOG,
     memory::{map_device_memory, PhysicalAddress, PAGE_SIZE},
 };
diff --git a/src/arch/aarch64/device/mod.rs b/src/arch/aarch64/device/mod.rs
index 5c977b7f56..03b4d26250 100644
--- a/src/arch/aarch64/device/mod.rs
+++ b/src/arch/aarch64/device/mod.rs
@@ -7,7 +7,6 @@ pub mod generic_timer;
 pub mod irqchip;
 pub mod rtc;
 pub mod serial;
-pub mod uart_pl011;
 
 use crate::dtb::irqchip::IRQ_CHIP;
 use irqchip::ic_for_chip;
diff --git a/src/arch/aarch64/device/serial.rs b/src/arch/aarch64/device/serial.rs
index 81df8716f2..71d683c2a8 100644
--- a/src/arch/aarch64/device/serial.rs
+++ b/src/arch/aarch64/device/serial.rs
@@ -3,8 +3,7 @@ use spin::Mutex;
 
 use crate::{
     arch::device::irqchip::ic_for_chip,
-    device::uart_pl011,
-    devices::uart_16550,
+    devices::{uart_16550, uart_pl011},
     dtb::{
         diag_uart_range, get_interrupt,
         irqchip::{register_irq, InterruptHandler, IRQ_CHIP},
diff --git a/src/devices/mod.rs b/src/devices/mod.rs
index 8962174326..5b12fbed5f 100644
--- a/src/devices/mod.rs
+++ b/src/devices/mod.rs
@@ -1,2 +1,3 @@
 pub mod graphical_debug;
 pub mod uart_16550;
+pub mod uart_pl011;
diff --git a/src/arch/aarch64/device/uart_pl011.rs b/src/devices/uart_pl011.rs
similarity index 99%
rename from src/arch/aarch64/device/uart_pl011.rs
rename to src/devices/uart_pl011.rs
index 8e6c98a25b..6cb8846f83 100644
--- a/src/arch/aarch64/device/uart_pl011.rs
+++ b/src/devices/uart_pl011.rs
@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use core::ptr;
 
 use crate::scheme::debug::{debug_input, debug_notify};