added irq-extension.h declarations

4 files changed, 190 insertions, 6 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index c5941fabe4..ddf0cf8358 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,20 +1,22 @@
+2008-07-10     Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/include/rtems/rtems/intr.h: Documentation.
+
+	* cpukit/include/rtems/irq-extension.h: Extension of the RTEMS
+	Interrupt Manager (shared handler and handler with a handle).
+
+
 2008-07-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* cpukit/include/rtems/status-checks.h: Macros for status code and
 	return value checks.
 
-2008-07-03	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
 	* cpukit/libmisc/shell/shell.c: Restore terminal settings on exit.
 
-2008-07-03	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
 	* cpukit/libfs/src/dosfs/msdos_dir.c,
 	cpukit/libfs/src/dosfs/msdos_file.c: Added S_IRWXU, S_IRWXG and S_IRWXO
 	to file mode.
 
-2008-07-03	Sebastian Huber <sebastian.huber@embedded-brains.de>
-
 	* cpukit/libi2c/libi2c.h, cpukit/libi2c/libi2c.c: Modified error
 	messages.  Driver operations table is now constant.  New entry in the
 	rtems_libi2c_tfr_mode_t structure: idle_char. This character will be
diff --git a/cpukit/include/rtems/irq-extension.h b/cpukit/include/rtems/irq-extension.h
new file mode 100644
index 0000000000..50ee3a905f
--- /dev/null
+++ b/cpukit/include/rtems/irq-extension.h
@@ -0,0 +1,171 @@
+/**
+ * @file
+ *
+ * @ingroup rtems_interrupt_extension
+ *
+ * @brief Header file for the RTEMS Interrupt Manager Extension.
+ */
+
+/*
+ * Based on concepts of Pavel Pisa, Till Straumann and Eric Valette.
+ *
+ * Copyright (c) 2008
+ * Embedded Brains GmbH
+ * Obere Lagerstr. 30
+ * D-82178 Puchheim
+ * Germany
+ * rtems@embedded-brains.de
+ *
+ * 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.
+ */
+
+#ifndef RTEMS_IRQ_EXTENSION_H
+#define RTEMS_IRQ_EXTENSION_H
+
+#include <rtems.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup rtems_interrupt_extension RTEMS Interrupt Manager Extension
+ *
+ * @ingroup ClassicINTR
+ *
+ * In addition to the classic API interrupt handler with a handle are
+ * supported.  You can also install multiple shared handler for one interrupt
+ * vector.
+ *
+ * @{
+ */
+
+/**
+ * @brief Interrupt handler routine type.
+ */
+typedef void (*rtems_interrupt_handler)( rtems_vector_number, void *);
+
+/**
+ * @brief Installs the interrupt handler routine @a handler for the interrupt
+ * vector with number @a vector.
+ *
+ * You can set some @ref rtems_interrupt_extension_options "options" with @a
+ * options for the interrupt handler.
+ *
+ * The handler routine shall be called with argument @a arg when dispatched.
+ * The order in which the shared interrupt handlers are dispatched for one
+ * vector is BSP dependent.
+ *
+ * If the option @ref RTEMS_INTERRUPT_UNIQUE is set then it shall be ensured
+ * that this handler will be the only one for this vector.
+ *
+ * You can provide an informative description @a info.  This may be used for
+ * system debugging and status tools.  The string has to be persistent during
+ * the handler life time.
+ *
+ * @note This function may block.
+ *
+ * @return
+ * - On success RTEMS_SUCCESSFUL shall be returned.
+ * - If the vector is already occupied with a unique handler the
+ * RTEMS_RESOURCE_IN_USE status code shall be returned.
+ * - If you want to install a unique handler and there is already a handler
+ * installed RTEMS_RESOURCE_IN_USE shall be returned.
+ * - If this function is called within interrupt context RTEMS_CALLED_FROM_ISR
+ * shall be returned.
+ * - If the vector number is out of range RTEMS_INVALID_NUMBER shall be
+ * returned.
+ * - If the handler address is NULL a RTEMS_INVALID_ADDRESS shall be returned.
+ * - If a handler with this argument is already installed for this vector
+ * RTEMS_TOO_MANY shall be returned.
+ * - Other error states are BSP specific.
+ */
+rtems_status_code rtems_interrupt_handler_install(
+    rtems_vector_number vector,
+    const char *info,
+    rtems_option options,
+    rtems_interrupt_handler handler,
+    void *arg
+);
+
+/**
+ * @brief Removes the interrupt handler routine @a handler with argument @a arg
+ * for the interrupt vector with number @a vector.
+ *
+ * @note This function may block.
+ *
+ * @return
+ * - On success RTEMS_SUCCESSFUL shall be returned.
+ * - If this function is called within interrupt context RTEMS_CALLED_FROM_ISR
+ * shall be returned.
+ * - If the vector number is out of range RTEMS_INVALID_NUMBER shall be
+ * returned.
+ * - If the handler address is NULL a RTEMS_INVALID_ADDRESS shall be returned.
+ * - If the handler with this argument is not installed for this vector
+ * RTEMS_UNSATISFIED shall be returned.
+ * - Other error states are BSP specific.
+ */
+rtems_status_code rtems_interrupt_handler_remove(
+    rtems_vector_number vector,
+    rtems_interrupt_handler handler,
+    void *arg
+);
+
+/** @} */
+
+/**
+ * @defgroup rtems_interrupt_extension_options Interrupt Handler Options
+ *
+ * @ingroup rtems_interrupt_extension
+ *
+ * @{
+ */
+
+/**
+ * @name Options
+ *
+ * @{
+ */
+
+/**
+ * @brief Makes the interrupt handler unique.  Prevents other handler from
+ * using the same interrupt vector.
+ */
+#define RTEMS_INTERRUPT_UNIQUE ((rtems_option) 0x00000001)
+
+/**
+ * @brief Allows that this interrupt handler may share a common interrupt
+ * vector with other handler.
+ */
+#define RTEMS_INTERRUPT_SHARED ((rtems_option) 0x00000000)
+
+/** @} */
+
+/**
+ * @name Option Set Checks
+ *
+ * @{
+ */
+
+/**
+ * @brief Returns true if the interrupt handler unique option is set.
+ */
+#define RTEMS_INTERRUPT_IS_UNIQUE( options) \
+    ((options) & RTEMS_INTERRUPT_UNIQUE)
+
+/**
+ * @brief Returns true if the interrupt handler shared option is set.
+ */
+#define RTEMS_INTERRUPT_IS_SHARED( options) \
+    (!RTEMS_INTERRUPT_IS_UNIQUE( options))
+
+/** @} */
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* RTEMS_IRQ_EXTENSION_H */
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index 4a02e00a08..0c3bf52bd2 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-09	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* rtems/m68k/m68360.h: added port b pin definitions for SPI
+
 2008-06-13	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* rtems/score/m68k.h: There is no point in defining the maximum
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
index 04be8eff11..006045fdfe 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
+++ b/cpukit/score/cpu/m68k/rtems/m68k/m68360.h
@@ -886,4 +886,11 @@ typedef struct m360_ {
 
 extern volatile m360_t m360;
 
+/*
+ * definitions for the port b SPI pin bits
+ */
+#define M360_PB_SPI_MISO_MSK       (1<< 3)
+#define M360_PB_SPI_MOSI_MSK       (1<< 2)
+#define M360_PB_SPI_CLK_MSK        (1<< 1)
+
 #endif /* _RTEMS_M68K_M68360_H */