1 files changed, 31 insertions, 30 deletions

diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.c b/c/src/lib/libbsp/i386/shared/irq/irq.c
index a8d57442f9..78fdcfcaf5 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.c
+++ b/c/src/lib/libbsp/i386/shared/irq/irq.c
@@ -56,15 +56,15 @@ rtems_i8259_masks i8259s_cache = 0xFFFB;
 +--------------------------------------------------------------------------*/
 int BSP_irq_disable_at_i8259s    (const rtems_irq_number irqLine)
 {
-  unsigned short mask;
-  unsigned int 	level;
+  unsigned short        mask;
+  rtems_interrupt_level level;
 
   if ( ((int)irqLine < BSP_LOWEST_OFFSET) ||
        ((int)irqLine > BSP_MAX_OFFSET )
        )
     return 1;
 
-  _CPU_ISR_Disable(level);
+  rtems_interrupt_disable(level);
 
   mask = 1 << irqLine;
   i8259s_cache |= mask;
@@ -77,7 +77,7 @@ int BSP_irq_disable_at_i8259s    (const rtems_irq_number irqLine)
   {
     outport_byte(PIC_SLAVE_IMR_IO_PORT, ((i8259s_cache & 0xff00) >> 8));
   }
-  _CPU_ISR_Enable (level);
+  rtems_interrupt_enable(level);
 
   return 0;
 }
@@ -91,15 +91,15 @@ int BSP_irq_disable_at_i8259s    (const rtems_irq_number irqLine)
 +--------------------------------------------------------------------------*/
 int BSP_irq_enable_at_i8259s    (const rtems_irq_number irqLine)
 {
-  unsigned short mask;
-  unsigned int 	level;
+  unsigned short        mask;
+  rtems_interrupt_level level;
 
   if ( ((int)irqLine < BSP_LOWEST_OFFSET) ||
        ((int)irqLine > BSP_MAX_OFFSET )
        )
     return 1;
 
-  _CPU_ISR_Disable(level);
+  rtems_interrupt_disable(level);
 
   mask = ~(1 << irqLine);
   i8259s_cache &= mask;
@@ -112,7 +112,7 @@ int BSP_irq_enable_at_i8259s    (const rtems_irq_number irqLine)
   {
     outport_byte(PIC_SLAVE_IMR_IO_PORT, ((i8259s_cache & 0xff00) >> 8));
   }
-  _CPU_ISR_Enable (level);
+  rtems_interrupt_enable(level);
 
   return 0;
 } /* mask_irq */
@@ -200,7 +200,7 @@ static int isValidInterrupt(int irq)
 
 int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
-    unsigned int level;
+    rtems_interrupt_level       level;
 
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -212,9 +212,9 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      * RATIONALE : to always have the same transition by forcing the user
      * to get the previous handler before accepting to disconnect.
      */
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
-	  _CPU_ISR_Enable(level);
+	  rtems_interrupt_enable(level);
       return 0;
     }
 
@@ -231,27 +231,27 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      */
     irq->on(irq);
 
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
 
     return 1;
 }
 
 int BSP_get_current_rtems_irq_handler	(rtems_irq_connect_data* irq)
 {
-     unsigned int level;
+    rtems_interrupt_level       level;
 
-     if (!isValidInterrupt(irq->name)) {
+    if (!isValidInterrupt(irq->name)) {
       return 0;
-     }
-    _CPU_ISR_Disable(level);
-     *irq = rtems_hdl_tbl[irq->name];
-    _CPU_ISR_Enable(level);
-     return 1;
+    }
+    rtems_interrupt_disable(level);
+      *irq = rtems_hdl_tbl[irq->name];
+    rtems_interrupt_enable(level);
+    return 1;
 }
 
 int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 {
-    unsigned int level;
+    rtems_interrupt_level       level;
 
     if (!isValidInterrupt(irq->name)) {
       return 0;
@@ -263,9 +263,9 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      * RATIONALE : to always have the same transition by forcing the user
      * to get the previous handler before accepting to disconnect.
      */
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
-      _CPU_ISR_Enable(level);
+      rtems_interrupt_enable(level);
       return 0;
     }
 
@@ -284,7 +284,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
      */
     rtems_hdl_tbl[irq->name] = default_rtems_entry;
 
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
 
     return 1;
 }
@@ -295,16 +295,17 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 
 int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 {
-    int i;
-    unsigned int level;
-   /*
-    * Store various code accelerators
-    */
+    int                    i;
+    rtems_interrupt_level  level;
+
+    /*
+     * Store various code accelerators
+     */
     internal_config 		= config;
     default_rtems_entry 	= config->defaultEntry;
     rtems_hdl_tbl 		= config->irqHdlTbl;
 
-    _CPU_ISR_Disable(level);
+    rtems_interrupt_disable(level);
     /*
      * set up internal tables used by rtems interrupt prologue
      */
@@ -324,7 +325,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
      * must enable slave pic anyway
      */
     BSP_irq_enable_at_i8259s (2);
-    _CPU_ISR_Enable(level);
+    rtems_interrupt_enable(level);
     return 1;
 }