Changeset 04803bf in mainline for uspace/app/nettest1/nettest.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/app/nettest1/nettest.h (moved) (moved from kernel/arch/mips32/include/arg.h ) (3 diffs)

uspace/app/nettest1/nettest.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup nettest
  * @{
  */
+
 /** @file
+ * Networking test support functions.
  */
 
-#ifndef KERN_mips32_ARG_H_
-#define KERN_mips32_ARG_H_
+#ifndef NET_TEST_
+#define NET_TEST_
 
-#include <arch/types.h>
+#include <net/socket.h>
 
-/**
- * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not)
- * To satisfy this, paddings must be sometimes inserted. 
- */
-
-typedef uintptr_t va_list;
-
-#define va_start(ap, lst) \
-        ((ap) = (va_list)&(lst) + sizeof(lst))
-
-#define va_arg(ap, type)        \
-        (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uintptr_t)((ap) + 2*4 - 1) & (~3)) : ((uintptr_t)((ap) + 2*8 -1) & (~7)) )))[-1])
-
-#define va_copy(dst,src) ((dst)=(src))
-
-#define va_end(ap)
+extern void print_mark(int);
+extern int sockets_create(int, int *, int, int, sock_type_t);
+extern int sockets_close(int, int *, int);
+extern int sockets_connect(int, int *, int, struct sockaddr *, socklen_t);
+extern int sockets_sendto(int, int *, int, struct sockaddr *, socklen_t, char *, int, int);
+extern int sockets_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
+extern int sockets_sendto_recvfrom(int, int *, int, struct sockaddr *, socklen_t *, char *, int, int);
 
 #endif
@@ -59 +52 @@
 /** @}
  */
+