Changeset fdbc3ff in mainline for uspace/lib/c/generic/net/packet.c

Timestamp:

2010-11-19T23:50:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/c/generic/net/packet.c (modified) (14 diffs)

uspace/lib/c/generic/net/packet.c

@@ -64 +64 @@
 typedef packet_t packet_map_t[PACKET_MAP_SIZE];
 
-/** Type definition of the packet map page pointer. */
-typedef packet_map_t * packet_map_ref;
-
 /** Packet map.
  * Maps packet identifiers to the packet references.
@@ -85 +82 @@
 /** Initializes the packet map.
  *
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
  */
 int pm_init(void)
@@ -104 +101 @@
  *
  * @param[in] packet_id The packet identifier to be found.
- * @returns             The found packet reference.
- * @returns             NULL if the mapping does not exist.
+ * @return              The found packet reference.
+ * @return              NULL if the mapping does not exist.
  */
 packet_t pm_find(packet_id_t packet_id)
 {
-        packet_map_ref map;
+        packet_map_t *map;
         packet_t packet;
 
@@ -133 +130 @@
  *
  * @param[in] packet    The packet to be remembered.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet is not valid.
- * @returns             EINVAL if the packet map is not initialized.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              EINVAL if the packet is not valid.
+ * @return              EINVAL if the packet map is not initialized.
+ * @return              ENOMEM if there is not enough memory left.
  */
 int pm_add(packet_t packet)
 {
-        packet_map_ref map;
+        packet_map_t *map;
         int rc;
 
@@ -154 +151 @@
         } else {
                 do {
-                        map = (packet_map_ref) malloc(sizeof(packet_map_t));
+                        map = (packet_map_t *) malloc(sizeof(packet_map_t));
                         if (!map) {
                                 fibril_rwlock_write_unlock(&pm_globals.lock);
@@ -180 +177 @@
         int count;
         int index;
-        packet_map_ref map;
+        packet_map_t *map;
         packet_t packet;
 
@@ -208 +205 @@
  * @param[in] order     The packet order value.
  * @param[in] metric    The metric value of the packet.
- * @returns             EOK on success.
- * @returns             EINVAL if the first parameter is NULL.
- * @returns             EINVAL if the packet is not valid.
+ * @return              EOK on success.
+ * @return              EINVAL if the first parameter is NULL.
+ * @return              EINVAL if the packet is not valid.
  */
 int pq_add(packet_t * first, packet_t packet, size_t order, size_t metric)
@@ -252 +249 @@
  * @param[in] first     The first packet of the queue.
  * @param[in] order     The packet order value.
- * @returns             The packet with the given order.
- * @returns             NULL if the first packet is not valid.
- * @returns             NULL if the packet is not found.
+ * @return              The packet with the given order.
+ * @return              NULL if the first packet is not valid.
+ * @return              NULL if the packet is not found.
  */
 packet_t pq_find(packet_t packet, size_t order)
@@ -278 +275 @@
  * @param[in] packet    The packet in the queue.
  * @param[in] new_packet The new packet to be inserted.
- * @returns             EOK on success.
- * @returns             EINVAL if etiher of the packets is invalid.
+ * @return              EOK on success.
+ * @return              EINVAL if etiher of the packets is invalid.
  */
 int pq_insert_after(packet_t packet, packet_t new_packet)
@@ -301 +298 @@
  *
  * @param[in] packet    The packet to be detached.
- * @returns             The next packet in the queue. If the packet is the first
+ * @return              The next packet in the queue. If the packet is the first
  *                      one of the queue, this becomes the new first one.
- * @returns             NULL if there is no packet left.
- * @returns             NULL if the packet is not valid.
+ * @return              NULL if there is no packet left.
+ * @return              NULL if the packet is not valid.
  */
 packet_t pq_detach(packet_t packet)
@@ -331 +328 @@
  * @param[in] order     The packet order value.
  * @param[in] metric    The metric value of the packet.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet is invalid.
+ * @return              EOK on success.
+ * @return              EINVAL if the packet is invalid.
  */
 int pq_set_order(packet_t packet, size_t order, size_t metric)
@@ -349 +346 @@
  * @param[out] order    The packet order value.
  * @param[out] metric   The metric value of the packet.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet is invalid.
+ * @return              EOK on success.
+ * @return              EINVAL if the packet is invalid.
  */
 int pq_get_order(packet_t packet, size_t *order, size_t *metric)
@@ -394 +391 @@
  *
  * @param[in] packet    The packet queue member.
- * @returns             The next packet in the queue.
- * @returns             NULL if there is no next packet.
- * @returns             NULL if the packet is not valid.
+ * @return              The next packet in the queue.
+ * @return              NULL if there is no next packet.
+ * @return              NULL if the packet is not valid.
  */
 packet_t pq_next(packet_t packet)
@@ -409 +406 @@
  *
  * @param[in] packet    The packet queue member.
- * @returns             The previous packet in the queue.
- * @returns             NULL if there is no previous packet.
- * @returns             NULL if the packet is not valid.
+ * @return              The previous packet in the queue.
+ * @return              NULL if there is no previous packet.
+ * @return              NULL if the packet is not valid.
  */
 packet_t pq_previous(packet_t packet)