Changeset eb083ad in mainline for uspace/app/nterm/conn.h

Timestamp:

2012-05-17T21:09:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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/app/nterm/conn.h (moved) (moved from uspace/lib/c/include/net/modules.h ) (2 diffs)

uspace/app/nterm/conn.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup edit
  * @{
  */
-
-/** @file
- * Generic module functions.
- *
- * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
- * FUNCTIONALITY OR VIA INTEGRATING ITS FUNCTIONALITY MORE TIGHTLY WITH THE REST
- * OF THE SYSTEM.
+/**
+ * @file
  */
 
-#ifndef LIBC_MODULES_H_
-#define LIBC_MODULES_H_
+#ifndef CONN_H
+#define CONN_H
 
-#include <async.h>
-#include <ipc/services.h>
-#include <sys/time.h>
+#include <sys/types.h>
 
-extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
-extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t);
-extern void refresh_answer(ipc_call_t *, size_t *);
+extern int conn_open(const char *, const char *);
+extern int conn_send(void *, size_t);
 
 #endif