Changeset b910455 in mainline for kernel/generic/include/lib/memfnc.h

Timestamp:

2011-04-07T09:46:11Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/lib/memfnc.h (moved) (moved from kernel/arch/ia64/include/memstr.h ) (3 diffs)

kernel/generic/include/lib/memfnc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_ia64_MEMSTR_H_
-#define KERN_ia64_MEMSTR_H_
+#ifndef KERN_LIB_MEMFNC_H_
+#define KERN_LIB_MEMFNC_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#include <typedefs.h>
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
+extern void *memset(void *, int, size_t);
+extern void *memcpy(void *, const void *, size_t);
 
 #endif