Changeset bbc74af7 in mainline for uspace/lib

Timestamp:

2010-12-16T20:21:45Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

40dc422, 87b4baa

Parents:

eb221e5 (diff), cc274f5a (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 from lp:~jakub/helenos/net.

Location:

uspace/lib/c

Files:

• generic/net/modules.c (modified) (1 diff)
• include/net/modules.h (modified) (2 diffs)

uspace/lib/c/generic/net/modules.c

@@ -198 +198 @@
 }
 
-/** Receives data from the other party.
- *
- * The received data buffer is allocated and returned.
- *
- * @param[out] data     The data buffer to be filled.
- * @param[out] length   The buffer length.
- * @return              EOK on success.
- * @return              EBADMEM if the data or the length parameter is NULL.
- * @return              EINVAL if the client does not send data.
- * @return              ENOMEM if there is not enough memory left.
- * @return              Other error codes as defined for the
- *                      async_data_write_finalize() function.
- */
-int data_receive(void **data, size_t *length)
-{
-        ipc_callid_t callid;
-        int rc;
-
-        if (!data || !length)
-                return EBADMEM;
-
-        // fetch the request
-        if (!async_data_write_receive(&callid, length))
-                return EINVAL;
-
-        // allocate the buffer
-        *data = malloc(*length);
-        if (!*data)
-                return ENOMEM;
-
-        // fetch the data
-        rc = async_data_write_finalize(callid, *data, *length);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-
-        return EOK;
-}
-
 /** Replies the data to the other party.
  *

uspace/lib/c/include/net/modules.h

@@ -49 +49 @@
 #include <sys/time.h>
 
-/** Converts the data length between different types.
- *
- * @param[in] type_from The source type.
- * @param[in] type_to   The destination type.
- * @param[in] count     The number units of the source type size.
- */
-#define CONVERT_SIZE(type_from, type_to, count) \
-        ((sizeof(type_from) / sizeof(type_to)) * (count))
-
-/** Registers the module service at the name server.
- *
- * @param[in] me        The module service.
- * @param[out] phonehash The created phone hash.
- */
-#define REGISTER_ME(me, phonehash) \
-        ipc_connect_to_me(PHONE_NS, (me), 0, 0, (phonehash))
-
 /** Connect to the needed module function type definition.
  *
@@ -80 +63 @@
 extern int connect_to_service(services_t);
 extern int connect_to_service_timeout(services_t, suseconds_t);
-extern int data_receive(void **, size_t *);
 extern int data_reply(void *, size_t);
 extern void refresh_answer(ipc_call_t *, int *);