Changeset 8b5690f in mainline for uspace/lib/c/generic/private


Ignore:
Timestamp:
2011-02-03T05:11:01Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ba38f72c
Parents:
22027b6e (diff), 86d7bfa (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.

Location:
uspace/lib/c/generic/private
Files:
1 added
5 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/private/async.h

    r22027b6e r8b5690f  
    3333 */
    3434
    35 #ifndef LIBC_ASYNC_PRIV_H_
    36 #define LIBC_ASYNC_PRIV_H_
     35#ifndef LIBC_PRIVATE_ASYNC_H_
     36#define LIBC_PRIVATE_ASYNC_H_
    3737
    3838#include <adt/list.h>
    … …  
    5151        /** If true, we have timed out. */
    5252        bool occurred;
    53 
     53       
    5454        /** Expiration time. */
    5555        struct timeval expires;
    … …  
    6565} wu_event_t;
    6666
    67 
    6867/** Structures of this type represent a waiting fibril. */
    6968typedef struct {
    … …  
    7372        /** If true, this fibril is currently active. */
    7473        bool active;
    75 
     74       
    7675        /** Timeout wait data. */
    7776        to_event_t to_event;
    … …  
    8079} awaiter_t;
    8180
    82 extern void async_insert_timeout(awaiter_t *wd);
     81extern void __async_init(void);
     82extern void async_insert_timeout(awaiter_t *);
    8383
    8484#endif

  • uspace/lib/c/generic/private/async_sess.h

    r22027b6e r8b5690f  
    11/*
    2  * Copyright (c) 2006 Ondrej Palkovsky
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    3333 */
    3434
    35 #include <stdio.h>
    36 #include <stdlib.h>
     35#ifndef LIBC_PRIVATE_ASYNC_SESS_H_
     36#define LIBC_PRIVATE_ASYNC_SESS_H_
    3737
    38 /* TODO
    39 void errx(int __status, __const char *__format, ...)
    40 {
    41         _exit(0);
    42 }
    43 */
     38extern void __async_sess_init(void);
     39
     40#endif
    4441
    4542/** @}

  • uspace/lib/c/generic/private/io.h

    r22027b6e r8b5690f  
    11/*
    2  * Copyright (c) 2009 Lukas Mejdrech
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup ip
     29/** @addtogroup libc
    3030 * @{
    3131 */
    32 
    3332/** @file
    34  * IP module functions.
    35  * The functions are used as IP module entry points.
    3633 */
    3734
    38 #ifndef NET_IP_MODULE_H_
    39 #define NET_IP_MODULE_H_
     35#ifndef LIBC_PRIVATE_IO_H_
     36#define LIBC_PRIVATE_IO_H_
    4037
    41 #include <ipc/ipc.h>
     38#include <vfs/vfs.h>
    4239
    43 extern int ip_initialize(async_client_conn_t);
    44 extern int ip_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
    45     int *);
     40extern void __stdio_init(int filc, fdi_node_t *filv[]);
     41extern void __stdio_done(void);
    4642
    4743#endif

  • uspace/lib/c/generic/private/libc.h

    r22027b6e r8b5690f  
    11/*
    2  * Copyright (c) 2009 Lukas Mejdrech
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup arp
     29/** @addtogroup libc
    3030 * @{
    3131 */
    32 
    3332/** @file
    34  * ARP module functions.
    35  * The functions are used as ARP module entry points.
    3633 */
    3734
    38 #ifndef NET_ARP_MODULE_H_
    39 #define NET_ARP_MODULE_H_
     35#ifndef LIBC_PRIVATE_LIBC_H_
     36#define LIBC_PRIVATE_LIBC_H_
    4037
    41 #include <ipc/ipc.h>
    42 #include <async.h>
    43 
    44 extern int arp_initialize(async_client_conn_t);
    45 extern int arp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
    46     int *);
     38extern int main(int, char *[]);
     39extern void __main(void *) __attribute__((noreturn));
    4740
    4841#endif

  • uspace/lib/c/generic/private/thread.h

    r22027b6e r8b5690f  
    11/*
    2  * Copyright (c) 2008 Lukas Mejdrech
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup tcp
     29/** @addtogroup libc
    3030 * @{
    3131 */
    32 
    3332/** @file
    34  * TCP module functions.
    35  * The functions are used as TCP module entry points.
    3633 */
    3734
    38 #ifndef NET_TCP_MODULE_H_
    39 #define NET_TCP_MODULE_H_
     35#ifndef LIBC_PRIVATE_THREAD_H_
     36#define LIBC_PRIVATE_THREAD_H_
    4037
    41 #include <async.h>
    42 #include <ipc/ipc.h>
     38#include <kernel/proc/uarg.h>
    4339
    44 extern int tcp_initialize(async_client_conn_t);
    45 extern int tcp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
    46     int *);
     40extern void __thread_entry(void);
     41extern void __thread_main(uspace_arg_t *);
    4742
    4843#endif
Note: See TracChangeset for help on using the changeset viewer.