From 09000273ad94c21e83085a9d92fae13b0fc82445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Wed, 4 Oct 2023 11:17:16 +0200
Subject: [PATCH] chore: remove explicit dependency on tock-registers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
---
 Cargo.lock                            | 1 -
 Cargo.toml                            | 1 -
 src/arch/aarch64/kernel/interrupts.rs | 1 -
 src/arch/aarch64/kernel/processor.rs  | 3 +--
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36d277cef9..8b41fdf599 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,7 +469,6 @@ dependencies = [
  "take-static",
  "talc",
  "time",
- "tock-registers",
  "uart_16550",
  "x86",
  "x86_64",
diff --git a/Cargo.toml b/Cargo.toml
index 10a132a0b8..0891f453b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -122,7 +122,6 @@ x86_64 = "0.14"
 aarch64 = { version = "0.0", default-features = false }
 arm-gic = { version = "0.1" }
 hermit-dtb = { version = "0.1" }
-tock-registers = { version = "0.8", default-features = false }
 
 [dev-dependencies]
 float-cmp = "0.9"
diff --git a/src/arch/aarch64/kernel/interrupts.rs b/src/arch/aarch64/kernel/interrupts.rs
index 2a0bd55243..591cc5a64b 100644
--- a/src/arch/aarch64/kernel/interrupts.rs
+++ b/src/arch/aarch64/kernel/interrupts.rs
@@ -9,7 +9,6 @@ use arm_gic::gicv3::{GicV3, IntId, Trigger};
 use hashbrown::HashMap;
 use hermit_dtb::Dtb;
 use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex, OnceCell};
-use tock_registers::interfaces::Readable;
 
 use crate::arch::aarch64::kernel::boot_info;
 use crate::arch::aarch64::kernel::core_local::increment_irq_counter;
diff --git a/src/arch/aarch64/kernel/processor.rs b/src/arch/aarch64/kernel/processor.rs
index 4dedd765aa..2a0999639a 100644
--- a/src/arch/aarch64/kernel/processor.rs
+++ b/src/arch/aarch64/kernel/processor.rs
@@ -1,11 +1,10 @@
 use core::arch::asm;
 use core::{fmt, str};
 
-use aarch64::regs::CNTFRQ_EL0;
+use aarch64::regs::{Readable, CNTFRQ_EL0};
 use hermit_dtb::Dtb;
 use hermit_sync::{without_interrupts, Lazy};
 use qemu_exit::QEMUExit;
-use tock_registers::interfaces::Readable;
 
 use crate::arch::aarch64::kernel::boot_info;
 use crate::env;