From cfa3d384177165bc7c996e1a82e2049682eb6e9d Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 26 Jun 2013 12:03:25 +0200
Subject: [PATCH] Use Genode's memcpy in L4Linux block driver

---
 ports-foc/include/genode/string.h       | 31 +++++++++++++++++++++++++
 ports-foc/lib/mk/l4lx.mk                |  1 +
 ports-foc/src/drivers/genode_block.c    |  5 ++--
 ports-foc/src/lib/l4lx/genode_string.cc | 25 ++++++++++++++++++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 ports-foc/include/genode/string.h
 create mode 100644 ports-foc/src/lib/l4lx/genode_string.cc

diff --git a/ports-foc/include/genode/string.h b/ports-foc/include/genode/string.h
new file mode 100644
index 000000000..bb6102d2f
--- /dev/null
+++ b/ports-foc/include/genode/string.h
@@ -0,0 +1,31 @@
+/*
+ * \brief  Genode C API string related functions
+ * \author Stefan Kalkowski
+ * \date   2013-06-26
+ */
+
+/*
+ * Copyright (C) 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__GENODE__STRING_H_
+#define _INCLUDE__GENODE__STRING_H_
+
+#include <l4/sys/compiler.h>
+
+#include <genode/linkage.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	L4_CV void genode_memcpy(void* dst, void *src, unsigned long size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_INCLUDE__GENODE__STRING_H_
diff --git a/ports-foc/lib/mk/l4lx.mk b/ports-foc/lib/mk/l4lx.mk
index ff474ffae..299450535 100644
--- a/ports-foc/lib/mk/l4lx.mk
+++ b/ports-foc/lib/mk/l4lx.mk
@@ -8,6 +8,7 @@ SRC_CC  += env.cc \
            genode_input.cc \
            genode_net.cc \
            genode_terminal.cc \
+           genode_string.cc \
            l4_io.cc \
            l4_log.cc \
            l4_re_c_dataspace.cc \
diff --git a/ports-foc/src/drivers/genode_block.c b/ports-foc/src/drivers/genode_block.c
index 707475680..723ed0d5e 100644
--- a/ports-foc/src/drivers/genode_block.c
+++ b/ports-foc/src/drivers/genode_block.c
@@ -27,6 +27,7 @@
 
 /* Genode support library includes */
 #include <genode/block.h>
+#include <genode/string.h>
 #include <l4/log/log.h>
 
 enum Geometry {
@@ -113,7 +114,7 @@ static void genode_blk_request(struct request_queue *q)
 
 			rq_for_each_segment(bvec, req, iter) {
 				void *buffer = page_address(bvec->bv_page) + bvec->bv_offset;
-				memcpy((void*)ptr, buffer, bvec->bv_len);
+				genode_memcpy((void*)ptr, buffer, bvec->bv_len);
 				ptr += bvec->bv_len;
 			}
 		}
@@ -136,7 +137,7 @@ genode_end_request(void *request, short write,
 
 		rq_for_each_segment(bvec, req, iter) {
 			void *buffer = page_address(bvec->bv_page) + bvec->bv_offset;
-			memcpy(buffer, (void*)ptr, bvec->bv_len);
+			genode_memcpy(buffer, (void*)ptr, bvec->bv_len);
 			ptr += bvec->bv_len;
 		}
 	}
diff --git a/ports-foc/src/lib/l4lx/genode_string.cc b/ports-foc/src/lib/l4lx/genode_string.cc
new file mode 100644
index 000000000..a4bc098d1
--- /dev/null
+++ b/ports-foc/src/lib/l4lx/genode_string.cc
@@ -0,0 +1,25 @@
+/*
+ * \brief  Genode C API string API
+ * \author Stefan Kalkowski
+ * \date   2013-06-26
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#include <util/string.h>
+
+namespace Fiasco {
+#include <genode/string.h>
+}
+using namespace Fiasco;
+
+
+extern "C" void genode_memcpy(void *dst, void *src, unsigned long size)
+{
+	Genode::memcpy(dst, src, size);
+}