Changeset 8fb1bf82 in mainline for uspace/lib/net/generic/generic.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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:

• uspace/lib/net/generic/generic.c (modified) (3 diffs)

uspace/lib/net/generic/generic.c

@@ -92 +92 @@
  * @param[out] address  The desired address.
  * @param[out] data     The address data container.
- * @returns             EOK on success.
- * @returns             EBADMEM if the address parameter and/or the data
+ * @return              EOK on success.
+ * @return              EBADMEM if the address parameter and/or the data
  *                      parameter is NULL.
- * @returns             Other error codes as defined for the specific service
+ * @return              Other error codes as defined for the specific service
  *                      message.
  */
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_ref *address, char ** data)
+    measured_string_t **address, char ** data)
 {
         aid_t message_id;
@@ -138 +138 @@
 int
 generic_packet_size_req_remote(int phone, int message, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
         if (!packet_dimension)
@@ -223 +223 @@
  * @param[out] translation The translated values.
  * @param[out] data     The translation data container.
- * @returns             EOK on success.
- * @returns             EINVAL if the configuration parameter is NULL.
- * @returns             EINVAL if the count parameter is zero.
- * @returns             EBADMEM if the translation or the data parameters are
+ * @return              EOK on success.
+ * @return              EINVAL if the configuration parameter is NULL.
+ * @return              EINVAL if the count parameter is zero.
+ * @return              EBADMEM if the translation or the data parameters are
  *                      NULL.
- * @returns             Other error codes as defined for the specific service
+ * @return              Other error codes as defined for the specific service
  *                      message.
  */
 int
 generic_translate_req(int phone, int message, device_id_t device_id,
-    services_t service, measured_string_ref configuration, size_t count,
-    measured_string_ref *translation, char **data)
+    services_t service, measured_string_t *configuration, size_t count,
+    measured_string_t **translation, char **data)
 {
         aid_t message_id;