From 00c87925a934a4e7664bb4f112c9fdf3ade775c2 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 30 Oct 2015 08:03:57 +0100
Subject: Initialize interrupt server early

This enables its use before the Nexus device exists.
---
 libbsd.py                        |  1 +
 libbsd_waf.py                    |  1 +
 rtemsbsd/rtems/rtems-bsd-irqs.c  | 63 ++++++++++++++++++++++++++++++++++++++++
 rtemsbsd/rtems/rtems-bsd-nexus.c | 17 +++--------
 4 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 rtemsbsd/rtems/rtems-bsd-irqs.c

diff --git a/libbsd.py b/libbsd.py
index 388aedfb..c03f2303 100755
--- a/libbsd.py
+++ b/libbsd.py
@@ -74,6 +74,7 @@ def rtems(mm):
             'rtems/rtems-bsd-get-task-priority.c',
             'rtems/rtems-bsd-get-task-stack-size.c',
             'rtems/rtems-bsd-init.c',
+            'rtems/rtems-bsd-irqs.c',
             'rtems/rtems-bsd-jail.c',
             'rtems/rtems-bsd-log.c',
             'rtems/rtems-bsd-malloc.c',
diff --git a/libbsd_waf.py b/libbsd_waf.py
index c99ef935..991a1c83 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -986,6 +986,7 @@ def build(bld):
               'rtemsbsd/rtems/rtems-bsd-get-task-priority.c',
               'rtemsbsd/rtems/rtems-bsd-get-task-stack-size.c',
               'rtemsbsd/rtems/rtems-bsd-init.c',
+              'rtemsbsd/rtems/rtems-bsd-irqs.c',
               'rtemsbsd/rtems/rtems-bsd-jail.c',
               'rtemsbsd/rtems/rtems-bsd-log.c',
               'rtemsbsd/rtems/rtems-bsd-malloc.c',
diff --git a/rtemsbsd/rtems/rtems-bsd-irqs.c b/rtemsbsd/rtems/rtems-bsd-irqs.c
new file mode 100644
index 00000000..e558d1f5
--- /dev/null
+++ b/rtemsbsd/rtems/rtems-bsd-irqs.c
@@ -0,0 +1,63 @@
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_rtems
+ *
+ * @brief TODO.
+ */
+
+/*
+ * Copyright (c) 2009-2015 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <machine/rtems-bsd-kernel-space.h>
+
+#include <rtems/bsd/sys/types.h>
+#include <sys/kernel.h>
+
+#include <rtems/bsd/bsd.h>
+#include <rtems/irq-extension.h>
+
+static void
+irqs_sysinit(void)
+{
+	static const char name[] = "IRQS";
+	rtems_status_code status;
+
+	status = rtems_interrupt_server_initialize(
+		rtems_bsd_get_task_priority(name),
+		rtems_bsd_get_task_stack_size(name),
+		RTEMS_DEFAULT_MODES,
+		RTEMS_DEFAULT_ATTRIBUTES,
+		NULL
+	);
+	BSD_ASSERT(status == RTEMS_SUCCESSFUL);
+}
+SYSINIT(irqs, SI_SUB_SETTINGS, SI_ORDER_ANY, irqs_sysinit, NULL);
diff --git a/rtemsbsd/rtems/rtems-bsd-nexus.c b/rtemsbsd/rtems/rtems-bsd-nexus.c
index 22c56040..d8afebc2 100644
--- a/rtemsbsd/rtems/rtems-bsd-nexus.c
+++ b/rtemsbsd/rtems/rtems-bsd-nexus.c
@@ -71,27 +71,18 @@ static struct rman irq_rman;
 static struct rman port_rman;
 #endif
 
+#ifndef DISABLE_INTERRUPT_EXTENSION
+SYSINIT_REFERENCE(irqs);
+#endif
+
 static int
 nexus_probe(device_t dev)
 {
-	static const char name[] = "IRQS";
-	rtems_status_code status;
 	int err;
 	const rtems_bsd_device *nd;
 
 	device_set_desc(dev, "RTEMS Nexus device");
 
-#ifndef DISABLE_INTERRUPT_EXTENSION
-	status = rtems_interrupt_server_initialize(
-		rtems_bsd_get_task_priority(name),
-		rtems_bsd_get_task_stack_size(name),
-		RTEMS_DEFAULT_MODES,
-		RTEMS_DEFAULT_ATTRIBUTES,
-		NULL
-	);
-	BSD_ASSERT(status == RTEMS_SUCCESSFUL);
-#endif
-
 	mem_rman.rm_start = 0;
 	mem_rman.rm_end = ~0UL;
 	mem_rman.rm_type = RMAN_ARRAY;
-- 
cgit v1.2.3