Changeset 4c14b88 in mainline for uspace/lib/c/include/adt

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

Location:

uspace/lib/c/include/adt

Files:

• checksum.h (moved) (moved from uspace/lib/c/include/net/device.h ) (2 diffs)
• list.h (modified) (4 diffs)

uspace/lib/c/include/adt/checksum.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Dominik Taborsky
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-
 /** @file
- * Network device.
  */
 
-#ifndef LIBC_NET_DEVICE_H_
-#define LIBC_NET_DEVICE_H_
+#ifndef LIBC_CHECKSUM_H_
+#define LIBC_CHECKSUM_H_
 
-#include <adt/int_map.h>
-#include <nic/nic.h>
+#include <sys/types.h>
 
-/** Device identifier to generic type map declaration. */
-#define DEVICE_MAP_DECLARE  INT_MAP_DECLARE
-
-/** Device identifier to generic type map implementation. */
-#define DEVICE_MAP_IMPLEMENT  INT_MAP_IMPLEMENT
-
-/** Device identifier type. */
-typedef int nic_device_id_t;
-
-/** Invalid device identifier. */
-#define NIC_DEVICE_INVALID_ID  (-1)
+extern uint32_t compute_crc32(uint8_t *, size_t);
+extern uint32_t compute_crc32_seed(uint8_t *, size_t, uint32_t);
 
 #endif

uspace/lib/c/include/adt/list.h

@@ -38 +38 @@
 
 #include <assert.h>
+#include <stdbool.h>
 #include <unistd.h>
 
@@ -72 +73 @@
             iterator = list_get_instance(_link, itype, member), \
             _link != &(list).head; _link = _link->next)
+
+#define list_foreach_rev(list, member, itype, iterator) \
+        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
+            for (link_t *_link = (list).head.prev; \
+            iterator = list_get_instance(_link, itype, member), \
+            _link != &(list).head; _link = _link->prev)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
@@ -105 +112 @@
 
 #define assert_link_not_used(link) \
-        assert(((link)->prev == NULL) && ((link)->next == NULL))
+        assert(!link_used(link))
 
 /** Returns true if the link is definitely part of a list. False if not sure. */
@@ -357 +364 @@
 }
 
+/** Determine if link is used.
+ *
+ * @param link Link
+ * @return @c true if link is used, @c false if not.
+ */
+static inline bool link_used(link_t *link)
+{
+        if (link->prev == NULL && link->next == NULL)
+                return false;
+
+        assert(link->prev != NULL && link->next != NULL);
+        return true;
+}
+
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);