Changeset 6a44ee4 in mainline for uspace/lib/c/include/ns.h

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/lib/c/include/ns.h (moved) (moved from uspace/srv/hid/kbd/include/layout.h ) (3 diffs)

uspace/lib/c/include/ns.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup libc
  * @{
  */
@@ -35 +33 @@
  */
 
-#ifndef KBD_LAYOUT_H_
-#define KBD_LAYOUT_H_
+#ifndef LIBC_NS_H_
+#define LIBC_NS_H_
 
 #include <sys/types.h>
-#include <io/console.h>
+#include <task.h>
+#include <async.h>
 
-typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(console_event_t *);
-} layout_op_t;
+extern int service_register(sysarg_t);
+extern async_sess_t *service_connect(exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t);
+extern async_sess_t *service_connect_blocking(exch_mgmt_t, sysarg_t, sysarg_t,
+    sysarg_t);
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+extern int ns_ping(void);
+extern int ns_intro(task_id_t);
 
 #endif
 
-/**
- * @}
+/** @}
  */