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


Ignore:
Timestamp:
2011-11-06T22:21:05Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (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:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/ns.h

    r2bdf8313 rb0f00a9  
    2727 */
    2828
    29 /** @addtogroup console
     29/** @addtogroup libc
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef GCONS_H_
    36 #define GCONS_H_
     35#ifndef LIBC_NS_H_
     36#define LIBC_NS_H_
    3737
    3838#include <sys/types.h>
     39#include <task.h>
     40#include <async.h>
    3941
    40 void gcons_init(int);
     42extern int service_register(sysarg_t);
     43extern async_sess_t *service_connect(exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t);
     44extern async_sess_t *service_connect_blocking(exch_mgmt_t, sysarg_t, sysarg_t,
     45    sysarg_t);
    4146
    42 void gcons_redraw_console(void);
    43 void gcons_change_console(size_t);
    44 void gcons_notify_char(size_t);
    45 void gcons_in_kernel(void);
    46 
    47 void gcons_notify_connect(size_t);
    48 void gcons_notify_disconnect(size_t);
    49 
    50 void gcons_mouse_move(ssize_t, ssize_t);
    51 int gcons_mouse_btn(bool state);
     47extern int ns_ping(void);
     48extern int ns_intro(task_id_t);
    5249
    5350#endif
Note: See TracChangeset for help on using the changeset viewer.