Changeset 8fb1bf82 in mainline for uspace/lib/c/include/net/packet.h

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/c/include/net/packet.h (modified) (3 diffs)

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

@@ -46 +46 @@
  * @see packet
  */
-typedef struct packet * packet_t;
-
-/** Type definition of the packet pointer.
- * @see packet
- */
-typedef packet_t * packet_ref;
+typedef struct packet packet_t;
 
 /** Type definition of the packet dimension.
@@ -57 +52 @@
  */
 typedef struct packet_dimension packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- * @see packet_dimension
- */
-typedef packet_dimension_t * packet_dimension_ref;
 
 /** Packet dimension. */
@@ -79 +69 @@
 /*@{*/
 
-extern packet_t pm_find(packet_id_t);
-extern int pm_add(packet_t);
+extern packet_t *pm_find(packet_id_t);
+extern int pm_add(packet_t *);
 extern int pm_init(void);
 extern void pm_destroy(void);
 
-extern int pq_add(packet_t *, packet_t, size_t, size_t);
-extern packet_t pq_find(packet_t, size_t);
-extern int pq_insert_after(packet_t, packet_t);
-extern packet_t pq_detach(packet_t);
-extern int pq_set_order(packet_t, size_t, size_t);
-extern int pq_get_order(packet_t, size_t *, size_t *);
-extern void pq_destroy(packet_t, void (*)(packet_t));
-extern packet_t pq_next(packet_t);
-extern packet_t pq_previous(packet_t);
+extern int pq_add(packet_t **, packet_t *, size_t, size_t);
+extern packet_t *pq_find(packet_t *, size_t);
+extern int pq_insert_after(packet_t *, packet_t *);
+extern packet_t *pq_detach(packet_t *);
+extern int pq_set_order(packet_t *, size_t, size_t);
+extern int pq_get_order(packet_t *, size_t *, size_t *);
+extern void pq_destroy(packet_t *, void (*)(packet_t *));
+extern packet_t *pq_next(packet_t *);
+extern packet_t *pq_previous(packet_t *);
 
 /*@}*/