From dca263620a1237a1b79b19805d9ea64dabdede12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 20 Jan 2005 17:52:06 +0000 Subject: [PATCH] Improved headers, updated license, made C++ safe. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10909 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/elf.h | 13 +++++++---- headers/private/kernel/port.h | 44 ++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/headers/private/kernel/elf.h b/headers/private/kernel/elf.h index a3ba3385f3..2ca5765d66 100755 --- a/headers/private/kernel/elf.h +++ b/headers/private/kernel/elf.h @@ -1,7 +1,10 @@ /* -** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2005, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. + * + * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. + * Distributed under the terms of the NewOS License. + */ #ifndef _KERNEL_ELF_H #define _KERNEL_ELF_H @@ -9,6 +12,8 @@ #include #include +struct kernel_args; + #ifdef __cplusplus extern "C" { @@ -22,7 +27,7 @@ status_t unload_kernel_add_on(image_id id); status_t elf_lookup_symbol_address(addr_t address, addr_t *_baseAddress, const char **_symbolName, const char **_imageName, bool *_exactMatch); -status_t elf_init(kernel_args *args); +status_t elf_init(struct kernel_args *args); #ifdef __cplusplus } diff --git a/headers/private/kernel/port.h b/headers/private/kernel/port.h index 9491edc94f..e404f519a4 100755 --- a/headers/private/kernel/port.h +++ b/headers/private/kernel/port.h @@ -1,16 +1,22 @@ -/* ports.h - * - * Definitions here are for kernel use only. For the actual - * definitions of port functions, please look at OS.h +/* + * Copyright 2005, Haiku Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. */ #ifndef _KERNEL_PORT_H #define _KERNEL_PORT_H #include +struct kernel_args; + + #define PORT_FLAG_USE_USER_MEMCPY 0x80000000 -status_t port_init(kernel_args *ka); +#ifdef __cplusplus +extern "C" { +#endif + +status_t port_init(struct kernel_args *args); int delete_owned_ports(team_id owner); int32 port_max_ports(void); int32 port_used_ports(void); @@ -18,31 +24,27 @@ int32 port_used_ports(void); // temp: test void port_test(void); -// user-level API +// user syscalls port_id _user_create_port(int32 queue_length, const char *name); status_t _user_close_port(port_id id); status_t _user_delete_port(port_id id); port_id _user_find_port(const char *port_name); status_t _user_get_port_info(port_id id, struct port_info *info); -status_t _user_get_next_port_info(team_id team, - int32 *cookie, +status_t _user_get_next_port_info(team_id team, int32 *cookie, struct port_info *info); -ssize_t _user_port_buffer_size_etc(port_id port, - uint32 flags, +ssize_t _user_port_buffer_size_etc(port_id port, uint32 flags, bigtime_t timeout); ssize_t _user_port_count(port_id port); -ssize_t _user_read_port_etc(port_id port, - int32 *msg_code, - void *msg_buffer, - size_t buffer_size, - uint32 flags, +ssize_t _user_read_port_etc(port_id port, int32 *msg_code, + void *msg_buffer, size_t buffer_size, uint32 flags, bigtime_t timeout); status_t _user_set_port_owner(port_id port, team_id team); -status_t _user_write_port_etc(port_id port, - int32 msg_code, - const void *msg_buffer, - size_t buffer_size, - uint32 flags, - bigtime_t timeout); +status_t _user_write_port_etc(port_id port, int32 msg_code, + const void *msg_buffer, size_t buffer_size, + uint32 flags, bigtime_t timeout); + +#ifdef __cplusplus +} +#endif #endif /* _KERNEL_PORT_H */