From bb45cbbb30b34b2f67a47f88b7ac304251b0704e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 29 Jun 2004 20:12:29 +0000 Subject: [PATCH] Removed some unneeded includes, making the header easier to swallow. Renamed the image and node monitor syscalls to the new scheme. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8235 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/fs/node_monitor.h | 8 ++++---- headers/private/kernel/syscalls.h | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/headers/private/kernel/fs/node_monitor.h b/headers/private/kernel/fs/node_monitor.h index f78fb5e314..ab4d0bc937 100644 --- a/headers/private/kernel/fs/node_monitor.h +++ b/headers/private/kernel/fs/node_monitor.h @@ -1,7 +1,7 @@ #ifndef _KERNEL_NODE_MONITOR_H #define _KERNEL_NODE_MONITOR_H /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. +** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ @@ -20,10 +20,10 @@ extern status_t remove_node_monitors(struct io_context *context); extern status_t node_monitor_init(void); // user-space exported calls -extern status_t user_stop_notifying(port_id port, uint32 token); -extern status_t user_start_watching(dev_t device, ino_t node, uint32 flags, +extern status_t _user_stop_notifying(port_id port, uint32 token); +extern status_t _user_start_watching(dev_t device, ino_t node, uint32 flags, port_id port, uint32 token); -extern status_t user_stop_watching(dev_t device, ino_t node, uint32 flags, +extern status_t _user_stop_watching(dev_t device, ino_t node, uint32 flags, port_id port, uint32 token); #ifdef __cplusplus diff --git a/headers/private/kernel/syscalls.h b/headers/private/kernel/syscalls.h index 066aa06de7..900fa74794 100644 --- a/headers/private/kernel/syscalls.h +++ b/headers/private/kernel/syscalls.h @@ -8,9 +8,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include @@ -70,16 +68,16 @@ int sys_sigaction(int sig, const struct sigaction *act, struct sigaction *oact); bigtime_t sys_set_alarm(bigtime_t time, uint32 mode); // image functions -image_id sys_register_image(image_info *info, size_t size); -status_t sys_unregister_image(image_id id); -status_t sys_get_image_info(image_id id, image_info *info, size_t size); -status_t sys_get_next_image_info(team_id team, int32 *cookie, image_info *info, size_t size); +image_id _kern_register_image(image_info *info, size_t size); +status_t _kern_unregister_image(image_id id); +status_t _kern_get_image_info(image_id id, image_info *info, size_t size); +status_t _kern_get_next_image_info(team_id team, int32 *cookie, image_info *info, size_t size); // node monitor functions -status_t sys_stop_notifying(port_id port, uint32 token); -status_t sys_start_watching(dev_t device, ino_t node, uint32 flags, +status_t _kern_stop_notifying(port_id port, uint32 token); +status_t _kern_start_watching(dev_t device, ino_t node, uint32 flags, port_id port, uint32 token); -status_t sys_stop_watching(dev_t device, ino_t node, uint32 flags, +status_t _kern_stop_watching(dev_t device, ino_t node, uint32 flags, port_id port, uint32 token); // time functions