2011-09-01 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* cpu.c, cpu_asm.S: Removed files.
	* nios2-context-initialize.c, nios2-context-switch.S,
	nios2-fatal-halt.c, nios2-initialize-vectors.c, nios2-initialize.c,
	nios2-isr-get-level.c, nios2-isr-install-raw-handler.c,
	nios2-isr-install-vector.c, nios2-isr-is-in-progress.c,
	nios2-isr-set-level.c, nios2-thread-dispatch-disabled.c,
	rtems/score/nios2-utility.h: New files.
	* Makefile.am, preinstall.am: Reflect changes above.
	* irq.c: Update due to API changes.
	* rtems/score/cpu.h: New functions _CPU_Initialize_vectors(),
	_CPU_ISR_Set_level(), and _CPU_Fatal_halt() (instead of macros).
	Support for external interrupt controller (EIC).  Documentation
	changes.

1 files changed, 54 insertions, 0 deletions

diff --git a/cpukit/score/cpu/nios2/nios2-isr-set-level.c b/cpukit/score/cpu/nios2/nios2-isr-set-level.c
new file mode 100644
index 0000000000..6c73944866
--- /dev/null
+++ b/cpukit/score/cpu/nios2/nios2-isr-set-level.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2011 embedded brains GmbH
+ *
+ * Copyright (c) 2006 Kolja Waschk (rtemsdev/ixo.de)
+ *
+ * COPYRIGHT (c) 1989-2006
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include <rtems/score/cpu.h>
+#include <rtems/score/interr.h>
+#include <rtems/score/nios2-utility.h>
+
+void _CPU_ISR_Set_level( uint32_t new_level )
+{
+  uint32_t status = _Nios2_Get_ctlreg_status();
+
+  switch ( _Nios2_Get_ISR_status_mask() ) {
+    case NIOS2_ISR_STATUS_MASK_IIC:
+      if ( new_level == 0 ) {
+        status |= NIOS2_STATUS_PIE;
+      } else {
+        status &= ~NIOS2_STATUS_PIE;
+      }
+      break;
+    case NIOS2_ISR_STATUS_MASK_EIC_IL:
+      status &= ~NIOS2_STATUS_IL_MASK;
+      status |= (new_level << NIOS2_STATUS_IL_OFFSET) & NIOS2_STATUS_IL_MASK;
+      break;
+    case NIOS2_ISR_STATUS_MASK_EIC_RSIE:
+      if ( new_level == 0 ) {
+        status |= NIOS2_STATUS_RSIE;
+      } else {
+        status &= ~NIOS2_STATUS_RSIE;
+      }
+      break;
+    default:
+      /* FIXME */
+      _Internal_error_Occurred( INTERNAL_ERROR_CORE, false, 0xdeadbeef );
+      break;
+  }
+
+  _Nios2_Set_ctlreg_status( status );
+}