diff --git a/sys/compat/aoutm68k/syscalls.master b/sys/compat/aoutm68k/syscalls.master index da5e4aabe238..cc0d3b930b51 100644 --- a/sys/compat/aoutm68k/syscalls.master +++ b/sys/compat/aoutm68k/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.30 2008/11/21 15:14:56 he Exp $ + $NetBSD: syscalls.master,v 1.31 2009/01/11 12:25:03 tsutsui Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -72,8 +72,8 @@ 5 NOARGS { int sys_open(const char *path, int flags, \ ... mode_t mode); } 6 NOARGS { int sys_close(int fd); } -7 NOARGS { int sys_wait4(int pid, int *status, int options, \ - struct rusage *rusage); } +7 NOARGS { int compat_50_sys_wait4(int pid, int *status, \ + int options, struct rusage50 *rusage); } #if defined(COMPAT_43) || !defined(_KERNEL) 8 NOARGS { int compat_43_sys_creat(const char *path, \ mode_t mode); } ocreat @@ -85,8 +85,8 @@ 11 OBSOL execv 12 NOARGS { int sys_chdir(const char *path); } 13 NOARGS { int sys_fchdir(int fd); } -14 NOARGS { int sys_mknod(const char *path, mode_t mode, \ - dev_t dev); } +14 NOARGS { int compat_50_sys_mknod(const char *path, \ + mode_t mode, dev_t dev); } 15 NOARGS { int sys_chmod(const char *path, mode_t mode); } 16 NOARGS { int sys_chown(const char *path, uid_t uid, \ gid_t gid); } @@ -239,9 +239,9 @@ const gid_t *gidset); } 81 NOARGS { int sys_getpgrp(void); } 82 NOARGS { int sys_setpgid(int pid, int pgid); } -83 NOARGS { int sys_setitimer(int which, \ - const struct itimerval *itv, \ - struct itimerval *oitv); } +83 NOARGS { int compat_50_sys_setitimer(int which, \ + const struct itimerval50 *itv, \ + struct itimerval50 *oitv); } #if defined(COMPAT_43) || !defined(_KERNEL) 84 NOARGS { int compat_43_sys_wait(void); } owait #else @@ -252,8 +252,8 @@ #else 85 EXCL compat_12_sys_swapon #endif -86 NOARGS { int sys_getitimer(int which, \ - struct itimerval *itv); } +86 NOARGS { int compat_50_sys_getitimer(int which, \ + struct itimerval50 *itv); } #if defined(COMPAT_43) || !defined(_KERNEL) 87 NOARGS { int compat_43_sys_gethostname(char *hostname, \ u_int len); } ogethostname @@ -269,8 +269,8 @@ 90 NOARGS { int sys_dup2(int from, int to); } 91 UNIMPL getdopt 92 NOARGS { int sys_fcntl(int fd, int cmd, ... void *arg); } -93 NOARGS { int sys_select(int nd, fd_set *in, fd_set *ou, \ - fd_set *ex, struct timeval *tv); } +93 NOARGS { int compat_50_sys_select(int nd, fd_set *in, \ + fd_set *ou, fd_set *ex, struct timeval50 *tv); } 94 UNIMPL setdopt 95 NOARGS { int sys_fsync(int fd); } 96 NOARGS { int sys_setpriority(int which, int who, int prio); } @@ -333,9 +333,10 @@ 114 EXCL compat_43_sys_sendmesg #endif 115 OBSOL vtrace -116 NOARGS { int sys_gettimeofday(struct timeval *tp, \ +116 NOARGS { int compat_50_sys_gettimeofday(struct timeval50 *tp, \ struct timezone *tzp); } -117 NOARGS { int sys_getrusage(int who, struct rusage *rusage); } +117 NOARGS { int compat_50_sys_getrusage(int who, \ + struct rusage50 *rusage); } 118 NOARGS { int sys_getsockopt(int s, int level, int name, \ void *val, int *avalsize); } 119 OBSOL resuba @@ -343,7 +344,8 @@ const struct iovec *iovp, int iovcnt); } 121 NOARGS { ssize_t sys_writev(int fd, \ const struct iovec *iovp, int iovcnt); } -122 NOARGS { int sys_settimeofday(const struct timeval *tv, \ +122 NOARGS { int compat_50_sys_settimeofday( \ + const struct timeval50 *tv, \ const struct timezone *tzp); } 123 NOARGS { int sys_fchown(int fd, uid_t uid, gid_t gid); } 124 NOARGS { int sys_fchmod(int fd, mode_t mode); } @@ -376,11 +378,12 @@ int protocol, int *rsv); } 136 NOARGS { int sys_mkdir(const char *path, mode_t mode); } 137 NOARGS { int sys_rmdir(const char *path); } -138 NOARGS { int sys_utimes(const char *path, \ - const struct timeval *tptr); } +138 NOARGS { int compat_50_sys_utimes(const char *path, \ + const struct timeval50 *tptr); } 139 OBSOL 4.2 sigreturn -140 NOARGS { int sys_adjtime(const struct timeval *delta, \ - struct timeval *olddelta); } +140 NOARGS { int compat_50_sys_adjtime( \ + const struct timeval50 *delta, \ + struct timeval50 *olddelta); } #if defined(COMPAT_43) || !defined(_KERNEL) 141 NOARGS { int compat_43_sys_getpeername(int fdes, void *asa, \ int *alen); } ogetpeername @@ -511,8 +514,8 @@ 185 NOARGS { int sys_lfs_markv(fsid_t *fsidp, \ struct block_info *blkiov, int blkcnt); } 186 NOARGS { int sys_lfs_segclean(fsid_t *fsidp, u_long segment); } -187 NOARGS { int sys_lfs_segwait(fsid_t *fsidp, \ - struct timeval *tv); } +187 NOARGS { int compat_50_sys_lfs_segwait(fsid_t *fsidp, \ + struct timeval50 *tv); } #else 184 EXCL lfs_bmapv 185 EXCL lfs_markv @@ -559,8 +562,8 @@ 203 NOARGS { int sys_mlock(const void *addr, size_t len); } 204 NOARGS { int sys_munlock(const void *addr, size_t len); } 205 NOARGS { int sys_undelete(const char *path); } -206 NOARGS { int sys_futimes(int fd, \ - const struct timeval *tptr); } +206 NOARGS { int compat_50_sys_futimes(int fd, \ + const struct timeval50 *tptr); } 207 NOARGS { pid_t sys_getpgid(pid_t pid); } 208 NOARGS { int sys_reboot(int opt, char *bootstr); } 209 NOARGS { int sys_poll(struct pollfd *fds, u_int nfds, \ @@ -628,12 +631,12 @@ 230 EXCL shmdt 231 EXCL shmget #endif -232 NOARGS { int sys_clock_gettime(clockid_t clock_id, \ - struct timespec *tp); } -233 NOARGS { int sys_clock_settime(clockid_t clock_id, \ - const struct timespec *tp); } -234 NOARGS { int sys_clock_getres(clockid_t clock_id, \ - struct timespec *tp); } +232 NOARGS { int compat_50_sys_clock_gettime(clockid_t clock_id, \ + struct timespec50 *tp); } +233 NOARGS { int compat_50_sys_clock_settime(clockid_t clock_id, \ + const struct timespec50 *tp); } +234 NOARGS { int compat_50_sys_clock_getres(clockid_t clock_id, \ + struct timespec50 *tp); } 235 UNIMPL timer_create 236 UNIMPL timer_delete 237 UNIMPL timer_settime @@ -642,8 +645,9 @@ ; ; Syscalls 240-269 are reserved for other IEEE Std1003.1b syscalls ; -240 NOARGS { int sys_nanosleep(const struct timespec *rqtp, \ - struct timespec *rmtp); } +240 NOARGS { int compat_50_sys_nanosleep( \ + const struct timespec50 *rqtp, \ + struct timespec50 *rmtp); } 241 NOARGS { int sys_fdatasync(int fd); } 242 NOARGS { int sys_mlockall(int flags); } 243 NOARGS { int sys_munlockall(void); } @@ -686,8 +690,8 @@ 274 NOARGS { int sys_lchmod(const char *path, mode_t mode); } 275 NOARGS { int sys_lchown(const char *path, uid_t uid, \ gid_t gid); } -276 NOARGS { int sys_lutimes(const char *path, \ - const struct timeval *tptr); } +276 NOARGS { int compat_50_sys_lutimes(const char *path, \ + const struct timeval50 *tptr); } 277 NOARGS { int sys___msync13(void *addr, size_t len, int flags); } 278 STD { int aoutm68k_sys___stat13(const char *path, \ struct aoutm68k_stat *ub); } @@ -752,19 +756,19 @@ 300 EXCL compat_20_sys_fhstatfs #endif #if defined(SYSVSEM) || !defined(_KERNEL) -301 NOARGS { int sys_____semctl13(int semid, int semnum, int cmd, \ - ... union __semun *arg); } +301 NOARGS { int compat_50_sys_____semctl13(int semid, \ + int semnum, int cmd, ... union __semun *arg); } #else 301 EXCL ____semctl13 #endif #if defined(SYSVMSG) || !defined(_KERNEL) -302 NOARGS { int sys___msgctl13(int msqid, int cmd, \ +302 NOARGS { int compat_50_sys___msgctl13(int msqid, int cmd, \ struct msqid_ds *buf); } #else 302 EXCL __msgctl13 #endif #if defined(SYSVSHM) || !defined(_KERNEL) -303 NOARGS { int sys___shmctl13(int shmid, int cmd, \ +303 NOARGS { int compat_50_sys___shmctl13(int shmid, int cmd, \ struct shmid_ds *buf); } #else 303 EXCL __shmctl13