Changeset 7390870 in mainline

Timestamp:

2010-09-26T12:36:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

edba2b6f

Parents:

c5b59ce

Message:

Move ADT's used by the networking stack to libc.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/adt/char_map.c (moved) (moved from uspace/lib/socket/adt/char_map.c )
• c/generic/adt/dynamic_fifo.c (moved) (moved from uspace/lib/socket/adt/dynamic_fifo.c )
• c/generic/adt/measured_strings.c (moved) (moved from uspace/lib/socket/adt/measured_strings.c ) (2 diffs)
• c/include/adt/char_map.h (moved) (moved from uspace/lib/socket/include/adt/char_map.h )
• c/include/adt/dynamic_fifo.h (moved) (moved from uspace/lib/socket/include/adt/dynamic_fifo.h )
• c/include/adt/generic_char_map.h (moved) (moved from uspace/lib/socket/include/adt/generic_char_map.h )
• c/include/adt/generic_field.h (moved) (moved from uspace/lib/socket/include/adt/generic_field.h )
• c/include/adt/int_map.h (moved) (moved from uspace/lib/socket/include/adt/int_map.h )
• c/include/adt/measured_strings.h (moved) (moved from uspace/lib/socket/include/adt/measured_strings.h )
• socket/Makefile (modified) (1 diff)

uspace/lib/c/Makefile

@@ -89 +89 @@
         generic/adt/list.o \
         generic/adt/hash_table.o \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/measured_strings.c \
+        generic/adt/char_map.c \
         generic/time.c \
         generic/err.c \

uspace/lib/c/generic/adt/measured_strings.c

@@ -36 +36 @@
  */
 
+#include <adt/measured_strings.h>
 #include <malloc.h>
 #include <mem.h>
@@ -41 +42 @@
 #include <errno.h>
 #include <err.h>
-
-#include <ipc/ipc.h>
-
-#include <net_modules.h>
-#include <adt/measured_strings.h>
+#include <async.h>
+
 
 measured_string_ref measured_string_create_bulk(const char * string, size_t length){

uspace/lib/socket/Makefile

@@ -42 +42 @@
         packet/packet.c \
         packet/packet_client.c \
-        packet/packet_server.c \
-        adt/dynamic_fifo.c \
-        adt/measured_strings.c \
-        adt/char_map.c
+        packet/packet_server.c 
 
 include $(USPACE_PREFIX)/Makefile.common