2002-03-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

  	* rtems/score/idtr.h: New file, extracted from libcpu/cpu.h.
  	* rtems/score/interrupts.h: New file, extracted from libcpu/cpu.h.
	* rtems/score/registers.h: New file, moved from libcpu.
	* Makefile.am: Reflect changes above.
	* cpu.c: Don't include cpuModel.h,
	  #include <rtems.h>,
	  #include <rtems/score/i386types.h>,
	  #include <rtems/score/idtr.h>.
	* rtems/score/cpu.h: Don't include libcpu/cpu.h.
	  #include <rtems/score/interrupts.h>,
	  #include <rtems/score/registers.h>.

1 files changed, 75 insertions, 0 deletions

diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/rtems/score/interrupts.h
new file mode 100644
index 0000000000..bcc1dfb85a
--- /dev/null
+++ b/cpukit/score/cpu/i386/rtems/score/interrupts.h
@@ -0,0 +1,75 @@
+/*
+ *  i386 interrupt macros.
+ *
+ *  Formerly contained in and extracted from libcpu/i386/cpu.h
+ *
+ *  COPYRIGHT (c) 1998 valette@crf.canon.fr
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ * 
+ *  $Id$
+ *
+ *  Applications must not include this file directly.
+ */
+
+#ifndef _rtems_score_interrupts_h
+#define _rtems_score_interrupts_h
+
+#ifndef ASM
+
+struct 	__rtems_raw_irq_connect_data__;
+
+typedef void (*rtems_raw_irq_hdl)		(void);
+typedef void (*rtems_raw_irq_enable)		(const struct __rtems_raw_irq_connect_data__*);
+typedef void (*rtems_raw_irq_disable)		(const struct __rtems_raw_irq_connect_data__*);
+typedef int  (*rtems_raw_irq_is_enabled)	(const struct __rtems_raw_irq_connect_data__*);
+
+/*
+ *  Interrupt Level Macros
+ */
+
+#define i386_disable_interrupts( _level ) \
+  { \
+    asm volatile ( "pushf ; \
+                    cli ; \
+                    pop %0" \
+                   : "=rm" ((_level)) \
+    ); \
+  }
+
+#define i386_enable_interrupts( _level )  \
+  { \
+    asm volatile ( "push %0 ; \
+                    popf" \
+                    : : "rm" ((_level)) : "cc" \
+    ); \
+  }
+
+#define i386_flash_interrupts( _level ) \
+  { \
+    asm volatile ( "push %0 ; \
+                    popf ; \
+                    cli" \
+                    : : "rm" ((_level)) : "cc" \
+    ); \
+  }
+
+#define i386_get_interrupt_level( _level ) \
+  do { \
+    register unsigned32 _eflags; \
+    \
+    asm volatile ( "pushf ; \
+                    pop %0" \
+                    : "=rm" ((_eflags)) \
+    ); \
+    \
+    _level = (_eflags & EFLAGS_INTR_ENABLE) ? 0 : 1; \
+  } while (0)
+
+#define _CPU_ISR_Disable( _level ) i386_disable_interrupts( _level )
+#define _CPU_ISR_Enable( _level ) i386_enable_interrupts( _level )
+     
+#endif
+#endif