diff --git a/repos/base-foc/include/util/assert.h b/repos/base-foc/include/util/assert.h
deleted file mode 100644
index 43bc7f142..000000000
--- a/repos/base-foc/include/util/assert.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * \brief Assertion macros for Fiasco.OC
- * \author Stefan Kalkowski
- * \date 2012-05-25
- */
-
-/*
- * Copyright (C) 2006-2013 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#ifndef _INCLUDE__UTIL__ASSERT_H_
-#define _INCLUDE__UTIL__ASSERT_H_
-
-#include
-
-namespace Fiasco {
-#include
-}
-
-#if 1
-#define ASSERT(e, s) \
- do { if (!(e)) { \
- Fiasco::outstring(ESC_ERR s ESC_END "\n"); \
- Fiasco::outstring(__FILE__ ":"); \
- Fiasco::outdec(__LINE__); \
- Fiasco::outstring("\n"); \
- enter_kdebug("ASSERT"); \
- } \
- } while(0)
-#else
-#define ASSERT(e, s) do { } while (0)
-#endif
-
-#endif /* _INCLUDE__UTIL__ASSERT_H_ */
diff --git a/repos/base-foc/src/core/rpc_cap_factory.cc b/repos/base-foc/src/core/rpc_cap_factory.cc
index 8672f2072..cce7ab30f 100644
--- a/repos/base-foc/src/core/rpc_cap_factory.cc
+++ b/repos/base-foc/src/core/rpc_cap_factory.cc
@@ -24,6 +24,7 @@
/* base-internal includes */
#include
+#include
/* Fiasco includes */
namespace Fiasco {
@@ -34,8 +35,6 @@ namespace Fiasco {
#include
}
-#include
-
using namespace Genode;
diff --git a/repos/base-foc/src/include/base/internal/cap_alloc.h b/repos/base-foc/src/include/base/internal/cap_alloc.h
index 7b995af1a..760cb17a3 100644
--- a/repos/base-foc/src/include/base/internal/cap_alloc.h
+++ b/repos/base-foc/src/include/base/internal/cap_alloc.h
@@ -16,12 +16,12 @@
/* Genode includes */
#include
-#include
#include
#include
/* base-internal includes */
#include
+#include
namespace Genode {
diff --git a/repos/base-foc/src/include/base/internal/foc_assert.h b/repos/base-foc/src/include/base/internal/foc_assert.h
new file mode 100644
index 000000000..04f73c325
--- /dev/null
+++ b/repos/base-foc/src/include/base/internal/foc_assert.h
@@ -0,0 +1,32 @@
+/*
+ * \brief Assertion macros for Fiasco.OC
+ * \author Stefan Kalkowski
+ * \date 2012-05-25
+ */
+
+/*
+ * Copyright (C) 2006-2013 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+#ifndef _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_
+#define _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_
+
+/* Genode includes */
+#include
+
+/* Fiasco includes */
+namespace Fiasco {
+#include
+}
+
+#define ASSERT(e, s) \
+ do { if (!(e)) { \
+ Genode::raw("assertion failed: ", s, __FILE__, __LINE__); \
+ enter_kdebug("ASSERT"); \
+ } \
+ } while(0)
+
+#endif /* _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_ */
diff --git a/repos/base-foc/include/signal_source/client.h b/repos/base-foc/src/include/signal_source/client.h
similarity index 100%
rename from repos/base-foc/include/signal_source/client.h
rename to repos/base-foc/src/include/signal_source/client.h
diff --git a/repos/base-foc/include/signal_source/foc_signal_source.h b/repos/base-foc/src/include/signal_source/foc_signal_source.h
similarity index 100%
rename from repos/base-foc/include/signal_source/foc_signal_source.h
rename to repos/base-foc/src/include/signal_source/foc_signal_source.h
diff --git a/repos/base-foc/include/signal_source/rpc_object.h b/repos/base-foc/src/include/signal_source/rpc_object.h
similarity index 100%
rename from repos/base-foc/include/signal_source/rpc_object.h
rename to repos/base-foc/src/include/signal_source/rpc_object.h
diff --git a/repos/base-foc/src/lib/base/cap_map.cc b/repos/base-foc/src/lib/base/cap_map.cc
index 47974fb8c..fb7b32702 100644
--- a/repos/base-foc/src/lib/base/cap_map.cc
+++ b/repos/base-foc/src/lib/base/cap_map.cc
@@ -13,13 +13,10 @@
* under the terms of the GNU General Public License version 2.
*/
-/* Genode includes */
-#include
-#include
-
/* base-internal includes */
#include
#include
+#include
/* kernel includes */
#include
diff --git a/repos/base-foc/src/lib/base/ipc.cc b/repos/base-foc/src/lib/base/ipc.cc
index 8abe4dcbc..71866b9e5 100644
--- a/repos/base-foc/src/lib/base/ipc.cc
+++ b/repos/base-foc/src/lib/base/ipc.cc
@@ -26,13 +26,13 @@
#include
#include
#include
-#include
/* base-internal includes */
#include /* for 'thread_get_my_native_id()' */
#include
#include
#include
+#include
/* Fiasco.OC includes */
namespace Fiasco {
diff --git a/repos/base-nova/include/signal_source/client.h b/repos/base-nova/src/include/signal_source/client.h
similarity index 100%
rename from repos/base-nova/include/signal_source/client.h
rename to repos/base-nova/src/include/signal_source/client.h
diff --git a/repos/base-nova/include/signal_source/nova_signal_source.h b/repos/base-nova/src/include/signal_source/nova_signal_source.h
similarity index 100%
rename from repos/base-nova/include/signal_source/nova_signal_source.h
rename to repos/base-nova/src/include/signal_source/nova_signal_source.h
diff --git a/repos/base/include/pd_session/pd_session.h b/repos/base/include/pd_session/pd_session.h
index 0074b93ab..b3053382c 100644
--- a/repos/base/include/pd_session/pd_session.h
+++ b/repos/base/include/pd_session/pd_session.h
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
namespace Genode {
diff --git a/repos/base/include/signal_source/capability.h b/repos/base/src/include/signal_source/capability.h
similarity index 100%
rename from repos/base/include/signal_source/capability.h
rename to repos/base/src/include/signal_source/capability.h
diff --git a/repos/base/include/signal_source/client.h b/repos/base/src/include/signal_source/client.h
similarity index 95%
rename from repos/base/include/signal_source/client.h
rename to repos/base/src/include/signal_source/client.h
index aa2448898..b6843e43c 100644
--- a/repos/base/include/signal_source/client.h
+++ b/repos/base/src/include/signal_source/client.h
@@ -16,6 +16,7 @@
#include
#include
+#include
namespace Genode { class Signal_source_client; }
diff --git a/repos/base/include/signal_source/rpc_object.h b/repos/base/src/include/signal_source/rpc_object.h
similarity index 100%
rename from repos/base/include/signal_source/rpc_object.h
rename to repos/base/src/include/signal_source/rpc_object.h
diff --git a/repos/base/include/signal_source/signal_source.h b/repos/base/src/include/signal_source/signal_source.h
similarity index 100%
rename from repos/base/include/signal_source/signal_source.h
rename to repos/base/src/include/signal_source/signal_source.h
diff --git a/repos/base/src/lib/base/rpc_entrypoint.cc b/repos/base/src/lib/base/rpc_entrypoint.cc
index 68f4da924..ea82ea9c5 100644
--- a/repos/base/src/lib/base/rpc_entrypoint.cc
+++ b/repos/base/src/lib/base/rpc_entrypoint.cc
@@ -19,6 +19,7 @@
/* base-internal includes */
#include
+#include
using namespace Genode;
diff --git a/repos/base/src/lib/base/signal.cc b/repos/base/src/lib/base/signal.cc
index 348741e01..b079a264a 100644
--- a/repos/base/src/lib/base/signal.cc
+++ b/repos/base/src/lib/base/signal.cc
@@ -18,11 +18,11 @@
#include
#include
#include
-#include
#include
/* base-internal includes */
#include
+#include
using namespace Genode;
diff --git a/repos/ports-foc/src/lib/l4lx/genode_block.cc b/repos/ports-foc/src/lib/l4lx/genode_block.cc
index 54cd3d81d..c34b1fe7b 100644
--- a/repos/ports-foc/src/lib/l4lx/genode_block.cc
+++ b/repos/ports-foc/src/lib/l4lx/genode_block.cc
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
@@ -25,6 +24,7 @@
namespace Fiasco {
#include
#include
+#include
}
namespace {
@@ -63,7 +63,10 @@ namespace {
void insert(void *packet, void *request)
{
int idx = _find(0);
- ASSERT(idx >= 0, "Req cache full!");
+ if (idx == 0) {
+ PERR("Req cache full!");
+ enter_kdebug("Req_cache");
+ }
_cache[idx] = Req_entry(packet, request);
}
@@ -71,7 +74,10 @@ namespace {
void remove(void *packet, void **request)
{
int idx = _find(packet);
- ASSERT(idx >= 0, "Req cache entry not found!");
+ if (idx == 0) {
+ PERR("Req cache entry not found!");
+ enter_kdebug("Req_cache");
+ }
*request = _cache[idx].req;
_cache[idx].pkt = 0;