Changeset 32eceb4f in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2010-11-20T22:30:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cb59f787

Parents:

1b22bd4 (diff), 7e1f9b7 (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/tl/tl_common.c (modified) (6 diffs)

uspace/lib/net/tl/tl_common.c

@@ -64 +64 @@
  * @param[in] addrlen   The address length.
  * @param[out] port     The set port.
- * @returns             EOK on success.
- * @returns             EINVAL if the address length does not match the address
+ * @return              EOK on success.
+ * @return              EINVAL if the address length does not match the address
  *                      family.
- * @returns             EAFNOSUPPORT if the address family is not supported.
+ * @return              EAFNOSUPPORT if the address family is not supported.
  */
 int
@@ -120 +120 @@
 int
 tl_get_ip_packet_dimension(int ip_phone,
-    packet_dimensions_ref packet_dimensions, device_id_t device_id,
-    packet_dimension_ref *packet_dimension)
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimension_t **packet_dimension)
 {
         int rc;
@@ -158 +158 @@
  * @param[in] device_id The device identifier.
  * @param[in] content   The new maximum content size.
- * @returns             EOK on success.
+ * @return              EOK on success.
  * @return              ENOENT if the packet dimension is not cached.
  */
 int
-tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     device_id_t device_id, size_t content)
 {
-        packet_dimension_ref packet_dimension;
+        packet_dimension_t *packet_dimension;
 
         packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
@@ -196 +196 @@
  * @param[in] addrlen   The address length.
  * @param[in] port      The port to be set.
- * @returns             EOK on success.
- * @returns             EINVAL if the address length does not match the address
+ * @return              EOK on success.
+ * @return              EINVAL if the address length does not match the address
  *                      family.
- * @returns             EAFNOSUPPORT if the address family is not supported.
+ * @return              EAFNOSUPPORT if the address family is not supported.
  */
 int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
@@ -244 +244 @@
  * @param[in] error     The packet error reporting service. Prefixes the
  *                      received packet.
- * @returns             EOK on success.
- * @returns             ENOENT if no packet may be sent.
- */
-int
-tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
+ * @return              EOK on success.
+ * @return              ENOENT if no packet may be sent.
+ */
+int
+tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet,
     services_t error)
 {
-        packet_t next;
+        packet_t *next;
         uint8_t *src;
         int length;
@@ -280 +280 @@
  * @param[in] addr      The destination address.
  * @param[in] addrlen   The address length.
- * @returns             Number of bytes received.
- * @returns             EINVAL if the client does not send data.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              Number of bytes received.
+ * @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_read_finalize() function.
  */
 int
-tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
-    const packet_dimension_ref dimension, const struct sockaddr *addr,
+tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
     socklen_t addrlen)
 {