Changeset 557c7d0 in mainline for uspace/lib/c

Timestamp:

2010-12-19T10:12:49Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8dd039a, f568ee7

Parents:

11658b64 (diff), 40dc422 (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

Location:

uspace/lib/c

Files:

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

uspace/lib/c/generic/devmap.c

@@ -127 +127 @@
 /** Register new device.
  *
- * @param namespace Namespace name.
+ * The @p interface is used when forwarding connection to the driver.
+ * If not 0, the first argument is the interface and the second argument
+ * is the devmap handle of the device.
+ * When the interface is zero (default), the first argument is directly
+ * the handle (to ensure backward compatibility).
+ *
+ * @param fqdn Fully qualified device name.
+ * @param[out] handle Handle to the created instance of device.
+ * @param interface Interface when forwarding.
+ *
+ */
+int devmap_device_register_with_iface(const char *fqdn,
+    devmap_handle_t *handle, sysarg_t interface)
+{
+        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, interface, 0,
+            &answer);
+        
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        async_serialize_end();
+        
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = -1;
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
+
+/** Register new device.
+ *
  * @param fqdn      Fully qualified device name.
  * @param handle    Output: Handle to the created instance of device.
@@ -134 +183 @@
 int devmap_device_register(const char *fqdn, devmap_handle_t *handle)
 {
-        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
-        
-        if (phone < 0)
-                return phone;
-        
-        async_serialize_start();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0,
-            &answer);
-        
-        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-        
-        async_wait_for(req, &retval);
-        
-        async_serialize_end();
-        
-        if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
-        
-        return retval;
-}
+        return devmap_device_register_with_iface(fqdn, handle, 0);
+}
+
 
 int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, unsigned int flags)

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/devmap.h

@@ -45 +45 @@
 extern int devmap_driver_register(const char *, async_client_conn_t);
 extern int devmap_device_register(const char *, devmap_handle_t *);
+extern int devmap_device_register_with_iface(const char *, devmap_handle_t *, sysarg_t);
 
 extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);

uspace/lib/c/include/ipc/devman.h

@@ -123 +123 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
+        DEVMAN_CONNECT_FROM_DEVMAP,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;

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 *);