Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2531 → Rev 2541

/trunk/uspace/lib/libc/include/types.h
File deleted
/trunk/uspace/lib/libc/include/futex.h
36,7 → 36,7
#define LIBC_FUTEX_H_
 
#include <atomic.h>
#include <types.h>
#include <sys/types.h>
 
#define FUTEX_INITIALIZER {1}
 
/trunk/uspace/lib/libc/include/as.h
35,7 → 35,7
#ifndef LIBC_AS_H_
#define LIBC_AS_H_
 
#include <types.h>
#include <sys/types.h>
#include <task.h>
#include <kernel/mm/as.h>
#include <libarch/config.h>
/trunk/uspace/lib/libc/include/stdint.h
35,8 → 35,8
#ifndef LIBC_STDINT_H_
#define LIBC_STDINT_H_
 
/* Definitions of types with fixed size*/
#include <types.h>
/* Definitions of types with fixed size */
#include <libarch/types.h>
 
#define MAX_INT8 (0x7F)
#define MIN_INT8 (0x80)
/trunk/uspace/lib/libc/include/string.h
35,7 → 35,7
#ifndef LIBC_STRING_H_
#define LIBC_STRING_H_
 
#include <types.h>
#include <sys/types.h>
 
#define bzero(ptr, len) memset((ptr), 0, (len))
 
/trunk/uspace/lib/libc/include/stddef.h
35,7 → 35,7
#ifndef LIBC_STDDEF_H_
#define LIBC_STDDEF_H_
 
#include <types.h>
#include <sys/types.h>
 
#endif
 
/trunk/uspace/lib/libc/include/syscall.h
37,7 → 37,7
#ifndef LIBC_SYSCALL_H_
#define LIBC_SYSCALL_H_
 
#include <types.h>
#include <sys/types.h>
#include <kernel/syscall/syscall.h>
 
extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, const sysarg_t p4, const syscall_t id);
/trunk/uspace/lib/libc/include/async.h
55,9 → 55,9
}
 
aid_t async_send_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
ipc_call_t *dataptr);
ipc_call_t *dataptr);
aid_t async_send_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
ipcarg_t arg3, ipc_call_t *dataptr);
ipcarg_t arg3, ipc_call_t *dataptr);
void async_wait_for(aid_t amsgid, ipcarg_t *result);
int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout);
 
67,7 → 67,8
*
* @return Return code of message
*/
static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
static inline ipcarg_t async_req_2(int phoneid, ipcarg_t method, ipcarg_t arg1,
ipcarg_t arg2, ipcarg_t *r1, ipcarg_t *r2)
{
ipc_call_t result;
ipcarg_t rc;
80,11 → 81,11
*r2 = IPC_GET_ARG2(result);
return rc;
}
#define async_req(phoneid, method, arg1, r1) async_req_2(phoneid, method, arg1, 0, r1, 0)
#define async_req(phoneid, method, arg1, r1) \
async_req_2(phoneid, method, arg1, 0, r1, 0)
 
static inline ipcarg_t async_req_3(int phoneid, ipcarg_t method, ipcarg_t arg1,
ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1,
ipcarg_t *r2, ipcarg_t *r3)
ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *r1, ipcarg_t *r2, ipcarg_t *r3)
{
ipc_call_t result;
ipcarg_t rc;
113,7 → 114,7
 
/* Primitve functions for IPC communication */
void async_msg_3(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2,
ipcarg_t arg3);
ipcarg_t arg3);
void async_msg_2(int phoneid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2);
#define async_msg(ph, m, a1) async_msg_2(ph, m, a1, 0)
 
/trunk/uspace/lib/libc/include/stdio.h
35,7 → 35,7
#ifndef LIBC_STDIO_H_
#define LIBC_STDIO_H_
 
#include <types.h>
#include <sys/types.h>
#include <stdarg.h>
 
#define EOF (-1)
/trunk/uspace/lib/libc/include/bitops.h
35,7 → 35,7
#ifndef LIBC_BITOPS_H_
#define LIBC_BITOPS_H_
 
#include <types.h>
#include <sys/types.h>
 
 
/** Return position of first non-zero bit from left (i.e. [log_2(arg)]).
/trunk/uspace/lib/libc/include/task.h
35,7 → 35,7
#ifndef LIBC_TASK_H_
#define LIBC_TASK_H_
 
#include <types.h>
#include <sys/types.h>
 
typedef uint64_t task_id_t;
 
/trunk/uspace/lib/libc/include/unistd.h
35,7 → 35,7
#ifndef LIBC_UNISTD_H_
#define LIBC_UNISTD_H_
 
#include <types.h>
#include <sys/types.h>
#include <libarch/config.h>
 
#define NULL 0
/trunk/uspace/lib/libc/include/thread.h
37,7 → 37,7
 
#include <kernel/proc/uarg.h>
#include <libarch/thread.h>
#include <types.h>
#include <sys/types.h>
 
typedef uint64_t thread_id_t;
 
/trunk/uspace/lib/libc/include/libc.h
35,7 → 35,7
#ifndef LIBC_LIBC_H_
#define LIBC_LIBC_H_
 
#include <types.h>
#include <sys/types.h>
#include <kernel/syscall/syscall.h>
#include <libarch/syscall.h>
 
/trunk/uspace/lib/libc/include/io/printf_core.h
35,7 → 35,7
#ifndef LIBC_PRINTF_CORE_H_
#define LIBC_PRINTF_CORE_H_
 
#include <libarch/types.h>
#include <sys/types.h>
#include <stdarg.h>
 
/** Structure for specifying output methods for different printf clones. */
/trunk/uspace/lib/libc/include/io/io.h
35,7 → 35,7
#ifndef LIBC_IO_H_
#define LIBC_IO_H_
 
#include <libarch/types.h>
#include <sys/types.h>
 
int putnchars(const char * buf, size_t count);
int putstr(const char * str);
/trunk/uspace/lib/libc/include/stdarg.h
35,7 → 35,7
#ifndef LIBC_STDARG_H_
#define LIBC_STDARG_H_
 
#include <types.h>
#include <sys/types.h>
#include <libarch/stackarg.h>
 
#ifndef __VARARGS_DEFINED
/trunk/uspace/lib/libc/include/ipc/ipc.h
38,7 → 38,7
#include <kernel/ipc/ipc.h>
#include <kernel/ddi/irq.h>
#include <libc.h>
#include <types.h>
#include <sys/types.h>
#include <kernel/synch/synch.h>
 
typedef sysarg_t ipcarg_t;
/trunk/uspace/lib/libc/include/sys/time.h
35,7 → 35,7
#ifndef LIBC_TIME_H_
#define LIBC_TIME_H_
 
#include <types.h>
#include <sys/types.h>
 
#define DST_NONE 0
 
/trunk/uspace/lib/libc/include/sys/types.h
35,8 → 35,12
#ifndef LIBC_SYS_TYPES_H_
#define LIBC_SYS_TYPES_H_
 
#include <types.h>
#include <libarch/types.h>
 
typedef unsigned long size_t;
typedef signed long ssize_t;
typedef long off_t;
 
#endif
 
/** @}
/trunk/uspace/lib/libc/include/sys/mman.h
36,6 → 36,7
#define LIBC_MMAN_H_
 
#include <as.h>
#include <sys/types.h>
 
#define MAP_FAILED ((void *) -1)
 
48,8 → 49,8
#define PROTO_WRITE AS_AREA_WRITE
#define PROTO_EXEC AS_AREA_EXEC
 
extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
off_t offset);
extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
off_t offset);
extern int munmap(void *start, size_t length);
 
#endif