Changeset 7e1f9b7 in mainline for uspace/lib/c

Timestamp:

2010-11-20T17:10:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32eceb4f, 8b3bff5

Parents:

0b4a67a (diff), dd5046dd (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 from lp:~jakub/helenos/net.

Location:

uspace/lib/c

Files:

• generic/net/packet.c (modified) (13 diffs)
• include/net/packet.h (modified) (2 diffs)
• include/net/packet_header.h (modified) (1 diff)

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

@@ -62 +62 @@
 
 /** Type definition of the packet map page. */
-typedef packet_t packet_map_t[PACKET_MAP_SIZE];
+typedef packet_t *packet_map_t[PACKET_MAP_SIZE];
 
 /** Packet map.
@@ -104 +104 @@
  * @return              NULL if the mapping does not exist.
  */
-packet_t pm_find(packet_id_t packet_id)
+packet_t *pm_find(packet_id_t packet_id)
 {
         packet_map_t *map;
-        packet_t packet;
+        packet_t *packet;
 
         if (!packet_id)
@@ -135 +135 @@
  * @return              ENOMEM if there is not enough memory left.
  */
-int pm_add(packet_t packet)
+int pm_add(packet_t *packet)
 {
         packet_map_t *map;
@@ -178 +178 @@
         int index;
         packet_map_t *map;
-        packet_t packet;
+        packet_t *packet;
 
         fibril_rwlock_write_lock(&pm_globals.lock);
@@ -209 +209 @@
  * @return              EINVAL if the packet is not valid.
  */
-int pq_add(packet_t * first, packet_t packet, size_t order, size_t metric)
-{
-        packet_t item;
+int pq_add(packet_t **first, packet_t *packet, size_t order, size_t metric)
+{
+        packet_t *item;
 
         if (!first || !packet_is_valid(packet))
@@ -253 +253 @@
  * @return              NULL if the packet is not found.
  */
-packet_t pq_find(packet_t packet, size_t order)
-{
-        packet_t item;
+packet_t *pq_find(packet_t *packet, size_t order)
+{
+        packet_t *item;
 
         if (!packet_is_valid(packet))
@@ -278 +278 @@
  * @return              EINVAL if etiher of the packets is invalid.
  */
-int pq_insert_after(packet_t packet, packet_t new_packet)
-{
-        packet_t item;
+int pq_insert_after(packet_t *packet, packet_t *new_packet)
+{
+        packet_t *item;
 
         if (!packet_is_valid(packet) || !packet_is_valid(new_packet))
@@ -303 +303 @@
  * @return              NULL if the packet is not valid.
  */
-packet_t pq_detach(packet_t packet)
-{
-        packet_t next;
-        packet_t previous;
+packet_t *pq_detach(packet_t *packet)
+{
+        packet_t *next;
+        packet_t *previous;
 
         if (!packet_is_valid(packet))
@@ -331 +331 @@
  * @return              EINVAL if the packet is invalid.
  */
-int pq_set_order(packet_t packet, size_t order, size_t metric)
+int pq_set_order(packet_t *packet, size_t order, size_t metric)
 {
         if (!packet_is_valid(packet))
@@ -349 +349 @@
  * @return              EINVAL if the packet is invalid.
  */
-int pq_get_order(packet_t packet, size_t *order, size_t *metric)
+int pq_get_order(packet_t *packet, size_t *order, size_t *metric)
 {
         if (!packet_is_valid(packet))
@@ -372 +372 @@
  *                      packets after its detachment.
  */
-void pq_destroy(packet_t first, void (*packet_release)(packet_t packet))
-{
-        packet_t actual;
-        packet_t next;
+void pq_destroy(packet_t *first, void (*packet_release)(packet_t *packet))
+{
+        packet_t *actual;
+        packet_t *next;
 
         actual = first;
@@ -395 +395 @@
  * @return              NULL if the packet is not valid.
  */
-packet_t pq_next(packet_t packet)
+packet_t *pq_next(packet_t *packet)
 {
         if (!packet_is_valid(packet))
@@ -410 +410 @@
  * @return              NULL if the packet is not valid.
  */
-packet_t pq_previous(packet_t packet)
+packet_t *pq_previous(packet_t *packet)
 {
         if (!packet_is_valid(packet))

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

@@ -46 +46 @@
  * @see packet
  */
-typedef struct packet * packet_t;
+typedef struct packet packet_t;
 
 /** Type definition of the packet dimension.
@@ -69 +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 *);
 
 /*@}*/

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

@@ -128 +128 @@
  * @return              False otherwise.
  */
-static inline int packet_is_valid(const packet_t packet)
+static inline int packet_is_valid(const packet_t *packet)
 {
         return packet && (packet->magic_value == PACKET_MAGIC_VALUE);