diff options
| author | mycroft <mycroft@NetBSD.org> | 1995-08-14 01:11:52 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1995-08-14 01:11:52 +0000 |
| commit | eba2f2e81ae89a368fba4a37ef20db91a052db18 (patch) | |
| tree | cabe7e7ba4113b44736d167e111f9edfd5862ce6 /sys/compat/linux/common | |
| parent | 3b76c0ddef216b2787f8400119d7ac56f2b639e4 (diff) | |
Move signal types into signal.h.
Diffstat (limited to 'sys/compat/linux/common')
| -rw-r--r-- | sys/compat/linux/common/linux_olduname.h | 11 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_sig_notalpha.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_sigaction.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_signal.c | 4 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_signal.h | 90 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_types.h | 11 |
6 files changed, 55 insertions, 69 deletions
diff --git a/sys/compat/linux/common/linux_olduname.h b/sys/compat/linux/common/linux_olduname.h index cd68fe7475c..1daf1fff12f 100644 --- a/sys/compat/linux/common/linux_olduname.h +++ b/sys/compat/linux/common/linux_olduname.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_olduname.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_olduname.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/common/linux_sig_notalpha.c b/sys/compat/linux/common/linux_sig_notalpha.c index eaa9012b251..ba303102d07 100644 --- a/sys/compat/linux/common/linux_sig_notalpha.c +++ b/sys/compat/linux/common/linux_sig_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sig_notalpha.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sig_notalpha.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_sigaction.c b/sys/compat/linux/common/linux_sigaction.c index 62c394d833a..eaa6c805669 100644 --- a/sys/compat/linux/common/linux_sigaction.c +++ b/sys/compat/linux/common/linux_sigaction.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigaction.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sigaction.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c index 9f83920594d..6ad3c57d054 100644 --- a/sys/compat/linux/common/linux_signal.c +++ b/sys/compat/linux/common/linux_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_signal.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_signal.h b/sys/compat/linux/common/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/common/linux_signal.h +++ b/sys/compat/linux/common/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/common/linux_types.h b/sys/compat/linux/common/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/common/linux_types.h +++ b/sys/compat/linux/common/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ |
