Changeset 99 for trunk/hal/x86_64/core/hal_irqmask.c

Timestamp:

Jun 29, 2017, 3:48:39 PM (6 years ago)

Author:

max@…

Message:

add the irq functions; we will forbid nested critical sections, so
the argument will disappear soon

File:

• trunk/hal/x86_64/core/hal_irqmask.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_irqmask.c

@@ -1 +1 @@
 /*
- * hal_irqmask.c - implementation of Generic IRQ Masking API for TSAR-MIPS32
- * 
- * Author  Ghassan Almaless (2008,2009,2010,2011,2012)
- *         Alain Greiner    (2016)
+ * hal_irqmask.c - implementation of Generic IRQ Masking API for x86
  *
- * Copyright (c) UPMC Sorbonne Universites
- * 
- * This file is part of ALMOS-MKH..
+ * Copyright (c) 2017 Maxime Villard
  *
- * ALMOS-MKH. is free software; you can redistribute it and/or modify it
+ * This file is part of ALMOS-MKH.
+ *
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH. is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -26 +23 @@
 #include <hal_internal.h>
 
-inline void hal_disable_irq( uint32_t * old )
+static int interrupts_enabled __in_kdata = 0;
+
+inline void hal_disable_irq(uint32_t *old)
+{
+        if (!interrupts_enabled) {
+                x86_panic("nested critical sections forbidden");
+        }
+        interrupts_enabled = 0;
+        cli();
+}
+
+inline void hal_enable_irq(uint32_t *old)
+{
+        if (interrupts_enabled) {
+                x86_panic("nested critical sections forbidden");
+        }
+        interrupts_enabled = 1;
+        sti();
+}
+
+inline void hal_restore_irq(uint32_t old)
 {
         x86_panic((char *)__func__);
 }
 
-inline void hal_enable_irq( uint32_t * old )
-{
-        x86_panic((char *)__func__);
-}
-
-inline void hal_restore_irq( uint32_t old )
-{
-        x86_panic((char *)__func__);
-}
-