Changeset ad7a6c9 in mainline for kernel/generic/src/lib/memfnc.c

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/src/lib/memfnc.c (moved) (moved from uspace/srv/net/il/ip/ip_module.c ) (2 diffs)

kernel/generic/src/lib/memfnc.c

@@ -1 @@
-/*
- * Copyright (c) 2009 Lukas Mejdrech
+        /*
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ip
+/** @addtogroup generic
  * @{
  */
 
-/** @file
- * IP standalone module implementation.
- * Contains skeleton module functions mapping.
- * The functions are used by the module skeleton as module specific entry
- * points.
+/**
+ * @file
+ * @brief Memory string functions.
  *
- * @see module.c
+ * This file provides architecture independent functions to manipulate blocks
+ * of memory. These functions are optimized as much as generic functions of
+ * this type can be.
  */
 
-#include <async.h>
-#include <stdio.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <errno.h>
+#include <lib/memfnc.h>
+#include <typedefs.h>
 
-#include <net/modules.h>
-#include <net_interface.h>
-#include <net/packet.h>
-#include <il_local.h>
-
-#include "ip.h"
-#include "ip_module.h"
-
-/** IP module global data. */
-extern ip_globals_t ip_globals;
-
-int
-il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+/** Fill block of memory.
+ *
+ * Fill cnt bytes at dst address with the value val.
+ *
+ * @param dst Destination address to fill.
+ * @param val Value to fill.
+ * @param cnt Number of bytes to fill.
+ *
+ * @return Destination address.
+ *
+ */
+void *memset(void *dst, int val, size_t cnt)
 {
-        return ip_message_standalone(callid, call, answer, answer_count);
+        size_t i;
+        uint8_t *ptr = (uint8_t *) dst;
+        
+        for (i = 0; i < cnt; i++)
+                ptr[i] = val;
+        
+        return dst;
 }
 
-int il_module_start_standalone(async_client_conn_t client_connection)
+/** Move memory block without overlapping.
+ *
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas cannot overlap.
+ *
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @param cnt Number of bytes to copy.
+ *
+ * @return Destination address.
+ *
+ */
+void *memcpy(void *dst, const void *src, size_t cnt)
 {
-        sysarg_t phonehash;
-        int rc;
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
         
-        async_set_client_connection(client_connection);
-        ip_globals.net_phone = net_connect_module();
-
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
+        while (cnt-- != 0)
+                        *dp++ = *sp++;
         
-        rc = ip_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-        
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_IP, 0, 0, &phonehash);
-        if (rc != EOK)
-                goto out;
-        
-        async_manager();
-
-out:
-        pm_destroy();
-        return rc;
+        return dst;
 }