Access the console device table with IRQ disabled

LeslieKid · Apr 10, 2024 · bd8be26 · bd8be26
1 parent e4fd51b
commit bd8be26
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/kernel/comps/console/src/lib.rs b/kernel/comps/console/src/lib.rs
@@ -28,7 +28,7 @@ pub fn register_device(name: String, device: Arc<dyn AnyConsoleDevice>) {
         .get()
         .unwrap()
         .console_device_table
-        .lock()
+        .lock_irq_disabled()
         .insert(name, device);
 }
 
@@ -37,13 +37,17 @@ pub fn get_device(str: &str) -> Option<Arc<dyn AnyConsoleDevice>> {
         .get()
         .unwrap()
         .console_device_table
-        .lock()
+        .lock_irq_disabled()
         .get(str)
         .cloned()
 }
 
 pub fn all_devices() -> Vec<(String, Arc<dyn AnyConsoleDevice>)> {
-    let console_devs = COMPONENT.get().unwrap().console_device_table.lock();
+    let console_devs = COMPONENT
+        .get()
+        .unwrap()
+        .console_device_table
+        .lock_irq_disabled();
     console_devs
         .iter()
         .map(|(name, device)| (name.clone(), device.clone()))